From 1bc0b83855f533013842c9cee912ce01124dd5c1 Mon Sep 17 00:00:00 2001 From: Tobias Schwarz Date: Tue, 18 Feb 2014 10:33:45 +0100 Subject: Target Explorer: fix equal --- .../tcf/te/runtime/services/filetransfer/FileTransferItem.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 87c957537..d458c7411 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 @@ -102,9 +102,10 @@ public class FileTransferItem extends PropertiesContainer implements IFileTransf public boolean equals(Object obj) { boolean equals = super.equals(obj); if (!equals && obj instanceof IFileTransferItem) { - return getHostPath() != null ? getHostPath().equals(((IFileTransferItem)obj).getHostPath()) : ((IFileTransferItem)obj).getHostPath() == null - && getTargetPath() != null ? getTargetPath().equals(((IFileTransferItem)obj).getTargetPath()) : ((IFileTransferItem)obj).getTargetPath() == null - && getDirection() == ((IFileTransferItem)obj).getDirection(); + boolean hostPathEqual = getHostPath() != null ? getHostPath().equals(((IFileTransferItem)obj).getHostPath()) : ((IFileTransferItem)obj).getHostPath() == null; + boolean targetPathEqual = getTargetPath() != null ? getTargetPath().equals(((IFileTransferItem)obj).getTargetPath()) : ((IFileTransferItem)obj).getTargetPath() == null; + boolean directionEqual = getDirection() == ((IFileTransferItem)obj).getDirection(); + return hostPathEqual && targetPathEqual && directionEqual; } return equals; } -- cgit v1.2.3