diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar index 77bac49c..90989836 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/AxialFilmCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/AxialFilmCapacitor.java index 5c861fa5..eb024b86 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/AxialFilmCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/AxialFilmCapacitor.java @@ -21,7 +21,7 @@ public class AxialFilmCapacitor extends AbstractLeadedDIYComponent { public static Size DEFAULT_WIDTH = new Size(1d / 2, SizeUnit.in); public static Size DEFAULT_HEIGHT = new Size(1d / 8, SizeUnit.in); public static Color BODY_COLOR = Color.decode("#FFE303"); - public static Color BORDER_COLOR = Color.decode("#B8860B"); + public static Color BORDER_COLOR = BODY_COLOR.darker(); private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF); diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/CeramicDiskCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/RadialCeramicDiskCapacitor.java similarity index 87% rename from diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/CeramicDiskCapacitor.java rename to diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/RadialCeramicDiskCapacitor.java index 670f8c05..a2f371a7 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/CeramicDiskCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/RadialCeramicDiskCapacitor.java @@ -14,18 +14,18 @@ import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; @ComponentDescriptor(name = "Ceramic Capacitor", author = "bancika", category = "Passive", instanceNamePrefix = "C", desciption = "test") -public class CeramicDiskCapacitor extends AbstractLeadedDIYComponent { +public class RadialCeramicDiskCapacitor extends AbstractLeadedDIYComponent { private static final long serialVersionUID = 1L; public static Size DEFAULT_WIDTH = new Size(1d / 2, SizeUnit.in); public static Size DEFAULT_HEIGHT = new Size(1d / 8, SizeUnit.in); public static Color BODY_COLOR = Color.decode("#F0E68C"); - public static Color BORDER_COLOR = Color.decode("#B8860B"); + public static Color BORDER_COLOR = BODY_COLOR.darker(); private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF); - public CeramicDiskCapacitor() { + public RadialCeramicDiskCapacitor() { super(); } diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/RadialFilmCapacitor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/RadialFilmCapacitor.java index 28ff47ea..9491d8bc 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/RadialFilmCapacitor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/RadialFilmCapacitor.java @@ -20,8 +20,8 @@ public class RadialFilmCapacitor extends AbstractLeadedDIYComponent { public static Size DEFAULT_WIDTH = new Size(1d, SizeUnit.in); public static Size DEFAULT_HEIGHT = new Size(1d / 4, SizeUnit.in); - public static Color BODY_COLOR = Color.decode("#FF9912"); - public static Color BORDER_COLOR = Color.decode("#D98719"); + public static Color BODY_COLOR = Color.decode("#FF8000"); + public static Color BORDER_COLOR = BODY_COLOR.darker(); private Capacitance value = new Capacitance(123d, CapacitanceUnit.nF); diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/Resistor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/Resistor.java index 87a233cc..098576a5 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/Resistor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src.library/org/diylc/components/Resistor.java @@ -21,7 +21,7 @@ public class Resistor extends AbstractLeadedDIYComponent { public static Size DEFAULT_WIDTH = new Size(1d / 2, SizeUnit.in); public static Size DEFAULT_HEIGHT = new Size(1d / 8, SizeUnit.in); public static Color BODY_COLOR = Color.decode("#82CFFD"); - public static Color BORDER_COLOR = Color.decode("#5D92B1"); + public static Color BORDER_COLOR = BODY_COLOR.darker(); private Resistance value = new Resistance(123d, ResistanceUnit.K);