Fixes for warnings
Change-Id: Ide0e57b0a6bafd705c302a3624fad27313a02e40
diff --git a/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters b/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters
deleted file mode 100644
index c27d724..0000000
--- a/framework/bundles/org.eclipse.ecf.identity/.settings/.api_filters
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.ecf.identity" version="2">
- <resource path="src_r7stubs/org/osgi/service/log/Logger.java" type="org.osgi.service.log.Logger">
- <filter comment="Logger only for backward compatibility. No @since needed" id="1110441988">
- <message_arguments>
- <message_argument value="org.osgi.service.log.Logger"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
index baad81a..d4eb482 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
@@ -23,8 +23,7 @@
*
*/
public class IDFactory implements IIDFactory {
- public static final String SECURITY_PROPERTY = IDFactory.class.getName()
- + ".security"; //$NON-NLS-1$
+ public static final String SECURITY_PROPERTY = IDFactory.class.getName() + ".security"; //$NON-NLS-1$
private static Hashtable<String, Namespace> namespaces = new Hashtable<String, Namespace>();
@@ -77,8 +76,7 @@
return (Namespace) namespaces.put(namespace.getName(), namespace);
}
- protected final static void checkPermission(
- NamespacePermission namespacepermission) throws SecurityException {
+ protected final static void checkPermission(NamespacePermission namespacepermission) throws SecurityException {
}
/*
@@ -88,8 +86,7 @@
* org.eclipse.ecf.core.identity.IIDFactory#containsNamespace(org.eclipse
* .ecf.core.identity.Namespace)
*/
- public boolean containsNamespace(Namespace namespace)
- throws SecurityException {
+ public boolean containsNamespace(Namespace namespace) throws SecurityException {
if (namespace == null)
return false;
initialize();
@@ -165,12 +162,10 @@
* @see org.eclipse.ecf.core.identity.IIDFactory#createGUID(int)
*/
public ID createGUID(int length) throws IDCreateException {
- return createID(new GUID.GUIDNamespace(), new Integer[] { Integer.valueOf(
- length) });
+ return createID(new GUID.GUIDNamespace(), new Integer[] { Integer.valueOf(length) });
}
- protected static void logAndThrow(String s, Throwable t)
- throws IDCreateException {
+ protected static void logAndThrow(String s, Throwable t) throws IDCreateException {
IDCreateException e = null;
if (t != null) {
e = new IDCreateException(s + ": " + t.getClass().getName() + ": " //$NON-NLS-1$ //$NON-NLS-2$
@@ -178,9 +173,7 @@
} else {
e = new IDCreateException(s);
}
- Activator.getDefault().log(
- new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR,
- s, e));
+ Activator.getDefault().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, s, e));
throw e;
}
@@ -210,17 +203,14 @@
* @see org.eclipse.ecf.core.identity.IIDFactory#createID(java.lang.String,
* java.lang.Object[])
*/
- public ID createID(String namespaceName, Object[] args)
- throws IDCreateException {
+ public ID createID(String namespaceName, Object[] args) throws IDCreateException {
Namespace n = getNamespaceByName(namespaceName);
if (n == null)
- throw new IDCreateException(
- "Namespace " + namespaceName + " not found"); //$NON-NLS-1$
+ throw new IDCreateException("Namespace " + namespaceName + " not found"); //$NON-NLS-1$
return createID(n, args);
}
- public ID createID(Namespace namespace, String uri)
- throws IDCreateException {
+ public ID createID(Namespace namespace, String uri) throws IDCreateException {
return createID(namespace, new Object[] { uri });
}
@@ -237,8 +227,7 @@
public ID createStringID(String idstring) throws IDCreateException {
if (idstring == null)
throw new IDCreateException("StringID cannot be null"); //$NON-NLS-1$
- return createID(new StringID.StringIDNamespace(),
- new String[] { idstring });
+ return createID(new StringID.StringIDNamespace(), new String[] { idstring });
}
/*
@@ -247,7 +236,7 @@
* @see org.eclipse.ecf.core.identity.IIDFactory#createLongID(long)
*/
public ID createLongID(long l) throws IDCreateException {
- return createID(new LongID.LongNamespace(), new Long[] { new Long(l) });
+ return createID(new LongID.LongNamespace(), new Long[] { Long.valueOf(l) });
}
/*
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java
index 6a875ac..08c078a 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/LongID.java
@@ -28,11 +28,9 @@
}
/**
- * @param args
- * must not be <code>null></code>
+ * @param args must not be <code>null></code>
* @return ID created. Will not be <code>null</code>.
- * @throws IDCreateException
- * never thrown
+ * @throws IDCreateException never thrown
*/
public ID createInstance(Object[] args) throws IDCreateException {
try {
@@ -74,7 +72,7 @@
protected LongID(Namespace n, long v) {
super(n);
- value = new Long(v);
+ value = Long.valueOf(v);
}
protected int namespaceCompareTo(BaseID o) {
diff --git a/framework/bundles/org.eclipse.ecf/.project b/framework/bundles/org.eclipse.ecf/.project
index 9c23f0c..d4d083a 100644
--- a/framework/bundles/org.eclipse.ecf/.project
+++ b/framework/bundles/org.eclipse.ecf/.project
@@ -29,7 +29,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.composent.client.collabnature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java
index c11ff2e..553d7b6 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/util/ClassResolverObjectInputStream.java
@@ -83,16 +83,6 @@
return this.bundleContext;
}
- private IClassResolver getClassResolver() {
- IClassResolver result = null;
- if (this.classResolverST != null) {
- this.classResolverST.open();
- result = this.classResolverST.getService();
- this.classResolverST.close();
- }
- return result;
- }
-
@SuppressWarnings("unused")
@Override
protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException {
