Fixed generator bug of generating two same fields

zhourenjian@gmail.com · zhourenjian@gmail.com · commit 355a187c1d0b · 2013-09-26T05:17:41.000Z
diff --git a/sources/net.sf.j2s.ajax/generator/net/sf/j2s/ajax/SimpleSource4Java.java b/sources/net.sf.j2s.ajax/generator/net/sf/j2s/ajax/SimpleSource4Java.java
@@ -229,12 +229,17 @@ public static String generateSourceFromObject(SimpleSerializable s) {
 		Field[] clazzFields = clazz.getDeclaredFields();
 		
 		List<Field> fields = new ArrayList<Field>();
+		Set<String> j2sIgnoredFileds = new HashSet<String>();
+		
 		for (int i = 0; i < clazzFields.length; i++) {
 			Field f = clazzFields[i];
 			int modifiers = f.getModifiers();
 			if ((modifiers & (Modifier.PUBLIC/* | Modifier.PROTECTED*/)) != 0
 					&& (modifiers & (Modifier.TRANSIENT | Modifier.STATIC)) == 0) {
 				fields.add(f);
+				if ((modifiers & Modifier.PROTECTED) != 0) {
+					j2sIgnoredFileds.add(f.getName());
+				}
 			}
 		}
 
@@ -411,19 +416,6 @@ public int compare(Class<?> c1, Class<?> c2) {
 			source.append("\tprivate static Map<String, String> aliasMappings = mappingFromArray(mappings, true);\r\n");
 		}
 		
-		Set<String> j2sIgnoredFileds = new HashSet<String>();
-		
-		for (int i = 0; i < clazzFields.length; i++) {
-			Field f = clazzFields[i];
-			int modifiers = f.getModifiers();
-			if ((modifiers & (Modifier.PUBLIC/* | Modifier.PROTECTED*/)) != 0
-					&& (modifiers & (Modifier.TRANSIENT | Modifier.STATIC)) == 0) {
-				fields.add(f);
-				if ((modifiers & Modifier.PROTECTED) != 0) {
-					j2sIgnoredFileds.add(f.getName());
-				}
-			}
-		}
 		for (int i = 0; i < clazzFields.length; i++) {
 			Field f = clazzFields[i];
 			String name = f.getName();
