improved auto-create for pads

DIYLC/config.xml

@@ -1,23 +0,0 @@
-<map>
-  <entry>
-    <string>metric</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>zoom</string>
-    <double>1.0</double>
-  </entry>
-  <entry>
-    <string>lastPath</string>
-    <string>C:\Documents and Settings\Branislav Stojkovic\Desktop</string>
-  </entry>
-  <entry>
-    <string>default.org.diylc.components.misc.Label:Color</string>
-    <awt-color>
-      <red>255</red>
-      <green>0</green>
-      <blue>0</blue>
-      <alpha>255</alpha>
-    </awt-color>
-  </entry>
-</map>

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

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

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

@@ -1,259 +0,0 @@
-package org.diylc.components;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.geom.Rectangle2D;
-
-import org.diylc.common.Display;
-import org.diylc.common.ObjectCache;
-import org.diylc.core.ComponentState;
-import org.diylc.core.IDrawingObserver;
-import org.diylc.core.Project;
-import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-
-/**
- * Base class for all leaded components such as resistors or capacitors. Has two
- * control points and draws leads between them. Also, it positions and draws the
- * shape of the component as specified by a child class.
- * 
- * @author Branislav Stojkovic
- */
-public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComponent<T> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Color LEAD_COLOR = Color.decode("#236B8E");
-	public static Size LEAD_THICKNESS = new Size(0.6d, SizeUnit.mm);
-	public static Size DEFAULT_SIZE = new Size(1d, SizeUnit.in);
-
-	protected Size width;
-	protected Size height;
-	protected Point[] points = new Point[] {
-			new Point((int) (-DEFAULT_SIZE.convertToPixels() / 2), 0),
-			new Point(DEFAULT_SIZE.convertToPixels() / 2, 0) };
-	protected Color bodyColor = getDefaultBodyColor();
-	protected Color borderColor = getDefaultBorderColor();
-	protected Color labelColor = LABEL_COLOR;
-	protected Display display = Display.NAME;
-
-	protected AbstractLeadedComponent() {
-		super();
-		try {
-			this.width = getDefaultWidth().clone();
-			this.height = getDefaultHeight().clone();
-		} catch (CloneNotSupportedException e) {
-			// This should never happen because Size supports cloning.
-		} catch (NullPointerException e) {
-			// This will happen if components do not have any shape.
-		}
-	}
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
-			IDrawingObserver drawingObserver) {
-		double distance = points[0].distance(points[1]);
-		Shape shape = getBodyShape();
-		if (shape == null) {
-			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(
-					getLeadThickness().convertToPixels()));
-			g2d.setColor(shouldShadeLeads() ? getLeadColor(componentState).darker()
-					: getLeadColor(componentState));
-			g2d.drawLine(points[0].x, points[0].y, points[1].x, points[1].y);
-			if (shouldShadeLeads()) {
-				g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(
-						getLeadThickness().convertToPixels() - 2));
-				g2d.setColor(getLeadColor(componentState));
-				g2d.drawLine(points[0].x, points[0].y, points[1].x, points[1].y);
-			}
-			return;
-		}
-		Rectangle shapeRect = shape.getBounds();
-		double leadLenght = (distance - shapeRect.width) / 2;
-		Double theta = Math.atan2(points[1].y - points[0].y, points[1].x - points[0].x);
-		// Transform graphics to draw the body in the right place and at the
-		// right angle.
-		g2d.translate((points[0].x + points[1].x - shapeRect.width) / 2,
-				(points[0].y + points[1].y - shapeRect.height) / 2);
-		g2d.rotate(theta, shapeRect.width / 2, shapeRect.height / 2);
-		// Draw body.
-		Composite oldComposite = g2d.getComposite();
-		if (alpha < MAX_ALPHA) {
-			g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
-					/ MAX_ALPHA));
-		}
-		g2d.setColor(bodyColor);
-		g2d.fill(shape);
-		decorateComponentBody(g2d);
-		g2d.setComposite(oldComposite);
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-		g2d.setColor(componentState == ComponentState.SELECTED
-				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : borderColor);
-		g2d.draw(shape);
-		// Draw leads.
-		int leadThickness = getClosestOdd(getLeadThickness().convertToPixels());
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
-		g2d.setColor(shouldShadeLeads() ? getLeadColor(componentState).darker()
-				: getLeadColor(componentState));
-		g2d.drawLine((int) (shapeRect.width - distance) / 2, (int) shapeRect.height / 2,
-				(int) ((shapeRect.width - distance) / 2 + leadLenght) - leadThickness / 2,
-				(int) shapeRect.height / 2);
-		g2d.drawLine((int) (shapeRect.width + distance) / 2, (int) shapeRect.height / 2,
-				(int) ((shapeRect.width + distance) / 2 - leadLenght) + leadThickness / 2,
-				(int) shapeRect.height / 2);
-		if (shouldShadeLeads()) {
-			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
-			g2d.setColor(getLeadColor(componentState));
-			g2d.drawLine((int) (shapeRect.width - distance) / 2, (int) shapeRect.height / 2,
-					(int) ((shapeRect.width - distance) / 2 + leadLenght) - leadThickness / 2,
-					(int) shapeRect.height / 2);
-			g2d.drawLine((int) (shapeRect.width + distance) / 2, (int) shapeRect.height / 2,
-					(int) ((shapeRect.width + distance) / 2 - leadLenght) + leadThickness / 2,
-					(int) shapeRect.height / 2);
-		}
-		// Do not track the label because that area was already covered.
-		drawingObserver.stopTracking();
-		// Draw label.
-		g2d.setFont(LABEL_FONT);
-		g2d.setColor(componentState == ComponentState.SELECTED ? LABEL_COLOR_SELECTED : labelColor);
-		FontMetrics fontMetrics = g2d.getFontMetrics();
-		String label = display == Display.NAME ? getName() : getValue().toString();
-		// Adjust label angle if needed to make sure that it's readable.
-		if ((theta >= Math.PI / 2 && theta <= Math.PI)
-				|| (theta < -Math.PI / 2 && theta > -Math.PI)) {
-			g2d.rotate(Math.PI, shapeRect.width / 2, shapeRect.height / 2);
-		}
-		Rectangle2D textRect = fontMetrics.getStringBounds(label, g2d);
-		g2d.drawString(label, (int) (shapeRect.width - textRect.getWidth()) / 2,
-				(int) (shapeRect.height - textRect.getHeight()) / 2 + fontMetrics.getAscent());
-	}
-
-	protected void decorateComponentBody(Graphics2D g2d) {
-		// Do nothing.
-	}
-
-	protected boolean shouldShadeLeads() {
-		return true;
-	}
-
-	/**
-	 * @return default component width.
-	 */
-	protected abstract Size getDefaultWidth();
-
-	/**
-	 * Returns default component height.
-	 * 
-	 * @return
-	 */
-	protected abstract Size getDefaultHeight();
-
-	/**
-	 * @return shape that represents component body. Shape should not be
-	 *         transformed and should be referenced to (0, 0).
-	 */
-	protected abstract Shape getBodyShape();
-
-	/**
-	 * @return default component body color.
-	 */
-	protected abstract Color getDefaultBodyColor();
-
-	/**
-	 * @return default component border color.
-	 */
-	protected abstract Color getDefaultBorderColor();
-
-	/**
-	 * @return default lead thickness. Override this method to change it.
-	 */
-	protected Size getLeadThickness() {
-		return LEAD_THICKNESS;
-	}
-
-	/**
-	 * @return default lead color. Override this method to change it.
-	 */
-	protected Color getLeadColor(ComponentState componentState) {
-		return componentState == ComponentState.SELECTED
-				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : LEAD_COLOR;
-	}
-
-	@Override
-	public int getControlPointCount() {
-		return points.length;
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return (Point) points[index];
-	}
-
-	@Override
-	public boolean isControlPointSticky(int index) {
-		return true;
-	}
-
-	@Override
-	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
-		return VisibilityPolicy.ALWAYS;
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		points[index].setLocation(point);
-	}
-
-	@EditableProperty(name = "Color")
-	public Color getBodyColor() {
-		return bodyColor;
-	}
-
-	public void setBodyColor(Color bodyColor) {
-		this.bodyColor = bodyColor;
-	}
-
-	@EditableProperty(name = "Border")
-	public Color getBorderColor() {
-		return borderColor;
-	}
-
-	public void setBorderColor(Color borderColor) {
-		this.borderColor = borderColor;
-	}
-
-	@EditableProperty(defaultable = true)
-	public Size getWidth() {
-		return width;
-	}
-
-	public void setWidth(Size width) {
-		this.width = width;
-	}
-
-	@EditableProperty(defaultable = true)
-	public Size getHeight() {
-		return height;
-	}
-
-	public void setHeight(Size height) {
-		this.height = height;
-	}
-
-	@EditableProperty
-	public Display getDisplay() {
-		return display;
-	}
-
-	public void setDisplay(Display display) {
-		this.display = display;
-	}
-}

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

@@ -1,36 +0,0 @@
-package org.diylc.components;
-
-import java.awt.Point;
-
-public abstract class AbstractSinglePointComponent extends AbstractComponent<Void> {
-
-	private static final long serialVersionUID = 1L;
-
-	protected Point point = new Point(0, 0);
-
-	@Override
-	public int getControlPointCount() {
-		return 1;
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return point;
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		this.point.setLocation(point);
-	}
-	
-	@Deprecated
-	@Override
-	public Void getValue() {
-		return null;
-	}
-	
-	@Deprecated
-	@Override
-	public void setValue(Void value) {
-	}
-}

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

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

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

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

DIYLC/src/org/diylc/utils/dnd/AbstractComponentDecorator.java

@@ -1,657 +0,0 @@
-package org.diylc.utils.dnd;
-
-/* Copyright (c) 2003-2006 Timothy Wall, All Rights Reserved */
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Cursor;
-import java.awt.Graphics;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Window;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.HierarchyEvent;
-import java.awt.event.HierarchyListener;
-import java.awt.event.MouseEvent;
-import java.awt.geom.Area;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.JComponent;
-import javax.swing.JLayeredPane;
-import javax.swing.RootPaneContainer;
-import javax.swing.SwingUtilities;
-
-/**
- * Provide a method for consistently augmenting the appearance of a given
- * component by painting something on it <i>after</i> the component itself gets
- * painted. If not explicitly removed via {@link #dispose}, an instance of this
- * object will live as long as its target component.
- * <p>
- * By default, the decorator matches the location and size of the decorated
- * component, but the bounds can be adjusted by overriding
- * {@link #getDecorationBounds()}. The {@link #synch()} method should be called
- * whenever the bounds returned by {@link #getDecorationBounds()} would change.
- * <p>
- * The decoration is clipped to the bounds set on the decoration, which does not
- * necessarily need to be the same as the decorated component bounds. The
- * decoration may extend beyond the decorated component bounds, or it may be
- * reduced to a smaller region.
- */
-// TODO: should probably do some locking on Component.getTreeLock()
-// TODO: synch underlying cursor when decorator covers more than
-// one component; the cursor should change if the decoration exceeds the
-// component's bounds
-public abstract class AbstractComponentDecorator {
-	public static final Rectangle DEFAULT_BOUNDS = null;
-	public static final int TOP = 0;
-	// Disabled for now, since it doesn't work properly
-	private static final int BOTTOM = -1;
-	/**
-	 * Account for the difference between the decorator actual origin and the
-	 * logical origin we want to pass to the {@link #paint} method.
-	 */
-	private Point originOffset = new Point(0, 0);
-
-	private Painter painter;
-	private JComponent component;
-	private Container parent;
-	private Listener listener;
-	private int layerOffset;
-	private int position;
-	private Rectangle bounds;
-
-	/** Create a decorator for the given component. */
-	public AbstractComponentDecorator(JComponent c) {
-		this(c, 1);
-	}
-
-	/**
-	 * Create a decorator for the given component, indicating the layer offset
-	 * from the target component. Negative values mean the decoration is painted
-	 * <em>before</em> the target component is painted.
-	 */
-	public AbstractComponentDecorator(JComponent c, int layerOffset) {
-		this(c, layerOffset, TOP);
-	}
-
-	/**
-	 * Create a decorator with the given position within its layer. Use
-	 * {@link #TOP} to cover other decorations, or {@link #BOTTOM} to be covered
-	 * by other decorations.
-	 * <p>
-	 * WARNING: BOTTOM doesn't currently work, probably a JLayeredPane bug in
-	 * either the code or documentation.
-	 * 
-	 * @see JLayeredPane
-	 */
-	public AbstractComponentDecorator(JComponent c, int layerOffset, int position) {
-		component = c;
-		this.layerOffset = layerOffset;
-		this.position = position;
-		this.bounds = DEFAULT_BOUNDS;
-		parent = c.getParent();
-		painter = new Painter();
-		listener = new Listener();
-		component.addHierarchyListener(listener);
-		component.addComponentListener(listener);
-		component.addPropertyChangeListener(listener);
-		attach();
-	}
-
-	/**
-	 * Set the text to be displayed when the mouse is over the decoration.
-	 * 
-	 * @see JComponent#setToolTipText(String)
-	 */
-	public void setToolTipText(String text) {
-		painter.setToolTipText(text);
-	}
-
-	/**
-	 * Return the currently set default tooltip text.
-	 * 
-	 * @see JComponent#setToolTipText
-	 */
-	public String getToolTipText() {
-		return painter.getToolTipText();
-	}
-
-	/**
-	 * Provide for different tool tips depending on the actual location over the
-	 * decoration. Note that if you <em>only</em> override this method, you must
-	 * also invoke {@link #setToolTipText(String)} with a non-<span
-	 * class="javakeyword">null</span> argument.
-	 * 
-	 * @see JComponent#getToolTipText(MouseEvent)
-	 */
-	public String getToolTipText(MouseEvent e) {
-		return getToolTipText();
-	}
-
-	/**
-	 * Indicate whether any of the decoration is visible. The decoration may be
-	 * clipped by ancestor scroll panes or by being moved outside if the visible
-	 * region of its parent window.
-	 */
-	public boolean isVisible() {
-		return painter.isVisible();
-	}
-
-	/** Use this to change the visibility of the decoration. */
-	public void setVisible(boolean visible) {
-		painter.setVisible(visible);
-	}
-
-	protected void attach() {
-		Window w = SwingUtilities.getWindowAncestor(component);
-		if (w instanceof RootPaneContainer) {
-			JLayeredPane lp = ((RootPaneContainer) w).getLayeredPane();
-			Component layeredChild = component;
-			int layer = JLayeredPane.DRAG_LAYER.intValue();
-			if (this instanceof BackgroundPainter) {
-				layer = ((BackgroundPainter) this).layer;
-				painter.setDecoratedLayer(layer);
-			} else if (layeredChild == lp) {
-				// Is this the best layer to use?
-				painter.setDecoratedLayer(layer);
-			} else {
-				while (layeredChild.getParent() != lp) {
-					layeredChild = layeredChild.getParent();
-				}
-				int base = lp.getLayer(layeredChild);
-				// NOTE: JLayeredPane doesn't properly repaint an overlapping
-				// child when an obscured child calls repaint() if the two
-				// are in the same layer, so we use the next-higher layer
-				// instead of simply using a different position within the
-				// layer.
-				layer = base + layerOffset;
-				if (layerOffset < 0) {
-					BackgroundPainter bp = (BackgroundPainter) lp
-							.getClientProperty(BackgroundPainter.key(base));
-					if (bp == null) {
-						bp = new BackgroundPainter(lp, base);
-					}
-				}
-				painter.setDecoratedLayer(base);
-			}
-			lp.add(painter, new Integer(layer), position);
-		} else {
-			// Always detach when the target component's window is null
-			// or is not a suitable container,
-			// otherwise we might prevent GC of the component
-			Container parent = painter.getParent();
-			if (parent != null) {
-				parent.remove(painter);
-			}
-		}
-		// Track size changes in any viewport parent
-		if (parent != null) {
-			parent.removeComponentListener(listener);
-		}
-		parent = component.getParent();
-		if (parent != null) {
-			parent.addComponentListener(listener);
-		}
-		synch();
-	}
-
-	/**
-	 * Ensure the size of the decorator matches the current decoration bounds
-	 * with appropriate clipping to viewports.
-	 */
-	protected void synch() {
-		Container painterParent = painter.getParent();
-		if (painterParent != null) {
-			Rectangle decorated = getDecorationBounds();
-			Rectangle clipRect = clipDecorationBounds(decorated);
-
-			Point pt = SwingUtilities
-					.convertPoint(component, clipRect.x, clipRect.y, painterParent);
-			if (clipRect.width <= 0 || clipRect.height <= 0) {
-				setPainterBounds(-1, -1, 0, 0);
-				setVisible(false);
-			} else {
-				setPainterBounds(pt.x, pt.y, clipRect.width, clipRect.height);
-				setVisible(true);
-			}
-		}
-		painter.repaint();
-	}
-
-	/**
-	 * Adjust the painting offsets and size of the decoration to account for
-	 * ancestor clipping. This might be due to scroll panes or having the
-	 * decoration lie outside the parent layered pane.
-	 */
-	protected Rectangle clipDecorationBounds(Rectangle decorated) {
-		// Amount we have to translate the Graphics context
-		originOffset.x = decorated.x;
-		originOffset.y = decorated.y;
-		// If the the component is obscured (by a viewport or some
-		// other means), use the painter bounds to clip to the visible
-		// bounds. Doing may change the actual origin, so adjust our
-		// origin offset accordingly
-		Rectangle visible = getClippingRect(component, decorated);
-		Rectangle clipRect = decorated.intersection(visible);
-		if (decorated.x < visible.x)
-			originOffset.x += visible.x - decorated.x;
-		if (decorated.y < visible.y)
-			originOffset.y += visible.y - decorated.y;
-		return clipRect;
-	}
-
-	/**
-	 * Return any clipping rectangle detected above the given component, in the
-	 * coordinate space of the given component. The given rectangle is desired
-	 * to be visible.
-	 */
-	private Rectangle getClippingRect(Container component, Rectangle desired) {
-		Rectangle clip = component instanceof JComponent ? ((JComponent) component)
-				.getVisibleRect()
-				: new Rectangle(0, 0, component.getWidth(), component.getHeight());
-		if (desired.x >= clip.x && desired.y >= clip.y
-				&& desired.x + desired.width <= clip.x + clip.width
-				&& desired.y + desired.height <= clip.y + clip.height) {
-			// desired rect is within the current clip rect
-		} else if (component.getParent() != null) {
-			// Only apply the clip if it is actually smaller than the
-			// component's visible area
-			if (component != painter.getParent() && clip.x > 0 && clip.y > 0
-					&& clip.width < component.getWidth() && clip.height < component.getHeight()) {
-				// Don't alter the original rectangle
-				desired = new Rectangle(desired);
-				// Check for clipping further up the hierarchy
-				desired.x += component.getX();
-				desired.y += component.getY();
-				clip = getClippingRect(component.getParent(), desired);
-				clip.x -= component.getX();
-				clip.y -= component.getY();
-			}
-		}
-		return clip;
-	}
-
-	/**
-	 * Return the bounds, relative to the decorated component, of the
-	 * decoration. The default covers the entire component. Note that this
-	 * method will be called from the constructor, so be careful when overriding
-	 * and referencing derived class state.
-	 */
-	protected Rectangle getDecorationBounds() {
-		return bounds != DEFAULT_BOUNDS ? bounds : new Rectangle(0, 0, component.getWidth(),
-				component.getHeight());
-	}
-
-	/**
-	 * Change the bounds of the decoration, relative to the decorated component.
-	 * The special value {@link #DEFAULT_BOUNDS} means the bounds will track the
-	 * component bounds.
-	 */
-	public void setDecorationBounds(Rectangle bounds) {
-		if (bounds == DEFAULT_BOUNDS) {
-			this.bounds = bounds;
-		} else {
-			this.bounds = new Rectangle(bounds);
-		}
-		synch();
-	}
-
-	/**
-	 * Change the bounds of the decoration, relative to the decorated component.
-	 */
-	public void setDecorationBounds(int x, int y, int w, int h) {
-		setDecorationBounds(new Rectangle(x, y, w, h));
-	}
-
-	protected void setPainterBounds(int x, int y, int w, int h) {
-		painter.setLocation(x, y);
-		painter.setSize(w, h);
-		repaint();
-	}
-
-	protected JComponent getComponent() {
-		return component;
-	}
-
-	protected JComponent getPainter() {
-		return painter;
-	}
-
-	/** Set the cursor to appear anywhere over the decoration bounds. */
-	public void setCursor(Cursor cursor) {
-		painter.setCursor(cursor);
-	}
-
-	/** Force a refresh of the underlying component and its decoration. */
-	public void repaint() {
-		component.repaint();
-		painter.repaint();
-	}
-
-	/** Stop decorating. */
-	public void dispose() {
-		component.removeHierarchyListener(listener);
-		component.removeComponentListener(listener);
-		component.removePropertyChangeListener(listener);
-		if (parent != null) {
-			parent.removeComponentListener(listener);
-			parent = null;
-		}
-		Container painterParent = painter.getParent();
-		if (painterParent != null) {
-			Rectangle bounds = painter.getBounds();
-			painterParent.remove(painter);
-			painterParent.repaint(bounds.x, bounds.y, bounds.width, bounds.height);
-		}
-		component.repaint();
-		component = null;
-	}
-
-	/**
-	 * Define the decoration's appearance. The point (0,0) represents the upper
-	 * left corner of the decorated component. The default clip mask will be the
-	 * extents of the decoration bounds, as indicated by
-	 * {@link #getDecorationBounds()}, which defaults to the decorated component
-	 * bounds.
-	 */
-	public abstract void paint(Graphics g);
-
-	public String toString() {
-		return super.toString() + " on " + getComponent();
-	}
-
-	private static Field nComponents;
-	static {
-		try {
-			nComponents = Container.class.getDeclaredField("ncomponents");
-			nComponents.setAccessible(true);
-		} catch (Exception e) {
-			nComponents = null;
-		}
-	}
-
-	private static boolean useSimpleBackground() {
-		return nComponents == null;
-	}
-
-	/** Used to hook into the Swing painting architecture. */
-	private class Painter extends JComponent {
-		private int base;
-		private Cursor cursor;
-
-		public JComponent getComponent() {
-			return AbstractComponentDecorator.this.getComponent();
-		}
-
-		public void setDecoratedLayer(int base) {
-			this.base = base;
-		}
-
-		public int getDecoratedLayer() {
-			return base;
-		}
-
-		public boolean isBackgroundDecoration() {
-			return layerOffset < 0;
-		}
-
-		/** Set the cursor to something else. */
-		public void setCursor(Cursor cursor) {
-			Cursor oldCursor = getCursor();
-			// Make sure the cursor actually changed, otherwise
-			// we get cursor flicker (notably on w32 title bars)
-			if (oldCursor == null && cursor != null || oldCursor != null
-					&& !oldCursor.equals(cursor)) {
-				this.cursor = cursor;
-				super.setCursor(cursor);
-			}
-		}
-
-		/**
-		 * Returns the cursor of the decorated component, or the last cursor set
-		 * by {@link #setCursor}.
-		 */
-		public Cursor getCursor() {
-			return cursor != null ? cursor : component.getCursor();
-		}
-
-		/**
-		 * Delegate to the containing decorator to perform the paint.
-		 */
-		public void paint(Graphics g) {
-			if (!component.isShowing())
-				return;
-			Graphics g2 = g.create();
-			g2.translate(-originOffset.x, -originOffset.y);
-			AbstractComponentDecorator.this.paint(g2);
-			g2.dispose();
-			/*
-			 * g = g.create(); g.setClip(null); g.setColor(Color.red);
-			 * g.drawRect(0, 0, getWidth()-1, getHeight()-1);
-			 */
-		}
-
-		/**
-		 * Provide a decorator-specific tooltip, shown when within the
-		 * decorator's bounds.
-		 */
-		public String getToolTipText(MouseEvent e) {
-			return AbstractComponentDecorator.this.getToolTipText(e);
-		}
-
-		public String toString() {
-			return "Painter for " + AbstractComponentDecorator.this;
-		}
-	}
-
-	/**
-	 * Provides a shared background painting mechanism for multiple decorations.
-	 * This ensures that the background is only painted once if more than one
-	 * background decorator is applied.
-	 */
-	private static class BackgroundPainter extends AbstractComponentDecorator {
-		private static String key(int layer) {
-			return "backgroundPainter for layer " + layer;
-		}
-
-		private String key;
-		private int layer;
-
-		public BackgroundPainter(JLayeredPane p, int layer) {
-			super(p, 0, TOP);
-			this.layer = layer;
-			key = key(layer);
-			p.putClientProperty(key, this);
-		}
-
-		private int hideChildren(Container c) {
-			if (c == null)
-				return 0;
-			int value = c.getComponentCount();
-			try {
-				nComponents.set(c, new Integer(0));
-			} catch (Exception e) {
-				return c.getComponentCount();
-			}
-			return value;
-		}
-
-		private void restoreChildren(Container c, int count) {
-			if (c != null) {
-				try {
-					nComponents.set(c, new Integer(count));
-				} catch (Exception e) {
-				}
-			}
-		}
-
-		private void paintBackground(Graphics g, Component parent, JComponent jc) {
-			int x = jc.getX();
-			int y = jc.getY();
-			int w = jc.getWidth();
-			int h = jc.getHeight();
-			paintBackground(g.create(x, y, w, h), jc);
-		}
-
-		private void paintBackground(Graphics g, JComponent jc) {
-			if (jc.isOpaque()) {
-				if (useSimpleBackground()) {
-					g.setColor(jc.getBackground());
-					g.fillRect(0, 0, jc.getWidth(), jc.getHeight());
-				} else {
-					int count = hideChildren(jc);
-					boolean db = jc.isDoubleBuffered();
-					if (db)
-						jc.setDoubleBuffered(false);
-					jc.paint(g);
-					if (db)
-						jc.setDoubleBuffered(true);
-					restoreChildren(jc, count);
-				}
-			}
-			Component[] kids = jc.getComponents();
-			for (int i = 0; i < kids.length; i++) {
-				if (kids[i] instanceof JComponent) {
-					paintBackground(g, jc, (JComponent) kids[i]);
-				}
-			}
-		}
-
-		private List findOpaque(Component root) {
-			List list = new ArrayList();
-			if (root.isOpaque() && root instanceof JComponent) {
-				list.add(root);
-				((JComponent) root).setOpaque(false);
-			}
-			if (root instanceof Container) {
-				Component[] kids = ((Container) root).getComponents();
-				for (int i = 0; i < kids.length; i++) {
-					list.addAll(findOpaque(kids[i]));
-				}
-			}
-			return list;
-		}
-
-		private List findDoubleBuffered(Component root) {
-			List list = new ArrayList();
-			if (root.isDoubleBuffered() && root instanceof JComponent) {
-				list.add(root);
-				((JComponent) root).setDoubleBuffered(false);
-			}
-			if (root instanceof Container) {
-				Component[] kids = ((Container) root).getComponents();
-				for (int i = 0; i < kids.length; i++) {
-					list.addAll(findDoubleBuffered(kids[i]));
-				}
-			}
-			return list;
-		}
-
-		private void paintForeground(Graphics g, JComponent jc) {
-			List opaque = findOpaque(jc);
-			List db = findDoubleBuffered(jc);
-			jc.paint(g);
-			for (Iterator i = opaque.iterator(); i.hasNext();) {
-				((JComponent) i.next()).setOpaque(true);
-			}
-			for (Iterator i = db.iterator(); i.hasNext();) {
-				((JComponent) i.next()).setDoubleBuffered(true);
-			}
-		}
-
-		/** Walk the list of "background" decorators and paint them. */
-		public void paint(Graphics g) {
-
-			JLayeredPane lp = (JLayeredPane) getComponent();
-			Component[] kids = lp.getComponents();
-			// Construct an area of the intersection of all decorators
-			Area area = new Area();
-			List painters = new ArrayList();
-			List components = new ArrayList();
-			for (int i = kids.length - 1; i >= 0; i--) {
-				if (kids[i] instanceof Painter) {
-					Painter p = (Painter) kids[i];
-					if (p.isBackgroundDecoration() && p.getDecoratedLayer() == layer
-							&& p.isShowing()) {
-						painters.add(p);
-						area.add(new Area(p.getBounds()));
-					}
-				} else if (lp.getLayer(kids[i]) == layer && kids[i] instanceof JComponent) {
-					components.add(kids[i]);
-				}
-			}
-			if (painters.size() == 0) {
-				dispose();
-				return;
-			}
-			g.setClip(area);
-
-			// Paint background for that area
-			for (Iterator i = components.iterator(); i.hasNext();) {
-				JComponent c = (JComponent) i.next();
-				paintBackground(g, lp, c);
-			}
-
-			// Paint the bg decorators
-			for (Iterator i = painters.iterator(); i.hasNext();) {
-				Painter p = (Painter) i.next();
-				p.paint(g.create(p.getX(), p.getY(), p.getWidth(), p.getHeight()));
-			}
-			// Paint foreground for the area
-			for (Iterator i = components.iterator(); i.hasNext();) {
-				JComponent c = (JComponent) i.next();
-				paintForeground(g.create(c.getX(), c.getY(), c.getWidth(), c.getHeight()), c);
-			}
-		}
-
-		public void dispose() {
-			getComponent().putClientProperty(key, null);
-			super.dispose();
-		}
-
-		public String toString() {
-			return key + " on " + getComponent();
-		}
-	}
-
-	/** Tracks changes to component configuration. */
-	private final class Listener extends ComponentAdapter implements HierarchyListener,
-			PropertyChangeListener {
-		public void hierarchyChanged(HierarchyEvent e) {
-			if ((e.getChangeFlags() & HierarchyEvent.PARENT_CHANGED) != 0) {
-				attach();
-			}
-		}
-
-		public void propertyChange(PropertyChangeEvent e) {
-			if (JLayeredPane.LAYER_PROPERTY.equals(e.getPropertyName())) {
-				attach();
-			}
-		}
-
-		public void componentMoved(ComponentEvent e) {
-			// FIXME figure out why attach works and synch doesn't
-			// when painting a selection marquee over a decorated background
-			attach();
-		}
-
-		public void componentResized(ComponentEvent e) {
-			// FIXME figure out why attach works and synch doesn't
-			// when painting a selection marquee over a decorated background
-			attach();
-		}
-
-		public void componentHidden(ComponentEvent e) {
-			setVisible(false);
-		}
-
-		public void componentShown(ComponentEvent e) {
-			setVisible(true);
-		}
-	}
-}

DIYLC/src/org/diylc/utils/dnd/GhostedDragImage.java

@@ -1,216 +0,0 @@
-package org.diylc.utils.dnd;
-
-/* Copyright 2006 Timothy Wall All Rights Reserved. */
-import java.awt.AlphaComposite;
-import java.awt.Component;
-import java.awt.Cursor;
-import java.awt.Frame;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.JLayeredPane;
-import javax.swing.RootPaneContainer;
-import javax.swing.SwingUtilities;
-import javax.swing.Timer;
-
-/**
- * Provide a ghosted drag image which will appear on any instances of
- * {@link RootPaneContainer} in the current VM. Its location in screen
- * coordinates may be set via {@link #move}.
- * <p>
- * When the image is no longer needed, invoke {@link #dispose}, which hides the
- * graphic immediately, or {@link #returnToOrigin}, which moves the image to its
- * original location prior to invoking {@link #dispose}.
- */
-public class GhostedDragImage extends AbstractComponentDecorator {
-
-	private Icon icon;
-	// drag origin, relative to drag source
-	private Point origin;
-	// current drag location, relative to drag source
-	private Point location;
-	// offset of the image from the cursor
-	private Point imageOffset;
-	private List ghosts = new ArrayList();
-	private Component dragSource;
-	private float ghostAlpha = 0.5f;
-
-	/**
-	 * Create a ghosted drag image, using the given icon.
-	 * 
-	 * @param dragSource
-	 *            source of the drag
-	 * @param screenLocation
-	 *            screen location where the drag started
-	 * @param icon
-	 *            image to be drawn
-	 * @param imageOffset
-	 *            offset of the image from the cursor
-	 */
-	public GhostedDragImage(JComponent dragSource, Point screenLocation, Icon icon,
-			Point imageOffset) {
-		this(dragSource, dragSource.getRootPane().getLayeredPane(), screenLocation, icon,
-				imageOffset, true);
-	}
-
-	/**
-	 * Create a ghosted drag image.
-	 * 
-	 * @param dragSource
-	 *            source of the drag
-	 * @param root
-	 *            layered pane on which ghosted image is drawn
-	 * @param screenLocation
-	 *            initial location of image, in screen coordinates
-	 * @param icon
-	 *            icon to use for the ghost image
-	 * @param imageOffset
-	 *            offset of the image within the drag source
-	 * @param trackFrames
-	 *            if true, creates additional ghosts for all extant frames which
-	 *            contain a {@link JLayeredPane} where the image can be painted.
-	 */
-	protected GhostedDragImage(JComponent dragSource, JLayeredPane root, Point screenLocation,
-			Icon icon, Point imageOffset, boolean trackFrames) {
-		super(root);
-		this.dragSource = dragSource;
-		this.icon = icon;
-		this.imageOffset = imageOffset;
-		Point loc = root.getLocationOnScreen();
-		setLocation(screenLocation.x - loc.x + imageOffset.x, screenLocation.y - loc.y
-				+ imageOffset.y);
-		if (trackFrames) {
-			Window w = SwingUtilities.getWindowAncestor(root);
-			Frame[] frames = Frame.getFrames();
-			// Log.debug("track " + frames.length + " other frames");
-			for (int i = 0; i < frames.length; i++) {
-				Frame frame = frames[i];
-				if (frame instanceof RootPaneContainer && frame.isShowing() && frame != w) {
-					// Log.debug("Track " + frame);
-					JLayeredPane p = ((RootPaneContainer) frame).getLayeredPane();
-					GhostedDragImage slave = new GhostedDragImage(dragSource, p, screenLocation,
-							icon, imageOffset, false);
-					ghosts.add(slave);
-					slave.move(screenLocation);
-				}
-			}
-		}
-	}
-
-	/** Set the transparency of the ghosted image. */
-	public void setAlpha(float alpha) {
-		ghostAlpha = alpha;
-	}
-
-	/**
-	 * Ensure the decorator cursor matches the drag cursor, or we get cursor
-	 * flicker when autoscrolling.
-	 */
-	public void setCursor(Cursor cursor) {
-		super.setCursor(cursor);
-		for (Iterator i = ghosts.iterator(); i.hasNext();) {
-			GhostedDragImage slave = (GhostedDragImage) i.next();
-			slave.setCursor(cursor);
-		}
-	}
-
-	/** Make all ghosted images go away. */
-	public void dispose() {
-		location = origin;
-		super.dispose();
-		for (Iterator i = ghosts.iterator(); i.hasNext();) {
-			GhostedDragImage slave = (GhostedDragImage) i.next();
-			slave.dispose();
-		}
-	}
-
-	/**
-	 * Sets the location of the decoration within the layered pane. Keeps track
-	 * of the location relative to the drag source to facilitate moving back
-	 * with {@link #returnToOrigin}.
-	 */
-	private void setLocation(int x, int y) {
-		location = SwingUtilities.convertPoint(getComponent(), x, y, dragSource);
-		if (origin == null)
-			origin = location;
-		setDecorationBounds(x, y, icon.getIconWidth(), icon.getIconHeight());
-	}
-
-	// Setting this non-zero provides some buffer around the drag image
-	// which helps avoid cursor flicker as the cursor moves (especially
-	// repomgr, probably due to slow repaint times).
-	private static final int CURSOR_SIZE = 32;
-
-	/**
-	 * Adjust the bounds of the painting component to allow some buffer to avoid
-	 * cursor flicker when moving.
-	 */
-	protected Rectangle clipDecorationBounds(Rectangle decorated) {
-		decorated.x -= CURSOR_SIZE;
-		decorated.y -= CURSOR_SIZE;
-		decorated.width += CURSOR_SIZE * 2;
-		decorated.height += CURSOR_SIZE * 2;
-		return super.clipDecorationBounds(decorated);
-	}
-
-	/**
-	 * Move the ghosted image to the requested location.
-	 * 
-	 * @param screen
-	 *            Where to draw the image, in screen coordinates
-	 */
-	public void move(Point screen) {
-		// Log.debug("Move to " + screen);
-		Point loc = getComponent().getLocationOnScreen();
-		setLocation(screen.x - loc.x + imageOffset.x, screen.y - loc.y + imageOffset.y);
-		for (Iterator i = ghosts.iterator(); i.hasNext();) {
-			GhostedDragImage g = (GhostedDragImage) i.next();
-			// Log.debug("Move on other frame");
-			g.move(screen);
-		}
-	}
-
-	/** Paint the supplied image with transparency. */
-	public void paint(Graphics graphics) {
-		Rectangle r = getDecorationBounds();
-		Graphics2D g = (Graphics2D) graphics.create();
-		g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, ghostAlpha));
-		g.translate(CURSOR_SIZE, CURSOR_SIZE);
-		icon.paintIcon(getPainter(), g, r.x, r.y);
-		g.dispose();
-	}
-
-	private static final int SLIDE_INTERVAL = 1000 / 24;
-
-	/** Animate the ghosted image returning to its origin. */
-	public void returnToOrigin() {
-		setCursor(null);
-		final Timer timer = new Timer(SLIDE_INTERVAL, null);
-		timer.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				int dx = (origin.x - location.x) / 2;
-				int dy = (origin.y - location.y) / 2;
-				if (dx != 0 || dy != 0) {
-					Point loc = dragSource.getLocationOnScreen();
-					Point where = new Point(loc.x + location.x + dx - imageOffset.x, loc.y
-							+ location.y + dy - imageOffset.y);
-					move(where);
-				} else {
-					timer.stop();
-					dispose();
-				}
-			}
-		});
-		timer.start();
-	}
-}

DIYLC/update.xml

@@ -1,86 +0,0 @@
-<java.util.Arrays_-ArrayList>
-	<a class="com.diyfever.gui.update.Version-array">
-		<com.diyfever.gui.update.Version>
-			<versionNumber>
-				<major>3</major>
-				<minor>0</minor>
-				<build>4</build>
-			</versionNumber>
-			<releaseDate>2011-01-27 21:00:00.000 CET</releaseDate>
-			<name></name>
-			<changes>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Copy/paste between two instances of the
-						application</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Parsing numerical values in countries that use
-						comma as decimal separator</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Dragging sticky points affects selectability
-						of objects</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Click is sometimes not registered while adding a
-						new component</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Fixed NPE when using default values</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Allow shape control points of curves to overlap
-					</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Added DIL IC first pin indentation</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Added transparency to the potentiometer
-					</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Reduced number of layers</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Import from v1 files can now read label and
-						electrolytic capacitor components and trace/pad colors
-					</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Added worker thread for longer file operation, so
-						GUI doesn't freeze</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added right click menu on the canvas</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added "send to back" and "bring to front" options</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added label component</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added image component</description>
-				</com.diyfever.gui.update.Change>
-			</changes>
-			<url>http://code.google.com/p/diy-layout-creator/downloads/list
-			</url>
-		</com.diyfever.gui.update.Version>
-	</a>
-</java.util.Arrays_-ArrayList>

Library/src/org/diylc/components/misc/ProjectInformation.java

@@ -1,108 +0,0 @@
-package org.diylc.components.misc;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.geom.Rectangle2D;
-
-import org.diylc.components.AbstractComponent;
-import org.diylc.core.ComponentState;
-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.ComponentDescriptor;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-
-@ComponentDescriptor(name = "Project Information", author = "Branislav Stojkovic", category = "Misc", description = "Draws a box with general project information", instanceNamePrefix = "BOM", zOrder = IDIYComponent.TEXT, stretchable = false)
-public class ProjectInformation extends AbstractComponent<Void> {
-
-	public static Size DEFAULT_SIZE = new Size(10d, SizeUnit.cm);
-	public static Color COLOR = Color.black;
-	public static String DEFAULT_TEXT = "No components to show in the Bill of Materials";
-
-	private static final long serialVersionUID = 1L;
-
-	private Point point = new Point(0, 0);
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
-			IDrawingObserver drawingObserver) {
-		g2d.setFont(LABEL_FONT);
-		g2d.setColor(componentState == ComponentState.DRAGGING
-				|| componentState == ComponentState.SELECTED ? SELECTION_COLOR : COLOR);
-		// FontMetrics fontMetrics = g2d.getFontMetrics();
-		g2d.drawString(project.getTitle(), point.x, point.y);
-	}
-
-	@Override
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		g2d.setColor(Color.white);
-		g2d.fillRect(width / 8, 0, 6 * width / 8, height - 1);
-		g2d.setColor(Color.black);
-		g2d.drawRect(width / 8, 0, 6 * width / 8, height - 1);
-		g2d.setFont(LABEL_FONT.deriveFont(1f * 9 * width / 32).deriveFont(Font.PLAIN));
-
-		FontMetrics fontMetrics = g2d.getFontMetrics();
-		Rectangle2D rect = fontMetrics.getStringBounds("BOM", g2d);
-
-		int textHeight = (int) (rect.getHeight());
-		int textWidth = (int) (rect.getWidth());
-
-		// Center text horizontally and vertically.
-		int x = (width - textWidth) / 2 + 1;
-		int y = textHeight + 2;
-
-		g2d.drawString("BOM", x, y);
-
-		g2d.setFont(g2d.getFont().deriveFont(1f * 5 * width / 32));
-
-		fontMetrics = g2d.getFontMetrics();
-		rect = fontMetrics.getStringBounds("resistors", g2d);
-		x = (width - textWidth) / 2 + 1;
-		y = height / 2 + 2;
-		g2d.drawString("resistors", x, y);
-		y += rect.getHeight() - 1;
-		g2d.drawString("tubes", x, y);
-		y += rect.getHeight() - 1;
-		g2d.drawString("diodes", x, y);
-	}
-
-	@Override
-	public int getControlPointCount() {
-		return 1;
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return point;
-	}
-
-	@Override
-	public boolean isControlPointSticky(int index) {
-		return false;
-	}
-
-	@Override
-	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
-		return VisibilityPolicy.NEVER;
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		this.point.setLocation(point);
-	}
-
-	@Deprecated
-	@Override
-	public Void getValue() {
-		return null;
-	}
-
-	@Override
-	public void setValue(Void value) {
-	}
-}

Library/src/org/diylc/components/passive/ElectrolyticRadial.java

@@ -1,102 +0,0 @@
-package org.diylc.components.passive;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.Ellipse2D;
-
-import org.diylc.components.AbstractLeadedComponent;
-import org.diylc.core.CreationMethod;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Capacitance;
-import org.diylc.core.measures.CapacitanceUnit;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-
-@ComponentDescriptor(name = "Electrolytic Capacitor", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "test", zOrder = IDIYComponent.COMPONENT)
-public class ElectrolyticRadial extends AbstractLeadedComponent<Capacitance> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Size DEFAULT_SIZE = new Size(1d / 2, SizeUnit.in);
-	public static Color BODY_COLOR = Color.decode("#27408B");
-	public static Color BORDER_COLOR = BODY_COLOR.darker();
-	public static Color COVER_COLOR = Color.decode("#C3E4ED");
-
-	private Capacitance value = new Capacitance(1d, CapacitanceUnit.uF);
-
-	public ElectrolyticRadial() {
-		super();
-	}
-
-	@EditableProperty
-	public Capacitance getValue() {
-		return value;
-	}
-
-	public void setValue(Capacitance value) {
-		this.value = value;
-	}
-
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		g2d.setColor(BODY_COLOR);
-		g2d.fillOval(6, 6, width - 12, width - 12);
-		g2d.setColor(BORDER_COLOR);
-		g2d.drawOval(6, 6, width - 12, width - 12);
-	}
-
-	@Override
-	protected void decorateComponentBody(Graphics2D g2d) {
-		int totalDiameter = getClosestOdd(getWidth().convertToPixels());
-		int coverDiameter = getClosestOdd(totalDiameter * 3 / 4);
-		g2d.setColor(COVER_COLOR);
-		int position = (totalDiameter - coverDiameter) / 2;
-		g2d.fillOval(position, position, coverDiameter, coverDiameter);
-		g2d.setColor(COVER_COLOR.darker());
-		g2d.drawLine(position + coverDiameter / 5, position + coverDiameter / 5, position + 4
-				* coverDiameter / 5, position + 4 * coverDiameter / 5);
-		g2d.drawLine(position + coverDiameter / 5, position + 4 * coverDiameter / 5, position + 4
-				* coverDiameter / 5, position + coverDiameter / 5);
-	}
-
-	@Override
-	protected Size getDefaultHeight() {
-		return null;
-	}
-
-	@Deprecated
-	@Override
-	public Size getHeight() {
-		return super.getHeight();
-	}
-
-	@Override
-	protected Size getDefaultWidth() {
-		// We'll reuse width property to set the diameter.
-		return DEFAULT_SIZE;
-	}
-
-	@EditableProperty(name = "Diameter")
-	@Override
-	public Size getWidth() {
-		return super.getWidth();
-	}
-
-	@Override
-	protected Color getDefaultBodyColor() {
-		return BODY_COLOR;
-	}
-
-	@Override
-	protected Color getDefaultBorderColor() {
-		return BORDER_COLOR;
-	}
-
-	@Override
-	protected Shape getBodyShape() {
-		return new Ellipse2D.Double(0f, 0f, getClosestOdd(getWidth().convertToPixels()),
-				getClosestOdd(getWidth().convertToPixels()));
-	}
-}

Library/src/org/diylc/components/passive/Resistor.java

@@ -1,78 +0,0 @@
-package org.diylc.components.passive;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.Rectangle2D;
-
-import org.diylc.components.AbstractLeadedComponent;
-import org.diylc.core.CreationMethod;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Resistance;
-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 = "test", zOrder = IDIYComponent.COMPONENT)
-public class Resistor extends AbstractLeadedComponent<Resistance> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Size DEFAULT_WIDTH = new Size(1d / 2, SizeUnit.in);
-	public static Size DEFAULT_HEIGHT = new Size(1d / 8, SizeUnit.in);
-	public static Color BODY_COLOR = Color.decode("#82CFFD");
-	public static Color BORDER_COLOR = BODY_COLOR.darker();
-
-	private Resistance value = new Resistance(123d, ResistanceUnit.K);
-
-	public Resistor() {
-		super();
-	}
-
-	@EditableProperty
-	public Resistance getValue() {
-		return value;
-	}
-
-	public void setValue(Resistance value) {
-		this.value = value;
-	}
-
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		g2d.rotate(-Math.PI / 4, width / 2, height / 2);
-		g2d.setColor(LEAD_COLOR);
-		g2d.drawLine(0, height / 2, width, height / 2);
-		g2d.setColor(BODY_COLOR);
-		g2d.fillRect(4, height / 2 - 3, width - 8, 6);
-		g2d.setColor(BORDER_COLOR);
-		g2d.drawRect(4, height / 2 - 3, width - 8, 6);
-	}
-
-	@Override
-	protected Size getDefaultHeight() {
-		return DEFAULT_HEIGHT;
-	}
-
-	@Override
-	protected Size getDefaultWidth() {
-		return DEFAULT_WIDTH;
-	}
-
-	@Override
-	protected Color getDefaultBodyColor() {
-		return BODY_COLOR;
-	}
-
-	@Override
-	protected Color getDefaultBorderColor() {
-		return BORDER_COLOR;
-	}
-
-	@Override
-	protected Shape getBodyShape() {
-		return new Rectangle2D.Double(0f, 0f, getWidth().convertToPixels(),
-				getClosestOdd(getHeight().convertToPixels()));
-	}
-}

diylc-core/.classpath

@@ -9,9 +9,9 @@
 	<classpathentry kind="lib" path="lib/iText-2.1.7.jar"/>
 	<classpathentry kind="lib" path="lib/cloning-1.5.jar"/>
 	<classpathentry kind="lib" path="lib/objenesis-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/bancika-gui-framework.jar"/>
 	<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
 	<classpathentry kind="lib" path="library/main.jar"/>
+	<classpathentry kind="lib" path="lib/app-framework.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

diylc-core/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>DIYLC</name>
+	<name>diylc-core</name>
 	<comment></comment>
 	<projects>
 	</projects>

diylc-core/build.xml

@@ -0,0 +1,82 @@
+<project name="diylc-core" basedir="." default="jar">
+	<property name="src.dir" value="src" />
+
+	<property name="lib.dir" value="${basedir}/lib" />
+	<property name="build.dir" value="${basedir}/build" />
+	<property name="jar.dir" value="${build.dir}/jar" />
+	<property name="report.dir" value="${build.dir}/junitreport" />
+
+	<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
+	<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
+
+	<target name="clean">
+		<delete dir="${build.dir}" />
+	</target>
+
+	<!--change src dir-->
+	<target name="compile">
+		<mkdir dir="${classes.dir}" />
+		<echo>Compile with JDK ${java.runtime.version}</echo>
+		<javac encoding="8859_1" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="class.path" />
+	</target>
+
+	<target name="resource.copy">
+		<copy todir="${classes.dir}">
+			<fileset dir="${src.dir}">
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="lib.copy">
+		<copy todir="${jar.dir}/lib" overwrite="true">
+			<fileset dir="${basedir}/lib">
+				<exclude name="**/*dll" />
+			</fileset>
+		</copy>
+		<copy todir="${jar.dir}/library" overwrite="true">
+			<fileset dir="${basedir}/library">
+				<exclude name="**/*dll" />
+			</fileset>
+		</copy>
+		<copy todir="${jar.dir}" overwrite="true">
+			<fileset dir="${basedir}/lib/" includes="**/*.dll" />
+		</copy>
+	</target>
+
+	<path id="class.path">
+		<fileset dir="${basedir}">
+			<include name="lib/**/*.jar" />
+			<include name="library/**/*.jar" />
+		</fileset>
+	</path>
+
+	<manifestclasspath jarfile="${ant.project.name}.jar" property="manifest.class.path">
+		<classpath refid="class.path" />
+	</manifestclasspath>
+
+	<target name="jar" depends="clean, lib.copy, resource.copy, compile">
+		<jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
+			<manifest>
+				<attribute name="Built-By" value="${user.name}" />
+				<attribute name="Class-Path" value="${manifest.class.path}" />
+			</manifest>
+		</jar>
+		<copy todir="../diylc-swing/lib" overwrite="true">
+			<fileset dir="${jar.dir}" includes="${ant.project.name}.jar" />
+		</copy>
+		<copy todir="../diylc-library/lib" overwrite="true">
+			<fileset dir="${jar.dir}" includes="${ant.project.name}.jar" />
+		</copy>
+	</target>
+
+	<target name="javadoc">
+		<javadoc access="public" author="true" classpathref="class.path" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.6" splitindex="true" use="true" version="true">
+			<fileset dir="${src.dir}">
+				<exclude name="**\.svn\**" />
+				<include name="**/*.java" />
+			</fileset>
+		</javadoc>
+	</target>
+
+</project>

diylc-core/src/org/diylc/common/DrawOption.java

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

diylc-core/src/org/diylc/common/EventType.java

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

diylc-core/src/org/diylc/common/HorizontalAlignment.java

@@ -0,0 +1,5 @@
+package org.diylc.common;
+
+public enum HorizontalAlignment {
+	LEFT, CENTER, RIGHT
+}

diylc-core/src/org/diylc/common/IMouseProcessor.java

@@ -0,0 +1,68 @@
+package org.diylc.common;
+
+import java.awt.Point;
+
+public interface IMouseProcessor {
+
+	/**
+	 * Notifies the presenter that mouse is clicked.
+	 * 
+	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @param ctrlDown
+	 * @param shiftDown
+	 * @param altDown
+	 * @param clickCount
+	 */
+	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown,
+			int clickCount);
+
+	/**
+	 * Notifies the presenter that mouse is moved.
+	 * 
+	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @param ctrlDown
+	 * @param shiftDown
+	 * @param altDown
+	 */
+	void mouseMoved(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
+
+	/**
+	 * Notification that drag has been started from the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @param dragAction
+	 */
+	void dragStarted(Point point, int dragAction);
+
+	/**
+	 * Checks if it's possible to drop over the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @return
+	 */
+	boolean dragOver(Point point);
+
+	/**
+	 * Changes the current drag action during the dragging.
+	 * 
+	 * @param dragAction
+	 */
+	void dragActionChanged(int dragAction);
+
+	/**
+	 * Notification that drag has been ended in the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 */
+	void dragEnded(Point point);
+}

diylc-core/src/org/diylc/common/IPlugIn.java

@@ -1,6 +1,6 @@
 package org.diylc.common;
 
-import com.diyfever.gui.simplemq.IMessageListener;
+import org.diylc.appframework.simplemq.IMessageListener;
 
 /**
  * Interface for plug-ins.

diylc-core/src/org/diylc/common/IPlugInPort.java

@@ -9,12 +9,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.diylc.appframework.simplemq.IMessageListener;
+import org.diylc.appframework.simplemq.MessageDispatcher;
+import org.diylc.appframework.update.VersionNumber;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;
-
-import com.diyfever.gui.simplemq.IMessageListener;
-import com.diyfever.gui.simplemq.MessageDispatcher;
-import com.diyfever.gui.update.VersionNumber;
+import org.diylc.core.Theme;
 
 /**
  * Interface for communication between plug-ins and the application. Plug-ins
@@ -28,9 +28,25 @@ import com.diyfever.gui.update.VersionNumber;
  * @see IMessageListener
  * @see EventType
  */
-public interface IPlugInPort {
+public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor {
 
-	public static final String CHECK_BOX_MENU_ITEM = "org.diylc.checkBoxMenuItem";
+	public static final String ANTI_ALIASING_KEY = "antiAliasing";
+	public static final String HI_QUALITY_RENDER_KEY = "hiQualityRender";
+	public static final String EXPORT_GRID_KEY = "exportGrid";
+	public static final String STICKY_POINTS_KEY = "stickyPoints";
+	public static final String METRIC_KEY = "metric";
+	public static final String SNAP_TO_GRID_KEY = "snapToGrid";
+	public static final String AUTO_PADS_KEY = "autoCreatePads";
+	public static final String CONTINUOUS_CREATION_KEY = "continuousCreation";
+	public static final String AUTO_EDIT_KEY = "autoEdit";
+	public static final String ABNORMAL_EXIT_KEY = "abnormalExit";
+	public static final String WHEEL_ZOOM_KEY = "wheelZoom";
+	public static final String OUTLINE_KEY = "outline";
+	public static final String THEME_KEY = "theme";
+	public static final String RECENT_COMPONENTS_KEY = "recentComponents";
+
+	public static final int DND_TOGGLE_STICKY = 0x1;
+	public static final int DND_TOGGLE_SNAP = 0x40000000;
 
 	/**
 	 * Returns size of the canvas that takes project dimensions into account as
@@ -86,8 +102,9 @@ public interface IPlugInPort {
 	 * Saves the current project into the specified file.
 	 * 
 	 * @param fileName
+	 * @param isBackup
 	 */
-	void saveProjectToFile(String fileName);
+	void saveProjectToFile(String fileName, boolean isBackup);
 
 	/**
 	 * @return the current file name.
@@ -145,73 +162,6 @@ public interface IPlugInPort {
 	 */
 	void setZoomLevel(double zoomLevel);
 
-	/**
-	 * Notifies the presenter that mouse is clicked.
-	 * 
-	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 */
-	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
-
-	/**
-	 * Notifies the presenter that mouse is moved.
-	 * 
-	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 */
-	void mouseMoved(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
-
-	/**
-	 * Returns the current {@link ComponentTransferable}.
-	 * 
-	 * @return
-	 */
-	List<IDIYComponent<?>> getSelectedComponents();
-
-	/**
-	 * Selects all components in the project.
-	 */
-	void selectAll();
-
-	/**
-	 * Notification that drag has been started from the specified point.
-	 * 
-	 * Note: point coordinates are scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 */
-	void dragStarted(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
-
-	/**
-	 * Checks if it's possible to drop over the specified point.
-	 * 
-	 * Note: point coordinates are scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @return
-	 */
-	boolean dragOver(Point point);
-
-	/**
-	 * Notification that drag has been ended in the specified point.
-	 * 
-	 * Note: point coordinates are scaled for zoom factor.
-	 * 
-	 * @param point
-	 */
-	void dragEnded(Point point);
-
 	/**
 	 * Returns current version number.
 	 * 
@@ -260,14 +210,7 @@ public interface IPlugInPort {
 	 */
 	List<PropertyWrapper> getMutualSelectionProperties();
 
-	/**
-	 * Applies specified properties to all the selected components. If some of
-	 * the properties are not applicable to some of the selected components an
-	 * exception will be thrown.
-	 * 
-	 * @param properties
-	 */
-	void applyPropertiesToSelection(List<PropertyWrapper> properties);
+	void editSelection();
 
 	/**
 	 * @return a list of editable properties of the current project.
@@ -328,4 +271,28 @@ public interface IPlugInPort {
 	 * Brings each of the selected components one step to front.
 	 */
 	void bringSelectionToFront();
+
+	/**
+	 * Causes the display to refresh.
+	 */
+	void refresh();
+
+	/**
+	 * @return currently selected theme.
+	 */
+	Theme getSelectedTheme();
+
+	/**
+	 * Changes the current theme.
+	 * 
+	 * @param theme
+	 */
+	void setSelectedTheme(Theme theme);
+
+	/**
+	 * Renumbers all the selected components.
+	 * 
+	 * @param xAxisFirst
+	 */
+	void renumberSelectedComponents(boolean xAxisFirst);
 }

diylc-core/src/org/diylc/common/ISelectionProcessor.java

@@ -0,0 +1,39 @@
+package org.diylc.common;
+
+import java.awt.Point;
+import java.util.List;
+
+import org.diylc.core.IDIYComponent;
+
+public interface ISelectionProcessor {
+
+	/**
+	 * Returns the current {@link ComponentTransferable}.
+	 * 
+	 * @return
+	 */
+	List<IDIYComponent<?>> getSelectedComponents();
+
+	/**
+	 * Updates the selection with the specified list of component. Also, updates
+	 * control point map with all components that are stuck to the newly
+	 * selected components.
+	 * 
+	 * @param newSelection
+	 */
+	void updateSelection(List<IDIYComponent<?>> newSelection);
+
+	/**
+	 * Finds all components at the specified location, sorted by z-index from
+	 * top to bottom.
+	 * 
+	 * @param point
+	 * @return
+	 */
+	List<IDIYComponent<?>> findComponentsAt(Point point);
+
+	/**
+	 * Selects all components in the project.
+	 */
+	void selectAll();
+}

diylc-core/src/org/diylc/common/LabelPosition.java

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

diylc-core/src/org/diylc/common/OrientationHV.java

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

diylc-core/src/org/diylc/common/PropertyWrapper.java

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

diylc-core/src/org/diylc/common/ResistorColorCode.java

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

diylc-core/src/org/diylc/common/VerticalAlignment.java

@@ -0,0 +1,5 @@
+package org.diylc.common;
+
+public enum VerticalAlignment {
+	TOP, CENTER, BOTTOM
+}

diylc-core/src/org/diylc/components/AbstractComponent.java

@@ -0,0 +1,119 @@
+package org.diylc.components;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.font.FontRenderContext;
+import java.awt.font.GlyphVector;
+
+import org.diylc.common.HorizontalAlignment;
+import org.diylc.common.VerticalAlignment;
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.annotations.EditableProperty;
+
+/**
+ * Abstract implementation of {@link IDIYComponent} that contains component name
+ * and toString.
+ * 
+ * @author Branislav Stojkovic
+ * 
+ * @param <T>
+ */
+public abstract class AbstractComponent<T> implements IDIYComponent<T> {
+
+	private static final long serialVersionUID = 1L;
+
+	protected String name = "";
+
+	public static Color SELECTION_COLOR = Color.red;
+	public static Color LABEL_COLOR = Color.black;
+	public static Color LABEL_COLOR_SELECTED = Color.red;
+	public static Font LABEL_FONT = new Font("Tahoma", Font.PLAIN, 14);
+
+	@EditableProperty(defaultable = false)
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public boolean canControlPointOverlap(int index) {
+		return false;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+
+	/**
+	 * Returns the closest odd number, i.e. x when x is odd, or x + 1 when x is
+	 * even.
+	 * 
+	 * @param x
+	 * @return
+	 */
+	protected int getClosestOdd(double x) {
+		return ((int) x / 2) * 2 + 1;
+	}
+
+	/**
+	 * @param clip
+	 * @return true if none of the control points lie in the clip rectangle.
+	 */
+	protected boolean checkPointsClipped(Shape clip) {
+		for (int i = 0; i < getControlPointCount(); i++) {
+			if (clip.contains(getControlPoint(i))) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	protected void drawCenteredText(Graphics2D g2d, String text, int x, int y,
+			HorizontalAlignment horizontalAlignment, VerticalAlignment verticalAlignment) {
+		FontMetrics fontMetrics = g2d.getFontMetrics();
+		Rectangle stringBounds = fontMetrics.getStringBounds(text, g2d).getBounds();
+
+		Font font = g2d.getFont();
+		FontRenderContext renderContext = g2d.getFontRenderContext();
+		GlyphVector glyphVector = font.createGlyphVector(renderContext, text);
+		Rectangle visualBounds = glyphVector.getVisualBounds().getBounds();
+
+		int textX = 0;
+		switch (horizontalAlignment) {
+		case CENTER:
+			textX = x - stringBounds.width / 2;
+			break;
+		case LEFT:
+			textX = x;
+			break;
+		case RIGHT:
+			textX = x - stringBounds.width;
+			break;
+		}
+
+		int textY = 0;
+		switch (verticalAlignment) {
+		case TOP:
+			textY = y + stringBounds.height;
+			break;
+		case CENTER:
+			textY = y - visualBounds.height / 2 - visualBounds.y;
+			break;
+		case BOTTOM:
+			textY = y - visualBounds.y;
+			break;
+		}
+
+		g2d.drawString(text, textX, textY);
+	}
+}

diylc-core/src/org/diylc/components/AbstractCurvedComponent.java

@@ -24,12 +24,15 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 	public static Color GUIDELINE_COLOR = Color.blue;
 	public static Size DEFAULT_SIZE = new Size(1d, SizeUnit.in);
 
-	protected Point[] controlPoints = new Point[] { new Point(0, 0),
-			new Point(DEFAULT_SIZE.convertToPixels() / 2, 0),
-			new Point(DEFAULT_SIZE.convertToPixels() / 2, DEFAULT_SIZE.convertToPixels()),
-			new Point(DEFAULT_SIZE.convertToPixels(), DEFAULT_SIZE.convertToPixels()) };
+	protected Point[] controlPoints = new Point[] {
+			new Point(0, 0),
+			new Point((int) (DEFAULT_SIZE.convertToPixels() / 2), 0),
+			new Point((int) (DEFAULT_SIZE.convertToPixels() / 2), (int) (DEFAULT_SIZE
+					.convertToPixels())),
+			new Point((int) DEFAULT_SIZE.convertToPixels(), (int) DEFAULT_SIZE.convertToPixels()) };
 
 	protected Color color = getDefaultColor();
+	protected PointCount pointCount = PointCount.FOUR;
 
 	/**
 	 * Draws the specified curve onto graphics.
@@ -37,6 +40,7 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 	 * @param curve
 	 * @param g2d
 	 * @param componentState
+	 * @param theme
 	 */
 	protected abstract void drawCurve(CubicCurve2D curve, Graphics2D g2d,
 			ComponentState componentState);
@@ -59,8 +63,11 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 	}
 
 	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
-			IDrawingObserver drawingObserver) {
+	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
+			Project project, IDrawingObserver drawingObserver) {
+		if (checkPointsClipped(g2d.getClip())) {
+			return;
+		}
 		if (componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING) {
 			// Do not track guidelines.
 			drawingObserver.stopTracking();
@@ -93,35 +100,133 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 		g2d.setComposite(oldComposite);
 	}
 
+	@EditableProperty(name = "Point Count")
+	public PointCount getPointCount() {
+		if (pointCount == null) {
+			pointCount = PointCount.FOUR;
+		}
+		return pointCount;
+	}
+
+	public void setPointCount(PointCount pointCount) {
+		this.pointCount = pointCount;
+		// Reset control points.
+		for (int i = 0; i < getControlPointCount(); i++) {
+			setControlPoint(getControlPoint(i), i);
+		}
+	}
+
 	@Override
 	public int getControlPointCount() {
-		return controlPoints.length;
+		switch (getPointCount()) {
+		case TWO:
+			return 2;
+		case THREE:
+			return 3;
+		case FOUR:
+			return 4;
+		}
+		return 0;
 	}
 
 	@Override
 	public boolean isControlPointSticky(int index) {
-		return index == 0 || index == 3;
+		return index == 0 || index == getControlPointCount() - 1;
 	}
 
 	@Override
 	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
 		return VisibilityPolicy.WHEN_SELECTED;
 	}
-	
+
 	@Override
 	public boolean canControlPointOverlap(int index) {
 		// Only shape control points may overlap.
-		return index == 1 || index == 2;
+		switch (getPointCount()) {
+		case TWO:
+			return false;
+		case THREE:
+			return index == 1;
+		case FOUR:
+			return index == 1 || index == 2;
+		}
+		return false;
 	}
 
 	@Override
 	public Point getControlPoint(int index) {
+		if (index == 0) {
+			return controlPoints[0];
+		}
+		switch (getPointCount()) {
+		case TWO:
+			switch (index) {
+			case 1:
+				return controlPoints[3];
+			}
+		case THREE:
+			switch (index) {
+			case 1:
+				return controlPoints[1];
+			case 2:
+				return controlPoints[3];
+			}
+		case FOUR:
+			switch (index) {
+			case 1:
+				return controlPoints[1];
+			case 2:
+				return controlPoints[2];
+			case 3:
+				return controlPoints[3];
+			}
+		}
 		return controlPoints[index];
 	}
 
 	@Override
 	public void setControlPoint(Point point, int index) {
-		controlPoints[index].setLocation(point);
+		if (index == 0) {
+			controlPoints[0].setLocation(point);
+		} else {
+			switch (getPointCount()) {
+			case TWO:
+				switch (index) {
+				case 1:
+					Point center = new Point((point.x + controlPoints[0].x) / 2,
+							(point.y + controlPoints[0].y) / 2);
+					controlPoints[1].setLocation(center);
+					controlPoints[2].setLocation(center);
+					controlPoints[3].setLocation(point);
+					break;
+				}
+				break;
+			case THREE:
+				switch (index) {
+				case 1:
+					controlPoints[1].setLocation(point);
+					controlPoints[2].setLocation(point);
+					break;
+				case 2:
+					controlPoints[3].setLocation(point);
+					break;
+				}
+				break;
+			case FOUR:
+				switch (index) {
+				case 1:
+					controlPoints[1].setLocation(point);
+					break;
+				case 2:
+					controlPoints[2].setLocation(point);
+					break;
+				case 3:
+					controlPoints[3].setLocation(point);
+					break;
+				}
+				break;
+			}
+		}
 	}
 
 	@EditableProperty
@@ -133,4 +238,12 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 		this.color = color;
 	}
 
+	enum PointCount {
+		TWO, THREE, FOUR;
+
+		@Override
+		public String toString() {
+			return name().substring(0, 1) + name().substring(1).toLowerCase();
+		}
+	}
 }

diylc-core/src/org/diylc/components/AbstractLeadedComponent.java

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

diylc-core/src/org/diylc/components/AbstractSchematicLeadedSymbol.java

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

diylc-core/src/org/diylc/core/AllowAllValidator.java

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

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

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

diylc-core/src/org/diylc/core/IPropertyValidator.java

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

diylc-core/src/org/diylc/core/IView.java

@@ -1,5 +1,10 @@
 package org.diylc.core;
 
+import java.util.List;
+import java.util.Set;
+
+import org.diylc.common.PropertyWrapper;
+
 
 /**
  * Base interface for the main GUI component.
@@ -21,8 +26,13 @@ public interface IView {
 	public static final int NO_OPTION = 1;
 	public static final int CANCEL_OPTION = 2;
 	public static final int OK_OPTION = 0;
+	
+	public static final String CHECK_BOX_MENU_ITEM = "org.diylc.checkBoxMenuItem";
+	public static final String RADIO_BUTTON_GROUP_KEY = "org.diylc.radioButtonGroup";
 
 	void showMessage(String message, String title, int messageType);
 
 	int showConfirmDialog(String message, String title, int optionType, int messageType);
+	
+	boolean editProperties(List<PropertyWrapper> properties, Set<PropertyWrapper> defaultedProperties);
 }

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

@@ -6,7 +6,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.diylc.appframework.update.VersionNumber;
 import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.PositiveMeasureValidator;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 
@@ -26,6 +28,8 @@ public class Project implements Serializable {
 	public static Size DEFAULT_HEIGHT = new Size(21d, SizeUnit.cm);
 	public static Size DEFAULT_GRID_SPACING = new Size(0.1d, SizeUnit.in);
 
+	private VersionNumber fileVersion;
+	
 	private String title;
 	private String author;
 	private String description;
@@ -92,7 +96,7 @@ public class Project implements Serializable {
 		this.height = height;
 	}
 
-	@EditableProperty(name = "Grid spacing")
+	@EditableProperty(name = "Grid spacing", validatorClass = SpacingValidator.class)
 	public Size getGridSpacing() {
 		return gridSpacing;
 	}
@@ -118,10 +122,18 @@ public class Project implements Serializable {
 	public Set<Set<IDIYComponent<?>>> getGroups() {
 		return groups;
 	}
-	
+
 	public Set<Integer> getLockedLayers() {
 		return lockedLayers;
 	}
+	
+	public VersionNumber getFileVersion() {
+		return fileVersion;
+	}
+	
+	public void setFileVersion(VersionNumber fileVersion) {
+		this.fileVersion = fileVersion;
+	}
 
 	@Override
 	public int hashCode() {
@@ -177,12 +189,27 @@ public class Project implements Serializable {
 			return false;
 		return true;
 	}
-	
+
 	@Override
 	public String toString() {
 		return title;
 	}
 
+	public static class SpacingValidator extends PositiveMeasureValidator {
+
+		@Override
+		public void validate(Object value) throws ValidationException {
+			super.validate(value);
+			Size size = (Size) value;
+			if (size.compareTo(new Size(0.5d, SizeUnit.mm)) < 0) {
+				throw new ValidationException("must be at least 0.5mm");
+			}
+			if (size.compareTo(new Size(1d, SizeUnit.in)) > 0) {
+				throw new ValidationException("must be less than 1in");
+			}
+		}
+	}
+
 	// @Override
 	// public Project clone() throws CloneNotSupportedException {
 	// List<IDIYComponent> clonedComponents = new

diylc-core/src/org/diylc/core/Theme.java

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

diylc-core/src/org/diylc/core/ValidationException.java

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

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

@@ -3,6 +3,9 @@ package org.diylc.core.annotations;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import org.diylc.core.AllowAllValidator;
+import org.diylc.core.IPropertyValidator;
+
 /**
  * Used to annotate editable component property. Editable property XYZ must have
  * both getter and setter named <code>getXYZ</code> and <code>setXYZ</code>
@@ -30,4 +33,10 @@ public @interface EditableProperty {
 	 * @return
 	 */
 	boolean defaultable() default true;
+	
+	/**
+	 * Class of validator to use to 
+	 * @return
+	 */
+	Class<? extends IPropertyValidator> validatorClass() default AllowAllValidator.class;
 }

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

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

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

@@ -76,6 +76,6 @@ public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializ
 
 	@Override
 	public String toString() {
-		return format.format(value) + " " + unit;
+		return format.format(value) + unit;
 	}
 }

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

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

diylc-core/src/org/diylc/core/measures/Power.java

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

diylc-core/src/org/diylc/core/measures/PowerUnit.java

@@ -0,0 +1,24 @@
+package org.diylc.core.measures;
+
+public enum PowerUnit implements Unit {
+
+	MW(1e-1, "mW"), W(1, "W"), KW(1e3, "KW");
+
+	double factor;
+	String display;
+
+	private PowerUnit(double factor, String display) {
+		this.factor = factor;
+		this.display = display;
+	}
+
+	@Override
+	public double getFactor() {
+		return factor;
+	}
+
+	@Override
+	public String toString() {
+		return display;
+	}
+}

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

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

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

@@ -2,7 +2,7 @@ package org.diylc.core.measures;
 
 public enum ResistanceUnit implements Unit {
 
-	R(1, "\u03a9"), K(1e3, "K"), M(1e6, "M");
+	R(1, "R"), K(1e3, "K"), M(1e6, "M");
 
 	double factor;
 	String display;

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

@@ -2,7 +2,7 @@ package org.diylc.core.measures;
 
 import org.diylc.utils.Constants;
 
-public class Size extends AbstractMeasure<SizeUnit> {
+public class Size extends AbstractMeasure<SizeUnit> implements Comparable<Size> {
 
 	private static final long serialVersionUID = 1L;
 
@@ -16,13 +16,13 @@ public class Size extends AbstractMeasure<SizeUnit> {
 		// TODO Auto-generated constructor stub
 	}
 
-	public int convertToPixels() {
+	public double convertToPixels() {
 //		double factor = getUnit().getFactor() / SizeUnit.in.getFactor();
 //		int grids = (int) (factor * getValue() * Constants.GRIDS_PER_INCH);
 //		double remainder = (factor * getValue() * Constants.GRIDS_PER_INCH) - grids;
 //		return (int) Math.round(Constants.PIXELS_PER_INCH / Constants.GRIDS_PER_INCH
 //				* (grids + remainder));
-		return (int) (getValue() * getUnit().getFactor() / SizeUnit.in.getFactor() * Constants.PIXELS_PER_INCH);
+		return getValue() * getUnit().getFactor() / SizeUnit.in.getFactor() * Constants.PIXELS_PER_INCH;
 	}
 
 	@Override
@@ -39,4 +39,9 @@ public class Size extends AbstractMeasure<SizeUnit> {
 		}
 		throw new IllegalArgumentException("Could not parse size: " + value);
 	}
+
+	@Override
+	public int compareTo(Size o) {
+		return new Double(value * unit.getFactor()).compareTo(o.getValue() * o.getUnit().getFactor());
+	}
 }

diylc-core/src/org/diylc/core/measures/Voltage.java

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

diylc-core/src/org/diylc/core/measures/VoltageUnit.java

@@ -0,0 +1,24 @@
+package org.diylc.core.measures;
+
+public enum VoltageUnit implements Unit {
+
+	MV(1e-1, "mV"), V(1, "V"), KV(1e3, "KV");
+
+	double factor;
+	String display;
+
+	private VoltageUnit(double factor, String display) {
+		this.factor = factor;
+		this.display = display;
+	}
+
+	@Override
+	public double getFactor() {
+		return factor;
+	}
+
+	@Override
+	public String toString() {
+		return display;
+	}
+}

diylc-core/src/org/diylc/images/IconLoader.java

@@ -30,7 +30,8 @@ public enum IconLoader {
 			"faq.png"), Component("component.png"), Plugin("plugin.png"), Manual("manual.png"), Donate(
 			"donate.png"), Bug("bug.png"), IconLarge("icon_large.png"), IconMedium(
 			"icon_medium.png"), IconSmall("icon_small.png"), DocumentEdit("document_edit.png"), EditComponent(
-			"edit_component.png"), Size("size.png"), Front("front.png"), Back("back.png");
+			"edit_component.png"), Size("size.png"), Front("front.png"), Back("back.png"), Pens(
+			"pens.png"), Sort("sort.png"), ElementsSelection("elements_selection.png");
 
 	protected String name;