Changeset 23835 in osm for applications/editors

Timestamp:

2010-10-26T00:40:04+02:00 (15 years ago)

Author:

oliverw

Message:

Removed debug output, added doc

Location:

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit

Files:

• AddressEditContainer.java (modified) (4 diffs)
• gui/AddressEditDialog.java (modified) (1 diff)
• gui/AddressEditTableModel.java (modified) (2 diffs)
• gui/UnresolvedAddressesTableModel.java (modified) (2 diffs)

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/AddressEditContainer.java

@@ -214 +214 @@
                         StreetNode sNode = streetDict.get(streetName);
                         sNode.addAddress(aNode);
-                        //System.out.println("Resolved address " + aNode + ": " + sNode);
                         return true;
                 }
@@ -232 +231 @@
                 }
                 
-                System.out.println("Resolved " + resolvedAddresses.size() + " addresses");
-                
                 /* Remove all resolves nodes from unresolved list */
                 for (AddressNode resolved : resolvedAddresses) {
                         unresolvedAddresses.remove(resolved);
                 }
-                
-                System.out.println("Still unresolved: " + unresolvedAddresses.size() + " addresses");
         }
         
@@ -260 +255 @@
                 resolveAddresses();
                 
+                Collections.sort(incompleteAddresses);
+                Collections.sort(unresolvedAddresses);
+                
                 fireContainerChanged();
         }
@@ -328 +326 @@
         @Override
         public void entityChanged() {
-                System.out.println("entityChanged, inavlidate... :-)");
                 invalidate();           
         }

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditDialog.java

@@ -118 +118 @@
                 JButton ok = new JButton(OK_COMMAND);
                 ok.addActionListener(this);
-                JButton cancel = new JButton(CANCEL_COMMAND);
-                cancel.addActionListener(this);
+                buttonPanel.add(ok);
                 
-                buttonPanel.add(cancel);
-                buttonPanel.add(ok);
                 // Murks
                 for (int i = 0; i < 8; i++) {

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/AddressEditTableModel.java

@@ -36 +36 @@
         public void containerChanged(AddressEditContainer container) {
                 fireTableDataChanged();
-                System.out.println("Fire data table changed...");
         }
 
@@ -42 +41 @@
         public void entityChanged() {
                 fireTableDataChanged();
-                System.out.println("Fire data table changed...");
         }
 }

applications/editors/josm/plugins/AddressEdit/src/org/openstreetmap/josm/plugins/addressEdit/gui/UnresolvedAddressesTableModel.java

@@ -42 +42 @@
 public class UnresolvedAddressesTableModel extends AddressEditTableModel {
 
-        private static final int NUMBER_OF_COLUMNS = 2;
-        private static final String[] COLUMN_NAMES = new String[]{tr("Street"), tr("Complete?")}; 
-        private static final Class<?>[] COLUMN_CLASSES = new Class<?>[]{String.class, Boolean.class};
+        private static final int NUMBER_OF_COLUMNS = 3;
+        private static final String[] COLUMN_NAMES = new String[]{tr("Street"), tr("City"), tr("Complete?")}; 
+        private static final Class<?>[] COLUMN_CLASSES = new Class<?>[]{String.class, String.class, Boolean.class};
         
         /**
@@ -91 +91 @@
                         return aNode.getStreet();
                 case 1:
+                        return aNode.getCity();
+                case 2:
                         return aNode.isComplete();
                 default: