diff options
2 files changed, 8 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherInfo.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherInfo.java index 0e4c6b779..10a8c6689 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherInfo.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/PublisherInfo.java @@ -33,12 +33,14 @@ public class PublisherInfo implements IPublisherInfo { return adviceList; } + @SuppressWarnings("unchecked") public <T extends IPublisherAdvice> Collection<T> getAdvice(String configSpec, boolean includeDefault, String id, Version version, Class<T> type) { ArrayList<T> result = new ArrayList<T>(); for (Iterator<IPublisherAdvice> i = adviceList.iterator(); i.hasNext();) { IPublisherAdvice advice = i.next(); if (type.isInstance(advice) && advice.isApplicable(configSpec, includeDefault, id, version)) - result.add(type.cast(advice)); + // Ideally, we would use Class.cast here but it was introduced in Java 1.5 + result.add((T) advice); } return result; } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUI.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUI.java index 22c7a5ff9..d8417a094 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUI.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/ProvUI.java @@ -108,13 +108,16 @@ public class ProvUI { return queryContext; } + @SuppressWarnings("unchecked") public static <T> T getAdapter(Object object, Class<T> adapterType) { if (object == null) return null; if (adapterType.isInstance(object)) - return adapterType.cast(object); + // Ideally, we would use Class.cast here but it was introduced in Java 1.5 + return (T) object; if (object instanceof IAdaptable) - return adapterType.cast(((IAdaptable) object).getAdapter(adapterType)); + // Ideally, we would use Class.cast here but it was introduced in Java 1.5 + return (T) ((IAdaptable) object).getAdapter(adapterType); return null; } |