Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2011-05-13 04:43:34 -0400
committerChristopher Frost2011-05-13 04:43:34 -0400
commitaf6790d661aa64212f494b6ebffdaf98901f012c (patch)
tree6a5aec194bef46f3d96c58947954d73474e1fa8f
parent366ef7015a765e6648335c55c9e83ea49e13cfe9 (diff)
downloadorg.eclipse.virgo.kernel-af6790d661aa64212f494b6ebffdaf98901f012c.tar.gz
org.eclipse.virgo.kernel-af6790d661aa64212f494b6ebffdaf98901f012c.tar.xz
org.eclipse.virgo.kernel-af6790d661aa64212f494b6ebffdaf98901f012c.zip
Some minor tidy up of warning markers as indicated by the new compiler
-rw-r--r--org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/BundleDependencyDeterminer.java2
-rw-r--r--org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/completers/AbstractInstallArtifactCompleter.java2
-rw-r--r--org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/formatting/BundleInstallArtifactCommandFormatter.java1
-rw-r--r--org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingRegistryHook.java4
4 files changed, 4 insertions, 5 deletions
diff --git a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/BundleDependencyDeterminer.java b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/BundleDependencyDeterminer.java
index 901c58c7..de2a1526 100644
--- a/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/BundleDependencyDeterminer.java
+++ b/org.eclipse.virgo.kernel.model/src/main/java/org/eclipse/virgo/kernel/model/internal/bundle/BundleDependencyDeterminer.java
@@ -81,7 +81,7 @@ public final class BundleDependencyDeterminer implements DependencyDeterminer {
for (QuasiBundle bundle : framework.getBundles()) {
if (artifact.getName().equals(bundle.getSymbolicName()) &&
artifact.getVersion().equals(bundle.getVersion()) &&
- artifact.getRegion().equals(this.regionDigraph.getRegion(bundle.getBundleId()))) {
+ artifact.getRegion().getName().equals(this.regionDigraph.getRegion(bundle.getBundleId()).getName())) {
return bundle;
}
}
diff --git a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/completers/AbstractInstallArtifactCompleter.java b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/completers/AbstractInstallArtifactCompleter.java
index e596e17b..cefee7d9 100644
--- a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/completers/AbstractInstallArtifactCompleter.java
+++ b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/completers/AbstractInstallArtifactCompleter.java
@@ -65,7 +65,7 @@ class AbstractInstallArtifactCompleter implements CommandCompleter {
* @param subcommand
* @param tokens
*/
- protected void filter(@SuppressWarnings("unused") Set<String> candidates, @SuppressWarnings("unused") String subcommand, @SuppressWarnings("unused") String... tokens) {
+ protected void filter(Set<String> candidates, String subcommand, String... tokens) {
}
private Set<String> versions(String name, String version) {
diff --git a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/formatting/BundleInstallArtifactCommandFormatter.java b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/formatting/BundleInstallArtifactCommandFormatter.java
index a1e97751..b05ad2d8 100644
--- a/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/formatting/BundleInstallArtifactCommandFormatter.java
+++ b/org.eclipse.virgo.kernel.shell/src/main/java/org/eclipse/virgo/kernel/shell/internal/formatting/BundleInstallArtifactCommandFormatter.java
@@ -287,7 +287,6 @@ public final class BundleInstallArtifactCommandFormatter implements InstallArtif
return lines;
}
- @SuppressWarnings("unchecked")
public List<String> formatHeaders(QuasiBundle bundle) {
if (bundle == null) {
return Arrays.asList("Unable to locate bundle");
diff --git a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingRegistryHook.java b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingRegistryHook.java
index 8b619198..8d8df13a 100644
--- a/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingRegistryHook.java
+++ b/org.eclipse.virgo.kernel.userregion/src/main/java/org/eclipse/virgo/kernel/userregion/internal/ServiceScopingRegistryHook.java
@@ -38,11 +38,11 @@ final class ServiceScopingRegistryHook implements FindHook, EventHook {
}
@SuppressWarnings("unchecked")
- public void find(BundleContext context, String name, String filter, boolean allServices, @SuppressWarnings("rawtypes") Collection references) {
+ public void find(BundleContext context, String name, String filter, boolean allServices, Collection references) {
this.serviceScopingStrategy.scopeReferences(references, context, name, filter);
}
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings("unchecked")
public void event(ServiceEvent event, Collection contexts) {
ServiceReference ref = event.getServiceReference();
for (Iterator iterator = contexts.iterator(); iterator.hasNext();) {

Back to the top