improved auto-create for pads

.classpath

@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="src" path="src.library"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
 	<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
@@ -10,9 +9,9 @@
 	<classpathentry kind="lib" path="lib/iText-2.1.7.jar"/>
 	<classpathentry kind="lib" path="lib/cloning-1.5.jar"/>
 	<classpathentry kind="lib" path="lib/objenesis-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/bancika-gui-framework.jar"/>
-	<classpathentry kind="lib" path="lib/HttpProxy.jar"/>
 	<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
+	<classpathentry kind="lib" path="library/main.jar"/>
+	<classpathentry kind="lib" path="lib/bancika-gui-framework.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

DIYLCStarter.launch

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<stringAttribute key="bad_container_name" value="\DIYLC\r"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/DIYLC/src/org/diylc/DIYLCStarter.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;Library&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;DIYLC&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.diylc.DIYLCStarter"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="DIYLC"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m"/>
+</launchConfiguration>

build.xml

@@ -5,7 +5,7 @@
 	<property name="build.dir" value="${basedir}/build" />
 	<property name="jar.dir" value="${build.dir}/jar" />
 	<property name="report.dir" value="${build.dir}/junitreport" />
-	<property name="main.class" value="com.diyfever.diylc.DIYLCStarter" />
+	<property name="main.class" value="org.diylc.DIYLCStarter" />
 
 	<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
 	<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
@@ -35,6 +35,11 @@
 				<exclude name="**/*dll" />
 			</fileset>
 		</copy>
+		<copy todir="${jar.dir}/library" overwrite="true">
+			<fileset dir="${basedir}/library">
+				<exclude name="**/*dll" />
+			</fileset>
+		</copy>
 		<copy todir="${jar.dir}" overwrite="true">
 			<fileset dir="${basedir}/lib/" includes="**/*.dll" />
 		</copy>
@@ -43,6 +48,7 @@
 	<path id="class.path">
 		<fileset dir="${basedir}">
 			<include name="lib/**/*.jar" />
+			<include name="library/**/*.jar" />
 		</fileset>
 	</path>
 

config.properties

@@ -0,0 +1,2 @@
+#org.diylc.utils.Constants.CANVAS_COLOR=#005D96
+#org.diylc.utils.Constants.GRID_COLOR=#FFFFFF

config.xml

@@ -1,31 +1,86 @@
 <map>
   <entry>
-    <string>defaults</string>
-    <map>
-      <entry>
-        <string>com.diyfever.diylc.components.MockComponentInstance:C</string>
-        <com.diyfever.diylc.model.measures.Capacitance>
-          <value>22.0</value>
-          <unit class="com.diyfever.diylc.model.measures.CapacitanceUnit">uF</unit>
-        </com.diyfever.diylc.model.measures.Capacitance>
-      </entry>
-      <entry>
-        <string>com.diyfever.diylc.components.MockComponentInstance:Color</string>
-        <awt-color>
-          <red>255</red>
-          <green>0</green>
-          <blue>0</blue>
-          <alpha>255</alpha>
-        </awt-color>
-      </entry>
-    </map>
-  </entry>
-  <entry>
-    <string>metric</string>
-    <boolean>true</boolean>
+    <string>default.org.diylc.components.passive.TrimmerPotentiometer:Type</string>
+    <org.diylc.components.passive.TrimmerPotentiometer_-TrimmerType>FLAT_LARGE</org.diylc.components.passive.TrimmerPotentiometer_-TrimmerType>
   </entry>
   <entry>
     <string>lastPath</string>
-    <string>C:\Documents and Settings\Branislav Stojkovic\Desktop</string>
+    <string>C:\Documents and Settings\Branislav Stojkovic\My Documents\Downloads</string>
+  </entry>
+  <entry>
+    <string>abnormalExit</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>stickyPoints</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>theme</string>
+    <org.diylc.core.Theme>
+      <name>Light</name>
+      <bgColor>
+        <red>255</red>
+        <green>255</green>
+        <blue>255</blue>
+        <alpha>255</alpha>
+      </bgColor>
+      <gridColor>
+        <red>240</red>
+        <green>240</green>
+        <blue>240</blue>
+        <alpha>240</alpha>
+      </gridColor>
+      <outlineColor>
+        <red>0</red>
+        <green>0</green>
+        <blue>0</blue>
+        <alpha>255</alpha>
+      </outlineColor>
+    </org.diylc.core.Theme>
+  </entry>
+  <entry>
+    <string>antiAliasing</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>snapToGrid</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>hiQualityRender</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>outline</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>exportGrid</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>autoEdit</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>wheelZoom</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>default.org.diylc.components.misc.Label:Font Bold</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>autoCreatePads</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>continuousCreation</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>showTemplatesAtStartup</string>
+    <boolean>false</boolean>
   </entry>
 </map>

src.library/org/diylc/components/AbstractLeadedComponentInstance.java

@@ -1,130 +0,0 @@
-package org.diylc.components;
-
-import java.awt.Point;
-
-import org.diylc.model.IComponentInstance;
-import org.diylc.model.VisibilityPolicy;
-import org.diylc.model.annotations.BomName;
-import org.diylc.model.annotations.ControlPoint;
-import org.diylc.model.annotations.EditableProperty;
-import org.diylc.model.measures.Size;
-import org.diylc.utils.Constants;
-
-
-/**
- * Base class for all leaded components such as resistors or capacitors. Has two
- * control points for leads and one control point for the label.
- * 
- * @author Branislav Stojkovic
- */
-public abstract class AbstractLeadedComponentInstance implements IComponentInstance {
-
-	private static final long serialVersionUID = 1L;
-
-	protected Size width;
-	protected Size height;
-	protected Point point1 = new Point(0, 0);
-	protected Point point2 = new Point((int) (Constants.GRID * 10), 0);
-	protected Point labelPoint = new Point((int) (Constants.GRID * 5), -(int) Constants.GRID);
-	protected String name = "New Component";
-
-	protected AbstractLeadedComponentInstance() {
-		super();
-		this.width = getDefaultWidth();
-		this.height = getDefaultHeight();
-	}
-
-	/**
-	 * Returns the default component width.
-	 * 
-	 * @return
-	 */
-	protected abstract Size getDefaultWidth();
-
-	/**
-	 * Returns the default component height.
-	 * 
-	 * @return
-	 */
-	protected abstract Size getDefaultHeight();
-
-	@BomName
-	@EditableProperty
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@ControlPoint(visibilityPolicy = VisibilityPolicy.WHEN_SELECTED)
-	public Point getPoint1() {
-		return point1;
-	}
-
-	public void setPoint1(Point point1) {
-		this.point1 = point1;
-	}
-
-	@ControlPoint(visibilityPolicy = VisibilityPolicy.WHEN_SELECTED)
-	public Point getPoint2() {
-		return point2;
-	}
-
-	public void setPoint2(Point point2) {
-		this.point2 = point2;
-	}
-
-	@ControlPoint(visibilityPolicy = VisibilityPolicy.WHEN_SELECTED)
-	public Point getLabelPoint() {
-		return labelPoint;
-	}
-
-	public void setLabelPoint(Point labelPoint) {
-		this.labelPoint = labelPoint;
-	}
-
-	@EditableProperty(defaultable = true)
-	public Size getWidth() {
-		return width;
-	}
-
-	public void setWidth(Size width) {
-		this.width = width;
-	}
-
-	@EditableProperty(defaultable = true)
-	public Size getHeight() {
-		return height;
-	}
-
-	public void setHeight(Size height) {
-		this.height = height;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		AbstractLeadedComponentInstance other = (AbstractLeadedComponentInstance) obj;
-		if (name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!name.equals(other.name))
-			return false;
-		return true;
-	}
-}

src.library/org/diylc/components/MockComponentInstance.java

@@ -1,127 +0,0 @@
-package org.diylc.components;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Point;
-
-import org.diylc.model.ComponentState;
-import org.diylc.model.IComponentInstance;
-import org.diylc.model.VisibilityPolicy;
-import org.diylc.model.annotations.BomName;
-import org.diylc.model.annotations.BomValue;
-import org.diylc.model.annotations.ControlPoint;
-import org.diylc.model.annotations.EditableProperty;
-import org.diylc.model.measures.Capacitance;
-import org.diylc.model.measures.CapacitanceUnit;
-import org.diylc.model.measures.Resistance;
-import org.diylc.model.measures.ResistanceUnit;
-import org.diylc.model.measures.Size;
-import org.diylc.model.measures.SizeUnit;
-
-
-public class MockComponentInstance implements IComponentInstance {
-
-	private static final long serialVersionUID = 1L;
-
-	private String testField = "Hello World";
-	private Capacitance c = new Capacitance(100d, CapacitanceUnit.uF);
-	private Resistance r = new Resistance(123d, ResistanceUnit.K);
-	private Size s = new Size(1d, SizeUnit.cm);
-	private Color color = Color.green;
-	private Point leftTopCorner = new Point(0, 0);
-	private String name = "something";
-
-	public MockComponentInstance(String testField, Capacitance c, Resistance r, Size s,
-			Color color, Point leftTopCorner) {
-		super();
-		this.testField = testField;
-		this.c = c;
-		this.r = r;
-		this.s = s;
-		this.color = color;
-		this.leftTopCorner = leftTopCorner;
-	}
-
-	public MockComponentInstance() {
-		super();
-	}
-
-	@BomName
-	@EditableProperty
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@ControlPoint(visibilityPolicy = VisibilityPolicy.WHEN_SELECTED)
-	public Point getLeftTopCorner() {
-		return leftTopCorner;
-	}
-
-	public void setLeftTopCorner(Point leftTopCorner) {
-		this.leftTopCorner = leftTopCorner;
-	}
-
-	@EditableProperty(name = "Test Field")
-	public String getTestField() {
-		return testField;
-	}
-
-	public void setTestField(String testField) {
-		this.testField = testField;
-	}
-
-	@BomValue
-	@EditableProperty(defaultable = true)
-	public Capacitance getC() {
-		return c;
-	}
-
-	public void setC(Capacitance c) {
-		this.c = c;
-	}
-
-	@EditableProperty(defaultable = true)
-	public Color getColor() {
-		return color;
-	}
-
-	public void setColor(Color color) {
-		this.color = color;
-	}
-
-	@EditableProperty
-	public Resistance getR() {
-		return r;
-	}
-
-	// Setter is commented out, ClassProcessor should ignore this property.
-	// public void setR(Resistance r) {
-	// this.r = r;
-	// }
-
-	// No annotation, so this property should be ignored.
-	public Size getS() {
-		return s;
-	}
-
-	public void setS(Size s) {
-		this.s = s;
-	}
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState) {
-		g2d.setColor(componentState.equals(ComponentState.SELECTED) ? color : color.darker());
-		g2d.fillRect(leftTopCorner.x, leftTopCorner.y, 200, 50);
-	}
-
-	@Override
-	public MockComponentInstance clone() throws CloneNotSupportedException {
-		MockComponentInstance newInstance = new MockComponentInstance(testField, c.clone(), r
-				.clone(), s.clone(), color, (Point) leftTopCorner.clone());
-		return newInstance;
-	}
-}

src.library/org/diylc/components/MockComponentType.java

@@ -1,48 +0,0 @@
-package org.diylc.components;
-
-import javax.swing.Icon;
-
-import org.diylc.images.IconLoader;
-import org.diylc.model.ComponentLayer;
-import org.diylc.model.IComponentInstance;
-import org.diylc.model.IComponentType;
-
-
-public class MockComponentType implements IComponentType {
-
-	@Override
-	public Class<? extends IComponentInstance> getComponentInstanceClass() {
-		return MockComponentInstance.class;
-	}
-	
-	@Override
-	public String getInstanceNamePrefix() {
-		return "ABC";
-	}
-
-	@Override
-	public ComponentLayer getComponentLayer() {
-		return ComponentLayer.BOARD;
-	}
-
-	@Override
-	public String getDescription() {
-		return "Some description";
-	}
-
-	@Override
-	public Icon getIcon() {
-		return IconLoader.Gears.getIcon();
-	}
-
-	@Override
-	public String getName() {
-		return "Mock Component";
-	}
-
-	@Override
-	public String getCategory() {
-		return "Samples";
-	}
-
-}

src.library/org/diylc/components/ResistorInstance.java

@@ -1,52 +0,0 @@
-package org.diylc.components;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics2D;
-
-import org.diylc.model.ComponentState;
-import org.diylc.model.annotations.EditableProperty;
-import org.diylc.model.measures.Resistance;
-import org.diylc.model.measures.ResistanceUnit;
-import org.diylc.model.measures.Size;
-import org.diylc.model.measures.SizeUnit;
-
-
-public class ResistorInstance extends AbstractLeadedComponentInstance {
-
-	private static final long serialVersionUID = 1L;
-
-	private Resistance r = new Resistance(123d, ResistanceUnit.K);
-	private Color color = Color.green;
-
-	public ResistorInstance() {
-		super();
-	}
-
-	@EditableProperty
-	public Resistance getR() {
-		return r;
-	}
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState) {
-		g2d.setColor(componentState.equals(ComponentState.SELECTED) ? color : color.darker());
-		g2d.setStroke(new BasicStroke(1));
-		if (componentState == ComponentState.DRAGGING) {
-			g2d.setStroke(new BasicStroke(1));
-		}
-		g2d.drawLine(point1.x, point1.y, point2.x, point2.y);
-		g2d.rotate(Math.PI / 4, (point1.x + point2.x) / 2, (point1.y + point2.y) / 2);
-		g2d.fillRect((point1.x + point2.x) / 2 - 10, (point1.y + point2.y) / 2 - 10, 20, 20);
-	}
-
-	@Override
-	protected Size getDefaultHeight() {
-		return new Size(3d, SizeUnit.mm);
-	}
-
-	@Override
-	protected Size getDefaultWidth() {
-		return new Size(10d, SizeUnit.mm);
-	}
-}

src.library/org/diylc/components/ResistorType.java

@@ -1,48 +0,0 @@
-package org.diylc.components;
-
-import javax.swing.Icon;
-
-import org.diylc.images.IconLoader;
-import org.diylc.model.ComponentLayer;
-import org.diylc.model.IComponentInstance;
-import org.diylc.model.IComponentType;
-
-
-public class ResistorType implements IComponentType {
-
-	@Override
-	public Class<? extends IComponentInstance> getComponentInstanceClass() {
-		return ResistorInstance.class;
-	}
-	
-	@Override
-	public String getInstanceNamePrefix() {
-		return "R";
-	}
-
-	@Override
-	public ComponentLayer getComponentLayer() {
-		return ComponentLayer.COMPONENT;
-	}
-
-	@Override
-	public String getDescription() {
-		return "Some description";
-	}
-
-	@Override
-	public Icon getIcon() {
-		return IconLoader.Gears.getIcon();
-	}
-
-	@Override
-	public String getName() {
-		return "Resistor";
-	}
-
-	@Override
-	public String getCategory() {
-		return "Samples";
-	}
-
-}

src/org/diylc/DIYLCStarter.java

@@ -1,22 +1,32 @@
 package org.diylc;
 
-import java.io.IOException;
+import java.io.FileInputStream;
 import java.net.URL;
 import java.util.Properties;
 
 import javax.swing.UIManager;
 
+import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
-import org.diylc.gui.MainFrame;
+import org.diylc.presenter.Presenter;
+import org.diylc.swing.gui.MainFrame;
+import org.diylc.swing.gui.TemplateDialog;
 
+import com.diyfever.gui.miscutils.ConfigurationManager;
 import com.diyfever.gui.miscutils.PropertyInjector;
 
 /**
+ * Main class that runs DIYLC.
  * 
  * @author Branislav Stojkovic
+ * 
+ * @see Presenter
+ * @see MainFrame
  */
 public class DIYLCStarter {
 
+	private static final Logger LOG = Logger.getLogger(Presenter.class);
+
 	/**
 	 * @param args
 	 */
@@ -26,83 +36,41 @@ public class DIYLCStarter {
 		try {
 			properties.load(url.openStream());
 			PropertyConfigurator.configure(properties);
-		} catch (IOException e) {
-			e.printStackTrace();
+		} catch (Exception e) {
+			LOG.error("Could not initialize log4j configuration", e);
 		}
+		
+		LOG.debug("Java version: " + System.getProperty("java.runtime.version") + " by " + System.getProperty("java.vm.vendor"));
 
-		url = DIYLCStarter.class.getResource("config.properties");
-		properties = new Properties();
-		try {
-			properties.load(url.openStream());
-			PropertyInjector.injectProperties(properties);
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
+		LOG.info("Starting DIYLC with working directory " + System.getProperty("user.dir"));
 
 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
+		} catch (Exception e) {
+			LOG.error("Could not set Look&Feel", e);
 		}
 
 		MainFrame mainFrame = new MainFrame();
-		// Presenter p = new Presenter(mainFrame);
-		//
-		// p.installPlugin(new ToolBox());
-		// p.installPlugin(new FileManager());
-		// p.installPlugin(new ClipboardManager());
-		// p.installPlugin(new StatusBar());
-		// p.installPlugin(new CanvasPlugin());
-		//
-		// Project project = new Project();
-		// project.getComponents().add(new MockComponentInstance());
-		// p.loadProject(project);
-		// panel.setPreferredSize(new Dimension(2000, 1500));
-		// RulerScrollPane scrollPane = new RulerScrollPane(panel);
-		// JFrame f = new JFrame("Test");
-		// f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		// f.add(scrollPane);
-		// f.setPreferredSize(new Dimension(800, 600));
-		// f.pack();
-		// f.setLocationRelativeTo(null);
 		mainFrame.setLocationRelativeTo(null);
 		mainFrame.setVisible(true);
 
-		// List<Property> properties = ClassProcessor
-		// .extractProperties(MockComponent.class);
-		// MockComponent component = new MockComponent();
-		// for (Property p : properties) {
-		// try {
-		// p.readFrom(component);
-		// } catch (IllegalArgumentException e) {
-		// // TODO Auto-generated catch block
-		// e.printStackTrace();
-		// } catch (IllegalAccessException e) {
-		// // TODO Auto-generated catch block
-		// e.printStackTrace();
-		// } catch (InvocationTargetException e) {
-		// // TODO Auto-generated catch block
-		// e.printStackTrace();
-		// }
-		// }
-		// PropertyEditorDialog.showFor(null, properties);
-		// for (Property p : properties) {
-		// try {
-		// p.writeTo(component);
-		// } catch (IllegalArgumentException e) {
-		// // TODO Auto-generated catch block
-		// e.printStackTrace();
-		// } catch (IllegalAccessException e) {
-		// // TODO Auto-generated catch block
-		// e.printStackTrace();
-		// } catch (InvocationTargetException e) {
-		// // TODO Auto-generated catch block
-		// e.printStackTrace();
-		// }
-		// System.out.println(p);
-		// }
-		// System.out.println(p.getComponentTypes());
+		boolean showTemplates = ConfigurationManager.getInstance().readBoolean(
+				TemplateDialog.SHOW_TEMPLATES_KEY, true);
+		if (showTemplates) {
+			TemplateDialog templateDialog = new TemplateDialog(mainFrame, mainFrame.getPresenter());
+			if (!templateDialog.getFiles().isEmpty()) {
+				templateDialog.setVisible(true);
+			}
+		}
+
+		url = DIYLCStarter.class.getResource("/config.properties");
+		properties = new Properties();
+		try {
+			LOG.info("Injecting default properties.");
+			properties.load(new FileInputStream("config.properties"));
+			PropertyInjector.injectProperties(properties);
+		} catch (Exception e) {
+			LOG.error("Could not read config.properties file", e);
+		}
 	}
 }

src/org/diylc/common/ComponentType.java

@@ -0,0 +1,88 @@
+package org.diylc.common;
+
+import javax.swing.Icon;
+
+import org.diylc.core.CreationMethod;
+import org.diylc.core.IDIYComponent;
+
+/**
+ * Entity class used to describe a component type.
+ * 
+ * @author Branislav Stojkovic
+ * 
+ * @see IDIYComponent
+ */
+public class ComponentType {
+
+	private String name;
+	private String description;
+	private CreationMethod creationMethod;
+	private String category;
+	private String namePrefix;
+	private String author;
+	private Icon icon;
+	private Class<? extends IDIYComponent<?>> instanceClass;
+	private double zOrder;
+	private boolean stretchable;
+
+	public ComponentType(String name, String description, CreationMethod creationMethod,
+			String category, String namePrefix, String author, Icon icon,
+			Class<? extends IDIYComponent<?>> instanceClass, double zOrder, boolean stretchable) {
+		super();
+		this.name = name;
+		this.description = description;
+		this.creationMethod = creationMethod;
+		this.category = category;
+		this.namePrefix = namePrefix;
+		this.author = author;
+		this.icon = icon;
+		this.instanceClass = instanceClass;
+		this.zOrder = zOrder;
+		this.stretchable = stretchable;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public CreationMethod getCreationMethod() {
+		return creationMethod;
+	}
+
+	public String getCategory() {
+		return category;
+	}
+
+	public String getNamePrefix() {
+		return namePrefix;
+	}
+
+	public String getAuthor() {
+		return author;
+	}
+
+	public Icon getIcon() {
+		return icon;
+	}
+
+	public Class<? extends IDIYComponent<?>> getInstanceClass() {
+		return instanceClass;
+	}
+
+	public double getZOrder() {
+		return zOrder;
+	}
+
+	public boolean isStretchable() {
+		return stretchable;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+}

src/org/diylc/common/ControlPointWrapper.java

@@ -1,120 +0,0 @@
-package org.diylc.common;
-
-import java.awt.Point;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.diylc.model.IComponentInstance;
-import org.diylc.model.VisibilityPolicy;
-
-
-/**
- * Entity bean that represents a control point. Has methods for reading/writing
- * {@link Point} value from/to a component.
- * 
- * @author Branislav Stojkovic
- */
-public class ControlPointWrapper {
-
-	private String name;
-	private Point value;
-	private Method setter;
-	private Method getter;
-	private boolean editable;
-	private boolean sticky;
-	private VisibilityPolicy visibilityPolicy;
-
-	public ControlPointWrapper(String name, Method getter, Method setter, boolean editable,
-			boolean sticky, VisibilityPolicy visibilityPolicy) {
-		super();
-		this.name = name;
-		this.getter = getter;
-		this.setter = setter;
-		this.editable = editable;
-		this.sticky = sticky;
-		this.visibilityPolicy = visibilityPolicy;
-	}
-
-	/**
-	 * Reads value from the specified component by invoking it's
-	 * <code>getter</code> method.
-	 * 
-	 * @param component
-	 * @throws IllegalArgumentException
-	 * @throws IllegalAccessException
-	 * @throws InvocationTargetException
-	 */
-	public void readFrom(IComponentInstance component) throws IllegalArgumentException,
-			IllegalAccessException, InvocationTargetException {
-		value = (Point) getter.invoke(component);
-	}
-
-	/**
-	 * Writes the value into the specified component by invoking it's
-	 * <code>setter</code> method.
-	 * 
-	 * @param component
-	 * @throws IllegalArgumentException
-	 * @throws IllegalAccessException
-	 * @throws InvocationTargetException
-	 */
-	public void writeTo(IComponentInstance component) throws IllegalArgumentException,
-			IllegalAccessException, InvocationTargetException {
-		setter.invoke(component, value);
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public boolean isEditable() {
-		return editable;
-	}
-
-	public boolean isSticky() {
-		return sticky;
-	}
-
-	public Point getValue() {
-		return value;
-	}
-
-	public void setValue(Point value) {
-		this.value = value;
-	}
-
-	public VisibilityPolicy getVisibilityPolicy() {
-		return visibilityPolicy;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
-		result = prime * result + ((value == null) ? 0 : value.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		ControlPointWrapper other = (ControlPointWrapper) obj;
-		if (name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!name.equals(other.name))
-			return false;
-		if (value == null) {
-			if (other.value != null)
-				return false;
-		} else if (!value.equals(other.value))
-			return false;
-		return true;
-	}
-}

src/org/diylc/common/Display.java

@@ -0,0 +1,11 @@
+package org.diylc.common;
+
+public enum Display {
+
+	NAME, VALUE;
+
+	@Override
+	public String toString() {
+		return name().substring(0, 1) + name().substring(1).toLowerCase();
+	}
+}

src/org/diylc/common/DrawOption.java

@@ -5,7 +5,7 @@ import java.awt.Graphics;
 /**
  * Enumerates all options that can be used when drawing a project.
  * 
- * @see IPlugInPort#draw(java.awt.Graphics2D, java.util.EnumSet)
+ * @see IPlugInPort#draw(java.awt.Graphics2D, java.util.Set, IComponentFiler)
  * 
  * @author Branislav Stojkovic
  */
@@ -32,5 +32,9 @@ public enum DrawOption {
 	/**
 	 * Anti-aliasing is used when drawing.
 	 */
-	ANTIALIASING;
+	ANTIALIASING,
+	/**
+	 * Draw components in outline mode.
+	 */
+	OUTLINE_MODE;
 }

src/org/diylc/common/EventType.java

@@ -1,10 +1,9 @@
 package org.diylc.common;
 
 import java.awt.Rectangle;
+import java.awt.geom.Point2D;
 
-import org.diylc.model.IComponentType;
-import org.diylc.model.Project;
-
+import org.diylc.core.Project;
 
 /**
  * Enumerates all possible events between {@link IPlugInPort} and
@@ -27,6 +26,12 @@ public enum EventType {
 	 * or loaded with undo/redo operations.
 	 */
 	PROJECT_LOADED,
+	/**
+	 * Called when either current file name or modified flag are changed. The
+	 * first parameter is the current file name, the second one is a boolean
+	 * modified flag.
+	 */
+	FILE_STATUS_CHANGED,
 	/**
 	 * Called when selection rectangle is changed. Object of type
 	 * {@link Rectangle} is the only parameter and it contains the new selection
@@ -39,12 +44,14 @@ public enum EventType {
 	 */
 	SELECTION_CHANGED,
 	/**
-	 * Called when display needs to be repainted. No parameters are passed.
+	 * Called when selection size changes, together with a {@link Point2D}
+	 * object containing selection size (x = width, y = height). Size is
+	 * expressed in the default measure (cm for metric, inches for imperial).
 	 */
 	REPAINT,
 	/**
 	 * Called when new component slot has been changed. The only parameter is
-	 * {@link IComponentType} and may be null.
+	 * {@link ComponentType} and may be null.
 	 */
 	SLOT_CHANGED,
 	/**
@@ -52,5 +59,25 @@ public enum EventType {
 	 * {@link Project} are passed as parameters, one before and one after the
 	 * change. The third parameter is a string containing change description.
 	 */
-	PROJECT_MODIFIED, AVAILABLE_CTRL_POINTS_CHANGED, SELECTED_CTRL_POINTS_CHANGED, ;
+	PROJECT_MODIFIED,
+	/**
+	 * Called when control points under the cursor are changed. A single
+	 * parameter is passed, an instance of
+	 * <code>Map<IDIYComponent<?>, Set<Integer>></code> containing all the
+	 * components and indices of their control points that are under the cursor.
+	 */
+	AVAILABLE_CTRL_POINTS_CHANGED,
+	/**
+	 * Called when mouse cursor is moved. Point object is passed, containing the
+	 * current cursor location (not taking zoom into account).
+	 */
+	MOUSE_MOVED,
+	/**
+	 * Called when a layer status is changed. The first parameter is a set of indices of locked layers. All layers not included are considered unlocked.
+	 */
+	LAYER_STATE_CHANGED,
+	/**
+	 * Called to update the status message. New status message is passed as a first parameter.
+	 */
+	STATUS_MESSAGE_CHANGED;
 }

src/org/diylc/common/GridType.java

@@ -0,0 +1,6 @@
+package org.diylc.common;
+
+public enum GridType {
+
+	LINES, CROSSHAIR, DOT, NONE;
+}

src/org/diylc/common/IComponentFiler.java

@@ -0,0 +1,8 @@
+package org.diylc.common;
+
+import org.diylc.core.IDIYComponent;
+
+public interface IComponentFiler {
+
+	boolean testComponent(IDIYComponent<?> component);
+}

src/org/diylc/common/IPlugInPort.java

@@ -4,20 +4,15 @@ import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Point;
-import java.awt.geom.Area;
+import java.awt.geom.Point2D;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.swing.Action;
-import javax.swing.JComponent;
-import javax.swing.SwingConstants;
-import javax.swing.JPopupMenu.Separator;
-
-import org.diylc.model.ComponentLayer;
-import org.diylc.model.IComponentInstance;
-import org.diylc.model.IComponentType;
-import org.diylc.model.Project;
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.Project;
+import org.diylc.core.Theme;
+import org.diylc.swing.plugins.edit.ComponentTransferable;
 
 import com.diyfever.gui.simplemq.IMessageListener;
 import com.diyfever.gui.simplemq.MessageDispatcher;
@@ -37,6 +32,21 @@ import com.diyfever.gui.update.VersionNumber;
  */
 public interface IPlugInPort {
 
+	public static final String ANTI_ALIASING_KEY = "antiAliasing";
+	public static final String HI_QUALITY_RENDER_KEY = "hiQualityRender";
+	public static final String EXPORT_GRID_KEY = "exportGrid";
+	public static final String STICKY_POINTS_KEY = "stickyPoints";
+	public static final String METRIC_KEY = "metric";
+	public static final String SNAP_TO_GRID_KEY = "snapToGrid";
+	public static final String AUTO_PADS_KEY = "autoCreatePads";
+	public static final String CONTINUOUS_CREATION_KEY = "continuousCreation";
+	public static final String AUTO_EDIT_KEY = "autoEdit";
+	public static final String ABNORMAL_EXIT_KEY = "abnormalExit";
+	public static final String WHEEL_ZOOM_KEY = "wheelZoom";
+	public static final String OUTLINE_KEY = "outline";
+	public static final String THEME_KEY = "theme";
+	public static final String RECENT_COMPONENTS_KEY = "recentComponents";
+
 	/**
 	 * Returns size of the canvas that takes project dimensions into account as
 	 * well as zoom level. Each dimension is calculated as the product of the
@@ -76,52 +86,64 @@ public interface IPlugInPort {
 	void loadProject(Project project, boolean freshStart);
 
 	/**
-	 * Returns all available {@link IComponentType}s classified by category.
+	 * Creates a new project.
+	 */
+	void createNewProject();
+
+	/**
+	 * Loads a project from the specified file.
+	 * 
+	 * @param fileName
+	 */
+	void loadProjectFromFile(String fileName);
+
+	/**
+	 * Saves the current project into the specified file.
+	 * 
+	 * @param fileName
+	 * @param isBackup
+	 */
+	void saveProjectToFile(String fileName, boolean isBackup);
+
+	/**
+	 * @return the current file name.
+	 */
+	String getCurrentFileName();
+
+	/**
+	 * @return true if the current project is modified.
+	 */
+	boolean isProjectModified();
+
+	/**
+	 * Shows a user dialog if there are changes to confirm that it's safe to
+	 * proceed.
+	 * 
+	 * @return true, if file actions (new, open, close) can be taken
+	 */
+	boolean allowFileAction();
+
+	/**
+	 * Returns all available {@link ComponentType}s classified by category.
 	 * Result is a {@link Map} between category name to a {@link List} of all
-	 * {@link IComponentType}s that share that category name.
+	 * {@link ComponentType}s that share that category name.
 	 * 
 	 * @return
 	 */
-	Map<String, List<IComponentType>> getComponentTypes();
+	Map<String, List<ComponentType>> getComponentTypes();
 
 	/**
-	 * Draws project on the provided {@link Graphics2D}.
+	 * Draws project on the provided {@link Graphics2D}. If the provided filter
+	 * is not null, it will be used to filter the components that are shown.
 	 * 
 	 * @param g2d
+	 * @param drawOptions
+	 *            specific drawing options
+	 * @param filter
 	 */
-	void draw(Graphics2D g2d, Set<DrawOption> drawProperties);
+	void draw(Graphics2D g2d, Set<DrawOption> drawOptions, IComponentFiler filter);
 
-	/**
-	 * Injects a custom GUI panels provided by the plug-in and desired position
-	 * in the window. Application will layout plug-in panels accordingly. <br>
-	 * Valid positions are:
-	 * <ul>
-	 * <li> {@link SwingConstants#TOP}</li>
-	 * <li> {@link SwingConstants#BOTTOM}</li>
-	 * <li> {@link SwingConstants#LEFT}</li>
-	 * <li> {@link SwingConstants#RIGHT}</li>
-	 * </ul>
-	 * 
-	 * Center position is reserved for the main canvas panel and cannot be used.
-	 * 
-	 * @param component
-	 * @param position
-	 * @throws BadPositionException
-	 *             in case invalid position is specified
-	 */
-	void injectGUIComponent(JComponent component, int position) throws BadPositionException;
-
-	/**
-	 * Injects a custom menu action into application's main menu. If
-	 * <code>action</code> is set to null {@link Separator} will be added. If
-	 * the specified menu does not exist it will be automatically created.
-	 * 
-	 * @param action
-	 *            {@link Action} to inser
-	 * @param menuName
-	 *            name of the menu to insert into
-	 */
-	public void injectMenuAction(Action action, String menuName);
+	Double[] getAvailableZoomLevels();
 
 	/**
 	 * Returns current zoom level where <code>zoomLevel = 1.0d</code> means
@@ -148,8 +170,10 @@ public interface IPlugInPort {
 	 * @param ctrlDown
 	 * @param shiftDown
 	 * @param altDown
+	 * @param clickCount
 	 */
-	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
+	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown,
+			int clickCount);
 
 	/**
 	 * Notifies the presenter that mouse is moved.
@@ -164,18 +188,25 @@ public interface IPlugInPort {
 	void mouseMoved(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
 
 	/**
-	 * Returns the current {@link ComponentSelection}.
+	 * Returns the current {@link ComponentTransferable}.
 	 * 
 	 * @return
 	 */
-	ComponentSelection getSelectedComponents();
+	List<IDIYComponent<?>> getSelectedComponents();
 
 	/**
-	 * Returns the {@link Area} occupied by the component.
+	 * Updates the selection with the specified list of component. Also, updates
+	 * control point map with all components that are stuck to the newly
+	 * selected components.
 	 * 
-	 * @return
+	 * @param newSelection
 	 */
-	Area getComponentArea(IComponentInstance component);
+	void updateSelection(List<IDIYComponent<?>> newSelection);
+
+	/**
+	 * Selects all components in the project.
+	 */
+	void selectAll();
 
 	/**
 	 * Notification that drag has been started from the specified point.
@@ -183,8 +214,11 @@ public interface IPlugInPort {
 	 * Note: point coordinates are scaled for zoom factor.
 	 * 
 	 * @param point
+	 * @param ctrlDown
+	 * @param shiftDown
+	 * @param altDown
 	 */
-	void dragStarted(Point point);
+	void dragStarted(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
 
 	/**
 	 * Checks if it's possible to drop over the specified point.
@@ -216,41 +250,13 @@ public interface IPlugInPort {
 	 * Adds a list of components to the project.
 	 * 
 	 * @param components
-	 * @param preferredPoint
 	 */
-	void addComponents(List<IComponentInstance> components, Point preferredPoint);
+	void pasteComponents(List<IDIYComponent<?>> components);
 
 	/**
-	 * Checks if a certain layer is locked for editing.
-	 * 
-	 * @param layer
-	 * @return
+	 * Deletes all the selected components from the project.
 	 */
-	boolean isLayerLocked(ComponentLayer layer);
-
-	/**
-	 * Changes layer's locked state.
-	 * 
-	 * @param layer
-	 * @param locked
-	 */
-	void setLayerLocked(ComponentLayer layer, boolean locked);
-
-	/**
-	 * Checks if a certain layer is visible.
-	 * 
-	 * @param layer
-	 * @return
-	 */
-	boolean isLayerVisible(ComponentLayer layer);
-
-	/**
-	 * Changes layer visibility.
-	 * 
-	 * @param layer
-	 * @param visible
-	 */
-	void setLayerVisible(ComponentLayer layer, boolean visible);
+	void deleteSelectedComponents();
 
 	/**
 	 * Sets default value for the specified property name for currently selected
@@ -261,32 +267,109 @@ public interface IPlugInPort {
 	 * @param value
 	 *            new default value, must not be null
 	 */
-	void setDefaultPropertyValue(String propertyName, Object value);
+	void setSelectionDefaultPropertyValue(String propertyName, Object value);
 
 	/**
-	 * Returns a list of properties that are mutual for all the selected
-	 * components. Resulting list may be empty if selected components do not
-	 * have mutual properties or can be null if the selection is empty.
+	 * Sets default value for the specified property name for projects.
 	 * 
-	 * @return
+	 * @param propertyName
+	 *            display name for property
+	 * @param value
+	 *            new default value, must not be null
+	 */
+	void setProjectDefaultPropertyValue(String propertyName, Object value);
+
+	/**
+	 * @return a list of properties that are mutual for all the selected
+	 *         components. Resulting list may be empty if selected components do
+	 *         not have mutual properties or can be null if the selection is
+	 *         empty.
 	 */
 	List<PropertyWrapper> getMutualSelectionProperties();
 
+	void editSelection();
+
 	/**
-	 * Applies specified properties to all the selected components. If some of
-	 * the properties are not applicable to some of the selected components an
-	 * exception will be thrown.
+	 * @return a list of editable properties of the current project.
+	 */
+	List<PropertyWrapper> getProjectProperties();
+
+	/**
+	 * Applies specified properties to the current project.
 	 * 
 	 * @param properties
-	 * @throws Exception
 	 */
-	void applyPropertiesToSelection(List<PropertyWrapper> properties) throws Exception;
-
-	// void setCursorIcon(Icon icon);
+	void applyPropertiesToProject(List<PropertyWrapper> properties);
 
 	/**
 	 * Sets the new component slot. Specified component type will be used to
 	 * instantiate new component.
 	 */
-	void setNewComponentSlot(IComponentType componentType);
+	void setNewComponentTypeSlot(ComponentType componentType);
+
+	/**
+	 * Changes default size notation, true for metric, false for imperial.
+	 * 
+	 * @param isMetric
+	 */
+	void setMetric(boolean isMetric);
+
+	/**
+	 * Groups all selected components.
+	 */
+	void groupSelectedComponents();
+
+	/**
+	 * Ungroups all selected components.
+	 */
+	void ungroupSelectedComponents();
+
+	/**
+	 * Locks or unlocks the specified layer. All components within +- 0.5 range
+	 * will be affected by the change as well.
+	 * 
+	 * @param layerZOrder
+	 * @param locked
+	 */
+	void setLayerLocked(int layerZOrder, boolean locked);
+
+	/**
+	 * @return selection size expressed in either inches or centimeters, based
+	 *         on the user preference.
+	 */
+	Point2D calculateSelectionDimension();
+
+	/**
+	 * Sends each of the selected components one step back.
+	 */
+	void sendSelectionToBack();
+
+	/**
+	 * Brings each of the selected components one step to front.
+	 */
+	void bringSelectionToFront();
+
+	/**
+	 * Causes the display to refresh.
+	 */
+	void refresh();
+
+	/**
+	 * @return currently selected theme.
+	 */
+	Theme getSelectedTheme();
+
+	/**
+	 * Changes the current theme.
+	 * 
+	 * @param theme
+	 */
+	void setSelectedTheme(Theme theme);
+
+	/**
+	 * Renumbers all the selected components.
+	 * 
+	 * @param xAxisFirst
+	 */
+	void renumberSelectedComponents(boolean xAxisFirst);
 }

src/org/diylc/common/ITask.java

@@ -0,0 +1,34 @@
+package org.diylc.common;
+
+/**
+ * Abstract layer between the app and platform worker thread implementation.
+ * 
+ * @author Branislav Stojkovic
+ * 
+ * @param <T>
+ */
+public interface ITask<T> {
+
+	/**
+	 * Runs in background thread.
+	 * 
+	 * @return
+	 * @throws Exception
+	 */
+	T doInBackground() throws Exception;
+
+	/**
+	 * Called if background thread fails.
+	 * 
+	 * @param e
+	 */
+	void failed(Exception e);
+
+	/**
+	 * Called if background thread is executed correctly, the result is passed
+	 * as a parameter.
+	 * 
+	 * @param result
+	 */
+	void complete(T result);
+}

src/org/diylc/common/LabelPosition.java

@@ -0,0 +1,11 @@
+package org.diylc.common;
+
+public enum LabelPosition {
+
+	ABOVE, BELOW;
+	
+	@Override
+	public String toString() {
+		return name().substring(0, 1) + name().substring(1).toLowerCase();
+	}
+}

src/org/diylc/common/ObjectCache.java

@@ -0,0 +1,39 @@
+package org.diylc.common;
+
+import java.awt.AlphaComposite;
+import java.awt.BasicStroke;
+import java.awt.Stroke;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Repository for object that may be reused, such as {@link Stroke} or
+ * {@link AlphaComposite}.
+ * 
+ * @author Branislav Stojkovic
+ */
+public class ObjectCache {
+
+	private static ObjectCache instance;
+
+	public static ObjectCache getInstance() {
+		if (instance == null) {
+			instance = new ObjectCache();
+		}
+		return instance;
+	}
+
+	private ObjectCache() {
+	}
+
+	private Map<Integer, Stroke> basicStrokeMap = new HashMap<Integer, Stroke>();
+
+	public Stroke fetchBasicStroke(int width) {
+		if (basicStrokeMap.containsKey(width)) {
+			return basicStrokeMap.get(width);
+		}
+		Stroke stroke = new BasicStroke(width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
+		basicStrokeMap.put(width, stroke);
+		return stroke;
+	}
+}

src/org/diylc/common/Orientation.java

@@ -0,0 +1,15 @@
+package org.diylc.common;
+
+public enum Orientation {
+
+	DEFAULT, _90, _180, _270;
+
+	@Override
+	public String toString() {
+		if (this == DEFAULT) {
+			return "Default";
+		} else {
+			return name().replace("_", "") + " degrees clockwise";
+		}
+	}
+}

src/org/diylc/common/OrientationHV.java

@@ -0,0 +1,11 @@
+package org.diylc.common;
+
+public enum OrientationHV {
+
+	VERTICAL, HORIZONTAL;
+
+	@Override
+	public String toString() {
+		return name().substring(0, 1) + name().substring(1).toLowerCase();
+	}
+}

src/org/diylc/common/PropertyWrapper.java

@@ -1,10 +1,8 @@
 package org.diylc.common;
 
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.diylc.model.IComponentInstance;
 
+import org.diylc.core.IPropertyValidator;
 
 /**
  * Entity class for editable properties extracted from component objects.
@@ -17,26 +15,30 @@ public class PropertyWrapper implements Cloneable {
 	private String name;
 	private Class<?> type;
 	private Object value;
-	private Method setter;
-	private Method getter;
+	private String setter;
+	private String getter;
 	private boolean defaultable;
+	private IPropertyValidator validator;
+	private boolean unique = true;
+	private boolean changed = false;
 
-	public PropertyWrapper(String name, Class<?> type, Method getter, Method setter,
-			boolean defaultable) {
+	public PropertyWrapper(String name, Class<?> type, String getter, String setter,
+			boolean defaultable, IPropertyValidator validator) {
 		super();
 		this.name = name;
 		this.type = type;
 		this.getter = getter;
 		this.setter = setter;
 		this.defaultable = defaultable;
+		this.validator = validator;
 	}
 
-	public void readFrom(IComponentInstance component) throws IllegalArgumentException,
-			IllegalAccessException, InvocationTargetException {
-		this.value = getter.invoke(component);
+	public void readFrom(Object object) throws IllegalArgumentException, IllegalAccessException,
+			InvocationTargetException, SecurityException, NoSuchMethodException {
+		this.value = object.getClass().getMethod(getter).invoke(object);
 	}
 
-	// public void readUniqueFrom(IComponentInstance component)
+	// public void readUniqueFrom(IDIYComponent component)
 	// throws IllegalArgumentException, IllegalAccessException,
 	// InvocationTargetException {
 	// Object newValue = getter.invoke(component);
@@ -45,9 +47,9 @@ public class PropertyWrapper implements Cloneable {
 	// }
 	// }
 
-	public void writeTo(IComponentInstance component) throws IllegalArgumentException,
-			IllegalAccessException, InvocationTargetException {
-		setter.invoke(component, value);
+	public void writeTo(Object object) throws IllegalArgumentException, IllegalAccessException,
+			InvocationTargetException, SecurityException, NoSuchMethodException {
+		object.getClass().getMethod(setter, type).invoke(object, this.value);
 	}
 
 	public String getName() {
@@ -70,8 +72,24 @@ public class PropertyWrapper implements Cloneable {
 		return defaultable;
 	}
 
-	public void setDefaultable(boolean defaultable) {
-		this.defaultable = defaultable;
+	public IPropertyValidator getValidator() {
+		return validator;
+	}
+	
+	public boolean isUnique() {
+		return unique;
+	}
+	
+	public void setUnique(boolean unique) {
+		this.unique = unique;
+	}
+	
+	public boolean isChanged() {
+		return changed;
+	}
+	
+	public void setChanged(boolean changed) {
+		this.changed = changed;
 	}
 
 	// @Override
@@ -94,7 +112,6 @@ public class PropertyWrapper implements Cloneable {
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		result = prime * result + ((setter == null) ? 0 : setter.hashCode());
 		result = prime * result + ((type == null) ? 0 : type.hashCode());
-		result = prime * result + ((value == null) ? 0 : value.hashCode());
 		return result;
 	}
 
@@ -129,11 +146,6 @@ public class PropertyWrapper implements Cloneable {
 				return false;
 		} else if (!type.equals(other.type))
 			return false;
-		if (value == null) {
-			if (other.value != null)
-				return false;
-		} else if (!value.equals(other.value))
-			return false;
 		return true;
 	}
 

src/org/diylc/common/ResistorColorCode.java

@@ -0,0 +1,14 @@
+package org.diylc.common;
+
+public enum ResistorColorCode {
+
+	NONE, _4_BAND, _5_BAND;
+
+	@Override
+	public String toString() {
+		if (name().startsWith("_")) {
+			return name().substring(1).replace("_", " ").toLowerCase();
+		}
+		return name().substring(0, 1).toUpperCase() + name().substring(1).toLowerCase();
+	}
+}

src/org/diylc/components/AbstractComponent.java

@@ -0,0 +1,73 @@
+package org.diylc.components;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Shape;
+
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.annotations.EditableProperty;
+
+/**
+ * Abstract implementation of {@link IDIYComponent} that contains component name
+ * and toString.
+ * 
+ * @author Branislav Stojkovic
+ * 
+ * @param <T>
+ */
+public abstract class AbstractComponent<T> implements IDIYComponent<T> {
+
+	private static final long serialVersionUID = 1L;
+
+	protected String name = "";
+
+	public static Color SELECTION_COLOR = Color.red;
+	public static Color LABEL_COLOR = Color.black;
+	public static Color LABEL_COLOR_SELECTED = Color.red;
+	public static Font LABEL_FONT = new Font("Tahoma", Font.PLAIN, 14);
+
+	@EditableProperty(defaultable = false)
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public boolean canControlPointOverlap(int index) {
+		return false;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+
+	/**
+	 * Returns the closest odd number, i.e. x when x is odd, or x + 1 when x is
+	 * even.
+	 * 
+	 * @param x
+	 * @return
+	 */
+	protected int getClosestOdd(double x) {
+		return ((int) x / 2) * 2 + 1;
+	}
+
+	/**
+	 * @param clip
+	 * @return true if none of the control points lie in the clip rectangle.
+	 */
+	protected boolean checkPointsClipped(Shape clip) {
+		for (int i = 0; i < getControlPointCount(); i++) {
+			if (clip.contains(getControlPoint(i))) {
+				return false;
+			}
+		}
+		return true;
+	}
+}

src/org/diylc/components/AbstractCurvedComponent.java

@@ -0,0 +1,249 @@
+package org.diylc.components;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.geom.CubicCurve2D;
+
+import org.diylc.common.ObjectCache;
+import org.diylc.core.ComponentState;
+import org.diylc.core.IDrawingObserver;
+import org.diylc.core.Project;
+import org.diylc.core.VisibilityPolicy;
+import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.measures.Size;
+import org.diylc.core.measures.SizeUnit;
+import org.diylc.utils.Constants;
+
+public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComponent<T> {
+
+	private static final long serialVersionUID = 1L;
+
+	public static Color GUIDELINE_COLOR = Color.blue;
+	public static Size DEFAULT_SIZE = new Size(1d, SizeUnit.in);
+
+	protected Point[] controlPoints = new Point[] {
+			new Point(0, 0),
+			new Point((int) (DEFAULT_SIZE.convertToPixels() / 2), 0),
+			new Point((int) (DEFAULT_SIZE.convertToPixels() / 2), (int) (DEFAULT_SIZE
+					.convertToPixels())),
+			new Point((int) DEFAULT_SIZE.convertToPixels(), (int) DEFAULT_SIZE.convertToPixels()) };
+
+	protected Color color = getDefaultColor();
+	protected PointCount pointCount = PointCount.FOUR;
+
+	/**
+	 * Draws the specified curve onto graphics.
+	 * 
+	 * @param curve
+	 * @param g2d
+	 * @param componentState
+	 * @param theme
+	 */
+	protected abstract void drawCurve(CubicCurve2D curve, Graphics2D g2d,
+			ComponentState componentState);
+
+	/**
+	 * @return default color.
+	 */
+	protected abstract Color getDefaultColor();
+
+	@Override
+	public void drawIcon(Graphics2D g2d, int width, int height) {
+		g2d.setColor(getDefaultColor().darker());
+		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(3));
+		CubicCurve2D curve = new CubicCurve2D.Double(1, height - 1, width / 4, height / 3,
+				3 * width / 4, 2 * height / 3, width - 1, 1);
+		g2d.draw(curve);
+		g2d.setColor(getDefaultColor());
+		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
+		g2d.draw(curve);
+	}
+
+	@Override
+	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
+			Project project, IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
+		if (componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING) {
+			// Do not track guidelines.
+			drawingObserver.stopTracking();
+			g2d.setStroke(Constants.DASHED_STROKE);
+			g2d.setColor(GUIDELINE_COLOR);
+			g2d.drawLine(controlPoints[0].x, controlPoints[0].y, controlPoints[1].x,
+					controlPoints[1].y);
+			g2d.drawLine(controlPoints[1].x, controlPoints[1].y, controlPoints[2].x,
+					controlPoints[2].y);
+			g2d.drawLine(controlPoints[2].x, controlPoints[2].y, controlPoints[3].x,
+					controlPoints[3].y);
+			drawingObserver.startTracking();
+		}
+		CubicCurve2D curve = new CubicCurve2D.Double(controlPoints[0].x, controlPoints[0].y,
+				controlPoints[1].x, controlPoints[1].y, controlPoints[2].x, controlPoints[2].y,
+				controlPoints[3].x, controlPoints[3].y);
+
+		Composite oldComposite = g2d.getComposite();
+		if (alpha < MAX_ALPHA) {
+			g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
+					/ MAX_ALPHA));
+		}
+		// g2d.setColor(color.darker());
+		// g2d.setStroke(new BasicStroke(thickness));
+		// g2d.draw(path);
+		// g2d.setColor(color);
+		// g2d.setStroke(new BasicStroke(thickness - 2));
+		// g2d.draw(path);
+		drawCurve(curve, g2d, componentState);
+		g2d.setComposite(oldComposite);
+	}
+
+	@EditableProperty(name = "Point Count")
+	public PointCount getPointCount() {
+		if (pointCount == null) {
+			pointCount = PointCount.FOUR;
+		}
+		return pointCount;
+	}
+
+	public void setPointCount(PointCount pointCount) {
+		this.pointCount = pointCount;
+		// Reset control points.
+		for (int i = 0; i < getControlPointCount(); i++) {
+			setControlPoint(getControlPoint(i), i);
+		}
+	}
+
+	@Override
+	public int getControlPointCount() {
+		switch (getPointCount()) {
+		case TWO:
+			return 2;
+		case THREE:
+			return 3;
+		case FOUR:
+			return 4;
+		}
+		return 0;
+	}
+
+	@Override
+	public boolean isControlPointSticky(int index) {
+		return index == 0 || index == getControlPointCount() - 1;
+	}
+
+	@Override
+	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
+		return VisibilityPolicy.WHEN_SELECTED;
+	}
+
+	@Override
+	public boolean canControlPointOverlap(int index) {
+		// Only shape control points may overlap.
+		switch (getPointCount()) {
+		case TWO:
+			return false;
+		case THREE:
+			return index == 1;
+		case FOUR:
+			return index == 1 || index == 2;
+		}
+		return false;
+	}
+
+	@Override
+	public Point getControlPoint(int index) {
+		if (index == 0) {
+			return controlPoints[0];
+		}
+		switch (getPointCount()) {
+		case TWO:
+			switch (index) {
+			case 1:
+				return controlPoints[3];
+			}
+		case THREE:
+			switch (index) {
+			case 1:
+				return controlPoints[1];
+			case 2:
+				return controlPoints[3];
+			}
+		case FOUR:
+			switch (index) {
+			case 1:
+				return controlPoints[1];
+			case 2:
+				return controlPoints[2];
+			case 3:
+				return controlPoints[3];
+			}
+		}
+		return controlPoints[index];
+	}
+
+	@Override
+	public void setControlPoint(Point point, int index) {
+		if (index == 0) {
+			controlPoints[0].setLocation(point);
+		} else {
+			switch (getPointCount()) {
+			case TWO:
+				switch (index) {
+				case 1:
+					Point center = new Point((point.x + controlPoints[0].x) / 2,
+							(point.y + controlPoints[0].y) / 2);
+					controlPoints[1].setLocation(center);
+					controlPoints[2].setLocation(center);
+					controlPoints[3].setLocation(point);
+					break;
+				}
+				break;
+			case THREE:
+				switch (index) {
+				case 1:
+					controlPoints[1].setLocation(point);
+					controlPoints[2].setLocation(point);
+					break;
+				case 2:
+					controlPoints[3].setLocation(point);
+					break;
+				}
+				break;
+			case FOUR:
+				switch (index) {
+				case 1:
+					controlPoints[1].setLocation(point);
+					break;
+				case 2:
+					controlPoints[2].setLocation(point);
+					break;
+				case 3:
+					controlPoints[3].setLocation(point);
+					break;
+				}
+				break;
+			}
+		}
+	}
+
+	@EditableProperty
+	public Color getColor() {
+		return color;
+	}
+
+	public void setColor(Color color) {
+		this.color = color;
+	}
+
+	enum PointCount {
+		TWO, THREE, FOUR;
+
+		@Override
+		public String toString() {
+			return name().substring(0, 1) + name().substring(1).toLowerCase();
+		}
+	}
+}

src/org/diylc/components/AbstractLeadedComponent.java

@@ -0,0 +1,336 @@
+package org.diylc.components;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.Rectangle2D;
+
+import org.diylc.common.Display;
+import org.diylc.common.IPlugInPort;
+import org.diylc.common.ObjectCache;
+import org.diylc.core.ComponentState;
+import org.diylc.core.IDrawingObserver;
+import org.diylc.core.Project;
+import org.diylc.core.Theme;
+import org.diylc.core.VisibilityPolicy;
+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.diyfever.gui.miscutils.ConfigurationManager;
+
+/**
+ * Base class for all leaded components such as resistors or capacitors. Has two
+ * control points and draws leads between them. Also, it positions and draws the
+ * shape of the component as specified by a child class.
+ * 
+ * @author Branislav Stojkovic
+ */
+public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComponent<T> {
+
+	private static final long serialVersionUID = 1L;
+
+	public static Color LEAD_COLOR = Color.decode("#236B8E");
+	public static Size LEAD_THICKNESS = new Size(0.6d, SizeUnit.mm);
+	public static Size DEFAULT_SIZE = new Size(1d, SizeUnit.in);
+
+	protected Size length;
+	protected Size width;
+	protected Point[] points = new Point[] {
+			new Point((int) (-DEFAULT_SIZE.convertToPixels() / 2), 0),
+			new Point((int) (DEFAULT_SIZE.convertToPixels() / 2), 0) };
+	protected Color bodyColor = Color.white;
+	protected Color borderColor = Color.black;
+	protected Color labelColor = LABEL_COLOR;
+	protected Display display = Display.VALUE;
+
+	protected AbstractLeadedComponent() {
+		super();
+		try {
+			this.length = getDefaultLength().clone();
+			this.width = getDefaultWidth().clone();
+		} catch (CloneNotSupportedException e) {
+			// This should never happen because Size supports cloning.
+		} catch (NullPointerException e) {
+			// This will happen if components do not have any shape.
+		}
+	}
+
+	@Override
+	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
+			Project project, IDrawingObserver drawingObserver) {
+		double distance = points[0].distance(points[1]);
+		Shape shape = getBodyShape();
+		// If there's no body, just draw the line connecting the ending points.
+		if (shape == null) {
+			drawLead(g2d, componentState);
+		} else if (supportsStandingMode()
+				&& length.convertToPixels() > points[0].distance(points[1])) {
+			// When ending points are too close draw the component in standing
+			// mode.
+			int width = getClosestOdd(this.width.convertToPixels());
+			Shape body = new Ellipse2D.Double(points[0].x - width / 2, points[0].y - width / 2,
+					width, width);
+			Composite oldComposite = g2d.getComposite();
+			if (alpha < MAX_ALPHA) {
+				g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
+						/ MAX_ALPHA));
+			}
+			g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
+			g2d.fill(body);
+			g2d.setComposite(oldComposite);
+			Color finalBorderColor;
+			if (outlineMode) {
+				Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
+						IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+				finalBorderColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : theme
+						.getOutlineColor();
+			} else {
+				finalBorderColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+						: borderColor;
+			}
+
+			g2d.setColor(finalBorderColor);
+			g2d.draw(body);
+			if (!outlineMode) {
+				drawLead(g2d, componentState);
+			}
+		} else {
+			// Normal mode with component body in the center and two lead parts.
+			Rectangle shapeRect = shape.getBounds();
+			Double theta = Math.atan2(points[1].y - points[0].y, points[1].x - points[0].x);
+			// Transform graphics to draw the body in the right place and at the
+			// right angle.
+			AffineTransform oldTransform = g2d.getTransform();
+			g2d.translate((points[0].x + points[1].x - shapeRect.width) / 2, (points[0].y
+					+ points[1].y - shapeRect.height) / 2);
+			g2d.rotate(theta, shapeRect.width / 2, shapeRect.height / 2);
+			// Draw body.
+			Composite oldComposite = g2d.getComposite();
+			if (alpha < MAX_ALPHA) {
+				g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
+						/ MAX_ALPHA));
+			}
+			if (bodyColor != null) {
+				if (bodyColor != null) {
+					g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
+					g2d.fill(shape);
+				}
+			}
+			decorateComponentBody(g2d, outlineMode);
+			g2d.setComposite(oldComposite);
+			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
+			Color finalBorderColor;
+			if (outlineMode) {
+				Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
+						IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+				finalBorderColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : theme
+						.getOutlineColor();
+			} else {
+				finalBorderColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+						: borderColor;
+			}
+			g2d.setColor(finalBorderColor);
+			g2d.draw(shape);
+			// Draw label.
+			g2d.setFont(LABEL_FONT);
+			Color finalLabelColor;
+			if (outlineMode) {
+				Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
+						IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+				finalLabelColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED : theme
+						.getOutlineColor();
+			} else {
+				finalLabelColor = componentState == ComponentState.SELECTED
+						|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+						: labelColor;
+			}
+			g2d.setColor(finalLabelColor);
+			FontMetrics fontMetrics = g2d.getFontMetrics();
+			String label = display == Display.NAME ? getName() : getValue().toString();
+			// Adjust label angle if needed to make sure that it's readable.
+			if ((theta >= Math.PI / 2 && theta <= Math.PI)
+					|| (theta < -Math.PI / 2 && theta > -Math.PI)) {
+				g2d.rotate(Math.PI, shapeRect.width / 2, shapeRect.height / 2);
+			}
+			Rectangle2D textRect = fontMetrics.getStringBounds(label, g2d);
+			g2d.drawString(label, (int) (shapeRect.width - textRect.getWidth()) / 2,
+					calculateLabelYCoordinate(shapeRect, textRect, fontMetrics));
+
+			// Go back to the original transformation to draw leads.
+			if (!outlineMode) {
+				g2d.setTransform(oldTransform);
+				int leadThickness = getClosestOdd(getLeadThickness());
+				double leadLength = (distance - shapeRect.width) / 2 - leadThickness / 2;
+				g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
+				Color leadColor = shouldShadeLeads() ? getLeadColor(componentState).darker()
+						: getLeadColor(componentState);
+				g2d.setColor(leadColor);
+				int endX = (int) (points[0].x + Math.cos(theta) * leadLength);
+				int endY = (int) Math.round(points[0].y + Math.sin(theta) * leadLength);
+				g2d.drawLine(points[0].x, points[0].y, endX, endY);
+				endX = (int) (points[1].x + Math.cos(theta - Math.PI) * leadLength);
+				endY = (int) Math.round(points[1].y + Math.sin(theta - Math.PI) * leadLength);
+				g2d.drawLine(points[1].x, points[1].y, endX, endY);
+				if (shouldShadeLeads()) {
+					g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
+					leadColor = getLeadColor(componentState);
+					g2d.setColor(leadColor);
+					g2d.drawLine(points[0].x, points[0].y, (int) (points[0].x + Math.cos(theta)
+							* leadLength), (int) (points[0].y + Math.sin(theta) * leadLength));
+					g2d.drawLine(points[1].x, points[1].y, (int) (points[1].x + Math.cos(theta
+							- Math.PI)
+							* leadLength), (int) (points[1].y + Math.sin(theta - Math.PI)
+							* leadLength));
+				}
+			}
+		}
+	}
+
+	private void drawLead(Graphics2D g2d, ComponentState componentState) {
+		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(getLeadThickness()));
+		Color leadColor = shouldShadeLeads() ? getLeadColor(componentState).darker()
+				: getLeadColor(componentState);
+		g2d.setColor(leadColor);
+		g2d.drawLine(points[0].x, points[0].y, points[1].x, points[1].y);
+		if (shouldShadeLeads()) {
+			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(getLeadThickness() - 2));
+			leadColor = getLeadColor(componentState);
+			g2d.setColor(leadColor);
+			g2d.drawLine(points[0].x, points[0].y, points[1].x, points[1].y);
+		}
+	}
+
+	protected void decorateComponentBody(Graphics2D g2d, boolean outlineMode) {
+		// Do nothing.
+	}
+
+	protected int calculateLabelYCoordinate(Rectangle2D shapeRect, Rectangle2D textRect,
+			FontMetrics fontMetrics) {
+		return (int) (shapeRect.getHeight() - textRect.getHeight()) / 2 + fontMetrics.getAscent();
+	}
+
+	protected boolean shouldShadeLeads() {
+		return true;
+	}
+
+	protected boolean supportsStandingMode() {
+		return false;
+	}
+
+	/**
+	 * @return default component length.
+	 */
+	protected abstract Size getDefaultLength();
+
+	/**
+	 * Returns default component width.
+	 * 
+	 * @return
+	 */
+	protected abstract Size getDefaultWidth();
+
+	/**
+	 * @return shape that represents component body. Shape should not be
+	 *         transformed and should be referenced to (0, 0).
+	 */
+	protected abstract Shape getBodyShape();
+
+	/**
+	 * @return default lead thickness. Override this method to change it.
+	 */
+	protected int getLeadThickness() {
+		return (int) LEAD_THICKNESS.convertToPixels();
+	}
+
+	/**
+	 * @return default lead color. Override this method to change it.
+	 */
+	protected Color getLeadColor(ComponentState componentState) {
+		return componentState == ComponentState.SELECTED
+				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : LEAD_COLOR;
+	}
+
+	@Override
+	public int getControlPointCount() {
+		return points.length;
+	}
+
+	@Override
+	public Point getControlPoint(int index) {
+		return (Point) points[index];
+	}
+
+	@Override
+	public boolean isControlPointSticky(int index) {
+		return true;
+	}
+
+	@Override
+	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
+		return VisibilityPolicy.ALWAYS;
+	}
+
+	@Override
+	public void setControlPoint(Point point, int index) {
+		points[index].setLocation(point);
+	}
+
+	@EditableProperty(name = "Color")
+	public Color getBodyColor() {
+		return bodyColor;
+	}
+
+	public void setBodyColor(Color bodyColor) {
+		this.bodyColor = bodyColor;
+	}
+
+	@EditableProperty(name = "Border")
+	public Color getBorderColor() {
+		return borderColor;
+	}
+
+	public void setBorderColor(Color borderColor) {
+		this.borderColor = borderColor;
+	}
+
+	@EditableProperty(name = "Length", defaultable = true)
+	public Size getLength() {
+		return length;
+	}
+
+	public void setLength(Size length) {
+		this.length = length;
+	}
+
+	@EditableProperty(name = "Width", defaultable = true)
+	public Size getWidth() {
+		return width;
+	}
+
+	public void setWidth(Size width) {
+		this.width = width;
+	}
+
+	@EditableProperty
+	public Display getDisplay() {
+		return display;
+	}
+
+	public void setDisplay(Display display) {
+		this.display = display;
+	}
+}

src/org/diylc/components/AbstractSchematicLeadedSymbol.java

@@ -0,0 +1,72 @@
+package org.diylc.components;
+
+import java.awt.Color;
+import java.awt.FontMetrics;
+import java.awt.geom.Rectangle2D;
+
+import org.diylc.common.LabelPosition;
+import org.diylc.core.ComponentState;
+import org.diylc.core.annotations.EditableProperty;
+
+public abstract class AbstractSchematicLeadedSymbol<T> extends AbstractLeadedComponent<T> {
+
+	private static final long serialVersionUID = 1L;
+
+	public static Color COLOR = Color.blue;
+	public static Color LEAD_COLOR = Color.black;
+
+	protected LabelPosition labelPosition = LabelPosition.ABOVE;
+
+	public AbstractSchematicLeadedSymbol() {
+		super();
+		// We don't want to fill the body, so use null.
+		this.bodyColor = null;
+		this.borderColor = COLOR;
+	}
+
+	@Override
+	public Color getBodyColor() {
+		return super.getBodyColor();
+	}
+
+	@Override
+	protected boolean shouldShadeLeads() {
+		return false;
+	}
+
+	@Override
+	protected int getLeadThickness() {
+		return 1;
+	}
+
+	@Override
+	protected int calculateLabelYCoordinate(Rectangle2D shapeRect, Rectangle2D textRect,
+			FontMetrics fontMetrics) {
+		if (labelPosition == LabelPosition.ABOVE) {
+			return -1;
+		} else {
+			return (int) (shapeRect.getHeight() + textRect.getHeight() - 1);
+		}
+	}
+
+	@EditableProperty(name = "Label position")
+	public LabelPosition getLabelPosition() {
+		return labelPosition;
+	}
+
+	@Override
+	@EditableProperty(name = "Color")
+	public Color getBorderColor() {
+		return super.getBorderColor();
+	}
+
+	public void setLabelPosition(LabelPosition labelPosition) {
+		this.labelPosition = labelPosition;
+	}
+
+	@Override
+	protected Color getLeadColor(ComponentState componentState) {
+		return componentState == ComponentState.SELECTED
+				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : LEAD_COLOR;
+	}
+}

src/org/diylc/components/AbstractTransparentComponent.java

@@ -0,0 +1,21 @@
+package org.diylc.components;
+
+import org.diylc.core.annotations.EditableProperty;
+
+public abstract class AbstractTransparentComponent<T> extends AbstractComponent<T> {
+
+	private static final long serialVersionUID = 1L;
+
+	public static byte MAX_ALPHA = 127;
+
+	protected byte alpha = MAX_ALPHA;
+
+	@EditableProperty
+	public Byte getAlpha() {
+		return alpha;
+	}
+
+	public void setAlpha(Byte alpha) {
+		this.alpha = alpha;
+	}
+}

src/org/diylc/config.properties

@@ -1 +0,0 @@
-Test=XYZ

src/org/diylc/core/AllowAllValidator.java

@@ -0,0 +1,13 @@
+package org.diylc.core;
+
+/**
+ * Validator that allows all values.
+ * 
+ * @author Branislav Stojkovic
+ */
+public class AllowAllValidator implements IPropertyValidator {
+
+	@Override
+	public void validate(Object value) throws ValidationException {
+	}
+}

src/org/diylc/core/ComponentState.java

@@ -1,4 +1,4 @@
-package org.diylc.model;
+package org.diylc.core;
 
 /**
  * Enumerates all possible states that a component can be in.

src/org/diylc/core/CreationMethod.java

@@ -0,0 +1,6 @@
+package org.diylc.core;
+
+public enum CreationMethod {
+
+	SINGLE_CLICK, POINT_BY_POINT;
+}

src/org/diylc/core/IDIYComponent.java

@@ -0,0 +1,122 @@
+package org.diylc.core;
+
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.io.Serializable;
+
+import org.diylc.core.annotations.ComponentDescriptor;
+import org.diylc.core.annotations.EditableProperty;
+
+/**
+ * Interface for component instance. Implementation classes of this interface
+ * will be instantiated by the application when component is added to the
+ * canvas. <br>
+ * <br>
+ * <b>Implementing classes should meet the following: </b>
+ * <ul>
+ * <li>Must have an empty constructor.</li>
+ * <li>Class should be annotated with {@link ComponentDescriptor}.</li>
+ * <li>Getters for properties editable by users should be annotated with
+ * {@link EditableProperty}.</li>
+ * <li>Component configuration should be stored int <code>public static</code>
+ * fields so they can be set through config file.</li>
+ * </ul>
+ * 
+ * @author Branislav Stojkovic
+ * 
+ * @param <T>
+ *            type of component values, e.g. Resistance for resistors or String
+ *            for transistors.
+ */
+public interface IDIYComponent<T> extends Serializable {
+
+	public static final int CHASSIS = 1;
+	public static final int BOARD = 2;
+	public static final int TRACE = 3;
+	public static final int COMPONENT = 4;
+	public static final int TEXT = 5;
+
+	/**
+	 * @return component instance name.
+	 */
+	String getName();
+
+	/**
+	 * Updates component instance name.
+	 * 
+	 * @param name
+	 */
+	void setName(String name);
+
+	/**
+	 * @return component value.
+	 */
+	T getValue();
+
+	/**
+	 * Updates component value.
+	 * 
+	 * @param value
+	 */
+	void setValue(T value);
+
+	/**
+	 * @return number of control points for this component instance. May vary
+	 *         between two instances of the same type, e.g. DIL IC with 8 and 16
+	 *         pins will have 8 or 16 pins although they are of the same type.
+	 */
+	int getControlPointCount();
+
+	/**
+	 * @param index
+	 * @return control point at the specified index.
+	 */
+	Point getControlPoint(int index);
+
+	/**
+	 * Updates the control point at the specified index.
+	 * 
+	 * @param point
+	 * @param index
+	 */
+	void setControlPoint(Point point, int index);
+
+	/**
+	 * @param index
+	 * @return true, if the specified control point may stick to control points
+	 *         of other components.
+	 */
+	boolean isControlPointSticky(int index);
+
+	/**
+	 * @param index
+	 * @return true, if the specified control point may overlap with other
+	 *         control points <b>of the same component</b>. The other control
+	 *         point must be able to overlap too.
+	 */
+	boolean canControlPointOverlap(int index);
+
+	VisibilityPolicy getControlPointVisibilityPolicy(int index);
+
+	/**
+	 * Draws the component onto the {@link Graphics2D}.
+	 * 
+	 * @param g2d
+	 * @param componentState
+	 * @param outlineMode
+	 * @param project
+	 * @param drawingObserver
+	 */
+	void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
+			IDrawingObserver drawingObserver);
+
+	/**
+	 * Draws icon representation of the component. This should not depend on
+	 * component state, i.e. it should be treated as a static method.
+	 * 
+	 * @param g2d
+	 * @param width
+	 * @param height
+	 */
+	void drawIcon(Graphics2D g2d, int width, int height);
+}

src/org/diylc/core/IDrawingObserver.java

@@ -0,0 +1,15 @@
+package org.diylc.core;
+
+/**
+ * Interface for tracking component drawing process. Components may use it to
+ * stop or restart tracking. Anything drawn while tracking is stopped will not
+ * be added to the mouse hot-spot area.
+ * 
+ * @author Branislav Stojkovic
+ */
+public interface IDrawingObserver {
+
+	void stopTracking();
+
+	void startTracking();
+}

src/org/diylc/core/IPropertyValidator.java

@@ -0,0 +1,16 @@
+package org.diylc.core;
+
+/**
+ * Interface for validating property value changes.
+ * 
+ * @author Branislav Stojkovic
+ */
+public interface IPropertyValidator {
+
+	/**
+	 * @param value
+	 * @throws ValidationException
+	 *             if validation fails. Message will contain the reason.
+	 */
+	void validate(Object value) throws ValidationException;
+}

src/org/diylc/core/IView.java

@@ -0,0 +1,38 @@
+package org.diylc.core;
+
+import java.util.List;
+import java.util.Set;
+
+import org.diylc.common.PropertyWrapper;
+
+
+/**
+ * Base interface for the main GUI component.
+ * 
+ * @author Branislav Stojkovic
+ */
+public interface IView {
+
+	public static final int ERROR_MESSAGE = 0;
+	public static final int INFORMATION_MESSAGE = 1;
+	public static final int WARNING_MESSAGE = 2;
+	public static final int QUESTION_MESSAGE = 3;
+	public static final int PLAIN_MESSAGE = -1;
+	public static final int DEFAULT_OPTION = -1;
+	public static final int YES_NO_OPTION = 0;
+	public static final int YES_NO_CANCEL_OPTION = 1;
+	public static final int OK_CANCEL_OPTION = 2;
+	public static final int YES_OPTION = 0;
+	public static final int NO_OPTION = 1;
+	public static final int CANCEL_OPTION = 2;
+	public static final int OK_OPTION = 0;
+	
+	public static final String CHECK_BOX_MENU_ITEM = "org.diylc.checkBoxMenuItem";
+	public static final String RADIO_BUTTON_GROUP_KEY = "org.diylc.radioButtonGroup";
+
+	void showMessage(String message, String title, int messageType);
+
+	int showConfirmDialog(String message, String title, int optionType, int messageType);
+	
+	boolean editProperties(List<PropertyWrapper> properties, Set<PropertyWrapper> defaultedProperties);
+}

src/org/diylc/core/Project.java

@@ -1,13 +1,17 @@
-package org.diylc.model;
+package org.diylc.core;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
-import org.diylc.model.annotations.EditableProperty;
-import org.diylc.model.measures.Size;
-import org.diylc.model.measures.SizeUnit;
+import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.PositiveMeasureValidator;
+import org.diylc.core.measures.Size;
+import org.diylc.core.measures.SizeUnit;
 
+import com.diyfever.gui.update.VersionNumber;
 
 /**
  * Entity class that defines a project. Contains project properties and a
@@ -23,34 +27,32 @@ public class Project implements Serializable {
 	public static String DEFAULT_TITLE = "New Project";
 	public static Size DEFAULT_WIDTH = new Size(29d, SizeUnit.cm);
 	public static Size DEFAULT_HEIGHT = new Size(21d, SizeUnit.cm);
+	public static Size DEFAULT_GRID_SPACING = new Size(0.1d, SizeUnit.in);
 
+	private VersionNumber fileVersion;
+	
 	private String title;
 	private String author;
 	private String description;
 	private Size width;
 	private Size height;
-	private List<IComponentInstance> components;
+	private Size gridSpacing;
+	private List<IDIYComponent<?>> components;
+	private Set<Set<IDIYComponent<?>>> groups;
+	private Set<Integer> lockedLayers;
 
 	public Project() {
-		components = new ArrayList<IComponentInstance>();
+		components = new ArrayList<IDIYComponent<?>>();
+		groups = new HashSet<Set<IDIYComponent<?>>>();
+		lockedLayers = new HashSet<Integer>();
 		title = DEFAULT_TITLE;
 		author = System.getProperty("user.name");
 		width = DEFAULT_WIDTH;
 		height = DEFAULT_HEIGHT;
+		gridSpacing = DEFAULT_GRID_SPACING;
 	}
 
-	public Project(String title, String author, String description, Size width, Size height,
-			List<IComponentInstance> components) {
-		super();
-		this.title = title;
-		this.author = author;
-		this.description = description;
-		this.width = width;
-		this.height = height;
-		this.components = components;
-	}
-
-	@EditableProperty
+	@EditableProperty(defaultable = false)
 	public String getTitle() {
 		return title;
 	}
@@ -68,7 +70,7 @@ public class Project implements Serializable {
 		this.author = author;
 	}
 
-	@EditableProperty
+	@EditableProperty(defaultable = false)
 	public String getDescription() {
 		return description;
 	}
@@ -95,10 +97,45 @@ public class Project implements Serializable {
 		this.height = height;
 	}
 
-	public List<IComponentInstance> getComponents() {
+	@EditableProperty(name = "Grid spacing", validatorClass = SpacingValidator.class)
+	public Size getGridSpacing() {
+		return gridSpacing;
+	}
+
+	public void setGridSpacing(Size gridSpacing) {
+		this.gridSpacing = gridSpacing;
+	}
+
+	/**
+	 * List of components sorted by z-order ascending.
+	 * 
+	 * @return
+	 */
+	public List<IDIYComponent<?>> getComponents() {
 		return components;
 	}
 
+	/**
+	 * Set of grouped components.
+	 * 
+	 * @return
+	 */
+	public Set<Set<IDIYComponent<?>>> getGroups() {
+		return groups;
+	}
+
+	public Set<Integer> getLockedLayers() {
+		return lockedLayers;
+	}
+	
+	public VersionNumber getFileVersion() {
+		return fileVersion;
+	}
+	
+	public void setFileVersion(VersionNumber fileVersion) {
+		this.fileVersion = fileVersion;
+	}
+
 	@Override
 	public int hashCode() {
 		final int prime = 31;
@@ -154,11 +191,31 @@ public class Project implements Serializable {
 		return true;
 	}
 
+	@Override
+	public String toString() {
+		return title;
+	}
+
+	public static class SpacingValidator extends PositiveMeasureValidator {
+
+		@Override
+		public void validate(Object value) throws ValidationException {
+			super.validate(value);
+			Size size = (Size) value;
+			if (size.compareTo(new Size(1d, SizeUnit.mm)) < 0) {
+				throw new ValidationException("must be greater than 1mm");
+			}
+			if (size.compareTo(new Size(1d, SizeUnit.in)) > 0) {
+				throw new ValidationException("must be less than 1in");
+			}
+		}
+	}
+
 	// @Override
 	// public Project clone() throws CloneNotSupportedException {
-	// List<IComponentInstance> clonedComponents = new
-	// ArrayList<IComponentInstance>();
-	// for (IComponentInstance component : components) {
+	// List<IDIYComponent> clonedComponents = new
+	// ArrayList<IDIYComponent>();
+	// for (IDIYComponent component : components) {
 	// clonedComponents.add(component.clone());
 	// }
 	// Project project = new Project(title, author, description,

src/org/diylc/core/Theme.java

@@ -0,0 +1,86 @@
+package org.diylc.core;
+
+import java.awt.Color;
+import java.io.Serializable;
+
+public class Theme implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private String name;
+	private Color bgColor;
+	private Color gridColor;
+	private Color outlineColor;
+
+	public Theme(String name, Color bgColor, Color gridColor, Color outlineColor) {
+		super();
+		this.name = name;
+		this.bgColor = bgColor;
+		this.gridColor = gridColor;
+		this.outlineColor = outlineColor;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public Color getBgColor() {
+		return bgColor;
+	}
+
+	public Color getGridColor() {
+		return gridColor;
+	}
+
+	public Color getOutlineColor() {
+		return outlineColor;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((bgColor == null) ? 0 : bgColor.hashCode());
+		result = prime * result + ((gridColor == null) ? 0 : gridColor.hashCode());
+		result = prime * result + ((outlineColor == null) ? 0 : outlineColor.hashCode());
+		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Theme other = (Theme) obj;
+		if (bgColor == null) {
+			if (other.bgColor != null)
+				return false;
+		} else if (!bgColor.equals(other.bgColor))
+			return false;
+		if (gridColor == null) {
+			if (other.gridColor != null)
+				return false;
+		} else if (!gridColor.equals(other.gridColor))
+			return false;
+		if (outlineColor == null) {
+			if (other.outlineColor != null)
+				return false;
+		} else if (!outlineColor.equals(other.outlineColor))
+			return false;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		return true;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+}

src/org/diylc/core/ValidationException.java

@@ -0,0 +1,11 @@
+
+package org.diylc.core;
+
+public class ValidationException extends Exception {
+
+	private static final long serialVersionUID = 1L;
+
+	public ValidationException(String message) {
+		super(message);
+	}
+}

src/org/diylc/core/VisibilityPolicy.java

@@ -1,4 +1,4 @@
-package org.diylc.model;
+package org.diylc.core;
 
 /**
  * Enumerates control point visibility policies.

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

@@ -0,0 +1,62 @@
+package org.diylc.core.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import org.diylc.core.CreationMethod;
+import org.diylc.core.IDIYComponent;
+
+/**
+ * Annotation for {@link IDIYComponent} implementation. Describes component
+ * properties.
+ * 
+ * @author Branislav Stojkovic
+ */
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ComponentDescriptor {
+
+	/**
+	 * @return component type name.
+	 */
+	String name();
+
+	/**
+	 * @return component type description.
+	 */
+	String description();
+
+	/**
+	 * @return method that should be used to create a component. If
+	 *         <code>CreationMethod.POINT_BY_POINT</code> is used, user will
+	 *         have to select ending points before the component is created.
+	 */
+	CreationMethod creationMethod() default CreationMethod.SINGLE_CLICK;
+
+	/**
+	 * @return component category, e.g. "Passive", "Semiconductors", etc.
+	 */
+	String category();
+
+	/**
+	 * @return component author name.
+	 */
+	String author();
+
+	/**
+	 * @return prefix that will be used to generate component instance names,
+	 *         e.g. "R" for resistors or "Q" for transistors.
+	 */
+	String instanceNamePrefix();
+
+	/**
+	 * @return Z-order of the component.
+	 */
+	double zOrder();
+
+	/**
+	 * @return when false, moving one control point will cause all the others to
+	 *         move together with it.
+	 */
+	boolean stretchable() default true;
+
+}

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

@@ -1,8 +1,11 @@
-package org.diylc.model.annotations;
+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;
+
 /**
  * Used to annotate editable component property. Editable property XYZ must have
  * both getter and setter named <code>getXYZ</code> and <code>setXYZ</code>
@@ -16,16 +19,24 @@ public @interface EditableProperty {
 	/**
 	 * Returns property name. If left blank property name will be extracted from
 	 * the getter name, e.g. getter <code>getXYZ</code> will induce property
-	 * name <code>XYZ</code>.
+	 * name <code>XYZ</code>. <br>
+	 * Default value is blank.
 	 * 
 	 * @return
 	 */
 	String name() default "";
 
 	/**
-	 * If true, application may set default value for this property.
+	 * If true, application may set default value for this property. <br>
+	 * Default value is true.
 	 * 
 	 * @return
 	 */
-	boolean defaultable() default false;
+	boolean defaultable() default true;
+	
+	/**
+	 * Class of validator to use to 
+	 * @return
+	 */
+	Class<? extends IPropertyValidator> validatorClass() default AllowAllValidator.class;
 }

src/org/diylc/core/annotations/PositiveMeasureValidator.java

@@ -0,0 +1,20 @@
+package org.diylc.core.annotations;
+
+import org.diylc.core.IPropertyValidator;
+import org.diylc.core.ValidationException;
+import org.diylc.core.measures.AbstractMeasure;
+
+public class PositiveMeasureValidator implements IPropertyValidator {
+
+	@Override
+	public void validate(Object value) throws ValidationException {
+		if (value instanceof AbstractMeasure) {
+			AbstractMeasure measure = (AbstractMeasure) value;
+			if (measure.getValue() < 0) {
+				throw new ValidationException("must be greater than zero.");
+			}
+		} else {
+			throw new ValidationException("wrong data type, measure expected.");
+		}
+	}
+}

src/org/diylc/core/measures/AbstractMeasure.java

@@ -1,4 +1,4 @@
-package org.diylc.model.measures;
+package org.diylc.core.measures;
 
 import java.io.Serializable;
 import java.text.DecimalFormat;
@@ -8,7 +8,7 @@ public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializ
 
 	private static final long serialVersionUID = 1L;
 
-	protected static final Format format = new DecimalFormat("#.00##");
+	protected static final Format format = new DecimalFormat("0.####");
 
 	protected Double value;
 	protected T unit;
@@ -37,6 +37,11 @@ public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializ
 	public void setUnit(T multiplier) {
 		this.unit = multiplier;
 	}
+	
+	@Override
+	public Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}
 
 	@Override
 	public int hashCode() {

src/org/diylc/core/measures/Capacitance.java

@@ -0,0 +1,31 @@
+package org.diylc.core.measures;
+
+public class Capacitance extends AbstractMeasure<CapacitanceUnit> {
+
+	private static final long serialVersionUID = 1L;
+
+	public Capacitance() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	public Capacitance(Double value, CapacitanceUnit unit) {
+		super(value, unit);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public Capacitance clone() throws CloneNotSupportedException {
+		return new Capacitance(value, unit);
+	}
+	
+	public static Capacitance parseCapacitance(String value) {
+		for (CapacitanceUnit unit : CapacitanceUnit.values()) {
+			if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
+				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+				return new Capacitance(Double.parseDouble(value), unit);
+			}
+		}
+		throw new IllegalArgumentException("Could not parse capacitance: " + value);
+	}
+}

src/org/diylc/core/measures/CapacitanceUnit.java

@@ -1,8 +1,8 @@
-package org.diylc.model.measures;
+package org.diylc.core.measures;
 
 public enum CapacitanceUnit implements Unit {
 
-	pF(1, "pF"), nF(1e3, "nF"), uF(1e6, "\u03bcF"), mF(1e9, "mF"), F(1e12, "F");
+	pF(1, "pF"), nF(1e3, "nF"), uF(1e6, "uF"), mF(1e9, "mF"), F(1e12, "F");
 
 	double factor;
 	String display;

src/org/diylc/core/measures/Inductance.java

@@ -0,0 +1,31 @@
+package org.diylc.core.measures;
+
+public class Inductance extends AbstractMeasure<InductanceUnit> {
+
+	private static final long serialVersionUID = 1L;
+
+	public Inductance() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	public Inductance(Double value, InductanceUnit unit) {
+		super(value, unit);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public Inductance clone() throws CloneNotSupportedException {
+		return new Inductance(value, unit);
+	}
+
+	public static Inductance parseCapacitance(String value) {
+		for (InductanceUnit unit : InductanceUnit.values()) {
+			if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
+				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+				return new Inductance(Double.parseDouble(value), unit);
+			}
+		}
+		throw new IllegalArgumentException("Could not parse inductance: " + value);
+	}
+}

src/org/diylc/core/measures/InductanceUnit.java

@@ -1,4 +1,4 @@
-package org.diylc.model.measures;
+package org.diylc.core.measures;
 
 public enum InductanceUnit implements Unit {
 

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

@@ -0,0 +1,78 @@
+package org.diylc.core.measures;
+
+import java.awt.Color;
+
+import org.diylc.common.ResistorColorCode;
+
+public class Resistance extends AbstractMeasure<ResistanceUnit> {
+
+	private static final long serialVersionUID = 1L;
+
+	private static final Color[] COLOR_DIGITS = new Color[] { Color.black, Color.decode("#8B4513"),
+			Color.red, Color.orange, Color.yellow, Color.decode("#76EE00"), Color.blue,
+			Color.decode("#91219E"), Color.lightGray, Color.white };
+	private static final Color[] COLOR_MULTIPLIER = new Color[] { Color.lightGray.brighter(),
+			Color.decode("#FFB90F"), Color.black, Color.decode("#8B4513"), Color.red, Color.orange,
+			Color.yellow, Color.decode("#76EE00"), Color.blue };
+
+	public Resistance() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	public Resistance(Double value, ResistanceUnit multiplier) {
+		super(value, multiplier);
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public Resistance clone() throws CloneNotSupportedException {
+		return new Resistance(value, unit);
+	}
+
+	public Color[] getColorCode(ResistorColorCode resistorColorCode) {
+		Color[] bands;
+		double base = getValue() * getUnit().getFactor();
+		int multiplier = 0;
+		while (base > (resistorColorCode == ResistorColorCode._4_BAND ? 99 : 999)) {
+			multiplier += 1;
+			base /= 10;
+		}
+		while (base < (resistorColorCode == ResistorColorCode._4_BAND ? 10 : 100)) {
+			multiplier -= 1;
+			base *= 10;
+		}
+		if (multiplier > 6 || multiplier < -2) {
+			// Out of range.
+			return new Color[] {};
+		}
+		switch (resistorColorCode) {
+		case _4_BAND:
+			bands = new Color[3];
+			bands[0] = COLOR_DIGITS[(int) (base / 10)];
+			bands[1] = COLOR_DIGITS[(int) (base % 10)];
+			bands[2] = COLOR_MULTIPLIER[multiplier + 2];
+			break;
+		case _5_BAND:
+			bands = new Color[4];
+			bands[0] = COLOR_DIGITS[(int) (base / 100)];
+			bands[1] = COLOR_DIGITS[(int) (base / 10 % 10)];
+			bands[2] = COLOR_DIGITS[(int) (base % 10)];
+			bands[3] = COLOR_MULTIPLIER[multiplier + 2];
+			break;
+		default:
+			bands = new Color[] {};
+		}
+		return bands;
+	}
+
+	public static Resistance parseResistance(String value) {
+		for (ResistanceUnit unit : ResistanceUnit.values()) {
+			if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
+				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+				return new Resistance(Double.parseDouble(value), unit);
+			}
+		}
+		throw new IllegalArgumentException("Could not parse resistance: " + value);
+	}
+}

src/org/diylc/core/measures/ResistanceUnit.java

@@ -1,4 +1,4 @@
-package org.diylc.model.measures;
+package org.diylc.core.measures;
 
 public enum ResistanceUnit implements Unit {
 

src/org/diylc/core/measures/Size.java

@@ -0,0 +1,47 @@
+package org.diylc.core.measures;
+
+import org.diylc.utils.Constants;
+
+public class Size extends AbstractMeasure<SizeUnit> implements Comparable<Size> {
+
+	private static final long serialVersionUID = 1L;
+
+	public Size() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	public Size(Double value, SizeUnit unit) {
+		super(value, unit);
+		// TODO Auto-generated constructor stub
+	}
+
+	public double convertToPixels() {
+//		double factor = getUnit().getFactor() / SizeUnit.in.getFactor();
+//		int grids = (int) (factor * getValue() * Constants.GRIDS_PER_INCH);
+//		double remainder = (factor * getValue() * Constants.GRIDS_PER_INCH) - grids;
+//		return (int) Math.round(Constants.PIXELS_PER_INCH / Constants.GRIDS_PER_INCH
+//				* (grids + remainder));
+		return getValue() * getUnit().getFactor() / SizeUnit.in.getFactor() * Constants.PIXELS_PER_INCH;
+	}
+
+	@Override
+	public Size clone() throws CloneNotSupportedException {
+		return new Size(value, unit);
+	}
+	
+	public static Size parseSize(String value) {
+		for (SizeUnit unit : SizeUnit.values()) {
+			if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
+				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
+				return new Size(Double.parseDouble(value), unit);
+			}
+		}
+		throw new IllegalArgumentException("Could not parse size: " + value);
+	}
+
+	@Override
+	public int compareTo(Size o) {
+		return new Double(value * unit.getFactor()).compareTo(o.getValue() * o.getUnit().getFactor());
+	}
+}

src/org/diylc/core/measures/SizeUnit.java

@@ -1,4 +1,4 @@
-package org.diylc.model.measures;
+package org.diylc.core.measures;
 
 public enum SizeUnit implements Unit {
 

src/org/diylc/core/measures/Unit.java

@@ -1,4 +1,4 @@
-package org.diylc.model.measures;
+package org.diylc.core.measures;
 
 public interface Unit {
 

src/org/diylc/gui/IView.java

@@ -1,44 +0,0 @@
-package org.diylc.gui;
-
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-
-import org.diylc.common.BadPositionException;
-import org.diylc.common.IPlugInPort;
-
-
-/**
- * Base interface for the main GUI component.
- * 
- * @author Branislav Stojkovic
- */
-public interface IView {
-
-	/**
-	 * Adds a component to the view.
-	 * 
-	 * @param component
-	 *            component to insert
-	 * @param position
-	 *            target position
-	 * @throws BadPositionException
-	 * 
-	 * @see IPlugInPort#injectGUIComponent
-	 */
-	void addComponent(JComponent component, int position) throws BadPositionException;
-
-	/**
-	 * Adds a menu action.
-	 * 
-	 * @param action
-	 *            action to insert
-	 * @param menuName
-	 *            target menu name
-	 * 
-	 * @see IPlugInPort#injectMenuAction
-	 */
-	void addMenuAction(Action action, String menuName);
-
-	void setCursorIcon(Icon icon);
-}

src/org/diylc/gui/MainFrame.java

@@ -1,203 +0,0 @@
-package org.diylc.gui;
-
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.Action;
-import javax.swing.BoxLayout;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import javax.swing.Timer;
-
-import org.diylc.common.BadPositionException;
-import org.diylc.model.Project;
-import org.diylc.plugins.canvas.CanvasPlugin;
-import org.diylc.plugins.clipboard.ClipboardManager;
-import org.diylc.plugins.file.FileManager;
-import org.diylc.plugins.help.HelpManager;
-import org.diylc.plugins.online.OnlineManager;
-import org.diylc.plugins.statusbar.StatusBar;
-import org.diylc.plugins.toolbox.ToolBox;
-import org.diylc.presenter.Presenter;
-
-
-public class MainFrame extends JFrame implements IView {
-
-	private static final long serialVersionUID = 1L;
-
-	private JPanel centerPanel;
-	private JPanel leftPanel;
-	private JPanel rightPanel;
-	private JPanel topPanel;
-	private JPanel bottomPanel;
-
-	private Presenter presenter;
-
-	private JMenuBar mainMenuBar;
-	private Map<String, JMenu> menuMap;
-
-	private CanvasPlugin canvasPlugin;
-
-	public MainFrame() {
-		super("DIYLC4");
-		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		setPreferredSize(new Dimension(800, 600));
-		createBasePanels();
-		menuMap = new HashMap<String, JMenu>();
-		DialogFactory.getInstance().initialize(this);
-
-		this.presenter = new Presenter(this);
-
-		setTitle(getTitle() + " " + presenter.getCurrentVersionNumber());
-
-		presenter.installPlugin(new ToolBox());
-		presenter.installPlugin(new FileManager());
-		presenter.installPlugin(new ClipboardManager());
-		presenter.installPlugin(new OnlineManager());
-		presenter.installPlugin(new HelpManager());
-
-		presenter.installPlugin(new StatusBar());
-		canvasPlugin = new CanvasPlugin();
-		presenter.installPlugin(canvasPlugin);
-
-		Project project = new Project();
-		// project.getComponents().add(new MockComponentInstance());
-		presenter.loadProject(project, true);
-
-		addWindowListener(new WindowAdapter() {
-
-			@Override
-			public void windowClosed(WindowEvent e) {
-				presenter.dispose();
-			}
-
-			@Override
-			public void windowClosing(WindowEvent e) {
-				presenter.dispose();
-			}
-		});
-
-		// setGlassPane(new CustomGlassPane());
-		// getGlassPane().setVisible(true);
-	}
-
-	@Override
-	public void setVisible(boolean b) {
-		super.setVisible(b);
-		// TODO: hack to prevent painting issues in the scroll bar rulers. Find
-		// a better fix if possible.
-		Timer timer = new Timer(50, new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				canvasPlugin.refresh();
-			}
-
-		});
-		timer.setRepeats(false);
-		timer.start();
-		// if (b) {
-		// SwingUtilities.invokeLater(new Runnable() {
-		// @Override
-		// public void run() {
-		//					
-		// }
-		// });
-		// }
-	}
-
-	private void createBasePanels() {
-		Container c = new Container();
-		c.setLayout(new BorderLayout());
-
-		centerPanel = new JPanel(new BorderLayout());
-		c.add(centerPanel, BorderLayout.CENTER);
-
-		topPanel = new JPanel();
-		topPanel.setLayout(new BoxLayout(topPanel, BoxLayout.Y_AXIS));
-		c.add(topPanel, BorderLayout.NORTH);
-
-		leftPanel = new JPanel();
-		leftPanel.setLayout(new BoxLayout(leftPanel, BoxLayout.X_AXIS));
-		c.add(leftPanel, BorderLayout.WEST);
-
-		bottomPanel = new JPanel();
-		bottomPanel.setLayout(new BoxLayout(bottomPanel, BoxLayout.Y_AXIS));
-		c.add(bottomPanel, BorderLayout.SOUTH);
-
-		rightPanel = new JPanel();
-		rightPanel.setLayout(new BoxLayout(rightPanel, BoxLayout.X_AXIS));
-		c.add(rightPanel, BorderLayout.EAST);
-
-		setContentPane(c);
-	}
-
-	private JMenuBar getMainMenuBar() {
-		if (mainMenuBar == null) {
-			mainMenuBar = new JMenuBar();
-			setJMenuBar(mainMenuBar);
-		}
-		return mainMenuBar;
-	}
-
-	// IView
-
-	@Override
-	public void addComponent(JComponent component, int position) throws BadPositionException {
-		switch (position) {
-		case SwingConstants.TOP:
-			topPanel.add(component);
-			break;
-		case SwingConstants.LEFT:
-			leftPanel.add(component);
-			break;
-		case SwingConstants.BOTTOM:
-			bottomPanel.add(component);
-			break;
-		case SwingConstants.RIGHT:
-			rightPanel.add(component);
-			break;
-		case SwingConstants.CENTER:
-			centerPanel.add(component, BorderLayout.CENTER);
-			break;
-		default:
-			throw new BadPositionException();
-		}
-		pack();
-	}
-
-	@Override
-	public void addMenuAction(Action action, String menuName) {
-		JMenu menu;
-		if (menuMap.containsKey(menuName)) {
-			menu = menuMap.get(menuName);
-		} else {
-			menu = new JMenu(menuName);
-			menuMap.put(menuName, menu);
-			getMainMenuBar().add(menu);
-		}
-		if (action == null) {
-			menu.addSeparator();
-		} else {
-			menu.add(action);
-		}
-	}
-
-	@Override
-	public void setCursorIcon(Icon icon) {
-		// TODO Auto-generated method stub
-
-	}
-}

src/org/diylc/gui/editor/FieldEditorFactory.java

@@ -1,27 +0,0 @@
-package org.diylc.gui.editor;
-
-import java.awt.Color;
-import java.awt.Component;
-
-import org.diylc.common.PropertyWrapper;
-import org.diylc.model.measures.AbstractMeasure;
-
-
-public class FieldEditorFactory {
-
-	public static Component createFieldEditor(PropertyWrapper property) {
-		if (property.getType().equals(String.class)) {
-			StringEditor editor = new StringEditor(property);
-			return editor;
-		}
-		if (property.getType().equals(Color.class)) {
-			ColorEditor editor = new ColorEditor(property);
-			return editor;
-		}
-		if (AbstractMeasure.class.isAssignableFrom(property.getType())) {
-			MeasureEditor editor = new MeasureEditor(property);
-			return editor;
-		}
-		return null;
-	}
-}

src/org/diylc/images/IconLoader.java

@@ -1,5 +1,10 @@
 package org.diylc.images;
 
+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;
 
@@ -14,14 +19,19 @@ public enum IconLoader {
 			"disk_blue.png"), SaveAs("save_as.png"), Exit("exit.png"), DocumentPlainYellow(
 			"document_plain_yellow.png"), PhotoScenery("photo_scenery.png"), LightBulbOn(
 			"lightbulb_on.png"), LightBulbOff("lightbulb_off.png"), NotebookAdd("notebook_add.png"), FormGreen(
-			"form_green.png"), Gears("gears.png"), About("about.png"), Donate("donate.gif"), WindowColors(
+			"form_green.png"), Gears("gears.png"), About("about.png"), WindowColors(
 			"window_colors.png"), WindowGear("window_gear.png"), NavigateCheck("navigate_check.png"), Undo(
 			"undo.png"), Error("error.png"), Warning("warning.png"), ZoomSmall("zoom_small.png"), MoveSmall(
 			"move_small.png"), Print("print.png"), PDF("pdf.png"), Excel("excel.png"), CSV(
 			"csv.png"), HTML("html.png"), Image("image.png"), Cut("cut.png"), Copy("copy.png"), Paste(
 			"paste.png"), Selection("selection.png"), BOM("bom.png"), BlackBoard("blackboard.png"), IdCard(
 			"id_card.png"), IdCardAdd("id_card_add.png"), Chest("chest.png"), Upload("upload.png"), Wrench(
-			"wrench.png"), ;
+			"wrench.png"), Group("group.png"), Ungroup("ungroup.png"), TraceMask("trace_mask.png"), Faq(
+			"faq.png"), Component("component.png"), Plugin("plugin.png"), Manual("manual.png"), Donate(
+			"donate.png"), Bug("bug.png"), IconLarge("icon_large.png"), IconMedium(
+			"icon_medium.png"), IconSmall("icon_small.png"), DocumentEdit("document_edit.png"), EditComponent(
+			"edit_component.png"), Size("size.png"), Front("front.png"), Back("back.png"), Pens(
+			"pens.png"), Sort("sort.png");
 
 	protected String name;
 
@@ -38,4 +48,14 @@ public enum IconLoader {
 			return null;
 		}
 	}
+
+	public Image getImage() {
+		BufferedImage img = null;
+		try {
+			img = ImageIO.read(getClass().getResourceAsStream(name));
+		} catch (IOException e) {
+			System.err.println("Couldn't find file: " + name);
+		}
+		return img;
+	}
 }

src/org/diylc/model/ComponentLayer.java

@@ -1,11 +0,0 @@
-package org.diylc.model;
-
-/**
- * Enumerates all drawing layers.
- * 
- * @author Branislav Stojkovic
- */
-public enum ComponentLayer {
-
-	BELOW_CHASSIS, CHASSIS, ABOVE_CHASSIS, BELOW_BOARD, BOARD, TRACE, COMPONENT, ABOVE_COMPONENT;
-}

src/org/diylc/model/IComponentInstance.java

@@ -1,26 +0,0 @@
-package org.diylc.model;
-
-import java.awt.Graphics2D;
-import java.io.Serializable;
-
-/**
- * Interface for component instance. Implementation classes of this interface
- * will be instantiated by the application when component is added to the
- * canvas. <br>
- * <br>
- * <b>Note: </b>Implementing classes must have an empty constructor.
- * 
- * @author Branislav Stojkovic
- * 
- * @see IComponentType
- */
-public interface IComponentInstance extends Serializable {
-
-	/**
-	 * Draws the component onto the {@link Graphics2D}.
-	 * 
-	 * @param g2d
-	 * @param componentState
-	 */
-	void draw(Graphics2D g2d, ComponentState componentState);
-}

src/org/diylc/model/IComponentType.java

@@ -1,65 +0,0 @@
-package org.diylc.model;
-
-import javax.swing.Icon;
-
-/**
- * Interface used to describe a component type.
- * 
- * @author Branislav Stojkovic
- * 
- * @see IComponentInstance
- */
-public interface IComponentType {
-
-	/**
-	 * Returns component type name.
-	 * 
-	 * @return
-	 */
-	String getName();
-
-	/**
-	 * Returns component instance name prefix, e.g. "R" for resistors, "C" for
-	 * capacitors, etc.
-	 * 
-	 * @return
-	 */
-	String getInstanceNamePrefix();
-
-	/**
-	 * Returns component category.
-	 * 
-	 * @return
-	 */
-	String getCategory();
-
-	/**
-	 * Returns component type description that may contain HTML tags.
-	 * 
-	 * @return
-	 */
-	String getDescription();
-
-	/**
-	 * Returns an {@link Icon} used to represent component type.
-	 * 
-	 * @return
-	 */
-	Icon getIcon();
-
-	/**
-	 * Returns a {@link ComponentLayer} where this component belongs.
-	 * 
-	 * @return
-	 */
-	ComponentLayer getComponentLayer();
-
-	/**
-	 * Returns class that represents component instances of this component type.
-	 * Application will instantiate objects of this class when components are
-	 * created.
-	 * 
-	 * @return
-	 */
-	Class<? extends IComponentInstance> getComponentInstanceClass();
-}

src/org/diylc/model/annotations/BomName.java

@@ -1,15 +0,0 @@
-package org.diylc.model.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Annotates getter for the component name that will be shown in the BOM. Only
- * one getter per class may be tagged with this annotation.
- * 
- * @author Branislav Stojkovic
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface BomName {
-
-}

src/org/diylc/model/annotations/BomValue.java

@@ -1,15 +0,0 @@
-package org.diylc.model.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Annotates getter for the component value that will be shown in the BOM. Only
- * one getter per class may be tagged with this annotation.
- * 
- * @author Branislav Stojkovic
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface BomValue {
-
-}

src/org/diylc/model/annotations/ComponentName.java

@@ -1,9 +0,0 @@
-package org.diylc.model.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ComponentName {
-
-}

src/org/diylc/model/annotations/ControlPoint.java

@@ -1,49 +0,0 @@
-package org.diylc.model.annotations;
-
-import java.awt.Point;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import org.diylc.model.VisibilityPolicy;
-
-
-/**
- * Annotation for control points. This annotation may be added fields of type
- * {@link Point} only when both getters and setters exist. Annotation is added
- * always on the getter.
- * 
- * @author Branislav Stojkovic
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ControlPoint {
-
-	/**
-	 * Determines when should the control point be rendered on the screen.
-	 * 
-	 * @return
-	 */
-	VisibilityPolicy visibilityPolicy() default VisibilityPolicy.ALWAYS;
-
-	/**
-	 * If true, application will allow the user to edit the control point.
-	 * 
-	 * @return
-	 */
-	boolean editable() default true;
-
-	/**
-	 * If true, the control point may be joined with other components' control
-	 * points.
-	 * 
-	 * @return
-	 */
-	boolean sticky() default true;
-
-	// /**
-	// * If true, the control point is the main control point for the component.
-	// * There cannot be more than one control point for a single component.
-	// *
-	// * @return
-	// */
-	// boolean main() default false;
-}

src/org/diylc/model/measures/Capacitance.java

@@ -1,21 +0,0 @@
-package org.diylc.model.measures;
-
-public class Capacitance extends AbstractMeasure<CapacitanceUnit> {
-
-	private static final long serialVersionUID = 1L;
-
-	public Capacitance() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public Capacitance(Double value, CapacitanceUnit unit) {
-		super(value, unit);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public Capacitance clone() throws CloneNotSupportedException {
-		return new Capacitance(value, unit);
-	}
-}

src/org/diylc/model/measures/Converter.java

@@ -1,10 +0,0 @@
-package org.diylc.model.measures;
-
-public class Converter {
-
-	public static <T extends Enum<? extends Unit>> AbstractMeasure<T> convert(
-			AbstractMeasure<T> measure, T newUnit) {
-
-		return null;
-	}
-}

src/org/diylc/model/measures/Inductance.java

@@ -1,21 +0,0 @@
-package org.diylc.model.measures;
-
-public class Inductance extends AbstractMeasure<InductanceUnit> {
-
-	private static final long serialVersionUID = 1L;
-
-	public Inductance() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public Inductance(Double value, InductanceUnit unit) {
-		super(value, unit);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public Inductance clone() throws CloneNotSupportedException {
-		return new Inductance(value, unit);
-	}
-}

src/org/diylc/model/measures/Resistance.java

@@ -1,21 +0,0 @@
-package org.diylc.model.measures;
-
-public class Resistance extends AbstractMeasure<ResistanceUnit> {
-
-	private static final long serialVersionUID = 1L;
-
-	public Resistance() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public Resistance(Double value, ResistanceUnit multiplier) {
-		super(value, multiplier);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public Resistance clone() throws CloneNotSupportedException {
-		return new Resistance(value, unit);
-	}
-}

src/org/diylc/model/measures/Size.java

@@ -1,30 +0,0 @@
-package org.diylc.model.measures;
-
-import java.awt.Toolkit;
-
-public class Size extends AbstractMeasure<SizeUnit> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static final int PIXELS_PER_INCH = Toolkit.getDefaultToolkit().getScreenResolution();
-
-	public Size() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public Size(Double value, SizeUnit unit) {
-		super(value, unit);
-		// TODO Auto-generated constructor stub
-	}
-
-	public int convertToPixels() {
-		double factor = getUnit().getFactor() / SizeUnit.in.getFactor();
-		return (int) (factor * PIXELS_PER_INCH * getValue());
-	}
-
-	@Override
-	public Size clone() throws CloneNotSupportedException {
-		return new Size(value, unit);
-	}
-}

src/org/diylc/plugins/canvas/CanvasPlugin.java

@@ -1,120 +0,0 @@
-package org.diylc.plugins.canvas;
-
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.awt.event.MouseEvent;
-import java.util.EnumSet;
-
-import javax.swing.SwingConstants;
-
-import org.apache.log4j.Logger;
-import org.diylc.common.BadPositionException;
-import org.diylc.common.EventType;
-import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.plugins.file.ProjectDrawingProvider;
-
-import com.diyfever.gui.miscutils.ConfigurationManager;
-import com.diyfever.gui.ruler.IRulerListener;
-import com.diyfever.gui.ruler.RulerScrollPane;
-
-public class CanvasPlugin implements IPlugIn {
-
-	private static final Logger LOG = Logger.getLogger(CanvasPlugin.class);
-
-	private static final String METRIC_KEY = "metric";
-
-	private RulerScrollPane scrollPane;
-	private CanvasPanel canvasPanel;
-	private IPlugInPort plugInPort;
-
-	public CanvasPlugin() {
-	}
-
-	@Override
-	public void connect(IPlugInPort plugInPort) {
-		this.plugInPort = plugInPort;
-		canvasPanel = new CanvasPanel(plugInPort);
-		try {
-			plugInPort.injectGUIComponent(getScrollPane(), SwingConstants.CENTER);
-		} catch (BadPositionException e) {
-			LOG.error("Could not install canvas plugin", e);
-		}
-	}
-
-	private RulerScrollPane getScrollPane() {
-		if (scrollPane == null) {
-			scrollPane = new RulerScrollPane(canvasPanel, new ProjectDrawingProvider(plugInPort));
-			Boolean metric = (Boolean) ConfigurationManager.getInstance().getConfigurationItem(
-					METRIC_KEY);
-			if (metric == null) {
-				metric = true;
-			}
-			scrollPane.setMetric(metric);
-			scrollPane.addUnitListener(new IRulerListener() {
-
-				@Override
-				public void unitsChanged(boolean isMetric) {
-					ConfigurationManager.getInstance().setConfigurationItem(METRIC_KEY, isMetric);
-				}
-			});
-		}
-		return scrollPane;
-	}
-
-	@Override
-	public EnumSet<EventType> getSubscribedEventTypes() {
-		return EnumSet.of(EventType.PROJECT_LOADED, EventType.ZOOM_CHANGED, EventType.REPAINT);
-	}
-
-	@Override
-	public void processMessage(final EventType eventType, Object... params) {
-		// SwingUtilities.invokeLater(new Runnable() {
-		//
-		// @Override
-		// public void run() {
-		// LOG.debug("event: " + eventType);
-		switch (eventType) {
-		case PROJECT_LOADED:
-			refreshSize();
-			if ((Boolean) params[1]) {
-				// Scroll to the center.
-				Rectangle visibleRect = canvasPanel.getVisibleRect();
-				visibleRect.setLocation((canvasPanel.getWidth() - visibleRect.width) / 2,
-						(canvasPanel.getHeight() - visibleRect.height) / 2);
-				canvasPanel.scrollRectToVisible(visibleRect);
-				canvasPanel.revalidate();
-			}
-			// canvasPanel.validate();
-			// canvasPanel.repaint();
-			break;
-		case ZOOM_CHANGED:
-			refreshSize();
-			break;
-		case REPAINT:
-			canvasPanel.repaint();
-			break;
-		}
-		// }
-		// });
-	}
-
-	private void refreshSize() {
-		Dimension d = plugInPort.getCanvasDimensions(true);
-		canvasPanel.setSize(d);
-		canvasPanel.setPreferredSize(d);
-		getScrollPane().setZoomLevel(plugInPort.getZoomLevel());
-	}
-
-	/**
-	 * Causes ruller scroll pane to refresh by sending a fake mouse moved
-	 * message to the canvasPanel.
-	 */
-	public void refresh() {
-		MouseEvent event = new MouseEvent(canvasPanel, MouseEvent.MOUSE_MOVED, System
-				.currentTimeMillis(), 0, 1, 1,// canvasPanel.getWidth() / 2,
-												// canvasPanel.getHeight() / 2,
-				0, false);
-		canvasPanel.dispatchEvent(event);
-	}
-}

src/org/diylc/plugins/clipboard/ClipboardManager.java

@@ -1,199 +0,0 @@
-package org.diylc.plugins.clipboard;
-
-import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.ClipboardOwner;
-import java.awt.datatransfer.FlavorEvent;
-import java.awt.datatransfer.FlavorListener;
-import java.awt.datatransfer.Transferable;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.util.EnumSet;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.KeyStroke;
-
-import org.apache.log4j.Logger;
-import org.diylc.common.ComponentSelection;
-import org.diylc.common.EventType;
-import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.images.IconLoader;
-import org.diylc.model.IComponentInstance;
-import org.diylc.model.Project;
-
-import com.diyfever.gui.undo.IUndoListener;
-import com.diyfever.gui.undo.UndoHandler;
-import com.rits.cloning.Cloner;
-
-public class ClipboardManager implements IPlugIn, ClipboardOwner {
-
-	private static final Logger LOG = Logger.getLogger(ClipboardManager.class);
-
-	private static final String EDIT_TITLE = "Edit";
-	private IPlugInPort plugInPort;
-
-	private Clipboard clipboard;
-	private Cloner cloner;
-
-	private CutAction cutAction;
-	private CopyAction copyAction;
-	private PasteAction pasteAction;
-
-	private UndoHandler<Project> undoHandler;
-
-	public ClipboardManager() {
-		clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
-		cloner = new Cloner();
-		undoHandler = new UndoHandler<Project>(new IUndoListener<Project>() {
-
-			@Override
-			public void actionPerformed(Project currentState) {
-				plugInPort.loadProject(currentState, false);
-			}
-		});
-		clipboard.addFlavorListener(new FlavorListener() {
-
-			@Override
-			public void flavorsChanged(FlavorEvent e) {
-				refreshActions();
-			}
-		});
-	}
-
-	@Override
-	public void connect(IPlugInPort plugInPort) {
-		this.plugInPort = plugInPort;
-		plugInPort.injectMenuAction(undoHandler.getUndoAction(), EDIT_TITLE);
-		plugInPort.injectMenuAction(undoHandler.getRedoAction(), EDIT_TITLE);
-		plugInPort.injectMenuAction(null, EDIT_TITLE);
-		cutAction = new CutAction();
-		plugInPort.injectMenuAction(cutAction, EDIT_TITLE);
-		copyAction = new CopyAction();
-		plugInPort.injectMenuAction(copyAction, EDIT_TITLE);
-		pasteAction = new PasteAction();
-		plugInPort.injectMenuAction(pasteAction, EDIT_TITLE);
-		plugInPort.injectMenuAction(null, EDIT_TITLE);
-		plugInPort.injectMenuAction(new SelectAllAction(), EDIT_TITLE);
-
-		refreshActions();
-	}
-
-	@Override
-	public EnumSet<EventType> getSubscribedEventTypes() {
-		return EnumSet.of(EventType.SELECTION_CHANGED, EventType.PROJECT_MODIFIED);
-	}
-
-	@Override
-	public void processMessage(EventType eventType, Object... params) {
-		switch (eventType) {
-		case SELECTION_CHANGED:
-			refreshActions();
-			break;
-		case PROJECT_MODIFIED:
-			undoHandler.stateChanged((Project) params[0], (Project) params[1], (String) params[2]);
-			break;
-		}
-	}
-
-	private void refreshActions() {
-		boolean enabled = !plugInPort.getSelectedComponents().isEmpty();
-		cutAction.setEnabled(enabled);
-		copyAction.setEnabled(enabled);
-		try {
-			pasteAction.setEnabled(clipboard.isDataFlavorAvailable(ComponentSelection.listFlavor));
-		} catch (Exception e) {
-			pasteAction.setEnabled(false);
-		}
-	}
-
-	class CutAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public CutAction() {
-			super();
-			putValue(AbstractAction.NAME, "Cut");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Cut.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Cut triggered");
-		}
-	}
-
-	class CopyAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public CopyAction() {
-			super();
-			putValue(AbstractAction.NAME, "Copy");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Copy.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Copy triggered");
-			clipboard.setContents(cloner.deepClone(plugInPort.getSelectedComponents()),
-					ClipboardManager.this);
-		}
-	}
-
-	class PasteAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public PasteAction() {
-			super();
-			putValue(AbstractAction.NAME, "Paste");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Paste.getIcon());
-		}
-
-		@SuppressWarnings("unchecked")
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Paste triggered");
-			try {
-				List<IComponentInstance> components = (List<IComponentInstance>) clipboard
-						.getData(ComponentSelection.listFlavor);
-				plugInPort.addComponents(cloner.deepClone(components), null);
-			} catch (Exception ex) {
-				LOG.error("Coule not paste.", ex);
-			}
-		}
-	}
-
-	class SelectAllAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public SelectAllAction() {
-			super();
-			putValue(AbstractAction.NAME, "Select All");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Selection.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Select All triggered");
-		}
-	}
-
-	// ClipboardOwner
-
-	@Override
-	public void lostOwnership(Clipboard clipboard, Transferable contents) {
-		refreshActions();
-	}
-}

src/org/diylc/plugins/file/FileManager.java

@@ -1,275 +0,0 @@
-package org.diylc.plugins.file;
-
-import java.awt.event.ActionEvent;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.EnumSet;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-
-import org.apache.log4j.Logger;
-import org.diylc.common.EventType;
-import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.gui.DialogFactory;
-import org.diylc.images.IconLoader;
-import org.diylc.model.Project;
-
-import com.diyfever.gui.export.DrawingExporter;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-
-/**
- * Entry point class for File management utilities.
- * 
- * @author Branislav Stojkovic
- */
-public class FileManager implements IPlugIn {
-
-	private static final Logger LOG = Logger.getLogger(FileManager.class);
-
-	private static final String FILE_TITLE = "File";
-	private IPlugInPort plugInPort;
-	private ProjectDrawingProvider drawingProvider;
-
-	private XStream xStream = new XStream(new DomDriver());
-
-	@Override
-	public void connect(IPlugInPort plugInPort) {
-		this.plugInPort = plugInPort;
-		this.drawingProvider = new ProjectDrawingProvider(plugInPort);
-
-		plugInPort.injectMenuAction(new NewAction(), FILE_TITLE);
-		plugInPort.injectMenuAction(new OpenAction(), FILE_TITLE);
-		plugInPort.injectMenuAction(new SaveAction(), FILE_TITLE);
-		plugInPort.injectMenuAction(new SaveAsAction(), FILE_TITLE);
-		plugInPort.injectMenuAction(null, FILE_TITLE);
-		plugInPort.injectMenuAction(new CreateBomAction(), FILE_TITLE);
-		plugInPort.injectMenuAction(null, FILE_TITLE);
-		plugInPort.injectMenuAction(new ExportPDFAction(), FILE_TITLE);
-		plugInPort.injectMenuAction(new ExportPNGAction(), FILE_TITLE);
-		plugInPort.injectMenuAction(new PrintAction(), FILE_TITLE);
-		plugInPort.injectMenuAction(null, FILE_TITLE);
-		plugInPort.injectMenuAction(new ExitAction(), FILE_TITLE);
-	}
-
-	class NewAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public NewAction() {
-			super();
-			putValue(AbstractAction.NAME, "New");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentPlainYellow.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Creating blank project.");
-			plugInPort.loadProject(new Project(), true);
-		}
-	}
-
-	class OpenAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public OpenAction() {
-			super();
-			putValue(AbstractAction.NAME, "Open");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.FolderOut.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance().showOpenDialog(FileFilterEnum.DIY.getFilter(),
-					null, FileFilterEnum.DIY.getExtensions()[0], new ProjectPreview());
-			if (file != null) {
-				LOG.info("Loading project from file.");
-				FileInputStream fis;
-				try {
-					fis = new FileInputStream(file);
-					Project project = (Project) xStream.fromXML(fis);
-					plugInPort.loadProject(project, true);
-					fis.close();
-				} catch (FileNotFoundException ex) {
-					// TODO Auto-generated catch block
-					ex.printStackTrace();
-				} catch (IOException ex) {
-					// TODO Auto-generated catch block
-					ex.printStackTrace();
-				}
-			}
-		}
-	}
-
-	class SaveAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public SaveAction() {
-			super();
-			putValue(AbstractAction.NAME, "Save");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.DiskBlue.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.DIY.getFilter(),
-					null, FileFilterEnum.DIY.getExtensions()[0], new ProjectPreview());
-			if (file != null) {
-				LOG.info("Saving project to file.");
-				FileOutputStream fos;
-				try {
-					fos = new FileOutputStream(file);
-					xStream.toXML(plugInPort.getCurrentProject(), fos);
-					fos.close();
-				} catch (FileNotFoundException ex) {
-					// TODO Auto-generated catch block
-					ex.printStackTrace();
-				} catch (IOException ex) {
-					// TODO Auto-generated catch block
-					ex.printStackTrace();
-				}
-			}
-		}
-	}
-
-	class SaveAsAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public SaveAsAction() {
-			super();
-			putValue(AbstractAction.NAME, "Save As");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.DiskBlue.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.DIY.getFilter(),
-					null, FileFilterEnum.DIY.getExtensions()[0], new ProjectPreview());
-			if (file != null) {
-				LOG.info("Saving project to file.");
-				FileOutputStream fos;
-				try {
-					fos = new FileOutputStream(file);
-					xStream.toXML(plugInPort.getCurrentProject(), fos);
-					fos.close();
-				} catch (FileNotFoundException ex) {
-					// TODO Auto-generated catch block
-					ex.printStackTrace();
-				} catch (IOException ex) {
-					// TODO Auto-generated catch block
-					ex.printStackTrace();
-				}
-			}
-		}
-	}
-
-	class CreateBomAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public CreateBomAction() {
-			super();
-			putValue(AbstractAction.NAME, "Create B.O.M.");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.BOM.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			List<BomEntry> bom = BomMaker.getInstance().createBom(
-					plugInPort.getCurrentProject().getComponents());
-			BomDialog dialog = DialogFactory.getInstance().createBomDialog(bom);
-			dialog.setVisible(true);
-		}
-	}
-
-	class ExportPDFAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public ExportPDFAction() {
-			super();
-			putValue(AbstractAction.NAME, "Export to PDF");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.PDF.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.PDF.getFilter(),
-					null, FileFilterEnum.PDF.getExtensions()[0], null);
-			if (file != null) {
-				DrawingExporter.getInstance().exportPDF(drawingProvider, file);
-			}
-		}
-	}
-
-	class ExportPNGAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public ExportPNGAction() {
-			super();
-			putValue(AbstractAction.NAME, "Export to PNG");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Image.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			File file = DialogFactory.getInstance().showSaveDialog(FileFilterEnum.PNG.getFilter(),
-					null, FileFilterEnum.PNG.getExtensions()[0], null);
-			if (file != null) {
-				DrawingExporter.getInstance().exportPNG(drawingProvider, file);
-			}
-		}
-	}
-
-	class PrintAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public PrintAction() {
-			super();
-			putValue(AbstractAction.NAME, "Print...");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Print.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			DrawingExporter.getInstance().print(drawingProvider);
-		}
-	}
-
-	class ExitAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public ExitAction() {
-			super();
-			putValue(AbstractAction.NAME, "Exit");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Exit.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			System.exit(0);
-		}
-	}
-
-	@Override
-	public EnumSet<EventType> getSubscribedEventTypes() {
-		return null;
-	}
-
-	@Override
-	public void processMessage(EventType eventType, Object... params) {
-		// TODO Auto-generated method stub
-
-	}
-}

src/org/diylc/plugins/file/ProjectDrawingProvider.java

@@ -1,37 +0,0 @@
-package org.diylc.plugins.file;
-
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.util.EnumSet;
-
-import org.diylc.common.DrawOption;
-import org.diylc.common.IPlugInPort;
-
-import com.diyfever.gui.IDrawingProvider;
-
-/**
- * {@link IDrawingProvider} implementation that uses {@link IPlugInPort} to draw
- * a project onto the canvas.
- * 
- * @author Branislav Stojkovic
- */
-public class ProjectDrawingProvider implements IDrawingProvider {
-
-	IPlugInPort plugInPort;
-
-	public ProjectDrawingProvider(IPlugInPort plugInPort) {
-		super();
-		this.plugInPort = plugInPort;
-	}
-
-	@Override
-	public void draw(Graphics g) {
-		plugInPort.draw((Graphics2D) g, EnumSet.of(DrawOption.ZOOM, DrawOption.ANTIALIASING));
-	}
-
-	@Override
-	public Dimension getSize() {
-		return plugInPort.getCanvasDimensions(true);
-	}
-}

src/org/diylc/plugins/help/HelpManager.java

@@ -1,69 +0,0 @@
-package org.diylc.plugins.help;
-
-import java.awt.event.ActionEvent;
-import java.util.EnumSet;
-
-import javax.swing.AbstractAction;
-
-import org.diylc.common.EventType;
-import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.gui.DialogFactory;
-import org.diylc.images.IconLoader;
-
-import com.diyfever.gui.AboutDialog;
-
-/**
- * Entry point class for help-related utilities.
- * 
- * @author Branislav Stojkovic
- */
-public class HelpManager implements IPlugIn {
-
-	private static final String HELP_TITLE = "Help";
-
-	private IPlugInPort plugInPort;
-	private AboutDialog aboutDialog;
-
-	@Override
-	public void connect(IPlugInPort plugInPort) {
-		this.plugInPort = plugInPort;
-
-		plugInPort.injectMenuAction(new AboutAction(), HELP_TITLE);
-	}
-
-	@Override
-	public EnumSet<EventType> getSubscribedEventTypes() {
-		return null;
-	}
-
-	@Override
-	public void processMessage(EventType eventType, Object... params) {
-	}
-
-	private AboutDialog getAboutDialog() {
-		if (aboutDialog == null) {
-			aboutDialog = DialogFactory.getInstance().createAboutDialog("DIY Layout Creator 4",
-					IconLoader.BlackBoard.getIcon(),
-					plugInPort.getCurrentVersionNumber().toString(), "Bane Stojkovic",
-					"diy-fever.com", "bancika@gmail.com", "");
-		}
-		return aboutDialog;
-	}
-
-	class AboutAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		public AboutAction() {
-			super();
-			putValue(AbstractAction.NAME, "About");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.About.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			getAboutDialog().setVisible(true);
-		}
-	}
-}