Fix some warnings

ctrueden · ctrueden · commit f14580f2f42b · 2013-10-22T10:45:11.000-05:00
diff --git a/src/main/java/org/scijava/object/ObjectIndex.java b/src/main/java/org/scijava/object/ObjectIndex.java
@@ -258,7 +258,9 @@ protected Class<?> getType(final E o) {
 	/** Removes the object from all compatible type lists. */
 	protected boolean remove(final Object o, final boolean batch) {
 		if (!getBaseClass().isAssignableFrom(o.getClass())) return false;
-		return remove(o, getType((E)o), batch);
+		@SuppressWarnings("unchecked")
+		final E e = (E) o;
+		return remove(o, getType(e), batch);
 	}
 
 	private Map<Class<?>, List<E>[]> type2Lists = new HashMap<Class<?>, List<E>[]>();
diff --git a/src/main/java/org/scijava/object/SortedObjectIndex.java b/src/main/java/org/scijava/object/SortedObjectIndex.java
@@ -97,14 +97,13 @@ public boolean addAll(final Collection<? extends E> c) {
 		return changed;
 	}
 
-	@SuppressWarnings("unchecked")
 	private void mergeAfterSorting(final Collection<? extends E> c) {
 		final List<E> listToMerge = new ArrayList<E>(c);
 		Collections.sort(listToMerge);
 		final Map<Class<?>, List<E>> map = new HashMap<Class<?>, List<E>>();
 		for (final E e : listToMerge) {
 			for (final Class<?> clazz : getTypes(getType(e))) {
-				final List<E> list = (List<E>)retrieveList(clazz);
+				final List<E> list = retrieveList(clazz);
 				List<E> list2 = map.get(clazz);
 				if (list2 == null) {
 					list2 = list.size() == 0 ? (List<E>)list : new ArrayList<E>();
diff --git a/src/main/java/org/scijava/util/FileUtils.java b/src/main/java/org/scijava/util/FileUtils.java
@@ -147,6 +147,7 @@ public static String stripFilenameVersion(final String filename) {
 	 * @return the {@link Matcher} object
 	 * @deprecated see {@link #stripFilenameVersion(String)}
 	 */
+	@Deprecated
 	public static Matcher matchVersionedFilename(String filename) {
 		return versionPattern.matcher(filename);
 	}
diff --git a/src/main/java/org/scijava/util/NumberUtils.java b/src/main/java/org/scijava/util/NumberUtils.java
@@ -53,8 +53,8 @@ private NumberUtils() {
 	 * null if the types are incompatible.
 	 */
 	public static Number toNumber(final Object value, final Class<?> type) {
-		final Object num = ClassUtils.convert(value, type);
-		return num == null ? null : ClassUtils.cast(num, Number.class);
+		final Object num = ConversionUtils.convert(value, type);
+		return num == null ? null : ConversionUtils.cast(num, Number.class);
 	}
 
 	public static Number getMinimumNumber(final Class<?> type) {
diff --git a/src/main/java/org/scijava/util/ObjectArray.java b/src/main/java/org/scijava/util/ObjectArray.java
@@ -187,7 +187,7 @@ public boolean contains(final Object o) {
 	@Override
 	public boolean remove(final Object o) {
 		if (!compatibleClass(o)) return false;
-		final E value = ClassUtils.cast(o, objectClass);
+		final E value = ConversionUtils.cast(o, objectClass);
 		return removeValue(value);
 	}
 
@@ -219,7 +219,7 @@ public boolean removeAll(final Collection<?> c) {
 		boolean changed = false;
 		for (final Object o : c) {
 			if (!compatibleClass(o)) continue;
-			final E value = ClassUtils.cast(o, objectClass);
+			final E value = ConversionUtils.cast(o, objectClass);
 			final boolean result = removeValue(value);
 			if (result) changed = true;
 		}
diff --git a/src/test/java/org/scijava/ContextCreationTest.java b/src/test/java/org/scijava/ContextCreationTest.java
@@ -377,20 +377,24 @@ public static abstract class AbstractBase extends AbstractService implements
 		BaseService
 	{ 
 		// NB: No implementation needed.
-	};
+	}
 
 	/** Abstract implementation of {@link ExtensionService}. */
 	public static abstract class AbstractExtension extends AbstractService
 		implements ExtensionService
 	{ 
 		// NB: No implementation needed.
-	};
+	}
 
 	/** Empty {@link BaseService} implementation. */
-	public static class BaseImpl extends AbstractBase { };
+	public static class BaseImpl extends AbstractBase {
+		// NB: No implementation needed.
+	}
 
 	/** Empty {@link ExtensionService} implementation. */
-	public static class ExtensionImpl extends AbstractExtension { };
+	public static class ExtensionImpl extends AbstractExtension {
+		// NB: No implementation needed.
+	}
 
 	/** A service that is doomed to fail, for depending on a missing service. */
 	public static class ServiceRequiringMissingService extends AbstractService {

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ public static String stripFilenameVersion(final String filename) {`
`147`	`147`	`* @return the {@link Matcher} object`
`148`	`148`	`* @deprecated see {@link #stripFilenameVersion(String)}`
`149`	`149`	`*/`
	`150`	`+ @Deprecated`
`150`	`151`	`public static Matcher matchVersionedFilename(String filename) {`
`151`	`152`	`return versionPattern.matcher(filename);`
`152`	`153`	`}`