Mercurial > hg > uwproj / file diff

--- a/src/main/java/de/unixwork/uwproj/OptionValue.java	Wed Sep 06 22:55:42 2023 +0200
+++ b/src/main/java/de/unixwork/uwproj/OptionValue.java	Sun Sep 10 12:52:10 2023 +0200
@@ -2,24 +2,25 @@
 
 import java.util.List;
 
+import static de.unixwork.uwproj.Util.isNotNullOrBlank;
+
 public class OptionValue {
-    Option option;
-    
-    String value;
-    
-    TargetData targetData = new TargetData();
-    
-    public OptionValue(Option opt) {
-        option = opt;
+    private final Option option;
+
+    private final String value;
+
+    private final TargetData targetData;
+
+    public OptionValue(Option option, String value, TargetData targetData) {
+        this.option = option;
+        this.value = value;
+        this.targetData = targetData;
     }
 
     public String getValue() {
         return value;
     }
 
-    public void setValue(String value) {
-        this.value = value;
-    }
 
     public List<String> getDependencies() {
         return targetData.getDependencies();
@@ -28,20 +29,16 @@
     public List<Define> getDefines() {
         return targetData.getDefines();
     }
-    
-    public void setTargetData(TargetData data) {
-        targetData = data;
-    }
-    
+
     public String getFunc() {
         return option.getValueFunc(value);
     }
-    
+
     public String getMake() {
         return targetData.getMake();
     }
-    
+
     public boolean hasMake() {
-        return !targetData.getMake().trim().isEmpty();
+        return isNotNullOrBlank(targetData.getMake());
     }
 }