Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Stieber2012-08-08 08:29:05 +0000
committerUwe Stieber2012-08-08 08:29:05 +0000
commita19c1e543fa9fd9020336115828e4a85e78906e3 (patch)
tree69a0f1851e8f6b90fb3a6b656c46db7c65efdb24 /target_explorer/plugins/org.eclipse.tcf.te.tcf.locator
parent0561f950fe6033e1244d06b0410f95ee5b8f717c (diff)
downloadorg.eclipse.tcf-a19c1e543fa9fd9020336115828e4a85e78906e3.tar.gz
org.eclipse.tcf-a19c1e543fa9fd9020336115828e4a85e78906e3.tar.xz
org.eclipse.tcf-a19c1e543fa9fd9020336115828e4a85e78906e3.zip
Target Explorer: Fix FindBugs warnings
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.locator')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/internal/nls/Messages.java4
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nodes/LocatorModel.java11
2 files changed, 6 insertions, 9 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/internal/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/internal/nls/Messages.java
index 7a053e140..c52249d53 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/internal/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/internal/nls/Messages.java
@@ -58,9 +58,7 @@ public class Messages extends NLS {
if (key != null) {
try {
Field field = Messages.class.getDeclaredField(key);
- if (field != null) {
- return (String)field.get(null);
- }
+ return (String)field.get(null);
} catch (Exception e) { /* ignored on purpose */ }
}
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nodes/LocatorModel.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nodes/LocatorModel.java
index 5e2833a7b..5a08691af 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nodes/LocatorModel.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.locator/src/org/eclipse/tcf/te/tcf/locator/nodes/LocatorModel.java
@@ -333,13 +333,12 @@ public class LocatorModel extends PlatformObject implements ILocatorModel {
}
IScanner scanner = getScanner();
+ Assert.isNotNull(scanner);
- if (scanner != null) {
- // Pass on the schedule parameter
- Map<String, Object> config = new HashMap<String, Object>(scanner.getConfiguration());
- config.put(IScanner.PROP_SCHEDULE, Long.valueOf(schedule));
- scanner.setConfiguration(config);
- }
+ // Pass on the schedule parameter
+ Map<String, Object> config = new HashMap<String, Object>(scanner.getConfiguration());
+ config.put(IScanner.PROP_SCHEDULE, Long.valueOf(schedule));
+ scanner.setConfiguration(config);
// The default scanner implementation is a job.
// -> schedule here if it is a job

Back to the top