From 4d557cc7b17b91c4d6de3827b1d7668fced82366 Mon Sep 17 00:00:00 2001 From: Uwe Stieber Date: Fri, 25 May 2012 12:30:10 +0200 Subject: Target Explorer: Updated feature description and fix more warnings --- .../tcf/te/runtime/services/AbstractServiceManager.java | 14 -------------- .../te/runtime/services/filetransfer/FileTransferItem.java | 11 +++++++++++ 2 files changed, 11 insertions(+), 14 deletions(-) (limited to 'target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src') 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 @@ -75,6 +75,17 @@ public class FileTransferItem extends PropertiesContainer implements IFileTransf return getStringProperty(PROPERTY_OPTIONS); } + /* (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) */ -- cgit v1.2.3