Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-05-31 18:13:31 +0000
committerUwe Stieber2012-05-31 18:13:31 +0000
commit4b2c19a4c25ca40ffee67d72263b77443686fc25 (patch)
treebc3f679f3c86f8e794af111ebe61471db8a5b8cc
parent9a57024bf6b43d08285a09ba3316e0c5272ffa03 (diff)
downloadorg.eclipse.tcf-4b2c19a4c25ca40ffee67d72263b77443686fc25.tar.gz
org.eclipse.tcf-4b2c19a4c25ca40ffee67d72263b77443686fc25.tar.xz
org.eclipse.tcf-4b2c19a4c25ca40ffee67d72263b77443686fc25.zip
Target Explorer: FindBugs fixes
-rw-r--r--admin/findbugs-exclude.xml6
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/model/LaunchNode.java14
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/tabs/launchcontext/AbstractContextSelectorControl.java1
3 files changed, 21 insertions, 0 deletions
diff --git a/admin/findbugs-exclude.xml b/admin/findbugs-exclude.xml
index 3e44dbfe9..88a988b05 100644
--- a/admin/findbugs-exclude.xml
+++ b/admin/findbugs-exclude.xml
@@ -90,6 +90,12 @@
<Method name="initialize"/>
</And>
</Match>
+
+ <!-- Ignore URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD in AbstractFileTransferSection -->
+ <Match>
+ <Bug pattern="URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD"/>
+ <Class name="org.eclipse.tcf.te.launch.ui.tabs.filetransfers.AbstractFileTransferSection"/>
+ </Match>
<!-- Filters for org.eclipse.tcf bundle -->
<Match>
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/model/LaunchNode.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/model/LaunchNode.java
index ca7025501..64751e6da 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/model/LaunchNode.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/model/LaunchNode.java
@@ -118,6 +118,20 @@ public class LaunchNode extends ContainerModelNode {
}
/* (non-Javadoc)
+ * @see org.eclipse.tcf.te.runtime.properties.PropertiesContainer#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ if (isType(TYPE_LAUNCH_CONFIG_TYPE) && getLaunchConfigurationType() != null) {
+ return getLaunchConfigurationType().hashCode();
+ }
+ else if (isType(TYPE_LAUNCH_CONFIG) && getLaunchConfiguration() != null) {
+ return getLaunchConfiguration().hashCode();
+ }
+ return super.hashCode();
+ }
+
+ /* (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.launch.ui/src/org/eclipse/tcf/te/launch/ui/tabs/launchcontext/AbstractContextSelectorControl.java b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/tabs/launchcontext/AbstractContextSelectorControl.java
index 0436bab83..ac8e664ac 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/tabs/launchcontext/AbstractContextSelectorControl.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.launch.ui/src/org/eclipse/tcf/te/launch/ui/tabs/launchcontext/AbstractContextSelectorControl.java
@@ -818,6 +818,7 @@ public abstract class AbstractContextSelectorControl extends AbstractDecoratedDi
@Override
public boolean isValid() {
boolean valid = super.isValid();
+ if (!valid) return valid;
// If there is a last failure cause set, show that failure cause
valid = getLastFailureCause() == null;

Back to the top