added recently used tab

Renumber selected components by X or Y axis
fixed method finding issues
2026-11-10 01:02:08 +10:00 · 2011-08-28 21:59:53 +00:00 · 2011-08-28 21:43:25 +00:00 · 2011-08-28 21:31:49 +00:00 · 2011-08-28 17:09:10 +00:00 · 2011-08-28 16:23:35 +00:00
258 changed files with 3086 additions and 11948 deletions
@@ -2,6 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
+	<classpathentry kind="lib" path="lib/bancika-gui-framework.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/DIYLC"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
-	<classpathentry kind="lib" path="lib/iText-2.1.7.jar"/>
-	<classpathentry kind="lib" path="lib/cloning-1.5.jar"/>
-	<classpathentry kind="lib" path="lib/objenesis-1.1.jar"/>
-	<classpathentry kind="lib" path="lib/bancika-gui-framework.jar"/>
-	<classpathentry kind="lib" path="lib/HttpProxy.jar"/>
-	<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
-	<classpathentry kind="lib" path="library/main.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>DIYLC</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>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<stringAttribute key="bad_container_name" value="\DIYLC\r"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/DIYLC/src/org/diylc/DIYLCStarter.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;Library&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;DIYLC&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.diylc.DIYLCStarter"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="DIYLC"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms64m -Xmx256m"/>
-</launchConfiguration>
@@ -1,78 +0,0 @@
-<project name="diylc" 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="main.class" value="org.diylc.DIYLCStarter" />
-
-	<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="Main-Class" value="${main.class}" />
-				<attribute name="Class-Path" value="${manifest.class.path}" />
-			</manifest>
-		</jar>
-	</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>
@@ -1,2 +0,0 @@
-#org.diylc.utils.Constants.CANVAS_COLOR=#005D96
-#org.diylc.utils.Constants.GRID_COLOR=#FFFFFF
@@ -1,14 +0,0 @@
-<map>
-  <entry>
-    <string>lastPath</string>
-    <string>C:\Documents and Settings\Branislav Stojkovic\Desktop</string>
-  </entry>
-  <entry>
-    <string>zoom</string>
-    <double>1.0</double>
-  </entry>
-  <entry>
-    <string>metric</string>
-    <boolean>true</boolean>
-  </entry>
-</map>
@@ -1,64 +0,0 @@
-package org.diylc;
-
-import java.io.FileInputStream;
-import java.net.URL;
-import java.util.Properties;
-
-import javax.swing.UIManager;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-import org.diylc.gui.MainFrame;
-import org.diylc.presenter.Presenter;
-
-import com.diyfever.gui.miscutils.PropertyInjector;
-
-/**
- * Main class that runs DIYLC.
- * 
- * @author Branislav Stojkovic
- * 
- * @see Presenter
- * @see MainFrame
- */
-public class DIYLCStarter {
-
-	private static final Logger LOG = Logger.getLogger(Presenter.class);
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		URL url = DIYLCStarter.class.getResource("log4j.properties");
-		Properties properties = new Properties();
-		try {
-			properties.load(url.openStream());
-			PropertyConfigurator.configure(properties);
-		} catch (Exception e) {
-			LOG.error("Could not initialize log4j configuration", e);
-		}
-		
-		LOG.info("Starting DIYLC with working directory " + System.getProperty("user.dir"));
-
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			LOG.error("Could not set Look&Feel", e);
-		}
-
-		MainFrame mainFrame = new MainFrame();
-		mainFrame.setLocationRelativeTo(null);
-		mainFrame.setVisible(true);
-		
-		url = DIYLCStarter.class.getResource("/config.properties");
-		properties = new Properties();
-		try {
-			LOG.info("Injecting default properties.");
-			properties.load(new FileInputStream("config.properties"));
-			PropertyInjector.injectProperties(properties);
-		} catch (Exception e) {
-			LOG.error("Could not read config.properties file", e);
-		}
-
-	}
-}
@@ -1,7 +0,0 @@
-package org.diylc.common;
-
-public class BadPositionException extends Exception {
-
-	private static final long serialVersionUID = 1L;
-
-}
@@ -1,60 +0,0 @@
-package org.diylc.common;
-
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.diylc.core.IDIYComponent;
-
-
-/**
- * Represents component selection as a {@link List} of
- * {@link IDIYComponent} objects. Implements {@link Transferable}, so it is
- * suitable for clipboard usage.
- * 
- * @author Branislav Stojkovic
- */
-public class ComponentSelection extends ArrayList<IDIYComponent<?>> implements Transferable {
-
-	private static final long serialVersionUID = 1L;
-
-	public static final DataFlavor listFlavor = new DataFlavor(List.class, "Java List");
-	
-	public static final ComponentSelection EMPTY_SELECTION = new ComponentSelection();
-	
-	public static ComponentSelection of(IDIYComponent<?> component) {
-		ComponentSelection selection = new ComponentSelection();
-		selection.add(component);
-		return selection;
-	}
-
-	public ComponentSelection() {
-		super();
-	}
-
-	public ComponentSelection(Collection<IDIYComponent<?>> selectedComponents) {
-		super(selectedComponents);
-	}
-
-	@Override
-	public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
-		if (flavor.equals(listFlavor)) {
-			return this;
-		}
-		throw new UnsupportedFlavorException(flavor);
-	}
-
-	@Override
-	public DataFlavor[] getTransferDataFlavors() {
-		return new DataFlavor[] { listFlavor };
-	}
-
-	@Override
-	public boolean isDataFlavorSupported(DataFlavor flavor) {
-		return flavor.equals(listFlavor);
-	}
-}
@@ -1,88 +0,0 @@
-package org.diylc.common;
-
-import javax.swing.Icon;
-
-import org.diylc.core.CreationMethod;
-import org.diylc.core.IDIYComponent;
-
-/**
- * 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 stretchable;
-
-	public ComponentType(String name, String description, CreationMethod creationMethod,
-			String category, String namePrefix, String author, Icon icon,
-			Class<? extends IDIYComponent<?>> instanceClass, double zOrder, boolean stretchable) {
-		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.stretchable = stretchable;
-	}
-
-	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 isStretchable() {
-		return stretchable;
-	}
-
-	@Override
-	public String toString() {
-		return name;
-	}
-}
@@ -1,11 +0,0 @@
-package org.diylc.common;
-
-public enum Display {
-
-	NAME, VALUE;
-
-	@Override
-	public String toString() {
-		return name().substring(0, 1) + name().substring(1).toLowerCase();
-	}
-}
@@ -1,36 +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;
-}
@@ -1,81 +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).
-	 */
-	SELECTION_SIZE_CHANGED,
-	/**
-	 * Called when display needs to be repainted. No parameters are passed.
-	 */
-	REPAINT,
-	/**
-	 * Called when new component slot has been changed. The only parameter is
-	 * {@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,
-	LAYER_STATE_CHANGED;
-	;
-}
@@ -1,6 +0,0 @@
-package org.diylc.common;
-
-public enum GridType {
-
-	LINES, CROSSHAIR, DOT, NONE;
-}
@@ -1,8 +0,0 @@
-package org.diylc.common;
-
-import org.diylc.core.IDIYComponent;
-
-public interface IComponentFiler {
-
-	boolean testComponent(IDIYComponent<?> component);
-}
@@ -1,19 +0,0 @@
-package org.diylc.common;
-
-import com.diyfever.gui.simplemq.IMessageListener;
-
-/**
- * Interface for plug-ins.
- * 
- * @author Branislav Stojkovic
- */
-public interface IPlugIn extends IMessageListener<EventType> {
-
-	/**
-	 * Method that connects the plug-in with {@link IPlugInPort}. Called by the
-	 * application when plug-in is installed.
-	 * 
-	 * @param plugInPort
-	 */
-	void connect(IPlugInPort plugInPort);
-}
@@ -1,356 +0,0 @@
-package org.diylc.common;
-
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.SwingConstants;
-import javax.swing.JPopupMenu.Separator;
-
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.Project;
-
-import com.diyfever.gui.simplemq.IMessageListener;
-import com.diyfever.gui.simplemq.MessageDispatcher;
-import com.diyfever.gui.update.VersionNumber;
-
-/**
- * Interface for communication between plug-ins and the application. Plug-ins
- * may acquire information or make changes through this interface. Application
- * events are dispatched to plug-ins through {@link MessageDispatcher}
- * 
- * @author Branislav Stojkovic
- * 
- * @see IPlugIn
- * @see MessageDispatcher
- * @see IMessageListener
- * @see EventType
- */
-public interface IPlugInPort {
-	
-	public static final String CHECK_BOX_MENU_ITEM = "org.diylc.checkBoxMenuItem";
-
-	/**
-	 * Returns size of the canvas that takes project dimensions into account as
-	 * well as zoom level. Each dimension is calculated as the product of the
-	 * actual size and the number of pixels per unit. If <code>useZoom</code> is
-	 * set to true, the result is scaled by zoom factor.
-	 * 
-	 * @param useZoom
-	 * 
-	 * @return canvas dimensions
-	 */
-	Dimension getCanvasDimensions(boolean useZoom);
-
-	/**
-	 * Returns an instance of {@link Cursor} that should be used at the
-	 * specified location.
-	 * 
-	 * Note: point coordinates are scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @return cursor
-	 */
-	Cursor getCursorAt(Point point);
-
-	/**
-	 * Returns an instance of currently loaded project.
-	 * 
-	 * @return
-	 */
-	Project getCurrentProject();
-
-	/**
-	 * Loads specified {@link Project}.
-	 * 
-	 * @param project
-	 * @param freshStart
-	 */
-	void loadProject(Project project, boolean freshStart);
-
-	/**
-	 * Creates a new project.
-	 */
-	void createNewProject();
-
-	/**
-	 * Loads a project from the specified file.
-	 * 
-	 * @param fileName
-	 */
-	void loadProjectFromFile(String fileName);
-
-	/**
-	 * Saves the current project into the specified file.
-	 * 
-	 * @param fileName
-	 */
-	void saveProjectToFile(String fileName);
-
-	/**
-	 * @return the current file name.
-	 */
-	String getCurrentFileName();
-
-	/**
-	 * @return true if the current project is modified.
-	 */
-	boolean isProjectModified();
-
-	/**
-	 * Shows a user dialog if there are changes to confirm that it's safe to
-	 * proceed.
-	 * 
-	 * @return true, if file actions (new, open, close) can be taken
-	 */
-	boolean allowFileAction();
-
-	/**
-	 * Returns all available {@link ComponentType}s classified by category.
-	 * Result is a {@link Map} between category name to a {@link List} of all
-	 * {@link ComponentType}s that share that category name.
-	 * 
-	 * @return
-	 */
-	Map<String, List<ComponentType>> getComponentTypes();
-
-	/**
-	 * Draws project on the provided {@link Graphics2D}. If the provided filter
-	 * is not null, it will be used to filter the components that are shown.
-	 * 
-	 * @param g2d
-	 * @param drawOptions
-	 *            specific drawing options
-	 * @param filter
-	 */
-	void draw(Graphics2D g2d, Set<DrawOption> drawOptions, IComponentFiler filter);
-
-	/**
-	 * Injects a custom GUI panels provided by the plug-in and desired position
-	 * in the window. Application will layout plug-in panels accordingly. <br>
-	 * Valid positions are:
-	 * <ul>
-	 * <li> {@link SwingConstants#TOP}</li>
-	 * <li> {@link SwingConstants#BOTTOM}</li>
-	 * <li> {@link SwingConstants#LEFT}</li>
-	 * <li> {@link SwingConstants#RIGHT}</li>
-	 * </ul>
-	 * 
-	 * Center position is reserved for the main canvas panel and cannot be used.
-	 * 
-	 * @param component
-	 * @param position
-	 * @throws BadPositionException
-	 *             in case invalid position is specified
-	 */
-	void injectGUIComponent(JComponent component, int position) throws BadPositionException;
-
-	/**
-	 * Injects a custom menu action into application's main menu. If
-	 * <code>action</code> is set to null {@link Separator} will be added. If
-	 * the specified menu does not exist it will be automatically created.
-	 * 
-	 * @param action
-	 *            {@link Action} to inser
-	 * @param menuName
-	 *            name of the menu to insert into
-	 */
-	void injectMenuAction(Action action, String menuName);
-
-	/**
-	 * Injects a custom submenu into application's main menu. If
-	 * <code>action</code> is set to null {@link Separator} will be added. If
-	 * the specified menu does not exist it will be automatically created.
-	 * 
-	 * @param name
-	 * @param icon
-	 * @param parentMenuName
-	 */
-	void injectSubmenu(String name, Icon icon, String parentMenuName);
-
-	Double[] getAvailableZoomLevels();
-
-	/**
-	 * Returns current zoom level where <code>zoomLevel = 1.0d</code> means
-	 * 100%.
-	 * 
-	 * @return current zoom level
-	 */
-	double getZoomLevel();
-
-	/**
-	 * Changes current zoom level where <code>zoomLevel = 1.0d</code> means 100%
-	 * 
-	 * @param zoomLevel
-	 *            new zoom leve
-	 */
-	void setZoomLevel(double zoomLevel);
-
-	/**
-	 * Notifies the presenter that mouse is clicked.
-	 * 
-	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 */
-	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
-
-	/**
-	 * Notifies the presenter that mouse is moved.
-	 * 
-	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 */
-	void mouseMoved(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
-
-	/**
-	 * Returns the current {@link ComponentSelection}.
-	 * 
-	 * @return
-	 */
-	ComponentSelection getSelectedComponents();
-
-	/**
-	 * Selects all components in the project.
-	 */
-	void selectAll();
-
-	/**
-	 * Notification that drag has been started from the specified point.
-	 * 
-	 * Note: point coordinates are scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @param ctrlDown
-	 * @param shiftDown
-	 * @param altDown
-	 */
-	void dragStarted(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
-
-	/**
-	 * Checks if it's possible to drop over the specified point.
-	 * 
-	 * Note: point coordinates are scaled for zoom factor.
-	 * 
-	 * @param point
-	 * @return
-	 */
-	boolean dragOver(Point point);
-
-	/**
-	 * Notification that drag has been ended in the specified point.
-	 * 
-	 * Note: point coordinates are scaled for zoom factor.
-	 * 
-	 * @param point
-	 */
-	void dragEnded(Point point);
-
-	/**
-	 * Returns current version number.
-	 * 
-	 * @return
-	 */
-	VersionNumber getCurrentVersionNumber();
-
-	/**
-	 * Adds a list of components to the project.
-	 * 
-	 * @param components
-	 */
-	void pasteComponents(List<IDIYComponent<?>> components);
-
-	/**
-	 * Deletes all the selected components from the project.
-	 */
-	void deleteSelectedComponents();
-
-	/**
-	 * Sets default value for the specified property name for currently selected
-	 * component types.
-	 * 
-	 * @param propertyName
-	 *            display name for property
-	 * @param value
-	 *            new default value, must not be null
-	 */
-	void setSelectionDefaultPropertyValue(String propertyName, Object value);
-
-	/**
-	 * Sets default value for the specified property name for projects.
-	 * 
-	 * @param propertyName
-	 *            display name for property
-	 * @param value
-	 *            new default value, must not be null
-	 */
-	void setProjectDefaultPropertyValue(String propertyName, Object value);
-
-	/**
-	 * @return a list of properties that are mutual for all the selected
-	 *         components. Resulting list may be empty if selected components do
-	 *         not have mutual properties or can be null if the selection is
-	 *         empty.
-	 */
-	List<PropertyWrapper> getMutualSelectionProperties();
-
-	/**
-	 * Applies specified properties to all the selected components. If some of
-	 * the properties are not applicable to some of the selected components an
-	 * exception will be thrown.
-	 * 
-	 * @param properties
-	 */
-	void applyPropertiesToSelection(List<PropertyWrapper> properties);
-
-	/**
-	 * @return a list of editable properties of the current project.
-	 */
-	List<PropertyWrapper> getProjectProperties();
-
-	/**
-	 * Applies specified properties to the current project.
-	 * 
-	 * @param properties
-	 */
-	void applyPropertiesToProject(List<PropertyWrapper> properties);
-
-	/**
-	 * Sets the new component slot. Specified component type will be used to
-	 * instantiate new component.
-	 */
-	void setNewComponentTypeSlot(ComponentType componentType);
-
-	/**
-	 * Changes default size notation, true for metric, false for imperial.
-	 * 
-	 * @param isMetric
-	 */
-	void setMetric(boolean isMetric);
-
-	/**
-	 * Groups all selected components.
-	 */
-	void groupSelectedComponents();
-
-	/**
-	 * Ungroups all selected components.
-	 */
-	void ungroupSelectedComponents();
-	
-	void setLayerLocked(int layerZOrder, boolean locked);
-}
@@ -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);
-		basicStrokeMap.put(width, stroke);
-		return stroke;
-	}
-}
@@ -1,15 +0,0 @@
-package org.diylc.common;
-
-public enum Orientation {
-
-	DEFAULT, _90, _180, _270;
-
-	@Override
-	public String toString() {
-		if (this == DEFAULT) {
-			return "Default";
-		} else {
-			return name().replace("_", "") + " degrees clockwise";
-		}
-	}
-}
@@ -1,141 +0,0 @@
-package org.diylc.common;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * Entity class for editable properties extracted from component objects.
- * Represents a single editable property together with it's current value.
- * 
- * @author Branislav Stojkovic
- */
-public class PropertyWrapper implements Cloneable {
-
-	private String name;
-	private Class<?> type;
-	private Object value;
-	private Method setter;
-	private Method getter;
-	private boolean defaultable;
-
-	public PropertyWrapper(String name, Class<?> type, Method getter, Method setter,
-			boolean defaultable) {
-		super();
-		this.name = name;
-		this.type = type;
-		this.getter = getter;
-		this.setter = setter;
-		this.defaultable = defaultable;
-	}
-
-	public void readFrom(Object object) throws IllegalArgumentException,
-			IllegalAccessException, InvocationTargetException {
-		this.value = getter.invoke(object);
-	}
-
-	// public void readUniqueFrom(IDIYComponent component)
-	// throws IllegalArgumentException, IllegalAccessException,
-	// InvocationTargetException {
-	// Object newValue = getter.invoke(component);
-	// if (!newValue.equals(value)) {
-	// this.value = null;
-	// }
-	// }
-
-	public void writeTo(Object object) throws IllegalArgumentException,
-			IllegalAccessException, InvocationTargetException {
-		setter.invoke(object, value);
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public Class<?> getType() {
-		return type;
-	}
-
-	public Object getValue() {
-		return value;
-	}
-
-	public void setValue(Object value) {
-		this.value = value;
-	}
-
-	public boolean isDefaultable() {
-		return defaultable;
-	}
-
-	public void setDefaultable(boolean defaultable) {
-		this.defaultable = defaultable;
-	}
-
-	// @Override
-	// public Object clone() throws CloneNotSupportedException {
-	// // Try to invoke clone method on value if possible.
-	// try {
-	// Method cloneMethod = value.getClass().getMethod("clone");
-	// return new Property(name, type, cloneMethod.invoke(value));
-	// } catch (Exception e) {
-	// }
-	// return new Property(name, type, value);
-	// }
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + (defaultable ? 1231 : 1237);
-		result = prime * result + ((getter == null) ? 0 : getter.hashCode());
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
-		result = prime * result + ((setter == null) ? 0 : setter.hashCode());
-		result = prime * result + ((type == null) ? 0 : type.hashCode());
-		result = prime * result + ((value == null) ? 0 : value.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		PropertyWrapper other = (PropertyWrapper) obj;
-		if (defaultable != other.defaultable)
-			return false;
-		if (getter == null) {
-			if (other.getter != null)
-				return false;
-		} else if (!getter.equals(other.getter))
-			return false;
-		if (name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!name.equals(other.name))
-			return false;
-		if (setter == null) {
-			if (other.setter != null)
-				return false;
-		} else if (!setter.equals(other.setter))
-			return false;
-		if (type == null) {
-			if (other.type != null)
-				return false;
-		} else if (!type.equals(other.type))
-			return false;
-		if (value == null) {
-			if (other.value != null)
-				return false;
-		} else if (!value.equals(other.value))
-			return false;
-		return true;
-	}
-
-	@Override
-	public String toString() {
-		return name + " = " + value;
-	}
-}
@@ -1,54 +0,0 @@
-package org.diylc.components;
-
-import java.awt.Color;
-import java.awt.Font;
-
-import org.diylc.core.IDIYComponent;
-import org.diylc.core.annotations.EditableProperty;
-
-/**
- * Abstract implementation of {@link IDIYComponent} that contains component name
- * and toString.
- * 
- * @author Branislav Stojkovic
- * 
- * @param <T>
- */
-public abstract class AbstractComponent<T> implements IDIYComponent<T> {
-
-	private static final long serialVersionUID = 1L;
-
-	protected String name = "";
-	
-	public static Color SELECTION_COLOR = Color.red;
-	public static Color LABEL_COLOR = Color.black;
-	public static Color LABEL_COLOR_SELECTED = Color.red;
-	public static Font LABEL_FONT = new Font("Tahoma", Font.PLAIN, 12);
-
-	@EditableProperty(defaultable = false)
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public String toString() {
-		return name;
-	}
-
-	/**
-	 * Returns the closest odd number, i.e. x when x is odd, or x + 1 when x is
-	 * even.
-	 * 
-	 * @param x
-	 * @return
-	 */
-	protected int getClosestOdd(int x) {
-		return (x / 2) * 2 + 1;
-	}
-}
@@ -1,130 +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(DEFAULT_SIZE.convertToPixels() / 2, 0),
-			new Point(DEFAULT_SIZE.convertToPixels() / 2, DEFAULT_SIZE.convertToPixels()),
-			new Point(DEFAULT_SIZE.convertToPixels(), DEFAULT_SIZE.convertToPixels()) };
-
-	protected Color color = getDefaultColor();
-
-	/**
-	 * Draws the specified curve onto graphics.
-	 * 
-	 * @param curve
-	 * @param g2d
-	 * @param componentState
-	 */
-	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, Project project,
-			IDrawingObserver drawingObserver) {
-		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);
-	}
-
-	@Override
-	public int getControlPointCount() {
-		return controlPoints.length;
-	}
-
-	@Override
-	public boolean isControlPointSticky(int index) {
-		return index == 0 || index == 3;
-	}
-
-	@Override
-	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
-		return index == 0 || index == 3 ? VisibilityPolicy.ALWAYS : VisibilityPolicy.WHEN_SELECTED;
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return controlPoints[index];
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		controlPoints[index].setLocation(point);
-	}
-
-	@EditableProperty
-	public Color getColor() {
-		return color;
-	}
-
-	public void setColor(Color color) {
-		this.color = color;
-	}
-
-}
@@ -1,259 +0,0 @@
-package org.diylc.components;
-
-import java.awt.AlphaComposite;
-import java.awt.Color;
-import java.awt.Composite;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.geom.Rectangle2D;
-
-import org.diylc.common.Display;
-import org.diylc.common.ObjectCache;
-import org.diylc.core.ComponentState;
-import org.diylc.core.IDrawingObserver;
-import org.diylc.core.Project;
-import org.diylc.core.VisibilityPolicy;
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-
-/**
- * Base class for all leaded components such as resistors or capacitors. Has two
- * control points and draws leads between them. Also, it positions and draws the
- * shape of the component as specified by a child class.
- * 
- * @author Branislav Stojkovic
- */
-public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComponent<T> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static Color LEAD_COLOR = Color.decode("#236B8E");
-	public static Size LEAD_THICKNESS = new Size(0.6d, SizeUnit.mm);
-	public static Size DEFAULT_SIZE = new Size(1d, SizeUnit.in);
-
-	protected Size width;
-	protected Size height;
-	protected Point[] points = new Point[] {
-			new Point((int) (-DEFAULT_SIZE.convertToPixels() / 2), 0),
-			new Point(DEFAULT_SIZE.convertToPixels() / 2, 0) };
-	protected Color bodyColor = getDefaultBodyColor();
-	protected Color borderColor = getDefaultBorderColor();
-	protected Color labelColor = LABEL_COLOR;
-	protected Display display = Display.NAME;
-
-	protected AbstractLeadedComponent() {
-		super();
-		try {
-			this.width = getDefaultWidth().clone();
-			this.height = getDefaultHeight().clone();
-		} catch (CloneNotSupportedException e) {
-			// This should never happen because Size supports cloning.
-		} catch (NullPointerException e) {
-			// This will happen if components do not have any shape.
-		}
-	}
-
-	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
-			IDrawingObserver drawingObserver) {
-		double distance = points[0].distance(points[1]);
-		Shape shape = getBodyShape();
-		if (shape == null) {
-			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(
-					getLeadThickness().convertToPixels()));
-			g2d.setColor(shouldShadeLeads() ? getLeadColor(componentState).darker()
-					: getLeadColor(componentState));
-			g2d.drawLine(points[0].x, points[0].y, points[1].x, points[1].y);
-			if (shouldShadeLeads()) {
-				g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(
-						getLeadThickness().convertToPixels() - 2));
-				g2d.setColor(getLeadColor(componentState));
-				g2d.drawLine(points[0].x, points[0].y, points[1].x, points[1].y);
-			}
-			return;
-		}
-		Rectangle shapeRect = shape.getBounds();
-		double leadLenght = (distance - shapeRect.width) / 2;
-		Double theta = Math.atan2(points[1].y - points[0].y, points[1].x - points[0].x);
-		// Transform graphics to draw the body in the right place and at the
-		// right angle.
-		g2d.translate((points[0].x + points[1].x - shapeRect.width) / 2,
-				(points[0].y + points[1].y - shapeRect.height) / 2);
-		g2d.rotate(theta, shapeRect.width / 2, shapeRect.height / 2);
-		// Draw body.
-		Composite oldComposite = g2d.getComposite();
-		if (alpha < MAX_ALPHA) {
-			g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
-					/ MAX_ALPHA));
-		}
-		g2d.setColor(bodyColor);
-		g2d.fill(shape);
-		decorateComponentBody(g2d);
-		g2d.setComposite(oldComposite);
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-		g2d.setColor(componentState == ComponentState.SELECTED
-				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : borderColor);
-		g2d.draw(shape);
-		// Draw leads.
-		int leadThickness = getClosestOdd(getLeadThickness().convertToPixels());
-		g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
-		g2d.setColor(shouldShadeLeads() ? getLeadColor(componentState).darker()
-				: getLeadColor(componentState));
-		g2d.drawLine((int) (shapeRect.width - distance) / 2, (int) shapeRect.height / 2,
-				(int) ((shapeRect.width - distance) / 2 + leadLenght) - leadThickness / 2,
-				(int) shapeRect.height / 2);
-		g2d.drawLine((int) (shapeRect.width + distance) / 2, (int) shapeRect.height / 2,
-				(int) ((shapeRect.width + distance) / 2 - leadLenght) + leadThickness / 2,
-				(int) shapeRect.height / 2);
-		if (shouldShadeLeads()) {
-			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
-			g2d.setColor(getLeadColor(componentState));
-			g2d.drawLine((int) (shapeRect.width - distance) / 2, (int) shapeRect.height / 2,
-					(int) ((shapeRect.width - distance) / 2 + leadLenght) - leadThickness / 2,
-					(int) shapeRect.height / 2);
-			g2d.drawLine((int) (shapeRect.width + distance) / 2, (int) shapeRect.height / 2,
-					(int) ((shapeRect.width + distance) / 2 - leadLenght) + leadThickness / 2,
-					(int) shapeRect.height / 2);
-		}
-		// Do not track the label because that area was already covered.
-		drawingObserver.stopTracking();
-		// Draw label.
-		g2d.setFont(LABEL_FONT);
-		g2d.setColor(componentState == ComponentState.SELECTED ? LABEL_COLOR_SELECTED : labelColor);
-		FontMetrics fontMetrics = g2d.getFontMetrics();
-		String label = display == Display.NAME ? getName() : getValue().toString();
-		// Adjust label angle if needed to make sure that it's readable.
-		if ((theta >= Math.PI / 2 && theta <= Math.PI)
-				|| (theta < -Math.PI / 2 && theta > -Math.PI)) {
-			g2d.rotate(Math.PI, shapeRect.width / 2, shapeRect.height / 2);
-		}
-		Rectangle2D textRect = fontMetrics.getStringBounds(label, g2d);
-		g2d.drawString(label, (int) (shapeRect.width - textRect.getWidth()) / 2,
-				(int) (shapeRect.height - textRect.getHeight()) / 2 + fontMetrics.getAscent());
-	}
-
-	protected void decorateComponentBody(Graphics2D g2d) {
-		// Do nothing.
-	}
-
-	protected boolean shouldShadeLeads() {
-		return true;
-	}
-
-	/**
-	 * @return default component width.
-	 */
-	protected abstract Size getDefaultWidth();
-
-	/**
-	 * Returns default component height.
-	 * 
-	 * @return
-	 */
-	protected abstract Size getDefaultHeight();
-
-	/**
-	 * @return shape that represents component body. Shape should not be
-	 *         transformed and should be referenced to (0, 0).
-	 */
-	protected abstract Shape getBodyShape();
-
-	/**
-	 * @return default component body color.
-	 */
-	protected abstract Color getDefaultBodyColor();
-
-	/**
-	 * @return default component border color.
-	 */
-	protected abstract Color getDefaultBorderColor();
-
-	/**
-	 * @return default lead thickness. Override this method to change it.
-	 */
-	protected Size getLeadThickness() {
-		return LEAD_THICKNESS;
-	}
-
-	/**
-	 * @return default lead color. Override this method to change it.
-	 */
-	protected Color getLeadColor(ComponentState componentState) {
-		return componentState == ComponentState.SELECTED
-				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : LEAD_COLOR;
-	}
-
-	@Override
-	public int getControlPointCount() {
-		return points.length;
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return (Point) points[index];
-	}
-
-	@Override
-	public boolean isControlPointSticky(int index) {
-		return true;
-	}
-
-	@Override
-	public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
-		return VisibilityPolicy.ALWAYS;
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		points[index].setLocation(point);
-	}
-
-	@EditableProperty(name = "Color")
-	public Color getBodyColor() {
-		return bodyColor;
-	}
-
-	public void setBodyColor(Color bodyColor) {
-		this.bodyColor = bodyColor;
-	}
-
-	@EditableProperty(name = "Border")
-	public Color getBorderColor() {
-		return borderColor;
-	}
-
-	public void setBorderColor(Color borderColor) {
-		this.borderColor = borderColor;
-	}
-
-	@EditableProperty(defaultable = true)
-	public Size getWidth() {
-		return width;
-	}
-
-	public void setWidth(Size width) {
-		this.width = width;
-	}
-
-	@EditableProperty(defaultable = true)
-	public Size getHeight() {
-		return height;
-	}
-
-	public void setHeight(Size height) {
-		this.height = height;
-	}
-
-	@EditableProperty
-	public Display getDisplay() {
-		return display;
-	}
-
-	public void setDisplay(Display display) {
-		this.display = display;
-	}
-}
@@ -1,36 +0,0 @@
-package org.diylc.components;
-
-import java.awt.Point;
-
-public abstract class AbstractSinglePointComponent extends AbstractComponent<Void> {
-
-	private static final long serialVersionUID = 1L;
-
-	protected Point point = new Point(0, 0);
-
-	@Override
-	public int getControlPointCount() {
-		return 1;
-	}
-
-	@Override
-	public Point getControlPoint(int index) {
-		return point;
-	}
-
-	@Override
-	public void setControlPoint(Point point, int index) {
-		this.point.setLocation(point);
-	}
-	
-	@Deprecated
-	@Override
-	public Void getValue() {
-		return null;
-	}
-	
-	@Deprecated
-	@Override
-	public void setValue(Void value) {
-	}
-}
@@ -1,21 +0,0 @@
-package org.diylc.components;
-
-import org.diylc.core.annotations.EditableProperty;
-
-public abstract class AbstractTransparentComponent<T> extends AbstractComponent<T> {
-
-	private static final long serialVersionUID = 1L;
-
-	public static byte MAX_ALPHA = 127;
-
-	protected byte alpha = MAX_ALPHA;
-
-	@EditableProperty
-	public Byte getAlpha() {
-		return alpha;
-	}
-
-	public void setAlpha(Byte alpha) {
-		this.alpha = alpha;
-	}
-}
@@ -1,11 +0,0 @@
-package org.diylc.core;
-
-/**
- * Enumerates all possible states that a component can be in.
- * 
- * @author Branislav Stojkovic
- */
-public enum ComponentState {
-
-	NORMAL, SELECTED, LOCKED, DRAGGING
-}
@@ -1,6 +0,0 @@
-package org.diylc.core;
-
-public enum CreationMethod {
-
-	SINGLE_CLICK, POINT_BY_POINT;
-}
@@ -1,112 +0,0 @@
-package org.diylc.core;
-
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.io.Serializable;
-
-import org.diylc.core.annotations.ComponentDescriptor;
-import org.diylc.core.annotations.EditableProperty;
-
-/**
- * Interface for component instance. Implementation classes of this interface
- * will be instantiated by the application when component is added to the
- * canvas. <br>
- * <br>
- * <b>Implementing classes should meet the following: </b>
- * <ul>
- * <li>Must have an empty constructor.</li>
- * <li>Class should be annotated with {@link ComponentDescriptor}.</li>
- * <li>Getters for properties editable by users should be annotated with
- * {@link EditableProperty}.</li>
- * <li>Component configuration should be stored int <code>public static</code>
- * fields so they can be set through config file.</li>
- * </ul>
- * 
- * @author Branislav Stojkovic
- * 
- * @param <T>
- *            type of component values, e.g. Resistance for resistors or String
- *            for transistors.
- */
-public interface IDIYComponent<T> extends Serializable {
-
-	public static final int BELOW_CHASSIS = 1;
-	public static final int CHASSIS = 2;
-	public static final int ABOVE_CHASSIS = 3;
-	public static final int BELOW_BOARD = 4;
-	public static final int BOARD = 5;
-	public static final int ABOVE_BOARD = 6;
-	public static final int BELOW_COMPONENT = 7;
-	public static final int COMPONENT = 8;
-	public static final int ABOVE_COMPONENT = 9;
-
-	/**
-	 * @return component instance name.
-	 */
-	String getName();
-
-	/**
-	 * Updates component instance name.
-	 * 
-	 * @param name
-	 */
-	void setName(String name);
-
-	/**
-	 * @return component value.
-	 */
-	T getValue();
-
-	/**
-	 * Updates component value.
-	 * 
-	 * @param value
-	 */
-	void setValue(T value);
-
-	/**
-	 * @return number of control points for this component instance. May vary
-	 *         between two instances of the same type, e.g. DIL IC with 8 and 16
-	 *         pins will have 8 or 16 pins although they are of the same type.
-	 */
-	int getControlPointCount();
-
-	/**
-	 * @param index
-	 * @return control point at the specified index.
-	 */
-	Point getControlPoint(int index);
-
-	/**
-	 * Updates the control point at the specified index.
-	 * 
-	 * @param point
-	 * @param index
-	 */
-	void setControlPoint(Point point, int index);
-	
-	boolean isControlPointSticky(int index);
-	
-	VisibilityPolicy getControlPointVisibilityPolicy(int index);
-
-	/**
-	 * Draws the component onto the {@link Graphics2D}.
-	 * 
-	 * @param g2d
-	 * @param componentState
-	 * @param project
-	 * @param drawingObserver
-	 */
-	void draw(Graphics2D g2d, ComponentState componentState, Project project,
-			IDrawingObserver drawingObserver);
-
-	/**
-	 * Draws icon representation of the component. This should not depend on
-	 * component state, i.e. it should be treated as a static method.
-	 * 
-	 * @param g2d
-	 * @param width
-	 * @param height
-	 */
-	void drawIcon(Graphics2D g2d, int width, int height);
-}
@@ -1,15 +0,0 @@
-package org.diylc.core;
-
-/**
- * Interface for tracking component drawing process. Components may use it to
- * stop or restart tracking. Anything drawn while tracking is stopped will not
- * be added to the mouse hot-spot area.
- * 
- * @author Branislav Stojkovic
- */
-public interface IDrawingObserver {
-
-	void stopTracking();
-
-	void startTracking();
-}
@@ -1,197 +0,0 @@
-package org.diylc.core;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.diylc.core.annotations.EditableProperty;
-import org.diylc.core.measures.Size;
-import org.diylc.core.measures.SizeUnit;
-
-/**
- * Entity class that defines a project. Contains project properties and a
- * collection of components.This class is serialized to file. Some filed getters
- * are tagged with {@link EditableProperty} to enable for user to edit them.
- * 
- * @author Branislav Stojkovic
- */
-public class Project implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	public static String DEFAULT_TITLE = "New Project";
-	public static Size DEFAULT_WIDTH = new Size(29d, SizeUnit.cm);
-	public static Size DEFAULT_HEIGHT = new Size(21d, SizeUnit.cm);
-	public static Size DEFAULT_GRID_SPACING = new Size(0.1d, SizeUnit.in);
-
-	private String title;
-	private String author;
-	private String description;
-	private Size width;
-	private Size height;
-	private Size gridSpacing;
-	private List<IDIYComponent<?>> components;
-	private Set<Set<IDIYComponent<?>>> groups;
-	private Set<Integer> lockedLayers;
-
-	public Project() {
-		components = new ArrayList<IDIYComponent<?>>();
-		groups = new HashSet<Set<IDIYComponent<?>>>();
-		lockedLayers = new HashSet<Integer>();
-		title = DEFAULT_TITLE;
-		author = System.getProperty("user.name");
-		width = DEFAULT_WIDTH;
-		height = DEFAULT_HEIGHT;
-		gridSpacing = DEFAULT_GRID_SPACING;
-	}
-
-	@EditableProperty(defaultable = false)
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	@EditableProperty
-	public String getAuthor() {
-		return author;
-	}
-
-	public void setAuthor(String author) {
-		this.author = author;
-	}
-
-	@EditableProperty(defaultable = false)
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	@EditableProperty
-	public Size getWidth() {
-		return width;
-	}
-
-	public void setWidth(Size width) {
-		this.width = width;
-	}
-
-	@EditableProperty
-	public Size getHeight() {
-		return height;
-	}
-
-	public void setHeight(Size height) {
-		this.height = height;
-	}
-
-	@EditableProperty(name = "Grid spacing")
-	public Size getGridSpacing() {
-		return gridSpacing;
-	}
-
-	public void setGridSpacing(Size gridSpacing) {
-		this.gridSpacing = gridSpacing;
-	}
-
-	/**
-	 * List of components sorted by z-order ascending.
-	 * 
-	 * @return
-	 */
-	public List<IDIYComponent<?>> getComponents() {
-		return components;
-	}
-
-	/**
-	 * Set of grouped components.
-	 * 
-	 * @return
-	 */
-	public Set<Set<IDIYComponent<?>>> getGroups() {
-		return groups;
-	}
-	
-	public Set<Integer> getLockedLayers() {
-		return lockedLayers;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((author == null) ? 0 : author.hashCode());
-		result = prime * result + ((components == null) ? 0 : components.hashCode());
-		result = prime * result + ((description == null) ? 0 : description.hashCode());
-		result = prime * result + ((height == null) ? 0 : height.hashCode());
-		result = prime * result + ((title == null) ? 0 : title.hashCode());
-		result = prime * result + ((width == null) ? 0 : width.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;
-		Project other = (Project) obj;
-		if (author == null) {
-			if (other.author != null)
-				return false;
-		} else if (!author.equals(other.author))
-			return false;
-		if (components == null) {
-			if (other.components != null)
-				return false;
-		} else if (!components.equals(other.components))
-			return false;
-		if (description == null) {
-			if (other.description != null)
-				return false;
-		} else if (!description.equals(other.description))
-			return false;
-		if (height == null) {
-			if (other.height != null)
-				return false;
-		} else if (!height.equals(other.height))
-			return false;
-		if (title == null) {
-			if (other.title != null)
-				return false;
-		} else if (!title.equals(other.title))
-			return false;
-		if (width == null) {
-			if (other.width != null)
-				return false;
-		} else if (!width.equals(other.width))
-			return false;
-		return true;
-	}
-	
-	@Override
-	public String toString() {
-		return title;
-	}
-
-	// @Override
-	// public Project clone() throws CloneNotSupportedException {
-	// List<IDIYComponent> clonedComponents = new
-	// ArrayList<IDIYComponent>();
-	// for (IDIYComponent component : components) {
-	// clonedComponents.add(component.clone());
-	// }
-	// Project project = new Project(title, author, description,
-	// width.clone(), height.clone(), clonedComponents);
-	// return project;
-	// }
-}
@@ -1,22 +0,0 @@
-package org.diylc.core;
-
-/**
- * Enumerates control point visibility policies.
- * 
- * @author Branislav Stojkovic
- */
-public enum VisibilityPolicy {
-
-	/**
-	 * Control point should be rendered all the time.
-	 */
-	ALWAYS,
-	/**
-	 * Control point should be rendered only when the component is selected.
-	 */
-	WHEN_SELECTED,
-	/**
-	 * Control point should not be rendered regardless of component selection.
-	 */
-	NEVER;
-}
@@ -1,62 +0,0 @@
-package org.diylc.core.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import org.diylc.core.CreationMethod;
-import org.diylc.core.IDIYComponent;
-
-/**
- * Annotation for {@link IDIYComponent} implementation. Describes component
- * properties.
- * 
- * @author Branislav Stojkovic
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ComponentDescriptor {
-
-	/**
-	 * @return component type name.
-	 */
-	String name();
-
-	/**
-	 * @return component type description.
-	 */
-	String description();
-
-	/**
-	 * @return method that should be used to create a component. If
-	 *         <code>CreationMethod.POINT_BY_POINT</code> is used, user will
-	 *         have to select ending points before the component is created.
-	 */
-	CreationMethod creationMethod() default CreationMethod.SINGLE_CLICK;
-
-	/**
-	 * @return component category, e.g. "Passive", "Semiconductors", etc.
-	 */
-	String category();
-
-	/**
-	 * @return component author name.
-	 */
-	String author();
-
-	/**
-	 * @return prefix that will be used to generate component instance names,
-	 *         e.g. "R" for resistors or "Q" for transistors.
-	 */
-	String instanceNamePrefix();
-
-	/**
-	 * @return Z-order of the component.
-	 */
-	double zOrder();
-
-	/**
-	 * @return when false, moving one control point will cause all the others to
-	 *         move together with it.
-	 */
-	boolean stretchable() default true;
-
-}
@@ -1,33 +0,0 @@
-package org.diylc.core.annotations;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Used to annotate editable component property. Editable property XYZ must have
- * both getter and setter named <code>getXYZ</code> and <code>setXYZ</code>
- * respectively and this annotation must be placed on the getter method.
- * 
- * @author Branislav Stojkovic
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EditableProperty {
-
-	/**
-	 * Returns property name. If left blank property name will be extracted from
-	 * the getter name, e.g. getter <code>getXYZ</code> will induce property
-	 * name <code>XYZ</code>. <br>
-	 * Default value is blank.
-	 * 
-	 * @return
-	 */
-	String name() default "";
-
-	/**
-	 * If true, application may set default value for this property. <br>
-	 * Default value is true.
-	 * 
-	 * @return
-	 */
-	boolean defaultable() default true;
-}
@@ -1,81 +0,0 @@
-package org.diylc.core.measures;
-
-import java.io.Serializable;
-import java.text.DecimalFormat;
-import java.text.Format;
-
-public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializable, Cloneable {
-
-	private static final long serialVersionUID = 1L;
-
-	protected static final Format format = new DecimalFormat("0.####");
-
-	protected Double value;
-	protected T unit;
-
-	public AbstractMeasure() {
-	}
-
-	public AbstractMeasure(Double value, T unit) {
-		super();
-		this.value = value;
-		this.unit = unit;
-	}
-
-	public Double getValue() {
-		return value;
-	}
-
-	public void setValue(Double value) {
-		this.value = value;
-	}
-
-	public T getUnit() {
-		return unit;
-	}
-
-	public void setUnit(T multiplier) {
-		this.unit = multiplier;
-	}
-	
-	@Override
-	public Object clone() throws CloneNotSupportedException {
-		return super.clone();
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((unit == null) ? 0 : unit.hashCode());
-		result = prime * result + ((value == null) ? 0 : value.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		AbstractMeasure<?> other = (AbstractMeasure<?>) obj;
-		if (unit == null) {
-			if (other.unit != null)
-				return false;
-		} else if (!unit.equals(other.unit))
-			return false;
-		if (value == null) {
-			if (other.value != null)
-				return false;
-		} else if (!value.equals(other.value))
-			return false;
-		return true;
-	}
-
-	@Override
-	public String toString() {
-		return format.format(value) + " " + unit;
-	}
-}
@@ -1,31 +0,0 @@
-package org.diylc.core.measures;
-
-public class Capacitance extends AbstractMeasure<CapacitanceUnit> {
-
-	private static final long serialVersionUID = 1L;
-
-	public Capacitance() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public Capacitance(Double value, CapacitanceUnit unit) {
-		super(value, unit);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public Capacitance clone() throws CloneNotSupportedException {
-		return new Capacitance(value, unit);
-	}
-	
-	public static Capacitance parseCapacitance(String value) {
-		for (CapacitanceUnit unit : CapacitanceUnit.values()) {
-			if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
-				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
-				return new Capacitance(Double.parseDouble(value), unit);
-			}
-		}
-		throw new IllegalArgumentException("Could not parse capacitance: " + value);
-	}
-}
@@ -1,24 +0,0 @@
-package org.diylc.core.measures;
-
-public enum CapacitanceUnit implements Unit {
-
-	pF(1, "pF"), nF(1e3, "nF"), uF(1e6, "\u03bcF"), mF(1e9, "mF"), F(1e12, "F");
-
-	double factor;
-	String display;
-
-	private CapacitanceUnit(double factor, String display) {
-		this.factor = factor;
-		this.display = display;
-	}
-
-	@Override
-	public double getFactor() {
-		return factor;
-	}
-
-	@Override
-	public String toString() {
-		return display;
-	}
-}
@@ -1,31 +0,0 @@
-package org.diylc.core.measures;
-
-public class Inductance extends AbstractMeasure<InductanceUnit> {
-
-	private static final long serialVersionUID = 1L;
-
-	public Inductance() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public Inductance(Double value, InductanceUnit unit) {
-		super(value, unit);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public Inductance clone() throws CloneNotSupportedException {
-		return new Inductance(value, unit);
-	}
-
-	public static Inductance parseCapacitance(String value) {
-		for (InductanceUnit unit : InductanceUnit.values()) {
-			if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
-				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
-				return new Inductance(Double.parseDouble(value), unit);
-			}
-		}
-		throw new IllegalArgumentException("Could not parse inductance: " + value);
-	}
-}
@@ -1,24 +0,0 @@
-package org.diylc.core.measures;
-
-public enum InductanceUnit implements Unit {
-
-	pH(1, "pH"), nH(1e3, "nH"), uH(1e6, "\u03bcH"), mH(1e9, "mH"), H(1e12, "H");
-
-	double factor;
-	String display;
-
-	private InductanceUnit(double factor, String display) {
-		this.factor = factor;
-		this.display = display;
-	}
-
-	@Override
-	public double getFactor() {
-		return factor;
-	}
-
-	@Override
-	public String toString() {
-		return display;
-	}
-}
@@ -1,31 +0,0 @@
-package org.diylc.core.measures;
-
-public class Resistance extends AbstractMeasure<ResistanceUnit> {
-
-	private static final long serialVersionUID = 1L;
-
-	public Resistance() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public Resistance(Double value, ResistanceUnit multiplier) {
-		super(value, multiplier);
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public Resistance clone() throws CloneNotSupportedException {
-		return new Resistance(value, unit);
-	}
-
-	public static Resistance parseResistance(String value) {
-		for (ResistanceUnit unit : ResistanceUnit.values()) {
-			if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
-				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
-				return new Resistance(Double.parseDouble(value), unit);
-			}
-		}
-		throw new IllegalArgumentException("Could not parse resistance: " + value);
-	}
-}
@@ -1,24 +0,0 @@
-package org.diylc.core.measures;
-
-public enum ResistanceUnit implements Unit {
-
-	R(1, "\u03a9"), K(1e3, "K"), M(1e6, "M");
-
-	double factor;
-	String display;
-
-	private ResistanceUnit(double factor, String display) {
-		this.factor = factor;
-		this.display = display;
-	}
-
-	@Override
-	public double getFactor() {
-		return factor;
-	}
-
-	@Override
-	public String toString() {
-		return display;
-	}
-}
@@ -1,42 +0,0 @@
-package org.diylc.core.measures;
-
-import org.diylc.utils.Constants;
-
-public class Size extends AbstractMeasure<SizeUnit> {
-
-	private static final long serialVersionUID = 1L;
-
-	public Size() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public Size(Double value, SizeUnit unit) {
-		super(value, unit);
-		// TODO Auto-generated constructor stub
-	}
-
-	public int convertToPixels() {
-//		double factor = getUnit().getFactor() / SizeUnit.in.getFactor();
-//		int grids = (int) (factor * getValue() * Constants.GRIDS_PER_INCH);
-//		double remainder = (factor * getValue() * Constants.GRIDS_PER_INCH) - grids;
-//		return (int) Math.round(Constants.PIXELS_PER_INCH / Constants.GRIDS_PER_INCH
-//				* (grids + remainder));
-		return (int) (getValue() * getUnit().getFactor() / SizeUnit.in.getFactor() * Constants.PIXELS_PER_INCH);
-	}
-
-	@Override
-	public Size clone() throws CloneNotSupportedException {
-		return new Size(value, unit);
-	}
-	
-	public static Size parseSize(String value) {
-		for (SizeUnit unit : SizeUnit.values()) {
-			if (value.toLowerCase().endsWith(unit.toString().toLowerCase())) {
-				value = value.substring(0, value.length() - unit.toString().length() - 1).trim();
-				return new Size(Double.parseDouble(value), unit);
-			}
-		}
-		throw new IllegalArgumentException("Could not parse size: " + value);
-	}
-}
@@ -1,17 +0,0 @@
-package org.diylc.core.measures;
-
-public enum SizeUnit implements Unit {
-
-	mm(1d), cm(10d), m(1e4d), in(25.4d), ft(25.4d * 12), yd(9144d);
-
-	double factor;
-
-	private SizeUnit(double factor) {
-		this.factor = factor;
-	}
-
-	@Override
-	public double getFactor() {
-		return factor;
-	}
-}
@@ -1,6 +0,0 @@
-package org.diylc.core.measures;
-
-public interface Unit {
-
-	double getFactor();
-}
@@ -1,42 +0,0 @@
-package org.diylc.gui;
-
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionAdapter;
-
-import javax.swing.Icon;
-import javax.swing.JComponent;
-
-public class CustomGlassPane extends JComponent {
-
-	private static final long serialVersionUID = 1L;
-	private Icon icon;
-
-	public CustomGlassPane() {
-		super();
-		addMouseMotionListener(new MouseMotionAdapter() {
-
-			@Override
-			public void mouseMoved(MouseEvent e) {
-				if (icon != null) {
-					repaint();
-				}
-			}
-		});
-	}
-
-	public void setCursorIcon(Icon icon) {
-		this.icon = icon;
-	}
-
-	@Override
-	public void paint(Graphics g) {
-		Point cursor = getMousePosition();
-		if ((icon != null) && (cursor != null)) {
-			Graphics2D g2d = (Graphics2D) g;
-			icon.paintIcon(this, g2d, cursor.x + 10, cursor.y + 10);
-		}
-	}
-}
@@ -1,155 +0,0 @@
-package org.diylc.gui;
-
-import java.io.File;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.filechooser.FileFilter;
-
-import org.diylc.common.PropertyWrapper;
-import org.diylc.gui.components.OverwritePromptFileChooser;
-import org.diylc.gui.editor.PropertyEditorDialog;
-import org.diylc.plugins.file.BomDialog;
-import org.diylc.plugins.file.BomEntry;
-import org.diylc.plugins.online.view.LoginDialog;
-import org.diylc.plugins.online.view.NewUserDialog;
-import org.diylc.plugins.online.view.UploadDialog;
-
-import com.diyfever.gui.AboutDialog;
-import com.diyfever.gui.IFileChooserAccessory;
-import com.diyfever.gui.ProgressDialog;
-import com.diyfever.gui.miscutils.ConfigurationManager;
-
-public class DialogFactory {
-
-	private static DialogFactory instance;
-
-	private static final String PATH_KEY = "lastPath";
-
-	public static DialogFactory getInstance() {
-		if (instance == null) {
-			instance = new DialogFactory();
-		}
-		return instance;
-	}
-
-	private JFrame mainFrame;
-	private File lastDirectory;
-
-	private DialogFactory() {
-	}
-
-	/**
-	 * Sets the frame to be used as dialog parent. This should be called prior
-	 * to any other methods in this class.
-	 * 
-	 * @param mainFrame
-	 */
-	public void initialize(JFrame mainFrame) {
-		this.mainFrame = mainFrame;
-		String lastDirectoryPath = (String) ConfigurationManager.getInstance()
-				.readString(PATH_KEY, null);
-		if (lastDirectoryPath != null) {
-			lastDirectory = new File(lastDirectoryPath);
-		}
-	}
-
-	public PropertyEditorDialog createPropertyEditorDialog(List<PropertyWrapper> properties,
-			String title) {
-		PropertyEditorDialog editor = new PropertyEditorDialog(mainFrame, properties, title);
-		return editor;
-	}
-
-	public BomDialog createBomDialog(List<BomEntry> bom) {
-		BomDialog dialog = new BomDialog(mainFrame, bom);
-		return dialog;
-	}
-
-	public File showOpenDialog(FileFilter fileFilter, File initialFile, String defaultExtension,
-			IFileChooserAccessory accessory) {
-		JFileChooser openFileChooser = new JFileChooser();
-		initializeFileChooser(openFileChooser, fileFilter, initialFile, defaultExtension, accessory);
-
-		int result = openFileChooser.showOpenDialog(mainFrame);
-
-		return processFileChooserResult(result, openFileChooser, defaultExtension);
-	}
-
-	public File showSaveDialog(FileFilter fileFilter, File initialFile, String defaultExtension,
-			IFileChooserAccessory accessory) {
-		JFileChooser saveFileChooser = new OverwritePromptFileChooser();
-		initializeFileChooser(saveFileChooser, fileFilter, initialFile, defaultExtension, accessory);
-
-		int result = saveFileChooser.showSaveDialog(mainFrame);
-
-		return processFileChooserResult(result, saveFileChooser, defaultExtension);
-	}
-
-	private void initializeFileChooser(JFileChooser fileChooser, FileFilter fileFilter,
-			File initialFile, String defaultExtension, IFileChooserAccessory accessory) {
-		if (accessory != null) {
-			accessory.install(fileChooser);
-		}
-		for (FileFilter filter : fileChooser.getChoosableFileFilters()) {
-			fileChooser.removeChoosableFileFilter(filter);
-		}
-		if (fileChooser instanceof OverwritePromptFileChooser) {
-			((OverwritePromptFileChooser) fileChooser).setFileFilter(fileFilter, defaultExtension);
-		} else {
-			fileChooser.setFileFilter(fileFilter);
-		}
-		if (lastDirectory != null) {
-			fileChooser.setCurrentDirectory(lastDirectory);
-		}
-		fileChooser.setSelectedFile(initialFile);
-	}
-
-	private File processFileChooserResult(int result, JFileChooser fileChooser,
-			String defaultExtension) {
-		fileChooser.setAccessory(null);
-		if (result == JFileChooser.APPROVE_OPTION) {
-			lastDirectory = fileChooser.getCurrentDirectory();
-			ConfigurationManager.getInstance().writeValue(PATH_KEY,
-					lastDirectory.getAbsolutePath());
-			if (fileChooser.getSelectedFile().getAbsolutePath().contains(".")) {
-				return fileChooser.getSelectedFile();
-			} else {
-				return new File(fileChooser.getSelectedFile().getAbsoluteFile() + "."
-						+ defaultExtension);
-			}
-		} else {
-			return null;
-		}
-	}
-
-	public AboutDialog createAboutDialog(String appName, Icon icon, String version, String author,
-			String url, String mail, String htmlContent) {
-		AboutDialog dialog = new AboutDialog(mainFrame, appName, icon, version, author, url, mail,
-				htmlContent);
-		return dialog;
-	}
-
-	public NewUserDialog createNewUserDialog() {
-		NewUserDialog dialog = new NewUserDialog(mainFrame);
-		return dialog;
-	}
-
-	public LoginDialog createLoginDialog() {
-		LoginDialog dialog = new LoginDialog(mainFrame);
-		return dialog;
-	}
-
-	public UploadDialog createUploadDialog() {
-		UploadDialog dialog = new UploadDialog(mainFrame);
-		return dialog;
-	}
-
-	public ProgressDialog createProgressDialog(String title, String[] buttonCaptions,
-			String description, boolean useProgress) {
-		ProgressDialog dialog = new ProgressDialog(mainFrame, title, buttonCaptions, description,
-				useProgress);
-		return dialog;
-	}
-}
@@ -1,54 +0,0 @@
-package org.diylc.gui;
-
-import javax.swing.Action;
-import javax.swing.Icon;
-import javax.swing.JComponent;
-
-import org.diylc.common.BadPositionException;
-import org.diylc.common.IPlugInPort;
-
-/**
- * Base interface for the main GUI component.
- * 
- * @author Branislav Stojkovic
- */
-public interface IView {
-
-	/**
-	 * Adds a component to the view.
-	 * 
-	 * @param component
-	 *            component to insert
-	 * @param position
-	 *            target position
-	 * @throws BadPositionException
-	 * 
-	 * @see IPlugInPort#injectGUIComponent
-	 */
-	void addComponent(JComponent component, int position) throws BadPositionException;
-
-	/**
-	 * Adds a menu action.
-	 * 
-	 * @param action
-	 *            action to insert
-	 * @param menuName
-	 *            target menu name
-	 * 
-	 * @see IPlugInPort#injectMenuAction
-	 */
-	void addMenuAction(Action action, String menuName);
-
-	/**
-	 * Adds a submenu to an existing menu.
-	 * 
-	 * @param name
-	 * @param icon
-	 * @param parentMenuName
-	 */
-	void addSubmenu(String name, Icon icon, String parentMenuName);
-
-	void showMessage(String message, String title, int messageType);
-
-	int showConfirmDialog(String message, String title, int optionType, int messageType);
-}
@@ -1,268 +0,0 @@
-package org.diylc.gui;
-
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.swing.Action;
-import javax.swing.BoxLayout;
-import javax.swing.Icon;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.SwingConstants;
-import javax.swing.Timer;
-
-import org.diylc.common.BadPositionException;
-import org.diylc.common.EventType;
-import org.diylc.common.IPlugIn;
-import org.diylc.common.IPlugInPort;
-import org.diylc.images.IconLoader;
-import org.diylc.plugins.canvas.CanvasPlugin;
-import org.diylc.plugins.clipboard.EditMenuPlugin;
-import org.diylc.plugins.file.FileMenuPlugin;
-import org.diylc.plugins.help.HelpMenuPlugin;
-import org.diylc.plugins.layers.LayersMenuPlugin;
-import org.diylc.plugins.statusbar.StatusBar;
-import org.diylc.plugins.toolbox.ToolBox;
-import org.diylc.presenter.Presenter;
-
-public class MainFrame extends JFrame implements IView {
-
-	private static final long serialVersionUID = 1L;
-
-	private JPanel centerPanel;
-	private JPanel leftPanel;
-	private JPanel rightPanel;
-	private JPanel topPanel;
-	private JPanel bottomPanel;
-
-	private Presenter presenter;
-
-	private JMenuBar mainMenuBar;
-	private Map<String, JMenu> menuMap;
-
-	private CanvasPlugin canvasPlugin;
-
-	public MainFrame() {
-		super("DIYLC 3");
-		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-		setPreferredSize(new Dimension(800, 600));
-		createBasePanels();
-		menuMap = new HashMap<String, JMenu>();
-		setIconImages(Arrays.asList(IconLoader.IconSmall.getImage(), IconLoader.IconMedium
-				.getImage(), IconLoader.IconLarge.getImage()));
-		DialogFactory.getInstance().initialize(this);
-
-		this.presenter = new Presenter(this);
-
-		presenter.installPlugin(new ToolBox());
-		presenter.installPlugin(new FileMenuPlugin());
-		presenter.installPlugin(new EditMenuPlugin());
-		presenter.installPlugin(new LayersMenuPlugin());
-		// presenter.installPlugin(new OnlineManager());
-		presenter.installPlugin(new HelpMenuPlugin());
-
-		presenter.installPlugin(new StatusBar());
-		canvasPlugin = new CanvasPlugin();
-		presenter.installPlugin(canvasPlugin);
-		presenter.installPlugin(new FramePlugin());
-
-		presenter.createNewProject();
-
-		addWindowListener(new WindowAdapter() {
-
-			@Override
-			public void windowClosed(WindowEvent e) {
-				if (presenter.allowFileAction()) {
-					dispose();
-					presenter.dispose();
-					System.exit(0);
-				}
-			}
-
-			@Override
-			public void windowClosing(WindowEvent e) {
-				if (presenter.allowFileAction()) {
-					dispose();
-					presenter.dispose();
-					System.exit(0);
-				}
-			}
-		});
-
-		// setGlassPane(new CustomGlassPane());
-		// getGlassPane().setVisible(true);
-	}
-
-	@Override
-	public void setVisible(boolean b) {
-		super.setVisible(b);
-		// TODO: hack to prevent painting issues in the scroll bar rulers. Find
-		// a better fix if possible.
-		Timer timer = new Timer(500, new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				canvasPlugin.refresh();
-			}
-
-		});
-		timer.setRepeats(false);
-		timer.start();
-		// if (b) {
-		// SwingUtilities.invokeLater(new Runnable() {
-		// @Override
-		// public void run() {
-		//					
-		// }
-		// });
-		// }
-	}
-
-	private void createBasePanels() {
-		Container c = new Container();
-		c.setLayout(new BorderLayout());
-
-		centerPanel = new JPanel(new BorderLayout());
-		c.add(centerPanel, BorderLayout.CENTER);
-
-		topPanel = new JPanel();
-		topPanel.setLayout(new BoxLayout(topPanel, BoxLayout.Y_AXIS));
-		c.add(topPanel, BorderLayout.NORTH);
-
-		leftPanel = new JPanel();
-		leftPanel.setLayout(new BoxLayout(leftPanel, BoxLayout.X_AXIS));
-		c.add(leftPanel, BorderLayout.WEST);
-
-		bottomPanel = new JPanel();
-		bottomPanel.setLayout(new BoxLayout(bottomPanel, BoxLayout.Y_AXIS));
-		c.add(bottomPanel, BorderLayout.SOUTH);
-
-		rightPanel = new JPanel();
-		rightPanel.setLayout(new BoxLayout(rightPanel, BoxLayout.X_AXIS));
-		c.add(rightPanel, BorderLayout.EAST);
-
-		setContentPane(c);
-	}
-
-	private JMenuBar getMainMenuBar() {
-		if (mainMenuBar == null) {
-			mainMenuBar = new JMenuBar();
-			setJMenuBar(mainMenuBar);
-		}
-		return mainMenuBar;
-	}
-
-	// IView
-
-	@Override
-	public void addComponent(JComponent component, int position) throws BadPositionException {
-		switch (position) {
-		case SwingConstants.TOP:
-			topPanel.add(component);
-			break;
-		case SwingConstants.LEFT:
-			leftPanel.add(component);
-			break;
-		case SwingConstants.BOTTOM:
-			bottomPanel.add(component);
-			break;
-		case SwingConstants.RIGHT:
-			rightPanel.add(component);
-			break;
-		case SwingConstants.CENTER:
-			centerPanel.add(component, BorderLayout.CENTER);
-			break;
-		default:
-			throw new BadPositionException();
-		}
-		pack();
-	}
-
-	@Override
-	public void addMenuAction(Action action, String menuName) {
-		JMenu menu = findOrCreateMenu(menuName);
-		if (action == null) {
-			menu.addSeparator();
-		} else {
-			Boolean isCheckBox = (Boolean) action.getValue(IPlugInPort.CHECK_BOX_MENU_ITEM);
-			if (isCheckBox != null && isCheckBox) {
-				menu.add(new JCheckBoxMenuItem(action));
-			} else {
-				menu.add(action);
-			}
-		}
-	}
-
-	@Override
-	public void addSubmenu(String name, Icon icon, String parentMenuName) {
-		JMenu menu = findOrCreateMenu(parentMenuName);
-		JMenu submenu = new JMenu(name);
-		submenu.setIcon(icon);
-		menu.add(submenu);
-		menuMap.put(name, submenu);
-	}
-
-	@Override
-	public void showMessage(String message, String title, int messageType) {
-		JOptionPane.showMessageDialog(this, message, title, messageType);
-	}
-
-	@Override
-	public int showConfirmDialog(String message, String title, int optionType, int messageType) {
-		return JOptionPane.showConfirmDialog(this, message, title, optionType, messageType);
-	}
-
-	private JMenu findOrCreateMenu(String menuName) {
-		JMenu menu;
-		if (menuMap.containsKey(menuName)) {
-			menu = menuMap.get(menuName);
-		} else {
-			menu = new JMenu(menuName);
-			menuMap.put(menuName, menu);
-			getMainMenuBar().add(menu);
-		}
-		return menu;
-	}
-
-	class FramePlugin implements IPlugIn {
-
-		private IPlugInPort plugInPort;
-
-		@Override
-		public void connect(IPlugInPort plugInPort) {
-			this.plugInPort = plugInPort;
-		}
-
-		@Override
-		public EnumSet<EventType> getSubscribedEventTypes() {
-			return EnumSet.of(EventType.FILE_STATUS_CHANGED);
-		}
-
-		@Override
-		public void processMessage(EventType eventType, Object... params) {
-			if (eventType == EventType.FILE_STATUS_CHANGED) {
-				String fileName = (String) params[0];
-				if (fileName == null) {
-					fileName = "Untitled";
-				}
-				String modified = (Boolean) params[1] ? " (modified)" : "";
-				setTitle(String.format("DIYLC %s alpha - %s %s", plugInPort
-						.getCurrentVersionNumber(), fileName, modified));
-			}
-		}
-	}
-}
@@ -1,38 +0,0 @@
-package org.diylc.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);
-	}
-}
@@ -1,26 +0,0 @@
-package org.diylc.gui.editor;
-
-import javax.swing.JSlider;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import org.diylc.common.PropertyWrapper;
-
-public class ByteEditor extends JSlider {
-
-	private static final long serialVersionUID = 1L;
-
-	public ByteEditor(final PropertyWrapper property) {
-		super();
-		setMinimum(0);
-		setMaximum(127);
-		setValue((Byte) property.getValue());
-		addChangeListener(new ChangeListener() {
-
-			@Override
-			public void stateChanged(ChangeEvent e) {
-				property.setValue(new Integer(getValue()).byteValue());
-			}
-		});
-	}
-}
@@ -1,50 +0,0 @@
-package org.diylc.gui.editor;
-
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-import javax.swing.BorderFactory;
-import javax.swing.JColorChooser;
-import javax.swing.JLabel;
-import javax.swing.SwingConstants;
-
-import org.diylc.common.PropertyWrapper;
-
-
-public class ColorEditor extends JLabel {
-
-	private static final long serialVersionUID = 1L;
-
-	public ColorEditor(final PropertyWrapper property) {
-		super("Click to edit");
-		setOpaque(true);
-		setHorizontalAlignment(SwingConstants.CENTER);
-		setBorder(BorderFactory.createEtchedBorder());
-		setBackground((Color) property.getValue());
-		setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-		addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				Color newColor = JColorChooser.showDialog(ColorEditor.this, "Choose Color",
-						getBackground());
-				if (newColor != null) {
-					property.setValue(newColor);
-					setBackground(newColor);
-				}
-			}
-		});
-	}
-	
-	@Override
-	public void setBackground(Color bg) {
-		if (bg.getRed() < 127 || bg.getBlue() < 127 || bg.getGreen() < 127) {
-			setForeground(Color.white);
-		} else {
-			setForeground(Color.black);
-		}
-		super.setBackground(bg);
-	}
-}
@@ -1,32 +0,0 @@
-package org.diylc.gui.editor;
-
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-
-import org.diylc.common.PropertyWrapper;
-
-public class EnumEditor extends JComboBox {
-
-	private static final long serialVersionUID = 1L;
-
-	private final PropertyWrapper property;
-
-	public EnumEditor(PropertyWrapper property) {
-		this.property = property;
-		Object[] values = property.getType().getEnumConstants();
-		setModel(new DefaultComboBoxModel(values));
-		setSelectedItem(property.getValue());
-		addItemListener(new ItemListener() {
-
-			@Override
-			public void itemStateChanged(ItemEvent e) {
-				if (e.getStateChange() == ItemEvent.SELECTED) {
-					EnumEditor.this.property.setValue(e.getItem());
-				}
-			}
-		});
-	}
-}
@@ -1,41 +0,0 @@
-package org.diylc.gui.editor;
-
-import java.awt.Color;
-import java.awt.Component;
-
-import javax.swing.JLabel;
-
-import org.apache.log4j.Logger;
-import org.diylc.common.PropertyWrapper;
-import org.diylc.core.measures.AbstractMeasure;
-
-public class FieldEditorFactory {
-
-	private static final Logger LOG = Logger.getLogger(FieldEditorFactory.class);
-
-	public static Component createFieldEditor(PropertyWrapper property) {
-		if (property.getType().equals(String.class)) {
-			StringEditor editor = new StringEditor(property);
-			return editor;
-		}
-		if (property.getType().equals(Color.class)) {
-			ColorEditor editor = new ColorEditor(property);
-			return editor;
-		}
-		if (AbstractMeasure.class.isAssignableFrom(property.getType())) {
-			MeasureEditor editor = new MeasureEditor(property);
-			return editor;
-		}
-		if (property.getType().isEnum()) {
-			EnumEditor editor = new EnumEditor(property);
-			return editor;
-		}
-		if (Byte.class.isAssignableFrom(property.getType())
-				|| byte.class.isAssignableFrom(property.getType())) {
-			ByteEditor byteEditor = new ByteEditor(property);
-			return byteEditor;
-		}
-		LOG.error("Unrecognized parameter type: " + property.getType().getName());
-		return new JLabel("Unrecognized");
-	}
-}
@@ -1,51 +0,0 @@
-package org.diylc.gui.editor;
-
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-import javax.swing.BorderFactory;
-import javax.swing.JColorChooser;
-import javax.swing.JLabel;
-import javax.swing.SwingConstants;
-
-import org.diylc.common.PropertyWrapper;
-
-
-public class FontEditor extends JLabel {
-
-	private static final long serialVersionUID = 1L;
-
-	public FontEditor(final PropertyWrapper property) {
-		super("Click to edit");
-		setOpaque(true);
-		setHorizontalAlignment(SwingConstants.CENTER);
-		setBorder(BorderFactory.createEtchedBorder());
-		setBackground((Color) property.getValue());
-		setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-		addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseClicked(MouseEvent e) {
-//				JFo
-				Color newColor = JColorChooser.showDialog(FontEditor.this, "Choose Color",
-						getBackground());
-				if (newColor != null) {
-					property.setValue(newColor);
-					setBackground(newColor);
-				}
-			}
-		});
-	}
-	
-	@Override
-	public void setBackground(Color bg) {
-		if (bg.getRed() < 127 || bg.getBlue() < 127 || bg.getGreen() < 127) {
-			setForeground(Color.white);
-		} else {
-			setForeground(Color.black);
-		}
-		super.setBackground(bg);
-	}
-}
@@ -1,79 +0,0 @@
-package org.diylc.gui.editor;
-
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.swing.JComboBox;
-
-import org.diylc.common.PropertyWrapper;
-import org.diylc.core.measures.AbstractMeasure;
-import org.diylc.core.measures.Unit;
-
-import com.diyfever.gui.DoubleTextField;
-
-public class MeasureEditor extends Container {
-
-	private static final long serialVersionUID = 1L;
-
-	@SuppressWarnings("unchecked")
-	public MeasureEditor(final PropertyWrapper property) {
-		setLayout(new BorderLayout());
-		AbstractMeasure measure = ((AbstractMeasure) property.getValue());
-		DoubleTextField valueField = new DoubleTextField(measure.getValue());
-		valueField.addPropertyChangeListener(DoubleTextField.VALUE_PROPERTY,
-				new PropertyChangeListener() {
-
-					@Override
-					public void propertyChange(PropertyChangeEvent evt) {
-						try {
-							AbstractMeasure<?> newMeasure = (AbstractMeasure<?>) ((AbstractMeasure) property
-									.getValue()).clone();
-							newMeasure.setValue((Double) evt.getNewValue());
-							property.setValue(newMeasure);
-						} catch (CloneNotSupportedException ex) {
-						}
-					}
-				});
-		add(valueField, BorderLayout.CENTER);
-		try {
-			Method method = measure.getUnit().getClass().getMethod("values");
-			final JComboBox unitBox = new JComboBox((Object[]) method.invoke(measure.getUnit()));
-			unitBox.setSelectedItem(measure.getUnit());
-			unitBox.addActionListener(new ActionListener() {
-
-				@Override
-				public void actionPerformed(ActionEvent e) {
-					try {
-						AbstractMeasure<Enum<? extends Unit>> newMeasure = (AbstractMeasure<Enum<? extends Unit>>) ((AbstractMeasure) property
-								.getValue()).clone();
-						newMeasure.setUnit((Enum<? extends Unit>) unitBox.getSelectedItem());
-						property.setValue(newMeasure);
-					} catch (CloneNotSupportedException ex) {
-					}
-				}
-			});
-			add(unitBox, BorderLayout.EAST);
-		} catch (IllegalArgumentException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IllegalAccessException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (InvocationTargetException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (SecurityException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (NoSuchMethodException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-}
@@ -1,151 +0,0 @@
-package org.diylc.gui.editor;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.swing.BorderFactory;
-import javax.swing.JCheckBox;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-import org.apache.log4j.Logger;
-import org.diylc.common.PropertyWrapper;
-
-import com.diyfever.gui.ButtonDialog;
-
-public class PropertyEditorDialog extends ButtonDialog {
-
-	private static final Logger LOG = Logger.getLogger(PropertyEditorDialog.class);
-
-	private static final long serialVersionUID = 1L;
-
-	private static final String DEFAULT_BOX_TOOLTIP = "<html>If this box is checked application will use the current value as a<br>default when creating new components of the same type</html>";
-
-	private List<PropertyWrapper> properties;
-	private Set<PropertyWrapper> defaultedProperties;
-
-	public PropertyEditorDialog(JFrame owner, List<PropertyWrapper> properties, String title) {
-		super(owner, title, new String[] { ButtonDialog.OK, ButtonDialog.CANCEL });
-
-		LOG.debug("Creating property editor for: " + properties);
-
-		this.properties = properties;
-		this.defaultedProperties = new HashSet<PropertyWrapper>();
-
-		setMinimumSize(new Dimension(240, 40));
-
-		layoutGui();
-		setLocationRelativeTo(owner);
-		//
-		// setModal(true);
-		//
-		// JPanel holderPanel = new JPanel();
-		// holderPanel.setLayout(new BorderLayout());
-		// holderPanel.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
-		//
-		// holderPanel.add(createEditorFields(), BorderLayout.CENTER);
-		// holderPanel.add(createButtonPanel(), BorderLayout.SOUTH);
-		//
-		// setContentPane(holderPanel);
-		// 
-		//
-		// pack();
-		// setLocationRelativeTo(owner);
-	}
-
-	private JPanel createEditorFields() {
-		JPanel editorPanel = new JPanel(new GridBagLayout());
-		editorPanel.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8));
-
-		GridBagConstraints gbc = new GridBagConstraints();
-
-		gbc.gridy = 0;
-		gbc.insets = new Insets(2, 2, 2, 2);
-		gbc.anchor = GridBagConstraints.LINE_START;
-
-		for (PropertyWrapper property : properties) {
-			gbc.gridx = 0;
-			gbc.fill = GridBagConstraints.NONE;
-			gbc.weightx = 0;
-
-			editorPanel.add(new JLabel(property.getName() + ": "), gbc);
-
-			gbc.gridx = 1;
-			gbc.fill = GridBagConstraints.HORIZONTAL;
-			gbc.weightx = 1;
-
-			Component editor = FieldEditorFactory.createFieldEditor(property);
-			editor.addKeyListener(new KeyAdapter() {
-
-				@Override
-				public void keyPressed(KeyEvent e) {
-					if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-						getButton(OK).doClick();
-					} else if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
-						getButton(CANCEL).doClick();
-					}
-				}
-			});
-			editorPanel.add(editor, gbc);
-
-			if (property.isDefaultable()) {
-				gbc.gridx = 2;
-				gbc.fill = GridBagConstraints.NONE;
-				gbc.weightx = 0;
-
-				editorPanel.add(createDefaultCheckBox(property), gbc);
-			}
-
-			gbc.gridy++;
-		}
-
-		return editorPanel;
-	}
-
-	private JCheckBox createDefaultCheckBox(final PropertyWrapper property) {
-		final JCheckBox checkBox = new JCheckBox();
-		checkBox.setToolTipText(DEFAULT_BOX_TOOLTIP);
-		checkBox.addActionListener(new ActionListener() {
-
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				if (checkBox.isSelected()) {
-					defaultedProperties.add(property);
-				} else {
-					defaultedProperties.remove(property);
-				}
-			}
-		});
-		return checkBox;
-	}
-
-	public Set<PropertyWrapper> getDefaultedProperties() {
-		return defaultedProperties;
-	}
-
-	public static boolean showFor(JFrame owner, List<PropertyWrapper> properties, String title) {
-		PropertyEditorDialog editor = new PropertyEditorDialog(owner, properties, title);
-		editor.setVisible(true);
-		if (OK.equals(editor.getSelectedButtonCaption())) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	protected JComponent getMainComponent() {
-		return createEditorFields();
-	}
-}
@@ -1,42 +0,0 @@
-package org.diylc.gui.editor;
-
-import javax.swing.JTextField;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import org.diylc.common.PropertyWrapper;
-
-
-public class StringEditor extends JTextField {
-
-	private static final long serialVersionUID = 1L;
-	
-	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();
-			}
-		});
-	}
-
-	private void textChanged() {
-		property.setValue(getText());
-	}
-
-}
@@ -1,60 +0,0 @@
-package org.diylc.images;
-
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-
-/**
- * Loads image resources as Icons.
- * 
- * @author Branislav Stojkovic
- */
-public enum IconLoader {
-
-	Delete("delete.png"), Add("add.png"), FolderOut("folder_out.png"), Garbage("garbage.png"), DiskBlue(
-			"disk_blue.png"), SaveAs("save_as.png"), Exit("exit.png"), DocumentPlainYellow(
-			"document_plain_yellow.png"), PhotoScenery("photo_scenery.png"), LightBulbOn(
-			"lightbulb_on.png"), LightBulbOff("lightbulb_off.png"), NotebookAdd("notebook_add.png"), FormGreen(
-			"form_green.png"), Gears("gears.png"), About("about.png"), WindowColors(
-			"window_colors.png"), WindowGear("window_gear.png"), NavigateCheck("navigate_check.png"), Undo(
-			"undo.png"), Error("error.png"), Warning("warning.png"), ZoomSmall("zoom_small.png"), MoveSmall(
-			"move_small.png"), Print("print.png"), PDF("pdf.png"), Excel("excel.png"), CSV(
-			"csv.png"), HTML("html.png"), Image("image.png"), Cut("cut.png"), Copy("copy.png"), Paste(
-			"paste.png"), Selection("selection.png"), BOM("bom.png"), BlackBoard("blackboard.png"), IdCard(
-			"id_card.png"), IdCardAdd("id_card_add.png"), Chest("chest.png"), Upload("upload.png"), Wrench(
-			"wrench.png"), Group("group.png"), Ungroup("ungroup.png"), TraceMask("trace_mask.png"), Faq(
-			"faq.png"), Component("component.png"), Plugin("plugin.png"), Manual("manual.png"), Donate(
-			"donate.png"), Bug("bug.png"), IconLarge("icon_large.png"), IconMedium(
-			"icon_medium.png"), IconSmall("icon_small.png"), DocumentEdit("document_edit.png"), EditComponent(
-			"edit_component.png");
-
-	protected String name;
-
-	private IconLoader(String name) {
-		this.name = name;
-	}
-
-	public Icon getIcon() {
-		java.net.URL imgURL = getClass().getResource(name);
-		if (imgURL != null) {
-			return new ImageIcon(imgURL, name);
-		} else {
-			System.err.println("Couldn't find file: " + name);
-			return null;
-		}
-	}
-
-	public Image getImage() {
-		BufferedImage img = null;
-		try {
-			img = ImageIO.read(getClass().getResourceAsStream(name));
-		} catch (IOException e) {
-			System.err.println("Couldn't find file: " + name);
-		}
-		return img;
-	}
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bancika	a33923fdd7		2011-08-28 21:59:53 +00:00
bancika	5df467a254		2011-08-28 21:43:25 +00:00
bancika	7c4d82b28c	added recently used tab	2011-08-28 21:31:49 +00:00
bancika	6b7d1c4277	Renumber selected components by X or Y axis	2011-08-28 17:09:10 +00:00
bancika	a0ae53d53c	fixed method finding issues	2011-08-28 16:23:35 +00:00
bancika	bd79ef2817	Component edit dialog allows changing property values even when they are not the same	2011-08-28 16:10:38 +00:00
bancika	69e2296c23	show mutual properties across different component types	2011-08-27 20:36:37 +00:00
bancika	7d3a7c30ca	check file permission before using auto-save	2011-08-26 18:31:36 +00:00
bancika	bea19f326c	Auto-increment component names when copy-pasting	2011-08-26 18:18:53 +00:00
bancika	ba694add0c	allow 0 ohm resistors	2011-08-26 17:59:50 +00:00
bancika	f137a398dc	double click on a component button to select all of that type	2011-08-26 17:56:33 +00:00
bancika	15ac8ff2e9	increase PNG resolution	2011-08-07 19:23:50 +00:00
bancika	1213dcaeac	increase PNG resolution	2011-08-07 19:23:23 +00:00
bancika	2ebcd1fe96	ctrl+click should never clear selection	2011-08-07 19:07:19 +00:00
bancika	943d123ca9	outline mode improved auto-create for pads	2011-03-05 19:53:19 +00:00
bancika	79c29dc349		2011-03-03 21:05:47 +00:00
bancika	746b5fbe1a		2011-03-03 20:56:56 +00:00
bancika	365c195091	fix for drawing area and optimization	2011-03-02 18:14:39 +00:00
bancika	d89a500a5f	fix for drawing area and optimization	2011-03-02 18:13:34 +00:00
bancika	085732fb2c		2011-03-01 00:17:53 +00:00
bancika	eab7654883	Curved traces and wires can have 2, 3 and 4 control points	2011-02-28 00:09:13 +00:00
bancika	5488657984	config menu order	2011-02-27 23:38:11 +00:00
bancika	1a256716db	tube socket improvement	2011-02-27 23:30:05 +00:00
bancika	2b9c76e876	add file version info improve image serialization serialize points referenced in inches	2011-02-27 23:26:11 +00:00
bancika	5ae8a3477e	add file version info improve image serialization serialize points referenced in inches	2011-02-27 23:23:51 +00:00
bancika	209e970c00	catch drag end outside the area	2011-02-27 22:56:40 +00:00
bancika	ae96fb9eef	label has editable font	2011-02-27 21:58:57 +00:00
bancika	401f2b5e6f	label has editable font	2011-02-27 21:56:08 +00:00
bancika	e2da0b884d	vertical vero board	2011-02-27 20:48:18 +00:00
bancika	bcf390b888	switchable wheel zoom	2011-02-27 19:25:39 +00:00
bancika	144e8f0cfe	standing resistors, capacitors and diodes	2011-02-27 19:09:15 +00:00
bancika	84d744a80b	switchable wheel zoom	2011-02-27 18:34:33 +00:00
bancika	5430ca71a3	added 6 pin IC	2011-02-26 21:12:45 +00:00
bancika	4665d5d42e	added tube	2011-02-26 21:05:40 +00:00
bancika	275918d079	dnd collision improvement	2011-02-26 15:35:53 +00:00
bancika	a83093519f		2011-02-26 11:30:05 +00:00
bancika	2e14929eb1	send to back/front renamed	2011-02-26 11:28:40 +00:00
bancika	a0b7cdc30e	auto-save added	2011-02-26 11:26:49 +00:00
bancika	ab5c9ad143	code cleanup	2011-02-24 00:05:27 +00:00
bancika	4154225e71	auto-edit mode	2011-02-24 00:02:32 +00:00
bancika	3856af3e18	continuous component creation	2011-02-23 23:44:00 +00:00
bancika	80e7ebcbe9	auto-create pads	2011-02-23 20:42:40 +00:00
bancika	abdf02eac8	configurable snap to grid	2011-02-18 22:17:03 +00:00
bancika	746aadd8a2	improve bring to front/send to back	2011-02-18 13:17:56 +00:00
bancika	ac4496040f	improve bring to front/send to back	2011-02-18 13:16:58 +00:00
bancika	d810096030	relax logging	2011-02-16 19:10:57 +00:00
bancika	4727017be7	fix for default browser	2011-02-15 20:36:18 +00:00
bancika	b2dae15ee6	fix for default browser	2011-02-15 19:18:01 +00:00
bancika	56e112ff81	don't show grid on the thumbnail	2011-02-13 11:46:53 +00:00
bancika	6f5926e18e	removed unused theme members	2011-02-13 09:43:27 +00:00
bancika	b1f4773b10		2011-02-12 20:59:04 +00:00
bancika	e5d33fb80d	switchable sticky points added themes fixed ruler precision improved board rendering	2011-02-12 20:35:09 +00:00
bancika	b8545d27a1	line tracing fix	2011-02-06 20:38:21 +00:00
bancika	70ac30473b	use clip to improve performance	2011-02-06 18:27:50 +00:00
bancika	4774e97ba2	use clip to improve performance	2011-02-06 18:22:30 +00:00
bancika	de7378c722		2011-02-06 16:23:29 +00:00
bancika	e2b3ed1b0e	configurable render quality	2011-02-06 16:01:57 +00:00
bancika	99d38feb1c	improved speed	2011-02-03 23:42:07 +00:00
bancika	a561f6a3f9	tweaked boards	2011-02-03 23:10:23 +00:00
bancika	6eee1525ee	better scaling added marshall board and trimmer	2011-02-03 21:47:16 +00:00
bancika	02d38bed01	added eyelet/turret	2011-01-31 22:47:21 +00:00
bancika	b96bad2688	cleanup component area map on loading fixed lead area mapping bug	2011-01-31 22:05:05 +00:00
bancika	12ca93e2c9	fixed color code rounding	2011-01-31 21:49:01 +00:00
bancika	d9b9542883	configurable jumper color	2011-01-31 20:03:41 +00:00
bancika	9e04cff806	fixed lead alignment issue	2011-01-31 20:03:22 +00:00
bancika	16600328cc	copy paste doesn't work for some components	2011-01-31 19:32:18 +00:00
bancika	85d7d8a450	fixed lead alignment issue	2011-01-31 00:19:57 +00:00
bancika	f358b5d87b	fixed lead alignment issue	2011-01-31 00:18:39 +00:00
bancika	fa02280292	code cleanup	2011-01-30 23:45:25 +00:00
bancika	8ea53b6876	added capacitor symbol	2011-01-30 23:35:07 +00:00
bancika	4d6e994555	added resistor wattage and capacitor voltage	2011-01-30 21:50:24 +00:00
bancika	10581c51fb	added abstract class for leaded schematic symbols and resistor symbol	2011-01-30 21:33:08 +00:00
bancika	2cf6b573a7	added abstract class for leaded schematic symbols and resistor symbol	2011-01-30 21:31:42 +00:00
bancika	629fb5fff7		2011-01-30 18:46:38 +00:00
bancika	bc154608f4	allow property edit validation	2011-01-30 17:21:42 +00:00
bancika	a8cc661d09	better error handling when drawing	2011-01-30 14:10:38 +00:00
bancika	0b10f0bfe3	V1 file importer can recognize hookup wire and transistors	2011-01-30 12:02:29 +00:00
bancika	f435571aae	added keyboard shortcuts to some menu options	2011-01-30 11:43:54 +00:00
bancika	6bb248032f	added square pad	2011-01-30 11:32:55 +00:00
bancika	1b04023a93	added axial electrolytic	2011-01-29 22:38:46 +00:00
bancika	a32c8c4c8d	added axial electrolytic	2011-01-29 22:35:09 +00:00
bancika	4a89159c80	reset component selection when switching tabs	2011-01-29 22:00:33 +00:00
bancika	e5113e110e	reset component selection when switching tabs	2011-01-29 22:00:01 +00:00
bancika	c2051fcea2	improved electrolytic cap and resistor	2011-01-29 21:56:43 +00:00
bancika	a42592410e	improved electrolytic cap and resistor	2011-01-29 21:55:51 +00:00
bancika	22185a2d14	Potentiometer misdraw at 180 degrees	2011-01-29 18:31:25 +00:00
bancika	ac6aaf4e06	added LED	2011-01-29 13:47:00 +00:00
bancika	1be52c1dfa	improved zooming	2011-01-29 09:49:28 +00:00
bancika	328d09123b	removed sysout	2011-01-29 09:02:19 +00:00
bancika	04cd80b561	added TO220 transistor improved status text	2011-01-29 08:59:53 +00:00
bancika	3a419ba3bc	added transistor	2011-01-28 20:05:37 +00:00
bancika	971ceb7160	added template support	2011-01-28 19:21:35 +00:00
bancika	e0d8990954	added template support	2011-01-28 19:19:05 +00:00
bancika	a70ec95822	added template support	2011-01-28 19:13:49 +00:00
bancika	8aacf915e3	added template support	2011-01-28 18:57:21 +00:00
bancika	777d3f6deb	added template support	2011-01-28 18:55:40 +00:00
bancika	7de327b9bd	fixed point visibility on curved trace added option to hide color bands on the resistor	2011-01-28 17:48:46 +00:00
bancika	11b7756a59	added resistor color codes fixed double value parsing	2011-01-27 22:34:41 +00:00
bancika	b3351ef081	version info	2011-01-27 20:17:06 +00:00
bancika	b1dbf4f1d2	added action to right click menu	2011-01-27 19:52:59 +00:00
bancika	9161182924	added send to back/bring to front	2011-01-27 19:49:33 +00:00
bancika	94f769f785	added send to back/bring to front	2011-01-27 19:44:37 +00:00
bancika	6dffcd6349	added send to back/bring to front	2011-01-27 19:41:36 +00:00
bancika	6fad7a2427	fixed NPE and wrong undo/redo for ungroup	2011-01-27 19:21:34 +00:00
bancika	4ab6231590	refactored actions out added right click menu	2011-01-27 19:16:40 +00:00
bancika	5de6caf073	fixed bug with file name when creating new file	2011-01-26 23:57:09 +00:00
bancika	be7ab3412d	optimize image saving/loading	2011-01-26 23:50:48 +00:00
bancika	3dd4a4c5e3	added worker thread	2011-01-26 21:49:57 +00:00
bancika	fb6f973a6e	added worker thread	2011-01-26 21:48:57 +00:00
bancika	e8d45e1426	added image alpha	2011-01-26 21:06:51 +00:00
bancika	51c916cbb5	added image component	2011-01-26 20:09:15 +00:00
bancika	a8ba97dc77	revived cut action	2011-01-26 19:45:44 +00:00
bancika	103860a42b	added update file	2011-01-26 19:04:51 +00:00
bancika	126d629cdc	refactored awt.transferable out of the presenter fixed copy/paste between instances	2011-01-26 18:44:40 +00:00
bancika	f28dda37a6	optimize refresh when creating new component	2011-01-25 22:48:51 +00:00
bancika	3a7fdeb792	allow curve shape control points to overlap	2011-01-25 21:38:37 +00:00
bancika	13e0cec8ad	better logging	2011-01-25 19:13:07 +00:00
bancika	df33d7fd6e	improved IC	2011-01-24 21:28:53 +00:00
bancika	2f672bf2b4	round corners	2011-01-24 21:02:33 +00:00
bancika	e84f77a7ca	pulled out scripting because of locale issues	2011-01-24 20:58:18 +00:00
bancika	efeaf92ccb	ability to center label	2011-01-24 20:12:51 +00:00
bancika	8927b2c326	tweak control point visibility	2011-01-24 20:00:11 +00:00
bancika	3476d3a608	import text component	2011-01-24 19:49:04 +00:00
bancika	6c052403d3	import electrolytics	2011-01-24 19:40:22 +00:00
bancika	1322f48918	removed unused ode	2011-01-24 19:23:03 +00:00
bancika	62cbe4826f	improved stick mechanism when more than one point is stuck	2011-01-24 19:13:09 +00:00
bancika	2aa8aed874	improved importer for v1	2011-01-24 18:54:04 +00:00
bancika	6d361283a1	Configurable wheel zoom	2011-01-24 18:21:57 +00:00
bancika	b33b6b6495	show selection size on demand removed scroll buttons in toolbox	2011-01-24 18:17:13 +00:00
bancika	fb5baf9571	added transparency to pot	2011-01-23 23:54:24 +00:00
bancika	2d6927993e	fixed creation bug with d&d	2011-01-23 23:47:35 +00:00
bancika	5806d17e56	added v1 conversion warnings	2011-01-23 23:25:20 +00:00
bancika	fcc001cb98	reduced number of base layers	2011-01-23 23:18:45 +00:00
bancika	1de1b9d6ec	refactored some swing out of the core parts	2011-01-23 22:57:52 +00:00
bancika	726f17aa7f	refactor some swing references	2011-01-23 19:58:47 +00:00
bancika	72ae295a09	fixed NPE	2011-01-23 18:51:04 +00:00