2026-11-10 01:02:08 +10:00 · 2011-03-03 21:06:11 +00:00 · 2011-03-03 21:04:03 +00:00
434 changed files with 1871 additions and 8095 deletions
@@ -7,11 +7,11 @@
 	<classpathentry kind="lib" path="lib/xstream-1.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.7.jar"/>
 	<classpathentry kind="lib" path="lib/iText-2.1.7.jar"/>
+	<classpathentry kind="lib" path="lib/cloning-1.5.jar"/>
+	<classpathentry kind="lib" path="lib/objenesis-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/jettison-1.0.1.jar"/>
 	<classpathentry kind="lib" path="lib/poi-3.5-FINAL-20090928.jar"/>
-	<classpathentry kind="lib" path="library/main.jar" sourcepath="/diylc-library"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/diylc-core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/app-framework"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/swing-framework"/>
+	<classpathentry kind="lib" path="library/main.jar"/>
+	<classpathentry kind="lib" path="lib/bancika-gui-framework.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>diylc-core</name>
+	<name>DIYLC</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -2,7 +2,7 @@
 <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-swing/src/org/diylc/DIYLCStarter.java"/>
+<listEntry value="/DIYLC/src/org/diylc/DIYLCStarter.java"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -10,6 +10,6 @@
 <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-swing"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m -Dorg.diylc.scriptRun=true -Ddorg.diylc.debugComponentAreas=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="DIYLC"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms256m -Xmx512m"/>
 </launchConfiguration>
@@ -1,4 +1,4 @@
-<project name="diylc-swing" basedir="." default="jar">
+<project name="diylc" basedir="." default="jar">
 	<property name="src.dir" value="src" />

 	<property name="lib.dir" value="${basedir}/lib" />
@@ -57,7 +57,7 @@
 	</manifestclasspath>

 	<target name="jar" depends="clean, lib.copy, resource.copy, compile">
-		<jar destfile="${jar.dir}/diylc.jar" basedir="${classes.dir}">
+		<jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
 				<attribute name="Main-Class" value="${main.class}" />
@@ -0,0 +1,76 @@
+<map>
+  <entry>
+    <string>default.org.diylc.components.passive.TrimmerPotentiometer:Type</string>
+    <org.diylc.components.passive.TrimmerPotentiometer_-TrimmerType>FLAT_LARGE</org.diylc.components.passive.TrimmerPotentiometer_-TrimmerType>
+  </entry>
+  <entry>
+    <string>lastPath</string>
+    <string>C:\Documents and Settings\Branislav Stojkovic\Desktop</string>
+  </entry>
+  <entry>
+    <string>abnormalExit</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>stickyPoints</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>theme</string>
+    <org.diylc.core.Theme>
+      <name>Light</name>
+      <bgColor>
+        <red>255</red>
+        <green>255</green>
+        <blue>255</blue>
+        <alpha>255</alpha>
+      </bgColor>
+      <gridColor>
+        <red>240</red>
+        <green>240</green>
+        <blue>240</blue>
+        <alpha>240</alpha>
+      </gridColor>
+    </org.diylc.core.Theme>
+  </entry>
+  <entry>
+    <string>antiAliasing</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>snapToGrid</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>hiQualityRender</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>exportGrid</string>
+    <boolean>true</boolean>
+  </entry>
+  <entry>
+    <string>autoEdit</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>wheelZoom</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>default.org.diylc.components.misc.Label:Font Bold</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>autoCreatePads</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>continuousCreation</string>
+    <boolean>false</boolean>
+  </entry>
+  <entry>
+    <string>showTemplatesAtStartup</string>
+    <boolean>false</boolean>
+  </entry>
+</map>
@@ -0,0 +1,76 @@
+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.presenter.Presenter;
+import org.diylc.swing.gui.MainFrame;
+import org.diylc.swing.gui.TemplateDialog;
+
+import com.diyfever.gui.miscutils.ConfigurationManager;
+import com.diyfever.gui.miscutils.PropertyInjector;
+
+/**
+ * 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.debug("Java version: " + System.getProperty("java.runtime.version") + " by " + System.getProperty("java.vm.vendor"));
+
+		LOG.info("Starting DIYLC with working directory " + System.getProperty("user.dir"));
+
+		try {
+			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);
+
+		boolean showTemplates = ConfigurationManager.getInstance().readBoolean(
+				TemplateDialog.SHOW_TEMPLATES_KEY, true);
+		if (showTemplates) {
+			TemplateDialog templateDialog = new TemplateDialog(mainFrame, mainFrame.getPresenter());
+			if (!templateDialog.getFiles().isEmpty()) {
+				templateDialog.setVisible(true);
+			}
+		}
+
+		url = DIYLCStarter.class.getResource("/config.properties");
+		properties = new Properties();
+		try {
+			LOG.info("Injecting default properties.");
+			properties.load(new FileInputStream("config.properties"));
+			PropertyInjector.injectProperties(properties);
+		} catch (Exception e) {
+			LOG.error("Could not read config.properties file", e);
+		}
+	}
+}
@@ -4,7 +4,6 @@ import javax.swing.Icon;

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

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

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

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

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

 	@Override
 	public String toString() {
@@ -32,9 +32,5 @@ public enum DrawOption {
 	/**
 	 * Anti-aliasing is used when drawing.
 	 */
-	ANTIALIASING,
-	/**
-	 * Draw components in outline mode.
-	 */
-	OUTLINE_MODE;
+	ANTIALIASING;
 }
@@ -1,6 +1,6 @@
 package org.diylc.common;

-import org.diylc.appframework.simplemq.IMessageListener;
+import com.diyfever.gui.simplemq.IMessageListener;

 /**
 * Interface for plug-ins.
@@ -9,12 +9,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;

-import org.diylc.appframework.simplemq.IMessageListener;
-import org.diylc.appframework.simplemq.MessageDispatcher;
-import org.diylc.appframework.update.VersionNumber;
 import org.diylc.core.IDIYComponent;
 import org.diylc.core.Project;
 import org.diylc.core.Theme;
+import org.diylc.swing.plugins.edit.ComponentTransferable;
+
+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
@@ -28,7 +30,7 @@ import org.diylc.core.Theme;
 * @see IMessageListener
 * @see EventType
 */
-public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyProcessor {
+public interface IPlugInPort {

 	public static final String ANTI_ALIASING_KEY = "antiAliasing";
 	public static final String HI_QUALITY_RENDER_KEY = "hiQualityRender";
@@ -41,20 +43,6 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	public static final String AUTO_EDIT_KEY = "autoEdit";
 	public static final String ABNORMAL_EXIT_KEY = "abnormalExit";
 	public static final String WHEEL_ZOOM_KEY = "wheelZoom";
-	public static final String OUTLINE_KEY = "outline";
-	public static final String THEME_KEY = "theme";
-	public static final String RECENT_COMPONENTS_KEY = "recentComponents";
-
-	public static final int DND_TOGGLE_STICKY = 0x1;
-	public static final int DND_TOGGLE_SNAP = 0x40000000;
-	
-    /**
-     * Mouse button constants.
-     */ 
-    public static final int NOBUTTON = 0;
-    public static final int BUTTON1 = 1;
-    public static final int BUTTON2 = 2;
-    public static final int BUTTON3 = 3;

 	/**
 	 * Returns size of the canvas that takes project dimensions into account as
@@ -110,7 +98,7 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	 * Saves the current project into the specified file.
 	 * 
 	 * @param fileName
-	 * @param isBackup
+	 * @param isBackup 
 	 */
 	void saveProjectToFile(String fileName, boolean isBackup);

@@ -170,6 +158,74 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	 */
 	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
+	 * @param clickCount
+	 */
+	void mouseClicked(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown, int clickCount);
+
+	/**
+	 * Notifies the presenter that mouse is moved.
+	 * 
+	 * Note: point coordinates are display based, i.e. scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @param ctrlDown
+	 * @param shiftDown
+	 * @param altDown
+	 */
+	void mouseMoved(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
+
+	/**
+	 * Returns the current {@link ComponentTransferable}.
+	 * 
+	 * @return
+	 */
+	List<IDIYComponent<?>> getSelectedComponents();
+
+	/**
+	 * Selects all components in the project.
+	 */
+	void selectAll();
+
+	/**
+	 * Notification that drag has been started from the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @param ctrlDown
+	 * @param shiftDown
+	 * @param altDown
+	 */
+	void dragStarted(Point point, boolean ctrlDown, boolean shiftDown, boolean altDown);
+
+	/**
+	 * Checks if it's possible to drop over the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 * @return
+	 */
+	boolean dragOver(Point point);
+
+	/**
+	 * Notification that drag has been ended in the specified point.
+	 * 
+	 * Note: point coordinates are scaled for zoom factor.
+	 * 
+	 * @param point
+	 */
+	void dragEnded(Point point);
+
 	/**
 	 * Returns current version number.
 	 * 
@@ -218,8 +274,9 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	 */
 	List<PropertyWrapper> getMutualSelectionProperties();

+	
 	void editSelection();
-
+	
 	/**
 	 * @return a list of editable properties of the current project.
 	 */
@@ -231,11 +288,6 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	 * @param properties
 	 */
 	void applyPropertiesToProject(List<PropertyWrapper> properties);
-	
-	/**
-	 * Gets the current new component slot.
-	 */
-	ComponentType getNewComponentTypeSlot();

 	/**
 	 * Sets the new component slot. Specified component type will be used to
@@ -301,11 +353,4 @@ public interface IPlugInPort extends ISelectionProcessor, IMouseProcessor, IKeyP
 	 * @param theme
 	 */
 	void setSelectedTheme(Theme theme);
-
-	/**
-	 * Renumbers all the selected components.
-	 * 
-	 * @param xAxisFirst
-	 */
-	void renumberSelectedComponents(boolean xAxisFirst);
 }
@@ -1,6 +1,7 @@
 package org.diylc.common;

 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;

 import org.diylc.core.IPropertyValidator;

@@ -15,15 +16,13 @@ public class PropertyWrapper implements Cloneable {
 	private String name;
 	private Class<?> type;
 	private Object value;
-	private String setter;
-	private String getter;
+	private Method setter;
+	private Method getter;
 	private boolean defaultable;
 	private IPropertyValidator validator;
-	private boolean unique = true;
-	private boolean changed = false;

-	public PropertyWrapper(String name, Class<?> type, String getter,
-			String setter, boolean defaultable, IPropertyValidator validator) {
+	public PropertyWrapper(String name, Class<?> type, Method getter, Method setter,
+			boolean defaultable, IPropertyValidator validator) {
 		super();
 		this.name = name;
 		this.type = type;
@@ -33,10 +32,9 @@ public class PropertyWrapper implements Cloneable {
 		this.validator = validator;
 	}

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

 	// public void readUniqueFrom(IDIYComponent component)
@@ -48,10 +46,9 @@ public class PropertyWrapper implements Cloneable {
 	// }
 	// }

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

 	public String getName() {
@@ -78,22 +75,6 @@ public class PropertyWrapper implements Cloneable {
 		return validator;
 	}

-	public boolean isUnique() {
-		return unique;
-	}
-
-	public void setUnique(boolean unique) {
-		this.unique = unique;
-	}
-
-	public boolean isChanged() {
-		return changed;
-	}
-
-	public void setChanged(boolean changed) {
-		this.changed = changed;
-	}
-
 	// @Override
 	// public Object clone() throws CloneNotSupportedException {
 	// // Try to invoke clone method on value if possible.
@@ -104,15 +85,6 @@ public class PropertyWrapper implements Cloneable {
 	// }
 	// return new Property(name, type, value);
 	// }
-	@Override
-	public Object clone() throws CloneNotSupportedException {
-		PropertyWrapper clone = new PropertyWrapper(this.name, this.type, this.getter,
-				this.setter, this.defaultable, this.validator);
-		clone.value = this.value;
-		clone.changed = this.changed;
-		clone.unique = this.unique;
-		return clone;
-	}

 	@Override
 	public int hashCode() {
@@ -123,6 +95,7 @@ public class PropertyWrapper implements Cloneable {
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		result = prime * result + ((setter == null) ? 0 : setter.hashCode());
 		result = prime * result + ((type == null) ? 0 : type.hashCode());
+		result = prime * result + ((value == null) ? 0 : value.hashCode());
 		return result;
 	}

@@ -157,6 +130,11 @@ public class PropertyWrapper implements Cloneable {
 				return false;
 		} else if (!type.equals(other.type))
 			return false;
+		if (value == null) {
+			if (other.value != null)
+				return false;
+		} else if (!value.equals(other.value))
+			return false;
 		return true;
 	}

@@ -0,0 +1,73 @@
+package org.diylc.components;
+
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.Shape;
+
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.annotations.EditableProperty;
+
+/**
+ * Abstract implementation of {@link IDIYComponent} that contains component name
+ * and toString.
+ * 
+ * @author Branislav Stojkovic
+ * 
+ * @param <T>
+ */
+public abstract class AbstractComponent<T> implements IDIYComponent<T> {
+
+	private static final long serialVersionUID = 1L;
+
+	protected String name = "";
+
+	public static Color SELECTION_COLOR = Color.red;
+	public static Color LABEL_COLOR = Color.black;
+	public static Color LABEL_COLOR_SELECTED = Color.red;
+	public static Font LABEL_FONT = new Font("Tahoma", Font.PLAIN, 14);
+
+	@EditableProperty(defaultable = false)
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public boolean canControlPointOverlap(int index) {
+		return false;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
+
+	/**
+	 * Returns the closest odd number, i.e. x when x is odd, or x + 1 when x is
+	 * even.
+	 * 
+	 * @param x
+	 * @return
+	 */
+	protected int getClosestOdd(double x) {
+		return ((int) x / 2) * 2 + 1;
+	}
+
+	/**
+	 * @param clip
+	 * @return true if none of the control points lie in the clip rectangle.
+	 */
+	protected boolean checkPointsClipped(Shape clip) {
+		for (int i = 0; i < getControlPointCount(); i++) {
+			if (clip.contains(getControlPoint(i))) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
@@ -63,8 +63,8 @@ public abstract class AbstractCurvedComponent<T> extends AbstractTransparentComp
 	}

 	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
+	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
+			IDrawingObserver drawingObserver) {
 		if (checkPointsClipped(g2d.getClip())) {
 			return;
 		}
@@ -12,19 +12,15 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.Ellipse2D;
 import java.awt.geom.Rectangle2D;

-import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.common.Display;
-import org.diylc.common.IPlugInPort;
 import org.diylc.common.ObjectCache;
 import org.diylc.core.ComponentState;
 import org.diylc.core.IDrawingObserver;
 import org.diylc.core.Project;
-import org.diylc.core.Theme;
 import org.diylc.core.VisibilityPolicy;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
-import org.diylc.utils.Constants;

 /**
 * Base class for all leaded components such as resistors or capacitors. Has two
@@ -49,7 +45,7 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 	protected Color bodyColor = Color.white;
 	protected Color borderColor = Color.black;
 	protected Color labelColor = LABEL_COLOR;
-	protected Display display = Display.VALUE;
+	protected Display display = Display.NAME;

 	protected AbstractLeadedComponent() {
 		super();
@@ -64,8 +60,8 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 	}

 	@Override
-	public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode,
-			Project project, IDrawingObserver drawingObserver) {
+	public void draw(Graphics2D g2d, ComponentState componentState, Project project,
+			IDrawingObserver drawingObserver) {
 		double distance = points[0].distance(points[1]);
 		Shape shape = getBodyShape();
 		// If there's no body, just draw the line connecting the ending points.
@@ -78,32 +74,13 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 			int width = getClosestOdd(this.width.convertToPixels());
 			Shape body = new Ellipse2D.Double(points[0].x - width / 2, points[0].y - width / 2,
 					width, width);
-			Composite oldComposite = g2d.getComposite();
-			if (alpha < MAX_ALPHA) {
-				g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha
-						/ MAX_ALPHA));
-			}
-			g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
+			g2d.setColor(bodyColor);
 			g2d.fill(body);
-			g2d.setComposite(oldComposite);
-			Color finalBorderColor;
-			if (outlineMode) {
-				Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
-						IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
-				finalBorderColor = componentState == ComponentState.SELECTED
-						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : theme
-						.getOutlineColor();
-			} else {
-				finalBorderColor = componentState == ComponentState.SELECTED
-						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR
-						: borderColor;
-			}
-
+			Color finalBorderColor = componentState == ComponentState.SELECTED
+					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : borderColor;
 			g2d.setColor(finalBorderColor);
 			g2d.draw(body);
-			if (!outlineMode) {
-				drawLead(g2d, componentState);
-			}
+			drawLead(g2d, componentState);
 		} else {
 			// Normal mode with component body in the center and two lead parts.
 			Rectangle shapeRect = shape.getBounds();
@@ -122,91 +99,60 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 			}
 			if (bodyColor != null) {
 				if (bodyColor != null) {
-					g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
+					g2d.setColor(bodyColor);
 					g2d.fill(shape);
 				}
 			}
-			decorateComponentBody(g2d, outlineMode);
+			decorateComponentBody(g2d);
 			g2d.setComposite(oldComposite);
 			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
-			Color finalBorderColor;
-			if (outlineMode) {
-				Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
-						IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
-				finalBorderColor = componentState == ComponentState.SELECTED
-						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : theme
-						.getOutlineColor();
-			} else {
-				finalBorderColor = componentState == ComponentState.SELECTED
-						|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR
-						: borderColor;
-			}
+			Color finalBorderColor = componentState == ComponentState.SELECTED
+					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : borderColor;
 			g2d.setColor(finalBorderColor);
 			g2d.draw(shape);
-			
-			// Go back to the original transformation to draw leads.
-			if (!outlineMode) {
-				AffineTransform textTransform = g2d.getTransform();
-				g2d.setTransform(oldTransform);
-				if (length.convertToPixels() > points[0].distance(points[1])) {
-					g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f));
-				}
-				int leadThickness = getClosestOdd(getLeadThickness());
-				double leadLength = (distance - shapeRect.width) / 2 - leadThickness / 2;
-				g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
-				Color leadColor = shouldShadeLeads() ? getLeadColor(componentState).darker()
-						: getLeadColor(componentState);
-				g2d.setColor(leadColor);
-				int endX = (int) (points[0].x + Math.cos(theta) * leadLength);
-				int endY = (int) Math.round(points[0].y + Math.sin(theta) * leadLength);
-				g2d.drawLine(points[0].x, points[0].y, endX, endY);
-				endX = (int) (points[1].x + Math.cos(theta - Math.PI) * leadLength);
-				endY = (int) Math.round(points[1].y + Math.sin(theta - Math.PI) * leadLength);
-				g2d.drawLine(points[1].x, points[1].y, endX, endY);
-				if (shouldShadeLeads()) {
-					g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
-					leadColor = getLeadColor(componentState);
-					g2d.setColor(leadColor);
-					g2d.drawLine(points[0].x, points[0].y, (int) (points[0].x + Math.cos(theta)
-							* leadLength), (int) (points[0].y + Math.sin(theta) * leadLength));
-					g2d.drawLine(points[1].x, points[1].y, (int) (points[1].x + Math.cos(theta
-							- Math.PI)
-							* leadLength), (int) (points[1].y + Math.sin(theta - Math.PI)
-							* leadLength));
-				}
-				g2d.setComposite(oldComposite);
-				g2d.setTransform(textTransform);
-			}
-			
 			// Draw label.
 			g2d.setFont(LABEL_FONT);
-			Color finalLabelColor;
-			if (outlineMode) {
-				Theme theme = (Theme) ConfigurationManager.getInstance().readObject(
-						IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
-				finalLabelColor = componentState == ComponentState.SELECTED
-						|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED : theme
-						.getOutlineColor();
-			} else {
-				finalLabelColor = componentState == ComponentState.SELECTED
-						|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
-						: labelColor;
-			}
-			g2d.setColor(finalLabelColor);
+			Color finalLabelFont = componentState == ComponentState.SELECTED
+					|| componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+					: labelColor;
+			g2d.setColor(finalLabelFont);
 			FontMetrics fontMetrics = g2d.getFontMetrics();
 			String label = display == Display.NAME ? getName() : getValue().toString();
-			Rectangle2D textRect = fontMetrics.getStringBounds(label, g2d);
-			// Don't offset in outline mode.
-			int offset = outlineMode ? 0 : getLabelOffset((int) shapeRect.getWidth(), (int) textRect.getWidth());
 			// Adjust label angle if needed to make sure that it's readable.
 			if ((theta >= Math.PI / 2 && theta <= Math.PI)
 					|| (theta < -Math.PI / 2 && theta > -Math.PI)) {
 				g2d.rotate(Math.PI, shapeRect.width / 2, shapeRect.height / 2);
-				offset = -offset;
-			}			
-			g2d.drawString(label, (int) (shapeRect.width - textRect.getWidth()) / 2 + offset,
+			}
+			Rectangle2D textRect = fontMetrics.getStringBounds(label, g2d);
+			g2d.drawString(label, (int) (shapeRect.width - textRect.getWidth()) / 2,
 					calculateLabelYCoordinate(shapeRect, textRect, fontMetrics));
+
+			// Go back to the original transformation to draw leads.
 			g2d.setTransform(oldTransform);
+			int leadThickness = getClosestOdd(getLeadThickness());
+			double leadLength = (distance - shapeRect.width) / 2 - leadThickness / 2;
+			g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
+			Color leadColor = shouldShadeLeads() ? getLeadColor(componentState).darker()
+					: getLeadColor(componentState);
+			g2d.setColor(leadColor);
+			int endX = (int) (points[0].x + Math.cos(theta) * leadLength);
+			int endY = (int) Math.round(points[0].y + Math.sin(theta) * leadLength);
+			g2d.drawLine(points[0].x, points[0].y, endX, endY);
+			endX = (int) (points[1].x + Math.cos(theta - Math.PI) * leadLength);
+			endY = (int) Math.round(points[1].y + Math.sin(theta - Math.PI) * leadLength);
+			g2d.drawLine(points[1].x, points[1].y, endX, endY);
+			if (shouldShadeLeads()) {
+				g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
+				leadColor = getLeadColor(componentState);
+				g2d.setColor(leadColor);
+				g2d.drawLine(points[0].x, points[0].y, (int) (points[0].x + Math.cos(theta)
+						* leadLength), (int) (points[0].y + Math.sin(theta) * leadLength));
+				g2d
+						.drawLine(points[1].x, points[1].y, (int) (points[1].x + Math.cos(theta
+								- Math.PI)
+								* leadLength), (int) (points[1].y + Math.sin(theta - Math.PI)
+								* leadLength));
+			}
 		}
 	}

@@ -224,7 +170,7 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 		}
 	}

-	protected void decorateComponentBody(Graphics2D g2d, boolean outlineMode) {
+	protected void decorateComponentBody(Graphics2D g2d) {
 		// Do nothing.
 	}

@@ -240,10 +186,6 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
 	protected boolean supportsStandingMode() {
 		return false;
 	}
-	
-	protected int getLabelOffset(int bodyWidth, int labelWidth) {
-		return 0;
-	}

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

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

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

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

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

-import org.diylc.appframework.update.VersionNumber;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.PositiveMeasureValidator;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;

+import com.diyfever.gui.update.VersionNumber;
+
 /**
 * Entity class that defines a project. Contains project properties and a
 * collection of components.This class is serialized to file. Some filed getters
@@ -203,8 +202,8 @@ public class Project implements Serializable {
 		public void validate(Object value) throws ValidationException {
 			super.validate(value);
 			Size size = (Size) value;
-			if (size.compareTo(new Size(0.5d, SizeUnit.mm)) < 0) {
-				throw new ValidationException("must be at least 0.5mm");
+			if (size.compareTo(new Size(1d, SizeUnit.mm)) < 0) {
+				throw new ValidationException("must be greater than 1mm");
 			}
 			if (size.compareTo(new Size(1d, SizeUnit.in)) > 0) {
 				throw new ValidationException("must be less than 1in");
@@ -212,37 +211,15 @@ public class Project implements Serializable {
 		}
 	}

-	@Override
-	public Project clone()  {
-		Project project = new Project();
-		project.setTitle(this.getTitle());
-		project.setAuthor(this.getAuthor());
-		project.setDescription(this.getDescription());
-		project.setFileVersion(this.getFileVersion());
-		project.setGridSpacing(this.getGridSpacing());
-		project.setHeight(this.getHeight());
-		project.setWidth(this.getWidth());
-		project.getLockedLayers().addAll(this.getLockedLayers());		
-		
-		Map<IDIYComponent<?>, IDIYComponent<?>> cloneMap = new HashMap<IDIYComponent<?>, IDIYComponent<?>>();
-		
-		for (IDIYComponent<?> component : this.components) {
-			try {
-				IDIYComponent<?> clone = component.clone();
-				project.getComponents().add(clone);
-				cloneMap.put(component, clone);
-			} catch (CloneNotSupportedException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		
-		for (Set<IDIYComponent<?>> group : this.groups) {
-			Set<IDIYComponent<?>> cloneGroup = new HashSet<IDIYComponent<?>>();
-			for (IDIYComponent<?> component : group) {
-				cloneGroup.add(cloneMap.get(component));
-			}
-			project.groups.add(cloneGroup);
-		}
-		return project;
-	}
+	// @Override
+	// public Project clone() throws CloneNotSupportedException {
+	// List<IDIYComponent> clonedComponents = new
+	// ArrayList<IDIYComponent>();
+	// for (IDIYComponent component : components) {
+	// clonedComponents.add(component.clone());
+	// }
+	// Project project = new Project(title, author, description,
+	// width.clone(), height.clone(), clonedComponents);
+	// return project;
+	// }
 }
@@ -10,14 +10,12 @@ public class Theme implements Serializable {
 	private String name;
 	private Color bgColor;
 	private Color gridColor;
-	private Color outlineColor;

-	public Theme(String name, Color bgColor, Color gridColor, Color outlineColor) {
+	public Theme(String name, Color bgColor, Color gridColor) {
 		super();
 		this.name = name;
 		this.bgColor = bgColor;
 		this.gridColor = gridColor;
-		this.outlineColor = outlineColor;
 	}

 	public String getName() {
@@ -32,17 +30,12 @@ public class Theme implements Serializable {
 		return gridColor;
 	}

-	public Color getOutlineColor() {
-		return outlineColor;
-	}
-
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + ((bgColor == null) ? 0 : bgColor.hashCode());
 		result = prime * result + ((gridColor == null) ? 0 : gridColor.hashCode());
-		result = prime * result + ((outlineColor == null) ? 0 : outlineColor.hashCode());
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
 		return result;
 	}
@@ -66,11 +59,6 @@ public class Theme implements Serializable {
 				return false;
 		} else if (!gridColor.equals(other.gridColor))
 			return false;
-		if (outlineColor == null) {
-			if (other.outlineColor != null)
-				return false;
-		} else if (!outlineColor.equals(other.outlineColor))
-			return false;
 		if (name == null) {
 			if (other.name != null)
 				return false;
@@ -53,22 +53,10 @@ public @interface ComponentDescriptor {
 	 */
 	double zOrder();

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

-	/**
-	 * @return controls what should be shown the BOM
-	 */
-	BomPolicy bomPolicy() default BomPolicy.SHOW_ALL_NAMES;
-
 }
@@ -10,7 +10,7 @@ public class PositiveMeasureValidator implements IPropertyValidator {
 	public void validate(Object value) throws ValidationException {
 		if (value instanceof AbstractMeasure) {
 			AbstractMeasure measure = (AbstractMeasure) value;
-			if (measure.getValue() < 0) {
+			if (measure.getValue() <= 0) {
 				throw new ValidationException("must be greater than zero.");
 			}
 		} else {
@@ -4,13 +4,6 @@ import java.io.Serializable;
 import java.text.DecimalFormat;
 import java.text.Format;

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

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

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

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

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

 	public T getUnit() {
 		return unit;
 	}

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

 	@Override
 	public int hashCode() {
@@ -83,6 +76,6 @@ public class AbstractMeasure<T extends Enum<? extends Unit>> implements Serializ

 	@Override
 	public String toString() {
-		return format.format(value) + unit;
+		return format.format(value) + " " + unit;
 	}
 }
@@ -4,10 +4,10 @@ public class Capacitance extends AbstractMeasure<CapacitanceUnit> {

 	private static final long serialVersionUID = 1L;

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

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

 	private static final long serialVersionUID = 1L;

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

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

 public enum ResistanceUnit implements Unit {

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

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

 	private static final long serialVersionUID = 1L;

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

 	public Size(Double value, SizeUnit unit) {
 		super(value, unit);
@@ -31,7 +31,7 @@ public enum IconLoader {
 			"donate.png"), Bug("bug.png"), IconLarge("icon_large.png"), IconMedium(
 			"icon_medium.png"), IconSmall("icon_small.png"), DocumentEdit("document_edit.png"), EditComponent(
 			"edit_component.png"), Size("size.png"), Front("front.png"), Back("back.png"), Pens(
-			"pens.png"), Sort("sort.png"), ElementsSelection("elements_selection.png");
+			"pens.png");

 	protected String name;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bancika	ee81a0609b		2011-03-03 21:06:11 +00:00
bancika	08f068cb4c		2011-03-03 21:04:03 +00:00