Changeset 18482 in osm for applications/editors/josm/plugins/openstreetbugs/src

Timestamp:

2009-11-07T07:32:25+01:00 (16 years ago)

Author:

guggis

Message:

Update to JOSM 2396

Location:

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb

Files:

• OsbLayer.java (modified) (4 diffs)
• OsbPlugin.java (modified) (1 diff)
• api/DownloadAction.java (modified) (1 diff)
• gui/OsbDialog.java (modified) (1 diff)

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java

@@ -119 +119 @@
     @Override
     public void paint(Graphics g, MapView mv) {
-        Object[] nodes = data.nodes.toArray();
+        Object[] nodes = data.getNodes().toArray();
         // This loop renders all the bug icons
         for (int i = 0; i < nodes.length; i++) {
@@ -210 +210 @@
         double minDistanceSq = Double.MAX_VALUE;
         Node minPrimitive = null;
-        for (Node n : data.nodes) {
+        for (Node n : data.getNodes()) {
             if (!n.isUsable())
                 continue;
@@ -232 +232 @@
             if(Main.map.mapView.getActiveLayer() == this) {
                 Node n = (Node) getNearestNode(e.getPoint());
-                if(data.nodes.contains(n)) {
+                if(data.getNodes().contains(n)) {
                     data.setSelected(n);
                 }
@@ -252 +252 @@
                 Node n = (Node) getNearestNode(e.getPoint());
                 OsbAction.setSelectedNode(n);
-                if(data.nodes.contains(n)) {
+                if(data.getNodes().contains(n)) {
                     PopupFactory.createPopup(n).show(e.getComponent(), e.getX(), e.getY());
                 }

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java

@@ -161 +161 @@
 
             // display the parsed data
-            if(!dataSet.nodes.isEmpty() && dialog.isDialogShowing()) {
+            if(!dataSet.getNodes().isEmpty() && dialog.isDialogShowing()) {
                 // if the map layer has been closed, while we are requesting the osb db,
                 // we don't have to update the gui, because the user is not interested

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/DownloadAction.java

@@ -67 +67 @@
 
         // clear dataset
-        dataset.nodes.clear();
-        dataset.relations.clear();
-        dataset.ways.clear();
+        dataset.clear();
 
         // parse the data

applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java

@@ -184 +184 @@
         Node lastNode = OsbAction.getSelectedNode();
         model = new DefaultListModel();
-        List<Node> sortedList = new ArrayList<Node>(dataset.nodes);
+        List<Node> sortedList = new ArrayList<Node>(dataset.getNodes());
         Collections.sort(sortedList, new BugComparator());