diy-layout-creator --username bancika@gmail.com/DIYLC/.gitignore

@@ -1 +0,0 @@
-/bin/

diy-layout-creator --username bancika@gmail.com/DIYLC/config.xml

@@ -1,86 +0,0 @@
-<map>
-  <entry>
-    <string>default.org.diylc.components.passive.TrimmerPotentiometer:Type</string>
-    <org.diylc.components.passive.TrimmerPotentiometer_-TrimmerType>FLAT_LARGE</org.diylc.components.passive.TrimmerPotentiometer_-TrimmerType>
-  </entry>
-  <entry>
-    <string>lastPath</string>
-    <string>C:\Documents and Settings\Branislav Stojkovic\My Documents\Downloads</string>
-  </entry>
-  <entry>
-    <string>abnormalExit</string>
-    <boolean>false</boolean>
-  </entry>
-  <entry>
-    <string>stickyPoints</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>theme</string>
-    <org.diylc.core.Theme>
-      <name>Light</name>
-      <bgColor>
-        <red>255</red>
-        <green>255</green>
-        <blue>255</blue>
-        <alpha>255</alpha>
-      </bgColor>
-      <gridColor>
-        <red>240</red>
-        <green>240</green>
-        <blue>240</blue>
-        <alpha>240</alpha>
-      </gridColor>
-      <outlineColor>
-        <red>0</red>
-        <green>0</green>
-        <blue>0</blue>
-        <alpha>255</alpha>
-      </outlineColor>
-    </org.diylc.core.Theme>
-  </entry>
-  <entry>
-    <string>antiAliasing</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>snapToGrid</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>hiQualityRender</string>
-    <boolean>false</boolean>
-  </entry>
-  <entry>
-    <string>outline</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>exportGrid</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>autoEdit</string>
-    <boolean>false</boolean>
-  </entry>
-  <entry>
-    <string>wheelZoom</string>
-    <boolean>false</boolean>
-  </entry>
-  <entry>
-    <string>default.org.diylc.components.misc.Label:Font Bold</string>
-    <boolean>false</boolean>
-  </entry>
-  <entry>
-    <string>autoCreatePads</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>continuousCreation</string>
-    <boolean>true</boolean>
-  </entry>
-  <entry>
-    <string>showTemplatesAtStartup</string>
-    <boolean>false</boolean>
-  </entry>
-</map>

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/EventType.java

@@ -1,83 +0,0 @@
-package org.diylc.common;
-
-import java.awt.Rectangle;
-import java.awt.geom.Point2D;
-
-import org.diylc.core.Project;
-
-/**
- * Enumerates all possible events between {@link IPlugInPort} and
- * {@link IPlugIn}. Some events overlap so be careful which ones you subscribe
- * for and how you process them.
- * 
- * @author Branislav Stojkovic
- */
-public enum EventType {
-
-	/**
-	 * Called when zoom level changes. Typically only one parameter of type
-	 * {@link Double} is passed with new zoom level.
-	 */
-	ZOOM_CHANGED,
-	/**
-	 * Called when a new project is loaded. New {@link Project} is the first
-	 * parameter. Boolean flag is the second parameter and it's true when new
-	 * project is loaded, false when the same project has been either reloaded
-	 * or loaded with undo/redo operations.
-	 */
-	PROJECT_LOADED,
-	/**
-	 * Called when either current file name or modified flag are changed. The
-	 * first parameter is the current file name, the second one is a boolean
-	 * modified flag.
-	 */
-	FILE_STATUS_CHANGED,
-	/**
-	 * Called when selection rectangle is changed. Object of type
-	 * {@link Rectangle} is the only parameter and it contains the new selection
-	 * rectangle.
-	 */
-	SELECTION_RECT_CHANGED,
-	/**
-	 * Called when component selection is changed. New
-	 * {@link ComponentSelection} is attached as a parameter.
-	 */
-	SELECTION_CHANGED,
-	/**
-	 * Called when selection size changes, together with a {@link Point2D}
-	 * object containing selection size (x = width, y = height). Size is
-	 * expressed in the default measure (cm for metric, inches for imperial).
-	 */
-	REPAINT,
-	/**
-	 * Called when new component slot has been changed. The only parameter is
-	 * {@link ComponentType} and may be null.
-	 */
-	SLOT_CHANGED,
-	/**
-	 * Called when the current project has been modified. Two instances of
-	 * {@link Project} are passed as parameters, one before and one after the
-	 * change. The third parameter is a string containing change description.
-	 */
-	PROJECT_MODIFIED,
-	/**
-	 * Called when control points under the cursor are changed. A single
-	 * parameter is passed, an instance of
-	 * <code>Map<IDIYComponent<?>, Set<Integer>></code> containing all the
-	 * components and indices of their control points that are under the cursor.
-	 */
-	AVAILABLE_CTRL_POINTS_CHANGED,
-	/**
-	 * Called when mouse cursor is moved. Point object is passed, containing the
-	 * current cursor location (not taking zoom into account).
-	 */
-	MOUSE_MOVED,
-	/**
-	 * Called when a layer status is changed. The first parameter is a set of indices of locked layers. All layers not included are considered unlocked.
-	 */
-	LAYER_STATE_CHANGED,
-	/**
-	 * Called to update the status message. New status message is passed as a first parameter.
-	 */
-	STATUS_MESSAGE_CHANGED;
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ITask.java

@@ -1,34 +0,0 @@
-package org.diylc.common;
-
-/**
- * Abstract layer between the app and platform worker thread implementation.
- * 
- * @author Branislav Stojkovic
- * 
- * @param <T>
- */
-public interface ITask<T> {
-
-	/**
-	 * Runs in background thread.
-	 * 
-	 * @return
-	 * @throws Exception
-	 */
-	T doInBackground() throws Exception;
-
-	/**
-	 * Called if background thread fails.
-	 * 
-	 * @param e
-	 */
-	void failed(Exception e);
-
-	/**
-	 * Called if background thread is executed correctly, the result is passed
-	 * as a parameter.
-	 * 
-	 * @param result
-	 */
-	void complete(T result);
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/LabelPosition.java

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

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ObjectCache.java

@@ -1,39 +0,0 @@
-package org.diylc.common;
-
-import java.awt.AlphaComposite;
-import java.awt.BasicStroke;
-import java.awt.Stroke;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Repository for object that may be reused, such as {@link Stroke} or
- * {@link AlphaComposite}.
- * 
- * @author Branislav Stojkovic
- */
-public class ObjectCache {
-
-	private static ObjectCache instance;
-
-	public static ObjectCache getInstance() {
-		if (instance == null) {
-			instance = new ObjectCache();
-		}
-		return instance;
-	}
-
-	private ObjectCache() {
-	}
-
-	private Map<Integer, Stroke> basicStrokeMap = new HashMap<Integer, Stroke>();
-
-	public Stroke fetchBasicStroke(int width) {
-		if (basicStrokeMap.containsKey(width)) {
-			return basicStrokeMap.get(width);
-		}
-		Stroke stroke = new BasicStroke(width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
-		basicStrokeMap.put(width, stroke);
-		return stroke;
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/OrientationHV.java

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

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/common/ResistorColorCode.java

@@ -1,14 +0,0 @@
-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();
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractCurvedComponent.java

@@ -1,249 +0,0 @@
-package org.diylc.components;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.geom.CubicCurve2D;
-
-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;
-import org.diylc.utils.Constants;
-
-public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComponent<T> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Color GUIDELINE_COLOR = Color.blue;
-	public static Size DEFAULT_SIZE = new Size(1d, SizeUnit.in);
-
-	protected Point[] controlPoints = new Point[] {
-			new Point(0, 0),
-			new Point((int) (DEFAULT_SIZE.convertToPixels() / 2), 0),
-			new Point((int) (DEFAULT_SIZE.convertToPixels() / 2), (int) (DEFAULT_SIZE
-					.convertToPixels())),
-			new Point((int) DEFAULT_SIZE.convertToPixels(), (int) DEFAULT_SIZE.convertToPixels()) };
-
-	protected Color color = getDefaultColor();
-	protected PointCount pointCount = PointCount.FOUR;
-
-	/**
-	 * Draws the specified curve onto graphics.
-	 * 
-	 * @param curve
-	 * @param g2d
-	 * @param componentState
-	 * @param theme
-	 */
-	protected abstract void drawCurve(CubicCurve2D curve, Graphics2D g2d,
-			ComponentState componentState);
-
-	/**
-	 * @return default color.
-	 */
-	protected abstract Color getDefaultColor();
-
-	@Override
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		g2d.setColor(getDefaultColor().darker());
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(3));
-		CubicCurve2D curve = new CubicCurve2D.Double(1, height - 1, width / 4, height / 3,
-				3 * width / 4, 2 * height / 3, width - 1, 1);
-		g2d.draw(curve);
-		g2d.setColor(getDefaultColor());
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-		g2d.draw(curve);
-	}
-
-	@Override
-	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();
-			g2d.setStroke(Constants.DASHED_STROKE);
-			g2d.setColor(GUIDELINE_COLOR);
-			g2d.drawLine(controlPoints[0].x, controlPoints[0].y, controlPoints[1].x,
-					controlPoints[1].y);
-			g2d.drawLine(controlPoints[1].x, controlPoints[1].y, controlPoints[2].x,
-					controlPoints[2].y);
-			g2d.drawLine(controlPoints[2].x, controlPoints[2].y, controlPoints[3].x,
-					controlPoints[3].y);
-			drawingObserver.startTracking();
-		}
-		CubicCurve2D curve = new CubicCurve2D.Double(controlPoints[0].x, controlPoints[0].y,
-				controlPoints[1].x, controlPoints[1].y, controlPoints[2].x, controlPoints[2].y,
-				controlPoints[3].x, controlPoints[3].y);
-
-		Composite oldComposite = g2d.getComposite();
-		if (alpha < MAX_ALPHA) {
-			g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
-					/ MAX_ALPHA));
-		}
-		// g2d.setColor(color.darker());
-		// g2d.setStroke(new BasicStroke(thickness));
-		// g2d.draw(path);
-		// g2d.setColor(color);
-		// g2d.setStroke(new BasicStroke(thickness - 2));
-		// g2d.draw(path);
-		drawCurve(curve, g2d, componentState);
-		g2d.setComposite(oldComposite);
-	}
-
-	@EditableProperty(name = "Point Count")
-	public PointCount getPointCount() {
-		if (pointCount == null) {
-			pointCount = PointCount.FOUR;
-		}
-		return pointCount;
-	}
-
-	public void setPointCount(PointCount pointCount) {
-		this.pointCount = pointCount;
-		// Reset control points.
-		for (int i = 0; i < getControlPointCount(); i++) {
-			setControlPoint(getControlPoint(i), i);
-		}
-	}
-
-	@Override
-	public int getControlPointCount() {
-		switch (getPointCount()) {
-		case TWO:
-			return 2;
-		case THREE:
-			return 3;
-		case FOUR:
-			return 4;
-		}
-		return 0;
-	}
-
-	@Override
-	public boolean isControlPointSticky(int index) {
-		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.
-		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) {
-		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
-	public Color getColor() {
-		return color;
-	}
-
-	public void setColor(Color color) {
-		this.color = color;
-	}
-
-	enum PointCount {
-		TWO, THREE, FOUR;
-
-		@Override
-		public String toString() {
-			return name().substring(0, 1) + name().substring(1).toLowerCase();
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractLeadedComponent.java

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

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractSchematicLeadedSymbol.java

@@ -1,72 +0,0 @@
-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;
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/AllowAllValidator.java

@@ -1,13 +0,0 @@
-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 {
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IPropertyValidator.java

@@ -1,16 +0,0 @@
-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;
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IView.java

@@ -1,38 +0,0 @@
-package org.diylc.core;
-
-import java.util.List;
-import java.util.Set;
-
-import org.diylc.common.PropertyWrapper;
-
-
-/**
- * Base interface for the main GUI component.
- * 
- * @author Branislav Stojkovic
- */
-public interface IView {
-
-	public static final int ERROR_MESSAGE = 0;
-	public static final int INFORMATION_MESSAGE = 1;
-	public static final int WARNING_MESSAGE = 2;
-	public static final int QUESTION_MESSAGE = 3;
-	public static final int PLAIN_MESSAGE = -1;
-	public static final int DEFAULT_OPTION = -1;
-	public static final int YES_NO_OPTION = 0;
-	public static final int YES_NO_CANCEL_OPTION = 1;
-	public static final int OK_CANCEL_OPTION = 2;
-	public static final int YES_OPTION = 0;
-	public static final int NO_OPTION = 1;
-	public static final int CANCEL_OPTION = 2;
-	public static final int OK_OPTION = 0;
-	
-	public static final String CHECK_BOX_MENU_ITEM = "org.diylc.checkBoxMenuItem";
-	public static final String RADIO_BUTTON_GROUP_KEY = "org.diylc.radioButtonGroup";
-
-	void showMessage(String message, String title, int messageType);
-
-	int showConfirmDialog(String message, String title, int optionType, int messageType);
-	
-	boolean editProperties(List<PropertyWrapper> properties, Set<PropertyWrapper> defaultedProperties);
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/Theme.java

@@ -1,86 +0,0 @@
-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;
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/ValidationException.java

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

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/PositiveMeasureValidator.java

@@ -1,20 +0,0 @@
-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.");
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/measures/Resistance.java

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

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/ComparatorFactory.java

@@ -1,88 +0,0 @@
-package org.diylc.presenter;
-
-import java.util.Comparator;
-
-import org.diylc.common.ComponentType;
-import org.diylc.common.PropertyWrapper;
-import org.diylc.core.IDIYComponent;
-
-public class ComparatorFactory {
-
-	private static ComparatorFactory instance;
-
-	private Comparator<IDIYComponent<?>> componentNameComparator;
-	private Comparator<ComponentType> componentTypeComparator;
-	private Comparator<PropertyWrapper> propertyNameComparator;
-	private Comparator<IDIYComponent<?>> componentZOrderComparator;
-
-	public static ComparatorFactory getInstance() {
-		if (instance == null) {
-			instance = new ComparatorFactory();
-		}
-		return instance;
-	}
-
-	public Comparator<IDIYComponent<?>> getComponentNameComparator() {
-		if (componentNameComparator == null) {
-			componentNameComparator = new Comparator<IDIYComponent<?>>() {
-
-				@Override
-				public int compare(IDIYComponent<?> o1, IDIYComponent<?> o2) {
-					String name1 = o1.getName();
-					String name2 = o2.getName();
-					if (name1 == null || name2 == null) {
-						return 0;
-					}
-					return name1.compareToIgnoreCase(name2);
-				}
-			};
-		}
-		return componentNameComparator;
-	}
-
-	public Comparator<ComponentType> getComponentTypeComparator() {
-		if (componentTypeComparator == null) {
-			componentTypeComparator = new Comparator<ComponentType>() {
-
-				@Override
-				public int compare(ComponentType o1, ComponentType o2) {
-					return o1.getName().compareToIgnoreCase(o2.getName());
-				}
-			};
-		}
-		return componentTypeComparator;
-	}
-
-	public Comparator<PropertyWrapper> getPropertyNameComparator() {
-		if (propertyNameComparator == null) {
-			propertyNameComparator = new Comparator<PropertyWrapper>() {
-
-				@Override
-				public int compare(PropertyWrapper o1, PropertyWrapper o2) {
-					return o1.getName().compareToIgnoreCase(o2.getName());
-				}
-
-			};
-		}
-		return propertyNameComparator;
-	}
-
-	public Comparator<IDIYComponent<?>> getComponentZOrderComparator() {
-		if (componentZOrderComparator == null) {
-			componentZOrderComparator = new Comparator<IDIYComponent<?>>() {
-
-				@Override
-				public int compare(IDIYComponent<?> o1, IDIYComponent<?> o2) {
-					ComponentType type1 = ComponentProcessor.getInstance()
-							.extractComponentTypeFrom(
-									(Class<? extends IDIYComponent<?>>) o1.getClass());
-					ComponentType type2 = ComponentProcessor.getInstance()
-							.extractComponentTypeFrom(
-									(Class<? extends IDIYComponent<?>>) o2.getClass());
-					return new Double(type1.getZOrder()).compareTo(type2.getZOrder());
-				}
-			};
-		}
-		return componentZOrderComparator;
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/PointConverter.java

@@ -1,41 +0,0 @@
-package org.diylc.presenter;
-
-import java.awt.Point;
-
-import org.diylc.utils.Constants;
-
-import com.thoughtworks.xstream.converters.Converter;
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-
-/**
- * Serializes {@link Point} objects by converting coordinates from pixels to
- * inches, thus avoiding the resolution to affect point placement.
- * 
- * @author Branislav Stojkovic
- */
-public class PointConverter implements Converter {
-
-	@Override
-	public void marshal(Object object, HierarchicalStreamWriter writer, MarshallingContext context) {
-		Point point = (Point) object;
-		writer.addAttribute("x", Double.toString(1d * point.x / Constants.PIXELS_PER_INCH));
-		writer.addAttribute("y", Double.toString(1d * point.y / Constants.PIXELS_PER_INCH));
-	}
-
-	@Override
-	public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
-		double x = Double.parseDouble(reader.getAttribute("x"));
-		double y = Double.parseDouble(reader.getAttribute("y"));
-		return new Point((int) Math.round(x * Constants.PIXELS_PER_INCH), (int) Math.round(y
-				* Constants.PIXELS_PER_INCH));
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public boolean canConvert(Class clazz) {
-		return Point.class.isAssignableFrom(clazz);
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/ActionFactory.java

@@ -1,870 +0,0 @@
-package org.diylc.swing;
-
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.ClipboardOwner;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.print.PrinterException;
-import java.io.File;
-import java.util.List;
-
-import javax.swing.AbstractAction;
-import javax.swing.KeyStroke;
-
-import org.apache.log4j.Logger;
-import org.diylc.common.IPlugInPort;
-import org.diylc.common.ITask;
-import org.diylc.common.PropertyWrapper;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.IView;
-import org.diylc.core.Theme;
-import org.diylc.images.IconLoader;
-import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.gui.editor.PropertyEditorDialog;
-import org.diylc.swing.plugins.edit.ComponentTransferable;
-import org.diylc.swing.plugins.file.BomDialog;
-import org.diylc.swing.plugins.file.BomEntry;
-import org.diylc.swing.plugins.file.BomMaker;
-import org.diylc.swing.plugins.file.FileFilterEnum;
-
-import com.diyfever.gui.ButtonDialog;
-import com.diyfever.gui.IDrawingProvider;
-import com.diyfever.gui.export.DrawingExporter;
-import com.diyfever.gui.miscutils.ConfigurationManager;
-import com.rits.cloning.Cloner;
-
-public class ActionFactory {
-
-	private static final Logger LOG = Logger.getLogger(ActionFactory.class);
-
-	private static ActionFactory instance;
-	private static Cloner cloner = new Cloner();
-
-	public static ActionFactory getInstance() {
-		if (instance == null) {
-			instance = new ActionFactory();
-		}
-		return instance;
-	}
-
-	private ActionFactory() {
-	}
-
-	// File menu actions.
-
-	public NewAction createNewAction(IPlugInPort plugInPort) {
-		return new NewAction(plugInPort);
-	}
-
-	public OpenAction createOpenAction(IPlugInPort plugInPort, ISwingUI swingUI) {
-		return new OpenAction(plugInPort, swingUI);
-	}
-
-	public SaveAction createSaveAction(IPlugInPort plugInPort, ISwingUI swingUI) {
-		return new SaveAction(plugInPort, swingUI);
-	}
-
-	public SaveAsAction createSaveAsAction(IPlugInPort plugInPort, ISwingUI swingUI) {
-		return new SaveAsAction(plugInPort, swingUI);
-	}
-
-	public CreateBomAction createBomAction(IPlugInPort plugInPort) {
-		return new CreateBomAction(plugInPort);
-	}
-
-	public ExportPDFAction createExportPDFAction(IDrawingProvider drawingProvider, ISwingUI swingUI) {
-		return new ExportPDFAction(drawingProvider, swingUI);
-	}
-
-	public ExportPNGAction createExportPNGAction(IDrawingProvider drawingProvider, ISwingUI swingUI) {
-		return new ExportPNGAction(drawingProvider, swingUI);
-	}
-
-	public PrintAction createPrintAction(IDrawingProvider drawingProvider) {
-		return new PrintAction(drawingProvider);
-	}
-
-	public ExitAction createExitAction(IPlugInPort plugInPort) {
-		return new ExitAction(plugInPort);
-	}
-
-	// Edit menu actions.
-
-	public CutAction createCutAction(IPlugInPort plugInPort, Clipboard clipboard,
-			ClipboardOwner clipboardOwner) {
-		return new CutAction(plugInPort, clipboard, clipboardOwner);
-	}
-
-	public CopyAction createCopyAction(IPlugInPort plugInPort, Clipboard clipboard,
-			ClipboardOwner clipboardOwner) {
-		return new CopyAction(plugInPort, clipboard, clipboardOwner);
-	}
-
-	public PasteAction createPasteAction(IPlugInPort plugInPort, Clipboard clipboard) {
-		return new PasteAction(plugInPort, clipboard);
-	}
-
-	public SelectAllAction createSelectAllAction(IPlugInPort plugInPort) {
-		return new SelectAllAction(plugInPort);
-	}
-
-	public GroupAction createGroupAction(IPlugInPort plugInPort) {
-		return new GroupAction(plugInPort);
-	}
-
-	public UngroupAction createUngroupAction(IPlugInPort plugInPort) {
-		return new UngroupAction(plugInPort);
-	}
-
-	public EditProjectAction createEditProjectAction(IPlugInPort plugInPort) {
-		return new EditProjectAction(plugInPort);
-	}
-
-	public EditSelectionAction createEditSelectionAction(IPlugInPort plugInPort) {
-		return new EditSelectionAction(plugInPort);
-	}
-
-	public DeleteSelectionAction createDeleteSelectionAction(IPlugInPort plugInPort) {
-		return new DeleteSelectionAction(plugInPort);
-	}
-
-	public SendToBackAction createSendToBackAction(IPlugInPort plugInPort) {
-		return new SendToBackAction(plugInPort);
-	}
-
-	public BringToFrontAction createBringToFrontAction(IPlugInPort plugInPort) {
-		return new BringToFrontAction(plugInPort);
-	}
-
-	// Config actions.
-
-	public ConfigAction createConfigAction(IPlugInPort plugInPort, String title, String configKey,
-			boolean defaultValue) {
-		return new ConfigAction(plugInPort, title, configKey, defaultValue);
-	}
-	
-	public ThemeAction createThemeAction(IPlugInPort plugInPort, Theme theme) {
-		return new ThemeAction(plugInPort, theme);
-	}
-	
-	public RenumberAction createRenumberAction(IPlugInPort plugInPort, boolean xAxisFirst) {
-		return new RenumberAction(plugInPort, xAxisFirst);
-	}
-
-	// File menu actions.
-
-	public static class NewAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-
-		public NewAction(IPlugInPort plugInPort) {
-			super();
-			this.plugInPort = plugInPort;
-			putValue(AbstractAction.NAME, "New");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_N,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentPlainYellow.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("NewAction triggered");
-			if (!plugInPort.allowFileAction()) {
-				return;
-			}
-			plugInPort.createNewProject();
-			List<PropertyWrapper> properties = plugInPort.getProjectProperties();
-			PropertyEditorDialog editor = DialogFactory.getInstance().createPropertyEditorDialog(
-					properties, "Edit Project");
-			editor.setVisible(true);
-			if (ButtonDialog.OK.equals(editor.getSelectedButtonCaption())) {
-				plugInPort.applyPropertiesToProject(properties);
-			}
-			// Save default values.
-			for (PropertyWrapper property : editor.getDefaultedProperties()) {
-				if (property.getValue() != null) {
-					plugInPort.setProjectDefaultPropertyValue(property.getName(), property
-							.getValue());
-				}
-			}
-		}
-	}
-
-	public static class OpenAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-		private ISwingUI swingUI;
-
-		public OpenAction(IPlugInPort plugInPort, ISwingUI swingUI) {
-			super();
-			this.plugInPort = plugInPort;
-			this.swingUI = swingUI;
-			putValue(AbstractAction.NAME, "Open");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_O,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.FolderOut.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("OpenAction triggered");
-			if (!plugInPort.allowFileAction()) {
-				return;
-			}
-			final File file = DialogFactory.getInstance().showOpenDialog(
-					FileFilterEnum.DIY.getFilter(), null, FileFilterEnum.DIY.getExtensions()[0],
-					null);
-			if (file != null) {
-				swingUI.executeBackgroundTask(new ITask<Void>() {
-
-					@Override
-					public Void doInBackground() throws Exception {
-						LOG.debug("Opening from " + file.getAbsolutePath());
-						plugInPort.loadProjectFromFile(file.getAbsolutePath());
-						return null;
-					}
-
-					@Override
-					public void complete(Void result) {
-					}
-
-					@Override
-					public void failed(Exception e) {
-						swingUI.showMessage("Could not open file. " + e.getMessage(), "Error",
-								ISwingUI.ERROR_MESSAGE);
-					}
-				});
-			}
-		}
-	}
-
-	public static class SaveAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-		private ISwingUI swingUI;
-
-		public SaveAction(IPlugInPort plugInPort, ISwingUI swingUI) {
-			super();
-			this.plugInPort = plugInPort;
-			this.swingUI = swingUI;
-			putValue(AbstractAction.NAME, "Save");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.DiskBlue.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("SaveAction triggered");
-			if (plugInPort.getCurrentFileName() == null) {
-				final File file = DialogFactory.getInstance().showSaveDialog(
-						FileFilterEnum.DIY.getFilter(), null,
-						FileFilterEnum.DIY.getExtensions()[0], null);
-				if (file != null) {
-					swingUI.executeBackgroundTask(new ITask<Void>() {
-
-						@Override
-						public Void doInBackground() throws Exception {
-							LOG.debug("Saving to " + file.getAbsolutePath());
-							plugInPort.saveProjectToFile(file.getAbsolutePath(), false);
-							return null;
-						}
-
-						@Override
-						public void complete(Void result) {
-						}
-
-						@Override
-						public void failed(Exception e) {
-							swingUI.showMessage("Could not save to file. " + e.getMessage(),
-									"Error", ISwingUI.ERROR_MESSAGE);
-						}
-					});
-				}
-			} else {
-				swingUI.executeBackgroundTask(new ITask<Void>() {
-
-					@Override
-					public Void doInBackground() throws Exception {
-						LOG.debug("Saving to " + plugInPort.getCurrentFileName());
-						plugInPort.saveProjectToFile(plugInPort.getCurrentFileName(), false);
-						return null;
-					}
-
-					@Override
-					public void complete(Void result) {
-					}
-
-					@Override
-					public void failed(Exception e) {
-						swingUI.showMessage("Could not save to file. " + e.getMessage(), "Error",
-								ISwingUI.ERROR_MESSAGE);
-					}
-				});
-			}
-		}
-	}
-
-	public static class SaveAsAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-		private ISwingUI swingUI;
-
-		public SaveAsAction(IPlugInPort plugInPort, ISwingUI swingUI) {
-			super();
-			this.plugInPort = plugInPort;
-			this.swingUI = swingUI;
-			putValue(AbstractAction.NAME, "Save As");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_S,
-					ActionEvent.CTRL_MASK | ActionEvent.SHIFT_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.DiskBlue.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("SaveAsAction triggered");
-			final File file = DialogFactory.getInstance().showSaveDialog(
-					FileFilterEnum.DIY.getFilter(), null, FileFilterEnum.DIY.getExtensions()[0],
-					null);
-			if (file != null) {
-				swingUI.executeBackgroundTask(new ITask<Void>() {
-
-					@Override
-					public Void doInBackground() throws Exception {
-						LOG.debug("Saving to " + file.getAbsolutePath());
-						plugInPort.saveProjectToFile(file.getAbsolutePath(), false);
-						return null;
-					}
-
-					@Override
-					public void complete(Void result) {
-					}
-
-					@Override
-					public void failed(Exception e) {
-						swingUI.showMessage("Could not save to file. " + e.getMessage(), "Error",
-								ISwingUI.ERROR_MESSAGE);
-					}
-				});
-			}
-		}
-	}
-
-	public static class CreateBomAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-
-		public CreateBomAction(IPlugInPort plugInPort) {
-			super();
-			this.plugInPort = plugInPort;
-			putValue(AbstractAction.NAME, "Create B.O.M.");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.BOM.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("CreateBomAction triggered");
-			List<BomEntry> bom = BomMaker.getInstance().createBom(
-					plugInPort.getCurrentProject().getComponents());
-			BomDialog dialog = DialogFactory.getInstance().createBomDialog(bom);
-			dialog.setVisible(true);
-		}
-	}
-
-	public static class ExportPDFAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IDrawingProvider drawingProvider;
-		private ISwingUI swingUI;
-
-		public ExportPDFAction(IDrawingProvider drawingProvider, ISwingUI swingUI) {
-			super();
-			this.drawingProvider = drawingProvider;
-			this.swingUI = swingUI;
-			putValue(AbstractAction.NAME, "Export to PDF");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.PDF.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("ExportPDFAction triggered");
-			final File file = DialogFactory.getInstance().showSaveDialog(
-					FileFilterEnum.PDF.getFilter(), null, FileFilterEnum.PDF.getExtensions()[0],
-					null);
-			if (file != null) {
-				swingUI.executeBackgroundTask(new ITask<Void>() {
-
-					@Override
-					public Void doInBackground() throws Exception {
-						LOG.debug("Exporting to " + file.getAbsolutePath());
-						DrawingExporter.getInstance().exportPDF(
-								ExportPDFAction.this.drawingProvider, file);
-						return null;
-					}
-
-					@Override
-					public void complete(Void result) {
-					}
-
-					@Override
-					public void failed(Exception e) {
-						swingUI.showMessage("Could not export to PDF. " + e.getMessage(), "Error",
-								ISwingUI.ERROR_MESSAGE);
-					}
-				});
-			}
-		}
-	}
-
-	public static class ExportPNGAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IDrawingProvider drawingProvider;
-		private ISwingUI swingUI;
-
-		public ExportPNGAction(IDrawingProvider drawingProvider, ISwingUI swingUI) {
-			super();
-			this.drawingProvider = drawingProvider;
-			this.swingUI = swingUI;
-			putValue(AbstractAction.NAME, "Export to PNG");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Image.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("ExportPNGAction triggered");
-			final File file = DialogFactory.getInstance().showSaveDialog(
-					FileFilterEnum.PNG.getFilter(), null, FileFilterEnum.PNG.getExtensions()[0],
-					null);
-			if (file != null) {
-				swingUI.executeBackgroundTask(new ITask<Void>() {
-
-					@Override
-					public Void doInBackground() throws Exception {
-						LOG.debug("Exporting to " + file.getAbsolutePath());
-						DrawingExporter.getInstance().exportPNG(
-								ExportPNGAction.this.drawingProvider, file);
-						return null;
-					}
-
-					@Override
-					public void complete(Void result) {
-					}
-
-					@Override
-					public void failed(Exception e) {
-						swingUI.showMessage("Could not export to PNG. " + e.getMessage(), "Error",
-								ISwingUI.ERROR_MESSAGE);
-					}
-				});
-			}
-		}
-	}
-
-	public static class PrintAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IDrawingProvider drawingProvider;
-
-		public PrintAction(IDrawingProvider drawingProvider) {
-			super();
-			this.drawingProvider = drawingProvider;
-			putValue(AbstractAction.NAME, "Print...");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_P,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Print.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("ExportPNGAction triggered");
-			try {
-				DrawingExporter.getInstance().print(this.drawingProvider);
-			} catch (PrinterException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
-		}
-	}
-
-	public static class ExitAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-
-		public ExitAction(IPlugInPort plugInPort) {
-			super();
-			this.plugInPort = plugInPort;
-			putValue(AbstractAction.NAME, "Exit");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Exit.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			if (plugInPort.allowFileAction()) {
-				System.exit(0);
-			}
-		}
-	}
-
-	// Edit menu actions.
-
-	public static class CutAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-		private Clipboard clipboard;
-		private ClipboardOwner clipboardOwner;
-
-		public CutAction(IPlugInPort plugInPort, Clipboard clipboard, ClipboardOwner clipboardOwner) {
-			super();
-			this.plugInPort = plugInPort;
-			this.clipboard = clipboard;
-			this.clipboardOwner = clipboardOwner;
-			putValue(AbstractAction.NAME, "Cut");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_X,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Cut.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Cut triggered");
-			clipboard.setContents(new ComponentTransferable(cloner.deepClone(plugInPort
-					.getSelectedComponents())), clipboardOwner);
-			plugInPort.deleteSelectedComponents();
-		}
-	}
-
-	public static class CopyAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-		private Clipboard clipboard;
-		private ClipboardOwner clipboardOwner;
-
-		public CopyAction(IPlugInPort plugInPort, Clipboard clipboard, ClipboardOwner clipboardOwner) {
-			super();
-			this.plugInPort = plugInPort;
-			this.clipboard = clipboard;
-			this.clipboardOwner = clipboardOwner;
-			putValue(AbstractAction.NAME, "Copy");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_C,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Copy.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Copy triggered");
-			clipboard.setContents(new ComponentTransferable(cloner.deepClone(plugInPort
-					.getSelectedComponents())), clipboardOwner);
-		}
-	}
-
-	public static class PasteAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-		private Clipboard clipboard;
-
-		public PasteAction(IPlugInPort plugInPort, Clipboard clipboard) {
-			super();
-			this.plugInPort = plugInPort;
-			this.clipboard = clipboard;
-			putValue(AbstractAction.NAME, "Paste");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_V,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Paste.getIcon());
-		}
-
-		@SuppressWarnings("unchecked")
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Paste triggered");
-			try {
-				List<IDIYComponent<?>> components = (List<IDIYComponent<?>>) clipboard
-						.getData(ComponentTransferable.listFlavor);
-				plugInPort.pasteComponents(cloner.deepClone(components));
-			} catch (Exception ex) {
-				LOG.error("Coule not paste.", ex);
-			}
-		}
-	}
-
-	public static class SelectAllAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-
-		public SelectAllAction(IPlugInPort plugInPort) {
-			super();
-			this.plugInPort = plugInPort;
-			putValue(AbstractAction.NAME, "Select All");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_A,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Selection.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Select All triggered");
-			plugInPort.selectAll();
-		}
-	}
-
-	public static class GroupAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-
-		public GroupAction(IPlugInPort plugInPort) {
-			super();
-			this.plugInPort = plugInPort;
-			putValue(AbstractAction.NAME, "Group Selection");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_G,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Group.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Group Selection triggered");
-			plugInPort.groupSelectedComponents();
-		}
-	}
-
-	public static class UngroupAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-
-		public UngroupAction(IPlugInPort plugInPort) {
-			super();
-			this.plugInPort = plugInPort;
-			putValue(AbstractAction.NAME, "Ungroup Selection");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_U,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Ungroup.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Ungroup Selection triggered");
-			plugInPort.ungroupSelectedComponents();
-		}
-	}
-
-	public static class EditProjectAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-
-		public EditProjectAction(IPlugInPort plugInPort) {
-			super();
-			this.plugInPort = plugInPort;
-			putValue(AbstractAction.NAME, "Edit Project");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.DocumentEdit.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Edit Project triggered");
-			List<PropertyWrapper> properties = plugInPort.getProjectProperties();
-			PropertyEditorDialog editor = DialogFactory.getInstance().createPropertyEditorDialog(
-					properties, "Edit Project");
-			editor.setVisible(true);
-			if (ButtonDialog.OK.equals(editor.getSelectedButtonCaption())) {
-				plugInPort.applyPropertiesToProject(properties);
-			}
-			// Save default values.
-			for (PropertyWrapper property : editor.getDefaultedProperties()) {
-				if (property.getValue() != null) {
-					plugInPort.setProjectDefaultPropertyValue(property.getName(), property
-							.getValue());
-				}
-			}
-		}
-	}
-
-	public static class EditSelectionAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-
-		public EditSelectionAction(IPlugInPort plugInPort) {
-			super();
-			this.plugInPort = plugInPort;
-			putValue(AbstractAction.NAME, "Edit Selection");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_E,
-					ActionEvent.CTRL_MASK));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.EditComponent.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Edit Selection triggered");
-			List<PropertyWrapper> properties = plugInPort.getMutualSelectionProperties();
-			if (properties == null || properties.isEmpty()) {
-				LOG.info("Nothing to edit");
-				return;
-			}
-			plugInPort.editSelection();
-		}
-	}
-
-	public static class DeleteSelectionAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-
-		public DeleteSelectionAction(IPlugInPort plugInPort) {
-			super();
-			this.plugInPort = plugInPort;
-			putValue(AbstractAction.NAME, "Delete Selection");
-			putValue(AbstractAction.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Delete.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Delete Selection triggered");
-			plugInPort.deleteSelectedComponents();
-		}
-	}
-
-	public static class SendToBackAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-
-		public SendToBackAction(IPlugInPort plugInPort) {
-			super();
-			this.plugInPort = plugInPort;
-			putValue(AbstractAction.NAME, "Send Backward");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Back.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Send to Back triggered");
-			plugInPort.sendSelectionToBack();
-		}
-	}
-
-	public static class BringToFrontAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-
-		public BringToFrontAction(IPlugInPort plugInPort) {
-			super();
-			this.plugInPort = plugInPort;
-			putValue(AbstractAction.NAME, "Bring Forward");
-			putValue(AbstractAction.SMALL_ICON, IconLoader.Front.getIcon());
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info("Bring to Front triggered");
-			plugInPort.bringSelectionToFront();
-		}
-	}
-
-	public static class ConfigAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-		private String configKey;
-
-		public ConfigAction(IPlugInPort plugInPort, String title, String configKey,
-				boolean defaultValue) {
-			super();
-			this.plugInPort = plugInPort;
-			this.configKey = configKey;
-			putValue(AbstractAction.NAME, title);
-			putValue(IView.CHECK_BOX_MENU_ITEM, true);
-			putValue(AbstractAction.SELECTED_KEY, ConfigurationManager.getInstance().readBoolean(
-					configKey, defaultValue));
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info(getValue(AbstractAction.NAME) + " triggered");
-			ConfigurationManager.getInstance().writeValue(configKey,
-					getValue(AbstractAction.SELECTED_KEY));
-			plugInPort.refresh();
-		}
-	}
-
-	public static class ThemeAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-		private Theme theme;
-
-		public ThemeAction(IPlugInPort plugInPort, Theme theme) {
-			super();
-			this.plugInPort = plugInPort;
-			this.theme = theme;
-			putValue(AbstractAction.NAME, theme.getName());
-			putValue(IView.RADIO_BUTTON_GROUP_KEY, "theme");
-			putValue(AbstractAction.SELECTED_KEY, plugInPort.getSelectedTheme().getName().equals(
-					theme.getName()));
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info(getValue(AbstractAction.NAME) + " triggered");
-			plugInPort.setSelectedTheme(theme);
-		}
-	}
-	
-	public static class RenumberAction extends AbstractAction {
-
-		private static final long serialVersionUID = 1L;
-
-		private IPlugInPort plugInPort;
-		private boolean xAxisFirst;
-
-		public RenumberAction(IPlugInPort plugInPort, boolean xAxisFirst) {
-			super();
-			this.plugInPort = plugInPort;
-			this.xAxisFirst = xAxisFirst;
-			putValue(AbstractAction.NAME, xAxisFirst ? "X Axis First" : "Y Axis First");
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			LOG.info(getValue(AbstractAction.NAME) + " triggered");
-			plugInPort.renumberSelectedComponents(xAxisFirst);
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/ISwingUI.java

@@ -1,64 +0,0 @@
-package org.diylc.swing;
-
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.SwingConstants;
-import javax.swing.JPopupMenu.Separator;
-
-import org.diylc.common.BadPositionException;
-import org.diylc.common.ITask;
-import org.diylc.core.IView;
-
-/**
- * Interface for plugin access to the swing front end.
- * 
- * @author Branislav Stojkovic
- */
-public interface ISwingUI extends IView {
-
-	/**
-	 * Injects a custom GUI panels provided by the plug-in and desired position
-	 * in the window. Application will layout plug-in panels accordingly. <br>
-	 * Valid positions are:
-	 * <ul>
-	 * <li> {@link SwingConstants#TOP}</li>
-	 * <li> {@link SwingConstants#BOTTOM}</li>
-	 * <li> {@link SwingConstants#LEFT}</li>
-	 * <li> {@link SwingConstants#RIGHT}</li>
-	 * </ul>
-	 * 
-	 * Center position is reserved for the main canvas panel and cannot be used.
-	 * 
-	 * @param component
-	 * @param position
-	 * @throws BadPositionException
-	 *             in case invalid position is specified
-	 */
-	void injectGUIComponent(JComponent component, int position) throws BadPositionException;
-
-	/**
-	 * Injects a custom menu action into application's main menu. If
-	 * <code>action</code> is set to null {@link Separator} will be added. If
-	 * the specified menu does not exist it will be automatically created.
-	 * 
-	 * @param action
-	 *            {@link Action} to inser
-	 * @param menuName
-	 *            name of the menu to insert into
-	 */
-	void injectMenuAction(Action action, String menuName);
-
-	/**
-	 * Injects a custom submenu into application's main menu. If
-	 * <code>action</code> is set to null {@link Separator} will be added. If
-	 * the specified menu does not exist it will be automatically created.
-	 * 
-	 * @param name
-	 * @param icon
-	 * @param parentMenuName
-	 */
-	void injectSubmenu(String name, Icon icon, String parentMenuName);
-	
-	<T extends Object> void executeBackgroundTask(ITask<T> task);
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/TemplateDialog.java

@@ -1,285 +0,0 @@
-package org.diylc.swing.gui;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.swing.BorderFactory;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import org.apache.log4j.Logger;
-import org.diylc.common.DrawOption;
-import org.diylc.common.IPlugInPort;
-import org.diylc.common.PropertyWrapper;
-import org.diylc.core.IView;
-import org.diylc.presenter.Presenter;
-
-import com.diyfever.gui.miscutils.ConfigurationManager;
-
-public class TemplateDialog extends JDialog {
-
-	private static final long serialVersionUID = 1L;
-
-	private static final Logger LOG = Logger.getLogger(TemplateDialog.class);
-
-	private static final Dimension panelSize = new Dimension(400, 300);
-	public static final String SHOW_TEMPLATES_KEY = "showTemplatesAtStartup";
-
-	private IPlugInPort plugInPort;
-
-	private JList fileList;
-	private JPanel canvasPanel;
-	private Presenter presenter;
-	private List<File> files;
-	private JCheckBox showTemplatesBox;
-	private JPanel mainPanel;
-	private JButton loadButton;
-	private JPanel infoPanel;
-
-	public TemplateDialog(JFrame owner, IPlugInPort plugInPort) {
-		super(owner, "Templates");
-		setModal(true);
-		setResizable(false);
-		this.plugInPort = plugInPort;
-		this.presenter = new Presenter(new IView() {
-
-			@Override
-			public int showConfirmDialog(String message, String title, int optionType,
-					int messageType) {
-				return JOptionPane.showConfirmDialog(TemplateDialog.this, message, title,
-						optionType, messageType);
-			}
-
-			@Override
-			public void showMessage(String message, String title, int messageType) {
-				JOptionPane.showMessageDialog(TemplateDialog.this, message, title, messageType);
-			}
-			
-			@Override
-			public boolean editProperties(List<PropertyWrapper> properties, Set<PropertyWrapper> defaultedProperties) {
-				return false;
-			}
-		});
-		// this.presenter.installPlugin(new IPlugIn() {
-		//
-		// @Override
-		// public void connect(IPlugInPort plugInPort) {
-		// }
-		//
-		// @Override
-		// public EnumSet<EventType> getSubscribedEventTypes() {
-		// return EnumSet.of(EventType.REPAINT);
-		// }
-		//
-		// @Override
-		// public void processMessage(EventType eventType, Object... params) {
-		// if (eventType == EventType.REPAINT) {
-		// getCanvasPanel().repaint();
-		// }
-		// }
-		// });
-		setContentPane(getMainPanel());
-		pack();
-		setLocationRelativeTo(owner);
-	}
-
-	public JPanel getMainPanel() {
-		if (mainPanel == null) {
-			mainPanel = new JPanel(new GridBagLayout());
-			mainPanel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
-
-			GridBagConstraints c = new GridBagConstraints();
-			c.gridx = 0;
-			c.gridy = 0;
-			c.weightx = 0;
-			c.weighty = 1;
-			c.weightx = 1;
-			c.gridwidth = 2;
-			c.fill = GridBagConstraints.BOTH;
-			c.insets = new Insets(0, 0, 4, 0);
-			mainPanel.add(getInfoPanel(), c);
-
-			c.gridy = 1;
-			c.weightx = 0;
-			c.gridwidth = 1;
-			c.insets = new Insets(0, 0, 0, 0);
-			JScrollPane scrollPane = new JScrollPane(getFileList());
-			mainPanel.add(scrollPane, c);
-
-			c.gridx = 1;
-			c.weightx = 1;
-
-			JPanel panel = new JPanel(new BorderLayout());
-			panel.setBorder(scrollPane.getBorder());
-			panel.add(getCanvasPanel(), BorderLayout.CENTER);
-			mainPanel.add(panel, c);
-
-			c.gridx = 0;
-			c.gridy = 2;
-			c.weightx = 0;
-			c.weighty = 0;
-			c.anchor = GridBagConstraints.LAST_LINE_START;
-			c.fill = GridBagConstraints.NONE;
-			mainPanel.add(getShowTemplatesBox(), c);
-
-			c.gridx = 1;
-			c.anchor = GridBagConstraints.LAST_LINE_END;
-			c.insets = new Insets(4, 0, 0, 0);
-			mainPanel.add(getLoadButton(), c);
-		}
-		return mainPanel;
-	}
-
-	public JButton getLoadButton() {
-		if (loadButton == null) {
-			loadButton = new JButton("Load Template");
-			loadButton.addActionListener(new ActionListener() {
-
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					plugInPort.loadProject(presenter.getCurrentProject(), true);
-					dispose();
-				}
-			});
-		}
-		return loadButton;
-	}
-
-	public JPanel getInfoPanel() {
-		if (infoPanel == null) {
-			infoPanel = new JPanel();
-			infoPanel.setBackground(Color.decode("#FFFFCC"));
-			infoPanel.setBorder(new JTextField().getBorder());
-			JLabel infoLabel = new JLabel(
-					"<html>Templates are semi-product layouts that are used as a starting point for your projects.<br>"
-							+ "Pick a templete in the left list and click \"Load Template\" to load it or close this dialog to continue.<br>"
-							+ "You can create your own templates by placing a DIY file into <b>diylc/templates</b> directory.</html>");
-			infoLabel.setOpaque(false);
-			infoPanel.add(infoLabel);
-		}
-		return infoPanel;
-	}
-
-	public JList getFileList() {
-		if (fileList == null) {
-			fileList = new JList(getFiles().toArray());
-			fileList.setPreferredSize(new Dimension(128, -1));
-			fileList.setCellRenderer(new DefaultListCellRenderer() {
-
-				private static final long serialVersionUID = 1L;
-
-				@Override
-				public Component getListCellRendererComponent(JList list, Object value, int index,
-						boolean isSelected, boolean cellHasFocus) {
-					JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index,
-							isSelected, cellHasFocus);
-					if (value instanceof File) {
-						label.setText(((File) value).getName());
-					}
-					return label;
-				}
-
-			});
-			fileList.addListSelectionListener(new ListSelectionListener() {
-
-				@Override
-				public void valueChanged(ListSelectionEvent e) {
-					File file = (File) fileList.getSelectedValue();
-					if (file != null) {
-						presenter.loadProjectFromFile(file.getAbsolutePath());
-						Dimension dim = presenter.getCanvasDimensions(true);
-						double xFactor = panelSize.getWidth() / dim.getWidth();
-						double yFactor = panelSize.getHeight() / dim.getHeight();
-						presenter.setZoomLevel(Math.min(xFactor, yFactor));
-						getCanvasPanel().repaint();
-					}
-				}
-			});
-			fileList.setSelectedIndex(0);
-		}
-		return fileList;
-	}
-
-	public JCheckBox getShowTemplatesBox() {
-		if (showTemplatesBox == null) {
-			showTemplatesBox = new JCheckBox("Show this dialog at startup");
-			showTemplatesBox.setSelected(true);
-			showTemplatesBox.addActionListener(new ActionListener() {
-
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					ConfigurationManager.getInstance().writeValue(SHOW_TEMPLATES_KEY,
-							showTemplatesBox.isSelected());
-				}
-			});
-		}
-		return showTemplatesBox;
-	}
-
-	public List<File> getFiles() {
-		if (files == null) {
-			files = new ArrayList<File>();
-			File dir = new File("templates");
-			if (dir.exists()) {
-				for (File f : dir.listFiles()) {
-					if (f.isFile() && f.getName().toLowerCase().endsWith(".diy")) {
-						files.add(f);
-					}
-				}
-			}
-			LOG.debug("Found " + files.size() + " templates");
-		}
-		return files;
-	}
-
-	public JPanel getCanvasPanel() {
-		if (canvasPanel == null) {
-			canvasPanel = new JPanel() {
-
-				private static final long serialVersionUID = 1L;
-
-				@Override
-				public void paint(Graphics g) {
-					super.paint(g);
-					// Graphics2D g2d = (Graphics2D) g;
-					// AffineTransform transform = g2d.getTransform();
-					presenter.draw((Graphics2D) g, EnumSet.of(DrawOption.ZOOM,
-							DrawOption.ANTIALIASING), null);
-					// g2d.setTransform(transform);
-					// Rectangle rect = canvasPanel.getBounds();
-					// BorderFactory.createEtchedBorder().paintBorder(canvasPanel,
-					// g, 0, 0,
-					// (int) rect.getWidth(), (int) rect.getHeight());
-				}
-			};
-			canvasPanel.setBackground(Color.white);
-			canvasPanel.setPreferredSize(panelSize);
-		}
-		return canvasPanel;
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/components/OverwritePromptFileChooser.java

@@ -1,38 +0,0 @@
-package org.diylc.swing.gui.components;
-
-import java.io.File;
-
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.filechooser.FileFilter;
-
-public class OverwritePromptFileChooser extends JFileChooser {
-
-	private static final long serialVersionUID = 1L;
-	private String defaultExtension;
-
-	public void approveSelection() {
-		File lSelectedFile;
-		if (getSelectedFile().getAbsolutePath().contains(".")) {
-			lSelectedFile = getSelectedFile();
-		} else {
-			lSelectedFile = new File(getSelectedFile().getAbsoluteFile() + "." + defaultExtension);
-		}
-
-		if (lSelectedFile != null && lSelectedFile.exists()) {
-			int lResponse = JOptionPane.showConfirmDialog(this, lSelectedFile.getAbsolutePath()
-					+ " already exists.\nDo you " + "want to replace it?", "Warning",
-					JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
-
-			if (lResponse != JOptionPane.YES_OPTION) {
-				return;
-			}
-		}
-		super.approveSelection();
-	}
-
-	public void setFileFilter(FileFilter filter, String defaultExtension) {
-		this.defaultExtension = defaultExtension;
-		super.setFileFilter(filter);
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/BooleanEditor.java

@@ -1,34 +0,0 @@
-package org.diylc.swing.gui.editor;
-
-import java.awt.Color;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JCheckBox;
-
-import org.diylc.common.PropertyWrapper;
-import org.diylc.utils.Constants;
-
-public class BooleanEditor extends JCheckBox {
-
-	private static final long serialVersionUID = 1L;
-
-	private Color oldBg = getBackground();
-
-	public BooleanEditor(final PropertyWrapper property) {
-		super();
-		setSelected((Boolean) property.getValue());
-		addActionListener(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				property.setChanged(true);
-				setBackground(oldBg);
-				property.setValue(isSelected());
-			}
-		});
-		if (!property.isUnique()) {
-			setBackground(Constants.MULTI_VALUE_COLOR);
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/FontEditor.java

@@ -1,42 +0,0 @@
-package org.diylc.swing.gui.editor;
-
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-
-import org.diylc.common.PropertyWrapper;
-import org.diylc.utils.Constants;
-
-import com.diyfever.gui.FontChooserComboBox;
-
-public class FontEditor extends FontChooserComboBox {
-
-	private static final long serialVersionUID = 1L;
-
-	private Color oldBg = getBackground();
-
-	private final PropertyWrapper property;
-
-	public FontEditor(final PropertyWrapper property) {
-		this.property = property;
-		setSelectedItem(((Font) property.getValue()).getName());
-		addItemListener(new ItemListener() {
-
-			@Override
-			public void itemStateChanged(ItemEvent e) {
-				if (e.getStateChange() == ItemEvent.SELECTED) {
-					property.setChanged(true);
-					setBackground(oldBg);
-					Font oldFont = (Font) FontEditor.this.property.getValue();
-					Font newFont = new Font(getSelectedItem().toString(), oldFont.getStyle(),
-							oldFont.getSize());
-					FontEditor.this.property.setValue(newFont);
-				}
-			}
-		});
-		if (!property.isUnique()) {
-			setBackground(Constants.MULTI_VALUE_COLOR);
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/ImageEditor.java

@@ -1,46 +0,0 @@
-package org.diylc.swing.gui.editor;
-
-import java.awt.event.ActionListener;
-import java.io.File;
-
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-
-import org.diylc.common.PropertyWrapper;
-import org.diylc.swing.gui.DialogFactory;
-import org.diylc.swing.plugins.file.FileFilterEnum;
-
-public class ImageEditor extends JButton {
-
-	private static final long serialVersionUID = 1L;
-
-	private static final String title = "Click to load image file";
-
-	public ImageEditor(final PropertyWrapper property) {
-		super(property.isUnique() ? title : ("(multi value) " + title));
-		addActionListener(new ActionListener() {
-
-			@Override
-			public void actionPerformed(java.awt.event.ActionEvent e) {
-				File file = DialogFactory.getInstance().showOpenDialog(
-						FileFilterEnum.IMAGES.getFilter(), null,
-						FileFilterEnum.IMAGES.getExtensions()[0], null);
-				if (file != null) {
-					property.setChanged(true);
-					ImageIcon image = new ImageIcon(file.getAbsolutePath());
-					property.setValue(image);
-				}
-			}
-		});
-	}
-
-	// @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);
-	// }
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/IntEditor.java

@@ -1,35 +0,0 @@
-package org.diylc.swing.gui.editor;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-import org.diylc.common.PropertyWrapper;
-import org.diylc.utils.Constants;
-
-import com.diyfever.gui.DoubleTextField;
-
-public class IntEditor extends DoubleTextField {
-
-	private static final long serialVersionUID = 1L;
-
-	private Color oldBg = getBackground();
-
-	public IntEditor(final PropertyWrapper property) {
-		setLayout(new BorderLayout());
-		setValue((double) (Integer) property.getValue());
-		addPropertyChangeListener(DoubleTextField.VALUE_PROPERTY, new PropertyChangeListener() {
-
-			@Override
-			public void propertyChange(PropertyChangeEvent evt) {
-				property.setChanged(true);
-				setBackground(oldBg);
-				property.setValue(((Double) evt.getNewValue()).intValue());
-			}
-		});
-		if (!property.isUnique()) {
-			setBackground(Constants.MULTI_VALUE_COLOR);
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/gui/editor/StringEditor.java

@@ -1,50 +0,0 @@
-package org.diylc.swing.gui.editor;
-
-import java.awt.Color;
-
-import javax.swing.JTextField;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import org.diylc.common.PropertyWrapper;
-import org.diylc.utils.Constants;
-
-public class StringEditor extends JTextField {
-
-	private static final long serialVersionUID = 1L;
-
-	private Color oldBg = getBackground();
-
-	private final PropertyWrapper property;
-
-	public StringEditor(PropertyWrapper property) {
-		super(property.getValue() == null ? "" : (String) property.getValue());
-		this.property = property;
-		getDocument().addDocumentListener(new DocumentListener() {
-
-			@Override
-			public void changedUpdate(DocumentEvent e) {
-				textChanged();
-			}
-
-			@Override
-			public void insertUpdate(DocumentEvent e) {
-				textChanged();
-			}
-
-			@Override
-			public void removeUpdate(DocumentEvent e) {
-				textChanged();
-			}
-		});
-		if (!property.isUnique()) {
-			setBackground(Constants.MULTI_VALUE_COLOR);
-		}
-	}
-
-	private void textChanged() {
-		property.setChanged(true);
-		setBackground(oldBg);
-		property.setValue(getText());
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/autosave/AutoSavePlugin.java

@@ -1,73 +0,0 @@
-package org.diylc.swing.plugins.autosave;
-
-import java.io.File;
-import java.util.EnumSet;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import javax.swing.SwingUtilities;
-
-import org.diylc.common.EventType;
-import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.core.IView;
-
-import com.diyfever.gui.miscutils.ConfigurationManager;
-
-public class AutoSavePlugin implements IPlugIn {
-
-	private static final String AUTO_SAVE_FILE_NAME = "autoSave.diy";
-
-	private ExecutorService executor;
-
-	private IPlugInPort plugInPort;
-	private IView view;
-
-	public AutoSavePlugin(IView view) {
-		this.view = view;
-		executor = Executors.newSingleThreadExecutor();
-	}
-
-	@Override
-	public void connect(IPlugInPort plugInPort) {
-		this.plugInPort = plugInPort;
-		SwingUtilities.invokeLater(new Runnable() {
-
-			@Override
-			public void run() {
-				boolean wasAbnormal = ConfigurationManager.getInstance().readBoolean(
-						IPlugInPort.ABNORMAL_EXIT_KEY, false);
-				if (wasAbnormal && new File(AUTO_SAVE_FILE_NAME).exists()) {
-					int decision = view
-							.showConfirmDialog(
-									"It appears that aplication was not closed normally in the previous session. Do you want to open the last auto-saved file?",
-									"Auto-Save", IView.YES_NO_OPTION, IView.QUESTION_MESSAGE);
-					if (decision == IView.YES_OPTION) {
-						AutoSavePlugin.this.plugInPort.loadProjectFromFile(AUTO_SAVE_FILE_NAME);
-					}
-				}
-				// Set abnormal flag to true, GUI side of the app must flip to
-				// false when app closes regularly.
-				ConfigurationManager.getInstance().writeValue(IPlugInPort.ABNORMAL_EXIT_KEY, true);
-			}
-		});
-	}
-
-	@Override
-	public EnumSet<EventType> getSubscribedEventTypes() {
-		return EnumSet.of(EventType.PROJECT_MODIFIED);
-	}
-
-	@Override
-	public void processMessage(EventType eventType, Object... params) {
-		if (eventType == EventType.PROJECT_MODIFIED) {
-			executor.execute(new Runnable() {
-
-				@Override
-				public void run() {
-					plugInPort.saveProjectToFile(AUTO_SAVE_FILE_NAME, true);
-				}
-			});
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java

@@ -1,319 +0,0 @@
-package org.diylc.swing.plugins.canvas;
-
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.ClipboardOwner;
-import java.awt.datatransfer.Transferable;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
-import java.util.EnumSet;
-
-import javax.swing.JPopupMenu;
-import javax.swing.SwingConstants;
-
-import org.apache.log4j.Logger;
-import org.diylc.common.BadPositionException;
-import org.diylc.common.EventType;
-import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-import org.diylc.presenter.Presenter;
-import org.diylc.swing.ActionFactory;
-import org.diylc.swing.ISwingUI;
-import org.diylc.swing.plugins.edit.ComponentTransferable;
-import org.diylc.swing.plugins.file.ProjectDrawingProvider;
-
-import com.diyfever.gui.miscutils.ConfigurationManager;
-import com.diyfever.gui.miscutils.IConfigListener;
-import com.diyfever.gui.ruler.IRulerListener;
-import com.diyfever.gui.ruler.RulerScrollPane;
-
-public class CanvasPlugin implements IPlugIn, ClipboardOwner {
-
-	private static final Logger LOG = Logger.getLogger(CanvasPlugin.class);
-
-	private RulerScrollPane scrollPane;
-	private CanvasPanel canvasPanel;
-	private JPopupMenu popupMenu;
-
-	private ActionFactory.CutAction cutAction;
-	private ActionFactory.CopyAction copyAction;
-	private ActionFactory.PasteAction pasteAction;
-	private ActionFactory.EditSelectionAction editSelectionAction;
-	private ActionFactory.DeleteSelectionAction deleteSelectionAction;
-	private ActionFactory.GroupAction groupAction;
-	private ActionFactory.UngroupAction ungroupAction;
-	private ActionFactory.SendToBackAction sendToBackAction;
-	private ActionFactory.BringToFrontAction bringToFrontAction;
-
-	private IPlugInPort plugInPort;
-	private ISwingUI swingUI;
-
-	private Clipboard clipboard;
-
-	private double zoomLevel = 1;
-
-	public CanvasPlugin(ISwingUI swingUI) {
-		this.swingUI = swingUI;
-		clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
-	}
-
-	@Override
-	public void connect(IPlugInPort plugInPort) {
-		this.plugInPort = plugInPort;
-		try {
-			swingUI.injectGUIComponent(getScrollPane(), SwingConstants.CENTER);
-		} catch (BadPositionException e) {
-			LOG.error("Could not install canvas plugin", e);
-		}
-	}
-
-	public CanvasPanel getCanvasPanel() {
-		if (canvasPanel == null) {
-			canvasPanel = new CanvasPanel(plugInPort);
-			canvasPanel.addMouseListener(new MouseAdapter() {
-
-				@Override
-				public void mouseReleased(MouseEvent e) {
-					if (e.isPopupTrigger()) {
-						// Enable actions.
-						boolean enabled = !plugInPort.getSelectedComponents().isEmpty();
-						getCutAction().setEnabled(enabled);
-						getCopyAction().setEnabled(enabled);
-						try {
-							getPasteAction()
-									.setEnabled(
-											clipboard
-													.isDataFlavorAvailable(ComponentTransferable.listFlavor));
-						} catch (Exception ex) {
-							getPasteAction().setEnabled(false);
-						}
-						getEditSelectionAction().setEnabled(enabled);
-						getDeleteSelectionAction().setEnabled(enabled);
-						getGroupAction().setEnabled(enabled);
-						getUngroupAction().setEnabled(enabled);
-						getSendToBackAction().setEnabled(enabled);
-						getBringToFrontAction().setEnabled(enabled);
-
-						getPopupMenu().show(canvasPanel, e.getX(), e.getY());
-					}
-				}
-			});
-		}
-		return canvasPanel;
-	}
-
-	private RulerScrollPane getScrollPane() {
-		if (scrollPane == null) {
-			scrollPane = new RulerScrollPane(getCanvasPanel(), new ProjectDrawingProvider(
-					plugInPort, true, false), new Size(1d, SizeUnit.cm).convertToPixels(),
-					new Size(1d, SizeUnit.in).convertToPixels());
-			boolean metric = ConfigurationManager.getInstance().readBoolean(Presenter.METRIC_KEY,
-					true);
-			boolean wheelZoom = ConfigurationManager.getInstance().readBoolean(
-					IPlugInPort.WHEEL_ZOOM_KEY, false);
-			ConfigurationManager.getInstance().addConfigListener(IPlugInPort.WHEEL_ZOOM_KEY,
-					new IConfigListener() {
-
-						@Override
-						public void valueChanged(String key, Object value) {
-							scrollPane.setWheelScrollingEnabled(!(Boolean) value);
-						}
-					});
-			scrollPane.setMetric(metric);
-			scrollPane.setWheelScrollingEnabled(!wheelZoom);
-			scrollPane.addUnitListener(new IRulerListener() {
-
-				@Override
-				public void unitsChanged(boolean isMetric) {
-					plugInPort.setMetric(isMetric);
-				}
-			});
-			scrollPane.addMouseWheelListener(new MouseWheelListener() {
-
-				@Override
-				public void mouseWheelMoved(MouseWheelEvent e) {
-					boolean wheelZoom = ConfigurationManager.getInstance().readBoolean(
-							IPlugInPort.WHEEL_ZOOM_KEY, false);
-					if (!wheelZoom) {
-						return;
-					}
-					double d = plugInPort.getZoomLevel();
-					Double[] availableZoomLevels = plugInPort.getAvailableZoomLevels();
-					if (e.getWheelRotation() > 0) {
-						int i = availableZoomLevels.length - 1;
-						while (i > 0 && availableZoomLevels[i] >= d) {
-							i--;
-						}
-						plugInPort.setZoomLevel(availableZoomLevels[i]);
-					} else {
-						int i = 0;
-						while (i < availableZoomLevels.length - 1 && availableZoomLevels[i] <= d) {
-							i++;
-						}
-						plugInPort.setZoomLevel(availableZoomLevels[i]);
-					}
-				}
-			});
-		}
-		return scrollPane;
-	}
-
-	public JPopupMenu getPopupMenu() {
-		if (popupMenu == null) {
-			popupMenu = new JPopupMenu();
-			popupMenu.add(getCutAction());
-			popupMenu.add(getCopyAction());
-			popupMenu.add(getPasteAction());
-			popupMenu.addSeparator();
-			popupMenu.add(getEditSelectionAction());
-			popupMenu.add(getDeleteSelectionAction());
-			popupMenu.add(getGroupAction());
-			popupMenu.add(getUngroupAction());
-			popupMenu.add(getSendToBackAction());
-			popupMenu.add(getBringToFrontAction());
-			popupMenu.addSeparator();
-			popupMenu.add(ActionFactory.getInstance().createEditProjectAction(plugInPort));
-		}
-		return popupMenu;
-	}
-
-	public ActionFactory.CutAction getCutAction() {
-		if (cutAction == null) {
-			cutAction = ActionFactory.getInstance().createCutAction(plugInPort, clipboard, this);
-		}
-		return cutAction;
-	}
-
-	public ActionFactory.CopyAction getCopyAction() {
-		if (copyAction == null) {
-			copyAction = ActionFactory.getInstance().createCopyAction(plugInPort, clipboard, this);
-		}
-		return copyAction;
-	}
-
-	public ActionFactory.PasteAction getPasteAction() {
-		if (pasteAction == null) {
-			pasteAction = ActionFactory.getInstance().createPasteAction(plugInPort, clipboard);
-		}
-		return pasteAction;
-	}
-
-	public ActionFactory.EditSelectionAction getEditSelectionAction() {
-		if (editSelectionAction == null) {
-			editSelectionAction = ActionFactory.getInstance().createEditSelectionAction(plugInPort);
-		}
-		return editSelectionAction;
-	}
-
-	public ActionFactory.DeleteSelectionAction getDeleteSelectionAction() {
-		if (deleteSelectionAction == null) {
-			deleteSelectionAction = ActionFactory.getInstance().createDeleteSelectionAction(
-					plugInPort);
-		}
-		return deleteSelectionAction;
-	}
-
-	public ActionFactory.GroupAction getGroupAction() {
-		if (groupAction == null) {
-			groupAction = ActionFactory.getInstance().createGroupAction(plugInPort);
-		}
-		return groupAction;
-	}
-
-	public ActionFactory.UngroupAction getUngroupAction() {
-		if (ungroupAction == null) {
-			ungroupAction = ActionFactory.getInstance().createUngroupAction(plugInPort);
-		}
-		return ungroupAction;
-	}
-
-	public ActionFactory.SendToBackAction getSendToBackAction() {
-		if (sendToBackAction == null) {
-			sendToBackAction = ActionFactory.getInstance().createSendToBackAction(plugInPort);
-		}
-		return sendToBackAction;
-	}
-
-	public ActionFactory.BringToFrontAction getBringToFrontAction() {
-		if (bringToFrontAction == null) {
-			bringToFrontAction = ActionFactory.getInstance().createBringToFrontAction(plugInPort);
-		}
-		return bringToFrontAction;
-	}
-
-	@Override
-	public EnumSet<EventType> getSubscribedEventTypes() {
-		return EnumSet.of(EventType.PROJECT_LOADED, EventType.ZOOM_CHANGED, EventType.REPAINT);
-	}
-
-	@Override
-	public void processMessage(final EventType eventType, Object... params) {
-		// SwingUtilities.invokeLater(new Runnable() {
-		//
-		// @Override
-		// public void run() {
-		// LOG.debug("event: " + eventType);
-		switch (eventType) {
-		case PROJECT_LOADED:
-			refreshSize();
-			if ((Boolean) params[1]) {
-				// Scroll to the center.
-				Rectangle visibleRect = canvasPanel.getVisibleRect();
-				visibleRect.setLocation((canvasPanel.getWidth() - visibleRect.width) / 2,
-						(canvasPanel.getHeight() - visibleRect.height) / 2);
-				canvasPanel.scrollRectToVisible(visibleRect);
-				canvasPanel.revalidate();
-			}
-			break;
-		case ZOOM_CHANGED:
-			Rectangle visibleRect = canvasPanel.getVisibleRect();
-			refreshSize();
-			// Try to set the visible area to be centered with the previous
-			// one.
-			double zoomFactor = (Double) params[0] / zoomLevel;
-			visibleRect.setBounds((int) (visibleRect.x * zoomFactor),
-					(int) (visibleRect.y * zoomFactor), visibleRect.width, visibleRect.height);
-			canvasPanel.scrollRectToVisible(visibleRect);
-			canvasPanel.revalidate();
-
-			zoomLevel = (Double) params[0];
-			break;
-		case REPAINT:
-			canvasPanel.repaint();
-			break;
-		}
-		// }
-		// });
-	}
-
-	private void refreshSize() {
-		Dimension d = plugInPort.getCanvasDimensions(true);
-		canvasPanel.setSize(d);
-		canvasPanel.setPreferredSize(d);
-		getScrollPane().setZoomLevel(plugInPort.getZoomLevel());
-	}
-
-	/**
-	 * Causes ruler scroll pane to refresh by sending a fake mouse moved message
-	 * to the canvasPanel.
-	 */
-	public void refresh() {
-		MouseEvent event = new MouseEvent(canvasPanel, MouseEvent.MOUSE_MOVED, System
-				.currentTimeMillis(), 0, 1, 1,// canvasPanel.getWidth() / 2,
-				// canvasPanel.getHeight() / 2,
-				0, false);
-		canvasPanel.dispatchEvent(event);
-	}
-
-	@Override
-	public void lostOwnership(Clipboard clipboard, Transferable contents) {
-		// TODO Auto-generated method stub
-
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/canvas/EmptyTransferable.java

@@ -1,24 +0,0 @@
-package org.diylc.swing.plugins.canvas;
-
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.IOException;
-
-public class EmptyTransferable implements Transferable {
-
-	@Override
-	public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
-		throw new UnsupportedFlavorException(flavor);
-	}
-
-	@Override
-	public DataFlavor[] getTransferDataFlavors() {
-		return new DataFlavor[] {};
-	}
-
-	@Override
-	public boolean isDataFlavorSupported(DataFlavor flavor) {
-		return false;
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/config/ConfigPlugin.java

@@ -1,90 +0,0 @@
-package org.diylc.swing.plugins.config;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.EnumSet;
-
-import org.apache.log4j.Logger;
-import org.diylc.common.EventType;
-import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.core.Theme;
-import org.diylc.images.IconLoader;
-import org.diylc.swing.ActionFactory;
-import org.diylc.swing.ISwingUI;
-
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-
-/**
- * Controls configuration menu.
- * 
- * @author Branislav Stojkovic
- */
-public class ConfigPlugin implements IPlugIn {
-
-	private static final Logger LOG = Logger.getLogger(ConfigPlugin.class);
-
-	private static final String CONFIG_MENU = "Config";
-	private static final String THEME_MENU = "Theme";
-
-	private ISwingUI swingUI;
-
-	public ConfigPlugin(ISwingUI swingUI) {
-		super();
-		this.swingUI = swingUI;
-	}
-
-	@Override
-	public void connect(IPlugInPort plugInPort) {
-		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
-				"Anti-Aliasing", IPlugInPort.ANTI_ALIASING_KEY, true), CONFIG_MENU);
-		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
-				"Auto-Create Pads", IPlugInPort.AUTO_PADS_KEY, false), CONFIG_MENU);
-		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
-				"Auto-Edit Mode", IPlugInPort.AUTO_EDIT_KEY, false), CONFIG_MENU);
-		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
-				"Continuous Creation", IPlugInPort.CONTINUOUS_CREATION_KEY, false), CONFIG_MENU);
-		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
-				"Export Grid", IPlugInPort.EXPORT_GRID_KEY, false), CONFIG_MENU);
-		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
-				"Hi-Quality Rendering", IPlugInPort.HI_QUALITY_RENDER_KEY, false), CONFIG_MENU);
-		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
-				"Mouse Wheel Zoom", IPlugInPort.WHEEL_ZOOM_KEY, false), CONFIG_MENU);
-		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
-				"Outline Mode", IPlugInPort.OUTLINE_KEY, false), CONFIG_MENU);
-		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
-				"Snap to Grid", IPlugInPort.SNAP_TO_GRID_KEY, true), CONFIG_MENU);
-		swingUI.injectMenuAction(ActionFactory.getInstance().createConfigAction(plugInPort,
-				"Sticky Points", IPlugInPort.STICKY_POINTS_KEY, true), CONFIG_MENU);
-
-		File themeDir = new File("themes");
-		if (themeDir.exists()) {
-			XStream xStream = new XStream(new DomDriver());
-			swingUI.injectSubmenu(THEME_MENU, IconLoader.Pens.getIcon(), CONFIG_MENU);
-			for (File file : themeDir.listFiles()) {
-				if (file.getName().toLowerCase().endsWith(".xml")) {
-					try {
-						InputStream in = new FileInputStream(file);
-						Theme theme = (Theme) xStream.fromXML(in);
-						LOG.debug("Found theme: " + theme.getName());
-						swingUI.injectMenuAction(ActionFactory.getInstance().createThemeAction(
-								plugInPort, theme), THEME_MENU);
-					} catch (Exception e) {
-						LOG.error("Could not load theme file " + file.getName(), e);
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public EnumSet<EventType> getSubscribedEventTypes() {
-		return EnumSet.noneOf(EventType.class);
-	}
-
-	@Override
-	public void processMessage(EventType eventType, Object... params) {
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/edit/EditMenuPlugin.java

@@ -1,224 +0,0 @@
-package org.diylc.swing.plugins.edit;
-
-import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.ClipboardOwner;
-import java.awt.datatransfer.FlavorEvent;
-import java.awt.datatransfer.FlavorListener;
-import java.awt.datatransfer.Transferable;
-import java.util.EnumSet;
-
-import org.diylc.common.EventType;
-import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.core.Project;
-import org.diylc.images.IconLoader;
-import org.diylc.swing.ActionFactory;
-import org.diylc.swing.ISwingUI;
-
-import com.diyfever.gui.undo.IUndoListener;
-import com.diyfever.gui.undo.UndoHandler;
-
-public class EditMenuPlugin implements IPlugIn, ClipboardOwner {
-
-	private static final String EDIT_TITLE = "Edit";
-	private static final String RENUMBER_TITLE = "Renumber Selection";
-
-	private IPlugInPort plugInPort;
-	private ISwingUI swingUI;
-
-	private Clipboard clipboard;
-
-	private ActionFactory.CutAction cutAction;
-	private ActionFactory.CopyAction copyAction;
-	private ActionFactory.PasteAction pasteAction;
-	private ActionFactory.EditSelectionAction editSelectionAction;
-	private ActionFactory.DeleteSelectionAction deleteSelectionAction;
-	private ActionFactory.GroupAction groupAction;
-	private ActionFactory.UngroupAction ungroupAction;
-	private ActionFactory.SendToBackAction sendToBackAction;
-	private ActionFactory.BringToFrontAction bringToFrontAction;
-	private ActionFactory.RenumberAction renumberXAxisAction;
-	private ActionFactory.RenumberAction renumberYAxisAction;
-
-	private UndoHandler<Project> undoHandler;
-
-	public EditMenuPlugin(ISwingUI swingUI) {
-		this.swingUI = swingUI;
-		// SecurityManager securityManager = System.getSecurityManager();
-		// if (securityManager != null) {
-		// try {
-		// securityManager.checkSystemClipboardAccess();
-		// } catch (Exception e) {
-		// e.printStackTrace();
-		// }
-		// }
-		clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
-		undoHandler = new UndoHandler<Project>(new IUndoListener<Project>() {
-
-			@Override
-			public void actionPerformed(Project currentState) {
-				plugInPort.loadProject(currentState, false);
-			}
-		});
-		clipboard.addFlavorListener(new FlavorListener() {
-
-			@Override
-			public void flavorsChanged(FlavorEvent e) {
-				refreshActions();
-			}
-		});
-	}
-
-	public ActionFactory.CutAction getCutAction() {
-		if (cutAction == null) {
-			cutAction = ActionFactory.getInstance().createCutAction(plugInPort, clipboard, this);
-		}
-		return cutAction;
-	}
-
-	public ActionFactory.CopyAction getCopyAction() {
-		if (copyAction == null) {
-			copyAction = ActionFactory.getInstance().createCopyAction(plugInPort, clipboard, this);
-		}
-		return copyAction;
-	}
-
-	public ActionFactory.PasteAction getPasteAction() {
-		if (pasteAction == null) {
-			pasteAction = ActionFactory.getInstance().createPasteAction(plugInPort, clipboard);
-		}
-		return pasteAction;
-	}
-
-	public ActionFactory.EditSelectionAction getEditSelectionAction() {
-		if (editSelectionAction == null) {
-			editSelectionAction = ActionFactory.getInstance().createEditSelectionAction(plugInPort);
-		}
-		return editSelectionAction;
-	}
-
-	public ActionFactory.DeleteSelectionAction getDeleteSelectionAction() {
-		if (deleteSelectionAction == null) {
-			deleteSelectionAction = ActionFactory.getInstance().createDeleteSelectionAction(
-					plugInPort);
-		}
-		return deleteSelectionAction;
-	}
-
-	public ActionFactory.GroupAction getGroupAction() {
-		if (groupAction == null) {
-			groupAction = ActionFactory.getInstance().createGroupAction(plugInPort);
-		}
-		return groupAction;
-	}
-
-	public ActionFactory.UngroupAction getUngroupAction() {
-		if (ungroupAction == null) {
-			ungroupAction = ActionFactory.getInstance().createUngroupAction(plugInPort);
-		}
-		return ungroupAction;
-	}
-
-	public ActionFactory.SendToBackAction getSendToBackAction() {
-		if (sendToBackAction == null) {
-			sendToBackAction = ActionFactory.getInstance().createSendToBackAction(plugInPort);
-		}
-		return sendToBackAction;
-	}
-
-	public ActionFactory.BringToFrontAction getBringToFrontAction() {
-		if (bringToFrontAction == null) {
-			bringToFrontAction = ActionFactory.getInstance().createBringToFrontAction(plugInPort);
-		}
-		return bringToFrontAction;
-	}
-
-	public ActionFactory.RenumberAction getRenumberXAxisAction() {
-		if (renumberXAxisAction == null) {
-			renumberXAxisAction = ActionFactory.getInstance()
-					.createRenumberAction(plugInPort, true);
-		}
-		return renumberXAxisAction;
-	}
-
-	public ActionFactory.RenumberAction getRenumberYAxisAction() {
-		if (renumberYAxisAction == null) {
-			renumberYAxisAction = ActionFactory.getInstance().createRenumberAction(plugInPort,
-					false);
-		}
-		return renumberYAxisAction;
-	}
-
-	@Override
-	public void connect(IPlugInPort plugInPort) {
-		this.plugInPort = plugInPort;
-
-		ActionFactory actionFactory = ActionFactory.getInstance();
-
-		swingUI.injectMenuAction(undoHandler.getUndoAction(), EDIT_TITLE);
-		swingUI.injectMenuAction(undoHandler.getRedoAction(), EDIT_TITLE);
-		swingUI.injectMenuAction(null, EDIT_TITLE);
-		swingUI.injectMenuAction(getCutAction(), EDIT_TITLE);
-		swingUI.injectMenuAction(getCopyAction(), EDIT_TITLE);
-		swingUI.injectMenuAction(getPasteAction(), EDIT_TITLE);
-		swingUI.injectMenuAction(null, EDIT_TITLE);
-		swingUI.injectMenuAction(actionFactory.createSelectAllAction(plugInPort), EDIT_TITLE);
-		swingUI.injectMenuAction(getEditSelectionAction(), EDIT_TITLE);
-		swingUI.injectMenuAction(getDeleteSelectionAction(), EDIT_TITLE);
-		swingUI.injectMenuAction(getGroupAction(), EDIT_TITLE);
-		swingUI.injectMenuAction(getUngroupAction(), EDIT_TITLE);
-		swingUI.injectMenuAction(getSendToBackAction(), EDIT_TITLE);
-		swingUI.injectMenuAction(getBringToFrontAction(), EDIT_TITLE);
-		swingUI.injectMenuAction(null, EDIT_TITLE);
-		swingUI.injectSubmenu(RENUMBER_TITLE, IconLoader.Sort.getIcon(), EDIT_TITLE);
-		swingUI.injectMenuAction(getRenumberXAxisAction(), RENUMBER_TITLE);
-		swingUI.injectMenuAction(getRenumberYAxisAction(), RENUMBER_TITLE);
-		swingUI.injectMenuAction(null, EDIT_TITLE);
-		swingUI.injectMenuAction(actionFactory.createEditProjectAction(plugInPort), EDIT_TITLE);
-
-		refreshActions();
-	}
-
-	@Override
-	public EnumSet<EventType> getSubscribedEventTypes() {
-		return EnumSet.of(EventType.SELECTION_CHANGED, EventType.PROJECT_MODIFIED);
-	}
-
-	@Override
-	public void processMessage(EventType eventType, Object... params) {
-		switch (eventType) {
-		case SELECTION_CHANGED:
-			refreshActions();
-			break;
-		case PROJECT_MODIFIED:
-			undoHandler.stateChanged((Project) params[0], (Project) params[1], (String) params[2]);
-			break;
-		}
-	}
-
-	private void refreshActions() {
-		boolean enabled = !plugInPort.getSelectedComponents().isEmpty();
-		getCutAction().setEnabled(enabled);
-		getCopyAction().setEnabled(enabled);
-		try {
-			getPasteAction().setEnabled(
-					clipboard.isDataFlavorAvailable(ComponentTransferable.listFlavor));
-		} catch (Exception e) {
-			getPasteAction().setEnabled(false);
-		}
-		getEditSelectionAction().setEnabled(enabled);
-		getDeleteSelectionAction().setEnabled(enabled);
-		getGroupAction().setEnabled(enabled);
-		getUngroupAction().setEnabled(enabled);
-		getSendToBackAction().setEnabled(enabled);
-		getBringToFrontAction().setEnabled(enabled);
-	}
-
-	// ClipboardOwner
-
-	@Override
-	public void lostOwnership(Clipboard clipboard, Transferable contents) {
-		refreshActions();
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileFilterEnum.java

@@ -1,50 +0,0 @@
-package org.diylc.swing.plugins.file;
-
-import java.io.File;
-
-import javax.swing.filechooser.FileFilter;
-
-public enum FileFilterEnum {
-
-	PNG("PNG Images (*.png)", "png"), PDF("PDF Files (*.pdf)", "pdf"), DIY(
-			"DIY Project Files (*.diy)", "diy"), EXCEL("Excel Workbooks (*.xls)", "xls"), CSV(
-			"Comma Separated Files (*.csv)", "csv"), HTML("HTML Files (*.html)", "html"), IMAGES(
-			"Image Files (*.png, *.jpg, *.gif)", "png", "jpg", "gif");
-
-	FileFilter filter;
-	String[] extensions;
-
-	private FileFilterEnum(final String description, final String... extensions) {
-		this.extensions = extensions;
-		filter = new FileFilter() {
-
-			@Override
-			public boolean accept(File f) {
-				if (f.isDirectory()) {
-					return true;
-				}
-				String fileExt = f.getName();
-				fileExt = fileExt.substring(fileExt.lastIndexOf('.') + 1).toLowerCase();
-				for (String ext : extensions) {
-					if (ext.equals(fileExt)) {
-						return true;
-					}
-				}
-				return false;
-			}
-
-			@Override
-			public String getDescription() {
-				return description;
-			}
-		};
-	}
-
-	public FileFilter getFilter() {
-		return filter;
-	}
-
-	public String[] getExtensions() {
-		return extensions;
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/file/FileMenuPlugin.java

@@ -1,69 +0,0 @@
-package org.diylc.swing.plugins.file;
-
-import java.util.EnumSet;
-
-import org.diylc.common.EventType;
-import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.images.IconLoader;
-import org.diylc.swing.ActionFactory;
-import org.diylc.swing.ISwingUI;
-
-/**
- * Entry point class for File management utilities.
- * 
- * @author Branislav Stojkovic
- */
-public class FileMenuPlugin implements IPlugIn {
-
-	private static final String FILE_TITLE = "File";
-	private static final String TRACE_MASK_TITLE = "Trace Mask";
-
-	private ProjectDrawingProvider drawingProvider;
-	private TraceMaskDrawingProvider traceMaskDrawingProvider;
-
-	private ISwingUI swingUI;
-
-	public FileMenuPlugin(ISwingUI swingUI) {
-		super();
-		this.swingUI = swingUI;
-	}
-
-	@Override
-	public void connect(IPlugInPort plugInPort) {
-		this.drawingProvider = new ProjectDrawingProvider(plugInPort, false, true);
-		this.traceMaskDrawingProvider = new TraceMaskDrawingProvider(plugInPort);
-
-		ActionFactory actionFactory = ActionFactory.getInstance();
-		swingUI.injectMenuAction(actionFactory.createNewAction(plugInPort), FILE_TITLE);
-		swingUI.injectMenuAction(actionFactory.createOpenAction(plugInPort, swingUI), FILE_TITLE);
-		swingUI.injectMenuAction(actionFactory.createSaveAction(plugInPort, swingUI), FILE_TITLE);
-		swingUI.injectMenuAction(actionFactory.createSaveAsAction(plugInPort, swingUI), FILE_TITLE);
-		swingUI.injectMenuAction(null, FILE_TITLE);
-		swingUI.injectMenuAction(actionFactory.createExportPDFAction(drawingProvider, swingUI),
-				FILE_TITLE);
-		swingUI.injectMenuAction(actionFactory.createExportPNGAction(drawingProvider, swingUI),
-				FILE_TITLE);
-		swingUI.injectMenuAction(actionFactory.createPrintAction(drawingProvider), FILE_TITLE);
-		swingUI.injectSubmenu(TRACE_MASK_TITLE, IconLoader.TraceMask.getIcon(), FILE_TITLE);
-		swingUI.injectMenuAction(actionFactory.createExportPDFAction(traceMaskDrawingProvider,
-				swingUI), TRACE_MASK_TITLE);
-		swingUI.injectMenuAction(actionFactory.createExportPNGAction(traceMaskDrawingProvider,
-				swingUI), TRACE_MASK_TITLE);
-		swingUI.injectMenuAction(actionFactory.createPrintAction(traceMaskDrawingProvider),
-				TRACE_MASK_TITLE);
-		swingUI.injectMenuAction(actionFactory.createBomAction(plugInPort), FILE_TITLE);
-		swingUI.injectMenuAction(null, FILE_TITLE);
-		swingUI.injectMenuAction(actionFactory.createExitAction(plugInPort), FILE_TITLE);
-	}
-
-	@Override
-	public EnumSet<EventType> getSubscribedEventTypes() {
-		return null;
-	}
-
-	@Override
-	public void processMessage(EventType eventType, Object... params) {
-		// Do nothing.
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/Test.java

@@ -1,28 +0,0 @@
-package org.diylc.swing.plugins.online;
-
-import org.apache.log4j.BasicConfigurator;
-import org.diylc.swing.plugins.online.presenter.LibraryPresenter;
-
-
-public class Test {
-
-	/**
-	 * @param args
-	 * @throws Exception
-	 */
-	public static void main(String[] args) throws Exception {
-		BasicConfigurator.configure();
-		LibraryPresenter pres = new LibraryPresenter();
-		// pres.createUser("bancika", "pwd", "bancika@gmail.com");
-		System.out.println(pres.fetchCategories());
-		pres.login("bancika", "pwd");
-		int id = pres.fetchMyProjectRows().get(0).getId();
-		// InputStream stream = pres.downloadProjectContent(id);
-		// byte[] buf = new byte[100];
-		// int len = stream.read(buf);
-		System.out.println(pres.downloadProjectContent(id));
-		// System.out.println(pres.hashPassword("bancikabancikabancikabancikabancika"));
-		pres.dispose();
-	}
-
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/AlreadyExistsException.java

@@ -1,7 +0,0 @@
-package org.diylc.swing.plugins.online.presenter;
-
-public class AlreadyExistsException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/MySqlDBManager.java

@@ -1,86 +0,0 @@
-package org.diylc.swing.plugins.online.presenter;
-
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.apache.log4j.Logger;
-
-public class MySqlDBManager {
-
-	private final static Logger LOG = Logger.getLogger(MySqlDBManager.class);
-
-	protected Connection connection;
-	protected Statement statement;
-	protected ResultSet resultSet;
-	protected String url;
-	protected String user;
-	protected String pass;
-	protected boolean connected;
-
-	public MySqlDBManager(String url, String user, String pass) {
-		this.url = url;
-		this.user = user;
-		this.pass = pass;
-		this.connected = false;
-	}
-
-	public MySqlDBManager(String host, String port, String userName, String password) {
-		this(String.format("jdbc:mysql://%s%s", host, port.trim().equals("") ? "" : (":" + port)),
-				userName, password);
-	}
-
-	public void connectDB() throws Exception {
-		if (!connected) {
-			Driver driver = (Driver) Class.forName("com.mysql.jdbc.Driver").newInstance();
-			DriverManager.registerDriver(driver);
-			String finalUrl = String.format("%s?user=%s&password=%s", url, user, pass);
-			LOG.info("Trying to connect to: " + url);
-			connection = DriverManager.getConnection(finalUrl);
-			statement = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
-					ResultSet.CONCUR_READ_ONLY);
-			connected = true;
-		}
-	}
-
-	public boolean isConnected() {
-		return connected;
-	}
-
-	public void closeConnection() {
-		LOG.info("Closing connection.");
-		try {
-			if (resultSet != null) {
-				resultSet.close();
-			}
-			if (statement != null) {
-				statement.close();
-			}
-			if (connection != null) {
-				connection.close();
-			}
-			connected = false;
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public ResultSet getResultSet(String query) throws SQLException {
-		LOG.info("Executing query: " + query);
-		resultSet = statement.executeQuery(query);
-		return resultSet;
-	}
-
-	public Connection getConnection() {
-		return connection;
-	}
-
-	public int updateDB(String query) throws SQLException {
-		LOG.info("Executing query: " + query);
-		statement.execute(query);
-		return statement.getUpdateCount();
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/NotExistsException.java

@@ -1,10 +0,0 @@
-package org.diylc.swing.plugins.online.presenter;
-
-public class NotExistsException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-
-	public NotExistsException(String message) {
-		super(message);
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/online/presenter/NotLoggedInException.java

@@ -1,7 +0,0 @@
-package org.diylc.swing.plugins.online.presenter;
-
-public class NotLoggedInException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ComponentTabbedPane.java

@@ -1,169 +0,0 @@
-package org.diylc.swing.plugins.toolbox;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Container;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JTabbedPane;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import org.apache.log4j.Logger;
-import org.diylc.common.ComponentType;
-import org.diylc.common.IPlugInPort;
-import org.diylc.core.IDIYComponent;
-import org.diylc.presenter.ComparatorFactory;
-import org.diylc.presenter.ComponentProcessor;
-import org.diylc.presenter.Presenter;
-
-import com.diyfever.gui.miscutils.ConfigurationManager;
-import com.diyfever.gui.miscutils.IConfigListener;
-
-/**
- * Tabbed pane that shows all available components categorized into tabs.
- * 
- * @author Branislav Stojkovic
- */
-class ComponentTabbedPane extends JTabbedPane {
-
-	private static final long serialVersionUID = 1L;
-
-	private static final Logger LOG = Logger.getLogger(ComponentTabbedPane.class);
-
-	public static int SCROLL_STEP = Presenter.ICON_SIZE + ComponentButton.MARGIN * 2 + 2;
-
-	private final IPlugInPort plugInPort;
-
-	public ComponentTabbedPane(IPlugInPort plugInPort) {
-		super();
-		this.plugInPort = plugInPort;
-		addTab("Recently Used", createRecentComponentsPanel());
-		Map<String, List<ComponentType>> componentTypes = plugInPort.getComponentTypes();
-		List<String> categories = new ArrayList<String>(componentTypes.keySet());
-		Collections.sort(categories);
-		for (String category : categories) {
-			JPanel panel = createTab((componentTypes.get(category)));
-			addTab(category, panel);
-		}
-		addChangeListener(new ChangeListener() {
-
-			@Override
-			public void stateChanged(ChangeEvent e) {
-				ComponentTabbedPane.this.plugInPort.setNewComponentTypeSlot(null);
-			}
-		});
-	}
-
-	private JPanel createTab(List<ComponentType> componentTypes) {
-		JPanel panel = new JPanel(new BorderLayout());
-		// final JScrollPane scrollPane =
-		// createComponentScrollBar(componentTypes);
-		panel.setOpaque(false);
-		panel.add(createComponentPanel(componentTypes), BorderLayout.CENTER);
-		// JButton leftButton = new JButton("<");
-		// leftButton.addActionListener(new ActionListener() {
-		//
-		// @Override
-		// public void actionPerformed(ActionEvent e) {
-		// Rectangle rect = scrollPane.getVisibleRect();
-		// if (rect.x > SCROLL_STEP) {
-		// rect.translate(-SCROLL_STEP, 0);
-		// } else {
-		// rect.translate(-rect.x, 0);
-		// }
-		// }
-		// });
-		// leftButton.setMargin(new Insets(0, 2, 0, 2));
-		// JButton rightButton = new JButton(">");
-		// rightButton.addActionListener(new ActionListener() {
-		//
-		// @Override
-		// public void actionPerformed(ActionEvent e) {
-		// Rectangle rect = scrollPane.getVisibleRect();
-		// if (rect.x + rect.width < scrollPane.getViewport().getSize().width -
-		// SCROLL_STEP) {
-		// rect.translate(SCROLL_STEP, 0);
-		// } else {
-		// rect.translate(scrollPane.getViewport().getSize().width - rect.x -
-		// rect.width,
-		// 0);
-		// }
-		// }
-		// });
-		// rightButton.setMargin(new Insets(0, 2, 0, 2));
-		// panel.add(leftButton, BorderLayout.WEST);
-		// panel.add(scrollPane);
-		// panel.add(rightButton, BorderLayout.EAST);
-		return panel;
-	}
-
-	// private JScrollPane createComponentScrollBar(List<ComponentType>
-	// componentTypes) {
-	// JScrollPane scrollPane = new
-	// JScrollPane(createComponentPanel(componentTypes));
-	// scrollPane.setOpaque(false);
-	// scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-	// scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
-	// return scrollPane;
-	// }
-
-	private Component createComponentPanel(List<ComponentType> componentTypes) {
-		Container toolbar = new Container();
-		Collections.sort(componentTypes, ComparatorFactory.getInstance()
-				.getComponentTypeComparator());
-		toolbar.setLayout(new BoxLayout(toolbar, BoxLayout.X_AXIS));
-		for (ComponentType componentType : componentTypes) {
-			JButton button = new ComponentButton(plugInPort, componentType);
-			toolbar.add(button);
-		}
-
-		return toolbar;
-	}
-
-	private Component createRecentComponentsPanel() {
-		JPanel panel = new JPanel(new BorderLayout());
-		panel.setOpaque(false);
-
-		final Container toolbar = new Container();
-		toolbar.setLayout(new BoxLayout(toolbar, BoxLayout.X_AXIS));
-		refreshRecentComponentsToolbar(toolbar, (List<String>) ConfigurationManager.getInstance()
-				.readObject(IPlugInPort.RECENT_COMPONENTS_KEY, new ArrayList<String>()));
-		ConfigurationManager.getInstance().addConfigListener(IPlugInPort.RECENT_COMPONENTS_KEY,
-				new IConfigListener() {
-
-					@Override
-					public void valueChanged(String key, Object value) {
-						refreshRecentComponentsToolbar(toolbar, (List<String>) value);
-						toolbar.invalidate();
-					}
-				});
-
-		panel.add(toolbar, BorderLayout.CENTER);
-
-		return panel;
-	}
-
-	private void refreshRecentComponentsToolbar(Container toolbar,
-			List<String> recentComponentClassList) {
-		toolbar.removeAll();
-		for (String componentClassName : recentComponentClassList) {
-			ComponentType componentType;
-			try {
-				componentType = ComponentProcessor.getInstance().extractComponentTypeFrom(
-						(Class<? extends IDIYComponent<?>>) Class.forName(componentClassName));
-				JButton button = new ComponentButton(plugInPort, componentType);
-				toolbar.add(button);
-			} catch (ClassNotFoundException e) {
-				LOG.error("Could not create recent component button for " + componentClassName, e);
-			}
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ToolBox.java

@@ -1,57 +0,0 @@
-package org.diylc.swing.plugins.toolbox;
-
-import java.util.EnumSet;
-
-import javax.swing.SwingConstants;
-
-import org.apache.log4j.Logger;
-import org.diylc.common.BadPositionException;
-import org.diylc.common.EventType;
-import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.swing.ISwingUI;
-import org.diylc.swing.plugins.statusbar.StatusBar;
-
-
-public class ToolBox implements IPlugIn {
-	
-	private static final Logger LOG = Logger.getLogger(StatusBar.class);
-	
-	private ISwingUI swingUI;
-	private IPlugInPort plugInPort;
-	
-	private ComponentTabbedPane componentTabbedPane;
-
-	public ToolBox(ISwingUI swingUI) {
-		this.swingUI = swingUI;
-	}
-
-	@Override
-	public void connect(IPlugInPort plugInPort) {
-		this.plugInPort = plugInPort;
-		try {
-			swingUI.injectGUIComponent(getComponentTabbedPane(), SwingConstants.TOP);
-		} catch (BadPositionException e) {
-			LOG.error("Could not install the toolbox", e);
-		}
-	}
-	
-	public ComponentTabbedPane getComponentTabbedPane() {
-		if (componentTabbedPane == null) {
-			componentTabbedPane = new ComponentTabbedPane(plugInPort);
-		}
-		return componentTabbedPane;
-	}
-
-	@Override
-	public EnumSet<EventType> getSubscribedEventTypes() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void processMessage(EventType eventType, Object... params) {
-		// TODO Auto-generated method stub
-
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/swing/plugins/toolbox/ToolboxGestureListener.java

@@ -1,33 +0,0 @@
-package org.diylc.swing.plugins.toolbox;
-
-import java.awt.Cursor;
-import java.awt.datatransfer.StringSelection;
-import java.awt.dnd.DragGestureEvent;
-import java.awt.dnd.DragGestureListener;
-
-import org.diylc.common.IPlugInPort;
-
-
-/**
- * {@link DragGestureListener} for {@link CanvasPanel}.
- * 
- * @author Branislav Stojkovic
- */
-class ToolboxGestureListener implements DragGestureListener {
-
-	private IPlugInPort presenter;
-	private String className;
-
-	public ToolboxGestureListener(IPlugInPort presenter, String className) {
-		super();
-		this.presenter = presenter;
-		this.className = className;
-	}
-
-	@Override
-	public void dragGestureRecognized(DragGestureEvent dge) {
-//		presenter.dragStarted(dge.getDragOrigin());
-		dge.startDrag(Cursor.getDefaultCursor(), new StringSelection(className),
-				new ToolboxSourceListener(presenter));
-	}
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/utils/Constants.java

@@ -1,27 +0,0 @@
-package org.diylc.utils;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Stroke;
-import java.awt.Toolkit;
-
-import org.diylc.core.Theme;
-
-public class Constants {
-
-	public static final int PIXELS_PER_INCH = 200;
-	public static final double PIXEL_SIZE = 1d * PIXELS_PER_INCH
-			/ Toolkit.getDefaultToolkit().getScreenResolution();
-
-	public static Color CANVAS_COLOR = Color.white;
-
-	public static final Stroke DASHED_STROKE = new BasicStroke(1.0f, BasicStroke.CAP_BUTT,
-			BasicStroke.JOIN_MITER, 10f, new float[] { 2.0f }, 0.0f);
-
-	public static final Theme DEFAULT_THEME = new Theme("Light", Constants.CANVAS_COLOR, new Color(
-			240, 240, 240), Color.black);
-
-	public static final Color TRANSPARENT_COLOR = new Color(0, 0, 0, 0);
-	
-	public static final Color MULTI_VALUE_COLOR = Color.yellow;
-}

diy-layout-creator --username bancika@gmail.com/DIYLC/templates/eyelet.diy

@@ -1,65 +0,0 @@
-<org.diylc.core.Project>
-  <title>New Project</title>
-  <author>Branislav Stojkovic</author>
-  <width>
-    <value>29.0</value>
-    <unit class="org.diylc.core.measures.SizeUnit">cm</unit>
-  </width>
-  <height>
-    <value>21.0</value>
-    <unit class="org.diylc.core.measures.SizeUnit">cm</unit>
-  </height>
-  <gridSpacing>
-    <value>0.1</value>
-    <unit class="org.diylc.core.measures.SizeUnit">in</unit>
-  </gridSpacing>
-  <components>
-    <org.diylc.components.boards.EyeletBoard>
-      <name>Board1</name>
-      <alpha>127</alpha>
-      <value></value>
-      <controlPoints>
-        <java.awt.Point>
-          <x>555</x>
-          <y>450</y>
-        </java.awt.Point>
-        <java.awt.Point>
-          <x>1140</x>
-          <y>795</y>
-        </java.awt.Point>
-      </controlPoints>
-      <firstPoint>
-        <x>555</x>
-        <y>450</y>
-      </firstPoint>
-      <secondPoint>
-        <x>1140</x>
-        <y>795</y>
-      </secondPoint>
-      <boardColor>
-        <red>248</red>
-        <green>235</green>
-        <blue>179</blue>
-        <alpha>255</alpha>
-      </boardColor>
-      <borderColor>
-        <red>173</red>
-        <green>164</green>
-        <blue>125</blue>
-        <alpha>255</alpha>
-      </borderColor>
-      <spacing>
-        <value>0.3</value>
-        <unit class="org.diylc.core.measures.SizeUnit">in</unit>
-      </spacing>
-      <eyeletColor>
-        <red>195</red>
-        <green>228</green>
-        <blue>237</blue>
-        <alpha>255</alpha>
-      </eyeletColor>
-    </org.diylc.components.boards.EyeletBoard>
-  </components>
-  <groups/>
-  <lockedLayers/>
-</org.diylc.core.Project>

diy-layout-creator --username bancika@gmail.com/DIYLC/templates/perf.diy

@@ -1,65 +0,0 @@
-<org.diylc.core.Project>
-  <title>New Project</title>
-  <author>Branislav Stojkovic</author>
-  <width>
-    <value>29.0</value>
-    <unit class="org.diylc.core.measures.SizeUnit">cm</unit>
-  </width>
-  <height>
-    <value>21.0</value>
-    <unit class="org.diylc.core.measures.SizeUnit">cm</unit>
-  </height>
-  <gridSpacing>
-    <value>0.1</value>
-    <unit class="org.diylc.core.measures.SizeUnit">in</unit>
-  </gridSpacing>
-  <components>
-    <org.diylc.components.boards.PerfBoard>
-      <name>Board1</name>
-      <alpha>127</alpha>
-      <value></value>
-      <controlPoints>
-        <java.awt.Point>
-          <x>585</x>
-          <y>450</y>
-        </java.awt.Point>
-        <java.awt.Point>
-          <x>1050</x>
-          <y>690</y>
-        </java.awt.Point>
-      </controlPoints>
-      <firstPoint>
-        <x>585</x>
-        <y>450</y>
-      </firstPoint>
-      <secondPoint>
-        <x>1050</x>
-        <y>690</y>
-      </secondPoint>
-      <boardColor>
-        <red>248</red>
-        <green>235</green>
-        <blue>179</blue>
-        <alpha>255</alpha>
-      </boardColor>
-      <borderColor>
-        <red>173</red>
-        <green>164</green>
-        <blue>125</blue>
-        <alpha>255</alpha>
-      </borderColor>
-      <spacing>
-        <value>0.1</value>
-        <unit class="org.diylc.core.measures.SizeUnit">in</unit>
-      </spacing>
-      <padColor>
-        <red>218</red>
-        <green>138</green>
-        <blue>103</blue>
-        <alpha>255</alpha>
-      </padColor>
-    </org.diylc.components.boards.PerfBoard>
-  </components>
-  <groups/>
-  <lockedLayers/>
-</org.diylc.core.Project>

diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Blueprint.xml

@@ -1,21 +0,0 @@
-<org.diylc.core.Theme>
-  <name>Blueprint</name>
-  <bgColor>
-    <red>3</red>
-    <green>122</green>
-    <blue>198</blue>
-    <alpha>255</alpha>
-  </bgColor>
-  <gridColor>
-    <red>29</red>
-    <green>140</green>
-    <blue>193</blue>
-    <alpha>255</alpha>
-  </gridColor>
-  <outlineColor>
-    <red>255</red>
-    <green>255</green>
-    <blue>255</blue>
-    <alpha>255</alpha>
-  </outlineColor>
-</org.diylc.core.Theme>

diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Dark.xml

@@ -1,21 +0,0 @@
-<org.diylc.core.Theme>
-  <name>Dark</name>
-  <bgColor>
-    <red>0</red>
-    <green>0</green>
-    <blue>0</blue>
-    <alpha>255</alpha>
-  </bgColor>
-  <gridColor>
-    <red>40</red>
-    <green>40</green>
-    <blue>40</blue>
-    <alpha>255</alpha>
-  </gridColor>
-  <outlineColor>
-    <red>255</red>
-    <green>255</green>
-    <blue>255</blue>
-    <alpha>255</alpha>
-  </outlineColor>
-</org.diylc.core.Theme>

diy-layout-creator --username bancika@gmail.com/DIYLC/themes/Light.xml

@@ -1,21 +0,0 @@
-<org.diylc.core.Theme>
-	<name>Light</name>
-	<bgColor>
-		<red>255</red>
-		<green>255</green>
-		<blue>255</blue>
-		<alpha>255</alpha>
-	</bgColor>
-	<gridColor>
-		<red>240</red>
-		<green>240</green>
-		<blue>240</blue>
-		<alpha>240</alpha>
-	</gridColor>
-	<outlineColor>
-		<red>0</red>
-		<green>0</green>
-		<blue>0</blue>
-		<alpha>255</alpha>
-	</outlineColor>
-</org.diylc.core.Theme>

diy-layout-creator --username bancika@gmail.com/DIYLC/update.xml

@@ -1,373 +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>
-		<com.diyfever.gui.update.Version>
-			<versionNumber>
-				<major>3</major>
-				<minor>0</minor>
-				<build>5</build>
-			</versionNumber>
-			<releaseDate>2011-01-30 20:00:00.000 CET</releaseDate>
-			<name></name>
-			<changes>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Curved trace does not show control points</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Potentiometer draws wrong at 180 degrees</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Reset component selection when tab is changed</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Resistor can show color bands</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Electrolytic capacitor has a new icon and new looks</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Solder pad can be square</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Added keyboard shortcuts to some menu options</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>V1 file importer can recognize hookup wire and transistors</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added support for creating and loading templates</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added TO-92 transistor</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added TO-220 transistor</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added LED</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added axial electrolytic capacitor</description>
-				</com.diyfever.gui.update.Change>
-			</changes>
-			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
-		</com.diyfever.gui.update.Version>
-		<com.diyfever.gui.update.Version>
-			<versionNumber>
-				<major>3</major>
-				<minor>0</minor>
-				<build>6</build>
-			</versionNumber>
-			<releaseDate>2011-02-07 20:00:00.000 CET</releaseDate>
-			<name></name>
-			<changes>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Copy/paste doesn't work for some components (potentiometer, transistor, etc)</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Resistor color codes are sometimes wrong</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Resistors can specify power handling</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Capacitors can specify voltage handling</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Fixed lead alignment issue</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Better scaling, grid lines are more precise</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Improved performance</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added resistor schematic symbol</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added capacitor schematic symbol</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added eyelet/turret component</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added Marshall/Trainwreck style boards</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added few types of trimmers</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Configurable rendering quality to improve speed</description>
-				</com.diyfever.gui.update.Change>
-			</changes>
-			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
-		</com.diyfever.gui.update.Version>
-		<com.diyfever.gui.update.Version>
-			<versionNumber>
-				<major>3</major>
-				<minor>0</minor>
-				<build>7</build>
-			</versionNumber>
-			<releaseDate>2011-02-27 20:00:00.000 CET</releaseDate>
-			<name></name>
-			<changes>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Resistor and capacitor symbols are not clickable</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Boards sometimes render holes/pads on the edge</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Download link doesn't work on Mac</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Ruler ticks don't always match with the grid</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Micro symbol doesn't get exported to PDF</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>DIL IC now has more pin options</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Send to Back/Bring to Front are more flexible and renamed to match what they do</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Auto-save project and restore if app crashes</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added support for themes</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Added tube socket</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Sticky points may be turned off</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Snap to Grid may be turned off</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Auto-create solder pads</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Auto-edit mode</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Continuous component creation</description>
-				</com.diyfever.gui.update.Change>
-			</changes>
-			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
-		</com.diyfever.gui.update.Version>
-		<com.diyfever.gui.update.Version>
-			<versionNumber>
-				<major>3</major>
-				<minor>0</minor>
-				<build>8</build>
-			</versionNumber>
-			<releaseDate>2011-03-03 20:00:00.000 CET</releaseDate>
-			<name></name>
-			<changes>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Sometimes it's not possible to click on a component, especially when layout is large</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Curved traces and wires can have 2, 3 and 4 control points</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Switchable wheel zoom</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Automatic standing resistors, capacitors and diodes</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Vertical vero board</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Label has editable font</description>
-				</com.diyfever.gui.update.Change>
-			</changes>
-			<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
-		</com.diyfever.gui.update.Version>
-		<com.diyfever.gui.update.Version>
-			<versionNumber>
-				<major>3</major>
-				<minor>0</minor>
-				<build>9</build>
-			</versionNumber>
-			<releaseDate>2011-08-28 20:00:00.000 CET</releaseDate>
-			<name></name>
-			<changes>
-				<com.diyfever.gui.update.Change>
-					<changeType>BUG_FIX</changeType>
-					<description>Auto-created solder pads aren't assigned with default settings and name</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Component edit dialog allows changing property values even when they are not the same. Boxes are marked yellow to designate multi-valued state.</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Component edit dialog should show mutual properties when components of different types are selected (e.g. curved trace and straight trace width)</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Ctrl+click should not clear selection when clicked on the canvas</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Increased PNG export resolution</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Auto-increment component names when copy-pasting</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Do not attempt to write auto-save files if user does not have permissions to create files</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>IMPROVEMENT</changeType>
-					<description>Allow zero ohm resistors</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Outline mode that resembles PCB silkscreen</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Double click on a component button in the toolbar selects all components of that type</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Renumber selected components by X or Y axis</description>
-				</com.diyfever.gui.update.Change>
-				<com.diyfever.gui.update.Change>
-					<changeType>NEW_FEATURE</changeType>
-					<description>Recently used components in the toolbar for easy navigation</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>

diy-layout-creator --username bancika@gmail.com/Library/.gitignore

@@ -1 +0,0 @@
-/bin/

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/MarshallPerfBoard.java

@@ -1,109 +0,0 @@
-package org.diylc.components.boards;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Shape;
-
-import org.diylc.core.ComponentState;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.IDrawingObserver;
-import org.diylc.core.Project;
-import org.diylc.core.Theme;
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-import org.diylc.utils.Constants;
-
-@ComponentDescriptor(name = "Marshall Style Perf Board", category = "Boards", author = "Branislav Stojkovic", zOrder = IDIYComponent.BOARD, instanceNamePrefix = "Board", description = "Perforated board as found on some Marshall and Trainwreck amps")
-public class MarshallPerfBoard extends AbstractBoard {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Color BOARD_COLOR = Color.decode("#CD8500");
-	public static Color BORDER_COLOR = BOARD_COLOR.darker();
-	public static Size SPACING = new Size(3 / 8d, SizeUnit.in);
-	public static Size HOLE_SIZE = new Size(1 / 8d, SizeUnit.in);
-
-	// private Area copperArea;
-	protected Size spacing = SPACING;
-
-	public MarshallPerfBoard() {
-		super();
-		this.boardColor = BOARD_COLOR;
-		this.borderColor = BORDER_COLOR;
-	}
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
-		Shape clip = g2d.getClip();
-		if (checkPointsClipped(clip) && !clip.contains(firstPoint.x, secondPoint.y)
-				&& !clip.contains(secondPoint.x, firstPoint.y)) {
-			return;
-		}
-		super.draw(g2d, componentState, outlineMode, project, drawingObserver);
-		if (componentState != ComponentState.DRAGGING) {
-			if (alpha < MAX_ALPHA) {
-				g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
-						/ MAX_ALPHA));
-			}
-			Point p = new Point(firstPoint);
-			int holeDiameter = getClosestOdd((int) HOLE_SIZE.convertToPixels());
-			int spacing = (int) this.spacing.convertToPixels();
-
-			while (p.y < secondPoint.y - spacing) {
-				p.x = firstPoint.x;
-				p.y += spacing;
-				while (p.x < secondPoint.x - spacing - holeDiameter) {
-					p.x += spacing;
-					g2d.setColor(Constants.CANVAS_COLOR);
-					g2d.fillOval(p.x - holeDiameter / 2, p.y - holeDiameter / 2, holeDiameter,
-							holeDiameter);
-					g2d.setColor(borderColor);
-					g2d.drawOval(p.x - holeDiameter / 2, p.y - holeDiameter / 2, holeDiameter,
-							holeDiameter);
-				}
-			}
-		}
-	}
-
-	@EditableProperty
-	public Size getSpacing() {
-		return spacing;
-	}
-
-	public void setSpacing(Size spacing) {
-		this.spacing = spacing;
-	}
-
-	@Override
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		g2d.setColor(BOARD_COLOR);
-		g2d.fillRect(2, 2, width - 4, height - 4);
-		g2d.setColor(BORDER_COLOR);
-		g2d.drawRect(2, 2, width - 4, height - 4);
-
-		g2d.setColor(Constants.CANVAS_COLOR);
-		g2d.fillOval(width / 3 - 2, width / 3 - 2, 5, 5);
-		g2d.setColor(BORDER_COLOR);
-		g2d.drawOval(width / 3 - 2, width / 3 - 2, 5, 5);
-
-		g2d.setColor(Constants.CANVAS_COLOR);
-		g2d.fillOval(2 * width / 3 - 2, width / 3 - 2, 5, 5);
-		g2d.setColor(BORDER_COLOR);
-		g2d.drawOval(2 * width / 3 - 2, width / 3 - 2, 5, 5);
-
-		g2d.setColor(Constants.CANVAS_COLOR);
-		g2d.fillOval(width / 3 - 2, 2 * width / 3 - 2, 5, 5);
-		g2d.setColor(BORDER_COLOR);
-		g2d.drawOval(width / 3 - 2, 2 * width / 3 - 2, 5, 5);
-
-		g2d.setColor(Constants.CANVAS_COLOR);
-		g2d.fillOval(2 * width / 3 - 2, 2 * width / 3 - 2, 5, 5);
-		g2d.setColor(BORDER_COLOR);
-		g2d.drawOval(2 * width / 3 - 2, 2 * width / 3 - 2, 5, 5);
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/Eyelet.java

@@ -1,139 +0,0 @@
-package org.diylc.components.connectivity;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Point;
-
-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.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-import org.diylc.utils.Constants;
-
-@ComponentDescriptor(name = "Eyelet", category = "Connectivity", author = "Branislav Stojkovic", description = "Eyelet or turret terminal", instanceNamePrefix = "Eyelet", stretchable = false, zOrder = IDIYComponent.TRACE + 0.1)
-public class Eyelet extends AbstractComponent<String> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Size SIZE = new Size(0.2d, SizeUnit.in);
-	public static Size HOLE_SIZE = new Size(0.1d, SizeUnit.in);
-	public static Color COLOR = Color.decode("#C3E4ED");
-
-	private Size size = SIZE;
-	private Size holeSize = HOLE_SIZE;
-	private Color color = COLOR;
-	private Point point = new Point(0, 0);
-	private String value = "";
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
-		if (checkPointsClipped(g2d.getClip())) {
-			return;
-		}
-		int diameter = getClosestOdd((int) size.convertToPixels());
-		int holeDiameter = getClosestOdd((int) holeSize.convertToPixels());
-		g2d.setColor(color);
-		g2d.fillOval(point.x - diameter / 2, point.y - diameter / 2, diameter, diameter);
-		g2d.setColor(componentState == ComponentState.SELECTED
-				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : color.darker());
-		g2d.drawOval(point.x - diameter / 2, point.y - diameter / 2, diameter, diameter);
-		g2d.setColor(Constants.CANVAS_COLOR);
-		g2d.fillOval(point.x - holeDiameter / 2, point.y - holeDiameter / 2, holeDiameter,
-				holeDiameter);
-		g2d.setColor(componentState == ComponentState.SELECTED
-				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : color.darker());
-		g2d.drawOval(point.x - holeDiameter / 2, point.y - holeDiameter / 2, holeDiameter,
-				holeDiameter);
-	}
-
-	@Override
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		int diameter = getClosestOdd(width / 2);
-		int holeDiameter = 5;
-		g2d.setColor(COLOR);
-		g2d.fillOval((width - diameter) / 2, (height - diameter) / 2, diameter, diameter);
-		g2d.setColor(COLOR.darker());
-		g2d.drawOval((width - diameter) / 2, (height - diameter) / 2, diameter, diameter);
-		g2d.setColor(Constants.CANVAS_COLOR);
-		g2d.fillOval((width - holeDiameter) / 2, (height - holeDiameter) / 2, holeDiameter,
-				holeDiameter);
-		g2d.setColor(COLOR.darker());
-		g2d.drawOval((width - holeDiameter) / 2, (height - holeDiameter) / 2, holeDiameter,
-				holeDiameter);
-	}
-
-	@EditableProperty
-	public Size getSize() {
-		return size;
-	}
-
-	public void setSize(Size size) {
-		this.size = size;
-	}
-
-	@EditableProperty(name = "Hole size")
-	public Size getHoleSize() {
-		return holeSize;
-	}
-
-	public void setHoleSize(Size holeSize) {
-		this.holeSize = holeSize;
-	}
-
-	@Override
-	public String getName() {
-		return super.getName();
-	}
-
-	@Override
-	public int getControlPointCount() {
-		return 1;
-	}
-
-	@Override
-	public boolean isControlPointSticky(int index) {
-		return true;
-	}
-
-	@Override
-	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
-		return VisibilityPolicy.NEVER;
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return point;
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		this.point.setLocation(point);
-	}
-
-	@EditableProperty(name = "Color")
-	public Color getColor() {
-		return color;
-	}
-
-	public void setColor(Color color) {
-		this.color = color;
-	}
-
-	@Override
-	@EditableProperty
-	public String getValue() {
-		return value;
-	}
-
-	@Override
-	public void setValue(String value) {
-		this.value = value;
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/IconImageConverter.java

@@ -1,102 +0,0 @@
-package org.diylc.components.misc;
-
-import java.awt.Image;
-import java.awt.Toolkit;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.awt.image.ImageObserver;
-import java.awt.image.MemoryImageSource;
-import java.awt.image.PixelGrabber;
-import java.io.File;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-import javax.swing.ImageIcon;
-
-import org.apache.log4j.Logger;
-
-import com.thoughtworks.xstream.converters.Converter;
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-
-public class IconImageConverter implements Converter {
-
-	private static final Logger LOG = Logger.getLogger(IconImageConverter.class);
-
-	@Override
-	public void marshal(Object object, HierarchicalStreamWriter writer, MarshallingContext context) {
-		ImageIcon image = (ImageIcon) object;
-		int width = image.getIconWidth();
-		int height = image.getIconHeight();
-		int[] pixels = new int[width * height];
-
-		if (image != null) {
-			try {
-				PixelGrabber pg = new PixelGrabber(image.getImage(), 0, 0, width, height, pixels,
-						0, width);
-				pg.grabPixels();
-				if ((pg.getStatus() & ImageObserver.ABORT) != 0) {
-					LOG.error("Failed to load image contents");
-				}
-			} catch (InterruptedException e) {
-				LOG.error("Image load interrupted");
-			}
-		}
-		LOG.debug("Writing image to file: " + width + "x" + height);
-		writer.addAttribute("width", Integer.toString(width));
-		writer.addAttribute("height", Integer.toString(height));
-		StringBuilder dataBuilder = new StringBuilder();
-		int n = 0;
-		for (int pixel : pixels) {
-			dataBuilder.append(Integer.toString(pixel, 16));
-			dataBuilder.append(",");
-			n++;
-			if (n % 16 == 0) {
-				dataBuilder.append("\n");
-			}
-		}
-		writer.addAttribute("data", dataBuilder.toString());
-	}
-
-	@Override
-	public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
-		int width = Integer.parseInt(reader.getAttribute("width"));
-		int height = Integer.parseInt(reader.getAttribute("height"));
-		LOG.debug("Reading image from file: " + width + "x" + height);
-		int[] pixels = new int[width * height];
-		String data = reader.getAttribute("data").replace("\n", "");
-		String[] splitData = data.split(",");
-		for (int i = 0; i < Math.min(splitData.length, pixels.length); i++) {
-			if (!splitData[i].trim().isEmpty()) {
-				try {
-					pixels[i] = Integer.parseInt(splitData[i].trim(), 16);
-				} catch (Exception e) {
-					pixels[i] = 0;
-				}
-			}
-		}
-
-		Toolkit toolkit = Toolkit.getDefaultToolkit();
-		ColorModel colorModel = ColorModel.getRGBdefault();
-		Image image = toolkit.createImage(new MemoryImageSource(width, height, colorModel, pixels,
-				0, width));
-
-		BufferedImage bimg = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-		bimg.setRGB(0, 0, width, height, pixels, 0, width);
-		File outputfile = new File("c:\\saved.png");
-		try {
-			ImageIO.write(bimg, "png", outputfile);
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return new ImageIcon(image);
-	}
-
-	@Override
-	public boolean canConvert(Class clazz) {
-		return ImageIcon.class.isAssignableFrom(clazz);
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Image.java

@@ -1,131 +0,0 @@
-package org.diylc.components.misc;
-
-import java.awt.AlphaComposite;
-import java.awt.Composite;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Shape;
-
-import javax.swing.ImageIcon;
-
-import org.diylc.components.AbstractTransparentComponent;
-import org.diylc.core.ComponentState;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.IDrawingObserver;
-import org.diylc.core.Project;
-import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-
-@ComponentDescriptor(name = "Image", author = "Branislav Stojkovic", category = "Misc", description = "User defined image", instanceNamePrefix = "Img", zOrder = IDIYComponent.TEXT, stretchable = false)
-public class Image extends AbstractTransparentComponent<Void> {
-
-	private static final long serialVersionUID = 1L;
-	public static String DEFAULT_TEXT = "Double click to edit text";
-	private static ImageIcon ICON;
-	private static byte DEFAULT_SCALE = 50;
-
-	static {
-		String name = "image.png";
-		java.net.URL imgURL = Image.class.getResource(name);
-		if (imgURL != null) {
-			ICON = new ImageIcon(imgURL, name);
-		}
-	}
-
-	private Point point = new Point(0, 0);
-	@XStreamConverter(IconImageConverter.class)
-	private ImageIcon image = ICON;
-	private byte scale = 50;
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
-		double s = 1d * scale / DEFAULT_SCALE;
-		Point endPoint = new Point((int) (image.getIconWidth() * s),
-				(int) (image.getIconHeight() * s));
-		Shape clip = g2d.getClip();
-		if (!clip.contains(point) && !clip.contains(endPoint)
-				&& !clip.contains(point.x, endPoint.y) && !clip.contains(endPoint.x, point.y)) {
-			return;
-		}
-		Composite oldComposite = g2d.getComposite();
-		if (alpha < MAX_ALPHA) {
-			g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
-					/ MAX_ALPHA));
-		}
-
-		g2d.scale(s, s);
-		g2d.drawImage(image.getImage(), (int) (point.x / s), (int) (point.y / s), null);
-		if (componentState == ComponentState.SELECTED) {
-			g2d.setComposite(oldComposite);
-			g2d.scale(1 / s, 1 / s);
-			g2d.setColor(SELECTION_COLOR);
-			g2d.drawRect(point.x, point.y, endPoint.x, endPoint.y);
-		}
-	}
-
-	@Override
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		g2d.drawImage(ICON.getImage(), point.x, point.y, null);
-	}
-
-	@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);
-	}
-
-	@EditableProperty(defaultable = false)
-	public ImageIcon getImage() {
-		return image;
-	}
-
-	public void setImage(ImageIcon image) {
-		this.image = image;
-	}
-
-	@EditableProperty(defaultable = false)
-	public byte getScale() {
-		return scale;
-	}
-
-	public void setScale(byte scale) {
-		this.scale = scale;
-	}
-
-	@Override
-	public String getName() {
-		return super.getName();
-	}
-
-	@Override
-	public Void getValue() {
-		return null;
-	}
-
-	@Override
-	public void setValue(Void value) {
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/AxialElectrolyticCapacitor.java

@@ -1,149 +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.common.IPlugInPort;
-import org.diylc.common.ObjectCache;
-import org.diylc.components.AbstractLeadedComponent;
-import org.diylc.core.CreationMethod;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.Theme;
-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;
-import org.diylc.utils.Constants;
-
-import com.diyfever.gui.miscutils.ConfigurationManager;
-
-@ComponentDescriptor(name = "Electrolytic Capacitor (axial)", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "Axial electrolytic capacitor, similar to Sprague Atom, F&T, etc", zOrder = IDIYComponent.COMPONENT)
-public class AxialElectrolyticCapacitor extends AbstractLeadedComponent<Capacitance> {
-
-	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("#EAADEA");
-	public static Color BORDER_COLOR = BODY_COLOR.darker();
-	public static Color MARKER_COLOR = Color.gray;
-	public static Color TICK_COLOR = Color.white;
-
-	private Capacitance value = new Capacitance(1d, CapacitanceUnit.uF);
-	private Voltage voltage = Voltage._63V;
-
-	private Color markerColor = MARKER_COLOR;
-	private Color tickColor = TICK_COLOR;
-	private boolean polarized = true;
-
-	public AxialElectrolyticCapacitor() {
-		super();
-		this.bodyColor = BODY_COLOR;
-		this.borderColor = BORDER_COLOR;
-	}
-
-	@EditableProperty
-	public Capacitance getValue() {
-		return value;
-	}
-
-	public void setValue(Capacitance value) {
-		this.value = value;
-	}
-
-	@EditableProperty
-	public Voltage getVoltage() {
-		return voltage;
-	}
-
-	public void setVoltage(Voltage voltage) {
-		this.voltage = voltage;
-	}
-
-	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(MARKER_COLOR);
-		g2d.fillRect(width - 9, height / 2 - 3, 5, 6);
-		g2d.setColor(TICK_COLOR);
-		g2d.drawLine(width - 6, height / 2 - 1, width - 6, height / 2 + 1);
-		g2d.setColor(BORDER_COLOR);
-		g2d.drawRect(4, height / 2 - 3, width - 8, 6);
-	}
-
-	@Override
-	protected Size getDefaultWidth() {
-		return DEFAULT_HEIGHT;
-	}
-
-	@Override
-	protected Size getDefaultLength() {
-		return DEFAULT_WIDTH;
-	}
-
-	@EditableProperty(name = "Marker")
-	public Color getMarkerColor() {
-		return markerColor;
-	}
-
-	public void setMarkerColor(Color coverColor) {
-		this.markerColor = coverColor;
-	}
-
-	@EditableProperty(name = "Tick")
-	public Color getTickColor() {
-		return tickColor;
-	}
-
-	public void setTickColor(Color tickColor) {
-		this.tickColor = tickColor;
-	}
-
-	@EditableProperty(name = "Polarized")
-	public boolean getPolarized() {
-		return polarized;
-	}
-
-	public void setPolarized(boolean polarized) {
-		this.polarized = polarized;
-	}
-
-	@Override
-	protected Shape getBodyShape() {
-		return new Rectangle2D.Double(0f, 0f, getLength().convertToPixels(),
-				getClosestOdd(getWidth().convertToPixels()));
-	}
-
-	@Override
-	protected void decorateComponentBody(Graphics2D g2d, boolean outlineMode) {
-		if (polarized) {
-			int width = getClosestOdd(getWidth().convertToPixels());
-			int markerLength = (int) (getLength().convertToPixels() * 0.2);
-			if (!outlineMode) {
-				g2d.setColor(markerColor);
-				g2d.fillRect((int) getLength().convertToPixels() - markerLength, 0, markerLength,
-						width);
-			}
-			Color finalTickColor;
-			if (outlineMode) {
-				Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
-						IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
-				finalTickColor = theme.getOutlineColor();
-			} else {
-				finalTickColor = tickColor;
-			}
-			g2d.setColor(finalTickColor);
-			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(2));
-			g2d.drawLine((int) getLength().convertToPixels() - markerLength / 2,
-					(int) (width / 2 - width * 0.15), (int) getLength().convertToPixels()
-							- markerLength / 2, (int) (width / 2 + width * 0.15));
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/CapacitorSymbol.java

@@ -1,101 +0,0 @@
-package org.diylc.components.passive;
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.GeneralPath;
-
-import org.diylc.components.AbstractSchematicLeadedSymbol;
-import org.diylc.core.CreationMethod;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.Theme;
-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 = "Capacitor (schematic symbol)", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "Capacitor schematic symbol with an optional polarity sign", zOrder = IDIYComponent.COMPONENT)
-public class CapacitorSymbol extends AbstractSchematicLeadedSymbol<Capacitance> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Size DEFAULT_LENGTH = new Size(0.05, SizeUnit.in);
-	public static Size DEFAULT_WIDTH = new Size(0.15, SizeUnit.in);
-
-	private Capacitance value = new Capacitance(22d, CapacitanceUnit.nF);
-	private Voltage voltage = Voltage._63V;
-	private boolean polarized = false;
-
-	@EditableProperty
-	public Capacitance getValue() {
-		return value;
-	}
-
-	public void setValue(Capacitance value) {
-		this.value = value;
-	}
-
-	@EditableProperty
-	public Voltage getVoltage() {
-		return voltage;
-	}
-
-	public void setVoltage(Voltage voltage) {
-		this.voltage = voltage;
-	}
-
-	@EditableProperty
-	public boolean getPolarized() {
-		return polarized;
-	}
-
-	public void setPolarized(boolean polarized) {
-		this.polarized = polarized;
-	}
-
-	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, 13, height / 2);
-		g2d.drawLine(width - 13, height / 2, width, height / 2);
-		g2d.setColor(COLOR);
-		g2d.drawLine(14, height / 2 - 6, 14, height / 2 + 6);
-		g2d.drawLine(width - 14, height / 2 - 6, width - 14, height / 2 + 6);
-	}
-
-	@Override
-	protected Size getDefaultWidth() {
-		return DEFAULT_WIDTH;
-	}
-
-	@Override
-	protected Size getDefaultLength() {
-		return DEFAULT_LENGTH;
-	}
-
-	@Override
-	protected Shape getBodyShape() {
-		GeneralPath polyline = new GeneralPath();
-		double length = getLength().convertToPixels();
-		double width = getWidth().convertToPixels();
-		polyline.moveTo(0, 0);
-		polyline.lineTo(0, width);
-		polyline.moveTo(length, 0);
-		polyline.lineTo(length, width);
-		return polyline;
-	}
-
-	@Override
-	protected void decorateComponentBody(Graphics2D g2d, boolean outlineMode) {
-		if (polarized) {
-			// Draw + sign.
-			g2d.setColor(getBorderColor());
-			int plusSize = getClosestOdd(getWidth().convertToPixels() / 4);
-			int x = -plusSize;
-			int y = plusSize;
-			g2d.drawLine(x - plusSize / 2, y, x + plusSize / 2, y);
-			g2d.drawLine(x, y - plusSize / 2, x, y + plusSize / 2);
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Power.java

@@ -1,18 +0,0 @@
-package org.diylc.components.passive;
-
-public enum Power {
-
-	EIGHT("1/8W"), QUARTER("1/4W"), HALF("1/2W"), ONE("1W"), TWO("2W"), FIVE("5W"), TEN("10W"), FIFTY(
-			"50W"), HUNDRED("100W");
-
-	String label;
-
-	Power(String label) {
-		this.label = label;
-	}
-
-	@Override
-	public String toString() {
-		return label;
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialElectrolytic.java

@@ -1,184 +0,0 @@
-package org.diylc.components.passive;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.Area;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Rectangle2D;
-
-import org.diylc.common.IPlugInPort;
-import org.diylc.common.ObjectCache;
-import org.diylc.components.AbstractLeadedComponent;
-import org.diylc.core.CreationMethod;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.Theme;
-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;
-import org.diylc.utils.Constants;
-
-import com.diyfever.gui.miscutils.ConfigurationManager;
-
-@ComponentDescriptor(name = "Electrolytic Capacitor", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "Vertical mounted electrolytic capacitor, polarized or bipolar", zOrder = IDIYComponent.COMPONENT)
-public class RadialElectrolytic 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("#EAADEA");
-	public static Color BORDER_COLOR = BODY_COLOR.darker();
-	public static Color MARKER_COLOR = Color.gray;
-	public static Color TICK_COLOR = Color.white;
-
-	private Capacitance value = new Capacitance(1d, CapacitanceUnit.uF);
-	private Voltage voltage = Voltage._63V;
-
-	private Color markerColor = MARKER_COLOR;
-	private Color tickColor = TICK_COLOR;
-	private boolean polarized = true;
-
-	public RadialElectrolytic() {
-		super();
-		this.bodyColor = BODY_COLOR;
-		this.borderColor = BORDER_COLOR;
-	}
-
-	@EditableProperty
-	public Capacitance getValue() {
-		return value;
-	}
-
-	public void setValue(Capacitance value) {
-		this.value = value;
-	}
-
-	@EditableProperty
-	public Voltage getVoltage() {
-		return voltage;
-	}
-
-	public void setVoltage(Voltage voltage) {
-		this.voltage = voltage;
-	}
-
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		g2d.setColor(BODY_COLOR);
-		int margin = 3;
-		Ellipse2D body = new Ellipse2D.Double(margin, margin, getClosestOdd(width - 2 * margin),
-				getClosestOdd(width - 2 * margin));
-		g2d.fill(body);
-		Area marker = new Area(body);
-		marker.subtract(new Area(new Rectangle2D.Double(margin, margin, width - 4 * margin,
-				getClosestOdd(width - 2 * margin))));
-		g2d.setColor(MARKER_COLOR);
-		g2d.fill(marker);
-		g2d.setColor(TICK_COLOR);
-		g2d.drawLine(width - 2 * margin, height / 2 - 2, width - 2 * margin, height / 2 + 2);
-		g2d.setColor(BORDER_COLOR);
-		g2d.draw(body);
-		// g2d.setColor(COVER_COLOR.darker());
-		// g2d.drawLine(innerMargin + 2, innerMargin + 2, width - innerMargin -
-		// 2, width - innerMargin
-		// - 2);
-		// g2d.drawLine(innerMargin + 2, width - innerMargin - 2, width -
-		// innerMargin - 2,
-		// innerMargin + 2);
-	}
-
-	@Override
-	protected void decorateComponentBody(Graphics2D g2d, boolean outlineMode) {
-		if (polarized) {
-			int totalDiameter = getClosestOdd(getLength().convertToPixels());
-			if (!outlineMode) {
-				Area area = new Area(getBodyShape());
-				area.subtract(new Area(new Rectangle2D.Double(0, 0, totalDiameter * 0.8,
-						totalDiameter)));
-				g2d.setColor(markerColor);
-				g2d.fill(area);
-			}
-			Color finalTickColor;
-			if (outlineMode) {
-				Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
-						IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
-				finalTickColor = theme.getOutlineColor();
-			} else {
-				finalTickColor = tickColor;
-			}
-			g2d.setColor(finalTickColor);
-			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(2));
-			g2d.drawLine((int) (totalDiameter * 0.9), totalDiameter / 2
-					- (int) (totalDiameter * 0.05), (int) (totalDiameter * 0.9), totalDiameter / 2
-					+ (int) (totalDiameter * 0.05));
-		}
-		// int coverDiameter = getClosestOdd(totalDiameter * 3 / 4);
-		// g2d.setColor(coverColor);
-		// int position = (totalDiameter - coverDiameter) / 2;
-		// g2d.fillOval(position, position, coverDiameter, coverDiameter);
-		// g2d.setColor(coverColor.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 getDefaultWidth() {
-		return null;
-	}
-
-	@Override
-	public Size getWidth() {
-		return super.getWidth();
-	}
-
-	@Override
-	protected Size getDefaultLength() {
-		// We'll reuse width property to set the diameter.
-		return DEFAULT_SIZE;
-	}
-
-	@EditableProperty(name = "Diameter")
-	@Override
-	public Size getLength() {
-		return super.getLength();
-	}
-
-	@EditableProperty(name = "Marker")
-	public Color getMarkerColor() {
-		return markerColor;
-	}
-
-	public void setMarkerColor(Color coverColor) {
-		this.markerColor = coverColor;
-	}
-
-	@EditableProperty(name = "Tick")
-	public Color getTickColor() {
-		return tickColor;
-	}
-
-	public void setTickColor(Color tickColor) {
-		this.tickColor = tickColor;
-	}
-
-	@EditableProperty(name = "Polarized")
-	public boolean getPolarized() {
-		return polarized;
-	}
-
-	public void setPolarized(boolean polarized) {
-		this.polarized = polarized;
-	}
-
-	@Override
-	protected Shape getBodyShape() {
-		return new Ellipse2D.Double(0f, 0f, getClosestOdd(getLength().convertToPixels()),
-				getClosestOdd(getLength().convertToPixels()));
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorSymbol.java

@@ -1,84 +0,0 @@
-package org.diylc.components.passive;
-
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.GeneralPath;
-
-import org.diylc.components.AbstractSchematicLeadedSymbol;
-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 (schematic symbol)", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "R", description = "", zOrder = IDIYComponent.COMPONENT)
-public class ResistorSymbol extends AbstractSchematicLeadedSymbol<Resistance> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Size DEFAULT_LENGTH = new Size(0.3, SizeUnit.in);
-	public static Size DEFAULT_WIDTH = new Size(0.08, SizeUnit.in);
-
-	private Resistance value = new Resistance(100d, ResistanceUnit.K);
-	private Power power = Power.HALF;
-
-	@EditableProperty
-	public Resistance getValue() {
-		return value;
-	}
-
-	public void setValue(Resistance value) {
-		this.value = value;
-	}
-	
-	@EditableProperty
-	public Power getPower() {
-		return power;
-	}
-	
-	public void setPower(Power power) {
-		this.power = power;
-	}
-
-	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, 4, height / 2);
-		g2d.drawLine(width - 4, height / 2, width, height / 2);
-		g2d.setColor(COLOR);
-		g2d.drawPolyline(new int[] { 4, 6, 10, 14, 18, 22, 26, 28 }, new int[] { height / 2,
-				height / 2 + 2, height / 2 - 2, height / 2 + 2, height / 2 - 2, height / 2 + 2,
-				height / 2 - 2, height / 2 }, 8);
-	}
-
-	@Override
-	protected Size getDefaultWidth() {
-		return DEFAULT_WIDTH;
-	}
-
-	@Override
-	protected Size getDefaultLength() {
-		return DEFAULT_LENGTH;
-	}
-
-	@Override
-	protected Shape getBodyShape() {
-		GeneralPath polyline = new GeneralPath();
-		double length = getLength().convertToPixels();
-		double width = getWidth().convertToPixels();
-		polyline.moveTo(0, width / 2);
-		polyline.lineTo(length / 16, width);
-		polyline.lineTo(3 * length / 16, 0);
-		polyline.lineTo(5 * length / 16, width);
-		polyline.lineTo(7 * length / 16, 0);
-		polyline.lineTo(9 * length / 16, width);
-		polyline.lineTo(11 * length / 16, 0);
-		polyline.lineTo(13 * length / 16, width);
-		polyline.lineTo(15 * length / 16, 0);
-		polyline.lineTo(length, width / 2);
-		return polyline;
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/ResistorValue.java

@@ -1,28 +0,0 @@
-package org.diylc.components.passive;
-
-import org.diylc.core.measures.Resistance;
-
-public class ResistorValue {
-
-	private Resistance resistance;
-	private Power power;
-
-	public ResistorValue(Resistance resistance, Power power) {
-		super();
-		this.resistance = resistance;
-		this.power = power;
-	}
-
-	public Resistance getResistance() {
-		return resistance;
-	}
-
-	public Power getPower() {
-		return power;
-	}
-	
-	@Override
-	public String toString() {
-		return resistance.toString() + power.toString();
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/TrimmerPotentiometer.java

@@ -1,375 +0,0 @@
-package org.diylc.components.passive;
-
-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.Shape;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Rectangle2D;
-
-import org.diylc.common.ObjectCache;
-import org.diylc.common.Orientation;
-import org.diylc.core.ComponentState;
-import org.diylc.core.CreationMethod;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.IDrawingObserver;
-import org.diylc.core.Project;
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-
-@ComponentDescriptor(name = "Trimmer Potentiometer", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.SINGLE_CLICK, instanceNamePrefix = "VR", description = "Various types of board mounted trimmer potentiometers", zOrder = IDIYComponent.COMPONENT, stretchable = false)
-public class TrimmerPotentiometer extends AbstractPotentiometer {
-
-	private static final long serialVersionUID = 1L;
-
-	protected static Size FLAT_BODY_SIZE = new Size(9.5d, SizeUnit.mm);
-	protected static Size FLAT_SHAFT_SIZE = new Size(4d, SizeUnit.mm);
-	protected static Size VERTICAL_BODY_LENGTH = new Size(9.5d, SizeUnit.mm);
-	protected static Size VERTICAL_BODY_WIDTH = new Size(4.5d, SizeUnit.mm);
-	protected static Size SPACING = new Size(0.1d, SizeUnit.in);
-	private static Color BODY_COLOR = Color.decode("#FFFFE0");
-	private static Color BORDER_COLOR = Color.decode("#8E8E38");
-	private static Color SHAFT_COLOR = Color.decode("#FFFFE0");
-	private static Color SHAFT_BORDER_COLOR = Color.decode("#8E8E38");
-	public static Color PIN_COLOR = Color.decode("#00B2EE");
-	public static Color PIN_BORDER_COLOR = PIN_COLOR.darker();
-	public static Size PIN_SIZE = new Size(0.03d, SizeUnit.in);
-
-	protected Color bodyColor = BODY_COLOR;
-	protected Color borderColor = BORDER_COLOR;
-	// Array of 7 elements: 3 lug connectors, 1 pot body and 3 lugs
-	transient protected Shape[] body = null;
-
-	protected TrimmerType type = TrimmerType.FLAT_SMALL;
-
-	public TrimmerPotentiometer() {
-		controlPoints = new Point[] { new Point(0, 0), new Point(0, 0), new Point(0, 0) };
-		updateControlPoints();
-	}
-
-	protected void updateControlPoints() {
-		int spacing = (int) SPACING.convertToPixels();
-		int dx1 = 0;
-		int dy1 = 0;
-		int dx2 = 0;
-		int dy2 = 0;
-		switch (orientation) {
-		case DEFAULT:
-			switch (type) {
-			case FLAT_SMALL:
-				dx1 = 2 * spacing;
-				dy1 = spacing;
-				dx2 = 0;
-				dy2 = 2 * spacing;
-				break;
-			case FLAT_LARGE:
-				dx1 = 4 * spacing;
-				dy1 = spacing;
-				dx2 = 0;
-				dy2 = 2 * spacing;
-				break;
-			case VERTICAL_INLINE:
-				dx1 = 0;
-				dy1 = spacing;
-				dx2 = 0;
-				dy2 = 2 * spacing;
-				break;
-			case VERTICAL_OFFSET:
-				dx1 = spacing;
-				dy1 = spacing;
-				dx2 = 0;
-				dy2 = 2 * spacing;
-				break;
-			}
-			break;
-		case _90:
-			switch (type) {
-			case FLAT_SMALL:
-				dx1 = -spacing;
-				dy1 = 2 * spacing;
-				dx2 = -2 * spacing;
-				dy2 = 0;
-				break;
-			case FLAT_LARGE:
-				dx1 = -spacing;
-				dy1 = 4 * spacing;
-				dx2 = -2 * spacing;
-				dy2 = 0;
-				break;
-			case VERTICAL_INLINE:
-				dx1 = -spacing;
-				dy1 = 0;
-				dx2 = -2 * spacing;
-				dy2 = 0;
-				break;
-			case VERTICAL_OFFSET:
-				dx1 = -spacing;
-				dy1 = spacing;
-				dx2 = -2 * spacing;
-				dy2 = 0;
-				break;
-			}
-			break;
-		case _180:
-			switch (type) {
-			case FLAT_SMALL:
-				dx1 = -2 * spacing;
-				dy1 = -spacing;
-				dx2 = 0;
-				dy2 = -2 * spacing;
-				break;
-			case FLAT_LARGE:
-				dx1 = -4 * spacing;
-				dy1 = -spacing;
-				dx2 = 0;
-				dy2 = -2 * spacing;
-				break;
-			case VERTICAL_INLINE:
-				dx1 = 0;
-				dy1 = -spacing;
-				dx2 = 0;
-				dy2 = -2 * spacing;
-				break;
-			case VERTICAL_OFFSET:
-				dx1 = -spacing;
-				dy1 = -spacing;
-				dx2 = 0;
-				dy2 = -2 * spacing;
-				break;
-			}
-			break;
-		case _270:
-			switch (type) {
-			case FLAT_SMALL:
-				dx1 = spacing;
-				dy1 = -2 * spacing;
-				dx2 = 2 * spacing;
-				dy2 = 0;
-				break;
-			case FLAT_LARGE:
-				dx1 = spacing;
-				dy1 = -4 * spacing;
-				dx2 = 2 * spacing;
-				dy2 = 0;
-				break;
-			case VERTICAL_INLINE:
-				dx1 = spacing;
-				dy1 = 0;
-				dx2 = 2 * spacing;
-				dy2 = 0;
-				break;
-			case VERTICAL_OFFSET:
-				dx1 = spacing;
-				dy1 = -spacing;
-				dx2 = 2 * spacing;
-				dy2 = 0;
-				break;
-			}
-			break;
-		default:
-			break;
-		}
-		controlPoints[1].setLocation(controlPoints[0].x + dx1, controlPoints[0].y + dy1);
-		controlPoints[2].setLocation(controlPoints[0].x + dx2, controlPoints[0].y + dy2);
-	}
-
-	public Shape[] getBody() {
-		if (body == null) {
-			body = new Shape[2];
-
-			// Calculate the center point as center of the minimum bounding
-			// rectangle.
-			int centerX = (Math.max(Math.max(controlPoints[0].x, controlPoints[1].x),
-					controlPoints[2].x) + Math.min(
-					Math.min(controlPoints[0].x, controlPoints[1].x), controlPoints[2].x)) / 2;
-			int centerY = (Math.max(Math.max(controlPoints[0].y, controlPoints[1].y),
-					controlPoints[2].y) + Math.min(
-					Math.min(controlPoints[0].y, controlPoints[1].y), controlPoints[2].y)) / 2;
-
-			// Calculate body dimensions based on the selected type.
-			int length = 0;
-			int width = 0;
-			switch (type) {
-			case FLAT_LARGE:
-			case FLAT_SMALL:
-				length = getClosestOdd(FLAT_BODY_SIZE.convertToPixels());
-				width = length;
-				int shaftSize = getClosestOdd(FLAT_SHAFT_SIZE.convertToPixels());
-				Area shaft = new Area(new Ellipse2D.Double(centerX - shaftSize / 2, centerY
-						- shaftSize / 2, shaftSize, shaftSize));
-				Area slot = new Area(new Rectangle2D.Double(centerX - shaftSize / 2, centerY
-						- shaftSize / 8, shaftSize, shaftSize / 4));
-				slot.transform(AffineTransform.getRotateInstance(Math.PI / 4, centerX, centerY));
-				shaft.subtract(slot);
-				body[1] = shaft;
-				break;
-			case VERTICAL_INLINE:
-			case VERTICAL_OFFSET:
-				length = getClosestOdd(VERTICAL_BODY_LENGTH.convertToPixels());
-				width = getClosestOdd(VERTICAL_BODY_WIDTH.convertToPixels());
-				break;
-			}
-			if (orientation == Orientation.DEFAULT || orientation == Orientation._180) {
-				int p = length;
-				length = width;
-				width = p;
-			}
-			body[0] = new Rectangle2D.Double(centerX - length / 2, centerY - width / 2, length,
-					width);
-		}
-		return body;
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		super.setControlPoint(point, index);
-		body = null;
-	}
-
-	@Override
-	public void setOrientation(Orientation orientation) {
-		super.setOrientation(orientation);
-		updateControlPoints();
-		body = null;
-	}
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
-		if (checkPointsClipped(g2d.getClip())) {
-			return;
-		}
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-		Shape mainShape = getBody()[0];
-		Shape shaftShape = getBody()[1];
-		if (mainShape != null) {
-			g2d.setColor(bodyColor);
-			Composite oldComposite = g2d.getComposite();
-			if (alpha < MAX_ALPHA) {
-				g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
-						/ MAX_ALPHA));
-			}
-			g2d.fill(mainShape);
-			if (shaftShape != null) {
-				g2d.setColor(SHAFT_COLOR);
-				g2d.fill(shaftShape);
-				g2d.setColor(SHAFT_BORDER_COLOR);
-				g2d.draw(shaftShape);
-			}
-			g2d.setComposite(oldComposite);
-			g2d.setColor(componentState == ComponentState.SELECTED
-					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : borderColor);
-			g2d.draw(mainShape);
-		}
-
-		// Draw pins.
-		int pinSize = getClosestOdd(PIN_SIZE.convertToPixels());
-		for (Point point : controlPoints) {
-			g2d.setColor(PIN_COLOR);
-			g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
-			g2d.setColor(PIN_BORDER_COLOR);
-			g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
-		}
-
-		// Draw label.
-		g2d.setFont(LABEL_FONT);
-		g2d
-				.setColor(componentState == ComponentState.SELECTED ? LABEL_COLOR_SELECTED
-						: LABEL_COLOR);
-		FontMetrics fontMetrics = g2d.getFontMetrics();
-		Rectangle2D bodyRect = getBody()[0].getBounds2D();
-		Rectangle2D rect = fontMetrics.getStringBounds(getName(), g2d);
-
-		int textHeight = (int) rect.getHeight();
-		int textWidth = (int) rect.getWidth();
-		int panelHeight = (int) bodyRect.getHeight();
-		int panelWidth = (int) bodyRect.getWidth();
-
-		int x = (panelWidth - textWidth) / 2;
-		int y = (panelHeight - textHeight) / 2 + fontMetrics.getAscent();
-
-		g2d.drawString(getName(), (int) (bodyRect.getX() + x), (int) (bodyRect.getY() + y));
-	}
-
-	@Override
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		int margin = 4;
-		g2d.setColor(BODY_COLOR);
-		g2d.fillRect(margin, margin, width - 2 * margin, width - 2 * margin);
-		g2d.setColor(BORDER_COLOR);
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-		g2d.drawRect(margin, margin, width - 2 * margin, width - 2 * margin);
-		int shaftSize = 11;
-		int slotSize = 2;
-		Area area = new Area(new Ellipse2D.Double(width / 2 - shaftSize / 2, width / 2 - shaftSize
-				/ 2, shaftSize, shaftSize));
-		Area slot = new Area(new Rectangle2D.Double(0, width / 2 - slotSize / 2, width, slotSize));
-		slot.transform(AffineTransform.getRotateInstance(Math.PI / 4, width / 2, width / 2));
-		area.subtract(slot);
-		g2d.setColor(SHAFT_COLOR);
-		g2d.fill(area);
-		g2d.setColor(SHAFT_BORDER_COLOR);
-		g2d.draw(area);
-
-		int pinSize = 3;
-		g2d.setColor(PIN_COLOR);
-		g2d.fillOval(margin - pinSize / 2, 10 - pinSize / 2, pinSize, pinSize);
-		g2d.setColor(PIN_BORDER_COLOR);
-		g2d.drawOval(margin - pinSize / 2, 10 - pinSize / 2, pinSize, pinSize);
-
-		g2d.setColor(PIN_COLOR);
-		g2d.fillOval(margin - pinSize / 2, 21 - pinSize / 2, pinSize, pinSize);
-		g2d.setColor(PIN_BORDER_COLOR);
-		g2d.drawOval(margin - pinSize / 2, 21 - pinSize / 2, pinSize, pinSize);
-
-		g2d.setColor(PIN_COLOR);
-		g2d.fillOval(width - margin - pinSize / 2, width / 2 - pinSize / 2, pinSize, pinSize);
-		g2d.setColor(PIN_BORDER_COLOR);
-		g2d.drawOval(width - margin - pinSize / 2, width / 2 - pinSize / 2, pinSize, pinSize);
-	}
-
-	@EditableProperty(name = "Body")
-	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
-	public TrimmerType getType() {
-		return type;
-	}
-
-	public void setType(TrimmerType type) {
-		this.type = type;
-		updateControlPoints();
-		body = null;
-	}
-
-	public static enum TrimmerType {
-		FLAT_LARGE, FLAT_SMALL, VERTICAL_INLINE, VERTICAL_OFFSET;
-
-		@Override
-		public String toString() {
-			return name().substring(0, 1) + name().substring(1).toLowerCase().replace("_", " ");
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/Voltage.java

@@ -1,11 +0,0 @@
-package org.diylc.components.passive;
-
-public enum Voltage {
-
-	_16V, _25V, _63V, _100V, _160V, _250V, _300V, _350V, _400V, _500V, _630V, _1KV;
-	
-	@Override
-	public String toString() {
-		return name().replace("_", "");
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/semiconductors/LED.java

@@ -1,107 +0,0 @@
-package org.diylc.components.semiconductors;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Shape;
-import java.awt.geom.Area;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Rectangle2D;
-
-import org.diylc.common.ObjectCache;
-import org.diylc.components.AbstractLeadedComponent;
-import org.diylc.core.CreationMethod;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.Theme;
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-
-@ComponentDescriptor(name = "LED", author = "Branislav Stojkovic", category = "Semiconductors", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "D", description = "Light Emitting Diode", zOrder = IDIYComponent.COMPONENT)
-public class LED extends AbstractLeadedComponent<String> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Size DEFAULT_SIZE = new Size(5d, SizeUnit.mm);
-	public static Color BODY_COLOR = Color.decode("#5DFC0A");
-	public static Color BORDER_COLOR = BODY_COLOR.darker();
-
-	private String value = "";
-
-	public LED() {
-		super();
-		this.bodyColor = BODY_COLOR;
-		this.borderColor = BORDER_COLOR;
-	}
-
-	@EditableProperty
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-		g2d.rotate(-Math.PI / 4, width / 2, height / 2);
-		g2d.setColor(LEAD_COLOR);
-		g2d.drawLine(0, height / 2, width, height / 2);
-
-		int margin = 4 * width / 32;
-		Area area = new Area(new Ellipse2D.Double(margin, margin, width - 2 * margin, width - 2
-				* margin));
-		area.intersect(new Area(new Rectangle2D.Double(margin, margin, width - 5 * margin / 2,
-				width - 2 * margin)));
-		g2d.setColor(BODY_COLOR);
-		g2d.fill(area);
-		g2d.setColor(BORDER_COLOR);
-		g2d.draw(area);
-		g2d
-				.drawOval(margin * 2 - 1, margin * 2 - 1, width - 4 * margin + 2, width - 4
-						* margin + 2);
-	}
-
-	@Override
-	protected Size getDefaultWidth() {
-		return DEFAULT_SIZE;
-	}
-
-	@Override
-	protected Size getDefaultLength() {
-		return DEFAULT_SIZE;
-	}
-
-	@Override
-	protected Shape getBodyShape() {
-		int size = getClosestOdd((int) (getLength().convertToPixels() * 1.2));
-		Area area = new Area(new Ellipse2D.Double(0, 0, size, size));
-		area.intersect(new Area(new Rectangle2D.Double(0, 0, getLength().convertToPixels() * 1.15,
-				size)));
-		return area;
-	}
-
-	@Override
-	protected void decorateComponentBody(Graphics2D g2d, boolean outlineMode) {
-		if (!outlineMode) {
-			int size = getClosestOdd((int) (getLength().convertToPixels() * 1.2));
-			int innerSize = getClosestOdd(getLength().convertToPixels());
-			int x = (size - innerSize) / 2;
-			Shape s = new Ellipse2D.Double(x, x, innerSize, innerSize);
-			g2d.setColor(getBorderColor());
-			g2d.draw(s);
-		}
-	}
-
-	@EditableProperty(name = "Size")
-	@Override
-	public Size getLength() {
-		return super.getLength();
-	}
-
-	@Override
-	public Size getWidth() {
-		return super.getWidth();
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/semiconductors/TransistorTO220.java

@@ -1,308 +0,0 @@
-package org.diylc.components.semiconductors;
-
-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.IPlugInPort;
-import org.diylc.common.ObjectCache;
-import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
-import org.diylc.core.ComponentState;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.IDrawingObserver;
-import org.diylc.core.Project;
-import org.diylc.core.Theme;
-import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-import org.diylc.utils.Constants;
-
-import com.diyfever.gui.miscutils.ConfigurationManager;
-
-@ComponentDescriptor(name = "Transistor (TO-220 package)", author = "Branislav Stojkovic", category = "Semiconductors", instanceNamePrefix = "Q", description = "Transistors with metal tab for heat sink mounting", stretchable = false, zOrder = IDIYComponent.COMPONENT)
-public class TransistorTO220 extends AbstractTransparentComponent<String> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Color BODY_COLOR = Color.gray;
-	public static Color BORDER_COLOR = Color.gray.darker();
-	public static Color PIN_COLOR = Color.decode("#00B2EE");
-	public static Color PIN_BORDER_COLOR = PIN_COLOR.darker();
-	public static Color TAB_COLOR = Color.decode("#C3E4ED");
-	public static Color TAB_BORDER_COLOR = TAB_COLOR.darker();
-	public static Color LABEL_COLOR = Color.white;
-	public static Size PIN_SIZE = new Size(0.03d, SizeUnit.in);
-	public static Size PIN_SPACING = new Size(0.1d, SizeUnit.in);
-	public static Size BODY_WIDTH = new Size(0.4d, SizeUnit.in);
-	public static Size BODY_HEIGHT = new Size(4.5d, SizeUnit.mm);
-	public static Size TAB_THICKNESS = new Size(1d, SizeUnit.mm);
-
-	private String value = "";
-	private Orientation orientation = Orientation.DEFAULT;
-	private Point[] controlPoints = new Point[] { new Point(0, 0), new Point(0, 0), new Point(0, 0) };
-	transient private Shape[] body;
-	private Color bodyColor = BODY_COLOR;
-	private Color borderColor = BORDER_COLOR;
-	private Color tabColor = TAB_COLOR;
-	private Color tabBorderColor = TAB_BORDER_COLOR;
-
-	public TransistorTO220() {
-		super();
-		updateControlPoints();
-	}
-
-	@EditableProperty
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	@EditableProperty
-	public Orientation getOrientation() {
-		return orientation;
-	}
-
-	public void setOrientation(Orientation orientation) {
-		this.orientation = orientation;
-		updateControlPoints();
-		// Reset body shape;
-		body = null;
-	}
-
-	@Override
-	public int getControlPointCount() {
-		return controlPoints.length;
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return controlPoints[index];
-	}
-
-	@Override
-	public boolean isControlPointSticky(int index) {
-		return true;
-	}
-
-	@Override
-	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
-		return VisibilityPolicy.NEVER;
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		controlPoints[index].setLocation(point);
-		body = null;
-	}
-
-	private void updateControlPoints() {
-		int pinSpacing = (int) PIN_SPACING.convertToPixels();
-		// Update control points.
-		int x = controlPoints[0].x;
-		int y = controlPoints[0].y;
-		switch (orientation) {
-		case DEFAULT:
-			controlPoints[1].setLocation(x, y + pinSpacing);
-			controlPoints[2].setLocation(x, y + 2 * pinSpacing);
-			break;
-		case _90:
-			controlPoints[1].setLocation(x - pinSpacing, y);
-			controlPoints[2].setLocation(x - 2 * pinSpacing, y);
-			break;
-		case _180:
-			controlPoints[1].setLocation(x, y - pinSpacing);
-			controlPoints[2].setLocation(x, y - 2 * pinSpacing);
-			break;
-		case _270:
-			controlPoints[1].setLocation(x + pinSpacing, y);
-			controlPoints[2].setLocation(x + 2 * pinSpacing, y);
-			break;
-		default:
-			throw new RuntimeException("Unexpected orientation: " + orientation);
-		}
-	}
-
-	public Shape[] getBody() {
-		if (body == null) {
-			body = new Shape[2];
-			int x = controlPoints[0].x;
-			int y = controlPoints[0].y;
-			int pinSpacing = (int) PIN_SPACING.convertToPixels();
-			int bodyWidth = getClosestOdd(BODY_WIDTH.convertToPixels());
-			int bodyHeight = getClosestOdd(BODY_HEIGHT.convertToPixels());
-			int tabThickness = (int) TAB_THICKNESS.convertToPixels();
-
-			switch (orientation) {
-			case DEFAULT:
-				body[0] = new Rectangle2D.Double(x - bodyHeight / 2,
-						y + pinSpacing - bodyWidth / 2, bodyHeight, bodyWidth);
-				body[1] = new Rectangle2D.Double(x + bodyHeight / 2 - tabThickness, y + pinSpacing
-						- bodyWidth / 2, tabThickness, bodyWidth);
-				break;
-			case _90:
-				body[0] = new Rectangle2D.Double(x - pinSpacing - bodyWidth / 2,
-						y - bodyHeight / 2, bodyWidth, bodyHeight);
-				body[1] = new Rectangle2D.Double(x - pinSpacing - bodyWidth / 2, y + bodyHeight / 2
-						- tabThickness, bodyWidth, tabThickness);
-				break;
-			case _180:
-				body[0] = new Rectangle2D.Double(x - bodyHeight / 2,
-						y - pinSpacing - bodyWidth / 2, bodyHeight, bodyWidth);
-				body[1] = new Rectangle2D.Double(x - bodyHeight / 2,
-						y - pinSpacing - bodyWidth / 2, tabThickness, bodyWidth);
-				break;
-			case _270:
-				body[0] = new Rectangle2D.Double(x + pinSpacing - bodyWidth / 2,
-						y - bodyHeight / 2, bodyWidth, bodyHeight);
-				body[1] = new Rectangle2D.Double(x + pinSpacing - bodyWidth / 2,
-						y - bodyHeight / 2, bodyWidth, tabThickness);
-				break;
-			default:
-				throw new RuntimeException("Unexpected orientation: " + orientation);
-			}
-		}
-		return body;
-	}
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
-		if (checkPointsClipped(g2d.getClip())) {
-			return;
-		}
-		int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
-		Shape mainArea = getBody()[0];
-		Shape tabArea = getBody()[1];
-		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(mainArea);
-		Color finalTabColor;
-		if (outlineMode) {
-			Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
-					IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
-			finalTabColor = theme.getOutlineColor();
-		} else {
-			finalTabColor = tabColor;
-		}
-		g2d.setColor(finalTabColor);
-		g2d.fill(tabArea);
-		g2d.setComposite(oldComposite);
-		if (!outlineMode) {
-			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-			g2d.setColor(tabBorderColor);
-			g2d.draw(tabArea);
-		}
-		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(mainArea);
-
-		// Draw pins.
-		if (!outlineMode) {
-			for (Point point : controlPoints) {
-				g2d.setColor(PIN_COLOR);
-				g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
-				g2d.setColor(PIN_BORDER_COLOR);
-				g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
-			}
-		}
-
-		// 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
-					: LABEL_COLOR;
-		}
-		g2d.setColor(finalLabelColor);
-		FontMetrics fontMetrics = g2d.getFontMetrics(g2d.getFont());
-		Rectangle2D rect = fontMetrics.getStringBounds(getName(), g2d);
-		int textHeight = (int) (rect.getHeight());
-		int textWidth = (int) (rect.getWidth());
-		// Center text horizontally and vertically
-		Rectangle bounds = mainArea.getBounds();
-		int x = bounds.x + (bounds.width - textWidth) / 2;
-		int y = bounds.y + (bounds.height - textHeight) / 2 + fontMetrics.getAscent();
-		g2d.drawString(getName(), x, y);
-	}
-
-	@Override
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		g2d.setColor(BODY_COLOR);
-		int margin = 2 * width / 32;
-		int thickness = 7 * width / 32;
-		g2d.fillRect(margin, (height - thickness) / 2, width - margin * 2, thickness);
-		g2d.setColor(TAB_COLOR);
-		g2d.fillRect(margin, (height + thickness) / 2 - margin - 1, width - margin * 2, margin);
-		g2d.setColor(BORDER_COLOR);
-		g2d.drawRect(margin, (height - thickness) / 2, width - margin * 2, thickness);
-	}
-
-	@EditableProperty(name = "Body")
-	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 = "Tab")
-	public Color getTabColor() {
-		return tabColor;
-	}
-
-	public void setTabColor(Color tabColor) {
-		this.tabColor = tabColor;
-	}
-
-	@EditableProperty(name = "Tab border")
-	public Color getTabBorderColor() {
-		return tabBorderColor;
-	}
-
-	public void setTabBorderColor(Color tabBorderColor) {
-		this.tabBorderColor = tabBorderColor;
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/semiconductors/TransistorTO92.java

@@ -1,268 +0,0 @@
-package org.diylc.components.semiconductors;
-
-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.geom.Area;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Rectangle2D;
-
-import org.diylc.common.IPlugInPort;
-import org.diylc.common.ObjectCache;
-import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
-import org.diylc.core.ComponentState;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.IDrawingObserver;
-import org.diylc.core.Project;
-import org.diylc.core.Theme;
-import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-import org.diylc.utils.Constants;
-
-import com.diyfever.gui.miscutils.ConfigurationManager;
-
-@ComponentDescriptor(name = "Transistor (TO-92 package)", author = "Branislav Stojkovic", category = "Semiconductors", instanceNamePrefix = "Q", description = "Transistor with small plastic or epoxy body", stretchable = false, zOrder = IDIYComponent.COMPONENT)
-public class TransistorTO92 extends AbstractTransparentComponent<String> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Color BODY_COLOR = Color.gray;
-	public static Color BORDER_COLOR = Color.gray.darker();
-	public static Color PIN_COLOR = Color.decode("#00B2EE");
-	public static Color PIN_BORDER_COLOR = PIN_COLOR.darker();
-	public static Color LABEL_COLOR = Color.white;
-	public static Size PIN_SIZE = new Size(0.03d, SizeUnit.in);
-	public static Size PIN_SPACING = new Size(0.1d, SizeUnit.in);
-	public static Size BODY_DIAMETER = new Size(0.2d, SizeUnit.in);
-
-	private String value = "";
-	private Orientation orientation = Orientation.DEFAULT;
-	private Point[] controlPoints = new Point[] { new Point(0, 0), new Point(0, 0), new Point(0, 0) };
-	transient private Area body;
-	private Color bodyColor = BODY_COLOR;
-	private Color borderColor = BORDER_COLOR;
-
-	public TransistorTO92() {
-		super();
-		updateControlPoints();
-	}
-
-	@EditableProperty
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	@EditableProperty
-	public Orientation getOrientation() {
-		return orientation;
-	}
-
-	public void setOrientation(Orientation orientation) {
-		this.orientation = orientation;
-		updateControlPoints();
-		// Reset body shape;
-		body = null;
-	}
-
-	@Override
-	public int getControlPointCount() {
-		return controlPoints.length;
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return controlPoints[index];
-	}
-
-	@Override
-	public boolean isControlPointSticky(int index) {
-		return true;
-	}
-
-	@Override
-	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
-		return VisibilityPolicy.NEVER;
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		controlPoints[index].setLocation(point);
-		body = null;
-	}
-
-	private void updateControlPoints() {
-		int pinSpacing = (int) PIN_SPACING.convertToPixels();
-		// Update control points.
-		int x = controlPoints[0].x;
-		int y = controlPoints[0].y;
-		switch (orientation) {
-		case DEFAULT:
-			controlPoints[1].setLocation(x, y + pinSpacing);
-			controlPoints[2].setLocation(x, y + 2 * pinSpacing);
-			break;
-		case _90:
-			controlPoints[1].setLocation(x - pinSpacing, y);
-			controlPoints[2].setLocation(x - 2 * pinSpacing, y);
-			break;
-		case _180:
-			controlPoints[1].setLocation(x, y - pinSpacing);
-			controlPoints[2].setLocation(x, y - 2 * pinSpacing);
-			break;
-		case _270:
-			controlPoints[1].setLocation(x + pinSpacing, y);
-			controlPoints[2].setLocation(x + 2 * pinSpacing, y);
-			break;
-		default:
-			throw new RuntimeException("Unexpected orientation: " + orientation);
-		}
-	}
-
-	public Area getBody() {
-		if (body == null) {
-			int x = controlPoints[0].x;
-			int y = controlPoints[0].y;
-			int pinSpacing = (int) PIN_SPACING.convertToPixels();
-			int bodyDiameter = getClosestOdd(BODY_DIAMETER.convertToPixels());
-
-			switch (orientation) {
-			case DEFAULT:
-				body = new Area(new Ellipse2D.Double(x - bodyDiameter / 2, y + pinSpacing
-						- bodyDiameter / 2, bodyDiameter, bodyDiameter));
-				body.subtract(new Area(new Rectangle2D.Double(x - bodyDiameter, y + pinSpacing
-						- bodyDiameter / 2, 3 * bodyDiameter / 4, bodyDiameter)));
-				break;
-			case _90:
-				body = new Area(new Ellipse2D.Double(x - pinSpacing - bodyDiameter / 2, y
-						- bodyDiameter / 2, bodyDiameter, bodyDiameter));
-				body.subtract(new Area(new Rectangle2D.Double(x - pinSpacing - bodyDiameter / 2, y
-						- bodyDiameter, bodyDiameter, 3 * bodyDiameter / 4)));
-				break;
-			case _180:
-				body = new Area(new Ellipse2D.Double(x - bodyDiameter / 2, y - pinSpacing
-						- bodyDiameter / 2, bodyDiameter, bodyDiameter));
-				body.subtract(new Area(new Rectangle2D.Double(x + bodyDiameter / 4, y - pinSpacing
-						- bodyDiameter / 2, 3 * bodyDiameter / 4, bodyDiameter)));
-				break;
-			case _270:
-				body = new Area(new Ellipse2D.Double(x + pinSpacing - bodyDiameter / 2, y
-						- bodyDiameter / 2, bodyDiameter, bodyDiameter));
-				body.subtract(new Area(new Rectangle2D.Double(x + pinSpacing - bodyDiameter / 2, y
-						+ bodyDiameter / 4, bodyDiameter, 3 * bodyDiameter / 4)));
-				break;
-			default:
-				throw new RuntimeException("Unexpected orientation: " + orientation);
-			}
-		}
-		return body;
-	}
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
-		if (checkPointsClipped(g2d.getClip())) {
-			return;
-		}
-		int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
-		Area mainArea = getBody();
-		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(mainArea);
-		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.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-		g2d.draw(mainArea);
-
-		if (!outlineMode) {
-			for (Point point : controlPoints) {
-				g2d.setColor(PIN_COLOR);
-				g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
-				g2d.setColor(PIN_BORDER_COLOR);
-				g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
-			}
-		}
-
-		// 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
-					: LABEL_COLOR;
-		}
-		g2d.setColor(finalLabelColor);
-		FontMetrics fontMetrics = g2d.getFontMetrics(g2d.getFont());
-		Rectangle2D rect = fontMetrics.getStringBounds(getName(), g2d);
-		int textHeight = (int) (rect.getHeight());
-		int textWidth = (int) (rect.getWidth());
-		// Center text horizontally and vertically
-		Rectangle bounds = mainArea.getBounds();
-		int x = bounds.x + (bounds.width - textWidth) / 2;
-		int y = bounds.y + (bounds.height - textHeight) / 2 + fontMetrics.getAscent();
-		g2d.drawString(getName(), x, y);
-	}
-
-	@Override
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		int margin = 3 * width / 32;
-		Area area = new Area(new Ellipse2D.Double(margin / 2, margin, width - 2 * margin, width - 2
-				* margin));
-		// area.subtract(new Area(new Rectangle2D.Double(0, 0, 2 * margin,
-		// height)));
-		area.intersect(new Area(new Rectangle2D.Double(2 * margin, 0, width, height)));
-		g2d.setColor(BODY_COLOR);
-		g2d.fill(area);
-		g2d.setColor(BORDER_COLOR);
-		g2d.draw(area);
-	}
-
-	@EditableProperty(name = "Body")
-	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;
-	}
-}

diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/tube/TubeSocket.java

@@ -1,328 +0,0 @@
-package org.diylc.components.tube;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Shape;
-import java.awt.geom.Area;
-import java.awt.geom.Ellipse2D;
-
-import org.diylc.common.IPlugInPort;
-import org.diylc.common.ObjectCache;
-import org.diylc.common.Orientation;
-import org.diylc.components.AbstractTransparentComponent;
-import org.diylc.core.ComponentState;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.IDrawingObserver;
-import org.diylc.core.Project;
-import org.diylc.core.Theme;
-import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-import org.diylc.utils.Constants;
-
-import com.diyfever.gui.miscutils.ConfigurationManager;
-
-@ComponentDescriptor(name = "Tube Socket", author = "Branislav Stojkovic", category = "Tubes", instanceNamePrefix = "V", description = "Various types of tube/valve sockets", stretchable = false, zOrder = IDIYComponent.COMPONENT)
-public class TubeSocket extends AbstractTransparentComponent<String> {
-
-	private static final long serialVersionUID = 1L;
-
-	private static Color BODY_COLOR = Color.decode("#FFFFE0");
-	private static Color BORDER_COLOR = Color.decode("#8E8E38");
-	public static Color PIN_COLOR = Color.decode("#00B2EE");
-	public static Color PIN_BORDER_COLOR = PIN_COLOR.darker();
-	public static Size PIN_SIZE = new Size(1d, SizeUnit.mm);
-	public static Size HOLE_SIZE = new Size(5d, SizeUnit.mm);
-	public static Size TICK_SIZE = new Size(2d, SizeUnit.mm);
-
-	private Base base = Base.B9A;
-	private String type = "";
-	private Orientation orientation = Orientation.DEFAULT;
-	// private Mount mount = Mount.CHASSIS;
-
-	private Point[] controlPoints = new Point[] { new Point(0, 0) };
-
-	transient private Shape body;
-
-	public TubeSocket() {
-		super();
-		updateControlPoints();
-	}
-
-	@EditableProperty
-	public Base getBase() {
-		return base;
-	}
-
-	public void setBase(Base base) {
-		this.base = base;
-		updateControlPoints();
-		// Reset body shape
-		body = null;
-	}
-
-	@EditableProperty
-	public Orientation getOrientation() {
-		return orientation;
-	}
-
-	public void setOrientation(Orientation orientation) {
-		this.orientation = orientation;
-		updateControlPoints();
-		// Reset body shape
-		body = null;
-	}
-
-	// @EditableProperty
-	// public Mount getMount() {
-	// return mount;
-	// }
-	//
-	// public void setMount(Mount mount) {
-	// this.mount = mount;
-	// }
-
-	private void updateControlPoints() {
-		Point firstPoint = controlPoints[0];
-		int pinCount;
-		int pinCircleDiameter;
-		boolean hasEmptySpace;
-		switch (base) {
-		case B7G:
-			pinCount = 7;
-			pinCircleDiameter = getClosestOdd(new Size(12d, SizeUnit.mm).convertToPixels());
-			hasEmptySpace = true;
-			break;
-		case OCTAL:
-			pinCount = 8;
-			pinCircleDiameter = getClosestOdd(new Size(17.5d, SizeUnit.mm).convertToPixels());
-			hasEmptySpace = false;
-			break;
-		case B9A:
-			pinCount = 9;
-			pinCircleDiameter = getClosestOdd(new Size(21d, SizeUnit.mm).convertToPixels());
-			hasEmptySpace = true;
-			break;
-		default:
-			throw new RuntimeException("Unexpected base: " + base);
-		}
-		double angleIncrement = Math.PI * 2 / (hasEmptySpace ? (pinCount + 1) : pinCount);
-		double initialAngleOffset = hasEmptySpace ? angleIncrement : (angleIncrement / 2);
-		double initialAngle;
-		switch (orientation) {
-		case DEFAULT:
-			initialAngle = Math.PI / 2 + initialAngleOffset;
-			break;
-		case _90:
-			initialAngle = Math.PI + initialAngleOffset;
-			break;
-		case _180:
-			initialAngle = 3 * Math.PI / 2 + initialAngleOffset;
-			break;
-		case _270:
-			initialAngle = initialAngleOffset;
-			break;
-		default:
-			throw new RuntimeException("Unexpected orientation: " + orientation);
-		}
-		controlPoints = new Point[pinCount + 1];
-		double angle = initialAngle;
-		controlPoints[0] = firstPoint;
-		for (int i = 0; i < pinCount; i++) {
-			controlPoints[i + 1] = new Point((int) (firstPoint.getX() + Math.cos(angle)
-					* pinCircleDiameter / 2), (int) (firstPoint.getY() + Math.sin(angle)
-					* pinCircleDiameter / 2));
-			angle += angleIncrement;
-		}
-	}
-
-	public Shape getBody() {
-		if (body == null) {
-			int bodyDiameter;
-			switch (base) {
-			case B7G:
-				bodyDiameter = getClosestOdd(new Size(17d, SizeUnit.mm).convertToPixels());
-				break;
-			case B9A:
-				bodyDiameter = getClosestOdd(new Size(19d, SizeUnit.mm).convertToPixels());
-				break;
-			case OCTAL:
-				bodyDiameter = getClosestOdd(new Size(24.5d, SizeUnit.mm).convertToPixels());
-				break;
-			default:
-				throw new RuntimeException("Unexpected base: " + base);
-			}
-			body = new Ellipse2D.Double(controlPoints[0].x - bodyDiameter / 2, controlPoints[0].y
-					- bodyDiameter / 2, bodyDiameter, bodyDiameter);
-			Area bodyArea = new Area(body);
-			int holeSize = getClosestOdd(HOLE_SIZE.convertToPixels());
-			bodyArea.subtract(new Area(new Ellipse2D.Double(controlPoints[0].x - holeSize / 2,
-					controlPoints[0].y - holeSize / 2, holeSize, holeSize)));
-			if (base == Base.OCTAL) {
-				int tickSize = getClosestOdd(TICK_SIZE.convertToPixels());
-				double angle = 0;
-				switch (orientation) {
-				case DEFAULT:
-					angle = Math.PI / 2;
-					break;
-				case _90:
-					angle = Math.PI;
-					break;
-				case _180:
-					angle = 3 * Math.PI / 2;
-					break;
-				case _270:
-					angle = 0;
-					break;
-				}
-				int centerX = (int) (controlPoints[0].x + Math.cos(angle) * holeSize / 2);
-				int centerY = (int) (controlPoints[0].y + Math.sin(angle) * holeSize / 2);
-				bodyArea.subtract(new Area(new Ellipse2D.Double(centerX - tickSize / 2, centerY
-						- tickSize / 2, tickSize, tickSize)));
-			}
-			body = bodyArea;
-		}
-		return body;
-	}
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
-		// g2d.setColor(Color.black);
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-		// for (int i = 0; i < controlPoints.length; i++) {
-		// g2d.drawString(Integer.toString(i), controlPoints[i].x,
-		// controlPoints[i].y);
-		// }
-		// Draw body
-		Shape body = getBody();
-		Composite oldComposite = g2d.getComposite();
-		if (alpha < MAX_ALPHA) {
-			g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
-					/ MAX_ALPHA));
-		}
-		if (componentState != ComponentState.DRAGGING) {
-			g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BODY_COLOR);
-			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 : BORDER_COLOR;
-		}
-		g2d.setColor(finalBorderColor);
-		g2d.draw(body);
-		// Draw pins
-		if (!outlineMode) {
-			int pinSize = getClosestOdd(PIN_SIZE.convertToPixels());
-			for (int i = 1; i < controlPoints.length; i++) {
-				g2d.setColor(PIN_COLOR);
-				g2d.fillOval(controlPoints[i].x - pinSize / 2, controlPoints[i].y - pinSize / 2,
-						pinSize, pinSize);
-				g2d.setColor(PIN_BORDER_COLOR);
-				g2d.drawOval(controlPoints[i].x - pinSize / 2, controlPoints[i].y - pinSize / 2,
-						pinSize, pinSize);
-			}
-		}
-	}
-
-	@Override
-	public void drawIcon(Graphics2D g2d, int width, int height) {
-		Area area = new Area(new Ellipse2D.Double(1, 1, width - 2, width - 2));
-		int center = width / 2;
-		area.subtract(new Area(new Ellipse2D.Double(center - 2, center - 2, 5, 5)));
-		g2d.setColor(BODY_COLOR);
-		g2d.fill(area);
-		g2d.setColor(BORDER_COLOR);
-		g2d.draw(area);
-
-		int radius = width / 2 - 6;
-		for (int i = 0; i < 8; i++) {
-			int x = (int) (center + Math.cos(i * Math.PI / 4) * radius);
-			int y = (int) (center + Math.sin(i * Math.PI / 4) * radius);
-			g2d.setColor(PIN_COLOR);
-			g2d.fillOval(x - 1, y - 1, 3, 3);
-			g2d.setColor(PIN_BORDER_COLOR);
-			g2d.drawOval(x - 1, y - 1, 3, 3);
-		}
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return controlPoints[index];
-	}
-
-	@Override
-	public int getControlPointCount() {
-		return controlPoints.length;
-	}
-
-	@Override
-	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
-		return VisibilityPolicy.NEVER;
-	}
-
-	@Override
-	@EditableProperty(name = "Type")
-	public String getValue() {
-		return type;
-	}
-
-	@Override
-	public void setValue(String value) {
-		this.type = value;
-	}
-
-	@Override
-	public boolean isControlPointSticky(int index) {
-		return index > 0;
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		controlPoints[index].setLocation(point);
-		body = null;
-	}
-
-	static enum Base {
-		B9A("Noval B9A"), OCTAL("Octal"), B7G("Small-button B7G");
-
-		String name;
-
-		private Base(String name) {
-			this.name = name;
-		}
-
-		@Override
-		public String toString() {
-			return name;
-		}
-	}
-
-	static enum Mount {
-		CHASSIS("Chassis"), PCB("PCB");
-
-		String name;
-
-		private Mount(String name) {
-			this.name = name;
-		}
-
-		@Override
-		public String toString() {
-			return name;
-		}
-	}
-}

diy-layout-creator --username bancika@gmail.com/diylc-core/.classpath

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
-	<classpathentry kind="lib" path="library/main.jar"/>
-	<classpathentry kind="lib" path="lib/app-framework.jar"/>
-	<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_45"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diy-layout-creator --username bancika@gmail.com/diylc-core/.gitignore

@@ -1 +0,0 @@
-/bin/

diy-layout-creator --username bancika@gmail.com/diylc-core/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>diylc-core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diy-layout-creator --username bancika@gmail.com/diylc-core/build.xml

@@ -1,82 +0,0 @@
-<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>

diy-layout-creator --username bancika@gmail.com/diylc-core/config.properties

@@ -1,2 +0,0 @@
-#org.diylc.utils.Constants.CANVAS_COLOR=#005D96
-#org.diylc.utils.Constants.GRID_COLOR=#FFFFFF

diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/BadPositionException.java

@@ -1,7 +0,0 @@
-package org.diylc.common;
-
-public class BadPositionException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-
-}

diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/ComponentType.java

@@ -1,114 +0,0 @@
-package org.diylc.common;
-
-import javax.swing.Icon;
-
-import org.diylc.core.CreationMethod;
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.annotations.BomPolicy;
-
-/**
- * Entity class used to describe a component type.
- * 
- * @author Branislav Stojkovic
- * 
- * @see IDIYComponent
- */
-public class ComponentType {
-
-	private String name;
-	private String description;
-	private CreationMethod creationMethod;
-	private String category;
-	private String namePrefix;
-	private String author;
-	private Icon icon;
-	private Class<? extends IDIYComponent<?>> instanceClass;
-	private double zOrder;
-	private boolean flexibleZOrder;
-	private boolean stretchable;
-	private BomPolicy bomPolicy;
-	private boolean autoEdit;
-	private boolean rotatable;
-
-	public ComponentType(String name, String description, CreationMethod creationMethod,
-			String category, String namePrefix, String author, Icon icon,
-			Class<? extends IDIYComponent<?>> instanceClass, double zOrder, boolean flexibleZOrder,
-					boolean stretchable, BomPolicy bomPolicy, boolean autoEdit, boolean rotatable) {
-		super();
-		this.name = name;
-		this.description = description;
-		this.creationMethod = creationMethod;
-		this.category = category;
-		this.namePrefix = namePrefix;
-		this.author = author;
-		this.icon = icon;
-		this.instanceClass = instanceClass;
-		this.zOrder = zOrder;
-		this.flexibleZOrder = flexibleZOrder;
-		this.stretchable = stretchable;
-		this.bomPolicy = bomPolicy;
-		this.autoEdit = autoEdit;
-		this.rotatable = rotatable;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public CreationMethod getCreationMethod() {
-		return creationMethod;
-	}
-
-	public String getCategory() {
-		return category;
-	}
-
-	public String getNamePrefix() {
-		return namePrefix;
-	}
-
-	public String getAuthor() {
-		return author;
-	}
-
-	public Icon getIcon() {
-		return icon;
-	}
-
-	public Class<? extends IDIYComponent<?>> getInstanceClass() {
-		return instanceClass;
-	}
-
-	public double getZOrder() {
-		return zOrder;
-	}
-	
-	public boolean isFlexibleZOrder() {
-		return flexibleZOrder;
-	}
-
-	public boolean isStretchable() {
-		return stretchable;
-	}
-	
-	public BomPolicy getBomPolicy() {
-		return bomPolicy;
-	}
-	
-	public boolean isAutoEdit() {
-		return autoEdit;
-	}
-	
-	public boolean isRotatable() {
-		return rotatable;
-	}
-
-	@Override
-	public String toString() {
-		return name;
-	}
-}

diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/Display.java

@@ -1,11 +0,0 @@
-package org.diylc.common;
-
-public enum Display {
-
-	NAME, VALUE, NONE, BOTH;
-
-	@Override
-	public String toString() {
-		return name().substring(0, 1) + name().substring(1).toLowerCase();
-	}
-}

diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/DrawOption.java

@@ -1,40 +0,0 @@
-package org.diylc.common;
-
-import java.awt.Graphics;
-
-/**
- * Enumerates all options that can be used when drawing a project.
- * 
- * @see IPlugInPort#draw(java.awt.Graphics2D, java.util.Set, IComponentFiler)
- * 
- * @author Branislav Stojkovic
- */
-public enum DrawOption {
-
-	/**
-	 * Selection rectangle will be drawn when needed and selected components may
-	 * be rendered differently.
-	 */
-	SELECTION,
-	/**
-	 * Selected zoom level will be applied to scale the {@link Graphics} before
-	 * drawing.
-	 */
-	ZOOM,
-	/**
-	 * Grid lines are drawn.
-	 */
-	GRID,
-	/**
-	 * Control points are drawn.
-	 */
-	CONTROL_POINTS,
-	/**
-	 * Anti-aliasing is used when drawing.
-	 */
-	ANTIALIASING,
-	/**
-	 * Draw components in outline mode.
-	 */
-	OUTLINE_MODE;
-}

diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/GridType.java

@@ -1,6 +0,0 @@
-package org.diylc.common;
-
-public enum GridType {
-
-	LINES, CROSSHAIR, DOT, NONE;
-}

diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/HorizontalAlignment.java

@@ -1,9 +0,0 @@
-package org.diylc.common;
-
-public enum HorizontalAlignment {
-	LEFT, CENTER, RIGHT;
-	
-	public String toString() {
-		return name().substring(0, 1) + name().substring(1).toLowerCase();
-	}
-}

diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/IComponentFiler.java

@@ -1,8 +0,0 @@
-package org.diylc.common;
-
-import org.diylc.core.IDIYComponent;
-
-public interface IComponentFiler {
-
-	boolean testComponent(IDIYComponent<?> component);
-}

diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/IKeyProcessor.java

@@ -1,22 +0,0 @@
-package org.diylc.common;
-
-public interface IKeyProcessor {
-
-	public static final int VK_LEFT = 0x25;
-	public static final int VK_UP = 0x26;
-	public static final int VK_RIGHT = 0x27;
-	public static final int VK_DOWN = 0x28;
-
-	/**
-	 * Notifies the presenter that a key hes been pressed on the canvas.
-	 * 
-	 * @param key
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 * 
-	 * @return true if the event should be consumed
-	 */
-	boolean keyPressed(int key, boolean ctrlDown, boolean shiftDown,
-			boolean altDown);
-}

diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/IMouseProcessor.java

@@ -1,69 +0,0 @@
-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 button
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 * @param clickCount
-	 */
-	void mouseClicked(Point point, int button, 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);
-}