merge

tools/model_generator/.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8

tools/model_generator/src/com/libiec61850/tools/DynamicModelGenerator.java

@@ -607,13 +607,24 @@ public class DynamicModelGenerator {
     }
 
     public static void main(String[] args) throws FileNotFoundException {
-        System.out.println("Dynamic model generator");
+        
+        args = new String[6];
+
+    	System.out.println("Dynamic model generator");
 
         if (args.length < 1) {
             System.out.println("Usage: genconfig <ICD file> [-ied  <ied-name>] [-ap <access-point-name>] [<output filename>]");
             System.exit(1);
         }
 
+
+        args[0] = "array.icd";
+        args[1] = "-ied";
+        args[2] = "TEMPLATE";
+        args[3] = "-ap";
+        args[4] = "NewAccessPoint";
+        args[5] = "model_rr";
+        
         String icdFile = args[0];
 
         PrintStream outputStream = System.out;

tools/model_generator/src/com/libiec61850/tools/StaticModelGenerator.java

@@ -213,11 +213,22 @@ public class StaticModelGenerator {
     }
 
     public static void main(String[] args) throws FileNotFoundException  {
-        if (args.length < 1) {
+        args = new String[6];
+    	
+    	if (args.length < 1) {
             System.out.println("Usage: genmodel <ICD file>  [-ied  <ied-name>] [-ap <access-point-name>] [-out <output-name>] [-modelprefix <model-prefix>]");
             System.exit(1);
         }
 
+
+        args[0] = "array.icd";
+        args[1] = "-ied";
+        args[2] = "TEMPLATE";
+        args[3] = "-ap";
+        args[4] = "NewAccessPoint";
+        args[5] = "model_rr";
+        
+        
         String icdFile = args[0];
 
 		String outputFileName = "static_model";