commit 488b0d1b9f9fe2a690f65d2c9f992cf837061269
author Florian Waibel <fwaibel@datenkollektiv.de> Sun Aug 11 12:02:36 2019 +0200
committer Florian Waibel <fwaibel@datenkollektiv.de> Sun Aug 11 16:23:51 2019 +0200
tree 97272fca261c5b024f8bb729bb0f6b3d9e118af1
parent bd66585f03c7ab551690ec6feb8c9af871df7e9a

Fix FindBugs Warning in BundleCommands.getBundle(..)

EC_UNRELATED_CLASS_AND_INTERFACE

EC: Call to org.eclipse.equinox.region.Region.equals(String)

kernel/org.eclipse.virgo.shell.command/src/main/java/org/eclipse/virgo/shell/internal/commands/BundleCommands.java

diff --git a/kernel/org.eclipse.virgo.shell.command/src/main/java/org/eclipse/virgo/shell/internal/commands/BundleCommands.java b/kernel/org.eclipse.virgo.shell.command/src/main/java/org/eclipse/virgo/shell/internal/commands/BundleCommands.java
index fa5ca3d..cfd071b 100644
--- a/kernel/org.eclipse.virgo.shell.command/src/main/java/org/eclipse/virgo/shell/internal/commands/BundleCommands.java
+++ b/kernel/org.eclipse.virgo.shell.command/src/main/java/org/eclipse/virgo/shell/internal/commands/BundleCommands.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.virgo.shell.internal.commands;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.equinox.region.RegionDigraph;
@@ -61,7 +61,7 @@
         if (bundle != null) {
             return examine(bundle.getSymbolicName(), bundle.getVersion().toString(), bundle.getRegion().getName());
         } else {
-            return Arrays.asList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
+            return Collections.singletonList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
         }
     }
 
@@ -71,7 +71,7 @@
         if (bundle != null) {
             return start(bundle.getSymbolicName(), bundle.getVersion().toString(), bundle.getRegion().getName());
         } else {
-            return Arrays.asList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
+            return Collections.singletonList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
         }
     }
 
@@ -81,7 +81,7 @@
         if (bundle != null) {
             return stop(bundle.getSymbolicName(), bundle.getVersion().toString(), bundle.getRegion().getName());
         } else {
-            return Arrays.asList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
+            return Collections.singletonList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
         }
     }
 
@@ -91,7 +91,7 @@
         if (bundle != null) {
             return refresh(bundle.getSymbolicName(), bundle.getVersion().toString(), bundle.getRegion().getName());
         } else {
-            return Arrays.asList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
+            return Collections.singletonList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
         }
     }
 
@@ -101,7 +101,7 @@
         if (bundle != null) {
             return uninstall(bundle.getSymbolicName(), bundle.getVersion().toString(), bundle.getRegion().getName());
         } else {
-            return Arrays.asList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
+            return Collections.singletonList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
         }
     }
 
@@ -111,7 +111,7 @@
         if (bundle != null) {
             return diag(bundle.getSymbolicName(), bundle.getVersion().toString(), bundle.getRegion().getName());
         } else {
-            return Arrays.asList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
+            return Collections.singletonList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
         }
     }
 
@@ -132,7 +132,7 @@
         if (bundle != null) {
             return headers(bundle.getSymbolicName(), bundle.getVersion().toString(), bundle.getRegion().getName());
         } else {
-            return Arrays.asList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
+            return Collections.singletonList(String.format(NO_BUNDLE_FOR_BUNDLE_ID, id));
         }
     }
 
@@ -145,7 +145,7 @@
         Version v = new Version(version);
         List<QuasiBundle> bundles = this.quasiBundleUtil.getAllBundles();
         for (QuasiBundle bundle : bundles) {
-            if (bundle.getSymbolicName().equals(name) && bundle.getVersion().equals(v) && bundle.getRegion().equals(region)) {
+            if (bundle.getSymbolicName().equals(name) && bundle.getVersion().equals(v) && bundle.getRegion().getName().equals(region)) {
                 return bundle;
             }
         }