DIYLC/.classpath

@@ -9,9 +9,10 @@
 	<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>

DIYLC/DIYLCStarter.launch

@@ -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="-Xms256m -Xmx512m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms64m -Xmx256m"/>
 </launchConfiguration>

DIYLC/config.xml

@@ -0,0 +1,14 @@
+<map>
+  <entry>
+    <string>lastPath</string>
+    <string>C:\Documents and Settings\Branislav Stojkovic\Desktop</string>
+  </entry>
+  <entry>
+    <string>zoom</string>
+    <double>1.0</double>
+  </entry>
+  <entry>
+    <string>metric</string>
+    <boolean>true</boolean>
+  </entry>
+</map>

DIYLC/src/org/diylc/DIYLCStarter.java

@@ -8,11 +8,9 @@ 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;
 
 /**
@@ -40,8 +38,6 @@ 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 {
@@ -53,16 +49,7 @@ 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 {
@@ -72,5 +59,6 @@ public class DIYLCStarter {
 		} catch (Exception e) {
 			LOG.error("Could not read config.properties file", e);
 		}
+
 	}
 }

DIYLC/src/org/diylc/common/ComponentSelection.java

@@ -1,4 +1,4 @@
-package org.diylc.swing.plugins.edit;
+package org.diylc.common;
 
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
@@ -10,24 +10,33 @@ import java.util.List;
 
 import org.diylc.core.IDIYComponent;
 
+
 /**
- * Represents component selection as a {@link List} of {@link IDIYComponent}
- * objects. Implements {@link Transferable}, so it is suitable for clipboard
- * usage.
+ * Represents component selection as a {@link List} of
+ * {@link IDIYComponent} objects. Implements {@link Transferable}, so it is
+ * suitable for clipboard usage.
  * 
  * @author Branislav Stojkovic
  */
-public class ComponentTransferable extends ArrayList<IDIYComponent<?>> implements Transferable {
+public class ComponentSelection extends ArrayList<IDIYComponent<?>> implements Transferable {
 
 	private static final long serialVersionUID = 1L;
 
-	public static final DataFlavor listFlavor = new DataFlavor(ComponentTransferable.class, "application/diylc");
+	public static final DataFlavor listFlavor = new DataFlavor(List.class, "Java List");
+	
+	public static final ComponentSelection EMPTY_SELECTION = new ComponentSelection();
+	
+	public static ComponentSelection of(IDIYComponent<?> component) {
+		ComponentSelection selection = new ComponentSelection();
+		selection.add(component);
+		return selection;
+	}
 
-	public ComponentTransferable() {
+	public ComponentSelection() {
 		super();
 	}
 
-	public ComponentTransferable(Collection<IDIYComponent<?>> selectedComponents) {
+	public ComponentSelection(Collection<IDIYComponent<?>> selectedComponents) {
 		super(selectedComponents);
 	}
 

DIYLC/src/org/diylc/common/DrawOption.java

@@ -32,9 +32,5 @@ public enum DrawOption {
 	/**
 	 * Anti-aliasing is used when drawing.
 	 */
-	ANTIALIASING,
-	/**
-	 * Draw components in outline mode.
-	 */
-	OUTLINE_MODE;
+	ANTIALIASING;
 }

DIYLC/src/org/diylc/common/EventType.java

@@ -48,6 +48,10 @@ 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
@@ -72,12 +76,6 @@ public enum EventType {
 	 * current cursor location (not taking zoom into account).
 	 */
 	MOUSE_MOVED,
-	/**
-	 * Called when a layer status is changed. The first parameter is a set of indices of locked layers. All layers not included are considered unlocked.
-	 */
-	LAYER_STATE_CHANGED,
-	/**
-	 * Called to update the status message. New status message is passed as a first parameter.
-	 */
-	STATUS_MESSAGE_CHANGED;
+	LAYER_STATE_CHANGED;
+	;
 }

DIYLC/src/org/diylc/common/IPlugInPort.java

@@ -4,15 +4,18 @@ 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;
@@ -31,21 +34,8 @@ import com.diyfever.gui.update.VersionNumber;
  * @see EventType
  */
 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 String CHECK_BOX_MENU_ITEM = "org.diylc.checkBoxMenuItem";
 
 	/**
 	 * Returns size of the canvas that takes project dimensions into account as
@@ -101,9 +91,8 @@ public interface IPlugInPort {
 	 * 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.
@@ -143,6 +132,49 @@ 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();
 
 	/**
@@ -170,10 +202,8 @@ public interface IPlugInPort {
 	 * @param ctrlDown
 	 * @param shiftDown
 	 * @param altDown
-	 * @param clickCount
 	 */
-	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown,
-			int clickCount);
+	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
 
 	/**
 	 * Notifies the presenter that mouse is moved.
@@ -188,20 +218,11 @@ public interface IPlugInPort {
 	void mouseMoved(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
 
 	/**
-	 * Returns the current {@link ComponentTransferable}.
+	 * Returns the current {@link ComponentSelection}.
 	 * 
 	 * @return
 	 */
-	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);
+	ComponentSelection getSelectedComponents();
 
 	/**
 	 * Selects all components in the project.
@@ -287,7 +308,14 @@ public interface IPlugInPort {
 	 */
 	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.
@@ -323,53 +351,6 @@ 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);
 }

DIYLC/src/org/diylc/common/ObjectCache.java

@@ -32,7 +32,7 @@ public class ObjectCache {
 		if (basicStrokeMap.containsKey(width)) {
 			return basicStrokeMap.get(width);
 		}
-		Stroke stroke = new BasicStroke(width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
+		Stroke stroke = new BasicStroke(width);
 		basicStrokeMap.put(width, stroke);
 		return stroke;
 	}

DIYLC/src/org/diylc/common/PropertyWrapper.java

@@ -1,8 +1,7 @@
 package org.diylc.common;
 
 import java.lang.reflect.InvocationTargetException;
-
-import org.diylc.core.IPropertyValidator;
+import java.lang.reflect.Method;
 
 /**
  * Entity class for editable properties extracted from component objects.
@@ -15,27 +14,23 @@ 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,
-			boolean defaultable, IPropertyValidator validator) {
+	public PropertyWrapper(String name, Class<?> type, Method getter, Method setter,
+			boolean defaultable) {
 		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, SecurityException, NoSuchMethodException {
-		this.value = object.getClass().getMethod(getter).invoke(object);
+	public void readFrom(Object object) throws IllegalArgumentException,
+			IllegalAccessException, InvocationTargetException {
+		this.value = getter.invoke(object);
 	}
 
 	// public void readUniqueFrom(IDIYComponent component)
@@ -47,9 +42,9 @@ 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);
+	public void writeTo(Object object) throws IllegalArgumentException,
+			IllegalAccessException, InvocationTargetException {
+		setter.invoke(object, value);
 	}
 
 	public String getName() {
@@ -72,24 +67,8 @@ public class PropertyWrapper implements Cloneable {
 		return 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;
+	public void setDefaultable(boolean defaultable) {
+		this.defaultable = defaultable;
 	}
 
 	// @Override
@@ -112,6 +91,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 +126,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;
 	}
 

DIYLC/src/org/diylc/components/AbstractComponent.java

@@ -2,7 +2,6 @@ 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;
@@ -20,11 +19,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, 14);
+	public static Font LABEL_FONT = new Font("Tahoma", Font.PLAIN, 12);
 
 	@EditableProperty(defaultable = false)
 	@Override
@@ -37,11 +36,6 @@ 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;
@@ -54,20 +48,7 @@ public abstract class AbstractComponent<T> implements IDIYComponent<T> {
 	 * @param x
 	 * @return
 	 */
-	protected int getClosestOdd(double x) {
-		return ((int) x / 2) * 2 + 1;
-	}
-
-	/**
-	 * @param clip
-	 * @return true if none of the control points lie in the clip rectangle.
-	 */
-	protected boolean checkPointsClipped(Shape clip) {
-		for (int i = 0; i < getControlPointCount(); i++) {
-			if (clip.contains(getControlPoint(i))) {
-				return false;
-			}
-		}
-		return true;
+	protected int getClosestOdd(int x) {
+		return (x / 2) * 2 + 1;
 	}
 }

DIYLC/src/org/diylc/components/AbstractCurvedComponent.java

@@ -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,29 @@ 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 == 0 || index == 3 ? VisibilityPolicy.ALWAYS : VisibilityPolicy.WHEN_SELECTED;
 	}
 
 	@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 +127,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();
-		}
-	}
 }

DIYLC/src/org/diylc/components/AbstractLeadedComponent.java

@@ -0,0 +1,259 @@
+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 width;
+	protected Size height;
+	protected Point[] points = new Point[] {
+			new Point((int) (-DEFAULT_SIZE.convertToPixels() / 2), 0),
+			new Point(DEFAULT_SIZE.convertToPixels() / 2, 0) };
+	protected Color bodyColor = getDefaultBodyColor();
+	protected Color borderColor = getDefaultBorderColor();
+	protected Color labelColor = LABEL_COLOR;
+	protected Display display = Display.NAME;
+
+	protected AbstractLeadedComponent() {
+		super();
+		try {
+			this.width = getDefaultWidth().clone();
+			this.height = getDefaultHeight().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 width.
+	 */
+	protected abstract Size getDefaultWidth();
+
+	/**
+	 * Returns default component height.
+	 * 
+	 * @return
+	 */
+	protected abstract Size getDefaultHeight();
+
+	/**
+	 * @return shape that represents component body. Shape should not be
+	 *         transformed and should be referenced to (0, 0).
+	 */
+	protected abstract Shape getBodyShape();
+
+	/**
+	 * @return default component body color.
+	 */
+	protected abstract Color getDefaultBodyColor();
+
+	/**
+	 * @return default component border color.
+	 */
+	protected abstract Color getDefaultBorderColor();
+
+	/**
+	 * @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(defaultable = true)
+	public Size getWidth() {
+		return width;
+	}
+
+	public void setWidth(Size width) {
+		this.width = width;
+	}
+
+	@EditableProperty(defaultable = true)
+	public Size getHeight() {
+		return height;
+	}
+
+	public void setHeight(Size height) {
+		this.height = height;
+	}
+
+	@EditableProperty
+	public Display getDisplay() {
+		return display;
+	}
+
+	public void setDisplay(Display display) {
+		this.display = display;
+	}
+}

DIYLC/src/org/diylc/components/AbstractSinglePointComponent.java

@@ -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) {
+	}
+}

DIYLC/src/org/diylc/core/IDIYComponent.java

@@ -30,11 +30,15 @@ import org.diylc.core.annotations.EditableProperty;
  */
 public interface IDIYComponent<T> extends Serializable {
 
-	public static final int CHASSIS = 1;
-	public static final int BOARD = 2;
-	public static final int TRACE = 3;
-	public static final int COMPONENT = 4;
-	public static final int TEXT = 5;
+	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;
 
 	/**
 	 * @return component instance name.
@@ -80,22 +84,9 @@ 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);
 
 	/**
@@ -103,11 +94,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);
 
 	/**

DIYLC/src/org/diylc/core/Project.java

@@ -7,12 +7,9 @@ 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
@@ -29,8 +26,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;
@@ -97,7 +92,7 @@ public class Project implements Serializable {
 		this.height = height;
 	}
 
-	@EditableProperty(name = "Grid spacing", validatorClass = SpacingValidator.class)
+	@EditableProperty(name = "Grid spacing")
 	public Size getGridSpacing() {
 		return gridSpacing;
 	}
@@ -123,18 +118,10 @@ 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() {
@@ -190,27 +177,12 @@ 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

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

@@ -3,9 +3,6 @@ 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>
@@ -33,10 +30,4 @@ public @interface EditableProperty {
 	 * @return
 	 */
 	boolean defaultable() default true;
-	
-	/**
-	 * Class of validator to use to 
-	 * @return
-	 */
-	Class<? extends IPropertyValidator> validatorClass() default AllowAllValidator.class;
 }

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

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

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

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

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

@@ -2,7 +2,7 @@ package org.diylc.core.measures;
 
 import org.diylc.utils.Constants;
 
-public class Size extends AbstractMeasure<SizeUnit> implements Comparable<Size> {
+public class Size extends AbstractMeasure<SizeUnit> {
 
 	private static final long serialVersionUID = 1L;
 
@@ -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
@@ -39,9 +39,4 @@ public class Size extends AbstractMeasure<SizeUnit> implements Comparable<Size>
 		}
 		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());
-	}
 }

DIYLC/src/org/diylc/gui/CustomGlassPane.java

@@ -1,4 +1,4 @@
-package org.diylc.swing.gui;
+package org.diylc.gui;
 
 import java.awt.Graphics;
 import java.awt.Graphics2D;

DIYLC/src/org/diylc/gui/DialogFactory.java

@@ -1,4 +1,4 @@
-package org.diylc.swing.gui;
+package org.diylc.gui;
 
 import java.io.File;
 import java.util.List;
@@ -9,13 +9,13 @@ import javax.swing.JFrame;
 import javax.swing.filechooser.FileFilter;
 
 import org.diylc.common.PropertyWrapper;
-import org.diylc.swing.gui.components.OverwritePromptFileChooser;
-import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.plugins.file.BomDialog;
-import org.diylc.swing.plugins.file.BomEntry;
-import org.diylc.swing.plugins.online.view.LoginDialog;
-import org.diylc.swing.plugins.online.view.NewUserDialog;
-import org.diylc.swing.plugins.online.view.UploadDialog;
+import org.diylc.gui.components.OverwritePromptFileChooser;
+import org.diylc.gui.editor.PropertyEditorDialog;
+import org.diylc.plugins.file.BomDialog;
+import org.diylc.plugins.file.BomEntry;
+import org.diylc.plugins.online.view.LoginDialog;
+import org.diylc.plugins.online.view.NewUserDialog;
+import org.diylc.plugins.online.view.UploadDialog;
 
 import com.diyfever.gui.AboutDialog;
 import com.diyfever.gui.IFileChooserAccessory;

DIYLC/src/org/diylc/gui/IView.java

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

DIYLC/src/org/diylc/gui/MainFrame.java

@@ -1,27 +1,19 @@
-package org.diylc.swing.gui;
+package org.diylc.gui;
 
 import java.awt.BorderLayout;
 import java.awt.Container;
-import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import javax.swing.Action;
 import javax.swing.BoxLayout;
-import javax.swing.ButtonGroup;
 import javax.swing.Icon;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JComponent;
@@ -30,39 +22,24 @@ import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JRadioButtonMenuItem;
 import javax.swing.SwingConstants;
-import javax.swing.SwingWorker;
 import javax.swing.Timer;
 
-import org.apache.log4j.Logger;
 import org.diylc.common.BadPositionException;
 import org.diylc.common.EventType;
 import org.diylc.common.IPlugIn;
 import org.diylc.common.IPlugInPort;
-import org.diylc.common.ITask;
-import org.diylc.common.PropertyWrapper;
-import org.diylc.core.IView;
 import org.diylc.images.IconLoader;
+import org.diylc.plugins.canvas.CanvasPlugin;
+import org.diylc.plugins.clipboard.EditMenuPlugin;
+import org.diylc.plugins.file.FileMenuPlugin;
+import org.diylc.plugins.help.HelpMenuPlugin;
+import org.diylc.plugins.layers.LayersMenuPlugin;
+import org.diylc.plugins.statusbar.StatusBar;
+import org.diylc.plugins.toolbox.ToolBox;
 import org.diylc.presenter.Presenter;
-import org.diylc.swing.ISwingUI;
-import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.plugins.autosave.AutoSavePlugin;
-import org.diylc.swing.plugins.canvas.CanvasPlugin;
-import org.diylc.swing.plugins.config.ConfigPlugin;
-import org.diylc.swing.plugins.edit.EditMenuPlugin;
-import org.diylc.swing.plugins.file.FileMenuPlugin;
-import org.diylc.swing.plugins.help.HelpMenuPlugin;
-import org.diylc.swing.plugins.layers.LayersMenuPlugin;
-import org.diylc.swing.plugins.statusbar.StatusBar;
-import org.diylc.swing.plugins.toolbox.ToolBox;
 
-import com.diyfever.gui.ButtonDialog;
-import com.diyfever.gui.miscutils.ConfigurationManager;
-
-public class MainFrame extends JFrame implements ISwingUI {
-
-	private static final Logger LOG = Logger.getLogger(MainFrame.class);
+public class MainFrame extends JFrame implements IView {
 
 	private static final long serialVersionUID = 1L;
 
@@ -76,7 +53,6 @@ public class MainFrame extends JFrame implements ISwingUI {
 
 	private JMenuBar mainMenuBar;
 	private Map<String, JMenu> menuMap;
-	private Map<String, ButtonGroup> buttonGroupMap;
 
 	private CanvasPlugin canvasPlugin;
 
@@ -86,41 +62,24 @@ public class MainFrame extends JFrame implements ISwingUI {
 		setPreferredSize(new Dimension(800, 600));
 		createBasePanels();
 		menuMap = new HashMap<String, JMenu>();
-		buttonGroupMap = new HashMap<String, ButtonGroup>();
 		setIconImages(Arrays.asList(IconLoader.IconSmall.getImage(), IconLoader.IconMedium
 				.getImage(), IconLoader.IconLarge.getImage()));
 		DialogFactory.getInstance().initialize(this);
 
 		this.presenter = new Presenter(this);
 
-		presenter.installPlugin(new ToolBox(this));
-		presenter.installPlugin(new FileMenuPlugin(this));
-		presenter.installPlugin(new EditMenuPlugin(this));
-		presenter.installPlugin(new ConfigPlugin(this));
-		presenter.installPlugin(new LayersMenuPlugin(this));
+		presenter.installPlugin(new ToolBox());
+		presenter.installPlugin(new FileMenuPlugin());
+		presenter.installPlugin(new EditMenuPlugin());
+		presenter.installPlugin(new LayersMenuPlugin());
 		// presenter.installPlugin(new OnlineManager());
-		presenter.installPlugin(new HelpMenuPlugin(this));
+		presenter.installPlugin(new HelpMenuPlugin());
 
-		presenter.installPlugin(new StatusBar(this));
-		canvasPlugin = new CanvasPlugin(this);
+		presenter.installPlugin(new StatusBar());
+		canvasPlugin = new CanvasPlugin();
 		presenter.installPlugin(canvasPlugin);
 		presenter.installPlugin(new FramePlugin());
 
-		try {
-			File testFile = new File("test.tmp");
-			Writer out = new OutputStreamWriter(new FileOutputStream(testFile));
-			out.write("This is a test");
-			out.close();
-			testFile.delete();
-			presenter.installPlugin(new AutoSavePlugin(this));
-		} catch (Exception e) {
-			showMessage(
-					"The current user does not have permissions to access folder "
-							+ new File(".").getAbsolutePath()
-							+ ".\nAuto-save feature will not be available, contact your system administrator.",
-					"Warning", IView.WARNING_MESSAGE);
-		}
-
 		presenter.createNewProject();
 
 		addWindowListener(new WindowAdapter() {
@@ -128,8 +87,6 @@ public class MainFrame extends JFrame implements ISwingUI {
 			@Override
 			public void windowClosed(WindowEvent e) {
 				if (presenter.allowFileAction()) {
-					ConfigurationManager.getInstance().writeValue(IPlugInPort.ABNORMAL_EXIT_KEY,
-							false);
 					dispose();
 					presenter.dispose();
 					System.exit(0);
@@ -139,8 +96,6 @@ public class MainFrame extends JFrame implements ISwingUI {
 			@Override
 			public void windowClosing(WindowEvent e) {
 				if (presenter.allowFileAction()) {
-					ConfigurationManager.getInstance().writeValue(IPlugInPort.ABNORMAL_EXIT_KEY,
-							false);
 					dispose();
 					presenter.dispose();
 					System.exit(0);
@@ -152,10 +107,6 @@ public class MainFrame extends JFrame implements ISwingUI {
 		// getGlassPane().setVisible(true);
 	}
 
-	public Presenter getPresenter() {
-		return presenter;
-	}
-
 	@Override
 	public void setVisible(boolean b) {
 		super.setVisible(b);
@@ -218,41 +169,7 @@ public class MainFrame extends JFrame implements ISwingUI {
 	// IView
 
 	@Override
-	public void showMessage(String message, String title, int messageType) {
-		JOptionPane.showMessageDialog(this, message, title, messageType);
-	}
-
-	@Override
-	public int showConfirmDialog(String message, String title, int optionType, int messageType) {
-		return JOptionPane.showConfirmDialog(this, message, title, optionType, messageType);
-	}
-
-	@Override
-	public boolean editProperties(List<PropertyWrapper> properties,
-			Set<PropertyWrapper> defaultedProperties) {
-		PropertyEditorDialog editor = DialogFactory.getInstance().createPropertyEditorDialog(
-				properties, "Edit Selection");
-		editor.setVisible(true);
-		defaultedProperties.addAll(editor.getDefaultedProperties());
-		return ButtonDialog.OK.equals(editor.getSelectedButtonCaption());
-	}
-
-	private JMenu findOrCreateMenu(String menuName) {
-		JMenu menu;
-		if (menuMap.containsKey(menuName)) {
-			menu = menuMap.get(menuName);
-		} else {
-			menu = new JMenu(menuName);
-			menuMap.put(menuName, menu);
-			getMainMenuBar().add(menu);
-		}
-		return menu;
-	}
-
-	@Override
-	public void injectGUIComponent(JComponent component, int position) throws BadPositionException {
-		LOG.info(String.format("injectGUIComponent(%s, %s)", component.getClass().getName(),
-				position));
+	public void addComponent(JComponent component, int position) throws BadPositionException {
 		switch (position) {
 		case SwingConstants.TOP:
 			topPanel.add(component);
@@ -276,28 +193,14 @@ public class MainFrame extends JFrame implements ISwingUI {
 	}
 
 	@Override
-	public void injectMenuAction(Action action, String menuName) {
-		LOG.info(String.format("injectMenuAction(%s, %s)", action == null ? "Separator" : action
-				.getValue(Action.NAME), menuName));
+	public void addMenuAction(Action action, String menuName) {
 		JMenu menu = findOrCreateMenu(menuName);
 		if (action == null) {
 			menu.addSeparator();
 		} else {
-			Boolean isCheckBox = (Boolean) action.getValue(IView.CHECK_BOX_MENU_ITEM);
-			String groupName = (String) action.getValue(IView.RADIO_BUTTON_GROUP_KEY);
+			Boolean isCheckBox = (Boolean) action.getValue(IPlugInPort.CHECK_BOX_MENU_ITEM);
 			if (isCheckBox != null && isCheckBox) {
 				menu.add(new JCheckBoxMenuItem(action));
-			} else if (groupName != null) {
-				ButtonGroup group;
-				if (buttonGroupMap.containsKey(groupName)) {
-					group = buttonGroupMap.get(groupName);
-				} else {
-					group = new ButtonGroup();
-					buttonGroupMap.put(groupName, group);
-				}
-				JRadioButtonMenuItem item = new JRadioButtonMenuItem(action);
-				group.add(item);
-				menu.add(item);
 			} else {
 				menu.add(action);
 			}
@@ -305,8 +208,7 @@ public class MainFrame extends JFrame implements ISwingUI {
 	}
 
 	@Override
-	public void injectSubmenu(String name, Icon icon, String parentMenuName) {
-		LOG.info(String.format("injectSubmenu(%s, icon, %s)", name, parentMenuName));
+	public void addSubmenu(String name, Icon icon, String parentMenuName) {
 		JMenu menu = findOrCreateMenu(parentMenuName);
 		JMenu submenu = new JMenu(name);
 		submenu.setIcon(icon);
@@ -315,28 +217,25 @@ public class MainFrame extends JFrame implements ISwingUI {
 	}
 
 	@Override
-	public <T extends Object> void executeBackgroundTask(final ITask<T> task) {
-		setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-		SwingWorker<T, Void> worker = new SwingWorker<T, Void>() {
+	public void showMessage(String message, String title, int messageType) {
+		JOptionPane.showMessageDialog(this, message, title, messageType);
+	}
 
-			@Override
-			protected T doInBackground() throws Exception {
-				return task.doInBackground();
-			}
+	@Override
+	public int showConfirmDialog(String message, String title, int optionType, int messageType) {
+		return JOptionPane.showConfirmDialog(this, message, title, optionType, messageType);
+	}
 
-			@Override
-			protected void done() {
-				try {
-					T result = get();
-					task.complete(result);
-				} catch (Exception e) {
-					LOG.error("Task failed", e);
-					task.failed(e);
-				}
-				setCursor(Cursor.getDefaultCursor());
-			}
-		};
-		worker.execute();
+	private JMenu findOrCreateMenu(String menuName) {
+		JMenu menu;
+		if (menuMap.containsKey(menuName)) {
+			menu = menuMap.get(menuName);
+		} else {
+			menu = new JMenu(menuName);
+			menuMap.put(menuName, menu);
+			getMainMenuBar().add(menu);
+		}
+		return menu;
 	}
 
 	class FramePlugin implements IPlugIn {
@@ -361,10 +260,9 @@ public class MainFrame extends JFrame implements ISwingUI {
 					fileName = "Untitled";
 				}
 				String modified = (Boolean) params[1] ? " (modified)" : "";
-				setTitle(String.format("DIYLC %s beta - %s %s", plugInPort
+				setTitle(String.format("DIYLC %s alpha - %s %s", plugInPort
 						.getCurrentVersionNumber(), fileName, modified));
 			}
 		}
 	}
-
 }

DIYLC/src/org/diylc/gui/components/OverwritePromptFileChooser.java

@@ -1,4 +1,4 @@
-package org.diylc.swing.gui.components;
+package org.diylc.gui.components;
 
 import java.io.File;
 

DIYLC/src/org/diylc/gui/editor/ByteEditor.java

@@ -1,20 +1,15 @@
-package org.diylc.swing.gui.editor;
-
-import java.awt.Color;
+package org.diylc.gui.editor;
 
 import javax.swing.JSlider;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
 import org.diylc.common.PropertyWrapper;
-import org.diylc.utils.Constants;
 
 public class ByteEditor extends JSlider {
 
 	private static final long serialVersionUID = 1L;
 
-	private Color oldBg = getBackground();
-
 	public ByteEditor(final PropertyWrapper property) {
 		super();
 		setMinimum(0);
@@ -24,13 +19,8 @@ public class ByteEditor extends JSlider {
 
 			@Override
 			public void stateChanged(ChangeEvent e) {
-				property.setChanged(true);
-				setBackground(oldBg);
 				property.setValue(new Integer(getValue()).byteValue());
 			}
 		});
-		if (!property.isUnique()) {
-			setBackground(Constants.MULTI_VALUE_COLOR);
-		}
 	}
 }

DIYLC/src/org/diylc/gui/editor/ColorEditor.java

@@ -1,4 +1,4 @@
-package org.diylc.swing.gui.editor;
+package org.diylc.gui.editor;
 
 import java.awt.Color;
 import java.awt.Cursor;
@@ -12,14 +12,13 @@ import javax.swing.SwingConstants;
 
 import org.diylc.common.PropertyWrapper;
 
-public class ColorEditor extends JLabel  {
+
+public class ColorEditor extends JLabel {
 
 	private static final long serialVersionUID = 1L;
 
-	private static final String title = "Click to edit";
-
 	public ColorEditor(final PropertyWrapper property) {
-		super(property.isUnique() ? title : ("(multi value) " + title));
+		super("Click to edit");
 		setOpaque(true);
 		setHorizontalAlignment(SwingConstants.CENTER);
 		setBorder(BorderFactory.createEtchedBorder());
@@ -32,14 +31,13 @@ public class ColorEditor extends JLabel  {
 				Color newColor = JColorChooser.showDialog(ColorEditor.this, "Choose Color",
 						getBackground());
 				if (newColor != null) {
-					property.setChanged(true);
 					property.setValue(newColor);
 					setBackground(newColor);
 				}
 			}
 		});
 	}
-
+	
 	@Override
 	public void setBackground(Color bg) {
 		if (bg.getRed() < 127 || bg.getBlue() < 127 || bg.getGreen() < 127) {

DIYLC/src/org/diylc/gui/editor/EnumEditor.java

@@ -1,6 +1,5 @@
-package org.diylc.swing.gui.editor;
+package org.diylc.gui.editor;
 
-import java.awt.Color;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
@@ -8,17 +7,14 @@ import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 
 import org.diylc.common.PropertyWrapper;
-import org.diylc.utils.Constants;
 
 public class EnumEditor extends JComboBox {
 
 	private static final long serialVersionUID = 1L;
 
-	private Color oldBg = getBackground();
-
 	private final PropertyWrapper property;
 
-	public EnumEditor(final PropertyWrapper property) {
+	public EnumEditor(PropertyWrapper property) {
 		this.property = property;
 		Object[] values = property.getType().getEnumConstants();
 		setModel(new DefaultComboBoxModel(values));
@@ -28,14 +24,9 @@ public class EnumEditor extends JComboBox {
 			@Override
 			public void itemStateChanged(ItemEvent e) {
 				if (e.getStateChange() == ItemEvent.SELECTED) {
-					property.setChanged(true);
-					setBackground(oldBg);
 					EnumEditor.this.property.setValue(e.getItem());
 				}
 			}
 		});
-		if (!property.isUnique()) {
-			setBackground(Constants.MULTI_VALUE_COLOR);
-		}
 	}
 }

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

@@ -1,10 +1,8 @@
-package org.diylc.swing.gui.editor;
+package org.diylc.gui.editor;
 
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Font;
 
-import javax.swing.ImageIcon;
 import javax.swing.JLabel;
 
 import org.apache.log4j.Logger;
@@ -28,32 +26,14 @@ public class FieldEditorFactory {
 			MeasureEditor editor = new MeasureEditor(property);
 			return editor;
 		}
-		if (ImageIcon.class.isAssignableFrom(property.getType())) {
-			ImageEditor editor = new ImageEditor(property);
-			return editor;
-		}
 		if (property.getType().isEnum()) {
 			EnumEditor editor = new EnumEditor(property);
 			return editor;
 		}
 		if (Byte.class.isAssignableFrom(property.getType())
 				|| byte.class.isAssignableFrom(property.getType())) {
-			ByteEditor editor = new ByteEditor(property);
-			return editor;
-		}
-		if (Boolean.class.isAssignableFrom(property.getType())
-				|| boolean.class.isAssignableFrom(property.getType())) {
-			BooleanEditor editor = new BooleanEditor(property);
-			return editor;
-		}
-		if (Font.class.isAssignableFrom(property.getType())) {
-			FontEditor editor = new FontEditor(property);
-			return editor;
-		}
-		if (Integer.class.isAssignableFrom(property.getType())
-				|| int.class.isAssignableFrom(property.getType())) {
-			IntEditor editor = new IntEditor(property);
-			return editor;
+			ByteEditor byteEditor = new ByteEditor(property);
+			return byteEditor;
 		}
 		LOG.error("Unrecognized parameter type: " + property.getType().getName());
 		return new JLabel("Unrecognized");

DIYLC/src/org/diylc/gui/editor/FontEditor.java

@@ -0,0 +1,51 @@
+package org.diylc.gui.editor;
+
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.JColorChooser;
+import javax.swing.JLabel;
+import javax.swing.SwingConstants;
+
+import org.diylc.common.PropertyWrapper;
+
+
+public class FontEditor extends JLabel {
+
+	private static final long serialVersionUID = 1L;
+
+	public FontEditor(final PropertyWrapper property) {
+		super("Click to edit");
+		setOpaque(true);
+		setHorizontalAlignment(SwingConstants.CENTER);
+		setBorder(BorderFactory.createEtchedBorder());
+		setBackground((Color) property.getValue());
+		setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
+		addMouseListener(new MouseAdapter() {
+
+			@Override
+			public void mouseClicked(MouseEvent e) {
+//				JFo
+				Color newColor = JColorChooser.showDialog(FontEditor.this, "Choose Color",
+						getBackground());
+				if (newColor != null) {
+					property.setValue(newColor);
+					setBackground(newColor);
+				}
+			}
+		});
+	}
+	
+	@Override
+	public void setBackground(Color bg) {
+		if (bg.getRed() < 127 || bg.getBlue() < 127 || bg.getGreen() < 127) {
+			setForeground(Color.white);
+		} else {
+			setForeground(Color.black);
+		}
+		super.setBackground(bg);
+	}
+}

DIYLC/src/org/diylc/gui/editor/MeasureEditor.java

@@ -1,7 +1,6 @@
-package org.diylc.swing.gui.editor;
+package org.diylc.gui.editor;
 
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Container;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -15,7 +14,6 @@ import javax.swing.JComboBox;
 import org.diylc.common.PropertyWrapper;
 import org.diylc.core.measures.AbstractMeasure;
 import org.diylc.core.measures.Unit;
-import org.diylc.utils.Constants;
 
 import com.diyfever.gui.DoubleTextField;
 
@@ -23,16 +21,11 @@ public class MeasureEditor extends Container {
 
 	private static final long serialVersionUID = 1L;
 
-	private Color oldBg;
-	private DoubleTextField valueField;
-	private JComboBox unitBox;
-
 	@SuppressWarnings("unchecked")
 	public MeasureEditor(final PropertyWrapper property) {
 		setLayout(new BorderLayout());
 		AbstractMeasure measure = ((AbstractMeasure) property.getValue());
-		valueField = new DoubleTextField(measure.getValue());
-		oldBg = valueField.getBackground();
+		DoubleTextField valueField = new DoubleTextField(measure.getValue());
 		valueField.addPropertyChangeListener(DoubleTextField.VALUE_PROPERTY,
 				new PropertyChangeListener() {
 
@@ -43,9 +36,6 @@ public class MeasureEditor extends Container {
 									.getValue()).clone();
 							newMeasure.setValue((Double) evt.getNewValue());
 							property.setValue(newMeasure);
-							property.setChanged(true);
-							valueField.setBackground(oldBg);
-							unitBox.setBackground(oldBg);
 						} catch (CloneNotSupportedException ex) {
 						}
 					}
@@ -53,7 +43,7 @@ public class MeasureEditor extends Container {
 		add(valueField, BorderLayout.CENTER);
 		try {
 			Method method = measure.getUnit().getClass().getMethod("values");
-			unitBox = new JComboBox((Object[]) method.invoke(measure.getUnit()));
+			final JComboBox unitBox = new JComboBox((Object[]) method.invoke(measure.getUnit()));
 			unitBox.setSelectedItem(measure.getUnit());
 			unitBox.addActionListener(new ActionListener() {
 
@@ -64,19 +54,11 @@ public class MeasureEditor extends Container {
 								.getValue()).clone();
 						newMeasure.setUnit((Enum<? extends Unit>) unitBox.getSelectedItem());
 						property.setValue(newMeasure);
-						property.setChanged(true);
-						valueField.setBackground(oldBg);
-						unitBox.setBackground(oldBg);
 					} catch (CloneNotSupportedException ex) {
 					}
 				}
 			});
 			add(unitBox, BorderLayout.EAST);
-
-			if (!property.isUnique()) {
-				valueField.setBackground(Constants.MULTI_VALUE_COLOR);
-				unitBox.setBackground(Constants.MULTI_VALUE_COLOR);
-			}
 		} catch (IllegalArgumentException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

DIYLC/src/org/diylc/gui/editor/PropertyEditorDialog.java

@@ -1,4 +1,4 @@
-package org.diylc.swing.gui.editor;
+package org.diylc.gui.editor;
 
 import java.awt.Component;
 import java.awt.Dimension;
@@ -18,12 +18,10 @@ import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
 import org.apache.log4j.Logger;
 import org.diylc.common.PropertyWrapper;
-import org.diylc.core.ValidationException;
 
 import com.diyfever.gui.ButtonDialog;
 
@@ -67,23 +65,6 @@ public class PropertyEditorDialog extends ButtonDialog {
 		// setLocationRelativeTo(owner);
 	}
 
-	@Override
-	protected boolean validateInput(String button) {
-		if (button.equals(ButtonDialog.OK)) {
-			for (PropertyWrapper property : properties) {
-				try {
-					property.getValidator().validate(property.getValue());
-				} catch (ValidationException ve) {
-					JOptionPane.showMessageDialog(PropertyEditorDialog.this, "Input error for \""
-							+ property.getName() + "\": " + ve.getMessage(), "Error",
-							JOptionPane.ERROR_MESSAGE);
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
 	private JPanel createEditorFields() {
 		JPanel editorPanel = new JPanel(new GridBagLayout());
 		editorPanel.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));

DIYLC/src/org/diylc/gui/editor/StringEditor.java

@@ -1,20 +1,16 @@
-package org.diylc.swing.gui.editor;
-
-import java.awt.Color;
+package org.diylc.gui.editor;
 
 import javax.swing.JTextField;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 import org.diylc.common.PropertyWrapper;
-import org.diylc.utils.Constants;
+
 
 public class StringEditor extends JTextField {
 
 	private static final long serialVersionUID = 1L;
-
-	private Color oldBg = getBackground();
-
+	
 	private final PropertyWrapper property;
 
 	public StringEditor(PropertyWrapper property) {
@@ -37,14 +33,10 @@ public class StringEditor extends JTextField {
 				textChanged();
 			}
 		});
-		if (!property.isUnique()) {
-			setBackground(Constants.MULTI_VALUE_COLOR);
-		}
 	}
 
 	private void textChanged() {
-		property.setChanged(true);
-		setBackground(oldBg);
 		property.setValue(getText());
 	}
+
 }

DIYLC/src/org/diylc/images/IconLoader.java

@@ -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");
+			"edit_component.png");
 
 	protected String name;