Refactor/maven (#889)

* mavenize * mavenization * mavenization * mavenization * mavenization * mavenization * mavenization * mavenization * mavenization * fix * app framework update * fix lib * lib * fix mavenized * fix mavenized * fix mavenized * fix mavenized * fix mavenized * fix mavenized * fix mavenized * fix mavenized * building for win and linux * Create run.bat * fixes for netlist * cleanup * unit tests * unit tests * configurable high dpi * performance upgrade * performance upgrade * rotate bug * Omit boards, wires, traces, terminals, etc from Spice netlist output * splash version update * optimize libs * optimize libs * updates * mac build maven * ruler optimization, moved images * cleanup * notarization * test workflow * build * Update pom.xml * Update pom.xml * Create README.md * Create test.yml * maven * build
2026-11-11 01:32:08 +10:00 · 2025-03-20 19:44:40 +01:00
parent ccb98d1953
commit 4093641b7e
1232 changed files with 17811 additions and 14965 deletions
@@ -0,0 +1,28 @@
+name: Test Build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        path: diy-layout-creator
+    
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+        
+    - name: Build with Maven
+      run: |
+        cd diy-layout-creator/diylc
+        mvn -B test --file pom.xml 
@@ -0,0 +1,51 @@
+name: Java CI Tests
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Set up JDK
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'  # Adjust version as needed
+        distribution: 'temurin'
+        cache: maven
+        
+    - name: Run Tests
+      run: mvn test
+      
+    # Generate and report coverage without failing
+    - name: Generate Coverage Report
+      run: mvn jacoco:report
+      
+    - name: Report Coverage
+      run: |
+        COVERAGE=$(mvn jacoco:report | grep -oP 'Total coverage: \K[0-9.]+' || echo "unknown")
+        echo "Current test coverage: $COVERAGE%"
+        
+    - name: Upload Coverage Report
+      uses: actions/upload-artifact@v3
+      with:
+        name: coverage-report
+        path: target/site/jacoco/
+        
+    # Optional: Comment test results on PR
+    - name: Add Test Results Comment
+      uses: marocchino/sticky-pull-request-comment@v2
+      if: github.event_name == 'pull_request'
+      with:
+        message: |
+          ### Test Results Summary
+          ✅ Tests completed
+          📊 Coverage: ${{ env.COVERAGE }}%
+          
+          Coverage report available in workflow artifacts 
@@ -0,0 +1,149 @@
+# Reference: https://github.com/github/gitignore
+# From: https://gist.github.com/edesdan/6bb43343740bcd54ef0f56a384a2f66f
+
+######################
+###### Mac OS X ######
+######################
+
+# Folder view configuration files
+.DS_Store
+Desktop.ini
+
+# Thumbnail cache files
+._*
+Thumbs.db
+
+# Files that might appear on external disks
+.Spotlight-V100
+.Trashes
+
+######################
+######   Java   ######
+######################
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+######################
+######  Gradle  ######
+######################
+
+.gradle
+build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+######################
+###### Intellij ######
+######################
+
+# Created by https://www.gitignore.io/api/intellij
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff:
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+
+# Sensitive or high-churn files:
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+
+# Gradle:
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
+
+# Mongo Explorer plugin:
+.idea/**/mongoSettings.xml
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### Intellij Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+# End of https://www.gitignore.io/api/intellij
+
+######################
+######   Maven  ######
+######################
+
+**/target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
+!/.mvn/wrapper/maven-wrapper.jar
@@ -0,0 +1,4 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/org/diylc/core/measures/Resistance.java=UTF-8
-encoding//src/org/diylc/core/measures/ResistanceUnit.java=UTF-8
@@ -1,5 +1,5 @@
 <project name="diylc-core" basedir="." default="jar">
-	<property name="src.dir" value="src" />
+	<property name="src.dir" value="${basedir}/src/main/java" />

 	<property name="lib.dir" value="${basedir}/lib" />
 	<property name="build.dir" value="${basedir}/build" />
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="EclipseModuleManager">
-    <libelement value="jar://$MODULE_DIR$/lib/log4j-1.2.15.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/lib/junit-4.7.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/lib/app-framework.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/lib/jettison-1.0.1.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/lib/xstream-1.3.1.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/lib/java-http-proxy.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/lib/AppleJavaExtensions.jar!/" />
-    <src_description expected_position="0">
-      <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
-      <src_folder value="file://$MODULE_DIR$/test" expected_position="1" />
-    </src_description>
-  </component>
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/bin" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="false" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="log4j-1.2.15.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/log4j-1.2.15.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="junit-4.7.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/junit-4.7.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="app-framework.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/app-framework.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="jettison-1.0.1.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/jettison-1.0.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="xstream-1.3.1.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/xstream-1.3.1.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="java-http-proxy.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/java-http-proxy.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="AppleJavaExtensions.jar">
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/AppleJavaExtensions.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="inheritedJdk" />
-  </component>
-</module>
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.diylc</groupId>
+        <artifactId>diylc-parent</artifactId>
+        <version>5.1.0</version>
+    </parent>
+    
+    <artifactId>diylc-core</artifactId>
+    <!-- No need to specify version - it inherits from parent -->
+    
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+    </properties>
+    
+    <dependencies>
+        <!-- Common dependencies from Maven Central -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.jms</groupId>
+                    <artifactId>jms</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jdmk</groupId>
+                    <artifactId>jmxtools</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.jmx</groupId>
+                    <artifactId>jmxri</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.4.0-jre</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+            <version>1.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.10.2</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Add Mockito for testing -->
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>5.11.0</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <!-- Local dependencies from lib folder -->
+        <dependency>
+            <groupId>org.diylc.local</groupId>
+            <artifactId>app-framework</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../lib/app-framework-1.0.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>org.diylc.local</groupId>
+            <artifactId>gerber-writer-api-1.0.0</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../lib/gerber-writer-api-1.0.0.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>org.diylc.local</groupId>
+            <artifactId>java-http-proxy</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/../lib/java-http-proxy.jar</systemPath>
+        </dependency>
+    </dependencies>
+</project>
@@ -28,10 +28,12 @@ import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import org.diylc.appframework.miscutils.ConfigurationManager;
-import org.diylc.plugins.cloud.model.IServiceAPI;
+
 import com.diyfever.httpproxy.PhpFlatProxy;
 import com.diyfever.httpproxy.ProxyFactory;

+import org.diylc.plugins.cloud.model.IServiceAPI;
+
 public class AnnouncementProvider {

  private String serviceUrl = "http://www.diy-fever.com/diylc/api/v1/announcements.html";
@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
+
 import org.diylc.core.IDIYComponent;

 /**
@@ -25,6 +25,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.log4j.Logger;
+
 import org.diylc.core.IDIYComponent;

 public class ComponentTransferableFactory {
@@ -22,6 +22,7 @@
 package org.diylc.common;

 import java.util.Collection;
+
 import org.diylc.core.IDIYComponent;

 public class BuildingBlock {
@@ -23,6 +23,7 @@ package org.diylc.common;

 import java.util.List;
 import java.util.Map;
+
 import org.diylc.core.IDIYComponent;

 public class BuildingBlockPackage {
@@ -20,6 +20,7 @@ package org.diylc.common;
 import java.io.Serializable;
 import java.util.List;
 import javax.swing.Icon;
+
 import org.diylc.core.CreationMethod;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.annotations.BomPolicy;
@@ -5,6 +5,7 @@ import java.awt.geom.Point2D;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import org.apache.log4j.Logger;
+
 import org.diylc.core.Angle;
 import org.diylc.core.IDIYComponent;
 import org.diylc.presenter.ComponentProcessor;
@@ -23,6 +23,7 @@ package org.diylc.common;

 import java.awt.Rectangle;
 import java.awt.geom.Point2D;
+
 import org.diylc.core.Project;

 /**
@@ -22,6 +22,7 @@
 package org.diylc.common;

 import java.awt.geom.Point2D;
+
 import org.diylc.core.IDIYComponent;

 public interface IComponentTransformer {
@@ -22,6 +22,7 @@
 package org.diylc.common;

 import java.util.List;
+
 import org.diylc.netlist.Netlist;
 import org.diylc.netlist.Node;
 import org.diylc.netlist.Summary;
@@ -22,6 +22,7 @@
 package org.diylc.common;

 import java.util.List;
+
 import org.diylc.netlist.INetlistParser;
 import org.diylc.netlist.Netlist;
 import org.diylc.netlist.NetlistException;
@@ -35,6 +35,7 @@ import org.diylc.appframework.simplemq.IMessageListener;
 import org.diylc.appframework.simplemq.MessageDispatcher;
 import org.diylc.appframework.update.Version;
 import org.diylc.appframework.update.VersionNumber;
+
 import org.diylc.clipboard.ComponentTransferable;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;
@@ -60,6 +61,7 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP

  public static final String ANTI_ALIASING_KEY = "antiAliasing";
  public static final String HI_QUALITY_RENDER_KEY = "hiQualityRender";
+  public static final String HIGH_DPI_RENDERING = "hiDpiRendering";
  public static final String EXPORT_GRID_KEY = "exportGrid";
  public static final String STICKY_POINTS_KEY = "stickyPoints";
  public static final String METRIC_KEY = "metric";
@@ -146,7 +148,7 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
   * 
   * @param project
   * @param freshStart
-   * @param optional file name when loading from a file
+   * @param filename file name when loading from a file
   */
  void loadProject(Project project, boolean freshStart, String filename);

@@ -22,6 +22,7 @@
 package org.diylc.common;

 import java.util.Set;
+
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;

@@ -25,6 +25,7 @@ import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.util.Collection;
 import java.util.List;
+
 import org.diylc.clipboard.ComponentTransferable;
 import org.diylc.core.ExpansionMode;
 import org.diylc.core.IDIYComponent;
@@ -23,6 +23,7 @@ package org.diylc.common;

 import java.io.IOException;
 import java.util.List;
+
 import org.diylc.core.Template;

 public interface IVariantProcessor {
@@ -23,6 +23,7 @@ package org.diylc.common;

 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+
 import org.diylc.core.IPropertyValidator;

 /**
@@ -23,6 +23,7 @@ package org.diylc.common;

 import java.util.List;
 import java.util.Map;
+
 import org.diylc.core.Template;

 public class VariantPackage {
@@ -22,6 +22,7 @@
 package org.diylc.components;

 import java.awt.Shape;
+
 import org.diylc.common.Orientation;
 import org.diylc.core.Angle;
 import org.diylc.core.annotations.EditableProperty;
@@ -31,6 +31,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
 import java.util.stream.Collectors;
+
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;
 import org.diylc.core.annotations.EditableProperty;
@@ -30,6 +30,10 @@ import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.ConfigurationManager;
+
+import com.google.common.collect.Streams;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
+
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.LineStyle;
 import org.diylc.common.ObjectCache;
@@ -41,8 +45,6 @@ import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;
-import com.google.common.collect.Streams;
-import com.thoughtworks.xstream.annotations.XStreamOmitField;

 public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComponent<T> {

@@ -22,6 +22,7 @@
 package org.diylc.components.transform;

 import java.awt.geom.Point2D;
+
 import org.diylc.common.IComponentTransformer;
 import org.diylc.core.IDIYComponent;

@@ -23,6 +23,7 @@ package org.diylc.components.transform;

 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
+
 import org.diylc.common.IComponentTransformer;
 import org.diylc.core.IDIYComponent;

@@ -24,6 +24,7 @@ package org.diylc.components.transform;
 import java.awt.Point;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
+
 import org.diylc.common.IComponentTransformer;
 import org.diylc.core.IDIYComponent;

@@ -25,6 +25,7 @@ import java.awt.Graphics2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.io.Serializable;
+
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;

@@ -24,6 +24,7 @@ package org.diylc.core;
 import java.io.File;
 import java.util.List;
 import java.util.Set;
+
 import org.diylc.common.PropertyWrapper;


@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.diylc.appframework.update.VersionNumber;
+
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.MultiLineText;
 import org.diylc.core.annotations.PositiveMeasureValidator;
@@ -23,6 +23,7 @@ package org.diylc.core.annotations;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+
 import org.diylc.common.DefaultComponentTransformer;
 import org.diylc.common.IComponentTransformer;
 import org.diylc.core.CreationMethod;
@@ -23,6 +23,7 @@ package org.diylc.core.annotations;

 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+
 import org.diylc.core.AllowAllValidator;
 import org.diylc.core.IPropertyValidator;

@@ -22,6 +22,7 @@
 package org.diylc.core.annotations;

 import java.util.List;
+
 import org.diylc.core.IDIYComponent;

 /**
@@ -13,6 +13,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.log4j.Logger;
+
+import com.bancika.gerberwriter.DataLayer;
+
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IView;
@@ -20,7 +23,6 @@ import org.diylc.core.Project;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.lang.LangUtil;
-import com.bancika.gerberwriter.DataLayer;

 public class GerberExporter {

@@ -30,13 +30,15 @@ import java.awt.image.renderable.RenderableImage;
 import java.text.AttributedCharacterIterator;
 import java.util.HashMap;
 import java.util.Map;
-import org.diylc.core.IDrawingObserver;
-import org.diylc.core.measures.SizeUnit;
-import org.diylc.utils.Constants;
+
 import com.bancika.gerberwriter.DataLayer;
 import com.bancika.gerberwriter.Point;
 import com.bancika.gerberwriter.padmasters.Circle;

+import org.diylc.core.IDrawingObserver;
+import org.diylc.core.measures.SizeUnit;
+import org.diylc.utils.Constants;
+
 public class GerberG2DWrapper extends Graphics2D
    implements IDrawingObserver, IGerberDrawingObserver {

--- a/Show More
+++ b/Show More