doc

diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/com/diyfever/diylc/components/AbstractLeadedComponentInstance.java

@@ -33,8 +33,18 @@ public abstract class AbstractLeadedComponentInstance implements IComponentInsta
 		this.height = getDefaultHeight();
 	}
 
+	/**
+	 * Returns the default component width.
+	 * 
+	 * @return
+	 */
 	protected abstract Size getDefaultWidth();
 
+	/**
+	 * Returns the default component height.
+	 * 
+	 * @return
+	 */
 	protected abstract Size getDefaultHeight();
 
 	@BomName
@@ -91,4 +101,29 @@ public abstract class AbstractLeadedComponentInstance implements IComponentInsta
 	public void setHeight(Size height) {
 		this.height = height;
 	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		return result;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		AbstractLeadedComponentInstance other = (AbstractLeadedComponentInstance) obj;
+		if (name == null) {
+			if (other.name != null)
+				return false;
+		} else if (!name.equals(other.name))
+			return false;
+		return true;
+	}
 }

diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/com/diyfever/diylc/components/ResistorInstance.java

@@ -3,84 +3,30 @@ package com.diyfever.diylc.components;
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Graphics2D;
-import java.awt.Point;
 
 import com.diyfever.diylc.model.ComponentState;
-import com.diyfever.diylc.model.IComponentInstance;
-import com.diyfever.diylc.model.VisibilityPolicy;
-import com.diyfever.diylc.model.annotations.BomName;
-import com.diyfever.diylc.model.annotations.BomValue;
-import com.diyfever.diylc.model.annotations.ControlPoint;
 import com.diyfever.diylc.model.annotations.EditableProperty;
-import com.diyfever.diylc.model.measures.Capacitance;
-import com.diyfever.diylc.model.measures.CapacitanceUnit;
 import com.diyfever.diylc.model.measures.Resistance;
 import com.diyfever.diylc.model.measures.ResistanceUnit;
 import com.diyfever.diylc.model.measures.Size;
 import com.diyfever.diylc.model.measures.SizeUnit;
-import com.diyfever.diylc.utils.Constants;
 
 public class ResistorInstance extends AbstractLeadedComponentInstance {
 
 	private static final long serialVersionUID = 1L;
 
-	private String testField = "Hello World";
-	private Capacitance c = new Capacitance(100d, CapacitanceUnit.uF);
 	private Resistance r = new Resistance(123d, ResistanceUnit.K);
-	private Size s = new Size(1d, SizeUnit.cm);
 	private Color color = Color.green;
 
 	public ResistorInstance() {
 		super();
 	}
 
-	@EditableProperty(name = "Test Field")
-	public String getTestField() {
-		return testField;
-	}
-
-	public void setTestField(String testField) {
-		this.testField = testField;
-	}
-
-	@BomValue
-	@EditableProperty(defaultable = true)
-	public Capacitance getC() {
-		return c;
-	}
-
-	public void setC(Capacitance c) {
-		this.c = c;
-	}
-
-	@EditableProperty(defaultable = true)
-	public Color getColor() {
-		return color;
-	}
-
-	public void setColor(Color color) {
-		this.color = color;
-	}
-
 	@EditableProperty
 	public Resistance getR() {
 		return r;
 	}
 
-	// Setter is commented out, ClassProcessor should ignore this property.
-	// public void setR(Resistance r) {
-	// this.r = r;
-	// }
-
-	// No annotation, so this property should be ignored.
-	public Size getS() {
-		return s;
-	}
-
-	public void setS(Size s) {
-		this.s = s;
-	}
-
 	@Override
 	public void draw(Graphics2D g2d, ComponentState componentState) {
 		g2d.setColor(componentState.equals(ComponentState.SELECTED) ? color : color.darker());