allow null values

This commit is contained in:
bancika
2012-09-25 20:24:03 +00:00
parent 6c7e149c93
commit e9b81795b7
14 changed files with 35 additions and 9 deletions
@@ -8,6 +8,8 @@ public class PositiveMeasureValidator implements IPropertyValidator {
@Override @Override
public void validate(Object value) throws ValidationException { public void validate(Object value) throws ValidationException {
if (value == null)
return;
if (value instanceof AbstractMeasure) { if (value instanceof AbstractMeasure) {
AbstractMeasure measure = (AbstractMeasure) value; AbstractMeasure measure = (AbstractMeasure) value;
if (measure.getValue() < 0) { if (measure.getValue() < 0) {
@@ -58,7 +58,7 @@ public class Presenter implements IPlugInPort {
private static final Logger LOG = Logger.getLogger(Presenter.class); private static final Logger LOG = Logger.getLogger(Presenter.class);
public static final VersionNumber CURRENT_VERSION = new VersionNumber(3, public static final VersionNumber CURRENT_VERSION = new VersionNumber(3,
18, 0); 19, 0);
public static final String DEFAULTS_KEY_PREFIX = "default."; public static final String DEFAULTS_KEY_PREFIX = "default.";
public static final List<IDIYComponent<?>> EMPTY_SELECTION = Collections public static final List<IDIYComponent<?>> EMPTY_SELECTION = Collections
@@ -6,6 +6,7 @@ import org.diylc.common.Orientation;
import org.diylc.components.AbstractTransparentComponent; import org.diylc.components.AbstractTransparentComponent;
import org.diylc.core.VisibilityPolicy; import org.diylc.core.VisibilityPolicy;
import org.diylc.core.annotations.EditableProperty; import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PositiveMeasureValidator;
import org.diylc.core.measures.Resistance; import org.diylc.core.measures.Resistance;
public abstract class AbstractPotentiometer extends public abstract class AbstractPotentiometer extends
@@ -50,8 +51,8 @@ public abstract class AbstractPotentiometer extends
+ taper.toString(); + taper.toString();
} }
@EditableProperty
@Override @Override
@EditableProperty(validatorClass = PositiveMeasureValidator.class)
public Resistance getValue() { public Resistance getValue() {
return resistance; return resistance;
} }
@@ -14,6 +14,7 @@ import org.diylc.core.IDIYComponent;
import org.diylc.core.Theme; import org.diylc.core.Theme;
import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty; import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PositiveMeasureValidator;
import org.diylc.core.measures.Capacitance; import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.Size; import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit; import org.diylc.core.measures.SizeUnit;
@@ -47,7 +48,7 @@ public class AxialElectrolyticCapacitor extends
this.borderColor = BORDER_COLOR; this.borderColor = BORDER_COLOR;
} }
@EditableProperty @EditableProperty(validatorClass = PositiveMeasureValidator.class)
public Capacitance getValue() { public Capacitance getValue() {
return value; return value;
} }
@@ -10,6 +10,7 @@ import org.diylc.core.CreationMethod;
import org.diylc.core.IDIYComponent; import org.diylc.core.IDIYComponent;
import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty; import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PositiveMeasureValidator;
import org.diylc.core.measures.Capacitance; import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.Size; import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit; import org.diylc.core.measures.SizeUnit;
@@ -40,7 +41,7 @@ public class AxialFilmCapacitor extends AbstractLeadedComponent<Capacitance> {
return true; return true;
} }
@EditableProperty @EditableProperty(validatorClass = PositiveMeasureValidator.class)
public Capacitance getValue() { public Capacitance getValue() {
return value; return value;
} }
@@ -9,6 +9,7 @@ import org.diylc.core.CreationMethod;
import org.diylc.core.IDIYComponent; import org.diylc.core.IDIYComponent;
import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty; import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PositiveMeasureValidator;
import org.diylc.core.measures.Capacitance; import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.Size; import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit; import org.diylc.core.measures.SizeUnit;
@@ -27,7 +28,7 @@ public class CapacitorSymbol extends AbstractSchematicLeadedSymbol<Capacitance>
private org.diylc.core.measures.Voltage voltageNew = null; private org.diylc.core.measures.Voltage voltageNew = null;
private boolean polarized = false; private boolean polarized = false;
@EditableProperty @EditableProperty(validatorClass = PositiveMeasureValidator.class)
public Capacitance getValue() { public Capacitance getValue() {
return value; return value;
} }
@@ -9,6 +9,7 @@ import org.diylc.core.CreationMethod;
import org.diylc.core.IDIYComponent; import org.diylc.core.IDIYComponent;
import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty; import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PositiveMeasureValidator;
import org.diylc.core.measures.Current; import org.diylc.core.measures.Current;
import org.diylc.core.measures.Inductance; import org.diylc.core.measures.Inductance;
import org.diylc.core.measures.Resistance; import org.diylc.core.measures.Resistance;
@@ -28,7 +29,7 @@ public class InductorSymbol extends AbstractSchematicLeadedSymbol<Inductance> {
private Resistance resistance = null; private Resistance resistance = null;
private boolean core = false; private boolean core = false;
@EditableProperty @EditableProperty(validatorClass = PositiveMeasureValidator.class)
public Inductance getValue() { public Inductance getValue() {
return value; return value;
} }
@@ -10,6 +10,7 @@ import org.diylc.core.CreationMethod;
import org.diylc.core.IDIYComponent; import org.diylc.core.IDIYComponent;
import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty; import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PositiveMeasureValidator;
import org.diylc.core.measures.Capacitance; import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.Size; import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit; import org.diylc.core.measures.SizeUnit;
@@ -35,7 +36,7 @@ public class RadialCeramicDiskCapacitor extends AbstractRadialComponent<Capacita
this.borderColor = BORDER_COLOR; this.borderColor = BORDER_COLOR;
} }
@EditableProperty @EditableProperty(validatorClass = PositiveMeasureValidator.class)
public Capacitance getValue() { public Capacitance getValue() {
return value; return value;
} }
@@ -17,6 +17,7 @@ import org.diylc.core.IDIYComponent;
import org.diylc.core.Theme; import org.diylc.core.Theme;
import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty; import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PositiveMeasureValidator;
import org.diylc.core.measures.Capacitance; import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.Size; import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit; import org.diylc.core.measures.SizeUnit;
@@ -53,7 +54,7 @@ public class RadialElectrolytic extends AbstractRadialComponent<Capacitance> {
this.borderColor = BORDER_COLOR; this.borderColor = BORDER_COLOR;
} }
@EditableProperty @EditableProperty(validatorClass = PositiveMeasureValidator.class)
public Capacitance getValue() { public Capacitance getValue() {
return value; return value;
} }
@@ -10,6 +10,7 @@ import org.diylc.core.CreationMethod;
import org.diylc.core.IDIYComponent; import org.diylc.core.IDIYComponent;
import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.ComponentDescriptor;
import org.diylc.core.annotations.EditableProperty; import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.annotations.PositiveMeasureValidator;
import org.diylc.core.measures.Capacitance; import org.diylc.core.measures.Capacitance;
import org.diylc.core.measures.Size; import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit; import org.diylc.core.measures.SizeUnit;
@@ -35,7 +36,7 @@ public class RadialFilmCapacitor extends AbstractRadialComponent<Capacitance> {
this.borderColor = BORDER_COLOR; this.borderColor = BORDER_COLOR;
} }
@EditableProperty @EditableProperty(validatorClass = PositiveMeasureValidator.class)
public Capacitance getValue() { public Capacitance getValue() {
return value; return value;
} }
@@ -961,5 +961,21 @@
</changes> </changes>
<url>http://code.google.com/p/diy-layout-creator/downloads/list</url> <url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
</org.diylc.appframework.update.Version> </org.diylc.appframework.update.Version>
<org.diylc.appframework.update.Version>
<versionNumber>
<major>3</major>
<minor>19</minor>
<build>0</build>
</versionNumber>
<releaseDate>2012-09-24 20:00:00.000 CET</releaseDate>
<name></name>
<changes>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>Cannot save a component template if value is not set</description>
</org.diylc.appframework.update.Change>
</changes>
<url>http://code.google.com/p/diy-layout-creator/downloads/list</url>
</org.diylc.appframework.update.Version>
</a> </a>
</java.util.Arrays_-ArrayList> </java.util.Arrays_-ArrayList>