2026-11-10 01:02:08 +10:00 · 2011-01-30 18:47:44 +00:00
435 changed files with 3652 additions and 11163 deletions
@@ -9,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/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/app-framework.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>diylc-core</name>
+	<name>DIYLC</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -2,7 +2,7 @@
 <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-swing/src/org/diylc/DIYLCStarter.java"/>
+<listEntry value="/DIYLC/src/org/diylc/DIYLCStarter.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -10,7 +10,6 @@
 <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.PROGRAM_ARGUMENTS" value="&quot;C:\Documents and Settings\bancika\My Documents\deacy.diy&quot;"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="diylc-swing"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="DIYLC"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m"/>
 </launchConfiguration>
@@ -1,4 +1,4 @@
-<project name="diylc-swing" basedir="." default="jar">
+<project name="diylc" basedir="." default="jar">
 	<property name="src.dir" value="src" />

 	<property name="lib.dir" value="${basedir}/lib" />
@@ -57,7 +57,7 @@
 	</manifestclasspath>

 	<target name="jar" depends="clean, lib.copy, resource.copy, compile">
-		<jar destfile="${jar.dir}/diylc.jar" basedir="${classes.dir}">
+		<jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
 				<attribute name="Main-Class" value="${main.class}" />
@@ -0,0 +1,22 @@
+<map>
+  <entry>
+    <string>lastPath</string>
+    <string>C:\Documents and Settings\Branislav Stojkovic\Desktop\oldFiles</string>
+  </entry>
+  <entry>
+    <string>zoom</string>
+    <double>1.0</double>
+  </entry>
+  <entry>
+    <string>metric</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>showTemplatesAtStartup</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>default.org.diylc.components.semiconductors.TransistorTO92:Orientation</string>
+    <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+  </entry>
+</map>
@@ -8,12 +8,13 @@ import javax.swing.UIManager;

 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
-import org.diylc.appframework.miscutils.ConfigurationManager;
-import org.diylc.appframework.miscutils.PropertyInjector;
 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.
 * 
@@ -24,7 +25,7 @@ import org.diylc.swing.gui.TemplateDialog;
 */
 public class DIYLCStarter {

-	private static final Logger LOG = Logger.getLogger(DIYLCStarter.class);
+	private static final Logger LOG = Logger.getLogger(Presenter.class);

 	/**
 	 * @param args
@@ -39,13 +40,7 @@ public class DIYLCStarter {
 			LOG.error("Could not initialize log4j configuration", e);
 		}

-		LOG.debug("Java version: " + System.getProperty("java.runtime.version")
-				+ " by " + System.getProperty("java.vm.vendor"));
-		LOG.debug("OS: " + System.getProperty("os.name") + " "
-				+ System.getProperty("os.version"));
-
-		LOG.info("Starting DIYLC with working directory "
-				+ System.getProperty("user.dir"));
+		LOG.info("Starting DIYLC with working directory " + System.getProperty("user.dir"));

 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
@@ -56,20 +51,17 @@ public class DIYLCStarter {
 		MainFrame mainFrame = new MainFrame();
 		mainFrame.setLocationRelativeTo(null);
 		mainFrame.setVisible(true);
-		if (args.length > 0) {
-			mainFrame.getPresenter().loadProjectFromFile(args[0]);
-		} else {
-			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);
-				}
+
+		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.");
@@ -4,7 +4,6 @@ import javax.swing.Icon;

 import org.diylc.core.CreationMethod;
 import org.diylc.core.IDIYComponent;
-import org.diylc.core.annotations.BomPolicy;

 /**
 * Entity class used to describe a component type.
@@ -25,12 +24,10 @@ public class ComponentType {
 	private Class<? extends IDIYComponent<?>> instanceClass;
 	private double zOrder;
 	private boolean stretchable;
-	private BomPolicy bomPolicy;

 	public ComponentType(String name, String description, CreationMethod creationMethod,
 			String category, String namePrefix, String author, Icon icon,
-			Class<? extends IDIYComponent<?>> instanceClass, double zOrder, 
-					boolean stretchable, BomPolicy bomPolicy) {
+			Class<? extends IDIYComponent<?>> instanceClass, double zOrder, boolean stretchable) {
 		super();
 		this.name = name;
 		this.description = description;
@@ -42,7 +39,6 @@ public class ComponentType {
 		this.instanceClass = instanceClass;
 		this.zOrder = zOrder;
 		this.stretchable = stretchable;
-		this.bomPolicy = bomPolicy;
 	}

 	public String getName() {
@@ -84,10 +80,6 @@ public class ComponentType {
 	public boolean isStretchable() {
 		return stretchable;
 	}
-	
-	public BomPolicy getBomPolicy() {
-		return bomPolicy;
-	}

 	@Override
 	public String toString() {
@@ -32,9 +32,5 @@ public enum DrawOption {
 	/**
 	 * Anti-aliasing is used when drawing.
 	 */
-	ANTIALIASING,
-	/**
-	 * Draw components in outline mode.
-	 */
-	OUTLINE_MODE;
+	ANTIALIASING;
 }
@@ -1,6 +1,6 @@
 package org.diylc.common;

-import org.diylc.appframework.simplemq.IMessageListener;
+import com.diyfever.gui.simplemq.IMessageListener;

 /**
 * Interface for plug-ins.
@@ -9,12 +9,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;

-import org.diylc.appframework.simplemq.IMessageListener;
-import org.diylc.appframework.simplemq.MessageDispatcher;
-import org.diylc.appframework.update.VersionNumber;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;
-import org.diylc.core.Theme;
+
+import com.diyfever.gui.simplemq.IMessageListener;
+import com.diyfever.gui.simplemq.MessageDispatcher;
+import com.diyfever.gui.update.VersionNumber;

 /**
 * Interface for communication between plug-ins and the application. Plug-ins
@@ -28,33 +28,9 @@ import org.diylc.core.Theme;
 * @see IMessageListener
 * @see EventType
 */
-public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyProcessor {
+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";
-
-	public static final int DND_TOGGLE_STICKY = 0x1;
-	public static final int DND_TOGGLE_SNAP = 0x40000000;
-	
-    /**
-     * Mouse button constants.
-     */ 
-    public static final int NOBUTTON = 0;
-    public static final int BUTTON1 = 1;
-    public static final int BUTTON2 = 2;
-    public static final int BUTTON3 = 3;
+	public static final String CHECK_BOX_MENU_ITEM = "org.diylc.checkBoxMenuItem";

 	/**
 	 * Returns size of the canvas that takes project dimensions into account as
@@ -110,9 +86,8 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	 * Saves the current project into the specified file.
 	 * 
 	 * @param fileName
-	 * @param isBackup
 	 */
-	void saveProjectToFile(String fileName, boolean isBackup);
+	void saveProjectToFile(String fileName);

 	/**
 	 * @return the current file name.
@@ -170,6 +145,73 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	 */
 	void setZoomLevel(double zoomLevel);

+	/**
+	 * Notifies the presenter that mouse is clicked.
+	 * 
+	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @param ctrlDown
+	 * @param shiftDown
+	 * @param altDown
+	 */
+	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
+
+	/**
+	 * Notifies the presenter that mouse is moved.
+	 * 
+	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @param ctrlDown
+	 * @param shiftDown
+	 * @param altDown
+	 */
+	void mouseMoved(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
+
+	/**
+	 * Returns the current {@link ComponentTransferable}.
+	 * 
+	 * @return
+	 */
+	List<IDIYComponent<?>> getSelectedComponents();
+
+	/**
+	 * Selects all components in the project.
+	 */
+	void selectAll();
+
+	/**
+	 * Notification that drag has been started from the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @param ctrlDown
+	 * @param shiftDown
+	 * @param altDown
+	 */
+	void dragStarted(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
+
+	/**
+	 * Checks if it's possible to drop over the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @return
+	 */
+	boolean dragOver(Point point);
+
+	/**
+	 * Notification that drag has been ended in the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 */
+	void dragEnded(Point point);
+
 	/**
 	 * Returns current version number.
 	 * 
@@ -218,7 +260,14 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	 */
 	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.
+	 * 
+	 * @param properties
+	 */
+	void applyPropertiesToSelection(List<PropertyWrapper> properties);

 	/**
 	 * @return a list of editable properties of the current project.
@@ -231,11 +280,6 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	 * @param properties
 	 */
 	void applyPropertiesToProject(List<PropertyWrapper> properties);
-	
-	/**
-	 * Gets the current new component slot.
-	 */
-	ComponentType getNewComponentTypeSlot();

 	/**
 	 * Sets the new component slot. Specified component type will be used to
@@ -284,28 +328,4 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	 * 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);
 }
@@ -0,0 +1,5 @@
+package org.diylc.common;
+
+public enum Power {
+ 
+}
@@ -1,6 +1,7 @@
 package org.diylc.common;

 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;

 import org.diylc.core.IPropertyValidator;

@@ -15,14 +16,12 @@ public class PropertyWrapper implements Cloneable {
 	private String name;
 	private Class<?> type;
 	private Object value;
-	private String setter;
-	private String getter;
+	private Method setter;
+	private Method getter;
 	private boolean defaultable;
 	private IPropertyValidator validator;
-	private boolean unique = true;
-	private boolean changed = false;

-	public PropertyWrapper(String name, Class<?> type, String getter, String setter,
+	public PropertyWrapper(String name, Class<?> type, Method getter, Method setter,
 			boolean defaultable, IPropertyValidator validator) {
 		super();
 		this.name = name;
@@ -34,8 +33,8 @@ public class PropertyWrapper implements Cloneable {
 	}

 	public void readFrom(Object object) throws IllegalArgumentException, IllegalAccessException,
-			InvocationTargetException, SecurityException, NoSuchMethodException {
-		this.value = object.getClass().getMethod(getter).invoke(object);
+			InvocationTargetException {
+		this.value = getter.invoke(object);
 	}

 	// public void readUniqueFrom(IDIYComponent component)
@@ -48,8 +47,8 @@ public class PropertyWrapper implements Cloneable {
 	// }

 	public void writeTo(Object object) throws IllegalArgumentException, IllegalAccessException,
-			InvocationTargetException, SecurityException, NoSuchMethodException {
-		object.getClass().getMethod(setter, type).invoke(object, this.value);
+			InvocationTargetException {
+		setter.invoke(object, value);
 	}

 	public String getName() {
@@ -75,22 +74,6 @@ public class PropertyWrapper implements Cloneable {
 	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
 	// public Object clone() throws CloneNotSupportedException {
@@ -112,6 +95,7 @@ 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;
 	}

@@ -146,6 +130,11 @@ 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;
 	}

@@ -0,0 +1,59 @@
+package org.diylc.components;
+
+import java.awt.Color;
+import java.awt.Font;
+
+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, 12);
+
+	@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(int x) {
+		return (x / 2) * 2 + 1;
+	}
+}
@@ -24,15 +24,12 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 	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 Point[] controlPoints = new Point[] { new Point(0, 0),
+			new Point(DEFAULT_SIZE.convertToPixels() / 2, 0),
+			new Point(DEFAULT_SIZE.convertToPixels() / 2, DEFAULT_SIZE.convertToPixels()),
+			new Point(DEFAULT_SIZE.convertToPixels(), DEFAULT_SIZE.convertToPixels()) };

 	protected Color color = getDefaultColor();
-	protected PointCount pointCount = PointCount.FOUR;

 	/**
 	 * Draws the specified curve onto graphics.
@@ -40,7 +37,6 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 	 * @param curve
 	 * @param g2d
 	 * @param componentState
-	 * @param theme
 	 */
 	protected abstract void drawCurve(CubicCurve2D curve, Graphics2D g2d,
 			ComponentState componentState);
@@ -63,11 +59,8 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 	}

 	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
-		if (checkPointsClipped(g2d.getClip())) {
-			return;
-		}
+	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
+			IDrawingObserver drawingObserver) {
 		if (componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING) {
 			// Do not track guidelines.
 			drawingObserver.stopTracking();
@@ -100,133 +93,35 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 		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;
+		return controlPoints.length;
 	}

 	@Override
 	public boolean isControlPointSticky(int index) {
-		return index == 0 || index == getControlPointCount() - 1;
+		return index == 0 || index == 3;
 	}

 	@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;
+		return index == 1 || index == 2;
 	}

 	@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;
-			}
-		}
+		controlPoints[index].setLocation(point);
 	}

 	@EditableProperty
@@ -238,12 +133,4 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 		this.color = color;
 	}

-	enum PointCount {
-		TWO, THREE, FOUR;
-
-		@Override
-		public String toString() {
-			return name().substring(0, 1) + name().substring(1).toLowerCase();
-		}
-	}
 }
@@ -0,0 +1,249 @@
+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.Rectangle2D;
+
+import org.diylc.common.Display;
+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;
+
+/**
+ * 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(DEFAULT_SIZE.convertToPixels() / 2, 0) };
+	protected Color bodyColor = Color.white;
+	protected Color borderColor = Color.black;
+	protected Color labelColor = LABEL_COLOR;
+	protected Display display = Display.NAME;
+
+	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, Project project,
+			IDrawingObserver drawingObserver) {
+		double distance = points[0].distance(points[1]);
+		Shape shape = getBodyShape();
+		if (shape == null) {
+			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(
+					getLeadThickness().convertToPixels()));
+			g2d.setColor(shouldShadeLeads() ? getLeadColor(componentState).darker()
+					: getLeadColor(componentState));
+			g2d.drawLine(points[0].x, points[0].y, points[1].x, points[1].y);
+			if (shouldShadeLeads()) {
+				g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(
+						getLeadThickness().convertToPixels() - 2));
+				g2d.setColor(getLeadColor(componentState));
+				g2d.drawLine(points[0].x, points[0].y, points[1].x, points[1].y);
+			}
+			return;
+		}
+		Rectangle shapeRect = shape.getBounds();
+		double leadLenght = (distance - shapeRect.width) / 2;
+		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.
+		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));
+		}
+		g2d.setColor(bodyColor);
+		g2d.fill(shape);
+		decorateComponentBody(g2d);
+		g2d.setComposite(oldComposite);
+		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
+		g2d.setColor(componentState == ComponentState.SELECTED
+				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : borderColor);
+		g2d.draw(shape);
+		// Draw leads.
+		int leadThickness = getClosestOdd(getLeadThickness().convertToPixels());
+		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
+		g2d.setColor(shouldShadeLeads() ? getLeadColor(componentState).darker()
+				: getLeadColor(componentState));
+		g2d.drawLine((int) (shapeRect.width - distance) / 2, (int) shapeRect.height / 2,
+				(int) ((shapeRect.width - distance) / 2 + leadLenght) - leadThickness / 2,
+				(int) shapeRect.height / 2);
+		g2d.drawLine((int) (shapeRect.width + distance) / 2, (int) shapeRect.height / 2,
+				(int) ((shapeRect.width + distance) / 2 - leadLenght) + leadThickness / 2,
+				(int) shapeRect.height / 2);
+		if (shouldShadeLeads()) {
+			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
+			g2d.setColor(getLeadColor(componentState));
+			g2d.drawLine((int) (shapeRect.width - distance) / 2, (int) shapeRect.height / 2,
+					(int) ((shapeRect.width - distance) / 2 + leadLenght) - leadThickness / 2,
+					(int) shapeRect.height / 2);
+			g2d.drawLine((int) (shapeRect.width + distance) / 2, (int) shapeRect.height / 2,
+					(int) ((shapeRect.width + distance) / 2 - leadLenght) + leadThickness / 2,
+					(int) shapeRect.height / 2);
+		}
+		// Do not track the label because that area was already covered.
+		drawingObserver.stopTracking();
+		// Draw label.
+		g2d.setFont(LABEL_FONT);
+		g2d.setColor(componentState == ComponentState.SELECTED ? LABEL_COLOR_SELECTED : labelColor);
+		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,
+				(int) (shapeRect.height - textRect.getHeight()) / 2 + fontMetrics.getAscent());
+	}
+
+	protected void decorateComponentBody(Graphics2D g2d) {
+		// Do nothing.
+	}
+
+	protected boolean shouldShadeLeads() {
+		return true;
+	}
+
+	/**
+	 * @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 Size getLeadThickness() {
+		return LEAD_THICKNESS;
+	}
+
+	/**
+	 * @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;
+	}
+}
@@ -0,0 +1,36 @@
+package org.diylc.components;
+
+import java.awt.Point;
+
+public abstract class AbstractSinglePointComponent extends AbstractComponent<Void> {
+
+	private static final long serialVersionUID = 1L;
+
+	protected Point point = new Point(0, 0);
+
+	@Override
+	public int getControlPointCount() {
+		return 1;
+	}
+
+	@Override
+	public Point getControlPoint(int index) {
+		return point;
+	}
+
+	@Override
+	public void setControlPoint(Point point, int index) {
+		this.point.setLocation(point);
+	}
+	
+	@Deprecated
+	@Override
+	public Void getValue() {
+		return null;
+	}
+	
+	@Deprecated
+	@Override
+	public void setValue(Void value) {
+	}
+}
@@ -103,11 +103,10 @@ public interface IDIYComponent<T> extends Serializable {
 	 * 
 	 * @param g2d
 	 * @param componentState
-	 * @param outlineMode
 	 * @param project
 	 * @param drawingObserver
 	 */
-	void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
+	void draw(Graphics2D g2d, ComponentState componentState, Project project,
 			IDrawingObserver drawingObserver);

 	/**
@@ -1,11 +1,5 @@
 package org.diylc.core;

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

 /**
 * Base interface for the main GUI component.
@@ -27,15 +21,8 @@ public interface IView {
 	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);
-	
-	File promptFileSave();
 }
@@ -6,7 +6,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

-import org.diylc.appframework.update.VersionNumber;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.PositiveMeasureValidator;
 import org.diylc.core.measures.Size;
@@ -28,8 +27,6 @@ public class Project implements Serializable {
 	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;
@@ -126,14 +123,6 @@ public class Project implements Serializable {
 	public Set<Integer> getLockedLayers() {
 		return lockedLayers;
 	}
-	
-	public VersionNumber getFileVersion() {
-		return fileVersion;
-	}
-	
-	public void setFileVersion(VersionNumber fileVersion) {
-		this.fileVersion = fileVersion;
-	}

 	@Override
 	public int hashCode() {
@@ -201,8 +190,8 @@ public class Project implements Serializable {
 		public void validate(Object value) throws ValidationException {
 			super.validate(value);
 			Size size = (Size) value;
-			if (size.compareTo(new Size(0.5d, SizeUnit.mm)) < 0) {
-				throw new ValidationException("must be at least 0.5mm");
+			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");
@@ -14,7 +14,7 @@ import org.diylc.core.IDIYComponent;
 */
@Retention(RetentionPolicy.RUNTIME)
 public @interface ComponentDescriptor {
-	
+
 	/**
 	 * @return component type name.
 	 */
@@ -58,10 +58,5 @@ public @interface ComponentDescriptor {
 	 *         move together with it.
 	 */
 	boolean stretchable() default true;
-	
-	/**
-	 * @return controls what should be shown the BOM 
-	 */
-	BomPolicy bomPolicy() default BomPolicy.SHOW_ALL_NAMES;

 }
@@ -10,7 +10,7 @@ public class PositiveMeasureValidator implements IPropertyValidator {
 	public void validate(Object value) throws ValidationException {
 		if (value instanceof AbstractMeasure) {
 			AbstractMeasure measure = (AbstractMeasure) value;
-			if (measure.getValue() < 0) {
+			if (measure.getValue() <= 0) {
 				throw new ValidationException("must be greater than zero.");
 			}
 		} else {
@@ -76,6 +76,6 @@ public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializ

 	@Override
 	public String toString() {
-		return format.format(value) + unit;
+		return format.format(value) + " " + unit;
 	}
 }
@@ -2,7 +2,7 @@ package org.diylc.core.measures;

 public enum CapacitanceUnit implements Unit {

-	pF(1, "pF"), nF(1e3, "nF"), uF(1e6, "uF"), mF(1e9, "mF"), F(1e12, "F");
+	pF(1, "pF"), nF(1e3, "nF"), uF(1e6, "\u03bcF"), mF(1e9, "mF"), F(1e12, "F");

 	double factor;
 	String display;
@@ -32,56 +32,36 @@ public class Resistance extends AbstractMeasure<ResistanceUnit> {

 	public Color[] getColorCode(ResistorColorCode resistorColorCode) {
 		Color[] bands;
-		if (getValue() == 0) {
-			switch (resistorColorCode) {
-			case _4_BAND:
-				bands = new Color[3];
-				bands[0] = COLOR_DIGITS[0];
-				bands[1] = COLOR_DIGITS[0];
-				bands[2] = COLOR_MULTIPLIER[2];
-				break;
-			case _5_BAND:
-				bands = new Color[4];
-				bands[0] = COLOR_DIGITS[0];
-				bands[1] = COLOR_DIGITS[0];
-				bands[2] = COLOR_DIGITS[0];
-				bands[3] = COLOR_MULTIPLIER[2];
-				break;
-			default:
-				bands = new Color[] {};
-			}
-		} else {
-			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[] {};
-			}
+		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) Math.round(base / 10)];
+			bands[1] = COLOR_DIGITS[(int) Math.round(base % 10)];
+			bands[2] = COLOR_MULTIPLIER[multiplier + 2];
+			break;
+		case _5_BAND:
+			bands = new Color[4];
+			bands[0] = COLOR_DIGITS[(int) Math.round(base / 100)];
+			bands[1] = COLOR_DIGITS[(int) Math.round(base / 10 % 10)];
+			bands[2] = COLOR_DIGITS[(int) Math.round(base % 10)];
+			bands[3] = COLOR_MULTIPLIER[multiplier + 2];
+			break;
+		default:
+			bands = new Color[] {};
 		}
 		return bands;
 	}
@@ -89,7 +69,7 @@ public class Resistance extends AbstractMeasure<ResistanceUnit> {
 	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()).trim();
+				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
 				return new Resistance(Double.parseDouble(value), unit);
 			}
 		}
@@ -2,7 +2,7 @@ package org.diylc.core.measures;

 public enum ResistanceUnit implements Unit {

-	R(1, "\u2126"), K(1e3, "K"), M(1e6, "M");
+	R(1, "\u03a9"), K(1e3, "K"), M(1e6, "M");

 	double factor;
 	String display;
@@ -16,13 +16,13 @@ public class Size extends AbstractMeasure<SizeUnit> implements Comparable<Size>
 		// TODO Auto-generated constructor stub
 	}

-	public double convertToPixels() {
+	public int 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;
+		return (int) (getValue() * getUnit().getFactor() / SizeUnit.in.getFactor() * Constants.PIXELS_PER_INCH);
 	}

 	@Override
@@ -30,8 +30,7 @@ public enum IconLoader {
 			"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"), ElementsSelection("elements_selection.png");
+			"edit_component.png"), Size("size.png"), Front("front.png"), Back("back.png");

 	protected String name;

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