added resistor wattage and capacitor voltage

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

@@ -1,5 +0,0 @@
-package org.diylc.common;
-
-public enum Power {
- 
-}

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

@@ -153,7 +153,11 @@
 				</com.diyfever.gui.update.Change>
 				<com.diyfever.gui.update.Change>
 					<changeType>IMPROVEMENT</changeType>
-					<description></description>
+					<description>Resistors can specify power handling</description>
+				</com.diyfever.gui.update.Change>
+				<com.diyfever.gui.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Capacitors can specify voltage handling</description>
 				</com.diyfever.gui.update.Change>
 				<com.diyfever.gui.update.Change>
 					<changeType>NEW_FEATURE</changeType>

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

@@ -29,6 +29,7 @@ public class AxialElectrolyticCapacitor extends AbstractLeadedComponent<Capacita
 	public static Color TICK_COLOR = Color.white;
 
 	private Capacitance value = new Capacitance(1d, CapacitanceUnit.uF);
+	private Voltage voltage = Voltage._63V;
 
 	private Color markerColor = MARKER_COLOR;
 	private Color tickColor = TICK_COLOR;
@@ -49,6 +50,15 @@ public class AxialElectrolyticCapacitor extends AbstractLeadedComponent<Capacita
 		this.value = value;
 	}
 
+	@EditableProperty
+	public Voltage getVoltage() {
+		return voltage;
+	}
+
+	public void setVoltage(Voltage voltage) {
+		this.voltage = voltage;
+	}
+
 	public void drawIcon(Graphics2D g2d, int width, int height) {
 		g2d.rotate(-Math.PI / 4, width / 2, height / 2);
 		g2d.setColor(LEAD_COLOR);

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

@@ -25,7 +25,8 @@ public class AxialFilmCapacitor extends AbstractLeadedComponent<Capacitance> {
 	public static Color BODY_COLOR = Color.decode("#FFE303");
 	public static Color BORDER_COLOR = BODY_COLOR.darker();
 
-	private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF);
+	private Capacitance value = new Capacitance(22d, CapacitanceUnit.nF);
+	private Voltage voltage = Voltage._63V;
 
 	public AxialFilmCapacitor() {
 		super();
@@ -42,6 +43,16 @@ public class AxialFilmCapacitor extends AbstractLeadedComponent<Capacitance> {
 		this.value = value;
 	}
 	
+	@EditableProperty
+	public Voltage getVoltage() {
+		return voltage;
+	}
+
+	public void setVoltage(Voltage voltage) {
+		this.voltage = voltage;
+	}
+
+
 	public void drawIcon(Graphics2D g2d, int width, int height) {
 		g2d.rotate(-Math.PI / 4, width / 2, height / 2);
 		g2d.setColor(LEAD_COLOR);

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

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

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

@@ -25,7 +25,8 @@ public class RadialCeramicDiskCapacitor extends AbstractLeadedComponent<Capacita
 	public static Color BODY_COLOR = Color.decode("#F0E68C");
 	public static Color BORDER_COLOR = BODY_COLOR.darker();
 
-	private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF);
+	private Capacitance value = new Capacitance(470d, CapacitanceUnit.pF);
+	private Voltage voltage = Voltage._63V;
 
 	public RadialCeramicDiskCapacitor() {
 		super();

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

@@ -19,7 +19,7 @@ import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 
 @ComponentDescriptor(name = "Electrolytic Capacitor", author = "Branislav Stojkovic", category = "Passive", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C", description = "Vertical mounted electrolytic capacitor, polarized or bipolar", zOrder = IDIYComponent.COMPONENT)
-public class ElectrolyticRadial extends AbstractLeadedComponent<Capacitance> {
+public class RadialElectrolytic extends AbstractLeadedComponent<Capacitance> {
 
 	private static final long serialVersionUID = 1L;
 
@@ -30,12 +30,13 @@ public class ElectrolyticRadial extends AbstractLeadedComponent<Capacitance> {
 	public static Color TICK_COLOR = Color.white;
 
 	private Capacitance value = new Capacitance(1d, CapacitanceUnit.uF);
+	private Voltage voltage = Voltage._63V;
 
 	private Color markerColor = MARKER_COLOR;
 	private Color tickColor = TICK_COLOR;
 	private boolean polarized = true;
 
-	public ElectrolyticRadial() {
+	public RadialElectrolytic() {
 		super();
 		this.bodyColor = BODY_COLOR;
 		this.borderColor = BORDER_COLOR;
@@ -50,6 +51,16 @@ public class ElectrolyticRadial extends AbstractLeadedComponent<Capacitance> {
 		this.value = value;
 	}
 	
+	@EditableProperty
+	public Voltage getVoltage() {
+		return voltage;
+	}
+
+	public void setVoltage(Voltage voltage) {
+		this.voltage = voltage;
+	}
+
+
 	public void drawIcon(Graphics2D g2d, int width, int height) {
 		g2d.setColor(BODY_COLOR);
 		int margin = 3;

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

@@ -26,6 +26,7 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent<Capacitance> {
 	public static Color BORDER_COLOR = BODY_COLOR.darker();
 
 	private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF);
+	private Voltage voltage = Voltage._63V;
 
 	public RadialFilmCapacitor() {
 		super();
@@ -42,6 +43,16 @@ public class RadialFilmCapacitor extends AbstractLeadedComponent<Capacitance> {
 		this.value = value;
 	}
 	
+	@EditableProperty
+	public Voltage getVoltage() {
+		return voltage;
+	}
+
+	public void setVoltage(Voltage voltage) {
+		this.voltage = voltage;
+	}
+
+
 	public void drawIcon(Graphics2D g2d, int width, int height) {
 		g2d.rotate(-Math.PI / 4, width / 2, height / 2);
 		g2d.setColor(LEAD_COLOR);

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

@@ -29,6 +29,7 @@ public class Resistor extends AbstractLeadedComponent<Resistance> {
 	public static Color BORDER_COLOR = BODY_COLOR.darker();
 
 	private Resistance value = new Resistance(123d, ResistanceUnit.K);
+	private Power power = Power.HALF;
 	private ResistorColorCode colorCode = ResistorColorCode._5_BAND;
 
 	public Resistor() {
@@ -46,6 +47,15 @@ public class Resistor extends AbstractLeadedComponent<Resistance> {
 		this.value = value;
 	}
 	
+	@EditableProperty
+	public Power getPower() {
+		return power;
+	}
+	
+	public void setPower(Power power) {
+		this.power = power;
+	}
+
 	public void drawIcon(Graphics2D g2d, int width, int height) {
 		g2d.rotate(-Math.PI / 4, width / 2, height / 2);
 		g2d.setColor(LEAD_COLOR);

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

@@ -23,6 +23,7 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol<Resistance> {
 	public static Size DEFAULT_WIDTH = new Size(0.08, SizeUnit.in);
 
 	private Resistance value = new Resistance(100d, ResistanceUnit.K);
+	private Power power = Power.HALF;
 
 	@EditableProperty
 	public Resistance getValue() {
@@ -33,6 +34,15 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol<Resistance> {
 		this.value = value;
 	}
 	
+	@EditableProperty
+	public Power getPower() {
+		return power;
+	}
+	
+	public void setPower(Power power) {
+		this.power = power;
+	}
+
 	public void drawIcon(Graphics2D g2d, int width, int height) {
 		g2d.rotate(-Math.PI / 4, width / 2, height / 2);
 		g2d.setColor(LEAD_COLOR);

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

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

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

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