Added parametrized imports/fields count

Author: iloveeclipse

JavaProjectGenerator/src/de/loskutov/jpg/Clazz.java

@@ -4,7 +4,7 @@ public class Clazz extends JavaElement {
 
 	String implement;
 	String extend;
-	
+
 	Clazz(String name, String packageName, String implement, String extend) {
 		super(name, packageName);
 		this.implement = implement;
@@ -18,12 +18,12 @@ String generateCode() {
 			return generateObject();
 		}
 		String type = genTypes.next();
-		String s = "package " + packageName + ";\n\n" + 
-				"import " + imports.next() + ";\n\n" +
+		String s = "package " + packageName + ";\n\n" +
+				generateImports() +
 				"@SuppressWarnings(\"all\")\n" +
-				"public abstract class " + name + "<"+type+"> extends " + extend + "<"+type+"> implements " + implement + "<"+type+"> {\n\n" + 
+				"public abstract class " + name + "<"+type+"> extends " + extend + "<"+type+"> implements " + implement + "<"+type+"> {\n\n" +
 					"\t public "+type+" element;\n\n" +
-					"\t public " + fields.next() + " field1;\n\n" +
+					generateFields() +
 					"\t public static " + name + " instance;\n\n" +
 					"\t public static " + name + " getInstance() {\n" +
 					"\t \t return instance;\n" +
@@ -51,40 +51,40 @@ String generateCode() {
 				"}\n";
 		return s;
 	}
-	
+
 	String generateObject() {
 		String type = genTypes.next();
-		String s = "package " + packageName + ";\n" + 
-				"import " + imports.next() + ";\n" +
+		String s = "package " + packageName + ";\n\n" +
+				generateImports() +
 				"@SuppressWarnings(\"all\")\n" +
-				"public abstract class " + name + "<"+type+"> implements " + implement + "<"+type+"> {\n" + 
+				"public abstract class " + name + "<"+type+"> implements " + implement + "<"+type+"> {\n\n" +
 					"public "+type+" element;\n" +
-					"public " + fields.next() + " field1;\n" +
-					"public static " + name + " instance;\n" +
+					generateFields() +
+					"public static " + name + " instance;\n\n" +
 					"public static " + name + " getInstance() {\n" +
 					"\t return instance;\n" +
 					"}\n" +
-				
+
 					"public static <T> T create(java.util.List<T> input) {\n" +
 					"\t return null;\n" +
 					"}\n" +
-					
+
 					"public String getName() {\n" +
 					"\t return element.toString();\n" +
 					"}\n" +
-					
+
 					"public void setName(String string) {\n" +
 					"\t return;\n" +
 					"}\n" +
-					
+
 					"public "+type+" get() {\n" +
 					"\t return element;\n" +
 					"}\n" +
-					
+
 					"public void set(Object element) {\n" +
 					"\t this.element = ("+type+")element;\n" +
 					"}\n" +
-					
+
 					"public "+type+" call() throws Exception {\n" +
 					"\t return ("+type+")getInstance().call();\n" +
 					"}\n" +

JavaProjectGenerator/src/de/loskutov/jpg/Interface.java

@@ -12,19 +12,19 @@ public class Interface extends JavaElement {
 	@Override
 	String generateCode() {
 		String type = genTypes.next();
-		String s = "package " + packageName + ";\n\n" + 
-				"import " + imports.next() + ";\n\n" +
+		String s = "package " + packageName + ";\n\n" +
+				generateImports() +
 				"@SuppressWarnings(\"all\")\n" +
-				"public interface " + name + "<"+type+"> extends " + extend + "<"+type+"> {\n\n" + 
+				"public interface " + name + "<"+type+"> extends " + extend + "<"+type+"> {\n\n" +
+
+					generateFields() +
 
-				     "\t " + fields.next() + " ifield = null;\n\n" +
-					
 					"\t String getName();\n\n" +
-					
+
 					"\t void setName(String s);\n\n" +
-					
+
 					"\t "+type+" get();\n\n" +
-					
+
 					"\t void set("+type+" e);\n\n" +
 				"}\n";
 		return s;

JavaProjectGenerator/src/de/loskutov/jpg/JavaElement.java

@@ -12,8 +12,11 @@
 import java.util.stream.IntStream;
 
 public abstract class JavaElement {
-	
-	static final List<String> IMPORTS = Arrays.asList( 
+
+	static int fieldsCount = 3;
+	static int importsCount = 3;
+
+	static final List<String> IMPORTS = Arrays.asList(
 			"java.awt.datatransfer.*",
 			"java.beans.beancontext.*",
 			"java.io.*",
@@ -29,7 +32,7 @@ public abstract class JavaElement {
 			"javax.net.ssl.*",
 			"javax.rmi.ssl.*"
 			);
-	
+
 	static final List<String> FIELDS = Arrays.asList(
 			"java.awt.datatransfer.DataFlavor",
 			"java.beans.beancontext.BeanContext",
@@ -46,35 +49,51 @@ public abstract class JavaElement {
 			"javax.net.ssl.ExtendedSSLSession",
 			"javax.rmi.ssl.SslRMIClientSocketFactory"
 			);
-	
-	static List<String> LETTERS = IntStream.rangeClosed('A', 'Z').mapToObj(x -> String.valueOf((char)x))
+
+	static final List<String> LETTERS = IntStream.rangeClosed('A', 'Z').mapToObj(x -> String.valueOf((char)x))
 			.collect(Collectors.toList());
-	
+
 	String name;
 	String packageName;
-	static Ring<String> imports = new Ring<>(IMPORTS);
-	static Ring<String> fields = new Ring<>(FIELDS); 
-	static Ring<String> genTypes = new Ring<>(LETTERS);
-	
+	static final Ring<String> imports = new Ring<>(IMPORTS);
+	static final Ring<String> fields = new Ring<>(FIELDS);
+	static final Ring<String> genTypes = new Ring<>(LETTERS);
+
 	JavaElement(String name, String packageName){
 		this.name = name;
 		this.packageName = packageName;
 	}
-	
+
 	abstract String generateCode();
-	
+
+	String generateImports() {
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < importsCount; i++) {
+			sb.append("import ").append(imports.next()).append(";\n\n");
+		}
+		return sb.toString();
+	}
+
+	String generateFields() {
+		StringBuilder sb = new StringBuilder();
+		for (int i = 0; i < fieldsCount; i++) {
+			sb.append("\t ").append(fields.next()).append(" f").append(i).append(" = null;\n\n");
+		}
+		return sb.toString();
+	}
+
 	void persist(Path root) throws IOException {
 		try(BufferedWriter writer = createWriter(root)){
 			String code = generateCode();
 			writer.append(code);
 			writer.flush();
 		}
 	}
-	
+
 	String fqn() {
 		return packageName + "." + name;
 	}
-	
+
 	BufferedWriter createWriter(Path root) throws IOException {
 		Path path = root.resolve(packageName.replace('.', File.separatorChar)).resolve(name + ".java");
 		Files.createDirectories(path.getParent());

JavaProjectGenerator/src/de/loskutov/jpg/Main.java

@@ -21,24 +21,34 @@ public static void main(String[] args) throws IOException {
         int roots = 10;
 		int depth = 10;
 		int classes = 100;
+		int fields = 1;
+		int imports = 1;
 		if(args.length == 0) {
 			System.out.println("No arguments given, using defaults");
 		} else {
 			try {
-				roots = Integer.parseUnsignedInt(args[0]);
-				depth = Integer.parseUnsignedInt(args[1]);
-				classes = Integer.parseUnsignedInt(args[2]);
-				pathname = args[3];
+				int argc = 0;
+				pathname = args[argc++];
+				roots = Integer.parseUnsignedInt(args[argc++]);
+				depth = Integer.parseUnsignedInt(args[argc++]);
+				classes = Integer.parseUnsignedInt(args[argc++]);
+				fields = Integer.parseUnsignedInt(args[argc++]);
+				imports = Integer.parseUnsignedInt(args[argc++]);
 			} catch(Exception e) {
 				//
 			}
 		}
 		File rootDir = new File(pathname);
 		Path root = rootDir.toPath();
 		System.out.println("Writing to "  + rootDir.getAbsolutePath());
-		System.out.println("Roots: " + roots + ", depth: " + depth + ", classes & interfaces per package: " + (classes*2));
+		System.out.println("Roots: " + roots + ", depth: " + depth +
+				", classes & interfaces per package: " + (classes*2) +
+				", imports+fields per class: " + imports + "+" + fields);
 		System.out.println("Will generate " + roots + "x" + depth + "x" + classes + "x2 + 2 = " + (depth * roots* classes * 2 + 2) + " files");
 
+		JavaElement.fieldsCount = fields;
+		JavaElement.importsCount = imports;
+
 		new JavaBuilder(depth, roots, classes, root).build();
 	}
 }