Bug 418661 - [Metadata] Get rid of compile warnings in official build

Fixes in org.eclipse.e4.ui.bindings

2 files changed, 12 insertions, 17 deletions

diff --git a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTable.java b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTable.java
index 0ba670a5faa..032cca6a30f 100644
--- a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTable.java
+++ b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingTable.java
@@ -326,6 +326,7 @@ public class BindingTable {
 		return null;
 	}
 
+	@SuppressWarnings("unchecked")
 	public Collection<Binding> getSequencesFor(ParameterizedCommand command) {
 		ArrayList<Binding> triggers = bindingsByCommand.get(command);
 		return (Collection<Binding>) (triggers == null ? Collections.EMPTY_LIST : triggers.clone());
diff --git a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/Util.java b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/Util.java
index 3527e60d239..7cdb56209ac 100644
--- a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/Util.java
+++ b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/Util.java
@@ -10,12 +10,9 @@
  *******************************************************************************/
 package org.eclipse.e4.ui.bindings.internal;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-import java.util.SortedSet;
-import java.util.TreeSet;
 import org.eclipse.swt.SWT;
 
 /**
@@ -28,13 +25,6 @@ import org.eclipse.swt.SWT;
 public final class Util {
 
 	/**
-	 * An unmodifiable, empty, sorted set. This value is guaranteed to never change and never be
-	 * <code>null</code>.
-	 */
-	public static final SortedSet EMPTY_SORTED_SET = Collections
-			.unmodifiableSortedSet(new TreeSet());
-
-	/**
 	 * A common zero-length string. It avoids needing write <code>NON-NLS</code> next to code
 	 * fragments. It's also a bit clearer to read.
 	 */
@@ -48,7 +38,7 @@ public final class Util {
 	 * @param c
 	 *            The class which the object should be; must not be <code>null</code>.
 	 */
-	public static final void assertInstance(final Object object, final Class c) {
+	public static final void assertInstance(final Object object, final Class<?> c) {
 		assertInstance(object, c, false);
 	}
 
@@ -63,7 +53,7 @@ public final class Util {
 	 * @param allowNull
 	 *            Whether the object is allowed to be <code>null</code>.
 	 */
-	private static final void assertInstance(final Object object, final Class c,
+	private static final void assertInstance(final Object object, final Class<?> c,
 			final boolean allowNull) {
 		if (object == null && allowNull) {
 			return;
@@ -108,6 +98,8 @@ public final class Util {
 	/**
 	 * Compares to comparable objects -- defending against <code>null</code>.
 	 * 
+	 * @param <T>
+	 * 
 	 * @param left
 	 *            The left object to compare; may be <code>null</code>.
 	 * @param right
@@ -115,7 +107,8 @@ public final class Util {
 	 * @return The result of the comparison. <code>null</code> is considered to be the least
 	 *         possible value.
 	 */
-	public static final int compare(final Comparable left, final Comparable right) {
+	@SuppressWarnings("unchecked")
+	public static final <T> int compare(final Comparable<T> left, final Comparable<T> right) {
 		if (left == null && right == null) {
 			return 0;
 		} else if (left == null) {
@@ -123,7 +116,7 @@ public final class Util {
 		} else if (right == null) {
 			return 1;
 		} else {
-			return left.compareTo(right);
+			return left.compareTo((T) right);
 		}
 	}
 
@@ -137,7 +130,7 @@ public final class Util {
 	 * @return The result of the comparison. <code>null</code> is considered to be the least
 	 *         possible value. A shorter array is considered less than a longer array.
 	 */
-	public static final int compare(final Comparable[] left, final Comparable[] right) {
+	public static final <T> int compare(final Comparable<T>[] left, final Comparable<T>[] right) {
 		if (left == null && right == null) {
 			return 0;
 		} else if (left == null) {
@@ -177,7 +170,8 @@ public final class Util {
 	 * @return The result of the comparison. <code>null</code> is considered to be the least
 	 *         possible value. A shorter list is considered less than a longer list.
 	 */
-	public static final int compare(final List left, final List right) {
+	public static final <T> int compare(final List<Comparable<T>> left,
+			final List<Comparable<T>> right) {
 		if (left == null && right == null) {
 			return 0;
 		} else if (left == null) {
@@ -193,7 +187,7 @@ public final class Util {
 			}
 
 			for (int i = 0; i < l; i++) {
-				int compareTo = compare((Comparable) left.get(i), (Comparable) right.get(i));
+				int compareTo = compare(left.get(i), right.get(i));
 
 				if (compareTo != 0) {
 					return compareTo;