Bug 460627 - Fix compiler problems from generified IAdaptable#getAdapter

Generify where needed and bump the min version requirement for
o.e.core.runtime and o.e.equinox.common to ensure that generified
dependency will be used.

Change-Id: I3e177a3c8384b5aaabe4c77c949e9802e53923b1
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

2 files changed, 4 insertions, 6 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.importexport/META-INF/MANIFEST.MF
index 9a1bd9024..2c75f37ef 100755
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.ui.importexport;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+ org.eclipse.core.runtime;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.equinox.p2.ui,
  org.eclipse.equinox.p2.extensionlocation,
  org.eclipse.equinox.p2.metadata;bundle-version="2.1.0",
diff --git a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/IUDetail.java b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/IUDetail.java
index d53653568..8c1a17377 100644
--- a/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/IUDetail.java
+++ b/bundles/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/IUDetail.java
@@ -33,12 +33,10 @@ public class IUDetail implements IAdaptable {
 		return referredRepo;
 	}
 
-	// don't suppress this warning as it will cause build-time warning
-	// see bug 423628. This should be possible to fix once
-	// the entire hierarchy starts using generics
-	public Object getAdapter(Class adapter) {
+	@SuppressWarnings("unchecked")
+	public <T> T getAdapter(Class<T> adapter) {
 		if (IInstallableUnit.class.equals(adapter))
-			return iu;
+			return (T) iu;
 		return null;
 	}