From 7f1f7b60a5cfe5e1d045374d275d76556d7298e5 Mon Sep 17 00:00:00 2001 From: bancika Date: Tue, 18 Jan 2011 20:39:28 +0000 Subject: [PATCH] fixed editing units --- .../DIYLC/src/org/diylc/gui/editor/MeasureEditor.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/MeasureEditor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/MeasureEditor.java index c3eb07ba..df0e8080 100644 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/MeasureEditor.java +++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/gui/editor/MeasureEditor.java @@ -13,6 +13,7 @@ import javax.swing.JComboBox; import org.diylc.common.PropertyWrapper; import org.diylc.core.measures.AbstractMeasure; +import org.diylc.core.measures.Unit; import com.diyfever.gui.DoubleTextField; @@ -23,7 +24,7 @@ public class MeasureEditor extends Container { @SuppressWarnings("unchecked") public MeasureEditor(final PropertyWrapper property) { setLayout(new BorderLayout()); - final AbstractMeasure measure = ((AbstractMeasure) property.getValue()); + AbstractMeasure measure = ((AbstractMeasure) property.getValue()); DoubleTextField valueField = new DoubleTextField(measure.getValue()); valueField.addPropertyChangeListener(DoubleTextField.VALUE_PROPERTY, new PropertyChangeListener() { @@ -31,7 +32,8 @@ public class MeasureEditor extends Container { @Override public void propertyChange(PropertyChangeEvent evt) { try { - AbstractMeasure newMeasure = (AbstractMeasure) measure.clone(); + AbstractMeasure newMeasure = (AbstractMeasure) ((AbstractMeasure) property + .getValue()).clone(); newMeasure.setValue((Double) evt.getNewValue()); property.setValue(newMeasure); } catch (CloneNotSupportedException ex) { @@ -48,8 +50,9 @@ public class MeasureEditor extends Container { @Override public void actionPerformed(ActionEvent e) { try { - AbstractMeasure newMeasure = (AbstractMeasure) measure.clone(); - measure.setUnit((Enum) unitBox.getSelectedItem()); + AbstractMeasure> newMeasure = (AbstractMeasure>) ((AbstractMeasure) property + .getValue()).clone(); + newMeasure.setUnit((Enum) unitBox.getSelectedItem()); property.setValue(newMeasure); } catch (CloneNotSupportedException ex) { }