Ignore copy right year in generating RPC/Pipe classes

zhourenjian@gmail.com · zhourenjian@gmail.com · commit 6dbe7c69bd6f · 2014-01-18T09:51:48.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
@@ -206,12 +206,14 @@ public static String generateSourceFromObject(SimpleSerializable s) {
 		}
 
 		Type[] interfaces = s.getClass().getGenericInterfaces();
+		List<Type> interfaceList = new ArrayList<Type>();
 		if (interfaces != null && interfaces.length > 0) {
 			for (int i = 0; i < interfaces.length; i++) {
 				Class<?> t = (Class<?>) interfaces[i];
 				if (!SimpleSerializable.isSubInterfaceOf(t, ISimpleConstant.class)) {
 					continue;
 				}
+				interfaceList.add(t);
 				String typeName = t.getName();
 				hasMoreImports = true;
 				if (!importedClasses.contains(typeName)) {
@@ -329,10 +331,10 @@ public int compare(Class<?> c1, Class<?> c2) {
 			source.append(simpleClazzName);
 		}
 
-		if (interfaces != null && interfaces.length > 0) {
+		if (interfaceList.size() > 0) {
 			boolean keywordAppended = false;
-			for (int i = 0; i < interfaces.length; i++) {
-				Class<?> t = (Class<?>) interfaces[i];
+			for (int i = 0; i < interfaceList.size(); i++) {
+				Class<?> t = (Class<?>) (Type) interfaceList.get(i);
 				if (!SimpleSerializable.isSubInterfaceOf(t, ISimpleConstant.class)) {
 					continue;
 				}
@@ -348,7 +350,7 @@ public int compare(Class<?> c1, Class<?> c2) {
 				}
 				
 				source.append(simpleTypeName);
-				if (i != interfaces.length -1) {
+				if (i != interfaceList.size() -1) {
 					source.append(", ");
 				}
 			}
diff --git a/sources/net.sf.j2s.ajax/generator/net/sf/j2s/ajax/SourceUtils.java b/sources/net.sf.j2s.ajax/generator/net/sf/j2s/ajax/SourceUtils.java
@@ -6,6 +6,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -175,6 +176,13 @@ public static void updateSourceContent(File file, String source) {
 			
 			if (source.equals(oldSource)) {
 				return;
+			} else {
+				@SuppressWarnings("deprecation")
+				String copyrightYear = "* Copyright (c) " + (new Date().getYear() + 1900);
+				String updatedSource = oldSource.replaceFirst("\\* Copyright \\(c\\) \\d{4}", copyrightYear);
+				if (source.equals(updatedSource)) {
+					return;
+				}
 			}
 		}
 		FileOutputStream fos = null;

Original file line number	Diff line number	Diff line change
`@@ -206,12 +206,14 @@ public static String generateSourceFromObject(SimpleSerializable s) {`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`Type[] interfaces = s.getClass().getGenericInterfaces();`
	`209`	`+ List<Type> interfaceList = new ArrayList<Type>();`
`209`	`210`	`if (interfaces != null && interfaces.length > 0) {`
`210`	`211`	`for (int i = 0; i < interfaces.length; i++) {`
`211`	`212`	`Class<?> t = (Class<?>) interfaces[i];`
`212`	`213`	`if (!SimpleSerializable.isSubInterfaceOf(t, ISimpleConstant.class)) {`
`213`	`214`	`continue;`
`214`	`215`	`}`
	`216`	`+ interfaceList.add(t);`
`215`	`217`	`String typeName = t.getName();`
`216`	`218`	`hasMoreImports = true;`
`217`	`219`	`if (!importedClasses.contains(typeName)) {`
`@@ -329,10 +331,10 @@ public int compare(Class<?> c1, Class<?> c2) {`
`329`	`331`	`source.append(simpleClazzName);`
`330`	`332`	`}`
`331`	`333`
`332`		`- if (interfaces != null && interfaces.length > 0) {`
	`334`	`+ if (interfaceList.size() > 0) {`
`333`	`335`	`boolean keywordAppended = false;`
`334`		`- for (int i = 0; i < interfaces.length; i++) {`
`335`		`- Class<?> t = (Class<?>) interfaces[i];`
	`336`	`+ for (int i = 0; i < interfaceList.size(); i++) {`
	`337`	`+ Class<?> t = (Class<?>) (Type) interfaceList.get(i);`
`336`	`338`	`if (!SimpleSerializable.isSubInterfaceOf(t, ISimpleConstant.class)) {`
`337`	`339`	`continue;`
`338`	`340`	`}`
`@@ -348,7 +350,7 @@ public int compare(Class<?> c1, Class<?> c2) {`
`348`	`350`	`}`
`349`	`351`
`350`	`352`	`source.append(simpleTypeName);`
`351`		`- if (i != interfaces.length -1) {`
	`353`	`+ if (i != interfaceList.size() -1) {`
`352`	`354`	`source.append(", ");`
`353`	`355`	`}`
`354`	`356`	`}`