Bug 246820 - org.eclipse.swt.tools causes 242 warnings in latest I-build

4 files changed, 11 insertions, 7 deletions

diff --git a/bundles/org.eclipse.swt.tools/.classpath b/bundles/org.eclipse.swt.tools/.classpath
index a23e6d08aa..22ab26bdb9 100644
--- a/bundles/org.eclipse.swt.tools/.classpath
+++ b/bundles/org.eclipse.swt.tools/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="JNI Generation"/>
 	<classpathentry kind="src" path="Mac Generation"/>
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectClass.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectClass.java
index be9c6042a3..64321d1c16 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectClass.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectClass.java
@@ -86,16 +86,20 @@ public String getName() {
 
 public JNIClass getSuperclass() {
 	Class superclazz = clazz.getSuperclass();
-	String path = new File(sourcePath).getParent() + "/" + superclazz.getSimpleName() + ".java";
+	String path = new File(sourcePath).getParent() + "/" + getSimpleName(superclazz) + ".java";
 	return new ReflectClass(superclazz, metaData, path);
 }
 
-public String getSimpleName() {
-	String name = clazz.getName();
+String getSimpleName(Class type) {
+	String name = type.getName();
 	int index = name.lastIndexOf('.') + 1;
 	return name.substring(index, name.length());
 }
 
+public String getSimpleName() {
+	return getSimpleName(clazz);
+}
+
 public String getExclude() {
 	return (String)getParam("exclude");
 }
diff --git a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectMethod.java b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectMethod.java
index b8d18bcba0..2120a29d56 100644
--- a/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectMethod.java
+++ b/bundles/org.eclipse.swt.tools/JNI Generation/org/eclipse/swt/tools/internal/ReflectMethod.java
@@ -57,12 +57,12 @@ public ReflectMethod(ReflectClass declaringClass, Method method, String source,
 		for (int i = 0; i < methods.length && decl == null; i++) {
 			MethodDeclaration node = methods[i];
 			if (node.getName().getIdentifier().equals(name)) {
-				if (!returnType.getSimpleName().equals(node.getReturnType2().toString())) continue;
+				if (!declaringClass.getSimpleName(returnType).equals(node.getReturnType2().toString())) continue;
 				List parameters = node.parameters();
 				if (parameters.size() != paramTypes.length) continue;
 				decl = node;
 				for (int j = 0; j < paramTypes.length; j++) {
-					if (!paramTypes[j].getSimpleName().equals(((SingleVariableDeclaration)parameters.get(j)).getType().toString())) {
+					if (!declaringClass.getSimpleName(paramTypes[j]).equals(((SingleVariableDeclaration)parameters.get(j)).getType().toString())) {
 						decl = null;
 						break;
 					}
diff --git a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF
index 709a743030..3569c49b3b 100755
--- a/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Export-Package: org.eclipse.swt.tools,
  org.eclipse.swt.tools.internal; x-internal:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
 Require-Bundle: org.eclipse.swt;bundle-version="3.4.0",
  org.eclipse.core.runtime;bundle-version="3.4.0",
  org.eclipse.core.resources;bundle-version="3.4.0",