[166226] Fix for Java 5 Toleration where generics were in the method declaraton.
diff --git a/features/org.eclipse.jem-feature/feature.xml b/features/org.eclipse.jem-feature/feature.xml
index 39a9459..1e4e21a 100644
--- a/features/org.eclipse.jem-feature/feature.xml
+++ b/features/org.eclipse.jem-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jem"
label="%featureName"
- version="1.2.2.qualifier"
+ version="1.2.3.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
diff --git a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/feature.xml b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/feature.xml
index 0402078..5778c36 100644
--- a/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/feature.xml
+++ b/features/org.eclipse.jem-feature/org.eclipse.jem.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jem.sdk"
label="%featureName"
- version="1.2.2.qualifier"
+ version="1.2.3.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg">
diff --git a/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF b/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF
index 04c6f03..2165ba3 100644
--- a/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jem.workbench/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jem.workbench; singleton:=true
-Bundle-Version: 1.2.2.qualifier
+Bundle-Version: 1.2.3.qualifier
Bundle-Activator: org.eclipse.jem.internal.plugin.JavaPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMAdaptor.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMAdaptor.java
index 372b839..d7f6e8e 100644
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMAdaptor.java
+++ b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/internal/adapters/jdom/JDOMAdaptor.java
@@ -11,7 +11,7 @@
package org.eclipse.jem.internal.adapters.jdom;
/*
* $RCSfile: JDOMAdaptor.java,v $
- * $Revision: 1.8 $ $Date: 2005/10/18 14:58:18 $
+ * $Revision: 1.9 $ $Date: 2007/01/30 14:39:13 $
*/
import java.io.File;
@@ -303,11 +303,18 @@
* Converts a type signature to a readable string.
*
* Uses Signature.toString(), then tries to undo bad replacement for inner classes.
+ *
+ * Bug: 166226 [https://bugs.eclipse.org/bugs/show_bug.cgi?id=166226]
+ * Update to use the erasure type from the signature in order to
+ * tolerate JDK 5 generics.
*
*/
public static String signatureToString(String signature) throws IllegalArgumentException {
boolean hasDollar = (signature.indexOf(Signature.C_DOLLAR) != -1);
- String result = Signature.toString(signature);
+ //begin 166226 fix
+ String result = Signature.getTypeErasure(signature);
+ result = Signature.toString(result);
+ //end 166226 fix
if (hasDollar) {
int newPos = result.lastIndexOf("."); //$NON-NLS-1$
if (newPos != -1) {
