Changeset 3136

Timestamp:

02/03/12 17:19:09 (4 months ago)

Author:

kasper

Message:

 

Location:

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner

Files:

• panels/datastructures/KeysAndTypesPropertyWidget.java (modified) (7 diffs)
• widgets/properties/MultipleMappedStringsPropertyWidget.java (modified) (2 diffs)
• widgets/properties/MultipleStringPropertyWidget.java (modified) (6 diffs)

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/panels/datastructures/KeysAndTypesPropertyWidget.java

@@ -25 +25 @@
 
 import javax.swing.JComponent;
+import javax.swing.event.DocumentEvent;
 
 import org.eobjects.analyzer.beans.datastructures.SelectFromMapTransformer;
@@ -30 +31 @@
 import org.eobjects.analyzer.job.builder.AbstractBeanJobBuilder;
 import org.eobjects.datacleaner.panels.DCPanel;
+import org.eobjects.datacleaner.util.DCDocumentListener;
 import org.eobjects.datacleaner.widgets.DCComboBox;
 import org.eobjects.datacleaner.widgets.DCComboBox.Listener;
@@ -36 +38 @@
 import org.eobjects.datacleaner.widgets.properties.PropertyWidget;
 import org.eobjects.datacleaner.widgets.properties.SingleClassPropertyWidget;
+import org.eobjects.metamodel.util.EqualsBuilder;
 import org.jdesktop.swingx.JXTextField;
 
@@ -65 +68 @@
                         @Override
                         public Class<?>[] getValue() {
-                                final Class<?>[] result = new Class<?>[_comboBoxes.size()];
+                                final String[] keys = KeysAndTypesPropertyWidget.this
+                                                .getValue();
+                                final Class<?>[] result = new Class<?>[keys.length];
                                 for (int i = 0; i < result.length; i++) {
-                                        result[i] = _comboBoxes.get(i).getSelectedItem();
+                                        final DCComboBox<Class<?>> comboBox = _comboBoxes.get(i);
+                                        result[i] = comboBox.getSelectedItem();
                                 }
                                 return result;
@@ -73 +79 @@
 
                         @Override
+                        public boolean isSet() {
+                                if (_comboBoxes.isEmpty()) {
+                                        return false;
+                                }
+                                for (DCComboBox<Class<?>> comboBox : _comboBoxes) {
+                                        if (comboBox.getSelectedItem() == null) {
+                                                return false;
+                                        }
+                                }
+                                return true;
+                        }
+
+                        @Override
                         protected void setValue(Class<?>[] value) {
-                                // TODO Auto-generated method stub
+                                if (EqualsBuilder.equals(value, getValue())) {
+                                        return;
+                                }
+
+                                if (value == null) {
+                                        value = new Class[0];
+                                }
+
+                                final String[] keys = KeysAndTypesPropertyWidget.this
+                                                .getValue();
+                                if (keys.length != value.length) {
+                                        // disregard this invalid value update
+                                        return;
+                                }
+
+                                for (int i = 0; i < keys.length; i++) {
+                                        DCComboBox<Class<?>> comboBox = _comboBoxes.get(i);
+                                        Class<?> selectedClass = value[i];
+                                        comboBox.setSelectedItem(selectedClass);
+                                }
                         }
                 };
@@ -88 +126 @@
                         @Override
                         public void onItemSelected(Class<?> item) {
+                                _typesPropertyWidget.fireValueChanged();
+                        }
+                });
+
+                textField.getDocument().addDocumentListener(new DCDocumentListener() {
+                        @Override
+                        protected void onChange(DocumentEvent event) {
                                 _typesPropertyWidget.fireValueChanged();
                         }
@@ -106 +151 @@
         }
 
+        @Override
+        protected boolean isEmptyStringValid() {
+                return false;
+        }
 }

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/widgets/properties/MultipleMappedStringsPropertyWidget.java

@@ -211 +211 @@
                                         return;
                                 }
+                                
+                                if (value == null) {
+                                        value = new String[0];
+                                }
 
                                 if (EqualsBuilder.equals(value, getValue())) {
@@ -218 +222 @@
                                                 .getValue();
 
-                                if (value != null && inputColumns.length != value.length) {
+                                if (inputColumns.length != value.length) {
                                         // disregard this invalid value update
                                         return;

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/widgets/properties/MultipleStringPropertyWidget.java

@@ -48 +48 @@
  * @author Kasper SÞrensen
  */
-public class MultipleStringPropertyWidget extends AbstractPropertyWidget<String[]> {
+public class MultipleStringPropertyWidget extends
+                AbstractPropertyWidget<String[]> {
 
         private final DCPanel _textFieldPanel;
@@ -54 +55 @@
 
         @Inject
-        public MultipleStringPropertyWidget(ConfiguredPropertyDescriptor propertyDescriptor,
+        public MultipleStringPropertyWidget(
+                        ConfiguredPropertyDescriptor propertyDescriptor,
                         AbstractBeanJobBuilder<?, ?, ?> beanJobBuilder) {
                 super(beanJobBuilder, propertyDescriptor);
@@ -63 +65 @@
                 _textFieldPanel.setLayout(new VerticalLayout(2));
 
-                final JButton addButton = WidgetFactory.createSmallButton("images/actions/add.png");
+                final JButton addButton = WidgetFactory
+                                .createSmallButton("images/actions/add.png");
                 addButton.addActionListener(new ActionListener() {
                         @Override
@@ -72 +75 @@
                 });
 
-                final JButton removeButton = WidgetFactory.createSmallButton("images/actions/remove.png");
+                final JButton removeButton = WidgetFactory
+                                .createSmallButton("images/actions/remove.png");
                 removeButton.addActionListener(new ActionListener() {
                         @Override
@@ -115 +119 @@
                                 if (!EqualsBuilder.equals(previousValues[i], values[i])) {
                                         Component decoration = _textFieldPanel.getComponent(i);
-                                        JXTextField component = _textFieldDecorations.get(decoration);
+                                        JXTextField component = _textFieldDecorations
+                                                        .get(decoration);
                                         component.setText(values[i]);
                                 }
@@ -182 +187 @@
 
         @Override
+        public boolean isSet() {
+                String[] value = getValue();
+                if (value.length == 0) {
+                        return false;
+                }
+
+                if (!isEmptyStringValid()) {
+                        for (int i = 0; i < value.length; i++) {
+                                if (value[i].length() == 0) {
+                                        return false;
+                                }
+                        }
+                }
+
+                return true;
+        }
+
+        /**
+         * Method to be overridden by subclasses in case empty strings inside the
+         * arrays are not to be tolerated.
+         * 
+         * @return
+         */
+        protected boolean isEmptyStringValid() {
+                return true;
+        }
+
+        @Override
         protected void setValue(String[] value) {
                 updateComponents(value);