Cleanup imports

2026-11-07 12:24:58 +10:00 · 2022-08-27 16:39:44 +02:00
parent 66e668a2b2
commit f5498714b0
321 changed files with 780 additions and 1170 deletions
@@ -21,17 +21,15 @@
 */
 package org.diylc.announcements;

-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+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 org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.plugins.cloud.model.IServiceAPI;
+import com.diyfever.httpproxy.PhpFlatProxy;
 import com.diyfever.httpproxy.ProxyFactory;

 public class AnnouncementProvider {
@@ -22,7 +22,6 @@
 package org.diylc.announcements;

 import java.util.List;
-
 import com.diyfever.httpproxy.ParamName;

 public interface IAnnouncementService {
@@ -28,7 +28,6 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
-
 import org.diylc.core.IDIYComponent;

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

@@ -21,8 +21,7 @@
 */
 package org.diylc.common;

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

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

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

 public class BuildingBlockPackage {
@@ -18,9 +18,7 @@
 package org.diylc.common;

 import java.io.Serializable;
-
 import javax.swing.Icon;
-
 import org.diylc.core.CreationMethod;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.annotations.BomPolicy;
@@ -22,7 +22,6 @@
 package org.diylc.common;

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

 public class DefaultTransformer implements IComponentTransformer {
@@ -21,9 +21,8 @@
 */
 package org.diylc.common;

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

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

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

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

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

 import java.util.List;
-
 import org.diylc.netlist.INetlistParser;
 import org.diylc.netlist.Netlist;

@@ -31,7 +31,6 @@ import java.awt.geom.Rectangle2D;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.diylc.appframework.simplemq.IMessageListener;
 import org.diylc.appframework.simplemq.MessageDispatcher;
 import org.diylc.appframework.update.Version;
@@ -22,7 +22,6 @@
 package org.diylc.common;

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

@@ -25,7 +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;
 import org.diylc.core.measures.Size;
@@ -23,7 +23,6 @@ package org.diylc.common;

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

 public interface IVariantProcessor {
@@ -21,9 +21,8 @@
 */
 package org.diylc.common;

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

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

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

 public class VariantPackage {
@@ -30,7 +30,6 @@ import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
-
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;
 import org.diylc.core.annotations.EditableProperty;
@@ -25,7 +25,6 @@ import java.awt.geom.CubicCurve2D;
 import java.awt.geom.Path2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.common.IPlugInPort;
@@ -39,7 +38,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.thoughtworks.xstream.annotations.XStreamOmitField;

 public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComponent<T> {
@@ -22,7 +22,6 @@
 package org.diylc.components.transform;

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

@@ -23,7 +23,6 @@ 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,7 +24,6 @@ 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,7 +25,6 @@ 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;

@@ -21,10 +21,9 @@
 */
 package org.diylc.core;

-import java.io.File;
-import java.util.List;
-import java.util.Set;
-
+import java.io.File;
+import java.util.List;
+import java.util.Set;
 import org.diylc.common.PropertyWrapper;


@@ -21,22 +21,21 @@
 */
 package org.diylc.core;

-import java.awt.Font;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-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 java.awt.Font;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+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;
 import org.diylc.core.annotations.PositiveNonZeroMeasureValidator;
-import org.diylc.core.measures.Size;
+import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

 /**
@@ -21,7 +21,7 @@
 */
 package org.diylc.core;

-import java.awt.Color;
+import java.awt.Color;
 import java.io.Serializable;

 public class Theme implements Serializable {
@@ -21,12 +21,11 @@
 */
 package org.diylc.core.annotations;

-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import org.diylc.common.DefaultTransformer;
-import org.diylc.common.IComponentTransformer;
-import org.diylc.core.CreationMethod;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import org.diylc.common.DefaultTransformer;
+import org.diylc.common.IComponentTransformer;
+import org.diylc.core.CreationMethod;
 import org.diylc.core.IDIYComponent;

 /**
@@ -21,8 +21,8 @@
 */
 package org.diylc.core.annotations;

-import java.util.Collections;
-import java.util.HashMap;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;

 public final class Defaults {
@@ -21,7 +21,7 @@
 */
 package org.diylc.core.annotations;

-import java.lang.annotation.Retention;
+import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

@Retention(RetentionPolicy.RUNTIME)  
@@ -21,10 +21,9 @@
 */
 package org.diylc.core.annotations;

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

 /**
@@ -21,8 +21,7 @@
 */
 package org.diylc.core.annotations;

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

 /**
@@ -21,7 +21,7 @@
 */
 package org.diylc.core.annotations;

-import java.lang.annotation.Retention;
+import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

@Retention(RetentionPolicy.RUNTIME)  
@@ -21,7 +21,7 @@
 */
 package org.diylc.core.annotations;

-import java.lang.annotation.Retention;
+import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

@Retention(RetentionPolicy.RUNTIME)  
@@ -21,12 +21,11 @@
 */
 package org.diylc.core.images;

-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-import javax.swing.Icon;
+import java.awt.Image;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import javax.imageio.ImageIO;
+import javax.swing.Icon;
 import javax.swing.ImageIcon;

 /**
@@ -21,8 +21,8 @@
 */
 package org.diylc.core.measures;

-import java.io.Serializable;
-import java.text.DecimalFormat;
+import java.io.Serializable;
+import java.text.DecimalFormat;
 import java.text.Format;

 /***
@@ -21,8 +21,7 @@
 */
 package org.diylc.core.measures;

-import java.awt.Color;
-
+import java.awt.Color;
 import org.diylc.common.ResistorColorCode;

 public class Resistance extends AbstractMeasure<ResistanceUnit> {
@@ -30,7 +30,6 @@ import java.util.HashMap;
 import java.util.List;
 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;
@@ -33,7 +33,6 @@ 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;
@@ -26,7 +26,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.diylc.core.IDIYComponent;

 /**
@@ -20,7 +20,6 @@ package org.diylc.netlist;

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

 /*
@@ -24,7 +24,6 @@ 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 {
@@ -27,7 +27,6 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.diylc.core.IDIYComponent;

 public class Tree {
@@ -22,7 +22,6 @@
 package org.diylc.netlist;

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

 public class TreeLeaf implements ITree {
@@ -23,7 +23,6 @@ package org.diylc.plugins.cloud.model;

 import java.io.File;
 import java.util.List;
-
 import com.diyfever.httpproxy.ParamName;

 /***
@@ -21,10 +21,9 @@
 */
 package org.diylc.plugins.cloud.model;

-import java.io.Serializable;
-
-import org.diylc.core.annotations.DynamicList;
-import org.diylc.core.annotations.EditableProperty;
+import java.io.Serializable;
+import org.diylc.core.annotations.DynamicList;
+import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.MultiLineText;

 /**
@@ -21,28 +21,26 @@
 */
 package org.diylc.plugins.cloud.presenter;

-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.URL;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.diylc.appframework.miscutils.ConfigurationManager;
-import org.diylc.common.PropertyWrapper;
-import org.diylc.plugins.cloud.model.CommentEntity;
-import org.diylc.plugins.cloud.model.IServiceAPI;
-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 java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.URL;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.util.Collections;
+import java.util.List;
+import org.apache.log4j.Logger;
+import org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.common.PropertyWrapper;
+import org.diylc.plugins.cloud.model.CommentEntity;
+import org.diylc.plugins.cloud.model.IServiceAPI;
+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;

 /**
@@ -21,8 +21,7 @@
 */
 package org.diylc.plugins.cloud.presenter;

-import java.util.List;
-
+import java.util.List;
 import org.diylc.plugins.cloud.model.ProjectEntity;

 /**
@@ -21,11 +21,10 @@
 */
 package org.diylc.presenter;

-import java.util.Comparator;
-
-import org.diylc.common.ComponentType;
-import org.diylc.common.PropertyWrapper;
-import org.diylc.core.IDIYComponent;
+import java.util.Comparator;
+import org.diylc.common.ComponentType;
+import org.diylc.common.PropertyWrapper;
+import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;

 public class ComparatorFactory {
@@ -21,31 +21,29 @@
 */
 package org.diylc.presenter;

-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.RenderingHints;
-import java.awt.image.BufferedImage;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-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;
-import org.diylc.core.CreationMethod;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.IPropertyValidator;
-import org.diylc.core.annotations.BomPolicy;
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+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;
+import org.diylc.core.CreationMethod;
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.IPropertyValidator;
+import org.diylc.core.annotations.BomPolicy;
+import org.diylc.core.annotations.ComponentDescriptor;
+import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.KeywordPolicy;
 import org.diylc.lang.LangUtil;

@@ -43,7 +43,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.IConfigurationManager;
 import org.diylc.appframework.simplemq.MessageDispatcher;
@@ -62,7 +62,6 @@ 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;
@@ -30,7 +30,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.clipboard.ComponentTransferable;
@@ -21,10 +21,9 @@
 */
 package org.diylc.presenter;

-import java.lang.reflect.Method;
-
-import org.diylc.common.IComponentFilter;
-import org.diylc.common.PCBLayer;
+import java.lang.reflect.Method;
+import org.diylc.common.IComponentFilter;
+import org.diylc.common.PCBLayer;
 import org.diylc.core.IDIYComponent;

 public class PCBLayerFilter implements IComponentFilter {
@@ -48,9 +48,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.function.Supplier;
-
 import javax.swing.JOptionPane;
-
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.IConfigurationManager;
 import org.diylc.appframework.miscutils.JarScanner;
@@ -96,7 +94,6 @@ import org.diylc.serialization.ProjectFileManager;
 import org.diylc.test.DIYTest;
 import org.diylc.test.Snapshot;
 import org.diylc.utils.Constants;
-
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.thoughtworks.xstream.security.AnyTypePermission;
@@ -26,7 +26,6 @@ import java.awt.geom.Path2D;
 import java.awt.geom.PathIterator;
 import java.util.ArrayList;
 import java.util.List;
-
 import com.thoughtworks.xstream.converters.Converter;
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
@@ -22,7 +22,6 @@
 package org.diylc.serialization;

 import java.awt.Color;
-
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
@@ -22,7 +22,6 @@
 package org.diylc.serialization;

 import java.awt.Font;
-
 import com.thoughtworks.xstream.converters.MarshallingContext;
 import com.thoughtworks.xstream.converters.UnmarshallingContext;
 import com.thoughtworks.xstream.io.HierarchicalStreamReader;
@@ -21,9 +21,8 @@
 */
 package org.diylc.serialization;

-import java.util.List;
-
-import org.diylc.core.Project;
+import java.util.List;
+import org.diylc.core.Project;
 import org.w3c.dom.Element;

 public interface IOldFileParser {
@@ -22,7 +22,6 @@
 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;
@@ -22,9 +22,7 @@
 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;
@@ -36,11 +36,9 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.Utils;
 import org.diylc.appframework.simplemq.MessageDispatcher;
@@ -54,7 +52,6 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.thoughtworks.xstream.mapper.MapperWrapper;
@@ -4,7 +4,6 @@ import java.awt.geom.Area;
 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;
@@ -4,7 +4,6 @@ import java.awt.Point;
 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;
@@ -21,18 +21,17 @@
 */
 package org.diylc.utils;

-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-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;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+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;
 import org.diylc.presenter.ComponentProcessor;

 public class BomMaker {
@@ -21,11 +21,10 @@
 */
 package org.diylc.utils;

-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Stroke;
-import java.awt.Toolkit;
-
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.Stroke;
+import java.awt.Toolkit;
 import org.diylc.core.Theme;

 public class Constants {
@@ -21,13 +21,12 @@
 */
 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;
-import org.diylc.core.annotations.KeywordPolicy;
+import java.util.HashSet;
+import java.util.Set;
+import org.diylc.common.ComponentType;
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.Project;
+import org.diylc.core.annotations.KeywordPolicy;
 import org.diylc.presenter.ComponentProcessor;

 public class KeywordExtractor {
@@ -21,11 +21,10 @@
 */
 package org.diylc.utils;

-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Collection;
-
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Collection;
 import org.apache.log4j.Logger;

 public class MemoryCleaner {
@@ -19,7 +19,6 @@
 package org.diylc.utils;

 import java.io.File;
-
 import org.apache.log4j.Logger;

 public class ResourceLoader {
@@ -5,11 +5,9 @@ import java.net.URL;
 import java.text.DateFormat;
 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;
@@ -32,7 +32,6 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.diylc.common.HorizontalAlignment;
 import org.diylc.common.VerticalAlignment;

@@ -29,7 +29,6 @@ import java.awt.Shape;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.awt.StringUtils;
 import org.diylc.common.Display;
@@ -33,7 +33,6 @@ import java.awt.geom.Ellipse2D;
 import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.awt.ShadedPaint;
 import org.diylc.awt.StringUtils;
@@ -21,10 +21,9 @@
 */
 package org.diylc.components;

-import java.awt.Rectangle;
-
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
+import java.awt.Rectangle;
+import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

 /**
@@ -25,7 +25,6 @@ import java.awt.Color;
 import java.awt.FontMetrics;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-
 import org.diylc.common.LabelPosition;
 import org.diylc.core.ComponentState;
 import org.diylc.core.annotations.EditableProperty;
@@ -21,13 +21,12 @@
 */
 package org.diylc.components.autocreate;

-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.diylc.appframework.miscutils.ConfigurationManager;
-import org.diylc.components.connectivity.SolderPad;
-import org.diylc.core.IDIYComponent;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.log4j.Logger;
+import org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.components.connectivity.SolderPad;
+import org.diylc.core.IDIYComponent;
 import org.diylc.core.annotations.IAutoCreator;

 public class SolderPadAutoCreator implements IAutoCreator {
@@ -27,7 +27,6 @@ import java.awt.Composite;
 import java.awt.Graphics2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.awt.StringUtils;
 import org.diylc.common.HorizontalAlignment;
@@ -1,7 +1,6 @@
 package org.diylc.components.boards;

 import java.awt.Color;
-
 import org.diylc.common.OrientationHV;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.PositiveNonZeroMeasureValidator;
@@ -27,7 +27,6 @@ import java.awt.Composite;
 import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.geom.Point2D;
-
 import org.diylc.common.ObjectCache;
 import org.diylc.components.transform.SimpleComponentTransformer;
 import org.diylc.core.ComponentState;
@@ -30,7 +30,6 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.awt.geom.RoundRectangle2D;
-
 import org.diylc.awt.StringUtils;
 import org.diylc.common.HorizontalAlignment;
 import org.diylc.common.ObjectCache;
@@ -18,6 +18,7 @@
 */
 package org.diylc.components.boards;

+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Shape;
@@ -29,7 +30,6 @@ import java.awt.geom.Rectangle2D;
 import java.awt.geom.RoundRectangle2D;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.diylc.awt.StringUtils;
 import org.diylc.common.HorizontalAlignment;
 import org.diylc.common.ObjectCache;
@@ -47,8 +47,6 @@ import org.diylc.core.annotations.KeywordPolicy;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

-import com.sun.prism.BasicStroke;
-
@ComponentDescriptor(name = "Eurorack Stripboard", category = "Boards",
    author = "Branislav Stojkovic",
    description = "David Haillant's eurorack format stripboard for prototyping and building simple modules",
@@ -26,7 +26,6 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.geom.Point2D;
-
 import org.diylc.components.transform.AbstractBoardTransformer;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
@@ -26,7 +26,6 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.geom.Point2D;
-
 import org.diylc.components.transform.AbstractBoardTransformer;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
@@ -26,7 +26,6 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.geom.Point2D;
-
 import org.diylc.components.transform.AbstractBoardTransformer;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
@@ -27,7 +27,6 @@ import java.awt.Shape;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-
 import org.diylc.awt.StringUtils;
 import org.diylc.common.HorizontalAlignment;
 import org.diylc.common.ObjectCache;
@@ -29,7 +29,6 @@ import java.awt.geom.Area;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
@@ -29,7 +29,6 @@ import java.awt.geom.Area;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.RoundRectangle2D;
-
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
@@ -26,7 +26,6 @@ import java.awt.Composite;
 import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.geom.Point2D;
-
 import org.diylc.common.OrientationHV;
 import org.diylc.components.transform.VeroBoardTransformer;
 import org.diylc.core.ComponentState;
@@ -26,7 +26,6 @@ import java.awt.Composite;
 import java.awt.Graphics2D;
 import java.awt.Shape;
 import java.awt.geom.Point2D;
-
 import org.diylc.common.OrientationHV;
 import org.diylc.components.transform.VeroBoardTransformer;
 import org.diylc.core.ComponentState;
@@ -24,7 +24,6 @@ package org.diylc.components.chassis;
 import java.awt.AlphaComposite;
 import java.awt.Composite;
 import java.awt.Graphics2D;
-
 import org.diylc.common.ObjectCache;
 import org.diylc.components.shapes.AbstractShape;
 import org.diylc.components.transform.SimpleComponentTransformer;
@@ -17,13 +17,13 @@
 */
 package org.diylc.components.chassis;

+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.Stroke;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-
 import org.diylc.awt.StringUtils;
 import org.diylc.common.HorizontalAlignment;
 import org.diylc.common.ObjectCache;
@@ -41,8 +41,6 @@ import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

-import com.sun.prism.BasicStroke;
-
@ComponentDescriptor(name = "Dial Scale", author = "Branislav Stojkovic", category = "Misc",
    instanceNamePrefix = "DS", description = "Control panel dial scale", zOrder = IDIYComponent.CHASSIS + 0.1,
    bomPolicy = BomPolicy.NEVER_SHOW, autoEdit = false, transformer = SimpleComponentTransformer.class)
@@ -20,7 +20,6 @@ package org.diylc.components.chassis;
 import java.awt.AlphaComposite;
 import java.awt.Composite;
 import java.awt.Graphics2D;
-
 import org.diylc.common.ObjectCache;
 import org.diylc.components.shapes.AbstractShape;
 import org.diylc.components.transform.SimpleComponentTransformer;
@@ -23,7 +23,6 @@ import java.awt.Composite;
 import java.awt.Graphics2D;
 import java.awt.geom.Point2D;
 import java.util.Arrays;
-
 import org.diylc.common.ObjectCache;
 import org.diylc.components.shapes.AbstractShape;
 import org.diylc.components.transform.SimpleComponentTransformer;
@@ -20,7 +20,6 @@ package org.diylc.components.chassis;
 import java.awt.AlphaComposite;
 import java.awt.Composite;
 import java.awt.Graphics2D;
-
 import org.diylc.common.ObjectCache;
 import org.diylc.components.shapes.AbstractShape;
 import org.diylc.components.transform.SimpleComponentTransformer;
@@ -20,7 +20,6 @@ package org.diylc.components.connectivity;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Shape;
-
 import org.diylc.common.ObjectCache;
 import org.diylc.common.PCBLayer;
 import org.diylc.components.AbstractLeadedComponent;
@@ -20,7 +20,6 @@ package org.diylc.components.connectivity;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.geom.Path2D;
-
 import org.diylc.common.LineStyle;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.PCBLayer;
@@ -22,7 +22,6 @@ import java.awt.Color;
 import java.awt.Composite;
 import java.awt.Graphics2D;
 import java.awt.geom.Point2D;
-
 import org.diylc.common.ObjectCache;
 import org.diylc.common.OrientationHV;
 import org.diylc.components.AbstractTransparentComponent;
@@ -25,7 +25,6 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Point2D;
-
 import org.diylc.components.AbstractComponent;
 import org.diylc.components.transform.SimpleComponentTransformer;
 import org.diylc.core.ComponentState;
@@ -25,7 +25,6 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
-
 import org.diylc.common.ObjectCache;
 import org.diylc.components.AbstractComponent;
 import org.diylc.components.transform.SimpleComponentTransformer;
--- a/Show More
+++ b/Show More