Allow runnables/callables to be generated independently from methods

Author: iloveeclipse

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

@@ -75,8 +75,13 @@ String generateMethods(String type) {
 				"\t public void set" + suffix + "(Object element) {\n" +
 				"\t \t this.element = ("+type+")element;\n" +
 				"\t \t " + extend + ".getInstance" + suffix + "().set" + suffix + "(this.element);\n" +
-				"\t }\n\n" +
-				"\t public void run" + suffix + "() {\n" +
+				"\t }\n\n";
+			sb.append(result);
+		}
+		if(methodCounts > 0) {
+			for (int i = 0; i < runnablesAndCallablesCounts; i++) {
+				String suffix = i == 0? "" : "" + i;
+				String result =	 "\t public void run" + suffix + "() {\n" +
 				"\t \t try {\n" +
 				"\t \t \t this.call" + suffix + "();\n" +
 				"\t \t } catch (Exception e) {}\n" +
@@ -91,20 +96,25 @@ String generateMethods(String type) {
 			 	"\t \t " + "r = " + extend + ".instance::run;\n" +
 			 	"\t \t " + "r.run();\n" +
 				"\t \t " + extend + ".getInstance" + suffix + "().run();\n" +
-				"\t }\n\n" +
-				"\t public "+type+" call" + suffix + "() throws Exception {\n" +
-				"\t \t " + extend + ".getInstance" + suffix + "().call();\n" +
-				"\t \t " + "java.util.concurrent.Callable<?> c = () -> {\n" +
-			 	"\t \t " + "    call" + suffix + "();\n" + 
-			 	"\t \t " + "    set(this);\n" +
-			 	"\t \t " + "    return get();\n" +
-			 	"\t \t " + "};\n" + 
-			 	"\t \t " + "c.call();\n" +
-			 	"\t \t " + "c = " + extend + ".getInstance" + suffix + "()::call;\n" +
-			 	"\t \t " + "c.call();\n" +
-			 	"\t \t return ("+type+")" + extend + ".getInstance" + suffix + "().call" + suffix + "();\n" +
-				"\t }\n";
-			sb.append(result);
+				"\t }\n\n";
+				sb.append(result);
+			}
+			for (int i = 0; i < runnablesAndCallablesCounts; i++) {
+				String suffix = i == 0? "" : "" + i;
+				String result =	"\t public "+type+" call" + suffix + "() throws Exception {\n" +
+						"\t \t " + extend + ".getInstance" + suffix + "().call();\n" +
+						"\t \t " + "java.util.concurrent.Callable<?> c = () -> {\n" +
+					 	"\t \t " + "    call" + suffix + "();\n" + 
+					 	"\t \t " + "    set(this);\n" +
+					 	"\t \t " + "    return get();\n" +
+					 	"\t \t " + "};\n" + 
+					 	"\t \t " + "c.call();\n" +
+					 	"\t \t " + "c = " + extend + ".getInstance" + suffix + "()::call;\n" +
+					 	"\t \t " + "c.call();\n" +
+					 	"\t \t return ("+type+")" + extend + ".getInstance" + suffix + "().call" + suffix + "();\n" +
+						"\t }\n\n";
+				sb.append(result);
+			}
 		}
 		return sb.toString();
 	}

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

@@ -20,6 +20,7 @@ public abstract class JavaElement {
 	static int commentsCount = 3;
 	static int seeCount = 3;
 	static int methodCounts = 1;
+	static int runnablesAndCallablesCounts = 1;
 	static boolean useExtend = true;
 
 	static final List<String> IMPORTS = Arrays.asList(

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

@@ -27,7 +27,8 @@ public static void main(String[] args) throws IOException {
 		int imports = 3;
 		int comments = 3;
 		int see = 3;
-		int methods = 1;
+		int methods = 1; // result method count will be (methods x 6 + runnablesAndCallables x 2)
+		int runnablesAndCallables = 1;
 		boolean extend = true;
 
 		if(args.length == 0) {
@@ -44,6 +45,7 @@ public static void main(String[] args) throws IOException {
 				comments = Integer.parseUnsignedInt(args[argc++]);
 				see = Integer.parseUnsignedInt(args[argc++]);
 				methods = Integer.parseUnsignedInt(args[argc++]);
+				runnablesAndCallables = Integer.parseUnsignedInt(args[argc++]);
 			} catch(Exception e) {
 				//
 			}
@@ -61,6 +63,7 @@ public static void main(String[] args) throws IOException {
 		JavaElement.commentsCount = comments;
 		JavaElement.seeCount = see;
 		JavaElement.methodCounts = methods;
+		JavaElement.runnablesAndCallablesCounts = runnablesAndCallables;
 		JavaElement.useExtend = extend;
 
 		new JavaBuilder(depth, roots, classes, root).build();