transpiler fix for @xml annotations in Enum not processing no-class

BobHanson · BobHanson · commit f86989f15ed0 · 2019-12-14T11:41:55.000+01:00
package creation
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java
@@ -25,8 +25,9 @@ public class CorePlugin extends Plugin {
 	 * "net.sf.j2s.core.jar" not "net.sf.j2s.core.3.2.5"
 	 * 
 	 */
-	public static String VERSION = "3.2.5-v2";
-	// BH 2019.12.06 -- 3.2.5.v2 fix for try(resources) not closing those
+	public static String VERSION = "3.2.5-v3";
+	// BH 2019.12.12 -- 3.2.5-v3 fix for enums == null in annotations
+	// BH 2019.12.06 -- 3.2.5-v2 fix for try(resources) not closing those
 	// BH 2019.11.12 -- 3.2.5-v0 fix for string literals with \n \nn \nnn octals, but "use strict" does not allow for this.
 	// BH 2019.11.13 -- 3.2.5-v0 fixes static initialization timing. See note in Java2ScriptVisitor
 	// BH 2019.10.30 -- 3.2.4.09 fixes problem with team...show history...compare having null project.getProject().getLocation()
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
@@ -6414,7 +6414,8 @@ public static void addClassAnnotations(int accessType, List<ClassAnnotation> cla
 						type = ((TypeDeclaration) a.node).resolveBinding();
 					} else if (a.node instanceof FieldDeclaration) {
 						FieldDeclaration field = (FieldDeclaration) a.node;
-						fields.remove(field);
+						if (fields != null)
+							fields.remove(field);
 						fragments = field.fragments();
 						VariableDeclarationFragment identifier = (VariableDeclarationFragment) fragments.get(0);
 						IVariableBinding var = identifier.resolveBinding();
@@ -6423,7 +6424,8 @@ public static void addClassAnnotations(int accessType, List<ClassAnnotation> cla
 					} else if (a.node instanceof MethodDeclaration) {
 						MethodDeclaration method = (MethodDeclaration) a.node;
 						IMethodBinding var = method.resolveBinding();
-						if (methods.contains(var))
+						if (methods != null)
+							if (methods.contains(var))
 							methods.remove(var);
 						if (accessType != TEST_TYPE)
 							var = getJAXBGetMethod(var, methods, false);
@@ -6433,7 +6435,8 @@ public static void addClassAnnotations(int accessType, List<ClassAnnotation> cla
 						type = var.getReturnType();
 					} else if (a.node instanceof EnumConstantDeclaration) {
 						EnumConstantDeclaration con = (EnumConstantDeclaration) a.node;
-						enums.remove(con);
+						if (enums != null)
+							enums.remove(con);
 						IVariableBinding var = con.resolveVariable();
 						varName = var.getName();
 						type = var.getType();
