Refactoring + Insert Modification for Strings, Integer, BigInteger, Long + Some more Modifications for Long

.gitignore

@@ -9,9 +9,13 @@ nbproject/
 nbactions.xml.project
 nbactions.xml
 
-# IntelliJ
-.idea/
+### IntelliJ IDEA ###
+.idea/*
+!.idea/inspectionProfiles
+!.idea/runConfigurations
+*.iws
 *.iml
+*.ipr
 
 # VS Code
 .vscode/

src/main/java/de/rub/nds/modifiablevariable/FileConfigurationException.java

@@ -9,7 +9,9 @@
 
 public class FileConfigurationException extends RuntimeException {
 
-    public FileConfigurationException() {}
+    public FileConfigurationException() {
+        super();
+    }
 
     public FileConfigurationException(Exception ex) {
         super(ex);

src/main/java/de/rub/nds/modifiablevariable/ModifiableVariableFactory.java

@@ -12,11 +12,12 @@
 import de.rub.nds.modifiablevariable.bytearray.ModifiableByteArray;
 import de.rub.nds.modifiablevariable.integer.ModifiableInteger;
 import de.rub.nds.modifiablevariable.longint.ModifiableLong;
+import de.rub.nds.modifiablevariable.path.ModifiablePath;
 import de.rub.nds.modifiablevariable.singlebyte.ModifiableByte;
 import de.rub.nds.modifiablevariable.string.ModifiableString;
 import java.math.BigInteger;
 
-public class ModifiableVariableFactory {
+public final class ModifiableVariableFactory {
 
     public static ModifiableBigInteger createBigIntegerModifiableVariable() {
         return new ModifiableBigInteger();
@@ -38,61 +39,297 @@ public static ModifiableLong createLongModifiableVariable() {
         return new ModifiableLong();
     }
 
+    public static ModifiableBoolean createBooleanModifiableVariable() {
+        return new ModifiableBoolean();
+    }
+
+    public static ModifiableString createStringModifiableVariable() {
+        return new ModifiableString();
+    }
+
+    public static ModifiablePath createPathModifiableVariable() {
+        return new ModifiablePath();
+    }
+
     public static ModifiableBigInteger safelySetValue(ModifiableBigInteger mv, BigInteger value) {
         if (mv == null) {
-            mv = new ModifiableBigInteger();
+            return new ModifiableBigInteger(value);
         }
         mv.setOriginalValue(value);
         return mv;
     }
 
+    /**
+     * Returns only a ModifiableBigInteger with the value, if the given mv is null or the original
+     * value of the mv is null
+     */
+    public static ModifiableBigInteger softlySetValue(ModifiableBigInteger mv, BigInteger value) {
+        if (mv == null) {
+            return new ModifiableBigInteger(value);
+        } else if (mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
+    /**
+     * Returns only a ModifiableBigInteger with the value, if the given mv is null or the original
+     * value of the mv is null or alwaysSet is true
+     */
+    public static ModifiableBigInteger softlySetValue(
+            ModifiableBigInteger mv, BigInteger value, boolean alwaysSet) {
+        if (mv == null) {
+            return new ModifiableBigInteger(value);
+        } else if (alwaysSet || mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
     public static ModifiableString safelySetValue(ModifiableString mv, String value) {
         if (mv == null) {
-            mv = new ModifiableString();
+            return new ModifiableString(value);
         }
         mv.setOriginalValue(value);
         return mv;
     }
 
+    /**
+     * Returns only a ModifiableString with the value, if the given mv is null or the original value
+     * of the mv is null
+     */
+    public static ModifiableString softlySetValue(ModifiableString mv, String value) {
+        if (mv == null) {
+            return new ModifiableString(value);
+        } else if (mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
+    /**
+     * Returns only a ModifiableString with the value, if the given mv is null or the original value
+     * of the mv is null or alwaysSet is true
+     */
+    public static ModifiableString softlySetValue(
+            ModifiableString mv, String value, boolean alwaysSet) {
+        if (mv == null) {
+            return new ModifiableString(value);
+        } else if (alwaysSet || mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
     public static ModifiableInteger safelySetValue(ModifiableInteger mv, Integer value) {
         if (mv == null) {
-            mv = new ModifiableInteger();
+            return new ModifiableInteger(value);
         }
         mv.setOriginalValue(value);
         return mv;
     }
 
+    /**
+     * Returns only a ModifiableInteger with the value, if the given mv is null or the original
+     * value of the mv is null
+     */
+    public static ModifiableInteger softlySetValue(ModifiableInteger mv, Integer value) {
+        if (mv == null) {
+            return new ModifiableInteger(value);
+        } else if (mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
+    /**
+     * Returns only a ModifiableInteger with the value, if the given mv is null or the original
+     * value of the mv is null or alwaysSet is true
+     */
+    public static ModifiableInteger softlySetValue(
+            ModifiableInteger mv, Integer value, boolean alwaysSet) {
+        if (mv == null) {
+            return new ModifiableInteger(value);
+        } else if (alwaysSet || mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
     public static ModifiableByte safelySetValue(ModifiableByte mv, Byte value) {
         if (mv == null) {
-            mv = new ModifiableByte();
+            return new ModifiableByte(value);
         }
         mv.setOriginalValue(value);
         return mv;
     }
 
+    /**
+     * Returns only a ModifiableByte with the value, if the given mv is null or the original value
+     * of the mv is null
+     */
+    public static ModifiableByte softlySetValue(ModifiableByte mv, Byte value) {
+        if (mv == null) {
+            return new ModifiableByte(value);
+        } else if (mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
+    /**
+     * Returns only a ModifiableByte with the value, if the given mv is null or the original value
+     * of the mv is null or alwaysSet is true
+     */
+    public static ModifiableByte softlySetValue(ModifiableByte mv, Byte value, boolean alwaysSet) {
+        if (mv == null) {
+            return new ModifiableByte(value);
+        } else if (alwaysSet || mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
     public static ModifiableByteArray safelySetValue(ModifiableByteArray mv, byte[] value) {
         if (mv == null) {
-            mv = new ModifiableByteArray();
+            return new ModifiableByteArray(value);
         }
         mv.setOriginalValue(value);
         return mv;
     }
 
+    /**
+     * Returns only a ModifiableByteArray with the value, if the given mv is null or the original
+     * value of the mv is null
+     */
+    public static ModifiableByteArray softlySetValue(ModifiableByteArray mv, byte[] value) {
+        if (mv == null) {
+            return new ModifiableByteArray(value);
+        } else if (mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
+    /**
+     * Returns only a ModifiableByteArray with the value, if the given mv is null or the original
+     * value of the mv is null or alwaysSet is true
+     */
+    public static ModifiableByteArray softlySetValue(
+            ModifiableByteArray mv, byte[] value, boolean alwaysSet) {
+        if (mv == null) {
+            return new ModifiableByteArray(value);
+        } else if (alwaysSet || mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
     public static ModifiableLong safelySetValue(ModifiableLong mv, Long value) {
         if (mv == null) {
-            mv = new ModifiableLong();
+            return new ModifiableLong(value);
         }
         mv.setOriginalValue(value);
         return mv;
     }
 
+    /**
+     * Returns only a ModifiableLong with the value, if the given mv is null or the original value
+     * of the mv is null
+     */
+    public static ModifiableLong softlySetValue(ModifiableLong mv, Long value) {
+        if (mv == null) {
+            return new ModifiableLong(value);
+        } else if (mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
+    /**
+     * Returns only a ModifiableLong with the value, if the given mv is null or the original value
+     * of the mv is null or alwaysSet is true
+     */
+    public static ModifiableLong softlySetValue(ModifiableLong mv, Long value, boolean alwaysSet) {
+        if (mv == null) {
+            return new ModifiableLong(value);
+        } else if (alwaysSet || mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
     public static ModifiableBoolean safelySetValue(ModifiableBoolean mv, Boolean value) {
         if (mv == null) {
-            mv = new ModifiableBoolean();
+            return new ModifiableBoolean(value);
+        }
+        mv.setOriginalValue(value);
+        return mv;
+    }
+
+    /**
+     * Returns only a ModifiableBoolean with the value, if the given mv is null or the original
+     * value of the mv is null
+     */
+    public static ModifiableBoolean softlySetValue(ModifiableBoolean mv, Boolean value) {
+        if (mv == null) {
+            return new ModifiableBoolean(value);
+        } else if (mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
+    /**
+     * Returns only a ModifiableBoolean with the value, if the given mv is null or the original
+     * value of the mv is null or alwaysSet is true
+     */
+    public static ModifiableBoolean softlySetValue(
+            ModifiableBoolean mv, Boolean value, boolean alwaysSet) {
+        if (mv == null) {
+            return new ModifiableBoolean(value);
+        } else if (alwaysSet || mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
+    public static ModifiablePath safelySetValue(ModifiablePath mv, String value) {
+        if (mv == null) {
+            return new ModifiablePath(value);
         }
         mv.setOriginalValue(value);
         return mv;
     }
 
-    private ModifiableVariableFactory() {}
+    /**
+     * Returns only a ModifiablePath with the value, if the given mv is null or the original value
+     * of the mv is null
+     */
+    public static ModifiablePath softlySetValue(ModifiablePath mv, String value) {
+        if (mv == null) {
+            return new ModifiablePath(value);
+        } else if (mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
+    /**
+     * Returns only a ModifiablePath with the value, if the given mv is null or the original value
+     * of the mv is null or alwaysSet is true
+     */
+    public static ModifiablePath softlySetValue(
+            ModifiablePath mv, String value, boolean alwaysSet) {
+        if (mv == null) {
+            return new ModifiablePath(value);
+        } else if (alwaysSet || mv.getOriginalValue() == null) {
+            mv.setOriginalValue(value);
+        }
+        return mv;
+    }
+
+    private ModifiableVariableFactory() {
+        super();
+    }
 }