Use TargetConfig constructor directly

lf-lang · Mar 19, 2023 · 0c1137d · 0c1137d
1 parent 0a50e96
commit 0c1137d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 25 deletions.
diff --git a/org.lflang/src/org/lflang/federated/generator/FedGenerator.java b/org.lflang/src/org/lflang/federated/generator/FedGenerator.java
@@ -297,7 +297,7 @@ private Map<Path, CodeMap> compileFederates(
                 }
                 props.put("docker", "false");
 
-                TargetConfig subConfig = GeneratorUtils.getTargetConfig(
+                TargetConfig subConfig = new TargetConfig(
                     props, GeneratorUtils.findTargetDecl(subFileConfig.resource), subContextErrorReporter
                 );
                 SubContext subContext = new SubContext(context, IntegratedBuilder.VALIDATED_PERCENT_PROGRESS, 100) {

diff --git a/org.lflang/src/org/lflang/generator/GeneratorUtils.java b/org.lflang/src/org/lflang/generator/GeneratorUtils.java
@@ -4,7 +4,6 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Properties;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -17,13 +16,8 @@
 import org.lflang.ErrorReporter;
 import org.lflang.FileConfig;
 import org.lflang.TargetConfig;
-import org.lflang.TargetConfig.DockerOptions;
-import org.lflang.TargetProperty.BuildType;
-import org.lflang.TargetProperty.LogLevel;
-import org.lflang.TargetProperty.UnionType;
 import org.lflang.generator.LFGeneratorContext.Mode;
 import org.lflang.TargetProperty;
-import org.lflang.TargetProperty.SchedulerOption;
 import org.lflang.lf.Action;
 import org.lflang.lf.ActionOrigin;
 import org.lflang.lf.Instantiation;
@@ -53,23 +47,6 @@ public static TargetDecl findTargetDecl(Resource resource) {
         return findAll(resource, TargetDecl.class).iterator().next();
     }
 
-    /**
-     * Set the appropriate target properties based on the target properties of
-     * the main .lf file and the given command-line arguments, if applicable.
-     * @param args The commandline arguments to process.
-     * @param target The target properties AST node.
-     * @param errorReporter The error reporter to which errors should be sent.
-     */
-    public static TargetConfig getTargetConfig(
-        Properties args,
-        TargetDecl target,
-        ErrorReporter errorReporter
-    ) {
-        final TargetConfig targetConfig = new TargetConfig(args, target, errorReporter);
-
-        return targetConfig;
-    }
-
     /**
      * Look for physical actions in 'resource'.
      * If appropriate, set keepalive to true in

diff --git a/org.lflang/src/org/lflang/generator/MainContext.java b/org.lflang/src/org/lflang/generator/MainContext.java
@@ -163,7 +163,7 @@ public void reportProgress(String message, int percentage) {
      * reflected in the target configuration.
      */
     public void loadTargetConfig() {
-        this.targetConfig = GeneratorUtils.getTargetConfig(
+        this.targetConfig = new TargetConfig(
             args, GeneratorUtils.findTargetDecl(fileConfig.resource), errorReporter
         );
     }