Move properties into separate package

This cleanup makes working with them more convenient.
TheAssassin · Apr 14, 2024 · 75b3de2 · 75b3de2
1 parent 4054819
commit 75b3de2
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 16 deletions.
diff --git a/src/main/java/de/thomas_oster/visicut/VisicutModel.java b/src/main/java/de/thomas_oster/visicut/VisicutModel.java
@@ -21,7 +21,7 @@
 import de.thomas_oster.liblasercut.IllegalJobException;
 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.VectorPart;

diff --git a/src/main/java/de/thomas_oster/visicut/gui/CamCalibrationDialog.java b/src/main/java/de/thomas_oster/visicut/gui/CamCalibrationDialog.java
@@ -26,7 +26,7 @@
 
 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.VectorPart;
 import de.thomas_oster.liblasercut.platform.Util;
 import de.thomas_oster.visicut.VisicutModel;

diff --git a/src/main/java/de/thomas_oster/visicut/gui/MainView.java b/src/main/java/de/thomas_oster/visicut/gui/MainView.java
@@ -21,7 +21,7 @@
 import com.frochr123.periodictasks.RefreshCameraThread;
 import de.thomas_oster.liblasercut.IllegalJobException;
 import de.thomas_oster.liblasercut.LaserCutter;
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.liblasercut.ProgressListener;
 import de.thomas_oster.liblasercut.platform.Util;
 import de.thomas_oster.uicomponents.PlatformIcon;

diff --git a/src/main/java/de/thomas_oster/visicut/gui/VisicutApp.java b/src/main/java/de/thomas_oster/visicut/gui/VisicutApp.java
@@ -19,7 +19,7 @@
 package de.thomas_oster.visicut.gui;
 
 import de.thomas_oster.liblasercut.LaserCutter;
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.liblasercut.LibInfo;
 import de.thomas_oster.liblasercut.ProgressListener;
 import de.thomas_oster.visicut.VisicutModel;

diff --git a/src/main/java/de/thomas_oster/visicut/gui/propertypanel/LaserPropertiesTableModel.java b/src/main/java/de/thomas_oster/visicut/gui/propertypanel/LaserPropertiesTableModel.java
@@ -18,7 +18,7 @@
  **/
 package de.thomas_oster.visicut.gui.propertypanel;
 
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.liblasercut.platform.Util;
 import java.util.List;
 import javax.swing.table.DefaultTableModel;

diff --git a/src/main/java/de/thomas_oster/visicut/gui/propertypanel/PropertiesPanel.java b/src/main/java/de/thomas_oster/visicut/gui/propertypanel/PropertiesPanel.java
@@ -18,7 +18,7 @@
  **/
 package de.thomas_oster.visicut.gui.propertypanel;
 
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.visicut.VisicutModel;
 import de.thomas_oster.visicut.managers.LaserPropertyManager;
 import de.thomas_oster.visicut.model.LaserDevice;

diff --git a/src/main/java/de/thomas_oster/visicut/gui/propertypanel/PropertyPanel.java b/src/main/java/de/thomas_oster/visicut/gui/propertypanel/PropertyPanel.java
@@ -18,7 +18,7 @@
  **/
 package de.thomas_oster.visicut.gui.propertypanel;
 
-import de.thomas_oster.liblasercut.LaserProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
 import de.thomas_oster.uicomponents.EditableTableProvider;
 import de.thomas_oster.visicut.VisicutModel;
 import de.thomas_oster.visicut.model.LaserDevice;

diff --git a/src/main/java/de/thomas_oster/visicut/managers/LaserPropertyManager.java b/src/main/java/de/thomas_oster/visicut/managers/LaserPropertyManager.java
@@ -18,8 +18,10 @@
  **/
 package de.thomas_oster.visicut.managers;
 
-import de.thomas_oster.liblasercut.LaserProperty;
-import de.thomas_oster.liblasercut.PowerSpeedFocusProperty;
+import de.thomas_oster.liblasercut.properties.LaserProperty;
+import de.thomas_oster.liblasercut.properties.PowerSpeedFocusProperty;
+import de.thomas_oster.liblasercut.properties.FloatPowerSpeedFocusFrequencyProperty;
+import de.thomas_oster.liblasercut.properties.PowerSpeedFocusFrequencyProperty;
 import de.thomas_oster.visicut.misc.Helper;
 import de.thomas_oster.visicut.model.LaserDevice;
 import de.thomas_oster.visicut.model.LaserProfile;
@@ -169,9 +171,9 @@ protected XStream getXStream()
       //fix old class references
       xstream.aliasPackage("com.t_oster", "de.thomas_oster");
       xstream.alias("LaosCutterProperty", de.thomas_oster.liblasercut.drivers.LaosCutterProperty.class);
-      xstream.alias("FloatPowerSpeedFocusFrequencyProperty", de.thomas_oster.liblasercut.FloatPowerSpeedFocusFrequencyProperty.class);
-      xstream.alias("PowerSpeedFocusFrequencyProperty", de.thomas_oster.liblasercut.PowerSpeedFocusFrequencyProperty.class);
-      xstream.alias("PowerSpeedFocusProperty", de.thomas_oster.liblasercut.PowerSpeedFocusProperty.class);
+      xstream.alias("FloatPowerSpeedFocusFrequencyProperty", FloatPowerSpeedFocusFrequencyProperty.class);
+      xstream.alias("PowerSpeedFocusFrequencyProperty", PowerSpeedFocusFrequencyProperty.class);
+      xstream.alias("PowerSpeedFocusProperty", PowerSpeedFocusProperty.class);
     }
     return xstream;
   }

diff --git a/src/main/java/de/thomas_oster/visicut/model/LaserProfile.java b/src/main/java/de/thomas_oster/visicut/model/LaserProfile.java
@@ -20,7 +20,7 @@
 
 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.platform.Util;
 import de.thomas_oster.uicomponents.ImageListable;
 import de.thomas_oster.visicut.misc.Helper;

diff --git a/src/main/java/de/thomas_oster/visicut/model/Raster3dProfile.java b/src/main/java/de/thomas_oster/visicut/model/Raster3dProfile.java
@@ -20,7 +20,7 @@
 
 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.platform.Point;

diff --git a/src/main/java/de/thomas_oster/visicut/model/RasterProfile.java b/src/main/java/de/thomas_oster/visicut/model/RasterProfile.java
@@ -21,7 +21,7 @@
 import de.thomas_oster.liblasercut.BlackWhiteRaster;
 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.RasterPart;
 import de.thomas_oster.liblasercut.dithering.DitheringAlgorithm;

diff --git a/src/main/java/de/thomas_oster/visicut/model/VectorProfile.java b/src/main/java/de/thomas_oster/visicut/model/VectorProfile.java
@@ -20,7 +20,7 @@
 
 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.VectorPart;
 import de.thomas_oster.liblasercut.platform.Util;
 import de.thomas_oster.liblasercut.utils.ShapeConverter;