Changeset 3201 in josm for trunk

Timestamp:

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

Author:

stoecker

Message:

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

Location:

trunk

Files:

• data/ar.lang (modified) ( previous)
• data/bg.lang (modified) ( previous)
• data/cs.lang (modified) ( previous)
• data/da.lang (modified) ( previous)
• data/de.lang (modified) ( previous)
• data/el.lang (modified) ( previous)
• data/en.lang (modified) ( previous)
• data/en_AU.lang (modified) (1 prop) ( previous)
• data/en_GB.lang (modified) ( previous)
• data/es.lang (modified) ( previous)
• data/et.lang (modified) ( previous)
• data/fi.lang (modified) ( previous)
• data/fr.lang (modified) ( previous)
• data/gl.lang (modified) ( previous)
• data/he.lang (modified) ( previous)
• data/is.lang (modified) ( previous)
• data/it.lang (modified) ( previous)
• data/ja.lang (modified) ( previous)
• data/nb.lang (modified) ( previous)
• data/nl.lang (modified) ( previous)
• data/pl.lang (modified) ( previous)
• data/pt_BR.lang (modified) ( previous)
• data/ro.lang (modified) ( previous)
• data/ru.lang (modified) ( previous)
• data/sk.lang (modified) ( previous)
• data/sl.lang (modified) ( previous)
• data/sv.lang (modified) ( previous)
• data/tr.lang (modified) ( previous)
• data/zh_TW.lang (modified) ( previous)
• src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (modified) (1 diff)
• src/org/openstreetmap/josm/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);
                 }