Bug 463808 - Fix more warnings in rt.equinox.framework projects
Change-Id: Iff0856404654b19373a998999cc36488e637899b
Signed-off-by: Szymon Ptaszkiewicz <szymon.ptaszkiewicz@pl.ibm.com>
diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java
index 88e85ba..28ebabc 100644
--- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java
+++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/StateWriter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2013 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -546,7 +546,7 @@
out.writeByte(3);
writeGenericSpecification((GenericSpecificationImpl) requirement, out);
} else
- throw new IllegalArgumentException("Unknown requiement type: " + requirement.getClass());
+ throw new IllegalArgumentException("Unknown requiement type: " + requirement.getClass()); //$NON-NLS-1$
BaseDescription capability = wire.getDeclaredCapability();
if (capability instanceof BundleDescription)
@@ -556,7 +556,7 @@
else if (capability instanceof GenericDescription)
writeGenericDescription((GenericDescription) capability, out);
else
- throw new IllegalArgumentException("Unknown capability type: " + requirement.getClass());
+ throw new IllegalArgumentException("Unknown capability type: " + requirement.getClass()); //$NON-NLS-1$
writeBundleDescription(wire.getRequirementHost(), out, false);
writeBundleDescription(wire.getCapabilityHost(), out, false);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java
index cf12bdd..13506ef 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/equinox/log/test/ExtendedLogReaderServiceTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Cognos Incorporated, IBM Corporation and others
+ * Copyright (c) 2012, 2015 Cognos Incorporated, IBM Corporation and others
* All rights reserved. This program and the accompanying materials are made
* available under the terms of the Eclipse Public License v1.0 which
* accompanies this distribution, and is available at
@@ -21,7 +21,7 @@
private ServiceReference logReference;
private ExtendedLogReaderService reader;
private ServiceReference readerReference;
- private boolean called;
+ boolean called;
public ExtendedLogReaderServiceTest(String name) {
super(name);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleExceptionTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleExceptionTests.java
index 813ee71..491c534 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleExceptionTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleExceptionTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -84,7 +84,7 @@
}
// test uninstalling the system bundle
- public void testUninstallSystemBundle() throws BundleException {
+ public void testUninstallSystemBundle() {
Bundle systemBundle = OSGiTestsActivator.getContext().getBundle(0);
assertNotNull("System Bundle is null!!", systemBundle); //$NON-NLS-1$
try {
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java
index e71ac9a..57d1bd8 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ClassLoadingBundleTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2014 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1192,7 +1192,7 @@
Bundle test2 = installer.installBundle("test2"); //$NON-NLS-1$
assertTrue("Could not resolve test2 bundle", installer.resolveBundles(new Bundle[] {test2}));
- BundleWiring test2Wiring = (BundleWiring) test2.adapt(BundleWiring.class);
+ BundleWiring test2Wiring = test2.adapt(BundleWiring.class);
Collection resources = test2Wiring.listResources("/", "*", 0);
assertTrue("could not find resource", resources.contains("resource2"));
resources = test2Wiring.listResources("data/", "resource2", 0);
@@ -1306,14 +1306,14 @@
ExportedPackage[] hostExports = packageAdmin.getExportedPackages(host);
assertEquals("Number host exports", 4, hostExports == null ? 0 : hostExports.length); //$NON-NLS-1$
- BundleWiring hostWiring = (BundleWiring) host.adapt(BundleWiring.class);
+ BundleWiring hostWiring = host.adapt(BundleWiring.class);
assertNotNull("No host wiring", hostWiring);
List packageCapabilities = hostWiring.getCapabilities(PackageNamespace.PACKAGE_NAMESPACE);
assertEquals("Number host export capabilities", 4, packageCapabilities.size()); //$NON-NLS-1$
assertEquals("Check export name", "host.multiple.exports", ((BundleCapability) packageCapabilities.get(0)).getAttributes().get(PackageNamespace.PACKAGE_NAMESPACE)); //$NON-NLS-1$//$NON-NLS-2$
- assertEquals("Check include directive", "Public*", (String) ((BundleCapability) packageCapabilities.get(0)).getDirectives().get(PackageNamespace.CAPABILITY_INCLUDE_DIRECTIVE)); //$NON-NLS-1$//$NON-NLS-2$
+ assertEquals("Check include directive", "Public*", ((BundleCapability) packageCapabilities.get(0)).getDirectives().get(PackageNamespace.CAPABILITY_INCLUDE_DIRECTIVE)); //$NON-NLS-1$//$NON-NLS-2$
assertEquals("Check export name", "host.multiple.exports.onlyone", ((BundleCapability) packageCapabilities.get(1)).getAttributes().get(PackageNamespace.PACKAGE_NAMESPACE)); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/NativeCodeBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/NativeCodeBundleTests.java
index 00dea03..345c1ad 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/NativeCodeBundleTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/NativeCodeBundleTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -148,7 +148,7 @@
private void setNativeAttribute(String key, String value) {
Bundle systemBundle = OSGiTestsActivator.getContext().getBundle(0);
ModuleRevision systemRevision = (ModuleRevision) systemBundle.adapt(BundleRevision.class);
- ModuleCapability nativeCapability = (ModuleCapability) systemRevision.getModuleCapabilities(NativeNamespace.NATIVE_NAMESPACE).get(0);
+ ModuleCapability nativeCapability = systemRevision.getModuleCapabilities(NativeNamespace.NATIVE_NAMESPACE).get(0);
Map attrs = new HashMap(nativeCapability.getAttributes());
attrs.put(key, value);
nativeCapability.setTransientAttrs(attrs);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
index bc01731..c70590f 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
@@ -1290,7 +1290,7 @@
Bundle geturlBundle = systemContext1.installBundle(installer.getBundleLocation("geturl"));
geturlBundle.start();
- PrivilegedAction geturlAction = (PrivilegedAction) systemContext1.getService(systemContext1.getServiceReference(PrivilegedAction.class));
+ PrivilegedAction geturlAction = systemContext1.getService(systemContext1.getServiceReference(PrivilegedAction.class));
try {
geturlAction.run();
} catch (Exception e) {
@@ -1718,8 +1718,8 @@
test1 = systemContext.getBundle(testID1);
test2 = systemContext.getBundle(testID2);
- BundleRevision rev1 = (BundleRevision) test1.adapt(BundleRevision.class);
- BundleRevision rev2 = (BundleRevision) test2.adapt(BundleRevision.class);
+ BundleRevision rev1 = test1.adapt(BundleRevision.class);
+ BundleRevision rev2 = test2.adapt(BundleRevision.class);
BundleWiring wiring1 = rev1.getWiring();
BundleWiring wiring2 = rev2.getWiring();
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java
index c10f930..5991c98 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/AbstractTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013 IBM Corporation and others.
+ * Copyright (c) 2013, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,13 +13,11 @@
import java.io.IOException;
import java.net.URL;
import java.util.*;
-import junit.framework.Assert;
import org.eclipse.osgi.container.*;
import org.eclipse.osgi.container.builders.OSGiManifestBuilderFactory;
import org.eclipse.osgi.tests.container.dummys.*;
import org.eclipse.osgi.util.ManifestElement;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.*;
import org.osgi.framework.*;
import org.osgi.framework.hooks.resolver.ResolverHook;
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java
index c1a834e..e28b304 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/container/TestModuleContainer.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013, 2014 IBM Corporation and others.
+ * Copyright (c) 2013, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1808,10 +1808,10 @@
Module c = installDummyModule("bug457118.c.MF", "c", container);
Module d = installDummyModule("bug457118.d.MF", "d", container);
- Module a2 = installDummyModule("bug457118.a2.MF", "a2", container);
- Module b2 = installDummyModule("bug457118.b2.MF", "b2", container);
- Module c2 = installDummyModule("bug457118.c2.MF", "c2", container);
- Module d2 = installDummyModule("bug457118.d2.MF", "d2", container);
+ installDummyModule("bug457118.a2.MF", "a2", container);
+ installDummyModule("bug457118.b2.MF", "b2", container);
+ installDummyModule("bug457118.c2.MF", "c2", container);
+ installDummyModule("bug457118.d2.MF", "d2", container);
container.resolve(null, true);
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FilterTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FilterTests.java
index f71d7bc..e2ca740 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FilterTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/filter/FilterTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
+ * Copyright (c) 2008, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -416,7 +416,7 @@
}
public String[] getPropertyKeys() {
- return (String[]) keys.clone();
+ return keys.clone();
}
public int compareTo(Object reference) {
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java
index c0f4822..b23bb5a 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -233,7 +233,7 @@
try {
assertEquals("1.0", "bundle02", installed.getSymbolicName()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("1.1", Bundle.INSTALLED, installed.getState()); //$NON-NLS-1$
- assertEquals("1.2", new Version("2.0"), new Version((String) installed.getHeaders().get(Constants.BUNDLE_VERSION))); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("1.2", new Version("2.0"), new Version(installed.getHeaders().get(Constants.BUNDLE_VERSION))); //$NON-NLS-1$ //$NON-NLS-2$
} finally {
// clean-up
installed.uninstall();
@@ -248,7 +248,7 @@
assertEquals("1.0", "bundle04", installed.getSymbolicName()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("1.1", Bundle.INSTALLED, installed.getState()); //$NON-NLS-1$
assertEquals("1.2", "1.3.7", installed.getHeaders().get(Constants.BUNDLE_VERSION)); //$NON-NLS-1$ //$NON-NLS-2$
- String symbolicNameString = (String) installed.getHeaders().get(Constants.BUNDLE_SYMBOLICNAME);
+ String symbolicNameString = installed.getHeaders().get(Constants.BUNDLE_SYMBOLICNAME);
assertNotNull("1.3", symbolicNameString); //$NON-NLS-1$
ManifestElement[] symbolicNameHeader = ManifestElement.parseHeader(Constants.BUNDLE_SYMBOLICNAME, symbolicNameString);
assertEquals("1.4", 1, symbolicNameHeader.length); //$NON-NLS-1$
@@ -268,7 +268,7 @@
assertEquals("1.0", "bundle05", installed.getSymbolicName()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("1.1", Bundle.INSTALLED, installed.getState()); //$NON-NLS-1$
assertEquals("1.2", "1.3.8", installed.getHeaders().get(Constants.BUNDLE_VERSION)); //$NON-NLS-1$ //$NON-NLS-2$
- String symbolicNameString = (String) installed.getHeaders().get(Constants.BUNDLE_SYMBOLICNAME);
+ String symbolicNameString = installed.getHeaders().get(Constants.BUNDLE_SYMBOLICNAME);
assertNotNull("1.3", symbolicNameString); //$NON-NLS-1$
ManifestElement[] symbolicNameHeader = ManifestElement.parseHeader(Constants.BUNDLE_SYMBOLICNAME, symbolicNameString);
assertEquals("1.4", 1, symbolicNameHeader.length); //$NON-NLS-1$
@@ -288,7 +288,7 @@
assertEquals("1.0", "bundle06", installed.getSymbolicName()); //$NON-NLS-1$ //$NON-NLS-2$
assertEquals("1.1", Bundle.INSTALLED, installed.getState()); //$NON-NLS-1$
assertEquals("1.2", "1.3.9", installed.getHeaders().get(Constants.BUNDLE_VERSION)); //$NON-NLS-1$ //$NON-NLS-2$
- String symbolicNameString = (String) installed.getHeaders().get(Constants.BUNDLE_SYMBOLICNAME);
+ String symbolicNameString = installed.getHeaders().get(Constants.BUNDLE_SYMBOLICNAME);
assertNotNull("1.3", symbolicNameString); //$NON-NLS-1$
ManifestElement[] symbolicNameHeader = ManifestElement.parseHeader(Constants.BUNDLE_SYMBOLICNAME, symbolicNameString);
assertEquals("1.4", 1, symbolicNameHeader.length); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java
index e365700..1d0f64f 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/listeners/ExceptionHandlerTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,10 +12,10 @@
import java.io.IOException;
import java.net.MalformedURLException;
-import junit.framework.Assert;
import junit.framework.TestCase;
import org.eclipse.core.tests.harness.BundleTestingHelper;
import org.eclipse.osgi.tests.OSGiTestsActivator;
+import org.junit.Assert;
import org.osgi.framework.*;
public class ExceptionHandlerTests extends TestCase {
@@ -48,7 +48,7 @@
event = null;
return tmp;
}
- };
+ }
protected void setUp() throws Exception {
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java
index 48c243f..35ffeac 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/perf/StatePerformanceTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2010 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -27,7 +27,7 @@
super(name);
}
- private State storeAndRetrieve(State toStore) throws IOException {
+ State storeAndRetrieve(State toStore) throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
toStore.getFactory().writeState(toStore, baos);
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
@@ -54,19 +54,19 @@
runner.run(this, localName, 10, repetitions);
}
- public void testResolution100() throws IOException {
+ public void testResolution100() {
testResolution(100, 500, null, AllTests.DEGRADATION_RESOLUTION);
}
- public void testResolution1000() throws IOException {
+ public void testResolution1000() {
testResolution(1000, 15, "State Resolution", null);
}
- public void testResolution500() throws IOException {
+ public void testResolution500() {
testResolution(500, 50, null, AllTests.DEGRADATION_RESOLUTION);
}
- public void testResolution5000() throws IOException {
+ public void testResolution5000() {
testResolution(5000, 1, null, AllTests.DEGRADATION_RESOLUTION);
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java
index 17b7857..d888187 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/BasicTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 IBM Corporation and others.
+ * Copyright (c) 2012, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,7 +12,9 @@
import java.util.*;
import java.util.Map.Entry;
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.junit.Assert;
import org.osgi.framework.Bundle;
import org.osgi.framework.Version;
import org.osgi.framework.namespace.IdentityNamespace;
@@ -77,7 +79,7 @@
public void testRequirementMatches() throws Exception {
Bundle tb5 = installer.installBundle("resource.tb5");
- Resource requirer = (BundleRevision) tb5.adapt(BundleRevision.class);
+ Resource requirer = tb5.adapt(BundleRevision.class);
Capability capability1 = createCapability1();
List requirements = requirer.getRequirements(capability1.getNamespace());
assertRequirements(requirements, 3);
@@ -150,7 +152,7 @@
*/
private void assertTb1() {
// Get the revision for TB1.
- BundleRevision revision = (BundleRevision) tb1.adapt(BundleRevision.class);
+ BundleRevision revision = tb1.adapt(BundleRevision.class);
// Make sure TB1's symbolic name and version match the manifest.
String symbolicName = revision.getSymbolicName();
assertSymbolicName("resource.tb1", symbolicName);
@@ -173,7 +175,7 @@
capability = getIdentityCapability(resource);
assertIdentityCapability(capability, symbolicName, version, type, arbitraryAttrs, arbitraryDirs);
// Check TB1's osgi.identity capability from the wiring.
- BundleWiring wiring = (BundleWiring) tb1.adapt(BundleWiring.class);
+ BundleWiring wiring = tb1.adapt(BundleWiring.class);
capability = getIdentityCapability(wiring);
assertIdentityCapability(capability, symbolicName, version, type, arbitraryAttrs, arbitraryDirs);
// There should be 1 provided osgi.identity wire (TB1 -> TB3).
@@ -181,7 +183,7 @@
assertWires(wires, 1);
// Check the osgi.identity wire between TB1 and TB3.
Wire wire = (Wire) wires.get(0);
- BundleRevision requirer = (BundleRevision) tb3.adapt(BundleRevision.class);
+ BundleRevision requirer = tb3.adapt(BundleRevision.class);
Requirement requirement = getIdentityRequirement(requirer, 1);
assertIdentityWire(wire, capability, revision, requirement, requirer);
// There should be 1 required osgi.identity wire (TB4 -> TB1 via TF1).
@@ -189,9 +191,9 @@
assertWires(wires, 1);
// Check the osgi.identity wire between TB4 and TB1 (via TF1).
wire = (Wire) wires.get(0);
- BundleRevision provider = (BundleRevision) tb4.adapt(BundleRevision.class);
+ BundleRevision provider = tb4.adapt(BundleRevision.class);
capability = getIdentityCapability(provider);
- requirement = getIdentityRequirement((BundleRevision) tf1.adapt(BundleRevision.class), 0);
+ requirement = getIdentityRequirement(tf1.adapt(BundleRevision.class), 0);
assertIdentityWire(wire, capability, provider, requirement, revision);
}
@@ -205,7 +207,7 @@
* None
*/
private void assertTb2() {
- final BundleRevision revision = (BundleRevision) tb2.adapt(BundleRevision.class);
+ final BundleRevision revision = tb2.adapt(BundleRevision.class);
assertNotIdentityCapability(new CapabilityProvider() {
public List getCapabilities(String namespace) {
return revision.getDeclaredCapabilities(namespace);
@@ -217,7 +219,7 @@
return resource.getCapabilities(namespace);
}
});
- final BundleWiring wiring = (BundleWiring) tb2.adapt(BundleWiring.class);
+ final BundleWiring wiring = tb2.adapt(BundleWiring.class);
assertNotIdentityCapability(new CapabilityProvider() {
public List getCapabilities(String namespace) {
return wiring.getCapabilities(namespace);
@@ -239,7 +241,7 @@
*/
private void assertTb3() {
// Get the revision for TB3.
- BundleRevision revision = (BundleRevision) tb3.adapt(BundleRevision.class);
+ BundleRevision revision = tb3.adapt(BundleRevision.class);
// Make sure TB3's symbolic name and version match the manifest.
String symbolicName = revision.getSymbolicName();
assertSymbolicName("resource.tb3", symbolicName);
@@ -256,7 +258,7 @@
capability = getIdentityCapability(resource);
assertIdentityCapability(capability, symbolicName, version, type, Collections.EMPTY_MAP, Collections.EMPTY_MAP);
// Check TB3's osgi.identity capability from the wiring.
- BundleWiring wiring = (BundleWiring) tb3.adapt(BundleWiring.class);
+ BundleWiring wiring = tb3.adapt(BundleWiring.class);
capability = getIdentityCapability(wiring);
assertIdentityCapability(capability, symbolicName, version, type, Collections.EMPTY_MAP, Collections.EMPTY_MAP);
// There should be 2 required osgi.identity wires (TB1 -> TB3 and TF1 -> TB3).
@@ -265,13 +267,13 @@
// Check the osgi.identity wire between TB1 and TB3.
Wire wire = (Wire) wires.get(1);
Requirement requirement = getIdentityRequirement(revision, 1);
- BundleRevision provider = (BundleRevision) tb1.adapt(BundleRevision.class);
+ BundleRevision provider = tb1.adapt(BundleRevision.class);
capability = getIdentityCapability(provider);
assertIdentityWire(wire, capability, provider, requirement, revision);
// Check the osgi.identity wire between TF1 and TB3.
wire = (Wire) wires.get(0);
requirement = getIdentityRequirement(revision, 0);
- provider = (BundleRevision) tf1.adapt(BundleRevision.class);
+ provider = tf1.adapt(BundleRevision.class);
capability = getIdentityCapability(provider);
assertIdentityWire(wire, capability, provider, requirement, revision);
}
@@ -288,7 +290,7 @@
*/
private void assertTb4() {
// Get the revision for TB4.
- BundleRevision revision = (BundleRevision) tb4.adapt(BundleRevision.class);
+ BundleRevision revision = tb4.adapt(BundleRevision.class);
// Make sure TB4's symbolic name and version match the manifest.
String symbolicName = revision.getSymbolicName();
assertSymbolicName("resource.tb4", symbolicName);
@@ -304,7 +306,7 @@
// Check TB4's osgi.identity capability from the resource.
capability = getIdentityCapability(resource);
assertIdentityCapability(capability, symbolicName, version, type, Collections.EMPTY_MAP, Collections.EMPTY_MAP);
- BundleWiring wiring = (BundleWiring) tb4.adapt(BundleWiring.class);
+ BundleWiring wiring = tb4.adapt(BundleWiring.class);
// Check TB4's osgi.identity capability from the wiring.
capability = getIdentityCapability(wiring);
assertIdentityCapability(capability, symbolicName, version, type, Collections.EMPTY_MAP, Collections.EMPTY_MAP);
@@ -314,9 +316,9 @@
// Check the osgi.identity wire between TB4 and TB1 (via TF1).
Wire wire = (Wire) wires.get(0);
// The requirer will be TB1's revision since fragment requirements are merged into the host...
- BundleRevision requirer = (BundleRevision) tb1.adapt(BundleRevision.class);
+ BundleRevision requirer = tb1.adapt(BundleRevision.class);
// ...but the requirement will come from the fragment.
- Requirement requirement = getIdentityRequirement((BundleRevision) tf1.adapt(BundleRevision.class), 0);
+ Requirement requirement = getIdentityRequirement(tf1.adapt(BundleRevision.class), 0);
assertIdentityWire(wire, capability, revision, requirement, requirer);
}
@@ -333,7 +335,7 @@
*/
private void assertTf1() {
// Get the revision for TF1.
- BundleRevision revision = (BundleRevision) tf1.adapt(BundleRevision.class);
+ BundleRevision revision = tf1.adapt(BundleRevision.class);
// Make sure TF1's symbolic name and version match the manifest.
String symbolicName = revision.getSymbolicName();
assertSymbolicName("resource.tf1", symbolicName);
@@ -350,7 +352,7 @@
capability = getIdentityCapability(resource);
assertIdentityCapability(capability, symbolicName, version, type, Collections.EMPTY_MAP, Collections.EMPTY_MAP);
// Check TF1's osgi.identity capability from the wiring.
- BundleWiring wiring = (BundleWiring) tf1.adapt(BundleWiring.class);
+ BundleWiring wiring = tf1.adapt(BundleWiring.class);
capability = getIdentityCapability(wiring);
assertIdentityCapability(capability, symbolicName, version, type, Collections.EMPTY_MAP, Collections.EMPTY_MAP);
// There should be 1 provided osgi.identity wire (TF1 -> TB3).
@@ -358,7 +360,7 @@
assertWires(wires, 1);
// Check the osgi.identity wire between TF1 and TB3.
Wire wire = (Wire) wires.get(0);
- BundleRevision requirer = (BundleRevision) tb3.adapt(BundleRevision.class);
+ BundleRevision requirer = tb3.adapt(BundleRevision.class);
Requirement requirement = getIdentityRequirement(requirer, 0);
assertIdentityWire(wire, capability, revision, requirement, requirer);
}
@@ -374,7 +376,7 @@
*/
private void assertTf2() {
// Get the revision for TF2.
- BundleRevision revision = (BundleRevision) tf2.adapt(BundleRevision.class);
+ BundleRevision revision = tf2.adapt(BundleRevision.class);
// Make sure TF1's symbolic name and version match the manifest.
String symbolicName = revision.getSymbolicName();
assertSymbolicName("resource.tf2", symbolicName);
@@ -391,7 +393,7 @@
capability = getIdentityCapability(resource);
assertIdentityCapability(capability, symbolicName, version, type, Collections.EMPTY_MAP, Collections.EMPTY_MAP);
// Check TF1's osgi.identity capability from the wiring.
- BundleWiring wiring = (BundleWiring) tf2.adapt(BundleWiring.class);
+ BundleWiring wiring = tf2.adapt(BundleWiring.class);
capability = getIdentityCapability(wiring);
assertIdentityCapability(capability, symbolicName, version, type, Collections.EMPTY_MAP, Collections.EMPTY_MAP);
// There should be 0 provided osgi.identity wire (TF1 -> TB3).
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java
index c4cbaf9..45fb434 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/resource/ResolverHookTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 IBM Corporation and others.
+ * Copyright (c) 2011, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -76,7 +76,7 @@
try {
Bundle tb1v1 = installer.installBundle("singleton.tb1v1");
Bundle tb1v2 = installer.installBundle("singleton.tb1v2");
- assertFalse(((FrameworkWiring) getContext().getBundle(0).adapt(FrameworkWiring.class)).resolveBundles(Arrays.asList(new Bundle[] {tb1v1, tb1v2})));
+ assertFalse(getContext().getBundle(0).adapt(FrameworkWiring.class).resolveBundles(Arrays.asList(new Bundle[] {tb1v1, tb1v2})));
assertTrue("ResolverHook was not called", called[0]);
if (error[0] != null)
throw error[0];
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java
index 4cf644f..b3729c3 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/NewResolverTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,7 +12,8 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.osgi.service.resolver.*;
+import org.eclipse.osgi.service.resolver.BundleDescription;
+import org.eclipse.osgi.service.resolver.State;
import org.osgi.framework.BundleException;
public class NewResolverTest extends AbstractStateTest {
@@ -24,8 +25,8 @@
public static Test suite() {
return new TestSuite(NewResolverTest.class);
}
-
- public void testSkeleton() throws BundleException {
+
+ public void testSkeleton() {
State state = buildEmptyState();
state.resolve();
}
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java
index 18d5fba..3aaa4ec 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/StateResolverTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2014 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -3202,7 +3202,7 @@
assertFalse("3.2", bCache.isResolved()); //$NON-NLS-1$
}
- public void testPlatformPropertiesBug207500b() throws BundleException, IOException {
+ public void testPlatformPropertiesBug207500b() throws BundleException {
State state = buildEmptyState();
int bundleID = 0;
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
index 1380974..45e4dee 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/SystemBundleActivator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2014 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -212,7 +212,6 @@
register(context, serviceClass.getName(), service, setRanking, properties);
}
- @SuppressWarnings("unchecked")
private void register(BundleContext context, String serviceClass, Object service, boolean setRanking, Dictionary<String, Object> properties) {
if (properties == null)
properties = new Hashtable<String, Object>(7);
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java
index dae7246..d6ddef5 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathEntry.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2013 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -45,6 +45,7 @@
private KeyedHashSet userObjects = null;
// TODO Note that PDE has internal dependency on this field type/name (bug 267238)
+ @SuppressWarnings("unused")
private final PDEData data;
/**
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java
index 8bb2acc..3d475e2 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/classpath/ClasspathManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2014 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -29,7 +29,8 @@
import org.eclipse.osgi.internal.messages.Msg;
import org.eclipse.osgi.internal.weaving.WeavingHookConfigurator;
import org.eclipse.osgi.storage.BundleInfo.Generation;
-import org.eclipse.osgi.storage.*;
+import org.eclipse.osgi.storage.NativeCodeFinder;
+import org.eclipse.osgi.storage.Storage;
import org.eclipse.osgi.storage.bundlefile.BundleEntry;
import org.eclipse.osgi.storage.bundlefile.BundleFile;
import org.eclipse.osgi.util.NLS;
@@ -49,7 +50,6 @@
public class ClasspathManager {
private static final FragmentClasspath[] emptyFragments = new FragmentClasspath[0];
private static final String[] DEFAULT_CLASSPATH = new String[] {"."}; //$NON-NLS-1$
- private final static Class<?>[] NULL_CLASS_RESULT = new Class[2];
@SuppressWarnings("unchecked")
private static final Enumeration<URL> EMPTY_ENUMERATION = Collections.enumeration(Collections.EMPTY_LIST);
@@ -557,7 +557,7 @@
private Class<?> findClassImpl(String name, ClasspathEntry classpathEntry, List<ClassLoaderHook> hooks) {
if (debug.DEBUG_LOADER)
- Debug.println("ModuleClassLoader[" + classloader.getBundleLoader() + " - " + classpathEntry.getBundleFile() + "].findClassImpl(" + name + ")"); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
+ Debug.println("ModuleClassLoader[" + classloader.getBundleLoader() + " - " + classpathEntry.getBundleFile() + "].findClassImpl(" + name + ")"); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$
String filename = name.replace('.', '/').concat(".class"); //$NON-NLS-1$
BundleEntry entry = classpathEntry.getBundleFile().getEntry(filename);
if (entry == null)
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java
index c9256a0..b0969bc 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/location/BasicLocation.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2014 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -74,7 +74,7 @@
EquinoxLogServices logServices = environmentInfo.getHookRegistry().getContainer().getLogServices();
// Note that logServices can be null if we are very early in the startup.
if (logServices != null) {
- logServices.log(EquinoxContainer.NAME, FrameworkLogEntry.INFO, "Called Location.getURL() when it has not been set for: \"" + property + "\"", new RuntimeException("Call stack for Location.getURL()")); //$NON-NLS-1$//$NON-NLS-2$
+ logServices.log(EquinoxContainer.NAME, FrameworkLogEntry.INFO, "Called Location.getURL() when it has not been set for: \"" + property + "\"", new RuntimeException("Call stack for Location.getURL()")); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
}
}
setURL(defaultValue, false);
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java
index 2d01cb1..446b1ca 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/signedcontent/SignatureBlockProcessor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2014 IBM Corporation and others. All rights reserved.
+ * Copyright (c) 2007, 2015 IBM Corporation and others. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -163,7 +163,7 @@
}
}
- private void populateMDResults(byte mfBuf[], SignerInfo signerInfo) throws NoSuchAlgorithmException {
+ private void populateMDResults(byte mfBuf[], SignerInfo signerInfo) {
// need to make a string from the MF file data bytes
String mfStr = new String(mfBuf, SignedContentConstants.UTF8);
@@ -262,7 +262,7 @@
return resultsList;
}
- private static String getDigestAlgorithmFromString(String digestLines) throws NoSuchAlgorithmException {
+ private static String getDigestAlgorithmFromString(String digestLines) {
if (digestLines != null) {
// String sDigestLine = digestLines[i];
int indexDigest = digestLines.indexOf(MF_DIGEST_PART);
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java
index 2ac2574..fb723ff 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/storage/Storage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012, 2014 IBM Corporation and others.
+ * Copyright (c) 2012, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -25,7 +25,8 @@
import org.eclipse.osgi.internal.container.LockSet;
import org.eclipse.osgi.internal.debug.Debug;
import org.eclipse.osgi.internal.framework.*;
-import org.eclipse.osgi.internal.hookregistry.*;
+import org.eclipse.osgi.internal.hookregistry.BundleFileWrapperFactoryHook;
+import org.eclipse.osgi.internal.hookregistry.StorageHookFactory;
import org.eclipse.osgi.internal.hookregistry.StorageHookFactory.StorageHook;
import org.eclipse.osgi.internal.location.EquinoxLocations;
import org.eclipse.osgi.internal.location.LocationHelper;
@@ -92,7 +93,7 @@
return storage;
}
- private Storage(EquinoxContainer container) throws IOException, BundleException {
+ private Storage(EquinoxContainer container) throws IOException {
mruList = new MRUBundleFileList(getBundleFileLimit(container.getConfiguration()));
equinoxContainer = container;
extensionInstaller = new FrameworkExtensionInstaller(container.getConfiguration());
