diff options
author | Uwe Stieber | 2012-05-25 10:30:10 +0000 |
---|---|---|
committer | Uwe Stieber | 2012-05-25 10:30:10 +0000 |
commit | 4d557cc7b17b91c4d6de3827b1d7668fced82366 (patch) | |
tree | 6c2b40024e4f1b094690f89fb9fb2da11eab1220 /target_explorer | |
parent | c43ff2700cbc527f99e29eefe83f4586a4c2258e (diff) | |
download | org.eclipse.tcf-4d557cc7b17b91c4d6de3827b1d7668fced82366.tar.gz org.eclipse.tcf-4d557cc7b17b91c4d6de3827b1d7668fced82366.tar.xz org.eclipse.tcf-4d557cc7b17b91c4d6de3827b1d7668fced82366.zip |
Target Explorer: Updated feature description and fix more warnings
Diffstat (limited to 'target_explorer')
6 files changed, 35 insertions, 33 deletions
diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.properties b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.properties index 34c1e9173..e232c9e7c 100644 --- a/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.properties +++ b/target_explorer/features/org.eclipse.tcf.te.tcf.feature/feature.properties @@ -1,5 +1,5 @@ ################################################################################## -# Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved. +# Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved. # This program and the accompanying materials are made available under the terms # of the Eclipse Public License v1.0 which accompanies this distribution, and is # available at http://www.eclipse.org/legal/epl-v10.html @@ -14,13 +14,14 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Target Explorer, TCF +featureName=TCF Target Explorer # "providerName" property - name of the company that provides the feature providerName=Eclipse.org - TCF # "description" property - description of the feature -description=TCF connectivity plug-in for the Target Explorer to browse remote file systems, processes or open a terminal. +description=Dynamic target discovery and configuration, remote file system and process browsing, \ +terminal access and debugger launch for systems running a TCF agent. Does not require RSE. # "copyright" property - text of the "Feature Update Copyright" copyright=\ diff --git a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.properties b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.properties index 5aab0976c..b18c4a2e7 100644 --- a/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.properties +++ b/target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature/feature.properties @@ -1,5 +1,5 @@ ################################################################################## -# Copyright (c) 2011 Wind River Systems, Inc. and others. All rights reserved. +# Copyright (c) 2011, 2012 Wind River Systems, Inc. and others. All rights reserved. # This program and the accompanying materials are made available under the terms # of the Eclipse Public License v1.0 which accompanies this distribution, and is # available at http://www.eclipse.org/legal/epl-v10.html @@ -14,13 +14,13 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Target Explorer SDK, TCF +featureName=TCF Target Explorer SDK # "providerName" property - name of the company that provides the feature providerName=Eclipse.org - TCF # "description" property - description of the feature -description=The Target Explorer TCF extensions SDK. +description=The TCF Target Explorer SDK. # "copyright" property - text of the "Feature Update Copyright" copyright=\ diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java index c0e459ed2..e07256cc0 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/AbstractServiceManager.java @@ -257,20 +257,6 @@ public abstract class AbstractServiceManager { return expression; } - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (obj instanceof IService) { - return equals((IService)obj); - } - if (obj instanceof ServiceProxy) { - return equals((ServiceProxy)obj); - } - return super.equals(obj); - } - public boolean equals(IService service) { Assert.isNotNull(service); return clazz != null ? clazz.equals(service.getClass().getCanonicalName()) : false; diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/filetransfer/FileTransferItem.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/filetransfer/FileTransferItem.java index 268cf1426..bed754c4d 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/filetransfer/FileTransferItem.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/filetransfer/FileTransferItem.java @@ -76,6 +76,17 @@ public class FileTransferItem extends PropertiesContainer implements IFileTransf }
/* (non-Javadoc)
+ * @see org.eclipse.tcf.te.runtime.properties.PropertiesContainer#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ int hc = getHostPath() != null ? getHostPath().hashCode() : 0;
+ hc = hc << 8 + (getTargetPath() != null ? getTargetPath().hashCode() : 0);
+ hc = hc << 8 + getDirection();
+ return hc;
+ }
+
+ /* (non-Javadoc)
* @see org.eclipse.tcf.te.runtime.properties.PropertiesContainer#equals(java.lang.Object)
*/
@Override
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Parser.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Parser.java index a3ab90eea..ead77d97b 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Parser.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Parser.java @@ -163,17 +163,18 @@ public class Parser { if (tok.startsWith("{")) { //$NON-NLS-1$
// Map type
- String fullTok = tok;
- boolean complete = isComplete(fullTok, '{', '}');
+ StringBuilder fullTok = new StringBuilder(tok);
+ boolean complete = isComplete(fullTok.toString(), '{', '}');
while (!complete && tokenizer.hasMoreTokens()) {
- fullTok = fullTok + " " + tokenizer.nextToken(); //$NON-NLS-1$
- complete = isComplete(fullTok, '{', '}');
+ fullTok.append(" "); //$NON-NLS-1$
+ fullTok.append(tokenizer.nextToken());
+ complete = isComplete(fullTok.toString(), '{', '}');
}
if (complete) {
- fullTok = fullTok + "\0"; //$NON-NLS-1$
+ String fullTokStr = fullTok.toString() + "\0"; //$NON-NLS-1$
try {
- Object[] args = JSON.parseSequence(fullTok.getBytes());
+ Object[] args = JSON.parseSequence(fullTokStr.getBytes());
if (args != null) {
for (Object arg : args) {
if (arg != null) token.addArgument(arg);
@@ -187,17 +188,18 @@ public class Parser { if (tok.startsWith("[")) { //$NON-NLS-1$
// List type
- String fullTok = tok;
- boolean complete = isComplete(fullTok, '[', ']');
+ StringBuilder fullTok = new StringBuilder(tok);
+ boolean complete = isComplete(fullTok.toString(), '[', ']');
while (!complete && tokenizer.hasMoreTokens()) {
- fullTok = fullTok + " " + tokenizer.nextToken(); //$NON-NLS-1$
- complete = isComplete(fullTok, '[', ']');
+ fullTok.append(" "); //$NON-NLS-1$
+ fullTok.append(tokenizer.nextToken());
+ complete = isComplete(fullTok.toString(), '[', ']');
}
if (complete) {
- fullTok = fullTok + "\0"; //$NON-NLS-1$
+ String fullTokStr = fullTok.toString() + "\0"; //$NON-NLS-1$
try {
- Object[] args = JSON.parseSequence(fullTok.getBytes());
+ Object[] args = JSON.parseSequence(fullTokStr.getBytes());
if (args != null) {
for (Object arg : args) {
if (arg != null) token.addArgument(arg);
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/LogManager.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/LogManager.java index 83437c938..ed2e2585d 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/LogManager.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.log.core/src/org/eclipse/tcf/te/tcf/log/core/internal/LogManager.java @@ -380,6 +380,7 @@ public final class LogManager implements IProtocolStateChangeListener { // Rename the log file if the rotate succeeded,
// Delete the log file if not.
rc = rc ? file.renameTo(maxFileInCycle) : file.delete();
+ if (!rc) { /* Well, there is nothing we can do about it */ }
}
} else {
@@ -393,7 +394,8 @@ public final class LogManager implements IProtocolStateChangeListener { Assert.isTrue(no <= maxInCycle);
// Rename the log file
- file.renameTo(fileInCycle);
+ boolean rc = file.renameTo(fileInCycle);
+ if (!rc) { /* Well, there is nothing we can do about it */ }
}
}
}
|