switch to java 1.6.x

Update README.md
improved potentiometer symbol
2026-11-10 01:02:08 +10:00 · 2016-04-28 13:44:52 +02:00 · 2016-04-25 15:03:26 +02:00 · 2016-04-25 15:00:25 +02:00 · 2016-04-21 18:05:08 +02:00 · 2016-04-21 18:04:25 +02:00
772 changed files with 41727 additions and 3584 deletions
@@ -9,10 +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>
@@ -0,0 +1 @@
+/bin/
@@ -11,5 +11,5 @@
 <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="-Xms64m -Xmx256m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m"/>
 </launchConfiguration>
@@ -0,0 +1,86 @@
+<map>
+  <entry>
+    <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\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>
@@ -8,9 +8,11 @@ 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;

 /**
@@ -38,6 +40,8 @@ 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.info("Starting DIYLC with working directory " + System.getProperty("user.dir"));

 		try {
@@ -49,7 +53,16 @@ public class DIYLCStarter {
 		MainFrame mainFrame = new MainFrame();
 		mainFrame.setLocationRelativeTo(null);
 		mainFrame.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 {
@@ -59,6 +72,5 @@ public class DIYLCStarter {
 		} catch (Exception e) {
 			LOG.error("Could not read config.properties file", e);
 		}
-
 	}
 }
@@ -32,5 +32,9 @@ public enum DrawOption {
 	/**
 	 * Anti-aliasing is used when drawing.
 	 */
-	ANTIALIASING;
+	ANTIALIASING,
+	/**
+	 * Draw components in outline mode.
+	 */
+	OUTLINE_MODE;
 }
@@ -48,10 +48,6 @@ public enum EventType {
 	 * object containing selection size (x = width, y = height). Size is
 	 * expressed in the default measure (cm for metric, inches for imperial).
 	 */
-	SELECTION_SIZE_CHANGED,
-	/**
-	 * Called when display needs to be repainted. No parameters are passed.
-	 */
 	REPAINT,
 	/**
 	 * Called when new component slot has been changed. The only parameter is
@@ -76,6 +72,12 @@ public enum EventType {
 	 * current cursor location (not taking zoom into account).
 	 */
 	MOUSE_MOVED,
-	LAYER_STATE_CHANGED;
-	;
+	/**
+	 * 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;
 }
@@ -4,18 +4,15 @@ import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Point;
+import java.awt.geom.Point2D;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.SwingConstants;
-import javax.swing.JPopupMenu.Separator;
-
 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;
@@ -34,8 +31,21 @@ import com.diyfever.gui.update.VersionNumber;
 * @see EventType
 */
 public interface IPlugInPort {
-	
-	public static final String CHECK_BOX_MENU_ITEM = "org.diylc.checkBoxMenuItem";
+
+	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
@@ -91,8 +101,9 @@ public interface IPlugInPort {
 	 * Saves the current project into the specified file.
 	 * 
 	 * @param fileName
+	 * @param isBackup
 	 */
-	void saveProjectToFile(String fileName);
+	void saveProjectToFile(String fileName, boolean isBackup);

 	/**
 	 * @return the current file name.
@@ -132,49 +143,6 @@ public interface IPlugInPort {
 	 */
 	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
-	 */
-	void injectMenuAction(Action action, String menuName);
-
-	/**
-	 * Injects a custom submenu 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 name
-	 * @param icon
-	 * @param parentMenuName
-	 */
-	void injectSubmenu(String name, Icon icon, String parentMenuName);
-
 	Double[] getAvailableZoomLevels();

 	/**
@@ -202,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.
@@ -218,11 +188,20 @@ 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();
+
+	/**
+	 * 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.
+	 * 
+	 * @param newSelection
+	 */
+	void updateSelection(List<IDIYComponent<?>> newSelection);

 	/**
 	 * Selects all components in the project.
@@ -308,14 +287,7 @@ public interface IPlugInPort {
 	 */
 	List<PropertyWrapper> getMutualSelectionProperties();

-	/**
-	 * 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);
+	void editSelection();

 	/**
 	 * @return a list of editable properties of the current project.
@@ -351,6 +323,53 @@ public interface IPlugInPort {
 	 * 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);
 }
@@ -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);
+}
@@ -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();
+	}
+}
@@ -32,7 +32,7 @@ public class ObjectCache {
 		if (basicStrokeMap.containsKey(width)) {
 			return basicStrokeMap.get(width);
 		}
-		Stroke stroke = new BasicStroke(width);
+		Stroke stroke = new BasicStroke(width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
 		basicStrokeMap.put(width, stroke);
 		return stroke;
 	}
@@ -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();
+	}
+}
@@ -1,7 +1,8 @@
 package org.diylc.common;

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

 /**
 * Entity class for editable properties extracted from component objects.
@@ -14,23 +15,27 @@ 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(Object object) throws IllegalArgumentException,
-			IllegalAccessException, InvocationTargetException {
-		this.value = getter.invoke(object);
+	public void readFrom(Object object) throws IllegalArgumentException, IllegalAccessException,
+			InvocationTargetException, SecurityException, NoSuchMethodException {
+		this.value = object.getClass().getMethod(getter).invoke(object);
 	}

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

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

 	public String getName() {
@@ -67,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
@@ -91,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;
 	}

@@ -126,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;
 	}

@@ -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();
+	}
+}
@@ -2,6 +2,7 @@ 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;
@@ -19,11 +20,11 @@ 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);
+	public static Font LABEL_FONT = new Font("Tahoma", Font.PLAIN, 14);

 	@EditableProperty(defaultable = false)
 	@Override
@@ -36,6 +37,11 @@ public abstract class AbstractComponent<T> implements IDIYComponent<T> {
 		this.name = name;
 	}

+	@Override
+	public boolean canControlPointOverlap(int index) {
+		return false;
+	}
+
 	@Override
 	public String toString() {
 		return name;
@@ -48,7 +54,20 @@ public abstract class AbstractComponent<T> implements IDIYComponent<T> {
 	 * @param x
 	 * @return
 	 */
-	protected int getClosestOdd(int x) {
-		return (x / 2) * 2 + 1;
+	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;
 	}
 }
@@ -24,12 +24,15 @@ 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(DEFAULT_SIZE.convertToPixels() / 2, 0),
-			new Point(DEFAULT_SIZE.convertToPixels() / 2, DEFAULT_SIZE.convertToPixels()),
-			new Point(DEFAULT_SIZE.convertToPixels(), DEFAULT_SIZE.convertToPixels()) };
+	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.
@@ -37,6 +40,7 @@ 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);
@@ -59,8 +63,11 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 	}

 	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
-			IDrawingObserver drawingObserver) {
+	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();
@@ -93,29 +100,133 @@ 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() {
-		return controlPoints.length;
+		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 == 3;
+		return index == 0 || index == getControlPointCount() - 1;
 	}

 	@Override
 	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
-		return index == 0 || index == 3 ? VisibilityPolicy.ALWAYS : VisibilityPolicy.WHEN_SELECTED;
+		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) {
-		controlPoints[index].setLocation(point);
+		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
@@ -127,4 +238,12 @@ 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,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;
+	}
+}
@@ -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;
+	}
+}
@@ -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 {
+	}
+}
@@ -30,15 +30,11 @@ import org.diylc.core.annotations.EditableProperty;
 */
 public interface IDIYComponent<T> extends Serializable {

-	public static final int BELOW_CHASSIS = 1;
-	public static final int CHASSIS = 2;
-	public static final int ABOVE_CHASSIS = 3;
-	public static final int BELOW_BOARD = 4;
-	public static final int BOARD = 5;
-	public static final int ABOVE_BOARD = 6;
-	public static final int BELOW_COMPONENT = 7;
-	public static final int COMPONENT = 8;
-	public static final int ABOVE_COMPONENT = 9;
+	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.
@@ -84,9 +80,22 @@ public interface IDIYComponent<T> extends Serializable {
 	 * @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);

 	/**
@@ -94,10 +103,11 @@ public interface IDIYComponent<T> extends Serializable {
 	 * 
 	 * @param g2d
 	 * @param componentState
+	 * @param outlineMode
 	 * @param project
 	 * @param drawingObserver
 	 */
-	void draw(Graphics2D g2d, ComponentState componentState, Project project,
+	void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
 			IDrawingObserver drawingObserver);

 	/**
@@ -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;
+}
@@ -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);
+}
@@ -7,9 +7,12 @@ import java.util.List;
 import java.util.Set;

 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
 * collection of components.This class is serialized to file. Some filed getters
@@ -26,6 +29,8 @@ 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;
@@ -92,7 +97,7 @@ public class Project implements Serializable {
 		this.height = height;
 	}

-	@EditableProperty(name = "Grid spacing")
+	@EditableProperty(name = "Grid spacing", validatorClass = SpacingValidator.class)
 	public Size getGridSpacing() {
 		return gridSpacing;
 	}
@@ -118,10 +123,18 @@ public class Project implements Serializable {
 	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() {
@@ -177,12 +190,27 @@ public class Project implements Serializable {
 			return false;
 		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<IDIYComponent> clonedComponents = new
@@ -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;
+	}
+}
@@ -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);
+	}
+}
@@ -3,6 +3,9 @@ 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>
@@ -30,4 +33,10 @@ public @interface EditableProperty {
 	 * @return
 	 */
 	boolean defaultable() default true;
+	
+	/**
+	 * Class of validator to use to 
+	 * @return
+	 */
+	Class<? extends IPropertyValidator> validatorClass() default AllowAllValidator.class;
 }
@@ -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.");
+		}
+	}
+}
@@ -2,7 +2,7 @@ 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;
@@ -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);
+	}
+}
@@ -2,7 +2,7 @@ package org.diylc.core.measures;

 import org.diylc.utils.Constants;

-public class Size extends AbstractMeasure<SizeUnit> {
+public class Size extends AbstractMeasure<SizeUnit> implements Comparable<Size> {

 	private static final long serialVersionUID = 1L;

@@ -16,13 +16,13 @@ public class Size extends AbstractMeasure<SizeUnit> {
 		// TODO Auto-generated constructor stub
 	}

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

 	@Override
@@ -39,4 +39,9 @@ public class Size extends AbstractMeasure<SizeUnit> {
 		}
 		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());
+	}
 }
@@ -30,7 +30,8 @@ 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");
+			"edit_component.png"), Size("size.png"), Front("front.png"), Back("back.png"), Pens(
+			"pens.png"), Sort("sort.png");

 	protected String name;

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