Changeset 23849 in osm for applications/editors/josm/plugins

Timestamp:

2010-10-26T18:29:48+02:00 (14 years ago)

Author:

oliverw

Message:

Added getters for number of streets/incomplete/unresolved.

Location:

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

Files:

• AddressEditContainer.java (modified) (1 diff)
• gui/AddressEditSelectionEvent.java (modified) (3 diffs)
• gui/IncompleteAddressesTableModel.java (modified) (2 diffs)
• gui/StreetTableModel.java (modified) (2 diffs)
• gui/UnresolvedAddressesTableModel.java (modified) (2 diffs)

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

@@ -204 +204 @@
                 return tags;
         }
+        
+        /**
+         * Gets the number of streets in the container.
+         * @return
+         */
+        public int getNumberOfStreets() {
+                return streetDict != null ? streetDict.size() : 0;
+        }
+        
+        /**
+         * Get the number of incomplete addresses.
+         * @return
+         */
+        public int getNumberOfIncompleteAddresses() {
+                return incompleteAddresses != null ? incompleteAddresses.size() : 0;
+        }
+        
+        /**
+         * Gets the number of unresolved addresses.
+         * @return
+         */
+        public int getNumberOfUnresolvedAddresses() {
+                return unresolvedAddresses != null ? unresolvedAddresses.size() : 0;
+        }
 
         /**

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

@@ -86 +86 @@
                         int selRows = streetTable.getSelectedRow();
                         
-                        if (selRows < 0 || selRows >= addressContainer.getStreetList().size()) {
+                        if (selRows < 0 || selRows >= addressContainer.getNumberOfStreets()) {
                                 return null;
                         }
@@ -108 +108 @@
                         List<AddressNode> nodes = new ArrayList<AddressNode>();
                         for (int i = 0; i < selRows.length; i++) {
-                                if (i >= 0 && i < addressContainer.getIncompleteAddresses().size()) {
+                                if (i >= 0 && i < addressContainer.getNumberOfIncompleteAddresses()) {
                                         nodes.add(addressContainer.getIncompleteAddresses().get(selRows[i]));
                                 }
@@ -130 +130 @@
                         List<AddressNode> nodes = new ArrayList<AddressNode>();
                         for (int i = 0; i < selRows.length; i++) {
-                                if (i >= 0 && i < addressContainer.getUnresolvedAddresses().size()) {
+                                if (i >= 0 && i < addressContainer.getNumberOfUnresolvedAddresses()) {
                                         nodes.add(addressContainer.getUnresolvedAddresses().get(selRows[i]));
                                 }

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

@@ -54 +54 @@
                         return 0;
                 }
-                return addressContainer.getIncompleteAddresses().size();
+                return addressContainer.getNumberOfIncompleteAddresses();
         }
 
@@ -62 +62 @@
                         return null;
                 }
-                if (row < 0 || row > addressContainer.getIncompleteAddresses().size()) {
+                if (row < 0 || row > addressContainer.getNumberOfIncompleteAddresses()) {
                         return null;
                 }

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

@@ -70 +70 @@
                         return 0;
                 }
-                return addressContainer.getStreetList().size();
+                return addressContainer.getNumberOfStreets();
         }
 
@@ -81 +81 @@
                         return null;
                 }
-                if (row < 0 || row > addressContainer.getStreetList().size()) {
+                if (row < 0 || row > addressContainer.getNumberOfStreets()) {
                         return null;
                 }

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

@@ -74 +74 @@
                         return 0;
                 }
-                return addressContainer.getUnresolvedAddresses().size();
+                return addressContainer.getNumberOfUnresolvedAddresses();
         }
 
@@ -82 +82 @@
                         return null;
                 }
-                if (row < 0 || row > addressContainer.getUnresolvedAddresses().size()) {
+                if (row < 0 || row > addressContainer.getNumberOfUnresolvedAddresses()) {
                         return null;
                 }