Move properties into separate package

This cleanup makes working with them more convenient.
t-oster · Apr 19, 2024 · 9567030 · 9567030
1 parent 365301a
commit 9567030
Show file tree

Hide file tree

Showing 45 changed files with 72 additions and 231 deletions.
diff --git a/src/main/java/de/thomas_oster/liblasercut/FloatMinMaxPowerSpeedFrequencyProperty.java b/src/main/java/de/thomas_oster/liblasercut/FloatMinMaxPowerSpeedFrequencyProperty.java
diff --git a/src/main/java/de/thomas_oster/liblasercut/LaserCutter.java b/src/main/java/de/thomas_oster/liblasercut/LaserCutter.java
@@ -24,6 +24,10 @@
 
 import de.thomas_oster.liblasercut.platform.Point;
 import de.thomas_oster.liblasercut.platform.Util;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
+import de.thomas_oster.liblasercut.properties.PowerSpeedFocusFrequencyProperty;
+import de.thomas_oster.liblasercut.properties.PowerSpeedFocusProperty;
+
 import java.io.OutputStream;
 
 import java.util.LinkedList;

diff --git a/src/main/java/de/thomas_oster/liblasercut/Raster3dPart.java b/src/main/java/de/thomas_oster/liblasercut/Raster3dPart.java
@@ -19,6 +19,8 @@
 package de.thomas_oster.liblasercut;
 
 import de.thomas_oster.liblasercut.platform.Point;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
+
 import java.util.List;
 
 /**

diff --git a/src/main/java/de/thomas_oster/liblasercut/RasterBuilder.java b/src/main/java/de/thomas_oster/liblasercut/RasterBuilder.java
@@ -20,6 +20,8 @@
 package de.thomas_oster.liblasercut;
 
 import de.thomas_oster.liblasercut.VectorCommand.CmdType;
+import de.thomas_oster.liblasercut.properties.AbstractLaserProperty;
+
 import java.util.Iterator;
 
 /**

diff --git a/src/main/java/de/thomas_oster/liblasercut/RasterPart.java b/src/main/java/de/thomas_oster/liblasercut/RasterPart.java
@@ -19,6 +19,8 @@
 package de.thomas_oster.liblasercut;
 
 import de.thomas_oster.liblasercut.platform.Point;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
+
 import java.util.List;
 
 /**

diff --git a/src/main/java/de/thomas_oster/liblasercut/RasterizableJobPart.java b/src/main/java/de/thomas_oster/liblasercut/RasterizableJobPart.java
@@ -19,6 +19,8 @@
 package de.thomas_oster.liblasercut;
 
 import de.thomas_oster.liblasercut.platform.Point;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
+
 import java.util.List;
 
 /**

diff --git a/src/main/java/de/thomas_oster/liblasercut/VectorCommand.java b/src/main/java/de/thomas_oster/liblasercut/VectorCommand.java
@@ -22,6 +22,8 @@
  */
 package de.thomas_oster.liblasercut;
 
+import de.thomas_oster.liblasercut.properties.LaserProperty;
+
 /**
  *
  * @author Thomas Oster <[email protected]>

diff --git a/src/main/java/de/thomas_oster/liblasercut/VectorPart.java b/src/main/java/de/thomas_oster/liblasercut/VectorPart.java
@@ -18,6 +18,8 @@
  */
 package de.thomas_oster.liblasercut;
 
+import de.thomas_oster.liblasercut.properties.LaserProperty;
+
 import java.util.LinkedList;
 import java.util.List;
 

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/Dummy.java b/src/main/java/de/thomas_oster/liblasercut/drivers/Dummy.java
@@ -22,8 +22,8 @@
 import de.thomas_oster.liblasercut.JobPart;
 import de.thomas_oster.liblasercut.LaserCutter;
 import de.thomas_oster.liblasercut.LaserJob;
-import de.thomas_oster.liblasercut.PowerSpeedFocusFrequencyProperty;
-import de.thomas_oster.liblasercut.PowerSpeedFocusProperty;
+import de.thomas_oster.liblasercut.properties.PowerSpeedFocusFrequencyProperty;
+import de.thomas_oster.liblasercut.properties.PowerSpeedFocusProperty;
 import de.thomas_oster.liblasercut.ProgressListener;
 import de.thomas_oster.liblasercut.ProgressListenerDummy;
 import de.thomas_oster.liblasercut.Raster3dPart;

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/EpilogCutter.java b/src/main/java/de/thomas_oster/liblasercut/drivers/EpilogCutter.java
@@ -26,7 +26,10 @@
 
 import de.thomas_oster.liblasercut.*;
 import de.thomas_oster.liblasercut.platform.Point;
-import de.thomas_oster.liblasercut.platform.Util;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
+import de.thomas_oster.liblasercut.properties.PowerSpeedFocusFrequencyProperty;
+import de.thomas_oster.liblasercut.properties.PowerSpeedFocusProperty;
+
 import java.io.*;
 import java.net.InetSocketAddress;
 import java.net.Socket;

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/EpilogEngraveProperty.java b/src/main/java/de/thomas_oster/liblasercut/drivers/EpilogEngraveProperty.java
@@ -18,7 +18,7 @@
  */
 package de.thomas_oster.liblasercut.drivers;
 
-import de.thomas_oster.liblasercut.PowerSpeedFocusProperty;
+import de.thomas_oster.liblasercut.properties.PowerSpeedFocusProperty;
 import java.util.Arrays;
 import java.util.LinkedList;
 

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/FloatPowerSpeedProperty.java b/src/main/java/de/thomas_oster/liblasercut/drivers/FloatPowerSpeedProperty.java
@@ -18,7 +18,7 @@
  */
 package de.thomas_oster.liblasercut.drivers;
 
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 
 /**
  * Based upon PowerSpeedFocusProperty by Thomas Oster <[email protected]>

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/FullSpectrumCutter.java b/src/main/java/de/thomas_oster/liblasercut/drivers/FullSpectrumCutter.java
@@ -23,7 +23,7 @@
 import de.thomas_oster.liblasercut.JobPart;
 import de.thomas_oster.liblasercut.LaserCutter;
 import de.thomas_oster.liblasercut.LaserJob;
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.liblasercut.ProgressListener;
 import de.thomas_oster.liblasercut.VectorCommand;
 import de.thomas_oster.liblasercut.VectorPart;

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/GenericGcodeDriver.java b/src/main/java/de/thomas_oster/liblasercut/drivers/GenericGcodeDriver.java
@@ -18,12 +18,12 @@
  */
 package de.thomas_oster.liblasercut.drivers;
 
-import de.thomas_oster.liblasercut.FloatPowerSpeedFocusProperty;
+import de.thomas_oster.liblasercut.properties.FloatPowerSpeedFocusProperty;
 import de.thomas_oster.liblasercut.IllegalJobException;
 import de.thomas_oster.liblasercut.JobPart;
 import de.thomas_oster.liblasercut.LaserCutter;
 import de.thomas_oster.liblasercut.LaserJob;
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.liblasercut.OptionSelector;
 import de.thomas_oster.liblasercut.ProgressListener;
 import de.thomas_oster.liblasercut.ProgressListenerDummy;

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/GoldCutHPGL.java b/src/main/java/de/thomas_oster/liblasercut/drivers/GoldCutHPGL.java
@@ -25,7 +25,7 @@
 import de.thomas_oster.liblasercut.JobPart;
 import de.thomas_oster.liblasercut.LaserCutter;
 import de.thomas_oster.liblasercut.LaserJob;
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.liblasercut.ProgressListener;
 import de.thomas_oster.liblasercut.ProgressListenerDummy;
 import de.thomas_oster.liblasercut.RasterizableJobPart;

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/IModelaMill.java b/src/main/java/de/thomas_oster/liblasercut/drivers/IModelaMill.java
@@ -23,7 +23,7 @@
 import de.thomas_oster.liblasercut.JobPart;
 import de.thomas_oster.liblasercut.LaserCutter;
 import de.thomas_oster.liblasercut.LaserJob;
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.liblasercut.ProgressListener;
 import de.thomas_oster.liblasercut.ProgressListenerDummy;
 import de.thomas_oster.liblasercut.Raster3dPart;

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/IModelaProperty.java b/src/main/java/de/thomas_oster/liblasercut/drivers/IModelaProperty.java
@@ -19,7 +19,7 @@
 
 package de.thomas_oster.liblasercut.drivers;
 
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.liblasercut.platform.Util;
 
 /**

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/K3EngraverDriver.java b/src/main/java/de/thomas_oster/liblasercut/drivers/K3EngraverDriver.java
@@ -21,13 +21,13 @@
 package de.thomas_oster.liblasercut.drivers;
 
 import de.thomas_oster.liblasercut.ByteArrayList;
-import de.thomas_oster.liblasercut.FloatPowerSpeedFocusProperty;
+import de.thomas_oster.liblasercut.properties.FloatPowerSpeedFocusProperty;
 import de.thomas_oster.liblasercut.IllegalJobException;
 import de.thomas_oster.liblasercut.JobPart;
 import de.thomas_oster.liblasercut.LaserCutter;
 import de.thomas_oster.liblasercut.LaserJob;
-import de.thomas_oster.liblasercut.LaserProperty;
-import de.thomas_oster.liblasercut.PowerSpeedFocusFrequencyProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
+import de.thomas_oster.liblasercut.properties.PowerSpeedFocusFrequencyProperty;
 import de.thomas_oster.liblasercut.ProgressListener;
 import de.thomas_oster.liblasercut.ProgressListenerDummy;
 import de.thomas_oster.liblasercut.Raster3dPart;

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/K40NanoDriver.java b/src/main/java/de/thomas_oster/liblasercut/drivers/K40NanoDriver.java
@@ -19,20 +19,20 @@
 
 package de.thomas_oster.liblasercut.drivers;
 
-import de.thomas_oster.liblasercut.AbstractLaserProperty;
+import de.thomas_oster.liblasercut.properties.AbstractLaserProperty;
 import de.thomas_oster.liblasercut.IllegalJobException;
 import de.thomas_oster.liblasercut.JobPart;
 import de.thomas_oster.liblasercut.LaserCutter;
 import de.thomas_oster.liblasercut.LaserJob;
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.liblasercut.ProgressListener;
 import de.thomas_oster.liblasercut.RasterBuilder;
 import de.thomas_oster.liblasercut.RasterElement;
 import de.thomas_oster.liblasercut.RasterPart;
 import de.thomas_oster.liblasercut.VectorCommand;
 import de.thomas_oster.liblasercut.VectorPart;
 import de.thomas_oster.liblasercut.utils.LinefeedPrintStream;
-import java.io.FileOutputStream;
+
 import java.io.OutputStream;
 
 import java.io.PrintStream;

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/LaosCutter.java b/src/main/java/de/thomas_oster/liblasercut/drivers/LaosCutter.java
@@ -23,7 +23,7 @@
 import de.thomas_oster.liblasercut.JobPart;
 import de.thomas_oster.liblasercut.LaserCutter;
 import de.thomas_oster.liblasercut.LaserJob;
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.liblasercut.ProgressListener;
 import de.thomas_oster.liblasercut.Raster3dPart;
 import de.thomas_oster.liblasercut.RasterPart;

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/LaosCutterProperty.java b/src/main/java/de/thomas_oster/liblasercut/drivers/LaosCutterProperty.java
@@ -18,7 +18,7 @@
  */
 package de.thomas_oster.liblasercut.drivers;
 
-import de.thomas_oster.liblasercut.FloatPowerSpeedFocusFrequencyProperty;
+import de.thomas_oster.liblasercut.properties.FloatPowerSpeedFocusFrequencyProperty;
 import java.util.Arrays;
 import java.util.LinkedList;
 

diff --git a/src/main/java/de/thomas_oster/liblasercut/drivers/LaosEngraveProperty.java b/src/main/java/de/thomas_oster/liblasercut/drivers/LaosEngraveProperty.java
@@ -19,7 +19,7 @@
 
 package de.thomas_oster.liblasercut.drivers;
 
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import java.util.Arrays;
 import java.util.LinkedList;
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,8 @@ @@
      */
     package de.thomas_oster.liblasercut;
+    import de.thomas_oster.liblasercut.properties.LaserProperty;
     /**
      *
      * @author Thomas Oster <[email protected]>
@@ Expand Down @@