mavenization

diylc/diylc-core/.classpath

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
@@ -11,10 +10,58 @@
 	<classpathentry kind="lib" path="lib/xstream-1.4.19.jar"/>
 	<classpathentry kind="lib" path="lib/guava-31.1-jre.jar"/>
 	<classpathentry kind="lib" path="lib/gerber-writer-api-1.0.0.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

diylc/diylc-core/.project

@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 	<filteredResources>

diylc/diylc-core/src/main/java/org/diylc/announcements/AnnouncementProvider.java

@@ -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";

diylc/diylc-core/src/main/java/org/diylc/clipboard/ComponentTransferable.java

@@ -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;
 
 /**

diylc/diylc-core/src/main/java/org/diylc/clipboard/ComponentTransferableFactory.java

@@ -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 {

diylc/diylc-core/src/main/java/org/diylc/common/BuildingBlock.java

@@ -22,6 +22,7 @@
 package org.diylc.common;
 
 import java.util.Collection;
+
 import org.diylc.core.IDIYComponent;
 
 public class BuildingBlock {

diylc/diylc-core/src/main/java/org/diylc/common/BuildingBlockPackage.java

@@ -23,6 +23,7 @@ package org.diylc.common;
 
 import java.util.List;
 import java.util.Map;
+
 import org.diylc.core.IDIYComponent;
 
 public class BuildingBlockPackage {

diylc/diylc-core/src/main/java/org/diylc/common/ComponentType.java

@@ -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;

diylc/diylc-core/src/main/java/org/diylc/common/DefaultComponentTransformer.java

@@ -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;

diylc/diylc-core/src/main/java/org/diylc/common/EventType.java

@@ -23,6 +23,7 @@ package org.diylc.common;
 
 import java.awt.Rectangle;
 import java.awt.geom.Point2D;
+
 import org.diylc.core.Project;
 
 /**

diylc/diylc-core/src/main/java/org/diylc/common/IComponentTransformer.java

@@ -22,6 +22,7 @@
 package org.diylc.common;
 
 import java.awt.geom.Point2D;
+
 import org.diylc.core.IDIYComponent;
 
 public interface IComponentTransformer {

diylc/diylc-core/src/main/java/org/diylc/common/INetlistAnalyzer.java

@@ -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;

diylc/diylc-core/src/main/java/org/diylc/common/INetlistProcessor.java

@@ -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;

diylc/diylc-core/src/main/java/org/diylc/common/IPlugInPort.java

@@ -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;

diylc/diylc-core/src/main/java/org/diylc/common/IProjectEditor.java

@@ -22,6 +22,7 @@
 package org.diylc.common;
 
 import java.util.Set;
+
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;
 

diylc/diylc-core/src/main/java/org/diylc/common/ISelectionProcessor.java

@@ -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;

diylc/diylc-core/src/main/java/org/diylc/common/IVariantProcessor.java

@@ -23,6 +23,7 @@ package org.diylc.common;
 
 import java.io.IOException;
 import java.util.List;
+
 import org.diylc.core.Template;
 
 public interface IVariantProcessor {

diylc/diylc-core/src/main/java/org/diylc/common/PropertyWrapper.java

@@ -23,6 +23,7 @@ package org.diylc.common;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+
 import org.diylc.core.IPropertyValidator;
 
 /**

diylc/diylc-core/src/main/java/org/diylc/common/VariantPackage.java

@@ -23,6 +23,7 @@ package org.diylc.common;
 
 import java.util.List;
 import java.util.Map;
+
 import org.diylc.core.Template;
 
 public class VariantPackage {

diylc/diylc-core/src/main/java/org/diylc/components/AbstractAngledComponent.java

@@ -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;

diylc/diylc-core/src/main/java/org/diylc/components/AbstractComponent.java

@@ -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;

diylc/diylc-core/src/main/java/org/diylc/components/AbstractCurvedComponent.java

@@ -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> {
 

diylc/diylc-core/src/main/java/org/diylc/components/transform/DefaultTransformer.java

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

diylc/diylc-core/src/main/java/org/diylc/components/transform/LeadedComponentTransformer.java

@@ -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;
 

diylc/diylc-core/src/main/java/org/diylc/components/transform/SimpleComponentTransformer.java

@@ -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;
 

diylc/diylc-core/src/main/java/org/diylc/core/IDIYComponent.java

@@ -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;
 

diylc/diylc-core/src/main/java/org/diylc/core/IView.java

@@ -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;
 
 

diylc/diylc-core/src/main/java/org/diylc/core/Project.java

@@ -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;

diylc/diylc-core/src/main/java/org/diylc/core/annotations/ComponentDescriptor.java

@@ -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;

diylc/diylc-core/src/main/java/org/diylc/core/annotations/EditableProperty.java

@@ -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;
 

diylc/diylc-core/src/main/java/org/diylc/core/annotations/IAutoCreator.java

@@ -22,6 +22,7 @@
 package org.diylc.core.annotations;
 
 import java.util.List;
+
 import org.diylc.core.IDIYComponent;
 
 /**

diylc/diylc-core/src/main/java/org/diylc/core/gerber/GerberExporter.java

@@ -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 {
 

diylc/diylc-core/src/main/java/org/diylc/core/gerber/GerberG2DWrapper.java

@@ -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 {
 

diylc/diylc-core/src/main/java/org/diylc/core/gerber/GerberPathRenderer.java

@@ -19,15 +19,17 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import javax.imageio.ImageIO;
-import org.diylc.core.ComponentState;
+
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.Project;
-import org.diylc.core.measures.SizeUnit;
 import com.bancika.gerberwriter.DataLayer;
 import com.bancika.gerberwriter.Point;
 import com.bancika.gerberwriter.path.MoveTo;
 import com.bancika.gerberwriter.path.Path;
 
+import org.diylc.core.ComponentState;
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.Project;
+import org.diylc.core.measures.SizeUnit;
+
 public class GerberPathRenderer {
 
   public static void drawComponent(Project currentProject, GerberG2DWrapper g2d, IDIYComponent<?> c,

diylc/diylc-core/src/main/java/org/diylc/core/gerber/IGerberComponentCustom.java

@@ -3,6 +3,7 @@ package org.diylc.core.gerber;
 import java.awt.Graphics2D;
 import java.util.EnumSet;
 import java.util.Set;
+
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;

diylc/diylc-core/src/main/java/org/diylc/core/measures/Resistance.java

@@ -22,6 +22,7 @@
 package org.diylc.core.measures;
 
 import java.awt.Color;
+
 import org.diylc.common.ResistorColorCode;
 
 public class Resistance extends AbstractMeasure<ResistanceUnit> {

diylc/diylc-core/src/main/java/org/diylc/lang/LangUtil.java

@@ -32,6 +32,7 @@ import java.util.Map;
 import java.util.stream.Stream;
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.ConfigurationManager;
+
 import org.diylc.common.IPlugInPort;
 import org.diylc.utils.ResourceLoader;
 

diylc/diylc-core/src/main/java/org/diylc/netlist/AbstractNetlistParser.java

@@ -33,6 +33,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

diylc/diylc-core/src/main/java/org/diylc/netlist/ContinuityGraph.java

@@ -24,6 +24,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import org.diylc.presenter.ContinuityArea;
 import org.diylc.utils.RTree;
 

diylc/diylc-core/src/main/java/org/diylc/netlist/Group.java

@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import org.diylc.core.IDIYComponent;
 
 /**

diylc/diylc-core/src/main/java/org/diylc/netlist/INetlistParser.java

@@ -20,6 +20,7 @@ package org.diylc.netlist;
 
 import java.util.List;
 import java.util.Map;
+
 import org.diylc.core.IDIYComponent;
 
 /*

diylc/diylc-core/src/main/java/org/diylc/netlist/Netlist.java

@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import org.diylc.core.IDIYComponent;
 
 public class Netlist implements Comparable<Netlist> {

diylc/diylc-core/src/main/java/org/diylc/netlist/NetlistAnalyzer.java

@@ -24,6 +24,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.diylc.core.IDIYComponent;
 
 public abstract class NetlistAnalyzer {

diylc/diylc-core/src/main/java/org/diylc/netlist/NetlistBuilder.java

@@ -30,6 +30,11 @@ import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 import org.apache.log4j.Logger;
+
+import com.google.common.graph.GraphBuilder;
+import com.google.common.graph.ImmutableGraph;
+import com.google.common.graph.ImmutableGraph.Builder;
+
 import org.diylc.common.ComponentType;
 import org.diylc.core.ICommonNode;
 import org.diylc.core.IContinuity;
@@ -42,9 +47,7 @@ import org.diylc.presenter.ComponentProcessor;
 import org.diylc.presenter.Connection;
 import org.diylc.presenter.ContinuityArea;
 import org.diylc.utils.RTree;
-import com.google.common.graph.GraphBuilder;
+
-import com.google.common.graph.ImmutableGraph;
-import com.google.common.graph.ImmutableGraph.Builder;
 import com.google.common.graph.Traverser;
 
 public class NetlistBuilder {

diylc/diylc-core/src/main/java/org/diylc/netlist/Node.java

@@ -22,6 +22,7 @@
 package org.diylc.netlist;
 
 import java.awt.geom.Point2D;
+
 import org.diylc.core.ICommonNode;
 import org.diylc.core.IDIYComponent;
 

diylc/diylc-core/src/main/java/org/diylc/netlist/TreeLeaf.java

@@ -22,6 +22,7 @@
 package org.diylc.netlist;
 
 import java.util.List;
+
 import org.diylc.core.IDIYComponent;
 
 public class TreeLeaf implements ITree {

diylc/diylc-core/src/main/java/org/diylc/plugins/cloud/model/ProjectEntity.java

@@ -22,6 +22,7 @@
 package org.diylc.plugins.cloud.model;
 
 import java.io.Serializable;
+
 import org.diylc.core.annotations.DynamicList;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.MultiLineText;

diylc/diylc-core/src/main/java/org/diylc/plugins/cloud/presenter/CloudPresenter.java

@@ -33,6 +33,10 @@ import java.util.Collections;
 import java.util.List;
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.ConfigurationManager;
+
+import com.diyfever.httpproxy.PhpFlatProxy;
+import com.diyfever.httpproxy.ProxyFactory;
+
 import org.diylc.common.PropertyWrapper;
 import org.diylc.plugins.cloud.model.CommentEntity;
 import org.diylc.plugins.cloud.model.IServiceAPI;
@@ -40,8 +44,6 @@ import org.diylc.plugins.cloud.model.ProjectEntity;
 import org.diylc.plugins.cloud.model.UserEntity;
 import org.diylc.presenter.ComparatorFactory;
 import org.diylc.presenter.ComponentProcessor;
-import com.diyfever.httpproxy.PhpFlatProxy;
-import com.diyfever.httpproxy.ProxyFactory;
 
 /**
  * Contains all the back-end logic for using the cloud and manipulating projects on the cloud.

diylc/diylc-core/src/main/java/org/diylc/plugins/cloud/presenter/SearchSession.java

@@ -22,6 +22,7 @@
 package org.diylc.plugins.cloud.presenter;
 
 import java.util.List;
+
 import org.diylc.plugins.cloud.model.ProjectEntity;
 
 /**

diylc/diylc-core/src/main/java/org/diylc/presenter/BuildingBlockManager.java

@@ -32,16 +32,18 @@ import java.util.List;
 import java.util.Map;
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.IConfigurationManager;
-import org.diylc.common.BuildingBlockPackage;
+
-import org.diylc.common.IBlockProcessor;
-import org.diylc.common.IBlockProcessor.InvalidBlockException;
-import org.diylc.common.IPlugInPort;
-import org.diylc.core.IDIYComponent;
-import org.diylc.serialization.ProjectFileManager;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 
+import org.diylc.common.BuildingBlockPackage;
+import org.diylc.common.IBlockProcessor;
+import org.diylc.common.IPlugInPort;
+import org.diylc.common.IBlockProcessor.InvalidBlockException;
+import org.diylc.core.IDIYComponent;
+import org.diylc.serialization.ProjectFileManager;
+
 public class BuildingBlockManager {
 
   private static final String BLOCKS_FILE_NAME = "blocks.xml";

diylc/diylc-core/src/main/java/org/diylc/presenter/CalcUtils.java

@@ -20,6 +20,7 @@ package org.diylc.presenter;
 
 import java.awt.geom.Point2D;
 import java.util.List;
+
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.measures.Size;
 

diylc/diylc-core/src/main/java/org/diylc/presenter/ComparatorFactory.java

@@ -22,6 +22,7 @@
 package org.diylc.presenter;
 
 import java.util.Comparator;
+
 import org.diylc.common.ComponentType;
 import org.diylc.common.PropertyWrapper;
 import org.diylc.core.IDIYComponent;

diylc/diylc-core/src/main/java/org/diylc/presenter/ComponentProcessor.java

@@ -35,6 +35,7 @@ import java.util.Map;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import org.apache.log4j.Logger;
+
 import org.diylc.common.ComponentType;
 import org.diylc.common.IComponentTransformer;
 import org.diylc.common.PropertyWrapper;

diylc/diylc-core/src/main/java/org/diylc/presenter/ContinuityArea.java

@@ -20,6 +20,7 @@ package org.diylc.presenter;
 
 import java.awt.geom.Area;
 import java.io.Serializable;
+
 import org.diylc.netlist.AreaSimplifier;
 
 public class ContinuityArea implements Serializable {

diylc/diylc-core/src/main/java/org/diylc/presenter/DatasheetService.java

@@ -55,10 +55,11 @@ public class DatasheetService {
   private DatasheetService() {}
 
   public List<String[]> loadDatasheet(Class<?> clazz) {
+    ClassLoader classloader = Thread.currentThread().getContextClassLoader();
     return datasheetCache.computeIfAbsent(clazz.getCanonicalName(), key -> {
       String fileName = clazz.getSimpleName() + ".datasheet";
       LOG.info("Loading datasheet file for " + fileName);
-      URL resource = clazz.getResource(fileName);
+      URL resource = classloader.getResource(fileName);
       if (resource == null) {
         LOG.warn("Datasheet file not found: " + fileName);
         return null;

diylc/diylc-core/src/main/java/org/diylc/presenter/DrawingCache.java

@@ -28,6 +28,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.log4j.Logger;
+
 import org.diylc.common.ComponentType;
 import org.diylc.core.ComponentForRender;
 import org.diylc.core.ComponentState;

diylc/diylc-core/src/main/java/org/diylc/presenter/DrawingManager.java

@@ -48,6 +48,7 @@ import java.util.stream.Collectors;
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.IConfigurationManager;
 import org.diylc.appframework.simplemq.MessageDispatcher;
+
 import org.diylc.common.DrawOption;
 import org.diylc.common.EventType;
 import org.diylc.common.GridType;

diylc/diylc-core/src/main/java/org/diylc/presenter/G2DWrapper.java

@@ -62,6 +62,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import org.diylc.common.ObjectCache;
 import org.diylc.common.ZoomableStroke;
 import org.diylc.core.IDrawingObserver;

diylc/diylc-core/src/main/java/org/diylc/presenter/InstantiationManager.java

@@ -34,6 +34,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.ConfigurationManager;
+
 import org.diylc.clipboard.ComponentTransferable;
 import org.diylc.common.ComponentType;
 import org.diylc.common.IPlugInPort;

diylc/diylc-core/src/main/java/org/diylc/presenter/PCBLayerFilter.java

@@ -22,6 +22,7 @@
 package org.diylc.presenter;
 
 import java.lang.reflect.Method;
+
 import org.diylc.common.IComponentFilter;
 import org.diylc.common.PCBLayer;
 import org.diylc.core.IDIYComponent;

diylc/diylc-core/src/main/java/org/diylc/presenter/Presenter.java

@@ -55,6 +55,11 @@ import org.diylc.appframework.miscutils.Utils;
 import org.diylc.appframework.simplemq.MessageDispatcher;
 import org.diylc.appframework.update.Version;
 import org.diylc.appframework.update.VersionNumber;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.thoughtworks.xstream.security.AnyTypePermission;
+
 import org.diylc.clipboard.ComponentTransferable;
 import org.diylc.common.ComponentType;
 import org.diylc.common.DrawOption;
@@ -90,9 +95,6 @@ import org.diylc.test.DIYTest;
 import org.diylc.test.Snapshot;
 import org.diylc.utils.Constants;
 import org.diylc.utils.ReflectionUtils;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-import com.thoughtworks.xstream.security.AnyTypePermission;
 
 /**
  * The main presenter class, contains core app logic and drawing routines.

diylc/diylc-core/src/main/java/org/diylc/presenter/VariantManager.java

@@ -34,12 +34,14 @@ import java.util.TreeMap;
 import java.util.stream.Collectors;
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.IConfigurationManager;
+
+import com.thoughtworks.xstream.XStream;
+
 import org.diylc.common.ComponentType;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.VariantPackage;
 import org.diylc.core.Template;
 import org.diylc.serialization.ProjectFileManager;
-import com.thoughtworks.xstream.XStream;
 
 public class VariantManager {
 

diylc/diylc-core/src/main/java/org/diylc/serialization/IOldFileParser.java

@@ -22,9 +22,11 @@
 package org.diylc.serialization;
 
 import java.util.List;
-import org.diylc.core.Project;
+
 import org.w3c.dom.Element;
 
+import org.diylc.core.Project;
+
 public interface IOldFileParser {
 
   boolean canParse(String version);

diylc/diylc-core/src/main/java/org/diylc/serialization/MeasureConverter.java

@@ -21,13 +21,14 @@
 */
 package org.diylc.serialization;
 
-import org.diylc.core.measures.AbstractMeasure;
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 
+import org.diylc.core.measures.AbstractMeasure;
+
 /**
  * Serializes objects of types derived from {@link AbstractMeasure} objects in a compact format. Backwards compatible when unmarshalling.
  * 

diylc/diylc-core/src/main/java/org/diylc/serialization/PointConverter.java

@@ -22,13 +22,15 @@
 package org.diylc.serialization;
 
 import java.awt.geom.Point2D;
-import org.diylc.utils.Constants;
+
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 
+import org.diylc.utils.Constants;
+
 /**
  * Serializes {@link Point2D} objects by converting coordinates from pixels to inches, thus avoiding
  * the resolution to affect point placement.

diylc/diylc-core/src/main/java/org/diylc/serialization/ProjectFileManager.java

@@ -43,10 +43,6 @@ import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.Utils;
 import org.diylc.appframework.simplemq.MessageDispatcher;
 import org.diylc.appframework.update.VersionNumber;
-import org.diylc.common.EventType;
-import org.diylc.core.Project;
-import org.diylc.presenter.Presenter;
-import org.diylc.test.DIYTest;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -57,6 +53,11 @@ import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.thoughtworks.xstream.mapper.MapperWrapper;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 
+import org.diylc.common.EventType;
+import org.diylc.core.Project;
+import org.diylc.presenter.Presenter;
+import org.diylc.test.DIYTest;
+
 public class ProjectFileManager {
 
   private static final Logger LOG = Logger.getLogger(ProjectFileManager.class);

diylc/diylc-core/src/main/java/org/diylc/test/Snapshot.java

@@ -3,6 +3,7 @@ package org.diylc.test;
 import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
+
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;
 import org.diylc.presenter.ComponentArea;

diylc/diylc-core/src/main/java/org/diylc/test/TestPlayer.java

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import org.apache.log4j.Logger;
+
 import org.diylc.common.ComponentType;
 import org.diylc.common.IPlugInPort;
 import org.diylc.core.Template;

diylc/diylc-core/src/main/java/org/diylc/utils/BomMaker.java

@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.diylc.common.ComponentType;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.annotations.BomPolicy;

diylc/diylc-core/src/main/java/org/diylc/utils/Constants.java

@@ -25,6 +25,7 @@ import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Stroke;
 import java.awt.Toolkit;
+
 import org.diylc.core.Theme;
 
 public class Constants {

diylc/diylc-core/src/main/java/org/diylc/utils/KeywordExtractor.java

@@ -23,6 +23,7 @@ package org.diylc.utils;
 
 import java.util.HashSet;
 import java.util.Set;
+
 import org.diylc.common.ComponentType;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;

diylc/diylc-core/src/main/java/org/diylc/utils/ReflectionUtils.java

@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Set;
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.Utils;
+
 import org.diylc.core.annotations.IAutoCreator;
 import org.diylc.netlist.INetlistParser;
 import org.diylc.presenter.Presenter;

diylc/diylc-core/src/main/java/org/diylc/utils/VersionReader.java

@@ -7,11 +7,13 @@ import java.text.SimpleDateFormat;
 import java.util.List;
 import org.diylc.appframework.update.Change;
 import org.diylc.appframework.update.Version;
-import org.diylc.presenter.Presenter;
+
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.thoughtworks.xstream.security.AnyTypePermission;
 
+import org.diylc.presenter.Presenter;
+
 public class VersionReader {
   public static void main(String[] args) {
     try {

diylc/diylc-core/src/test/java/org/diylc/AllTests.java

@@ -21,12 +21,13 @@
 */
 package org.diylc;
 
-import org.diylc.plugins.file.BomMakerTest;
-import org.diylc.presenter.ClassProcessorTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
+import org.diylc.plugins.file.BomMakerTest;
+import org.diylc.presenter.ClassProcessorTest;
+
 
 @RunWith(Suite.class)
 @SuiteClasses({BomMakerTest.class, ClassProcessorTest.class})

diylc/diylc-core/src/test/java/org/diylc/core/gerber/GerberPathRendererTest.java

@@ -11,6 +11,8 @@ import org.junit.Test;
 import com.bancika.gerberwriter.DataLayer;
 import com.bancika.gerberwriter.GenerationSoftware;
 
+import org.diylc.core.gerber.GerberPathRenderer;
+
 public class GerberPathRendererTest {
   
   @Test
@@ -20,7 +22,7 @@ public class GerberPathRendererTest {
     Shape shape = textToShape(text, font);
     DataLayer dataLayer = new DataLayer("Copper.Top", false, new GenerationSoftware("v", "a", "ver"));
     GerberPathRenderer.outputPathArea(shape.getPathIterator(null), dataLayer, 0.1, false, "Conductor");
-    dataLayer.dumpGerberToFile(font + text + ".gbr");
+//    dataLayer.dumpGerberToFile(font + text + ".gbr");
   }
 
   private Shape textToShape(String text, String font) {

diylc/diylc-core/src/test/java/org/diylc/netlist/TreeAsciiUtilTest.java

@@ -8,6 +8,8 @@ import java.util.List;
 
 import org.junit.Test;
 
+import org.diylc.netlist.TreeAsciiUtil;
+
 public class TreeAsciiUtilTest {
 
   @Test

diylc/diylc-core/src/test/java/org/diylc/plugins/file/BomMakerTest.java

@@ -29,13 +29,14 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import org.junit.Test;
+
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.measures.Capacitance;
 import org.diylc.core.measures.CapacitanceUnit;
-import org.diylc.testcomponents.MockDIYComponent;
 import org.diylc.utils.BomEntry;
 import org.diylc.utils.BomMaker;
-import org.junit.Test;
+import org.diylc.testcomponents.MockDIYComponent;
 
 public class BomMakerTest {
 

diylc/diylc-core/src/test/java/org/diylc/presenter/CalcUtilsTest.java

@@ -2,9 +2,11 @@ package org.diylc.presenter;
 
 import static org.junit.Assert.assertTrue;
 
+import org.junit.Test;
+
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
-import org.junit.Test;
+import org.diylc.presenter.CalcUtils;
 
 public class CalcUtilsTest {
 

diylc/diylc-core/src/test/java/org/diylc/presenter/ClassProcessorTest.java

@@ -26,10 +26,12 @@ import static org.junit.Assert.assertNotNull;
 
 import java.util.List;
 
-import org.diylc.common.PropertyWrapper;
-import org.diylc.testcomponents.MockDIYComponent;
 import org.junit.Test;
 
+import org.diylc.common.PropertyWrapper;
+import org.diylc.presenter.ComponentProcessor;
+import org.diylc.testcomponents.MockDIYComponent;
+
 
 public class ClassProcessorTest {