Changeset 3201 in josm for trunk/src/org

Timestamp:

2010-04-23T23:09:20+02:00 (15 years ago)

Author:

stoecker

Message:

fix #4766 (exception), don't display virtual nodes for disabled objects, i18n update

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (1 diff)
• data/osm/visitor/paint/MapPainter.java (modified) (1 diff)
• data/osm/visitor/paint/SimplePaintVisitor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -490 +490 @@
                         if (!nodesToMerge.isEmpty()) {
                             Command cmd = MergeNodesAction.mergeNodes(Main.main.getEditLayer(),nodesToMerge, targetNode);
-                            Main.main.undoRedo.add(cmd);
+                            if(cmd != null)
+                                Main.main.undoRedo.add(cmd);
                         }
                     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -307 +307 @@
             GeneralPath path = new GeneralPath();
             for (Way osm: ways){
-                if (osm.isUsable() && !osm.isFiltered()) {
+                if (osm.isUsable() && !osm.isFiltered() && !osm.isDisabled()) {
                     visitVirtual(path, osm);
                 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java

@@ -297 +297 @@
             GeneralPath path = new GeneralPath();
             for (Way osm: ways){
-                if (osm.isUsable() && !osm.isFiltered()) {
+                if (osm.isUsable() && !osm.isFiltered() && !osm.isDisabled()) {
                     visitVirtual(path, osm);
                 }