2026-11-10 01:02:08 +10:00 · 2012-03-22 01:06:06 +00:00
89 changed files with 838 additions and 2270 deletions
@@ -6,8 +6,12 @@
 	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
 	<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
-	<classpathentry kind="lib" path="library/main.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/app-framework"/>
+	<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/jettison-1.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
+	<classpathentry kind="lib" path="library/main.jar"/>
+	<classpathentry kind="lib" path="lib/app-framework.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -4,7 +4,6 @@ import javax.swing.Icon;

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

 /**
 * Entity class used to describe a component type.
@@ -24,14 +23,11 @@ public class ComponentType {
 	private Icon icon;
 	private Class<? extends IDIYComponent<?>> instanceClass;
 	private double zOrder;
-	private boolean flexibleZOrder;
 	private boolean stretchable;
-	private BomPolicy bomPolicy;

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

 	public String getName() {
@@ -82,18 +76,10 @@ public class ComponentType {
 	public double getZOrder() {
 		return zOrder;
 	}
-	
-	public boolean isFlexibleZOrder() {
-		return flexibleZOrder;
-	}

 	public boolean isStretchable() {
 		return stretchable;
 	}
-	
-	public BomPolicy getBomPolicy() {
-		return bomPolicy;
-	}

 	@Override
 	public String toString() {
@@ -1,22 +0,0 @@
-package org.diylc.common;
-
-public interface IKeyProcessor {
-
-	public static final int VK_LEFT = 0x25;
-	public static final int VK_UP = 0x26;
-	public static final int VK_RIGHT = 0x27;
-	public static final int VK_DOWN = 0x28;
-
-	/**
-	 * Notifies the presenter that a key hes been pressed on the canvas.
-	 * 
-	 * @param key
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 * 
-	 * @return true if the event should be consumed
-	 */
-	boolean keyPressed(int key, boolean ctrlDown, boolean shiftDown,
-			boolean altDown);
-}
@@ -10,13 +10,12 @@ public interface IMouseProcessor {
 	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
 	 * 
 	 * @param point
-	 * @param button
 	 * @param ctrlDown
 	 * @param shiftDown
 	 * @param altDown
 	 * @param clickCount
 	 */
-	void mouseClicked(Point point, int button, boolean ctrlDown, boolean shiftDown, boolean altDown,
+	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown,
 			int clickCount);

 	/**
@@ -28,7 +28,7 @@ import org.diylc.core.Theme;
 * @see IMessageListener
 * @see EventType
 */
-public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyProcessor {
+public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor {

 	public static final String ANTI_ALIASING_KEY = "antiAliasing";
 	public static final String HI_QUALITY_RENDER_KEY = "hiQualityRender";
@@ -47,14 +47,6 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP

 	public static final int DND_TOGGLE_STICKY = 0x1;
 	public static final int DND_TOGGLE_SNAP = 0x40000000;
-	
-    /**
-     * Mouse button constants.
-     */ 
-    public static final int NOBUTTON = 0;
-    public static final int BUTTON1 = 1;
-    public static final int BUTTON2 = 2;
-    public static final int BUTTON3 = 3;

 	/**
 	 * Returns size of the canvas that takes project dimensions into account as
@@ -231,11 +223,6 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	 * @param properties
 	 */
 	void applyPropertiesToProject(List<PropertyWrapper> properties);
-	
-	/**
-	 * Gets the current new component slot.
-	 */
-	ComponentType getNewComponentTypeSlot();

 	/**
 	 * Sets the new component slot. Specified component type will be used to
@@ -22,8 +22,8 @@ public class PropertyWrapper implements Cloneable {
 	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, String getter, String setter,
+			boolean defaultable, IPropertyValidator validator) {
 		super();
 		this.name = name;
 		this.type = type;
@@ -33,9 +33,8 @@ public class PropertyWrapper implements Cloneable {
 		this.validator = validator;
 	}

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

@@ -48,9 +47,8 @@ public class PropertyWrapper implements Cloneable {
 	// }
 	// }

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

@@ -77,19 +75,19 @@ public class PropertyWrapper implements Cloneable {
 	public IPropertyValidator getValidator() {
 		return validator;
 	}
-
+	
 	public boolean isUnique() {
 		return unique;
 	}
-
+	
 	public void setUnique(boolean unique) {
 		this.unique = unique;
 	}
-
+	
 	public boolean isChanged() {
 		return changed;
 	}
-
+	
 	public void setChanged(boolean changed) {
 		this.changed = changed;
 	}
@@ -104,15 +102,6 @@ public class PropertyWrapper implements Cloneable {
 	// }
 	// return new Property(name, type, value);
 	// }
-	@Override
-	public Object clone() throws CloneNotSupportedException {
-		PropertyWrapper clone = new PropertyWrapper(this.name, this.type, this.getter,
-				this.setter, this.defaultable, this.validator);
-		clone.value = this.value;
-		clone.changed = this.changed;
-		clone.unique = this.unique;
-		return clone;
-	}

 	@Override
 	public int hashCode() {
@@ -4,14 +4,10 @@ import java.awt.Color;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
-import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.Shape;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;

 import org.diylc.common.HorizontalAlignment;
 import org.diylc.common.VerticalAlignment;
@@ -22,10 +18,6 @@ import org.diylc.core.annotations.EditableProperty;
 * Abstract implementation of {@link IDIYComponent} that contains component name
 * and toString.
 * 
- * IMPORTANT: to improve performance, all fields except for <code>Point</code>
- * and <code>Point</code> arrays should be immutable. Failing to comply with
- * this can result in annoying and hard to trace bugs.
- * 
 * @author Branislav Stojkovic
 * 
 * @param <T>
@@ -88,11 +80,9 @@ public abstract class AbstractComponent<T> implements IDIYComponent<T> {
 	}

 	protected void drawCenteredText(Graphics2D g2d, String text, int x, int y,
-			HorizontalAlignment horizontalAlignment,
-			VerticalAlignment verticalAlignment) {
+			HorizontalAlignment horizontalAlignment, VerticalAlignment verticalAlignment) {
 		FontMetrics fontMetrics = g2d.getFontMetrics();
-		Rectangle stringBounds = fontMetrics.getStringBounds(text, g2d)
-				.getBounds();
+		Rectangle stringBounds = fontMetrics.getStringBounds(text, g2d).getBounds();

 		Font font = g2d.getFont();
 		FontRenderContext renderContext = g2d.getFontRenderContext();
@@ -127,55 +117,4 @@ public abstract class AbstractComponent<T> implements IDIYComponent<T> {

 		g2d.drawString(text, textX, textY);
 	}
-
-	@SuppressWarnings("unchecked")
-	public IDIYComponent<T> clone() throws CloneNotSupportedException {
-		try {
-			// Instantiate object of the same type
-			AbstractComponent<T> newInstance = (AbstractComponent<T>) this
-					.getClass().getConstructors()[0].newInstance();
-			Class<?> clazz = this.getClass();
-			while (AbstractComponent.class.isAssignableFrom(clazz)) {
-				Field[] fields = clazz.getDeclaredFields();
-				clazz = clazz.getSuperclass();
-				// fields = this.getClass().getDeclaredFields();
-				// Copy over all non-static, non-final fields that are declared
-				// in
-				// AbstractComponent or one of it's child classes
-				for (Field field : fields) {
-					if (!Modifier.isStatic(field.getModifiers())
-							&& !Modifier.isFinal(field.getModifiers())) {
-						field.setAccessible(true);
-						Object value = field.get(this);
-
-						// Deep copy point arrays.
-						// TODO: something nicer
-						if (value != null
-								&& value.getClass().isArray()
-								&& value.getClass().getComponentType()
-										.isAssignableFrom(Point.class)) {
-							Object newArray = Array.newInstance(value
-									.getClass().getComponentType(), Array
-									.getLength(value));
-							for (int i = 0; i < Array.getLength(value); i++) {
-								Point p = (Point) Array.get(value, i);
-								Array.set(newArray, i, new Point(p));
-							}
-							value = newArray;
-						}
-						// Deep copy points.
-						// TODO: something nicer
-						if (value != null && value instanceof Point) {
-							value = new Point((Point) value);
-						}
-
-						field.set(newInstance, value);
-					}
-				}
-			}
-			return newInstance;
-		} catch (Exception e) {
-			throw new CloneNotSupportedException("Could not clone the component. Reason: " + e.getMessage());
-		}
-	}
 }
@@ -107,8 +107,7 @@ public interface IDIYComponent<T> extends Serializable {
 	 * @param project
 	 * @param drawingObserver
 	 */
-	void draw(Graphics2D g2d, ComponentState componentState,
-			boolean outlineMode, Project project,
+	void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
 			IDrawingObserver drawingObserver);

 	/**
@@ -120,11 +119,4 @@ public interface IDIYComponent<T> extends Serializable {
 	 * @param height
 	 */
 	void drawIcon(Graphics2D g2d, int width, int height);
-
-	/**
-	 * Clones the component.
-	 * 
-	 * @return
-	 */
-	IDIYComponent<T> clone() throws CloneNotSupportedException;
 }
@@ -1,6 +1,5 @@
 package org.diylc.core;

-import java.io.File;
 import java.util.List;
 import java.util.Set;

@@ -36,6 +35,4 @@ public interface IView {
 	int showConfirmDialog(String message, String title, int optionType, int messageType);
 	
 	boolean editProperties(List<PropertyWrapper> properties, Set<PropertyWrapper> defaultedProperties);
-	
-	File promptFileSave();
 }
@@ -2,10 +2,8 @@ package org.diylc.core;

 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;

 import org.diylc.appframework.update.VersionNumber;
@@ -212,37 +210,15 @@ public class Project implements Serializable {
 		}
 	}

-	@Override
-	public Project clone()  {
-		Project project = new Project();
-		project.setTitle(this.getTitle());
-		project.setAuthor(this.getAuthor());
-		project.setDescription(this.getDescription());
-		project.setFileVersion(this.getFileVersion());
-		project.setGridSpacing(this.getGridSpacing());
-		project.setHeight(this.getHeight());
-		project.setWidth(this.getWidth());
-		project.getLockedLayers().addAll(this.getLockedLayers());		
-		
-		Map<IDIYComponent<?>, IDIYComponent<?>> cloneMap = new HashMap<IDIYComponent<?>, IDIYComponent<?>>();
-		
-		for (IDIYComponent<?> component : this.components) {
-			try {
-				IDIYComponent<?> clone = component.clone();
-				project.getComponents().add(clone);
-				cloneMap.put(component, clone);
-			} catch (CloneNotSupportedException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		
-		for (Set<IDIYComponent<?>> group : this.groups) {
-			Set<IDIYComponent<?>> cloneGroup = new HashSet<IDIYComponent<?>>();
-			for (IDIYComponent<?> component : group) {
-				cloneGroup.add(cloneMap.get(component));
-			}
-			project.groups.add(cloneGroup);
-		}
-		return project;
-	}
+	// @Override
+	// public Project clone() throws CloneNotSupportedException {
+	// List<IDIYComponent> clonedComponents = new
+	// ArrayList<IDIYComponent>();
+	// for (IDIYComponent component : components) {
+	// clonedComponents.add(component.clone());
+	// }
+	// Project project = new Project(title, author, description,
+	// width.clone(), height.clone(), clonedComponents);
+	// return project;
+	// }
 }
@@ -1,7 +0,0 @@
-package org.diylc.core.annotations;
-
-public enum BomPolicy {
-	SHOW_ALL_NAMES,
-	SHOW_ONLY_TYPE_NAME,
-	NEVER_SHOW,
-}
@@ -53,22 +53,10 @@ public @interface ComponentDescriptor {
 	 */
 	double zOrder();

-	/**
-	 * @return true if the component may go beyond it's predefined layer. In
-	 *         that case, <code>zOrder</code> is used as initial z order of the
-	 *         component.
-	 */
-	boolean flexibleZOrder() default false;
-
 	/**
 	 * @return when false, moving one control point will cause all the others to
 	 *         move together with it.
 	 */
 	boolean stretchable() default true;

-	/**
-	 * @return controls what should be shown the BOM
-	 */
-	BomPolicy bomPolicy() default BomPolicy.SHOW_ALL_NAMES;
-
 }
@@ -4,13 +4,6 @@ import java.io.Serializable;
 import java.text.DecimalFormat;
 import java.text.Format;

-/***
- * Immutable measure class.
- * 
- * @author bancika
- *
- * @param <T>
- */
 public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializable, Cloneable {

 	private static final long serialVersionUID = 1L;
@@ -20,8 +13,8 @@ public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializ
 	protected Double value;
 	protected T unit;

-//	public AbstractMeasure() {
-//	}
+	public AbstractMeasure() {
+	}

 	public AbstractMeasure(Double value, T unit) {
 		super();
@@ -33,22 +26,22 @@ public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializ
 		return value;
 	}

-//	public void setValue(Double value) {
-//		this.value = value;
-//	}
+	public void setValue(Double value) {
+		this.value = value;
+	}

 	public T getUnit() {
 		return unit;
 	}

-//	public void setUnit(T multiplier) {
-//		this.unit = multiplier;
-//	}
+	public void setUnit(T multiplier) {
+		this.unit = multiplier;
+	}
 	
-//	@Override
-//	public Object clone() throws CloneNotSupportedException {
-//		return super.clone();
-//	}
+	@Override
+	public Object clone() throws CloneNotSupportedException {
+		return super.clone();
+	}

 	@Override
 	public int hashCode() {
@@ -4,10 +4,10 @@ public class Capacitance extends AbstractMeasure<CapacitanceUnit> {

 	private static final long serialVersionUID = 1L;

-//	public Capacitance() {
-//		super();
-//		// TODO Auto-generated constructor stub
-//	}
+	public Capacitance() {
+		super();
+		// TODO Auto-generated constructor stub
+	}

 	public Capacitance(Double value, CapacitanceUnit unit) {
 		super(value, unit);
@@ -4,10 +4,10 @@ public class Inductance extends AbstractMeasure<InductanceUnit> {

 	private static final long serialVersionUID = 1L;

-//	public Inductance() {
-//		super();
-//		// TODO Auto-generated constructor stub
-//	}
+	public Inductance() {
+		super();
+		// TODO Auto-generated constructor stub
+	}

 	public Inductance(Double value, InductanceUnit unit) {
 		super(value, unit);
@@ -4,10 +4,10 @@ public class Power extends AbstractMeasure<PowerUnit> {

 	private static final long serialVersionUID = 1L;

-//	public Power() {
-//		super();
-//		// TODO Auto-generated constructor stub
-//	}
+	public Power() {
+		super();
+		// TODO Auto-generated constructor stub
+	}

 	public Power(Double value, PowerUnit unit) {
 		super(value, unit);
@@ -15,10 +15,10 @@ public class Resistance extends AbstractMeasure<ResistanceUnit> {
 			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() {
+		super();
+		// TODO Auto-generated constructor stub
+	}

 	public Resistance(Double value, ResistanceUnit multiplier) {
 		super(value, multiplier);
@@ -2,7 +2,7 @@ package org.diylc.core.measures;

 public enum ResistanceUnit implements Unit {

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

 	double factor;
 	String display;
@@ -6,10 +6,10 @@ public class Size extends AbstractMeasure<SizeUnit> implements Comparable<Size>

 	private static final long serialVersionUID = 1L;

-//	public Size() {
-//		super();
-//		// TODO Auto-generated constructor stub
-//	}
+	public Size() {
+		super();
+		// TODO Auto-generated constructor stub
+	}

 	public Size(Double value, SizeUnit unit) {
 		super(value, unit);
@@ -4,10 +4,10 @@ public class Voltage extends AbstractMeasure<VoltageUnit> {

 	private static final long serialVersionUID = 1L;

-//	public Voltage() {
-//		super();
-//		// TODO Auto-generated constructor stub
-//	}
+	public Voltage() {
+		super();
+		// TODO Auto-generated constructor stub
+	}

 	public Voltage(Double value, VoltageUnit unit) {
 		super(value, unit);
@@ -20,10 +20,11 @@ import org.diylc.common.PropertyWrapper;
 import org.diylc.core.CreationMethod;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IPropertyValidator;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;

+import com.rits.cloning.Cloner;
+
 /**
 * Utility class with component processing methods.
 * 
@@ -31,8 +32,7 @@ import org.diylc.core.annotations.EditableProperty;
 */
 public class ComponentProcessor {

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

 	private static ComponentProcessor instance;

@@ -40,6 +40,8 @@ public class ComponentProcessor {
 	private Map<String, IPropertyValidator> propertyValidatorCache;
 	private Map<String, ComponentType> componentTypeMap;

+	private Cloner cloner;
+
 	public static ComponentProcessor getInstance() {
 		if (instance == null) {
 			instance = new ComponentProcessor();
@@ -49,13 +51,13 @@ public class ComponentProcessor {

 	private ComponentProcessor() {
 		super();
+		this.cloner = new Cloner();
 		this.propertyCache = new HashMap<String, List<PropertyWrapper>>();
 		this.componentTypeMap = new HashMap<String, ComponentType>();
 		this.propertyValidatorCache = new HashMap<String, IPropertyValidator>();
 	}

-	public ComponentType extractComponentTypeFrom(
-			Class<? extends IDIYComponent<?>> clazz) {
+	public ComponentType extractComponentTypeFrom(Class<? extends IDIYComponent<?>> clazz) {
 		if (componentTypeMap.containsKey(clazz.getName())) {
 			return componentTypeMap.get(clazz.getName());
 		}
@@ -67,12 +69,9 @@ public class ComponentProcessor {
 		String author;
 		Icon icon;
 		double zOrder;
-		boolean flexibleZOrder;
 		boolean stretchable;
-		BomPolicy bomPolicy;
 		if (clazz.isAnnotationPresent(ComponentDescriptor.class)) {
-			ComponentDescriptor annotation = clazz
-					.getAnnotation(ComponentDescriptor.class);
+			ComponentDescriptor annotation = clazz.getAnnotation(ComponentDescriptor.class);
 			name = annotation.name();
 			description = annotation.description();
 			creationMethod = annotation.creationMethod();
@@ -80,9 +79,7 @@ public class ComponentProcessor {
 			namePrefix = annotation.instanceNamePrefix();
 			author = annotation.author();
 			zOrder = annotation.zOrder();
-			flexibleZOrder = annotation.flexibleZOrder();
 			stretchable = annotation.stretchable();
-			bomPolicy = annotation.bomPolicy();
 		} else {
 			name = clazz.getSimpleName();
 			description = "";
@@ -91,30 +88,27 @@ public class ComponentProcessor {
 			namePrefix = "Unknown";
 			author = "Unknown";
 			zOrder = IDIYComponent.COMPONENT;
-			flexibleZOrder = false;
 			stretchable = true;
-			bomPolicy = BomPolicy.SHOW_ALL_NAMES;
 		}
 		icon = null;
 		// Draw component icon.
 		try {
-			IDIYComponent<?> componentInstance = (IDIYComponent<?>) clazz
-					.newInstance();
-			Image image = new BufferedImage(Presenter.ICON_SIZE,
-					Presenter.ICON_SIZE,
+			IDIYComponent<?> componentInstance = (IDIYComponent<?>) clazz.newInstance();
+			Image image = new BufferedImage(Presenter.ICON_SIZE, Presenter.ICON_SIZE,
 					java.awt.image.BufferedImage.TYPE_INT_ARGB);
 			Graphics2D g2d = (Graphics2D) image.getGraphics();
-			g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-					RenderingHints.VALUE_ANTIALIAS_ON);
-			componentInstance.drawIcon(g2d, Presenter.ICON_SIZE,
-					Presenter.ICON_SIZE);
+			g2d
+					.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+							RenderingHints.VALUE_ANTIALIAS_ON);
+			componentInstance.drawIcon(g2d, Presenter.ICON_SIZE, Presenter.ICON_SIZE);
 			icon = new ImageIcon(image);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
+		} catch (InstantiationException e) {
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			e.printStackTrace();
 		}
-		ComponentType componentType = new ComponentType(name, description,
-				creationMethod, category, namePrefix, author, icon, clazz,
-				zOrder, flexibleZOrder, stretchable, bomPolicy);
+		ComponentType componentType = new ComponentType(name, description, creationMethod,
+				category, namePrefix, author, icon, clazz, zOrder, stretchable);
 		componentTypeMap.put(clazz.getName(), componentType);
 		return componentType;
 	}
@@ -127,7 +121,7 @@ public class ComponentProcessor {
 	 */
 	public List<PropertyWrapper> extractProperties(Class<?> clazz) {
 		if (propertyCache.containsKey(clazz.getName())) {
-			return cloneProperties(propertyCache.get(clazz.getName()));
+			return cloner.deepClone(propertyCache.get(clazz.getName()));
 		}
 		List<PropertyWrapper> properties = new ArrayList<PropertyWrapper>();
 		for (Method method : clazz.getMethods()) {
@@ -135,8 +129,7 @@ public class ComponentProcessor {
 				try {
 					if (method.isAnnotationPresent(EditableProperty.class)
 							&& !method.isAnnotationPresent(Deprecated.class)) {
-						EditableProperty annotation = method
-								.getAnnotation(EditableProperty.class);
+						EditableProperty annotation = method.getAnnotation(EditableProperty.class);
 						String name;
 						if (annotation.name().equals("")) {
 							name = method.getName().substring(3);
@@ -145,36 +138,22 @@ public class ComponentProcessor {
 						}
 						IPropertyValidator validator = getPropertyValidator(annotation
 								.validatorClass());
-						Method setter = clazz.getMethod("set"
-								+ method.getName().substring(3), method
-								.getReturnType());
+						Method setter = clazz.getMethod("set" + method.getName().substring(3),
+								method.getReturnType());
 						PropertyWrapper property = new PropertyWrapper(name,
-								method.getReturnType(), method.getName(),
-								setter.getName(), annotation.defaultable(),
-								validator);
+								method.getReturnType(), method.getName(), setter.getName(),
+								annotation.defaultable(), validator);
 						properties.add(property);
 					}
 				} catch (NoSuchMethodException e) {
-					LOG.debug("No matching setter found for \""
-							+ method.getName() + "\". Skipping...");
+					LOG.debug("No matching setter found for \"" + method.getName()
+							+ "\". Skipping...");
 				}
 			}
 		}

 		propertyCache.put(clazz.getName(), properties);
-		return cloneProperties(properties);
-	}
-	
-	private List<PropertyWrapper> cloneProperties(List<PropertyWrapper> properties) {
-		List<PropertyWrapper> result = new ArrayList<PropertyWrapper>(properties.size());
-		for (PropertyWrapper propertyWrapper : properties) {
-			try {
-				result.add((PropertyWrapper) propertyWrapper.clone());
-			} catch (CloneNotSupportedException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		return result;
+		return cloner.deepClone(properties);
 	}

 	/**
@@ -198,8 +177,7 @@ public class ComponentProcessor {
 		}
 		for (int i = 1; i < selectedComponents.size(); i++) {
 			IDIYComponent<?> component = selectedComponents.get(i);
-			List<PropertyWrapper> newProperties = extractProperties(component
-					.getClass());
+			List<PropertyWrapper> newProperties = extractProperties(component.getClass());
 			for (PropertyWrapper property : newProperties) {
 				property.readFrom(component);
 			}
@@ -208,14 +186,11 @@ public class ComponentProcessor {
 			// their values match.
 			for (PropertyWrapper oldProperty : properties) {
 				if (newProperties.contains(oldProperty)) {
-					PropertyWrapper newProperty = newProperties
-							.get(newProperties.indexOf(oldProperty));
-					if ((newProperty.getValue() != null && newProperty
-							.getValue() == null)
-							|| !newProperty.getValue().equals(
-									oldProperty.getValue())) {
-						// Values don't match, so the property is not unique
-						// valued.
+					PropertyWrapper newProperty = newProperties.get(newProperties
+							.indexOf(oldProperty));
+					if ((newProperty.getValue() != null && newProperty.getValue() == null)
+							|| !newProperty.getValue().equals(oldProperty.getValue())) {
+						// Values don't match, so the property is not unique valued.
 						oldProperty.setUnique(false);
 					}
 				}
@@ -229,13 +204,11 @@ public class ComponentProcessor {
 			// }
 			// }
 		}
-		Collections.sort(properties, ComparatorFactory.getInstance()
-				.getPropertyNameComparator());
+		Collections.sort(properties, ComparatorFactory.getInstance().getPropertyNameComparator());
 		return properties;
 	}

-	private IPropertyValidator getPropertyValidator(
-			Class<? extends IPropertyValidator> clazz) {
+	private IPropertyValidator getPropertyValidator(Class<? extends IPropertyValidator> clazz) {
 		if (propertyValidatorCache.containsKey(clazz.getName())) {
 			return propertyValidatorCache.get(clazz.getName());
 		}
@@ -243,8 +216,7 @@ public class ComponentProcessor {
 		try {
 			validator = clazz.newInstance();
 		} catch (Exception e) {
-			LOG.error("Could not instantiate validator for " + clazz.getName(),
-					e);
+			LOG.error("Could not instantiate validator for " + clazz.getName(), e);
 			return null;
 		}
 		propertyValidatorCache.put(clazz.getName(), validator);
@@ -3,19 +3,19 @@ package org.diylc.presenter;
 import java.awt.Point;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;

 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.common.ComponentType;
 import org.diylc.common.IPlugInPort;
-import org.diylc.common.Orientation;
 import org.diylc.common.PropertyWrapper;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;
 import org.diylc.core.measures.Size;

+import com.rits.cloning.Cloner;
+
 /**
 * Manages component instantiation.
 * 
@@ -23,10 +23,11 @@ import org.diylc.core.measures.Size;
 */
 public class InstantiationManager {

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

-	public static int MAX_RECENT_COMPONENTS = 16;
+	private static final int MAX_RECENT_COMPONENTS = 16;
+
+	private Cloner cloner;

 	private ComponentType componentTypeSlot;
 	private IDIYComponent<?> componentSlot;
@@ -34,6 +35,7 @@ public class InstantiationManager {
 	private Point potentialControlPoint;

 	public InstantiationManager() {
+		cloner = new Cloner();
 	}

 	public ComponentType getComponentTypeSlot() {
@@ -52,8 +54,8 @@ public class InstantiationManager {
 		return potentialControlPoint;
 	}

-	public void setComponentTypeSlot(ComponentType componentTypeSlot,
-			Project currentProject) throws Exception {
+	public void setComponentTypeSlot(ComponentType componentTypeSlot, Project currentProject)
+			throws Exception {
 		this.componentTypeSlot = componentTypeSlot;
 		if (componentTypeSlot == null) {
 			this.componentSlot = null;
@@ -63,8 +65,8 @@ public class InstantiationManager {
 				this.componentSlot = null;
 				break;
 			case SINGLE_CLICK:
-				this.componentSlot = instantiateComponent(componentTypeSlot,
-						new Point(0, 0), currentProject);
+				this.componentSlot = instantiateComponent(componentTypeSlot, new Point(0, 0),
+						currentProject);
 				break;
 			}
 		}
@@ -72,11 +74,9 @@ public class InstantiationManager {
 		this.potentialControlPoint = null;
 	}

-	public void instatiatePointByPoint(Point scaledPoint, Project currentProject)
-			throws Exception {
+	public void instatiatePointByPoint(Point scaledPoint, Project currentProject) throws Exception {
 		firstControlPoint = scaledPoint;
-		componentSlot = instantiateComponent(componentTypeSlot,
-				firstControlPoint, currentProject);
+		componentSlot = instantiateComponent(componentTypeSlot, firstControlPoint, currentProject);

 		// Set the other control point to the same location, we'll
 		// move it later when mouse moves.
@@ -99,8 +99,7 @@ public class InstantiationManager {
 		return changeMade;
 	}

-	public boolean updateSingleClick(Point scaledPoint, boolean snapToGrid,
-			Size gridSpacing) {
+	public boolean updateSingleClick(Point scaledPoint, boolean snapToGrid, Size gridSpacing) {
 		if (potentialControlPoint == null) {
 			potentialControlPoint = new Point(0, 0);
 		}
@@ -129,14 +128,12 @@ public class InstantiationManager {
 	}

 	@SuppressWarnings("unchecked")
-	public IDIYComponent<?> instantiateComponent(ComponentType componentType,
-			Point point, Project currentProject) throws Exception {
-		LOG.info("Instatiating component of type: "
-				+ componentType.getInstanceClass().getName());
+	public IDIYComponent<?> instantiateComponent(ComponentType componentType, Point point,
+			Project currentProject) throws Exception {
+		LOG.info("Instatiating component of type: " + componentType.getInstanceClass().getName());

 		// Instantiate the component.
-		IDIYComponent<?> component = componentType.getInstanceClass()
-				.newInstance();
+		IDIYComponent<?> component = componentType.getInstanceClass().newInstance();

 		component.setName(createUniqueName(componentType, currentProject));

@@ -153,12 +150,10 @@ public class InstantiationManager {
 		fillWithDefaultProperties(component);

 		// Write to recent components
-		List<String> recentComponentTypes = (List<String>) ConfigurationManager
-				.getInstance().readObject(IPlugInPort.RECENT_COMPONENTS_KEY,
-						new ArrayList<ComponentType>());
+		List<String> recentComponentTypes = (List<String>) ConfigurationManager.getInstance()
+				.readObject(IPlugInPort.RECENT_COMPONENTS_KEY, new ArrayList<ComponentType>());
 		String className = componentType.getInstanceClass().getName();
-		if (recentComponentTypes.size() == 0
-				|| !recentComponentTypes.get(0).equals(className)) {
+		if (recentComponentTypes.size() == 0 || !recentComponentTypes.get(0).equals(className)) {
 			// Remove if it's already somewhere in the list.
 			recentComponentTypes.remove(className);
 			// Add to the end of the list.
@@ -167,30 +162,25 @@ public class InstantiationManager {
 			if (recentComponentTypes.size() > MAX_RECENT_COMPONENTS) {
 				recentComponentTypes.remove(recentComponentTypes.size() - 1);
 			}
-			ConfigurationManager.getInstance().writeValue(
-					IPlugInPort.RECENT_COMPONENTS_KEY, recentComponentTypes);
+			ConfigurationManager.getInstance().writeValue(IPlugInPort.RECENT_COMPONENTS_KEY,
+					recentComponentTypes);
 		}

 		return component;
 	}

-	public String createUniqueName(ComponentType componentType,
-			Project currentProject) {
+	public String createUniqueName(ComponentType componentType, Project currentProject) {
 		int i = 0;
 		boolean exists = true;
-		List<IDIYComponent<?>> components = currentProject.getComponents();
-		String[] takenNames = new String[components.size()];
-		for (int j = 0; j < currentProject.getComponents().size(); j++) {
-			takenNames[j] = components.get(i).getName();
-		}
-		Arrays.sort(takenNames);
 		while (exists) {
 			i++;
 			String name = componentType.getNamePrefix() + i;
 			exists = false;
-			if (Arrays.binarySearch(takenNames, name) >= 0) {
-				exists = true;
-				break;
+			for (IDIYComponent<?> c : currentProject.getComponents()) {
+				if (c.getName().equals(name)) {
+					exists = true;
+					break;
+				}
 			}
 		}
 		return componentType.getNamePrefix() + i;
@@ -208,55 +198,22 @@ public class InstantiationManager {
 	 * @throws NoSuchMethodException
 	 * @throws SecurityException
 	 */
-	public void fillWithDefaultProperties(Object object)
-			throws IllegalArgumentException, IllegalAccessException,
-			InvocationTargetException, SecurityException, NoSuchMethodException {
+	public void fillWithDefaultProperties(Object object) throws IllegalArgumentException,
+			IllegalAccessException, InvocationTargetException, SecurityException,
+			NoSuchMethodException {
 		// Extract properties.
-		List<PropertyWrapper> properties = ComponentProcessor.getInstance()
-				.extractProperties(object.getClass());
+		List<PropertyWrapper> properties = ComponentProcessor.getInstance().extractProperties(
+				object.getClass());
 		// Override with default values if available.
 		for (PropertyWrapper property : properties) {
-			Object defaultValue = ConfigurationManager.getInstance()
-					.readObject(
-							Presenter.DEFAULTS_KEY_PREFIX
-									+ object.getClass().getName() + ":"
-									+ property.getName(), null);
+			Object defaultValue = ConfigurationManager.getInstance().readObject(
+					Presenter.DEFAULTS_KEY_PREFIX + object.getClass().getName() + ":"
+							+ property.getName(), null);
 			if (defaultValue != null) {
-				property.setValue(defaultValue);
+				property.setValue(cloner.deepClone(defaultValue));
 				property.writeTo(object);
 			}
 		}
 	}

-	public void tryToRotateComponentSlot() {
-		if (this.componentSlot == null) {
-			LOG.debug("Component slot is empty, cannot rotate");
-			return;
-		}
-		List<PropertyWrapper> properties = ComponentProcessor.getInstance()
-				.extractProperties(this.componentTypeSlot.getInstanceClass());
-		PropertyWrapper angleProperty = null;
-		for (PropertyWrapper propertyWrapper : properties) {
-			if (propertyWrapper.getType().getName().equals(
-					Orientation.class.getName())) {
-				angleProperty = propertyWrapper;
-				break;
-			}
-		}
-		if (angleProperty == null) {
-			LOG
-					.debug("Component in the slot does not have a property of type Orientation, cannot rotate");
-			return;
-		}
-		try {
-			angleProperty.readFrom(this.componentSlot);
-			Orientation value = (Orientation) angleProperty.getValue();
-			value.ordinal();
-			angleProperty.setValue(Orientation.values()[(value.ordinal() + 1)
-					% Orientation.values().length]);
-			angleProperty.writeTo(this.componentSlot);
-		} catch (Exception e) {
-			LOG.warn("Error trying to rotate the component", e);
-		}
-	}
 }
@@ -6,6 +6,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
@@ -84,7 +85,7 @@ public class ProjectFileManager {
 	private XStream xStreamOld;

 	private String currentFileName = null;
-	private boolean modified = false;	
+	private boolean modified = false;

 	private MessageDispatcher<EventType> messageDispatcher;

@@ -104,7 +105,7 @@ public class ProjectFileManager {
 		fireFileStatusChanged();
 	}

-	public synchronized void serializeProjectToFile(Project project, String fileName, boolean isBackup)
+	public void serializeProjectToFile(Project project, String fileName, boolean isBackup)
 			throws IOException {
 		if (!isBackup) {
 			LOG.info(String.format("saveProjectToFile(%s)", fileName));
@@ -2,23 +2,17 @@ package org.diylc.utils;

 public class BomEntry {

-	private String type;
 	private String name;
 	private String value;
 	private Integer quantity;
 	private String notes;

-	public BomEntry(String type, String name, String value, int quantity) {
+	public BomEntry(String name, String value, int quantity) {
 		super();
-		this.type = type;
 		this.name = name;
 		this.value = value;
 		this.quantity = quantity;
 	}
-	
-	public String getType() {
-		return type;
-	}

 	public String getName() {
 		return name;
@@ -56,7 +50,6 @@ public class BomEntry {
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + ((type == null) ? 0 : type.hashCode());
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		result = prime * result + ((notes == null) ? 0 : notes.hashCode());
 		result = prime * result + quantity;
@@ -73,11 +66,6 @@ public class BomEntry {
 		if (getClass() != obj.getClass())
 			return false;
 		BomEntry other = (BomEntry) obj;
-		if (type == null) {
-			if (other.type != null)
-				return false;
-		} else if (!type.equals(other.type))
-			return false;
 		if (name == null) {
 			if (other.name != null)
 				return false;
@@ -7,10 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import org.diylc.common.ComponentType;
 import org.diylc.core.IDIYComponent;
-import org.diylc.core.annotations.BomPolicy;
-import org.diylc.presenter.ComponentProcessor;

 public class BomMaker {

@@ -29,27 +26,15 @@ public class BomMaker {
 	public List<BomEntry> createBom(List<IDIYComponent<?>> components) {
 		Map<String, BomEntry> entryMap = new HashMap<String, BomEntry>();
 		for (IDIYComponent<?> component : components) {
-			ComponentType type = ComponentProcessor.getInstance()
-					.extractComponentTypeFrom(
-							(Class<? extends IDIYComponent<?>>) component
-									.getClass());
-			if (type.getBomPolicy() == BomPolicy.NEVER_SHOW)
-				continue;
 			String name = component.getName();
-			String value = component.getValue() == null ? null : component
-					.getValue().toString();
+			String value = component.getValue() == null ? null : component.getValue().toString();
 			if ((name != null) && (value != null)) {
-				String key = type.getName() + "|" + value;
+				String key = name + "|" + value;
 				if (entryMap.containsKey(key)) {
 					BomEntry entry = entryMap.get(key);
 					entry.setQuantity(entry.getQuantity() + 1);
-					if (type.getBomPolicy() == BomPolicy.SHOW_ALL_NAMES) {
-						entry.setName(entry.getName() + ", " + name);
-					}				
 				} else {
-					entryMap.put(key, new BomEntry(type.getName(), type
-							.getBomPolicy() == BomPolicy.SHOW_ALL_NAMES ? name
-							: type.getName(), value, 1));
+					entryMap.put(key, new BomEntry(name, value, 1));
 				}
 			}
 		}
@@ -19,7 +19,7 @@ import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

@ComponentDescriptor(name = "Mock", author = "bancika", category = "Sample", instanceNamePrefix = "M", description = "test", zOrder = IDIYComponent.COMPONENT)
-public class MockDIYComponent extends AbstractComponent<Capacitance> {
+public class MockDIYComponent implements IDIYComponent<Capacitance> {

 	private static final long serialVersionUID = 1L;

@@ -4,7 +4,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
+	<classpathentry kind="lib" path="lib/app-framework.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/app-framework"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -3,10 +3,9 @@ package org.diylc.components.boards;
 import java.awt.Graphics2D;

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

-@ComponentDescriptor(name = "Blank Board", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Blank circuit board", bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME)
+@ComponentDescriptor(name = "Blank Board", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Blank circuit board")
 public class BlankBoard extends AbstractBoard {

 	private static final long serialVersionUID = 1L;
@@ -10,14 +10,13 @@ import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;

-@ComponentDescriptor(name = "Eyelet Board", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated board with eyelets", bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME)
+@ComponentDescriptor(name = "Eyelet Board", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated board with eyelets")
 public class EyeletBoard extends AbstractBoard {

 	private static final long serialVersionUID = 1L;
@@ -10,14 +10,13 @@ import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;

-@ComponentDescriptor(name = "Marshall Style Perf Board", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated board as found on some Marshall and Trainwreck amps", bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME)
+@ComponentDescriptor(name = "Marshall Style Perf Board", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated board as found on some Marshall and Trainwreck amps")
 public class MarshallPerfBoard extends AbstractBoard {

 	private static final long serialVersionUID = 1L;
@@ -10,14 +10,13 @@ import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;

-@ComponentDescriptor(name = "Perf Board w/ Pads", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated board with solder pads", bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME)
+@ComponentDescriptor(name = "Perf Board w/ Pads", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated board with solder pads")
 public class PerfBoard extends AbstractBoard {

 	private static final long serialVersionUID = 1L;
@@ -12,14 +12,13 @@ import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;

-@ComponentDescriptor(name = "Vero Board", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated FR4 board with copper strips connecting all holes in a row", bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME)
+@ComponentDescriptor(name = "Vero Board", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated FR4 board with copper strips connecting all holes in a row")
 public class VeroBoard extends AbstractBoard {

 	private static final long serialVersionUID = 1L;
@@ -10,13 +10,12 @@ import org.diylc.core.ComponentState;
 import org.diylc.core.CreationMethod;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

-@ComponentDescriptor(name = "Copper Trace", author = "Branislav Stojkovic", category = "Connectivity", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "Trace", description = "Straight copper trace", zOrder = IDIYComponent.TRACE, bomPolicy = BomPolicy.NEVER_SHOW)
+@ComponentDescriptor(name = "Copper Trace", author = "Branislav Stojkovic", category = "Connectivity", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "Trace", description = "Straight copper trace", zOrder = IDIYComponent.TRACE)
 public class CopperTrace extends AbstractLeadedComponent<Void> {

 	private static final long serialVersionUID = 1L;
@@ -8,13 +8,12 @@ import org.diylc.common.ObjectCache;
 import org.diylc.components.AbstractCurvedComponent;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

-@ComponentDescriptor(name = "Curved Trace", author = "Branislav Stojkovic", category = "Connectivity", instanceNamePrefix = "Trace", description = "Curved copper trace with two control points", zOrder = IDIYComponent.TRACE, bomPolicy = BomPolicy.NEVER_SHOW)
+@ComponentDescriptor(name = "Curved Trace", author = "Branislav Stojkovic", category = "Connectivity", instanceNamePrefix = "Trace", description = "Curved copper trace with two control points", zOrder = IDIYComponent.TRACE)
 public class CurvedTrace extends AbstractCurvedComponent<Void> {

 	private static final long serialVersionUID = 1L;
@@ -10,14 +10,13 @@ import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
 import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;

-@ComponentDescriptor(name = "Eyelet", category = "Connectivity", author = "Branislav Stojkovic", description = "Eyelet or turret terminal", instanceNamePrefix = "Eyelet", stretchable = false, zOrder = IDIYComponent.TRACE + 0.1, bomPolicy = BomPolicy.SHOW_ONLY_TYPE_NAME)
+@ComponentDescriptor(name = "Eyelet", category = "Connectivity", author = "Branislav Stojkovic", description = "Eyelet or turret terminal", instanceNamePrefix = "Eyelet", stretchable = false, zOrder = IDIYComponent.TRACE + 0.1)
 public class Eyelet extends AbstractComponent<String> {

 	private static final long serialVersionUID = 1L;
@@ -8,12 +8,11 @@ import org.diylc.common.ObjectCache;
 import org.diylc.components.AbstractCurvedComponent;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDIYComponent;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.utils.Constants;

-@ComponentDescriptor(name = "Hookup Wire", author = "Branislav Stojkovic", category = "Connectivity", instanceNamePrefix = "W", description = "Flexible wire with two control points", zOrder = IDIYComponent.COMPONENT, bomPolicy = BomPolicy.NEVER_SHOW)
+@ComponentDescriptor(name = "Hookup Wire", author = "Branislav Stojkovic", category = "Connectivity", instanceNamePrefix = "W", description = "Flexible wire with two control points", zOrder = IDIYComponent.COMPONENT)
 public class HookupWire extends AbstractCurvedComponent<Void> {

 	private static final long serialVersionUID = 1L;
@@ -29,21 +28,17 @@ public class HookupWire extends AbstractCurvedComponent<Void> {
 	}

 	@Override
-	protected void drawCurve(CubicCurve2D curve, Graphics2D g2d,
-			ComponentState componentState) {
-		int thickness = (int) (Math.pow(Math.E, -1.12436 - 0.11594
-				* gauge.getValue())
+	protected void drawCurve(CubicCurve2D curve, Graphics2D g2d, ComponentState componentState) {
+		int thickness = (int) (Math.pow(Math.E, -1.12436 - 0.11594 * gauge.getValue())
 				* Constants.PIXELS_PER_INCH * (1 + 2 * INSULATION_THICKNESS_PCT));
 		Color curveColor = componentState == ComponentState.SELECTED
-				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR
-				: color.darker();
+				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : color.darker();
 		g2d.setColor(curveColor);
 		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(thickness));
 		g2d.draw(curve);
 		if (componentState == ComponentState.NORMAL) {
 			g2d.setColor(color);
-			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(
-					thickness - 2));
+			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(thickness - 2));
 			g2d.draw(curve);
 		}
 	}
@@ -9,12 +9,11 @@ import org.diylc.components.AbstractLeadedComponent;
 import org.diylc.core.ComponentState;
 import org.diylc.core.CreationMethod;
 import org.diylc.core.IDIYComponent;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;

-@ComponentDescriptor(name = "Jumper", author = "Branislav Stojkovic", category = "Connectivity", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "J", description = "", zOrder = IDIYComponent.COMPONENT, bomPolicy = BomPolicy.NEVER_SHOW)
+@ComponentDescriptor(name = "Jumper", author = "Branislav Stojkovic", category = "Connectivity", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "J", description = "", zOrder = IDIYComponent.COMPONENT)
 public class Jumper extends AbstractLeadedComponent<Void> {

 	private static final long serialVersionUID = 1L;
@@ -11,12 +11,11 @@ import org.diylc.core.CreationMethod;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;

-@ComponentDescriptor(name = "Line", author = "Branislav Stojkovic", category = "Connectivity", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "LN", description = "", zOrder = IDIYComponent.COMPONENT, bomPolicy = BomPolicy.NEVER_SHOW)
+@ComponentDescriptor(name = "Line", author = "Branislav Stojkovic", category = "Connectivity", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "LN", description = "", zOrder = IDIYComponent.COMPONENT)
 public class Line extends AbstractLeadedComponent<Void> {

 	private static final long serialVersionUID = 1L;
@@ -10,14 +10,13 @@ import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
 import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;

-@ComponentDescriptor(name = "Solder Pad", category = "Connectivity", author = "Branislav Stojkovic", description = "test", instanceNamePrefix = "Pad", stretchable = false, zOrder = IDIYComponent.TRACE + 0.1, bomPolicy = BomPolicy.NEVER_SHOW)
+@ComponentDescriptor(name = "Solder Pad", category = "Connectivity", author = "Branislav Stojkovic", description = "test", instanceNamePrefix = "Pad", stretchable = false, zOrder = IDIYComponent.TRACE + 0.1)
 public class SolderPad extends AbstractComponent<Void> {

 	private static final long serialVersionUID = 1L;
@@ -11,13 +11,12 @@ import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
 import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

-@ComponentDescriptor(name = "Trace Cut", category = "Connectivity", author = "Branislav Stojkovic", description = "Designates the place where a trace on the vero board needs to be cut", instanceNamePrefix = "Cut", stretchable = false, zOrder = IDIYComponent.BOARD + 1, bomPolicy = BomPolicy.NEVER_SHOW)
+@ComponentDescriptor(name = "Trace Cut", category = "Connectivity", author = "Branislav Stojkovic", description = "Designates the place where a trace on the vero board needs to be cut", instanceNamePrefix = "Cut", stretchable = false, zOrder = IDIYComponent.BOARD + 1)
 public class TraceCut extends AbstractComponent<Void> {

 	private static final long serialVersionUID = 1L;
@@ -1,252 +0,0 @@
-package org.diylc.components.electromechanical;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Polygon;
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Rectangle2D;
-
-import org.diylc.appframework.miscutils.ConfigurationManager;
-import org.diylc.common.IPlugInPort;
-import org.diylc.common.ObjectCache;
-import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
-import org.diylc.core.ComponentState;
-import org.diylc.core.IDIYComponent;
-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.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-import org.diylc.utils.Constants;
-
-@ComponentDescriptor(name = "9V Battery Snap", category = "Electromechanical", author = "Branislav Stojkovic", description = "", stretchable = false, zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "BTR")
-public class BatterySnap9V extends AbstractTransparentComponent<String> {
-
-	private static final long serialVersionUID = 1L;
-
-	private static Color BODY_COLOR = Color.darkGray;
-	private static Size WIDTH = new Size(0.5d, SizeUnit.in);
-	private static Size LENGTH = new Size(0.75d, SizeUnit.in);
-	private static Size TERMINAL_DIAMETER = new Size(0.3d, SizeUnit.in);
-	private static Size TERMINAL_SPACING = new Size(0.5d, SizeUnit.in);
-	private static Size TERMINAL_BORDER = new Size(0.7d, SizeUnit.mm);
-
-	private String value = "";
-	private Point controlPoint = new Point(0, 0);
-	transient Shape[] body;
-	private Orientation orientation = Orientation.DEFAULT;
-	private Color color = BODY_COLOR;
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
-		Shape[] body = getBody();
-
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-		if (componentState != ComponentState.DRAGGING) {
-			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 : color);
-			g2d.fill(body[0]);
-			g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : METAL_COLOR);
-			g2d.fill(body[1]);
-			g2d.fill(body[2]);
-			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 : color
-					.brighter();
-		}
-
-		g2d.setColor(finalBorderColor);
-		g2d.draw(body[0]);
-		g2d.setColor(METAL_COLOR.darker());
-		g2d.draw(body[1]);
-		g2d.setColor(METAL_COLOR.darker());
-		g2d.draw(body[2]);
-	}
-
-	public Shape[] getBody() {
-		if (body == null) {
-			body = new Shape[3];
-
-			int x = controlPoint.x;
-			int y = controlPoint.y;
-			int width = (int) WIDTH.convertToPixels();
-			int length = (int) LENGTH.convertToPixels();
-			int totalLength = length + width / 2;
-			int terminalDiameter = (int) TERMINAL_DIAMETER.convertToPixels();
-			int terminalSpacing = (int) TERMINAL_SPACING.convertToPixels();
-			int terminalBorder = (int) TERMINAL_BORDER.convertToPixels();
-
-			Area mainArea = new Area(new Rectangle2D.Double(x, y - width / 2, length, width));
-			mainArea.add(new Area(new Ellipse2D.Double(x + length - width / 2, y - width / 2,
-					width, width)));
-
-			body[0] = mainArea;
-
-			Area terminalArea = new Area(new Ellipse2D.Double(x + (totalLength - terminalSpacing)
-					/ 2 - terminalDiameter / 2, y - terminalDiameter / 2, terminalDiameter,
-					terminalDiameter));
-
-			int centerX = x + (totalLength + terminalSpacing) / 2;
-			int[] terminalX = new int[6];
-			int[] terminalY = new int[6];
-
-			for (int i = 0; i < 6; i++) {
-				terminalX[i] = (int) (centerX + Math.cos(Math.PI / 3 * i) * terminalDiameter / 2);
-				terminalY[i] = (int) (y + Math.sin(Math.PI / 3 * i) * terminalDiameter / 2);
-			}
-			terminalArea.add(new Area(new Polygon(terminalX, terminalY, 6)));
-
-			body[1] = terminalArea;
-
-			terminalArea = new Area(new Ellipse2D.Double(x + (totalLength - terminalSpacing) / 2
-					- terminalDiameter / 2 + terminalBorder, y - terminalDiameter / 2
-					+ terminalBorder, terminalDiameter - 2 * terminalBorder, terminalDiameter - 2
-					* terminalBorder));
-
-			for (int i = 0; i < 6; i++) {
-				terminalX[i] = (int) (centerX + Math.cos(Math.PI / 3 * i)
-						* (terminalDiameter / 2 + terminalBorder));
-				terminalY[i] = (int) (y + Math.sin(Math.PI / 3 * i)
-						* (terminalDiameter / 2 + terminalBorder));
-			}
-			terminalArea.add(new Area(new Polygon(terminalX, terminalY, 6)));
-
-			body[2] = terminalArea;
-
-			// Rotate if needed
-			if (orientation != Orientation.DEFAULT) {
-				double theta = 0;
-				switch (orientation) {
-				case _90:
-					theta = Math.PI / 2;
-					break;
-				case _180:
-					theta = Math.PI;
-					break;
-				case _270:
-					theta = Math.PI * 3 / 2;
-					break;
-				}
-				AffineTransform rotation = AffineTransform.getRotateInstance(theta, x, y);
-				for (Shape shape : body) {
-					Area area = (Area) shape;
-					area.transform(rotation);
-				}
-			}
-		}
-		return body;
-	}
-
-	@Override
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		g2d.setColor(BODY_COLOR);
-		g2d.fillOval(width / 4, width / 32, width / 2, width / 2);
-		g2d.setColor(BODY_COLOR.darker());
-		g2d.drawOval(width / 4, width / 32, width / 2, width / 2);
-		g2d.setColor(BODY_COLOR);
-		g2d.fillRect(width / 4, width / 32 + width / 4, width / 2, width * 3 / 4 - 2 * width / 32);
-		g2d.setColor(BODY_COLOR.darker());
-		g2d.drawRect(width / 4, width / 32 + width / 4, width / 2, width * 3 / 4 - 2 * width / 32);
-		g2d.setColor(METAL_COLOR);
-		g2d.fillOval(width / 4 + 3 * width / 32, width / 32 + 3 * width / 32, width / 2 - 6 * width
-				/ 32, width / 2 - 6 * width / 32);
-
-		int centerX = width / 2;
-		int centerY = height * 7 / 9;
-		int terminalDiameter = width / 2 - 4 * width / 32;
-		int[] terminalX = new int[6];
-		int[] terminalY = new int[6];
-
-		for (int i = 0; i < 6; i++) {
-			terminalX[i] = (int) (centerX + Math.cos(Math.PI / 3 * i) * terminalDiameter / 2);
-			terminalY[i] = (int) (centerY + Math.sin(Math.PI / 3 * i) * terminalDiameter / 2);
-		}
-		g2d.fillPolygon(terminalX, terminalY, 6);
-		g2d.setColor(METAL_COLOR.darker());
-		g2d.drawOval(width / 4 + 3 * width / 32, width / 32 + 3 * width / 32, width / 2 - 6 * width
-				/ 32, width / 2 - 6 * width / 32);
-		g2d.drawPolygon(terminalX, terminalY, 6);
-	}
-
-	@Override
-	public int getControlPointCount() {
-		return 1;
-	}
-
-	@Override
-	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
-		return VisibilityPolicy.WHEN_SELECTED;
-	}
-
-	@Override
-	public boolean isControlPointSticky(int index) {
-		return true;
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return controlPoint;
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		this.controlPoint.setLocation(point);
-		// Invalidate the body
-		body = null;
-	}
-
-	@Override
-	public String getValue() {
-		return value;
-	}
-
-	@Override
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	@EditableProperty
-	public Orientation getOrientation() {
-		return orientation;
-	}
-
-	public void setOrientation(Orientation orientation) {
-		this.orientation = orientation;
-		// Invalidate the body
-		body = null;
-	}
-
-	@EditableProperty
-	public Color getColor() {
-		return color;
-	}
-
-	public void setColor(Color color) {
-		this.color = color;
-	}
-}
@@ -1,370 +0,0 @@
-package org.diylc.components.guitar;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RoundRectangle2D;
-
-import org.diylc.appframework.miscutils.ConfigurationManager;
-import org.diylc.common.IPlugInPort;
-import org.diylc.common.ObjectCache;
-import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
-import org.diylc.core.ComponentState;
-import org.diylc.core.IDIYComponent;
-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.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-import org.diylc.utils.Constants;
-
-@ComponentDescriptor(name = "Lever Switch", category = "Guitar", author = "Branislav Stojkovic", description = "Strat-style lever switch", stretchable = false, zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "SW")
-public class LeverSwitch extends AbstractTransparentComponent<String> {
-
-	private static final long serialVersionUID = 1L;
-
-	private static Color BASE_COLOR = Color.lightGray;
-	private static Color WAFER_COLOR = Color.decode("#CD8500");
-
-	private static Size BASE_WIDTH = new Size(10d, SizeUnit.mm);
-	private static Size BASE_LENGTH = new Size(47.5d, SizeUnit.mm);
-	private static Size WAFER_LENGTH = new Size(40d, SizeUnit.mm);
-	private static Size WAFER_SPACING = new Size(7.62d, SizeUnit.mm);
-	private static Size WAFER_THICKNESS = new Size(1.27d, SizeUnit.mm);
-	private static Size HOLE_SIZE = new Size(2d, SizeUnit.mm);
-	private static Size HOLE_SPACING = new Size(41.2d, SizeUnit.mm);
-	private static Size TERMINAL_WIDTH = new Size(2d, SizeUnit.mm);
-	private static Size TERMINAL_LENGTH = new Size(0.1d, SizeUnit.in);
-	private static Size TERMINAL_SPACING = new Size(0.1d, SizeUnit.in);
-
-	private String value = "";
-	private Point[] controlPoints = new Point[] { new Point(0, 0) };
-	transient Shape[] body;
-	private Orientation orientation = Orientation.DEFAULT;
-	private LeverSwitchType type = LeverSwitchType.DP3T;
-
-	public LeverSwitch() {
-		super();
-		updateControlPoints();
-	}
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
-		Shape[] body = getBody();
-
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-		if (componentState != ComponentState.DRAGGING) {
-			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 : BASE_COLOR);
-			g2d.fill(body[0]);
-			g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : WAFER_COLOR);
-			g2d.fill(body[1]);
-			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 : BASE_COLOR
-					.darker();
-		}
-
-		g2d.setColor(finalBorderColor);
-		g2d.draw(body[0]);
-
-		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 : WAFER_COLOR
-					.darker();
-		}
-
-		g2d.draw(body[1]);
-
-		g2d.setColor(METAL_COLOR);
-		g2d.fill(body[2]);
-		g2d.setColor(METAL_COLOR.darker());
-		g2d.draw(body[2]);
-	}
-
-	public Shape[] getBody() {
-		if (body == null) {
-			body = new Shape[3];
-
-			int x = controlPoints[0].x;
-			int y = controlPoints[0].y;
-			int baseWidth = (int) BASE_WIDTH.convertToPixels();
-			int baseLength = (int) BASE_LENGTH.convertToPixels();
-			int holeSize = getClosestOdd(HOLE_SIZE.convertToPixels());
-			int holeSpacing = (int) HOLE_SPACING.convertToPixels();
-			int waferLength = (int) WAFER_LENGTH.convertToPixels();
-			int waferSpacing = (int) WAFER_SPACING.convertToPixels();
-			int waferThickness = (int) WAFER_THICKNESS.convertToPixels();
-			int terminalSpacing = (int) TERMINAL_SPACING.convertToPixels();
-			int terminalLength = getClosestOdd(TERMINAL_LENGTH.convertToPixels());
-			int terminalWidth = getClosestOdd(TERMINAL_WIDTH.convertToPixels());
-
-			int baseX = x - terminalLength / 2 - waferSpacing;
-			int baseY = y
-					- (baseLength - terminalSpacing * (type == LeverSwitchType.DP3T ? 7 : 12)) / 2;
-			Area baseArea = new Area(new Rectangle2D.Double(baseX, baseY, baseWidth, baseLength));
-			baseArea.subtract(new Area(new Ellipse2D.Double(baseX + baseWidth / 2 - holeSize / 2,
-					baseY + (baseLength - holeSpacing) / 2 - holeSize / 2, holeSize, holeSize)));
-			baseArea.subtract(new Area(new Ellipse2D.Double(baseX + baseWidth / 2 - holeSize / 2,
-					baseY + (baseLength - holeSpacing) / 2 - holeSize / 2 + holeSpacing, holeSize,
-					holeSize)));
-			body[0] = baseArea;
-
-			Area waferArea = new Area(new Rectangle2D.Double(x - terminalLength / 2
-					- waferThickness / 2,
-					y - (waferLength - terminalSpacing * (type == LeverSwitchType.DP3T ? 7 : 12))
-							/ 2, waferThickness, waferLength));
-
-			if (type == LeverSwitchType._4P5T) {
-				waferArea.add(new Area(new Rectangle2D.Double(x - terminalLength / 2
-						- waferThickness / 2 + waferSpacing, y
-						- (waferLength - terminalSpacing * (type == LeverSwitchType.DP3T ? 7 : 12))
-						/ 2, waferThickness, waferLength)));
-			}
-			body[1] = waferArea;
-
-			double theta = 0;
-			// Rotate if needed
-			if (orientation != Orientation.DEFAULT) {
-				switch (orientation) {
-				case _90:
-					theta = Math.PI / 2;
-					break;
-				case _180:
-					theta = Math.PI;
-					break;
-				case _270:
-					theta = Math.PI * 3 / 2;
-					break;
-				}
-			}
-
-			Area terminalArea = new Area();
-			for (Point point : controlPoints) {
-				Area terminal = new Area(new RoundRectangle2D.Double(point.x - terminalLength / 2,
-						point.y - terminalWidth / 2, terminalLength, terminalWidth,
-						terminalWidth / 2, terminalWidth / 2));
-				terminal.subtract(new Area(
-						new RoundRectangle2D.Double(point.x - terminalLength / 4, point.y
-								- terminalWidth / 4, terminalLength / 2, terminalWidth / 2,
-								terminalWidth / 2, terminalWidth / 2)));
-				// Rotate the terminal if needed
-				if (theta != 0) {
-					AffineTransform rotation = AffineTransform.getRotateInstance(theta, point.x,
-							point.y);
-					terminal.transform(rotation);
-				}
-				terminalArea.add(terminal);
-			}
-			body[2] = terminalArea;
-
-			// Rotate if needed
-			if (theta != 0) {
-				AffineTransform rotation = AffineTransform.getRotateInstance(theta, x, y);
-				// Skip the last one because it's already rotated
-				for (int i = 0; i < body.length - 1; i++) {
-					Shape shape = body[i];
-					Area area = (Area) shape;
-					area.transform(rotation);
-				}
-			}
-		}
-		return body;
-	}
-
-	private void updateControlPoints() {
-		int x = controlPoints[0].x;
-		int y = controlPoints[0].y;
-		int waferSpacing = (int) WAFER_SPACING.convertToPixels();
-		int terminalSpacing = (int) TERMINAL_SPACING.convertToPixels();
-		int terminalLength = (int) TERMINAL_LENGTH.convertToPixels();
-
-		switch (type) {
-		case DP3T:
-			controlPoints = new Point[8];
-			for (int i = 0; i < 8; i++) {
-				controlPoints[i] = new Point(x - (i % 2 == 1 ? terminalLength : 0), y + i
-						* terminalSpacing);
-			}
-			break;
-		case DP5T:
-			controlPoints = new Point[12];
-			for (int i = 0; i < 12; i++) {
-				controlPoints[i] = new Point(x, y + i * terminalSpacing
-						+ (i >= 6 ? terminalSpacing : 0));
-			}
-			break;
-		case _4P5T:
-			controlPoints = new Point[24];
-			for (int i = 0; i < 12; i++) {
-				controlPoints[i] = new Point(x, y + i * terminalSpacing
-						+ (i >= 6 ? terminalSpacing : 0));
-				controlPoints[i + 12] = new Point(x + waferSpacing, y + i * terminalSpacing
-						+ (i >= 6 ? terminalSpacing : 0));
-			}
-			break;
-		}
-
-		// Rotate if needed
-		if (orientation != Orientation.DEFAULT) {
-			double theta = 0;
-			switch (orientation) {
-			case _90:
-				theta = Math.PI / 2;
-				break;
-			case _180:
-				theta = Math.PI;
-				break;
-			case _270:
-				theta = Math.PI * 3 / 2;
-				break;
-			}
-			AffineTransform rotation = AffineTransform.getRotateInstance(theta, x, y);
-			for (Point point : controlPoints) {
-				rotation.transform(point, point);
-			}
-		}
-	}
-
-	@Override
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		g2d.setClip(width / 32, width / 32, width, height);
-		g2d.setColor(BASE_COLOR);
-		g2d.fillRect(0, 0, width * 2 / 3, height);
-		g2d.setColor(BASE_COLOR.darker());
-		g2d.drawRect(0, 0, width * 2 / 3, height);
-		g2d.setColor(WAFER_COLOR);
-		g2d.fillRect(width / 8 * 3, 0, width / 8, height);
-		g2d.setColor(WAFER_COLOR.darker());
-		g2d.drawRect(width / 8 * 3, 0, width / 8, height);
-		Area terminals = new Area();
-		int terminalLength = getClosestOdd(11 * width / 32);
-		int terminalWidth = getClosestOdd(7 * width / 32);
-		Area terminal = new Area(new RoundRectangle2D.Double(width / 16 * 7, 4 * width / 32,
-				terminalLength, terminalWidth, terminalWidth / 2, terminalWidth / 2));
-		terminal.subtract(new Area(new RoundRectangle2D.Double(width / 16 * 7 + terminalLength / 4
-				+ 1, 4 * width / 32 + terminalWidth / 4 + 1, terminalLength / 2, terminalWidth / 2,
-				terminalWidth / 4, terminalWidth / 4)));
-		terminals.add(terminal);
-		terminal = new Area(terminal);
-		terminal.transform(AffineTransform.getTranslateInstance(-terminalLength, terminalWidth + 2
-				* width / 32));
-		terminals.add(terminal);
-		terminal = new Area(terminal);
-		terminal.transform(AffineTransform.getTranslateInstance(terminalLength, terminalWidth + 2
-				* width / 32));
-		terminals.add(terminal);
-		g2d.setColor(METAL_COLOR);
-		g2d.fill(terminals);
-		g2d.setColor(METAL_COLOR.darker());
-		g2d.draw(terminals);
-	}
-
-	@Override
-	public int getControlPointCount() {
-		return controlPoints.length;
-	}
-
-	@Override
-	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
-		return VisibilityPolicy.NEVER;
-	}
-
-	@Override
-	public boolean isControlPointSticky(int index) {
-		return true;
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return controlPoints[index];
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		this.controlPoints[index].setLocation(point);
-		// Invalidate the body
-		body = null;
-	}
-
-	@Override
-	public String getValue() {
-		return value;
-	}
-
-	@Override
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	@EditableProperty
-	public Orientation getOrientation() {
-		return orientation;
-	}
-
-	@EditableProperty
-	public LeverSwitchType getType() {
-		return type;
-	}
-
-	public void setType(LeverSwitchType type) {
-		this.type = type;
-		updateControlPoints();
-		// Invalidate body
-		this.body = null;
-	}
-
-	public void setOrientation(Orientation orientation) {
-		this.orientation = orientation;
-		updateControlPoints();
-		// Invalidate the body
-		body = null;
-	}
-
-	public enum LeverSwitchType {
-		DP3T("DP3T (Standard Strat)"), _4P5T("4P5T (Super/Mega)"), DP5T("DP5T");
-
-		private String title;
-
-		private LeverSwitchType(String title) {
-			this.title = title;
-		}
-
-		@Override
-		public String toString() {
-			return title;
-		}
-	}
-}
@@ -15,7 +15,6 @@ import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
 import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
@@ -23,7 +22,7 @@ import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.BomEntry;
 import org.diylc.utils.BomMaker;

-@ComponentDescriptor(name = "Bill of Materials", author = "Branislav Stojkovic", category = "Misc", description = "", instanceNamePrefix = "BOM", zOrder = IDIYComponent.TEXT, stretchable = false, bomPolicy = BomPolicy.NEVER_SHOW)
+@ComponentDescriptor(name = "Bill of Materials", author = "Branislav Stojkovic", category = "Misc", description = "", instanceNamePrefix = "BOM", zOrder = IDIYComponent.TEXT, stretchable = false)
 public class BOM extends AbstractComponent<Void> {

 	public static Size DEFAULT_SIZE = new Size(10d, SizeUnit.cm);
@@ -50,20 +49,14 @@ public class BOM extends AbstractComponent<Void> {
 		}
 		g2d.setFont(LABEL_FONT);
 		g2d.setColor(componentState == ComponentState.DRAGGING
-				|| componentState == ComponentState.SELECTED ? SELECTION_COLOR : COLOR);		
+				|| componentState == ComponentState.SELECTED ? SELECTION_COLOR : COLOR);
 		// Determine maximum name length and maximum value length to calculate
-		// number of columns.		
+		// number of columns.
 		FontMetrics fontMetrics = g2d.getFontMetrics();
 		int maxNameWidth = 0;
 		int maxValueWidth = 0;
 		int maxHeight = 0;
 		for (BomEntry entry : bom) {
-			String valueStr;
-			if (entry.getValue() == null || entry.getValue().trim().isEmpty()) {
-				valueStr = "qty " + entry.getQuantity().toString();
-			} else {
-				valueStr = entry.getValue().toString();
-			}
 			Rectangle2D stringBounds = fontMetrics.getStringBounds(entry.getName(), g2d);
 			if (stringBounds.getWidth() > maxNameWidth) {
 				maxNameWidth = (int) stringBounds.getWidth();
@@ -71,7 +64,7 @@ public class BOM extends AbstractComponent<Void> {
 			if (stringBounds.getHeight() > maxHeight) {
 				maxHeight = (int) stringBounds.getHeight();
 			}
-			stringBounds = fontMetrics.getStringBounds(valueStr, g2d);
+			stringBounds = fontMetrics.getStringBounds(entry.getValue().toString(), g2d);
 			if (stringBounds.getWidth() > maxValueWidth) {
 				maxValueWidth = (int) stringBounds.getWidth();
 			}
@@ -82,8 +75,6 @@ public class BOM extends AbstractComponent<Void> {
 		// Calculate maximum entry size.
 		int maxEntrySize = maxNameWidth + maxValueWidth + 2 * (int) SPACING.convertToPixels();
 		int columnCount = (int) size.convertToPixels() / maxEntrySize;
-		if (columnCount == 0)
-			columnCount = 1;
 		int columnWidth = (int) size.convertToPixels() / columnCount;
 		int entriesPerColumn = (int) Math.ceil(1.d * bom.size() / columnCount);
 		if (entriesPerColumn == 0) {
@@ -91,20 +82,13 @@ public class BOM extends AbstractComponent<Void> {
 			return;
 		}
 		for (int i = 0; i < bom.size(); i++) {
-			String valueStr;
-			BomEntry entry = bom.get(i);
-			if (entry.getValue() == null || entry.getValue().trim().isEmpty()) {
-				valueStr = "qty " + entry.getQuantity().toString();
-			} else {
-				valueStr = entry.getValue().toString();
-			}
 			int columnIndex = i / entriesPerColumn;
 			int rowIndex = i % entriesPerColumn;
 			int x = point.x + columnIndex * columnWidth;
 			int y = point.y + rowIndex * maxHeight;
-			g2d.drawString(entry.getName(), x, y);
+			g2d.drawString(bom.get(i).getName(), x, y);
 			x += maxNameWidth + SPACING.convertToPixels();
-			g2d.drawString(valueStr, x, y);
+			g2d.drawString(bom.get(i).getValue().toString(), x, y);
 		}
 	}

@@ -12,13 +12,12 @@ import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
 import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

-@ComponentDescriptor(name = "Ground Symbol", author = "Branislav Stojkovic", category = "Misc", instanceNamePrefix = "GND", description = "Ground schematic symbol", stretchable = false, zOrder = IDIYComponent.COMPONENT, bomPolicy = BomPolicy.NEVER_SHOW)
+@ComponentDescriptor(name = "Ground Symbol", author = "Branislav Stojkovic", category = "Misc", instanceNamePrefix = "GND", description = "Ground schematic symbol", stretchable = false, zOrder = IDIYComponent.COMPONENT)
 public class GroundSymbol extends AbstractComponent<Void> {

 	private static final long serialVersionUID = 1L;
@@ -14,13 +14,12 @@ import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
 import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;

 import com.thoughtworks.xstream.annotations.XStreamConverter;

-@ComponentDescriptor(name = "Image", author = "Branislav Stojkovic", category = "Misc", description = "User defined image", instanceNamePrefix = "Img", zOrder = IDIYComponent.COMPONENT, flexibleZOrder = true, stretchable = false, bomPolicy = BomPolicy.NEVER_SHOW)
+@ComponentDescriptor(name = "Image", author = "Branislav Stojkovic", category = "Misc", description = "User defined image", instanceNamePrefix = "Img", zOrder = IDIYComponent.TEXT, stretchable = false)
 public class Image extends AbstractTransparentComponent<Void> {

 	private static final long serialVersionUID = 1L;
@@ -13,11 +13,10 @@ import org.diylc.core.IDIYComponent;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
 import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.BomPolicy;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;

-@ComponentDescriptor(name = "Label", author = "Branislav Stojkovic", category = "Misc", description = "User defined label", instanceNamePrefix = "L", zOrder = IDIYComponent.TEXT, flexibleZOrder = true, stretchable = false, bomPolicy = BomPolicy.NEVER_SHOW)
+@ComponentDescriptor(name = "Label", author = "Branislav Stojkovic", category = "Misc", description = "User defined label", instanceNamePrefix = "L", zOrder = IDIYComponent.TEXT, stretchable = false)
 public class Label extends AbstractComponent<Void> {

 	public static String DEFAULT_TEXT = "Double click to edit text";
@@ -19,7 +19,7 @@ import org.diylc.core.measures.ResistanceUnit;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

-@ComponentDescriptor(name = "Resistor", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "R", description = "", zOrder = IDIYComponent.COMPONENT)
+@ComponentDescriptor(name = "Resistor", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "R", description = "test", zOrder = IDIYComponent.COMPONENT)
 public class Resistor extends AbstractLeadedComponent<Resistance> {

 	private static final long serialVersionUID = 1L;
@@ -31,7 +31,7 @@ public class Resistor extends AbstractLeadedComponent<Resistance> {
 	public static int BAND_SPACING = 5;
 	public static int FIRST_BAND = 4;

-	private Resistance value = new Resistance(100d, ResistanceUnit.K);
+	private Resistance value = new Resistance(123d, ResistanceUnit.K);
 	@Deprecated
 	private Power power = Power.HALF;
 	private org.diylc.core.measures.Power powerNew = new org.diylc.core.measures.Power(0.5,
@@ -11,7 +11,6 @@ import java.awt.Shape;
 import java.awt.geom.Rectangle2D;

 import org.diylc.appframework.miscutils.ConfigurationManager;
-import org.diylc.common.Display;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.Orientation;
@@ -54,7 +53,6 @@ public class TransistorTO220 extends AbstractTransparentComponent<String> {
 	private Color borderColor = BORDER_COLOR;
 	private Color tabColor = TAB_COLOR;
 	private Color tabBorderColor = TAB_BORDER_COLOR;
-	private Display display = Display.NAME;

 	public TransistorTO220() {
 		super();
@@ -248,16 +246,15 @@ public class TransistorTO220 extends AbstractTransparentComponent<String> {
 					: LABEL_COLOR;
 		}
 		g2d.setColor(finalLabelColor);
-		String label = (getDisplay() == Display.NAME) ? getName() : getValue();
 		FontMetrics fontMetrics = g2d.getFontMetrics(g2d.getFont());
-		Rectangle2D rect = fontMetrics.getStringBounds(label, g2d);
+		Rectangle2D rect = fontMetrics.getStringBounds(getName(), g2d);
 		int textHeight = (int) (rect.getHeight());
 		int textWidth = (int) (rect.getWidth());
 		// Center text horizontally and vertically
 		Rectangle bounds = mainArea.getBounds();
 		int x = bounds.x + (bounds.width - textWidth) / 2;
 		int y = bounds.y + (bounds.height - textHeight) / 2 + fontMetrics.getAscent();
-		g2d.drawString(label, x, y);
+		g2d.drawString(getName(), x, y);
 	}

 	@Override
@@ -307,16 +304,4 @@ public class TransistorTO220 extends AbstractTransparentComponent<String> {
 	public void setTabBorderColor(Color tabBorderColor) {
 		this.tabBorderColor = tabBorderColor;
 	}
-	
-	@EditableProperty
-	public Display getDisplay() {
-		if (display == null) {
-			display = Display.NAME;
-		}
-		return display;
-	}
-
-	public void setDisplay(Display display) {
-		this.display = display;
-	}
 }
@@ -12,7 +12,6 @@ import java.awt.geom.Ellipse2D;
 import java.awt.geom.Rectangle2D;

 import org.diylc.appframework.miscutils.ConfigurationManager;
-import org.diylc.common.Display;
 import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.common.Orientation;
@@ -49,7 +48,6 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 	transient private Area body;
 	private Color bodyColor = BODY_COLOR;
 	private Color borderColor = BORDER_COLOR;
-	protected Display display = Display.NAME;

 	public TransistorTO92() {
 		super();
@@ -224,16 +222,15 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 					: LABEL_COLOR;
 		}
 		g2d.setColor(finalLabelColor);
-		String label = (getDisplay() == Display.NAME) ? getName() : getValue();
 		FontMetrics fontMetrics = g2d.getFontMetrics(g2d.getFont());
-		Rectangle2D rect = fontMetrics.getStringBounds(label, g2d);
+		Rectangle2D rect = fontMetrics.getStringBounds(getName(), g2d);
 		int textHeight = (int) (rect.getHeight());
 		int textWidth = (int) (rect.getWidth());
 		// Center text horizontally and vertically
 		Rectangle bounds = mainArea.getBounds();
 		int x = bounds.x + (bounds.width - textWidth) / 2;
 		int y = bounds.y + (bounds.height - textHeight) / 2 + fontMetrics.getAscent();
-		g2d.drawString(label, x, y);
+		g2d.drawString(getName(), x, y);
 	}

 	@Override
@@ -267,16 +264,4 @@ public class TransistorTO92 extends AbstractTransparentComponent<String> {
 	public void setBorderColor(Color borderColor) {
 		this.borderColor = borderColor;
 	}
-	
-	@EditableProperty
-	public Display getDisplay() {
-		if (display == null) {
-			display = Display.NAME;
-		}
-		return display;
-	}
-
-	public void setDisplay(Display display) {
-		this.display = display;
-	}
 }
@@ -7,11 +7,13 @@
 	<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
 	<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/jettison-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
 	<classpathentry kind="lib" path="library/main.jar" sourcepath="/diylc-library"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/app-framework"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/swing-framework"/>
+	<classpathentry kind="lib" path="lib/app-framework.jar"/>
+	<classpathentry kind="lib" path="lib/swing-framework.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -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-swing"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m -Dorg.diylc.scriptRun=true -Ddorg.diylc.debugComponentAreas=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m -Ddorg.diylc.debugComponentAreas=true"/>
 </launchConfiguration>
@@ -1,2 +0,0 @@
-ftype diyfile="%CD%\diylc.exe" "%%1"
-assoc .diy=diyfile
@@ -57,7 +57,7 @@
 	</manifestclasspath>

 	<target name="jar" depends="clean, lib.copy, resource.copy, compile">
-		<jar destfile="${jar.dir}/diylc.jar" basedir="${classes.dir}">
+		<jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
 				<attribute name="Main-Class" value="${main.class}" />
@@ -1,3 +1,2 @@
-# Uncomment lines you want to edit and change the part after the "=" sign.
-#org.diylc.presenter.InstantiationManager.MAX_RECENT_COMPONENTS=20
-#org.diylc.swing.plugins.canvas.CanvasPanel.USE_HARDWARE_ACCELLERATION=true
+#org.diylc.utils.Constants.CANVAS_COLOR=#005D96
+#org.diylc.utils.Constants.GRID_COLOR=#FFFFFF
@@ -1 +0,0 @@
-Xms512m -Xmx1024m -Dorg.diylc.scriptRun=true
@@ -1 +0,0 @@
-java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -cp diylc.jar:lib org.diylc.DIYLCStarter
@@ -4,7 +4,6 @@ import java.io.FileInputStream;
 import java.net.URL;
 import java.util.Properties;

-import javax.swing.JOptionPane;
 import javax.swing.UIManager;

 import org.apache.log4j.Logger;
@@ -27,8 +26,6 @@ public class DIYLCStarter {

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

-	private static final String SCRIPT_RUN = "org.diylc.scriptRun";
-
 	/**
 	 * @param args
 	 */
@@ -42,52 +39,32 @@ public class DIYLCStarter {
 			LOG.error("Could not initialize log4j configuration", e);
 		}

-		LOG.debug("Java version: " + System.getProperty("java.runtime.version")
-				+ " by " + System.getProperty("java.vm.vendor"));
-		LOG.debug("OS: " + System.getProperty("os.name") + " "
-				+ System.getProperty("os.version"));
+		LOG.debug("Java version: " + System.getProperty("java.runtime.version") + " by "
+				+ System.getProperty("java.vm.vendor"));
+		LOG.debug("OS: " + System.getProperty("os.name") + " " + System.getProperty("os.version"));

-		LOG.info("Starting DIYLC with working directory "
-				+ System.getProperty("user.dir"));
+		LOG.info("Starting DIYLC with working directory " + System.getProperty("user.dir"));

 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (Exception e) {
 			LOG.error("Could not set Look&Feel", e);
 		}
-		
-		String val = System.getProperty(SCRIPT_RUN);
-		if (!"true".equals(val)) {
-			int response = JOptionPane
-					.showConfirmDialog(
-							null,
-							"It is not recommended to run DIYLC by clicking on the diylc.jar file.\n" +
-							"Please use diylc.exe on Windows or run.sh on OSX/Linux to ensure the best\n" +
-							"performance and reliability. Do you want to continue?",
-							"DIYLC", JOptionPane.YES_NO_OPTION,
-							JOptionPane.WARNING_MESSAGE);
-			if (response != JOptionPane.YES_OPTION) {
-				System.exit(0);
-			}
-		}

 		MainFrame mainFrame = new MainFrame();
 		mainFrame.setLocationRelativeTo(null);
 		mainFrame.setVisible(true);
-		if (args.length > 0) {
-			mainFrame.getPresenter().loadProjectFromFile(args[0]);
-		} else {
-			boolean showTemplates = ConfigurationManager.getInstance()
-					.readBoolean(TemplateDialog.SHOW_TEMPLATES_KEY, true);
-			if (showTemplates) {
-				TemplateDialog templateDialog = new TemplateDialog(mainFrame,
-						mainFrame.getPresenter());
-				if (!templateDialog.getFiles().isEmpty()) {
-					templateDialog.setVisible(true);
-				}
+
+		boolean showTemplates = ConfigurationManager.getInstance().readBoolean(
+				TemplateDialog.SHOW_TEMPLATES_KEY, true);
+		if (showTemplates) {
+			TemplateDialog templateDialog = new TemplateDialog(mainFrame, mainFrame.getPresenter());
+			if (!templateDialog.getFiles().isEmpty()) {
+				templateDialog.setVisible(true);
 			}
 		}

+		url = DIYLCStarter.class.getResource("/config.properties");
 		properties = new Properties();
 		try {
 			LOG.info("Injecting default properties.");
@@ -6,7 +6,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.awt.print.PrinterException;
 import java.io.File;
-import java.util.ArrayList;
 import java.util.List;

 import javax.swing.AbstractAction;
@@ -26,17 +25,21 @@ import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swing.gui.editor.PropertyEditorDialog;
 import org.diylc.swing.plugins.edit.ComponentTransferable;
 import org.diylc.swing.plugins.file.BomDialog;
+import org.diylc.swing.plugins.file.BomEntry;
+import org.diylc.swing.plugins.file.BomMaker;
 import org.diylc.swing.plugins.file.FileFilterEnum;
 import org.diylc.swingframework.ButtonDialog;
 import org.diylc.swingframework.IDrawingProvider;
 import org.diylc.swingframework.export.DrawingExporter;
-import org.diylc.utils.BomEntry;
+
+import com.rits.cloning.Cloner;

 public class ActionFactory {

 	private static final Logger LOG = Logger.getLogger(ActionFactory.class);

 	private static ActionFactory instance;
+	private static Cloner cloner = new Cloner();

 	public static ActionFactory getInstance() {
 		if (instance == null) {
@@ -62,8 +65,7 @@ public class ActionFactory {
 		return new SaveAction(plugInPort, swingUI);
 	}

-	public SaveAsAction createSaveAsAction(IPlugInPort plugInPort,
-			ISwingUI swingUI) {
+	public SaveAsAction createSaveAsAction(IPlugInPort plugInPort, ISwingUI swingUI) {
 		return new SaveAsAction(plugInPort, swingUI);
 	}

@@ -71,13 +73,11 @@ public class ActionFactory {
 		return new CreateBomAction(plugInPort);
 	}

-	public ExportPDFAction createExportPDFAction(
-			IDrawingProvider drawingProvider, ISwingUI swingUI) {
+	public ExportPDFAction createExportPDFAction(IDrawingProvider drawingProvider, ISwingUI swingUI) {
 		return new ExportPDFAction(drawingProvider, swingUI);
 	}

-	public ExportPNGAction createExportPNGAction(
-			IDrawingProvider drawingProvider, ISwingUI swingUI) {
+	public ExportPNGAction createExportPNGAction(IDrawingProvider drawingProvider, ISwingUI swingUI) {
 		return new ExportPNGAction(drawingProvider, swingUI);
 	}

@@ -91,18 +91,17 @@ public class ActionFactory {

 	// Edit menu actions.

-	public CutAction createCutAction(IPlugInPort plugInPort,
-			Clipboard clipboard, ClipboardOwner clipboardOwner) {
+	public CutAction createCutAction(IPlugInPort plugInPort, Clipboard clipboard,
+			ClipboardOwner clipboardOwner) {
 		return new CutAction(plugInPort, clipboard, clipboardOwner);
 	}

-	public CopyAction createCopyAction(IPlugInPort plugInPort,
-			Clipboard clipboard, ClipboardOwner clipboardOwner) {
+	public CopyAction createCopyAction(IPlugInPort plugInPort, Clipboard clipboard,
+			ClipboardOwner clipboardOwner) {
 		return new CopyAction(plugInPort, clipboard, clipboardOwner);
 	}

-	public PasteAction createPasteAction(IPlugInPort plugInPort,
-			Clipboard clipboard) {
+	public PasteAction createPasteAction(IPlugInPort plugInPort, Clipboard clipboard) {
 		return new PasteAction(plugInPort, clipboard);
 	}

@@ -126,13 +125,12 @@ public class ActionFactory {
 		return new EditSelectionAction(plugInPort);
 	}

-	public DeleteSelectionAction createDeleteSelectionAction(
-			IPlugInPort plugInPort) {
+	public DeleteSelectionAction createDeleteSelectionAction(IPlugInPort plugInPort) {
 		return new DeleteSelectionAction(plugInPort);
 	}

-	public ExpandSelectionAction createExpandSelectionAction(
-			IPlugInPort plugInPort, ExpansionMode expansionMode) {
+	public ExpandSelectionAction createExpandSelectionAction(IPlugInPort plugInPort,
+			ExpansionMode expansionMode) {
 		return new ExpandSelectionAction(plugInPort, expansionMode);
 	}

@@ -146,8 +144,8 @@ public class ActionFactory {

 	// Config actions.

-	public ConfigAction createConfigAction(IPlugInPort plugInPort,
-			String title, String configKey, boolean defaultValue) {
+	public ConfigAction createConfigAction(IPlugInPort plugInPort, String title, String configKey,
+			boolean defaultValue) {
 		return new ConfigAction(plugInPort, title, configKey, defaultValue);
 	}

@@ -155,8 +153,7 @@ public class ActionFactory {
 		return new ThemeAction(plugInPort, theme);
 	}

-	public RenumberAction createRenumberAction(IPlugInPort plugInPort,
-			boolean xAxisFirst) {
+	public RenumberAction createRenumberAction(IPlugInPort plugInPort, boolean xAxisFirst) {
 		return new RenumberAction(plugInPort, xAxisFirst);
 	}

@@ -172,10 +169,9 @@ public class ActionFactory {
 			super();
 			this.plugInPort = plugInPort;
 			putValue(AbstractAction.NAME, "New");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_N, ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentPlainYellow
-					.getIcon());
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_N,
+					ActionEvent.CTRL_MASK));
+			putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentPlainYellow.getIcon());
 		}

 		@Override
@@ -185,10 +181,9 @@ public class ActionFactory {
 				return;
 			}
 			plugInPort.createNewProject();
-			List<PropertyWrapper> properties = plugInPort
-					.getProjectProperties();
-			PropertyEditorDialog editor = DialogFactory.getInstance()
-					.createPropertyEditorDialog(properties, "Edit Project");
+			List<PropertyWrapper> properties = plugInPort.getProjectProperties();
+			PropertyEditorDialog editor = DialogFactory.getInstance().createPropertyEditorDialog(
+					properties, "Edit Project");
 			editor.setVisible(true);
 			if (ButtonDialog.OK.equals(editor.getSelectedButtonCaption())) {
 				plugInPort.applyPropertiesToProject(properties);
@@ -196,8 +191,8 @@ public class ActionFactory {
 			// Save default values.
 			for (PropertyWrapper property : editor.getDefaultedProperties()) {
 				if (property.getValue() != null) {
-					plugInPort.setProjectDefaultPropertyValue(property
-							.getName(), property.getValue());
+					plugInPort.setProjectDefaultPropertyValue(property.getName(), property
+							.getValue());
 				}
 			}
 		}
@@ -215,8 +210,8 @@ public class ActionFactory {
 			this.plugInPort = plugInPort;
 			this.swingUI = swingUI;
 			putValue(AbstractAction.NAME, "Open");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_O, ActionEvent.CTRL_MASK));
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_O,
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.FolderOut.getIcon());
 		}

@@ -227,8 +222,8 @@ public class ActionFactory {
 				return;
 			}
 			final File file = DialogFactory.getInstance().showOpenDialog(
-					FileFilterEnum.DIY.getFilter(), null,
-					FileFilterEnum.DIY.getExtensions()[0], null);
+					FileFilterEnum.DIY.getFilter(), null, FileFilterEnum.DIY.getExtensions()[0],
+					null);
 			if (file != null) {
 				swingUI.executeBackgroundTask(new ITask<Void>() {

@@ -245,8 +240,7 @@ public class ActionFactory {

 					@Override
 					public void failed(Exception e) {
-						swingUI.showMessage("Could not open file. "
-								+ e.getMessage(), "Error",
+						swingUI.showMessage("Could not open file. " + e.getMessage(), "Error",
 								ISwingUI.ERROR_MESSAGE);
 					}
 				});
@@ -266,8 +260,8 @@ public class ActionFactory {
 			this.plugInPort = plugInPort;
 			this.swingUI = swingUI;
 			putValue(AbstractAction.NAME, "Save");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_S, ActionEvent.CTRL_MASK));
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S,
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.DiskBlue.getIcon());
 		}

@@ -284,8 +278,7 @@ public class ActionFactory {
 						@Override
 						public Void doInBackground() throws Exception {
 							LOG.debug("Saving to " + file.getAbsolutePath());
-							plugInPort.saveProjectToFile(
-									file.getAbsolutePath(), false);
+							plugInPort.saveProjectToFile(file.getAbsolutePath(), false);
 							return null;
 						}

@@ -295,9 +288,8 @@ public class ActionFactory {

 						@Override
 						public void failed(Exception e) {
-							swingUI.showMessage("Could not save to file. "
-									+ e.getMessage(), "Error",
-									ISwingUI.ERROR_MESSAGE);
+							swingUI.showMessage("Could not save to file. " + e.getMessage(),
+									"Error", ISwingUI.ERROR_MESSAGE);
 						}
 					});
 				}
@@ -306,10 +298,8 @@ public class ActionFactory {

 					@Override
 					public Void doInBackground() throws Exception {
-						LOG.debug("Saving to "
-								+ plugInPort.getCurrentFileName());
-						plugInPort.saveProjectToFile(plugInPort
-								.getCurrentFileName(), false);
+						LOG.debug("Saving to " + plugInPort.getCurrentFileName());
+						plugInPort.saveProjectToFile(plugInPort.getCurrentFileName(), false);
 						return null;
 					}

@@ -319,8 +309,7 @@ public class ActionFactory {

 					@Override
 					public void failed(Exception e) {
-						swingUI.showMessage("Could not save to file. "
-								+ e.getMessage(), "Error",
+						swingUI.showMessage("Could not save to file. " + e.getMessage(), "Error",
 								ISwingUI.ERROR_MESSAGE);
 					}
 				});
@@ -340,9 +329,8 @@ public class ActionFactory {
 			this.plugInPort = plugInPort;
 			this.swingUI = swingUI;
 			putValue(AbstractAction.NAME, "Save As");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_S, ActionEvent.CTRL_MASK
-							| ActionEvent.SHIFT_MASK));
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S,
+					ActionEvent.CTRL_MASK | ActionEvent.SHIFT_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.DiskBlue.getIcon());
 		}

@@ -350,16 +338,15 @@ public class ActionFactory {
 		public void actionPerformed(ActionEvent e) {
 			LOG.info("SaveAsAction triggered");
 			final File file = DialogFactory.getInstance().showSaveDialog(
-					FileFilterEnum.DIY.getFilter(), null,
-					FileFilterEnum.DIY.getExtensions()[0], null);
+					FileFilterEnum.DIY.getFilter(), null, FileFilterEnum.DIY.getExtensions()[0],
+					null);
 			if (file != null) {
 				swingUI.executeBackgroundTask(new ITask<Void>() {

 					@Override
 					public Void doInBackground() throws Exception {
 						LOG.debug("Saving to " + file.getAbsolutePath());
-						plugInPort.saveProjectToFile(file.getAbsolutePath(),
-								false);
+						plugInPort.saveProjectToFile(file.getAbsolutePath(), false);
 						return null;
 					}

@@ -369,8 +356,7 @@ public class ActionFactory {

 					@Override
 					public void failed(Exception e) {
-						swingUI.showMessage("Could not save to file. "
-								+ e.getMessage(), "Error",
+						swingUI.showMessage("Could not save to file. " + e.getMessage(), "Error",
 								ISwingUI.ERROR_MESSAGE);
 					}
 				});
@@ -394,8 +380,8 @@ public class ActionFactory {
 		@Override
 		public void actionPerformed(ActionEvent e) {
 			LOG.info("CreateBomAction triggered");
-			List<BomEntry> bom = org.diylc.utils.BomMaker.getInstance()
-					.createBom(plugInPort.getCurrentProject().getComponents());
+			List<BomEntry> bom = BomMaker.getInstance().createBom(
+					plugInPort.getCurrentProject().getComponents());
 			BomDialog dialog = DialogFactory.getInstance().createBomDialog(bom);
 			dialog.setVisible(true);
 		}
@@ -408,8 +394,7 @@ public class ActionFactory {
 		private IDrawingProvider drawingProvider;
 		private ISwingUI swingUI;

-		public ExportPDFAction(IDrawingProvider drawingProvider,
-				ISwingUI swingUI) {
+		public ExportPDFAction(IDrawingProvider drawingProvider, ISwingUI swingUI) {
 			super();
 			this.drawingProvider = drawingProvider;
 			this.swingUI = swingUI;
@@ -421,8 +406,8 @@ public class ActionFactory {
 		public void actionPerformed(ActionEvent e) {
 			LOG.info("ExportPDFAction triggered");
 			final File file = DialogFactory.getInstance().showSaveDialog(
-					FileFilterEnum.PDF.getFilter(), null,
-					FileFilterEnum.PDF.getExtensions()[0], null);
+					FileFilterEnum.PDF.getFilter(), null, FileFilterEnum.PDF.getExtensions()[0],
+					null);
 			if (file != null) {
 				swingUI.executeBackgroundTask(new ITask<Void>() {

@@ -440,8 +425,7 @@ public class ActionFactory {

 					@Override
 					public void failed(Exception e) {
-						swingUI.showMessage("Could not export to PDF. "
-								+ e.getMessage(), "Error",
+						swingUI.showMessage("Could not export to PDF. " + e.getMessage(), "Error",
 								ISwingUI.ERROR_MESSAGE);
 					}
 				});
@@ -456,8 +440,7 @@ public class ActionFactory {
 		private IDrawingProvider drawingProvider;
 		private ISwingUI swingUI;

-		public ExportPNGAction(IDrawingProvider drawingProvider,
-				ISwingUI swingUI) {
+		public ExportPNGAction(IDrawingProvider drawingProvider, ISwingUI swingUI) {
 			super();
 			this.drawingProvider = drawingProvider;
 			this.swingUI = swingUI;
@@ -469,8 +452,8 @@ public class ActionFactory {
 		public void actionPerformed(ActionEvent e) {
 			LOG.info("ExportPNGAction triggered");
 			final File file = DialogFactory.getInstance().showSaveDialog(
-					FileFilterEnum.PNG.getFilter(), null,
-					FileFilterEnum.PNG.getExtensions()[0], null);
+					FileFilterEnum.PNG.getFilter(), null, FileFilterEnum.PNG.getExtensions()[0],
+					null);
 			if (file != null) {
 				swingUI.executeBackgroundTask(new ITask<Void>() {

@@ -488,8 +471,7 @@ public class ActionFactory {

 					@Override
 					public void failed(Exception e) {
-						swingUI.showMessage("Could not export to PNG. "
-								+ e.getMessage(), "Error",
+						swingUI.showMessage("Could not export to PNG. " + e.getMessage(), "Error",
 								ISwingUI.ERROR_MESSAGE);
 					}
 				});
@@ -507,8 +489,8 @@ public class ActionFactory {
 			super();
 			this.drawingProvider = drawingProvider;
 			putValue(AbstractAction.NAME, "Print...");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_P, ActionEvent.CTRL_MASK));
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_P,
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Print.getIcon());
 		}

@@ -555,24 +537,22 @@ public class ActionFactory {
 		private Clipboard clipboard;
 		private ClipboardOwner clipboardOwner;

-		public CutAction(IPlugInPort plugInPort, Clipboard clipboard,
-				ClipboardOwner clipboardOwner) {
+		public CutAction(IPlugInPort plugInPort, Clipboard clipboard, ClipboardOwner clipboardOwner) {
 			super();
 			this.plugInPort = plugInPort;
 			this.clipboard = clipboard;
 			this.clipboardOwner = clipboardOwner;
 			putValue(AbstractAction.NAME, "Cut");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_X, ActionEvent.CTRL_MASK));
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X,
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Cut.getIcon());
 		}

 		@Override
 		public void actionPerformed(ActionEvent e) {
 			LOG.info("Cut triggered");
-			clipboard.setContents(new ComponentTransferable(
-					cloneComponents(plugInPort.getSelectedComponents())),
-					clipboardOwner);
+			clipboard.setContents(new ComponentTransferable(cloner.deepClone(plugInPort
+					.getSelectedComponents())), clipboardOwner);
 			plugInPort.deleteSelectedComponents();
 		}
 	}
@@ -585,24 +565,22 @@ public class ActionFactory {
 		private Clipboard clipboard;
 		private ClipboardOwner clipboardOwner;

-		public CopyAction(IPlugInPort plugInPort, Clipboard clipboard,
-				ClipboardOwner clipboardOwner) {
+		public CopyAction(IPlugInPort plugInPort, Clipboard clipboard, ClipboardOwner clipboardOwner) {
 			super();
 			this.plugInPort = plugInPort;
 			this.clipboard = clipboard;
 			this.clipboardOwner = clipboardOwner;
 			putValue(AbstractAction.NAME, "Copy");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_C, ActionEvent.CTRL_MASK));
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C,
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Copy.getIcon());
 		}

 		@Override
 		public void actionPerformed(ActionEvent e) {
 			LOG.info("Copy triggered");
-			clipboard.setContents(new ComponentTransferable(
-					cloneComponents(plugInPort.getSelectedComponents())),
-					clipboardOwner);
+			clipboard.setContents(new ComponentTransferable(cloner.deepClone(plugInPort
+					.getSelectedComponents())), clipboardOwner);
 		}
 	}

@@ -618,8 +596,8 @@ public class ActionFactory {
 			this.plugInPort = plugInPort;
 			this.clipboard = clipboard;
 			putValue(AbstractAction.NAME, "Paste");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_V, ActionEvent.CTRL_MASK));
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V,
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Paste.getIcon());
 		}

@@ -630,27 +608,13 @@ public class ActionFactory {
 			try {
 				List<IDIYComponent<?>> components = (List<IDIYComponent<?>>) clipboard
 						.getData(ComponentTransferable.listFlavor);
-				plugInPort.pasteComponents(cloneComponents(components));
+				plugInPort.pasteComponents(cloner.deepClone(components));
 			} catch (Exception ex) {
 				LOG.error("Coule not paste.", ex);
 			}
 		}
 	}

-	private static List<IDIYComponent<?>> cloneComponents(
-			List<IDIYComponent<?>> components) {
-		List<IDIYComponent<?>> result = new ArrayList<IDIYComponent<?>>(
-				components.size());
-		for (IDIYComponent<?> component : components) {
-			try {
-				result.add(component.clone());
-			} catch (CloneNotSupportedException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		return result;
-	}
-
 	public static class SelectAllAction extends AbstractAction {

 		private static final long serialVersionUID = 1L;
@@ -661,8 +625,8 @@ public class ActionFactory {
 			super();
 			this.plugInPort = plugInPort;
 			putValue(AbstractAction.NAME, "Select All");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_A, ActionEvent.CTRL_MASK));
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A,
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Selection.getIcon());
 		}

@@ -683,8 +647,8 @@ public class ActionFactory {
 			super();
 			this.plugInPort = plugInPort;
 			putValue(AbstractAction.NAME, "Group Selection");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_G, ActionEvent.CTRL_MASK));
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_G,
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Group.getIcon());
 		}

@@ -705,8 +669,8 @@ public class ActionFactory {
 			super();
 			this.plugInPort = plugInPort;
 			putValue(AbstractAction.NAME, "Ungroup Selection");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_U, ActionEvent.CTRL_MASK));
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_U,
+					ActionEvent.CTRL_MASK));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Ungroup.getIcon());
 		}

@@ -727,17 +691,15 @@ public class ActionFactory {
 			super();
 			this.plugInPort = plugInPort;
 			putValue(AbstractAction.NAME, "Edit Project");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentEdit
-					.getIcon());
+			putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentEdit.getIcon());
 		}

 		@Override
 		public void actionPerformed(ActionEvent e) {
 			LOG.info("Edit Project triggered");
-			List<PropertyWrapper> properties = plugInPort
-					.getProjectProperties();
-			PropertyEditorDialog editor = DialogFactory.getInstance()
-					.createPropertyEditorDialog(properties, "Edit Project");
+			List<PropertyWrapper> properties = plugInPort.getProjectProperties();
+			PropertyEditorDialog editor = DialogFactory.getInstance().createPropertyEditorDialog(
+					properties, "Edit Project");
 			editor.setVisible(true);
 			if (ButtonDialog.OK.equals(editor.getSelectedButtonCaption())) {
 				plugInPort.applyPropertiesToProject(properties);
@@ -745,8 +707,8 @@ public class ActionFactory {
 			// Save default values.
 			for (PropertyWrapper property : editor.getDefaultedProperties()) {
 				if (property.getValue() != null) {
-					plugInPort.setProjectDefaultPropertyValue(property
-							.getName(), property.getValue());
+					plugInPort.setProjectDefaultPropertyValue(property.getName(), property
+							.getValue());
 				}
 			}
 		}
@@ -762,17 +724,15 @@ public class ActionFactory {
 			super();
 			this.plugInPort = plugInPort;
 			putValue(AbstractAction.NAME, "Edit Selection");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_E, ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.EditComponent
-					.getIcon());
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_E,
+					ActionEvent.CTRL_MASK));
+			putValue(AbstractAction.SMALL_ICON, IconLoader.EditComponent.getIcon());
 		}

 		@Override
 		public void actionPerformed(ActionEvent e) {
 			LOG.info("Edit Selection triggered");
-			List<PropertyWrapper> properties = plugInPort
-					.getMutualSelectionProperties();
+			List<PropertyWrapper> properties = plugInPort.getMutualSelectionProperties();
 			if (properties == null || properties.isEmpty()) {
 				LOG.info("Nothing to edit");
 				return;
@@ -791,8 +751,7 @@ public class ActionFactory {
 			super();
 			this.plugInPort = plugInPort;
 			putValue(AbstractAction.NAME, "Delete Selection");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(
-					KeyEvent.VK_DELETE, 0));
+			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
 			putValue(AbstractAction.SMALL_ICON, IconLoader.Delete.getIcon());
 		}

@@ -810,8 +769,7 @@ public class ActionFactory {
 		private IPlugInPort plugInPort;
 		private ExpansionMode expansionMode;

-		public ExpandSelectionAction(IPlugInPort plugInPort,
-				ExpansionMode expansionMode) {
+		public ExpandSelectionAction(IPlugInPort plugInPort, ExpansionMode expansionMode) {
 			super();
 			this.plugInPort = plugInPort;
 			this.expansionMode = expansionMode;
@@ -885,15 +843,15 @@ public class ActionFactory {
 		private IPlugInPort plugInPort;
 		private String configKey;

-		public ConfigAction(IPlugInPort plugInPort, String title,
-				String configKey, boolean defaultValue) {
+		public ConfigAction(IPlugInPort plugInPort, String title, String configKey,
+				boolean defaultValue) {
 			super();
 			this.plugInPort = plugInPort;
 			this.configKey = configKey;
 			putValue(AbstractAction.NAME, title);
 			putValue(IView.CHECK_BOX_MENU_ITEM, true);
-			putValue(AbstractAction.SELECTED_KEY, ConfigurationManager
-					.getInstance().readBoolean(configKey, defaultValue));
+			putValue(AbstractAction.SELECTED_KEY, ConfigurationManager.getInstance().readBoolean(
+					configKey, defaultValue));
 		}

 		@Override
@@ -918,8 +876,8 @@ public class ActionFactory {
 			this.theme = theme;
 			putValue(AbstractAction.NAME, theme.getName());
 			putValue(IView.RADIO_BUTTON_GROUP_KEY, "theme");
-			putValue(AbstractAction.SELECTED_KEY, plugInPort.getSelectedTheme()
-					.getName().equals(theme.getName()));
+			putValue(AbstractAction.SELECTED_KEY, plugInPort.getSelectedTheme().getName().equals(
+					theme.getName()));
 		}

 		@Override
@@ -940,8 +898,7 @@ public class ActionFactory {
 			super();
 			this.plugInPort = plugInPort;
 			this.xAxisFirst = xAxisFirst;
-			putValue(AbstractAction.NAME, xAxisFirst ? "X Axis First"
-					: "Y Axis First");
+			putValue(AbstractAction.NAME, xAxisFirst ? "X Axis First" : "Y Axis First");
 		}

 		@Override
@@ -13,13 +13,13 @@ 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.swingframework.AboutDialog;
 import org.diylc.swingframework.IFileChooserAccessory;
 import org.diylc.swingframework.ProgressDialog;
-import org.diylc.utils.BomEntry;

 public class DialogFactory {

@@ -52,7 +52,6 @@ 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.FileFilterEnum;
 import org.diylc.swing.plugins.file.FileMenuPlugin;
 import org.diylc.swing.plugins.help.HelpMenuPlugin;
 import org.diylc.swing.plugins.layers.LayersMenuPlugin;
@@ -338,13 +337,6 @@ public class MainFrame extends JFrame implements ISwingUI {
 		};
 		worker.execute();
 	}
-	
-	@Override
-	public File promptFileSave() {
-		return DialogFactory.getInstance().showSaveDialog(
-				FileFilterEnum.DIY.getFilter(), null,
-				FileFilterEnum.DIY.getExtensions()[0], null);
-	}

 	class FramePlugin implements IPlugIn {

@@ -368,7 +360,7 @@ public class MainFrame extends JFrame implements ISwingUI {
 					fileName = "Untitled";
 				}
 				String modified = (Boolean) params[1] ? " (modified)" : "";
-				setTitle(String.format("DIYLC %s - %s %s", plugInPort
+				setTitle(String.format("DIYLC %s beta - %s %s", plugInPort
 						.getCurrentVersionNumber(), fileName, modified));
 			}
 		}
@@ -79,11 +79,6 @@ public class TemplateDialog extends JDialog {
 				JOptionPane.showMessageDialog(TemplateDialog.this, message, title, messageType);
 			}
 			
-			@Override
-			public File promptFileSave() {
-				return null;
-			}
-			
 			@Override
 			public boolean editProperties(List<PropertyWrapper> properties, Set<PropertyWrapper> defaultedProperties) {
 				return false;
@@ -5,10 +5,8 @@ import java.awt.Color;
 import java.awt.Container;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.KeyListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

@@ -31,7 +29,7 @@ public class MeasureEditor extends Container {
 	@SuppressWarnings("unchecked")
 	public MeasureEditor(final PropertyWrapper property) {
 		setLayout(new BorderLayout());
-		final AbstractMeasure measure = ((AbstractMeasure) property.getValue());
+		AbstractMeasure measure = ((AbstractMeasure) property.getValue());
 		valueField = new DoubleTextField(measure.getValue());
 		oldBg = valueField.getBackground();
 		valueField.addPropertyChangeListener(DoubleTextField.VALUE_PROPERTY,
@@ -40,28 +38,14 @@ public class MeasureEditor extends Container {
 					@Override
 					public void propertyChange(PropertyChangeEvent evt) {
 						try {
-							Constructor ctor = measure.getClass()
-									.getConstructors()[0];
-							AbstractMeasure<?> oldMeasure = (AbstractMeasure<?>) property.getValue();
-							AbstractMeasure<?> newMeasure = (AbstractMeasure<?>) ctor
-									.newInstance((Double) evt.getNewValue(),
-											oldMeasure.getUnit());
+							AbstractMeasure<?> newMeasure = (AbstractMeasure<?>) ((AbstractMeasure) property
+									.getValue()).clone();
+							newMeasure.setValue((Double) evt.getNewValue());
 							property.setValue(newMeasure);
 							property.setChanged(true);
 							valueField.setBackground(oldBg);
 							unitBox.setBackground(oldBg);
-						} catch (IllegalArgumentException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						} catch (InstantiationException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						} catch (IllegalAccessException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						} catch (InvocationTargetException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
+						} catch (CloneNotSupportedException ex) {
 						}
 					}
 				});
@@ -73,30 +57,16 @@ public class MeasureEditor extends Container {
 			unitBox.addActionListener(new ActionListener() {

 				@Override
-				public void actionPerformed(ActionEvent evt) {
+				public void actionPerformed(ActionEvent e) {
 					try {
-						Constructor ctor = measure.getClass().getConstructors()[0];
-						AbstractMeasure<?> oldMeasure = (AbstractMeasure<?>) property.getValue();
-						AbstractMeasure<?> newMeasure = (AbstractMeasure<?>) ctor
-								.newInstance(oldMeasure.getValue(),
-										(Enum<? extends Unit>) unitBox
-												.getSelectedItem());
+						AbstractMeasure<Enum<? extends Unit>> newMeasure = (AbstractMeasure<Enum<? extends Unit>>) ((AbstractMeasure) property
+								.getValue()).clone();
+						newMeasure.setUnit((Enum<? extends Unit>) unitBox.getSelectedItem());
 						property.setValue(newMeasure);
 						property.setChanged(true);
 						valueField.setBackground(oldBg);
 						unitBox.setBackground(oldBg);
-					} catch (IllegalArgumentException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (InstantiationException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (IllegalAccessException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (InvocationTargetException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
+					} catch (CloneNotSupportedException ex) {
 					}
 				}
 			});
@@ -123,20 +93,4 @@ public class MeasureEditor extends Container {
 			e.printStackTrace();
 		}
 	}
-
-	@Override
-	public void requestFocus() {
-		this.valueField.requestFocus();
-	}
-
-	@Override
-	public boolean requestFocusInWindow() {
-		return this.valueField.requestFocusInWindow();
-	}
-
-	@Override
-	public synchronized void addKeyListener(KeyListener l) {
-		this.valueField.addKeyListener(l);
-		this.unitBox.addKeyListener(l);
-	}
 }
@@ -28,8 +28,7 @@ import org.diylc.swingframework.ButtonDialog;

 public class PropertyEditorDialog extends ButtonDialog {

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

 	private static final long serialVersionUID = 1L;

@@ -37,12 +36,9 @@ public class PropertyEditorDialog extends ButtonDialog {

 	private List<PropertyWrapper> properties;
 	private Set<PropertyWrapper> defaultedProperties;
-	private Component componentToFocus = null;

-	public PropertyEditorDialog(JFrame owner, List<PropertyWrapper> properties,
-			String title) {
-		super(owner, title,
-				new String[] { ButtonDialog.OK, ButtonDialog.CANCEL });
+	public PropertyEditorDialog(JFrame owner, List<PropertyWrapper> properties, String title) {
+		super(owner, title, new String[] { ButtonDialog.OK, ButtonDialog.CANCEL });

 		LOG.debug("Creating property editor for: " + properties);

@@ -77,9 +73,8 @@ public class PropertyEditorDialog extends ButtonDialog {
 				try {
 					property.getValidator().validate(property.getValue());
 				} catch (ValidationException ve) {
-					JOptionPane.showMessageDialog(PropertyEditorDialog.this,
-							"Input error for \"" + property.getName() + "\": "
-									+ ve.getMessage(), "Error",
+					JOptionPane.showMessageDialog(PropertyEditorDialog.this, "Input error for \""
+							+ property.getName() + "\": " + ve.getMessage(), "Error",
 							JOptionPane.ERROR_MESSAGE);
 					return false;
 				}
@@ -131,11 +126,6 @@ public class PropertyEditorDialog extends ButtonDialog {
 				editorPanel.add(createDefaultCheckBox(property), gbc);
 			}

-			// Make value field focused
-			if (property.getName().equalsIgnoreCase("value")) {
-				componentToFocus = editor;
-			}
-
 			gbc.gridy++;
 		}

@@ -163,10 +153,8 @@ public class PropertyEditorDialog extends ButtonDialog {
 		return defaultedProperties;
 	}

-	public static boolean showFor(JFrame owner,
-			List<PropertyWrapper> properties, String title) {
-		PropertyEditorDialog editor = new PropertyEditorDialog(owner,
-				properties, title);
+	public static boolean showFor(JFrame owner, List<PropertyWrapper> properties, String title) {
+		PropertyEditorDialog editor = new PropertyEditorDialog(owner, properties, title);
 		editor.setVisible(true);
 		if (OK.equals(editor.getSelectedButtonCaption())) {
 			return true;
@@ -174,15 +162,6 @@ public class PropertyEditorDialog extends ButtonDialog {
 		return false;
 	}

-	@Override
-	public void setVisible(boolean b) {
-		if (b && componentToFocus != null) {
-			componentToFocus.requestFocusInWindow();
-			componentToFocus = null;
-		}
-		super.setVisible(b);
-	}
-
 	@Override
 	protected JComponent getMainComponent() {
 		return createEditorFields();
@@ -17,13 +17,10 @@ public class AutoSavePlugin implements IPlugIn {

 	private static final String AUTO_SAVE_FILE_NAME = "autoSave.diy";

-	protected static final long autoSaveFrequency = 60 * 1000;
-
 	private ExecutorService executor;

 	private IPlugInPort plugInPort;
 	private IView view;
-	private long lastSave = 0;

 	public AutoSavePlugin(IView view) {
 		this.view = view;
@@ -37,23 +34,20 @@ public class AutoSavePlugin implements IPlugIn {

 			@Override
 			public void run() {
-				boolean wasAbnormal = ConfigurationManager.getInstance()
-						.readBoolean(IPlugInPort.ABNORMAL_EXIT_KEY, false);
+				boolean wasAbnormal = ConfigurationManager.getInstance().readBoolean(
+						IPlugInPort.ABNORMAL_EXIT_KEY, false);
 				if (wasAbnormal && new File(AUTO_SAVE_FILE_NAME).exists()) {
 					int decision = view
 							.showConfirmDialog(
 									"It appears that aplication was not closed normally in the previous session. Do you want to open the last auto-saved file?",
-									"Auto-Save", IView.YES_NO_OPTION,
-									IView.QUESTION_MESSAGE);
+									"Auto-Save", IView.YES_NO_OPTION, IView.QUESTION_MESSAGE);
 					if (decision == IView.YES_OPTION) {
-						AutoSavePlugin.this.plugInPort
-								.loadProjectFromFile(AUTO_SAVE_FILE_NAME);
+						AutoSavePlugin.this.plugInPort.loadProjectFromFile(AUTO_SAVE_FILE_NAME);
 					}
 				}
 				// Set abnormal flag to true, GUI side of the app must flip to
 				// false when app closes regularly.
-				ConfigurationManager.getInstance().writeValue(
-						IPlugInPort.ABNORMAL_EXIT_KEY, true);
+				ConfigurationManager.getInstance().writeValue(IPlugInPort.ABNORMAL_EXIT_KEY, true);
 			}
 		});
 	}
@@ -66,18 +60,13 @@ public class AutoSavePlugin implements IPlugIn {
 	@Override
 	public void processMessage(EventType eventType, Object... params) {
 		if (eventType == EventType.PROJECT_MODIFIED) {
-			if (System.currentTimeMillis() - lastSave > autoSaveFrequency) {
-				executor.execute(new Runnable() {
+			executor.execute(new Runnable() {

-					@Override
-					public void run() {
-						Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
-
-						lastSave = System.currentTimeMillis();
-						plugInPort.saveProjectToFile(AUTO_SAVE_FILE_NAME, true);
-					}
-				});
-			}
+				@Override
+				public void run() {
+					plugInPort.saveProjectToFile(AUTO_SAVE_FILE_NAME, true);
+				}
+			});
 		}
 	}
 }
@@ -45,15 +45,13 @@ class CanvasPanel extends JComponent implements Autoscroll {
 	private Image bufferImage;
 	private GraphicsConfiguration screenGraphicsConfiguration;

-	public static boolean USE_HARDWARE_ACCELLERATION = false;
+	private static boolean USE_HARDWARE_ACCELLERATION = false;

-	// static final EnumSet<DrawOption> DRAW_OPTIONS =
-	// EnumSet.of(DrawOption.GRID,
-	// DrawOption.SELECTION, DrawOption.ZOOM, DrawOption.CONTROL_POINTS);
-	// static final EnumSet<DrawOption> DRAW_OPTIONS_ANTI_ALIASING =
-	// EnumSet.of(DrawOption.GRID,
-	// DrawOption.SELECTION, DrawOption.ZOOM, DrawOption.ANTIALIASING,
-	// DrawOption.CONTROL_POINTS);
+//	static final EnumSet<DrawOption> DRAW_OPTIONS = EnumSet.of(DrawOption.GRID,
+//			DrawOption.SELECTION, DrawOption.ZOOM, DrawOption.CONTROL_POINTS);
+//	static final EnumSet<DrawOption> DRAW_OPTIONS_ANTI_ALIASING = EnumSet.of(DrawOption.GRID,
+//			DrawOption.SELECTION, DrawOption.ZOOM, DrawOption.ANTIALIASING,
+//			DrawOption.CONTROL_POINTS);

 	public CanvasPanel(IPlugInPort plugInPort) {
 		super();
@@ -61,8 +59,7 @@ class CanvasPanel extends JComponent implements Autoscroll {
 		setFocusable(true);
 		initializeListeners();
 		initializeDnD();
-		GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment
-				.getLocalGraphicsEnvironment();
+		GraphicsEnvironment graphicsEnvironment = GraphicsEnvironment.getLocalGraphicsEnvironment();
 		GraphicsDevice[] devices = graphicsEnvironment.getScreenDevices();
 		screenGraphicsConfiguration = devices[0].getDefaultConfiguration();

@@ -75,8 +72,7 @@ class CanvasPanel extends JComponent implements Autoscroll {

 	private void initializeDnD() {
 		// Initialize drag source recognizer.
-		DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
-				this,
+		DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(this,
 				DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_LINK,
 				new CanvasGestureListener(plugInPort));
 		// Initialize drop target.
@@ -100,8 +96,8 @@ class CanvasPanel extends JComponent implements Autoscroll {

 	protected void createBufferImage() {
 		if (USE_HARDWARE_ACCELLERATION) {
-			bufferImage = screenGraphicsConfiguration
-					.createCompatibleVolatileImage(getWidth(), getHeight());
+			bufferImage = screenGraphicsConfiguration.createCompatibleVolatileImage(getWidth(),
+					getHeight());
 			((VolatileImage) bufferImage).validate(screenGraphicsConfiguration);
 		} else {
 			bufferImage = createImage(getWidth(), getHeight());
@@ -118,15 +114,12 @@ class CanvasPanel extends JComponent implements Autoscroll {
 		}
 		Graphics2D g2d = (Graphics2D) bufferImage.getGraphics();
 		g2d.setClip(getVisibleRect());
-		Set<DrawOption> drawOptions = EnumSet.of(DrawOption.GRID,
-				DrawOption.SELECTION, DrawOption.ZOOM,
-				DrawOption.CONTROL_POINTS);
-		if (ConfigurationManager.getInstance().readBoolean(
-				IPlugInPort.ANTI_ALIASING_KEY, true)) {
+		Set<DrawOption> drawOptions = EnumSet.of(DrawOption.GRID, DrawOption.SELECTION,
+				DrawOption.ZOOM, DrawOption.CONTROL_POINTS);
+		if (ConfigurationManager.getInstance().readBoolean(IPlugInPort.ANTI_ALIASING_KEY, true)) {
 			drawOptions.add(DrawOption.ANTIALIASING);
 		}
-		if (ConfigurationManager.getInstance().readBoolean(
-				IPlugInPort.OUTLINE_KEY, false)) {
+		if (ConfigurationManager.getInstance().readBoolean(IPlugInPort.OUTLINE_KEY, false)) {
 			drawOptions.add(DrawOption.OUTLINE_MODE);
 		}
 		plugInPort.draw(g2d, drawOptions, null);
@@ -151,7 +144,6 @@ class CanvasPanel extends JComponent implements Autoscroll {
 			g.drawImage(bufferImage, 0, 0, this);
 			// bufferImage.flush();
 		}
-		g2d.dispose();
 	}

 	@Override
@@ -185,8 +177,8 @@ class CanvasPanel extends JComponent implements Autoscroll {
 			@Override
 			public void mouseMoved(MouseEvent e) {
 				setCursor(plugInPort.getCursorAt(e.getPoint()));
-				plugInPort.mouseMoved(e.getPoint(), e.isControlDown(), e
-						.isShiftDown(), e.isAltDown());
+				plugInPort.mouseMoved(e.getPoint(), e.isControlDown(), e.isShiftDown(), e
+						.isAltDown());
 			}
 		});
 		addMouseListener(new MouseAdapter() {
@@ -194,9 +186,8 @@ class CanvasPanel extends JComponent implements Autoscroll {
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				if (e.getButton() == MouseEvent.BUTTON1) {
-					plugInPort.mouseClicked(e.getPoint(), e.getButton(), e
-							.isControlDown(), e.isShiftDown(), e.isAltDown(), e
-							.getClickCount());
+					plugInPort.mouseClicked(e.getPoint(), e.isControlDown(), e.isShiftDown(), e
+							.isAltDown(), e.getClickCount());
 				}
 			}
 		});
@@ -206,14 +197,13 @@ class CanvasPanel extends JComponent implements Autoscroll {

 	@Override
 	public void autoscroll(Point cursorLocn) {
-		scrollRectToVisible(new Rectangle(cursorLocn.x - 15, cursorLocn.y - 15,
-				30, 30));
+		scrollRectToVisible(new Rectangle(cursorLocn.x - 15, cursorLocn.y - 15, 30, 30));
 	}

 	@Override
 	public Insets getAutoscrollInsets() {
 		Rectangle rect = getVisibleRect();
-		return new Insets(rect.y - 15, rect.x - 15, rect.y + rect.height + 15,
-				rect.x + rect.width + 15);
+		return new Insets(rect.y - 15, rect.x - 15, rect.y + rect.height + 15, rect.x + rect.width
+				+ 15);
 	}
 }
@@ -9,8 +9,6 @@ import java.awt.datatransfer.ClipboardOwner;
 import java.awt.datatransfer.Transferable;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
@@ -31,7 +29,6 @@ import org.diylc.common.BadPositionException;
 import org.diylc.common.EventType;
 import org.diylc.common.IPlugIn;
 import org.diylc.common.IPlugInPort;
-import org.diylc.core.CreationMethod;
 import org.diylc.core.ExpansionMode;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.measures.Size;
@@ -95,20 +92,11 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 			canvasPanel = new CanvasPanel(plugInPort);
 			canvasPanel.addMouseListener(new MouseAdapter() {

-				@Override
-				public void mousePressed(MouseEvent e) {
-					canvasPanel.requestFocus();
-				}
-
 				@Override
 				public void mouseReleased(MouseEvent e) {
-					if (plugInPort.getNewComponentTypeSlot() != null && plugInPort.getNewComponentTypeSlot().getCreationMethod() == CreationMethod.SINGLE_CLICK) {
-						plugInPort.mouseClicked(e.getPoint(), e.getButton(),
-								false, false, false, e.getClickCount());
-					} else if (e.isPopupTrigger()) {
+					if (e.isPopupTrigger()) {
 						// Enable actions.
-						boolean enabled = !plugInPort.getSelectedComponents()
-								.isEmpty();
+						boolean enabled = !plugInPort.getSelectedComponents().isEmpty();
 						getCutAction().setEnabled(enabled);
 						getCopyAction().setEnabled(enabled);
 						try {
@@ -133,38 +121,25 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 					}
 				}
 			});
-
-			canvasPanel.addKeyListener(new KeyAdapter() {
-
-				@Override
-				public void keyPressed(KeyEvent e) {
-					if (plugInPort.keyPressed(e.getKeyCode(),
-							e.isControlDown(), e.isShiftDown(), e.isAltDown())) {
-						e.consume();
-					}
-				}
-			});
 		}
 		return canvasPanel;
 	}

 	private RulerScrollPane getScrollPane() {
 		if (scrollPane == null) {
-			scrollPane = new RulerScrollPane(getCanvasPanel(),
-					new ProjectDrawingProvider(plugInPort, true, false),
-					new Size(1d, SizeUnit.cm).convertToPixels(), new Size(1d,
-							SizeUnit.in).convertToPixels());
-			boolean metric = ConfigurationManager.getInstance().readBoolean(
-					Presenter.METRIC_KEY, true);
+			scrollPane = new RulerScrollPane(getCanvasPanel(), new ProjectDrawingProvider(
+					plugInPort, true, false), new Size(1d, SizeUnit.cm).convertToPixels(),
+					new Size(1d, SizeUnit.in).convertToPixels());
+			boolean metric = ConfigurationManager.getInstance().readBoolean(Presenter.METRIC_KEY,
+					true);
 			boolean wheelZoom = ConfigurationManager.getInstance().readBoolean(
 					IPlugInPort.WHEEL_ZOOM_KEY, false);
-			ConfigurationManager.getInstance().addConfigListener(
-					IPlugInPort.WHEEL_ZOOM_KEY, new IConfigListener() {
+			ConfigurationManager.getInstance().addConfigListener(IPlugInPort.WHEEL_ZOOM_KEY,
+					new IConfigListener() {

 						@Override
 						public void valueChanged(String key, Object value) {
-							scrollPane
-									.setWheelScrollingEnabled(!(Boolean) value);
+							scrollPane.setWheelScrollingEnabled(!(Boolean) value);
 						}
 					});
 			scrollPane.setMetric(metric);
@@ -180,14 +155,13 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {

 				@Override
 				public void mouseWheelMoved(MouseWheelEvent e) {
-					boolean wheelZoom = ConfigurationManager.getInstance()
-							.readBoolean(IPlugInPort.WHEEL_ZOOM_KEY, false);
+					boolean wheelZoom = ConfigurationManager.getInstance().readBoolean(
+							IPlugInPort.WHEEL_ZOOM_KEY, false);
 					if (!wheelZoom) {
 						return;
 					}
 					double d = plugInPort.getZoomLevel();
-					Double[] availableZoomLevels = plugInPort
-							.getAvailableZoomLevels();
+					Double[] availableZoomLevels = plugInPort.getAvailableZoomLevels();
 					if (e.getWheelRotation() > 0) {
 						int i = availableZoomLevels.length - 1;
 						while (i > 0 && availableZoomLevels[i] >= d) {
@@ -196,8 +170,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 						plugInPort.setZoomLevel(availableZoomLevels[i]);
 					} else {
 						int i = 0;
-						while (i < availableZoomLevels.length - 1
-								&& availableZoomLevels[i] <= d) {
+						while (i < availableZoomLevels.length - 1 && availableZoomLevels[i] <= d) {
 							i++;
 						}
 						plugInPort.setZoomLevel(availableZoomLevels[i]);
@@ -230,8 +203,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 			popupMenu.add(getBringToFrontAction());
 			popupMenu.add(getExpandMenu());
 			popupMenu.addSeparator();
-			popupMenu.add(ActionFactory.getInstance().createEditProjectAction(
-					plugInPort));
+			popupMenu.add(ActionFactory.getInstance().createEditProjectAction(plugInPort));
 		}
 		return popupMenu;
 	}
@@ -247,7 +219,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 	public JMenu getExpandMenu() {
 		if (expandMenu == null) {
 			expandMenu = new JMenu("Expand Selection");
-			expandMenu.setIcon(IconLoader.BranchAdd.getIcon());
+			expandMenu.setIcon(IconLoader.BranchAdd.getIcon());		
 			expandMenu.add(getExpandSelectionAllAction());
 			expandMenu.add(getExpandSelectionImmediateAction());
 			expandMenu.add(getExpandSelectionSameTypeAction());
@@ -257,8 +229,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {

 	private void updateSelectionMenu(int x, int y) {
 		getSelectionMenu().removeAll();
-		for (IDIYComponent<?> component : plugInPort
-				.findComponentsAt(new Point(x, y))) {
+		for (IDIYComponent<?> component : plugInPort.findComponentsAt(new Point(x, y))) {
 			JMenuItem item = new JMenuItem(component.getName());
 			final IDIYComponent<?> finalComponent = component;
 			item.addActionListener(new ActionListener() {
@@ -277,80 +248,72 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {

 	public ActionFactory.CutAction getCutAction() {
 		if (cutAction == null) {
-			cutAction = ActionFactory.getInstance().createCutAction(plugInPort,
-					clipboard, this);
+			cutAction = ActionFactory.getInstance().createCutAction(plugInPort, clipboard, this);
 		}
 		return cutAction;
 	}

 	public ActionFactory.CopyAction getCopyAction() {
 		if (copyAction == null) {
-			copyAction = ActionFactory.getInstance().createCopyAction(
-					plugInPort, clipboard, this);
+			copyAction = ActionFactory.getInstance().createCopyAction(plugInPort, clipboard, this);
 		}
 		return copyAction;
 	}

 	public ActionFactory.PasteAction getPasteAction() {
 		if (pasteAction == null) {
-			pasteAction = ActionFactory.getInstance().createPasteAction(
-					plugInPort, clipboard);
+			pasteAction = ActionFactory.getInstance().createPasteAction(plugInPort, clipboard);
 		}
 		return pasteAction;
 	}

 	public ActionFactory.EditSelectionAction getEditSelectionAction() {
 		if (editSelectionAction == null) {
-			editSelectionAction = ActionFactory.getInstance()
-					.createEditSelectionAction(plugInPort);
+			editSelectionAction = ActionFactory.getInstance().createEditSelectionAction(plugInPort);
 		}
 		return editSelectionAction;
 	}

 	public ActionFactory.DeleteSelectionAction getDeleteSelectionAction() {
 		if (deleteSelectionAction == null) {
-			deleteSelectionAction = ActionFactory.getInstance()
-					.createDeleteSelectionAction(plugInPort);
+			deleteSelectionAction = ActionFactory.getInstance().createDeleteSelectionAction(
+					plugInPort);
 		}
 		return deleteSelectionAction;
 	}

 	public ActionFactory.GroupAction getGroupAction() {
 		if (groupAction == null) {
-			groupAction = ActionFactory.getInstance().createGroupAction(
-					plugInPort);
+			groupAction = ActionFactory.getInstance().createGroupAction(plugInPort);
 		}
 		return groupAction;
 	}

 	public ActionFactory.UngroupAction getUngroupAction() {
 		if (ungroupAction == null) {
-			ungroupAction = ActionFactory.getInstance().createUngroupAction(
-					plugInPort);
+			ungroupAction = ActionFactory.getInstance().createUngroupAction(plugInPort);
 		}
 		return ungroupAction;
 	}

 	public ActionFactory.SendToBackAction getSendToBackAction() {
 		if (sendToBackAction == null) {
-			sendToBackAction = ActionFactory.getInstance()
-					.createSendToBackAction(plugInPort);
+			sendToBackAction = ActionFactory.getInstance().createSendToBackAction(plugInPort);
 		}
 		return sendToBackAction;
 	}

 	public ActionFactory.BringToFrontAction getBringToFrontAction() {
 		if (bringToFrontAction == null) {
-			bringToFrontAction = ActionFactory.getInstance()
-					.createBringToFrontAction(plugInPort);
+			bringToFrontAction = ActionFactory.getInstance().createBringToFrontAction(plugInPort);
 		}
 		return bringToFrontAction;
 	}

 	public ActionFactory.ExpandSelectionAction getExpandSelectionAllAction() {
 		if (expandSelectionAllAction == null) {
-			expandSelectionAllAction = ActionFactory.getInstance()
-					.createExpandSelectionAction(plugInPort, ExpansionMode.ALL);
+			expandSelectionAllAction = ActionFactory.getInstance().createExpandSelectionAction(
+					plugInPort, ExpansionMode.ALL);
 		}
 		return expandSelectionAllAction;
 	}
@@ -358,8 +321,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 	public ActionFactory.ExpandSelectionAction getExpandSelectionImmediateAction() {
 		if (expandSelectionImmediateAction == null) {
 			expandSelectionImmediateAction = ActionFactory.getInstance()
-					.createExpandSelectionAction(plugInPort,
-							ExpansionMode.IMMEDIATE);
+					.createExpandSelectionAction(plugInPort, ExpansionMode.IMMEDIATE);
 		}
 		return expandSelectionImmediateAction;
 	}
@@ -367,16 +329,14 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 	public ActionFactory.ExpandSelectionAction getExpandSelectionSameTypeAction() {
 		if (expandSelectionSameTypeAction == null) {
 			expandSelectionSameTypeAction = ActionFactory.getInstance()
-					.createExpandSelectionAction(plugInPort,
-							ExpansionMode.SAME_TYPE);
+					.createExpandSelectionAction(plugInPort, ExpansionMode.SAME_TYPE);
 		}
 		return expandSelectionSameTypeAction;
 	}

 	@Override
 	public EnumSet<EventType> getSubscribedEventTypes() {
-		return EnumSet.of(EventType.PROJECT_LOADED, EventType.ZOOM_CHANGED,
-				EventType.REPAINT);
+		return EnumSet.of(EventType.PROJECT_LOADED, EventType.ZOOM_CHANGED, EventType.REPAINT);
 	}

 	@Override
@@ -392,8 +352,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 			if ((Boolean) params[1]) {
 				// Scroll to the center.
 				Rectangle visibleRect = canvasPanel.getVisibleRect();
-				visibleRect.setLocation(
-						(canvasPanel.getWidth() - visibleRect.width) / 2,
+				visibleRect.setLocation((canvasPanel.getWidth() - visibleRect.width) / 2,
 						(canvasPanel.getHeight() - visibleRect.height) / 2);
 				canvasPanel.scrollRectToVisible(visibleRect);
 				canvasPanel.revalidate();
@@ -406,8 +365,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 			// one.
 			double zoomFactor = (Double) params[0] / zoomLevel;
 			visibleRect.setBounds((int) (visibleRect.x * zoomFactor),
-					(int) (visibleRect.y * zoomFactor), visibleRect.width,
-					visibleRect.height);
+					(int) (visibleRect.y * zoomFactor), visibleRect.width, visibleRect.height);
 			canvasPanel.scrollRectToVisible(visibleRect);
 			canvasPanel.revalidate();

@@ -433,9 +391,8 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 	 * to the canvasPanel.
 	 */
 	public void refresh() {
-		MouseEvent event = new MouseEvent(canvasPanel, MouseEvent.MOUSE_MOVED,
-				System.currentTimeMillis(), 0, 1, 1,// canvasPanel.getWidth() /
-				// 2,
+		MouseEvent event = new MouseEvent(canvasPanel, MouseEvent.MOUSE_MOVED, System
+				.currentTimeMillis(), 0, 1, 1,// canvasPanel.getWidth() / 2,
 				// canvasPanel.getHeight() / 2,
 				0, false);
 		canvasPanel.dispatchEvent(event);
@@ -19,7 +19,6 @@ import org.diylc.images.IconLoader;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swingframework.export.TableExporter;
 import org.diylc.swingframework.objecttable.ObjectListTable;
-import org.diylc.utils.BomEntry;

 public class BomDialog extends JDialog {

@@ -0,0 +1,89 @@
+package org.diylc.swing.plugins.file;
+
+public class BomEntry {
+
+	private String name;
+	private String value;
+	private Integer quantity;
+	private String notes;
+
+	public BomEntry(String name, String value, int quantity) {
+		super();
+		this.name = name;
+		this.value = value;
+		this.quantity = quantity;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public Integer getQuantity() {
+		return quantity;
+	}
+
+	public void setQuantity(Integer quantity) {
+		this.quantity = quantity;
+	}
+
+	public String getNotes() {
+		return notes;
+	}
+
+	public void setNotes(String notes) {
+		this.notes = notes;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		result = prime * result + ((notes == null) ? 0 : notes.hashCode());
+		result = prime * result + quantity;
+		result = prime * result + ((value == null) ? 0 : value.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		BomEntry other = (BomEntry) obj;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		if (notes == null) {
+			if (other.notes != null)
+				return false;
+		} else if (!notes.equals(other.notes))
+			return false;
+		if (quantity != other.quantity)
+			return false;
+		if (value == null) {
+			if (other.value != null)
+				return false;
+		} else if (!value.equals(other.value))
+			return false;
+		return true;
+	}
+
+}
@@ -0,0 +1,55 @@
+package org.diylc.swing.plugins.file;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.diylc.core.IDIYComponent;
+
+public class BomMaker {
+
+	private static BomMaker instance;
+
+	public static BomMaker getInstance() {
+		if (instance == null) {
+			instance = new BomMaker();
+		}
+		return instance;
+	}
+
+	private BomMaker() {
+	}
+
+	public List<BomEntry> createBom(List<IDIYComponent<?>> components) {
+		Map<String, BomEntry> entryMap = new HashMap<String, BomEntry>();
+		for (IDIYComponent<?> component : components) {
+			String name = component.getName();
+			String value = component.getValue() == null ? null : component.getValue().toString();
+			if ((name != null) && (value != null)) {
+				String key = name + "|" + value;
+				if (entryMap.containsKey(key)) {
+					BomEntry entry = entryMap.get(key);
+					entry.setQuantity(entry.getQuantity() + 1);
+				} else {
+					entryMap.put(key, new BomEntry(name, value, 1));
+				}
+			}
+		}
+		List<BomEntry> bom = new ArrayList<BomEntry>(entryMap.values());
+		Collections.sort(bom, new Comparator<BomEntry>() {
+
+			@Override
+			public int compare(BomEntry o1, BomEntry o2) {
+				int compare = o1.getName().compareToIgnoreCase(o2.getName());
+				if (compare != 0) {
+					return compare;
+				}
+				return o1.getValue().compareToIgnoreCase(o2.getValue());
+			}
+		});
+		return bom;
+	}
+}
@@ -61,11 +61,6 @@ public class ProjectPreview extends JPanel implements PropertyChangeListener, IF
 			@Override
 			public void showMessage(String message, String title, int messageType) {
 			}
-			
-			@Override
-			public File promptFileSave() {
-				return null;
-			}

 			@Override
 			public boolean editProperties(List<PropertyWrapper> properties, Set<PropertyWrapper> defaultedProperties) {
@@ -7,7 +7,6 @@ import javax.swing.AbstractAction;
 import javax.swing.Icon;

 import org.apache.log4j.Logger;
-import org.diylc.appframework.miscutils.Utils;
 import org.diylc.common.EventType;
 import org.diylc.common.IPlugIn;
 import org.diylc.common.IPlugInPort;
@@ -16,6 +15,7 @@ import org.diylc.swing.ISwingUI;
 import org.diylc.swing.gui.DialogFactory;
 import org.diylc.swingframework.AboutDialog;
 import org.diylc.swingframework.LinkLabel;
+import org.diylc.swingframework.miscutils.Utils;

 /**
 * Entry point class for help-related utilities.
@@ -263,8 +263,8 @@ public class StatusBar extends JPanel implements IPlugIn {
 				StringBuilder builder = new StringBuilder();
 				builder.append(Utils.toCommaString(selectedComponentNames.subList(0, Math.min(20,
 						selectedComponentNames.size()))));
-				if (selectedComponentNames.size() > 15) {
-					builder.append(" and " + (selectedComponentNames.size() - 15) + " more");
+				if (selectedComponentNames.size() > 20) {
+					builder.append(" and " + (selectedComponentNames.size() - 20) + " more");
 				}
 				if (!stuckComponentNames.isEmpty()) {
 					builder.append(" (hold <b>Ctrl</b> and drag to unstuck from ");
@@ -46,8 +46,8 @@ class ComponentButton extends JButton {
 		addMouseListener(new MouseAdapter() {
 			
 			@Override
-			public void mousePressed(MouseEvent e) {
-				if (e.getButton() == MouseEvent.BUTTON1) {
+			public void mouseClicked(MouseEvent e) {
+				if (e.getClickCount() == 1) {
 					plugInPort.setNewComponentTypeSlot(componentType);	
 				} else {
 					List<IDIYComponent<?>> components = plugInPort.getCurrentProject().getComponents();
@@ -60,7 +60,7 @@ class ComponentButton extends JButton {
 					plugInPort.updateSelection(newSelection);
 					plugInPort.setNewComponentTypeSlot(null);
 					plugInPort.refresh();
-				}				
+				}
 			}
 		});
 //		addActionListener(new ActionListener() {
@@ -39,8 +39,6 @@ class ComponentTabbedPane extends JTabbedPane {
 	public static int SCROLL_STEP = Presenter.ICON_SIZE + ComponentButton.MARGIN * 2 + 2;

 	private final IPlugInPort plugInPort;
-	private Container recentToolbar;
-	private List<String> pendingRecentComponents = null;

 	public ComponentTabbedPane(IPlugInPort plugInPort) {
 		super();
@@ -58,12 +56,6 @@ class ComponentTabbedPane extends JTabbedPane {
 			@Override
 			public void stateChanged(ChangeEvent e) {
 				ComponentTabbedPane.this.plugInPort.setNewComponentTypeSlot(null);
-				// Refresh recent components if needed
-				if (pendingRecentComponents != null) {					
-					refreshRecentComponentsToolbar(getRecentToolbar(), pendingRecentComponents);
-					getRecentToolbar().invalidate();
-					pendingRecentComponents = null;
-				}
 			}
 		});
 	}
@@ -120,14 +112,6 @@ class ComponentTabbedPane extends JTabbedPane {
 	// scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
 	// return scrollPane;
 	// }
-	
-	public Container getRecentToolbar() {
-		if (recentToolbar == null) {
-			recentToolbar = new Container();
-			recentToolbar.setLayout(new BoxLayout(recentToolbar, BoxLayout.X_AXIS));
-		}
-		return recentToolbar;
-	}

 	private Component createComponentPanel(List<ComponentType> componentTypes) {
 		Container toolbar = new Container();
@@ -146,7 +130,8 @@ class ComponentTabbedPane extends JTabbedPane {
 		JPanel panel = new JPanel(new BorderLayout());
 		panel.setOpaque(false);

-		final Container toolbar = getRecentToolbar();		
+		final Container toolbar = new Container();
+		toolbar.setLayout(new BoxLayout(toolbar, BoxLayout.X_AXIS));
 		refreshRecentComponentsToolbar(toolbar, (List<String>) ConfigurationManager.getInstance()
 				.readObject(IPlugInPort.RECENT_COMPONENTS_KEY, new ArrayList<String>()));
 		ConfigurationManager.getInstance().addConfigListener(IPlugInPort.RECENT_COMPONENTS_KEY,
@@ -154,8 +139,8 @@ class ComponentTabbedPane extends JTabbedPane {

 					@Override
 					public void valueChanged(String key, Object value) {
-						// Cache the new list, we'll refresh when there's a chance
-						pendingRecentComponents = (List<String>) value;
+						refreshRecentComponentsToolbar(toolbar, (List<String>) value);
+						toolbar.invalidate();
 					}
 				});

@@ -573,149 +573,5 @@
 			</changes>
 			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
 		</org.diylc.appframework.update.Version>
-		<org.diylc.appframework.update.Version>
-			<versionNumber>
-				<major>3</major>
-				<minor>7</minor>
-				<build>0</build>
-			</versionNumber>
-			<releaseDate>2012-03-27 20:00:00.000 CET</releaseDate>
-			<name></name>
-			<changes>		
-				<org.diylc.appframework.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Lever guitar switch</description>
-				</org.diylc.appframework.update.Change>	
-				<org.diylc.appframework.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>9V battery snap</description>
-				</org.diylc.appframework.update.Change>		
-			</changes>
-			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
-		</org.diylc.appframework.update.Version>
-		<org.diylc.appframework.update.Version>
-			<versionNumber>
-				<major>3</major>
-				<minor>8</minor>
-				<build>0</build>
-			</versionNumber>
-			<releaseDate>2012-08-16 20:00:00.000 CET</releaseDate>
-			<name></name>
-			<changes>
-				<org.diylc.appframework.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Right click rotates component while laying out on the canvas</description>
-				</org.diylc.appframework.update.Change>		
-				<org.diylc.appframework.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added DIY file association for Windows (run associations.bat)</description>
-				</org.diylc.appframework.update.Change>	
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>More usable "Bring to Forward" and "Send to Backward"</description>
-				</org.diylc.appframework.update.Change>
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Faster copy-paste functionality</description>
-				</org.diylc.appframework.update.Change>			
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Improved auto-save not to slow down the app</description>
-				</org.diylc.appframework.update.Change>		
-			</changes>
-			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
-		</org.diylc.appframework.update.Version>
-		<org.diylc.appframework.update.Version>
-			<versionNumber>
-				<major>3</major>
-				<minor>9</minor>
-				<build>0</build>
-			</versionNumber>
-			<releaseDate>2012-08-20 20:00:00.000 CET</releaseDate>
-			<name></name>
-			<changes>	
-				<org.diylc.appframework.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Move selected components with arrow keys (and ctrl/shift)</description>					
-				</org.diylc.appframework.update.Change>	
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Right-click in the toolbar to select all components of the same type</description>					
-				</org.diylc.appframework.update.Change>	
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Click on a component in the toolbar sometimes doesn't register</description>
-				</org.diylc.appframework.update.Change>		
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Remove junk from BOM (eyelets, wires, traces)</description>
-				</org.diylc.appframework.update.Change>	
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Improved "Recently Used" toolbox, doesn't jump as you click</description>
-				</org.diylc.appframework.update.Change>	
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Control number of "Recently Used" items from config.properties</description>
-				</org.diylc.appframework.update.Change>	
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Faster component placement, auto-focus on "Value" box</description>
-				</org.diylc.appframework.update.Change>	
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Transistors can show name or value</description>
-				</org.diylc.appframework.update.Change>	
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>UNICODE font export to PDF files</description>
-				</org.diylc.appframework.update.Change>	
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>More intuitive unsaved file warning message</description>
-				</org.diylc.appframework.update.Change>	
-			</changes>
-			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
-		</org.diylc.appframework.update.Version>
-		<org.diylc.appframework.update.Version>
-			<versionNumber>
-				<major>3</major>
-				<minor>10</minor>
-				<build>0</build>
-			</versionNumber>
-			<releaseDate>2012-08-20 20:00:00.000 CET</releaseDate>
-			<name></name>
-			<changes>				
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Improved overall performance</description>
-				</org.diylc.appframework.update.Change>
-				<org.diylc.appframework.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Should be more stable under OSX and not crash unexpectedly</description>
-				</org.diylc.appframework.update.Change>		
-			</changes>
-			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
-		</org.diylc.appframework.update.Version>
-		<org.diylc.appframework.update.Version>
-			<versionNumber>
-				<major>3</major>
-				<minor>11</minor>
-				<build>0</build>
-			</versionNumber>
-			<releaseDate>2012-08-20 21:00:00.000 CET</releaseDate>
-			<name></name>
-			<changes>				
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Some components (like Image) can be placed in any layer using Send to Back/Bring to Front</description>
-				</org.diylc.appframework.update.Change>		
-				<org.diylc.appframework.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Replaced deep cloning library with manual implementation</description>
-				</org.diylc.appframework.update.Change>			
-			</changes>
-			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
-		</org.diylc.appframework.update.Version>
 	</a>
 </java.util.Arrays_-ArrayList>
				`@@ -1 +0,0 @@`
				`-Xms512m -Xmx1024m -Dorg.diylc.scriptRun=true`
				`@@ -1 +0,0 @@`
				`java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -cp diylc.jar:lib org.diylc.DIYLCStarter`