remove unused CLI arguments, add a new argument for LText text

Author: memo33

build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns:ivy="antlib:org.apache.ivy.ant" name="NAMControllerCompiler" default="dist" basedir=".">
     <property name="targetversion" value="8" />
-    <property name="project.version" value="1.3.1" />
+    <property name="project.version" value="2.0.0-SNAPSHOT" />
     <property name="MyApp" value="${ant.project.name}" />
     <property name="MyApp-zipname" value="${ant.project.name}_${project.version}" />
     <property name="MyApp.jar" value="${MyApp}.jar" />

src/controller/CommandLineArguments.java

@@ -54,17 +54,8 @@ public enum ArgumentID {
 
         INPUT_DIR(0, ""),
         OUTPUT_DIR(1, ""),
-        RHD_FLAG(2, "1"),
-        PS_FLAG(3, "0"),
-        NWM_FLAGS(4, defaultWord),
-        RHW_L0_FLAGS(5, "0x01FF"),
-        RHW_L1_FLAGS(6, "0x01FF"),
-        RHW_L2_FLAGS(7, "0x01FF"),
-        RHW_L3_FLAGS(8, "0x001C"),
-        RHW_L4_FLAGS(9, "0x001C"),
-        RHW_DDRHW_FLAGS(10, "0x0008"),
-        RHW_FA_FLAGS(11, "0x0001"),
-        SAM_FLAGS(12, defaultWord); // TODO or 0x03FF ?
+        RHD_FLAG(2, "1"),  // 1=RHD, 0=LHD
+        LTEXT(3, "");
 
         private final int index;
         private final String defaultValue;

src/controller/Compiler.java

@@ -41,7 +41,8 @@ public abstract class Compiler extends AbstractCompiler {
 
     private final File RESOURCE_DIR, XML_DIR, XML_FILE, XML_FILE_TEMP;
     private final File[] DATA_FILES;
-    private final CompilerSettingsManager settingsManager ;
+    private final CompilerSettingsManager settingsManager;
+    private final String markerText;
 
     private File inputDir, outputDir;
     private File[] rulDirs;
@@ -91,6 +92,7 @@ private Compiler(File resourceDir, CompileMode mode, View view, CommandLineArgum
                 new File(RESOURCE_DIR, "NAMControllerCompilerSettings.txt~1"),
                 new File(RESOURCE_DIR, "NAMControllerCompilerSettings.txt~2")};
         this.settingsManager = new CompilerSettingsManager(DATA_FILES, args);
+        this.markerText = args.getArgument(CommandLineArguments.ArgumentID.LTEXT);
     }
 
     @Override
@@ -277,7 +279,7 @@ public boolean writeSettings() {
 
     @Override
     public void writeControllerFile() {
-        ExecutableTask writeTask = WriteControllerTask.getInstance(mode, collectRULsTask, isLHD, patterns, inputDir.toURI(), outputFile, view);
+        ExecutableTask writeTask = WriteControllerTask.getInstance(mode, collectRULsTask, isLHD, markerText, patterns, inputDir.toURI(), outputFile, view);
         writeTask.execute();
         // result will be handled by determineResult in writeTask
     }

src/controller/tasks/WriteControllerTask.java

@@ -47,6 +47,7 @@ public abstract class WriteControllerTask implements ExecutableTask {
 
     private final CollectRULsTask collectRULsTask;
     private final boolean isLHD;
+    private final String markerText;
     private final Queue<Pattern> patterns;
     private final URI inputURI;
     private final File outputFile;
@@ -56,20 +57,21 @@ public abstract class WriteControllerTask implements ExecutableTask {
     private long starttime;
 
     public static ExecutableTask getInstance(CompileMode mode, CollectRULsTask collectRULsTask,
-            boolean isLHD, Queue<Pattern> patterns, URI inputURI, File outputFile, View view) {
+            boolean isLHD, String markerText, Queue<Pattern> patterns, URI inputURI, File outputFile, View view) {
         if (mode.isInteractive()) {
-            return new GUITask(collectRULsTask, isLHD, patterns, inputURI, outputFile, view);
+            return new GUITask(collectRULsTask, isLHD, markerText, patterns, inputURI, outputFile, view);
         } else {
-            return new CommandLineTask(collectRULsTask, isLHD, patterns, inputURI, outputFile, view);
+            return new CommandLineTask(collectRULsTask, isLHD, markerText, patterns, inputURI, outputFile, view);
         }
     }
 
     public abstract boolean get() throws InterruptedException, ExecutionException;
 
     private WriteControllerTask(CollectRULsTask collectRULsTask,
-            boolean isLHD, Queue<Pattern> patterns, URI inputURI, File outputFile, View view) {
+            boolean isLHD, String markerText, Queue<Pattern> patterns, URI inputURI, File outputFile, View view) {
         this.collectRULsTask = collectRULsTask;
         this.isLHD = isLHD;
+        this.markerText = markerText;
         this.patterns = patterns;
         this.inputURI = inputURI;
         this.outputFile = outputFile;
@@ -123,7 +125,10 @@ public void stateChanged(ChangeEvent e) {
             // LText (Controller marker)
             LOGGER.info("Adding Controller marker description text");
             DBPFLText ltext = new DBPFLText(new byte[0], LTEXT_TGI, false);
-            ltext.setString(getControllerMarkerText(lastModf, WriteControllerTask.this.isLHD));
+            ltext.setString(
+                    WriteControllerTask.this.markerText.isEmpty()
+                    ? getDefaultControllerMarkerText(lastModf, WriteControllerTask.this.isLHD)
+                    : WriteControllerTask.this.markerText);
             writeList.add(ltext);
         }
         // write to file
@@ -169,7 +174,7 @@ private void determineResult() {
      * @param isLHD
      * @return
      */
-    private String getControllerMarkerText(long date, boolean isLHD) {
+    private String getDefaultControllerMarkerText(long date, boolean isLHD) {
         DateFormat dateFormat = new SimpleDateFormat("yyyy MMM dd - HH:mm:ss (z)", Locale.ENGLISH);
         dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
 //        return "Version: " + (isLHD ? "LHD " : "RHD ") + (isESeries ? "(e-series) - " : "(s-series) - ") + dateFormat.format(new Date(date));
@@ -187,8 +192,8 @@ private static class GUITask extends WriteControllerTask {
         private final SwingWorker<Boolean, String> worker;
 
         private GUITask(CollectRULsTask collectRULsTask,
-                boolean isLHD, Queue<Pattern> patterns, URI inputURI, File outputFile, View view) {
-            super(collectRULsTask, isLHD, patterns, inputURI, outputFile, view);
+                boolean isLHD, String markerText, Queue<Pattern> patterns, URI inputURI, File outputFile, View view) {
+            super(collectRULsTask, isLHD, markerText, patterns, inputURI, outputFile, view);
             worker = new MyWorker();
         }
 
@@ -230,8 +235,8 @@ private static class CommandLineTask extends WriteControllerTask implements Publ
         private Exception executionExceptionCause = null;
 
         private CommandLineTask(CollectRULsTask collectRULsTask,
-                boolean isLHD, Queue<Pattern> patterns, URI inputURI, File outputFile, View view) {
-            super(collectRULsTask, isLHD, patterns, inputURI, outputFile, view);
+                boolean isLHD, String markerText, Queue<Pattern> patterns, URI inputURI, File outputFile, View view) {
+            super(collectRULsTask, isLHD, markerText, patterns, inputURI, outputFile, view);
         }
 
         @Override