Changeset 3049 for DataCleaner

Timestamp:

01/17/12 16:18:55 (4 months ago)

Author:

kasper

Message:

Improved handling and matching of column types

File:

• DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/panels/MetadataPanel.java (modified) (4 diffs)

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

@@ -43 +43 @@
         private static final long serialVersionUID = 1L;
 
-        private static final String[] columnNames = new String[] { "Table", "Column", "Type", "Native type", "Size",
-                        "Nullable?", "Indexed?" };
+        private static final String[] COLUMN_NAMES = new String[] { "Table", "Column", "Type family", "Type", "Native type",
+                        "Size", "Nullable?", "Indexed?" };
 
         private final AnalysisJobBuilder _analysisJobBuilder;
-        private final DCTable _table;;
+        private final DCTable _table;
 
         @Inject
@@ -56 +56 @@
                 _analysisJobBuilder.getSourceColumnListeners().add(this);
 
-                _table = new DCTable(columnNames);
-                _table.setAlignment(5, Alignment.CENTER);
+                _table = new DCTable(COLUMN_NAMES);
+                _table.setAlignment(5, Alignment.RIGHT);
                 _table.setAlignment(6, Alignment.CENTER);
+                _table.setAlignment(7, Alignment.CENTER);
 
                 setLayout(new BorderLayout());
@@ -72 +73 @@
                 final Icon validIcon = ImageManager.getInstance().getImageIcon(IconUtils.STATUS_VALID, IconUtils.ICON_SIZE_SMALL);
 
-                DefaultTableModel model = new DefaultTableModel(columnNames, sourceColumns.size());
+                final DefaultTableModel model = new DefaultTableModel(COLUMN_NAMES, sourceColumns.size());
 
                 int i = 0;
@@ -80 +81 @@
                         model.setValueAt(column.getName(), i, 1);
                         model.setValueAt(inputColumn.getDataTypeFamily(), i, 2);
-                        model.setValueAt(column.getNativeType(), i, 3);
-                        model.setValueAt(column.getColumnSize(), i, 4);
+                        model.setValueAt(column.getType(), i, 3);
+                        model.setValueAt(column.getNativeType(), i, 4);
+                        model.setValueAt(column.getColumnSize(), i, 5);
 
                         Boolean nullable = column.isNullable();
                         if (nullable != null && nullable.booleanValue()) {
-                                model.setValueAt(validIcon, i, 5);
+                                model.setValueAt(validIcon, i, 6);
                         } else {
-                                model.setValueAt("", i, 5);
+                                model.setValueAt("", i, 6);
                         }
 
                         boolean indexed = column.isIndexed();
                         if (indexed) {
-                                model.setValueAt(validIcon, i, 6);
+                                model.setValueAt(validIcon, i, 7);
                         } else {
-                                model.setValueAt("", i, 6);
+                                model.setValueAt("", i, 7);
                         }