Fixed bug of RPC generators

zhourenjian@gmail.com · zhourenjian@gmail.com · commit 2dac2eaa4284 · 2014-06-21T08:14:23.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
@@ -241,6 +241,7 @@ public static String generateSourceFromObject(SimpleSerializable s) {
 		Field[] clazzFields = clazz.getDeclaredFields();
 		
 		List<Field> fields = new ArrayList<Field>();
+		List<Field> fields4Annotation = new ArrayList<Field>();
 		Set<String> j2sIgnoredFileds = new HashSet<String>();
 		
 		for (int i = 0; i < clazzFields.length; i++) {
@@ -253,9 +254,13 @@ public static String generateSourceFromObject(SimpleSerializable s) {
 					j2sIgnoredFileds.add(f.getName());
 				}
 			}
+			if ((modifiers & (Modifier.PUBLIC/* | Modifier.PROTECTED*/)) != 0
+					&& (modifiers & (Modifier.TRANSIENT/* | Modifier.STATIC*/)) == 0) {
+				fields4Annotation.add(f);
+			}
 		}
 
-		if (importAnnotationClasses(fields, clazz, source)) {
+		if (importAnnotationClasses(fields4Annotation, clazz, source)) {
 			hasMoreImports = true;
 		}
 		
diff --git a/sources/net.sf.j2s.ajax/generator/net/sf/j2s/ajax/SimpleSource4ObjectiveC.java b/sources/net.sf.j2s.ajax/generator/net/sf/j2s/ajax/SimpleSource4ObjectiveC.java
@@ -1119,7 +1119,7 @@ public static void main(String[] args) {
 			source.append("- (id) getClassShortenName:(NSString *) className {\r\n");
 			SourceUtils.insertLineComment(source, "\t", index++, false);
 
-			for (int i = 1 + 4; i < args.length; i++) {
+			for (int i = classStartingIndex; i < args.length; i++) {
 				String j2sSimpleClazz = args[i];
 				try {
 					Class<?> clazz = Class.forName(j2sSimpleClazz);

Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,7 @@ public static String generateSourceFromObject(SimpleSerializable s) {`
`241`	`241`	`Field[] clazzFields = clazz.getDeclaredFields();`
`242`	`242`
`243`	`243`	`List<Field> fields = new ArrayList<Field>();`
	`244`	`+ List<Field> fields4Annotation = new ArrayList<Field>();`
`244`	`245`	`Set<String> j2sIgnoredFileds = new HashSet<String>();`
`245`	`246`
`246`	`247`	`for (int i = 0; i < clazzFields.length; i++) {`
`@@ -253,9 +254,13 @@ public static String generateSourceFromObject(SimpleSerializable s) {`
`253`	`254`	`j2sIgnoredFileds.add(f.getName());`
`254`	`255`	`}`
`255`	`256`	`}`
	`257`	`+ if ((modifiers & (Modifier.PUBLIC/* \| Modifier.PROTECTED*/)) != 0`
	`258`	`+ && (modifiers & (Modifier.TRANSIENT/* \| Modifier.STATIC*/)) == 0) {`
	`259`	`+ fields4Annotation.add(f);`
	`260`	`+ }`
`256`	`261`	`}`
`257`	`262`
`258`		`- if (importAnnotationClasses(fields, clazz, source)) {`
	`263`	`+ if (importAnnotationClasses(fields4Annotation, clazz, source)) {`
`259`	`264`	`hasMoreImports = true;`
`260`	`265`	`}`
`261`	`266`