Changeset 3120 for DataCleaner

Timestamp:

02/02/12 23:41:20 (4 months ago)

Author:

kasper

Message:

Ticket #754: Added UI support in DataCleaner for most operations, still a few TODOs pending

Location:

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

Files:

• panels/datastructures (added)
• panels/datastructures/BuildMapJobBuilderPresenter.java (added)
• panels/datastructures/BuildMapJobBuilderPresenterRenderer.java (added)
• panels/datastructures/KeysAndTypesPropertyWidget.java (added)
• panels/datastructures/SelectFromMapJobBuilderPresenter.java (added)
• panels/datastructures/SelectFromMapJobBuilderPresenterRenderer.java (added)
• widgets/properties/MultipleMappedStringsPropertyWidget.java (modified) (3 diffs)
• widgets/properties/MultipleStringPropertyWidget.java (modified) (9 diffs)
• widgets/properties/SingleClassPropertyWidget.java (modified) (3 diffs)

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

@@ -129 +129 @@
                 final DCPanel panel = new DCPanel();
                 panel.setLayout(new BorderLayout());
-                panel.add(checkBox, BorderLayout.CENTER);
+                panel.add(checkBox, BorderLayout.WEST);
                 panel.add(textField, BorderLayout.EAST);
                 return panel;
         }
 
-        public PropertyWidget<String[]> getMappedColumnNamesPropertyWidget() {
+        public PropertyWidget<String[]> getMappedStringsPropertyWidget() {
                 return _mappedStringPropertyWidget;
         }
@@ -161 +161 @@
                         @Override
                         public String[] getValue() {
-                                return getMappedColumnNames();
+                                return getMappedStrings();
                         }
 
@@ -203 +203 @@
         }
 
-        private String[] getMappedColumnNames() {
+        private String[] getMappedStrings() {
                 final InputColumn<?>[] inputColumns = MultipleMappedStringsPropertyWidget.this.getValue();
                 final List<String> result = new ArrayList<String>();

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

@@ -24 +24 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.IdentityHashMap;
+import java.util.Map;
 
 import javax.inject.Inject;
 import javax.swing.JButton;
+import javax.swing.JComponent;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.DocumentEvent;
-import javax.swing.text.JTextComponent;
 
 import org.eobjects.analyzer.descriptors.ConfiguredPropertyDescriptor;
@@ -49 +51 @@
 
         private final DCPanel _textFieldPanel;
+        private final Map<JComponent, JXTextField> _textFieldDecorations;
 
         @Inject
@@ -55 +58 @@
                 super(beanJobBuilder, propertyDescriptor);
 
+                _textFieldDecorations = new IdentityHashMap<JComponent, JXTextField>();
+
                 _textFieldPanel = new DCPanel();
                 _textFieldPanel.setLayout(new VerticalLayout(2));
-
-                String[] currentValue = getCurrentValue();
-                updateComponents(currentValue);
 
                 final JButton addButton = WidgetFactory.createSmallButton("images/actions/add.png");
@@ -76 +78 @@
                                 int componentCount = _textFieldPanel.getComponentCount();
                                 if (componentCount > 0) {
-                                        _textFieldPanel.remove(componentCount - 1);
+                                        removeTextField();
                                         _textFieldPanel.updateUI();
                                         fireValueChanged();
@@ -98 +100 @@
         }
 
+        @Override
+        public void initialize(String[] value) {
+                updateComponents(value);
+        }
+
         public void updateComponents(String[] values) {
                 if (values == null) {
@@ -107 +114 @@
                                 // modify text boxes
                                 if (!EqualsBuilder.equals(previousValues[i], values[i])) {
-                                        JTextComponent component = (JTextComponent) _textFieldPanel.getComponent(i);
+                                        Component decoration = _textFieldPanel.getComponent(i);
+                                        JXTextField component = _textFieldDecorations.get(decoration);
                                         component.setText(values[i]);
                                 }
@@ -119 +127 @@
 
                         while (_textFieldPanel.getComponentCount() > values.length) {
-                                // remove text boxes if there are too many
-                                _textFieldPanel.remove(_textFieldPanel.getComponentCount() - 1);
+                                removeTextField();
                         }
                         _textFieldPanel.updateUI();
                 }
+        }
+
+        private void removeTextField() {
+                int componentCount = _textFieldPanel.getComponentCount();
+                if (componentCount == 0) {
+                        return;
+                }
+                int index = componentCount - 1;
+                Component decoration = _textFieldPanel.getComponent(index);
+                _textFieldDecorations.remove(decoration);
+                _textFieldPanel.remove(index);
         }
 
@@ -137 +155 @@
                         }
                 });
-                _textFieldPanel.add(textField);
+
+                JComponent decoration = decorateTextField(textField);
+                _textFieldDecorations.put(decoration, textField);
+
+                _textFieldPanel.add(decoration);
                 if (updateUI) {
                         _textFieldPanel.updateUI();
                 }
+        }
+
+        protected JComponent decorateTextField(JXTextField textField) {
+                return textField;
         }
 
@@ -148 +174 @@
                 String[] result = new String[components.length];
                 for (int i = 0; i < components.length; i++) {
-                        JXTextField textField = (JXTextField) components[i];
+                        Component decoration = components[i];
+                        JXTextField textField = _textFieldDecorations.get(decoration);
                         result[i] = textField.getText();
                 }

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

@@ -46 +46 @@
                 Collection<Class<?>> items = new ArrayList<Class<?>>();
 
-                if (!propertyDescriptor.isRequired()) {
+                _comboBox = createClassComboBox(propertyDescriptor.isRequired());
+                Class<?> currentValue = getCurrentValue();
+                if (currentValue != null) {
+                        _comboBox.setSelectedItem(currentValue);
+                }
+                
+                _comboBox.addListener(new Listener<Class<?>>() {
+                        @Override
+                        public void onItemSelected(Class<?> item) {
+                                fireValueChanged(item);
+                        }
+                });
+
+                add(_comboBox);
+        }
+        
+        public static DCComboBox<Class<?>> createClassComboBox(boolean required) {
+                Collection<Class<?>> items = new ArrayList<Class<?>>();
+
+                if (!required) {
                         items.add(null);
                 }
@@ -57 +76 @@
                 items.add(Object.class);
 
-                _comboBox = new DCComboBox<Class<?>>(items);
-                _comboBox.setRenderer(new DefaultListCellRenderer() {
+                DCComboBox<Class<?>> comboBox = new DCComboBox<Class<?>>(items);
+                comboBox.setRenderer(new DefaultListCellRenderer() {
 
                         private static final long serialVersionUID = 1L;
@@ -72 +91 @@
                         }
                 });
-                _comboBox.addListener(new Listener<Class<?>>() {
-                        @Override
-                        public void onItemSelected(Class<?> item) {
-                                fireValueChanged(item);
-                        }
-                });
-
-                add(_comboBox);
+                return comboBox;
         }