Changeset 3202 in josm for trunk/src

Timestamp:

2010-04-24T19:47:01+02:00 (14 years ago)

Author:

bastiK

Message:

preliminary fix for (see #4861) (Don't raise exception, just give warning on the console)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Storage.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/Storage.java

@@ -411 +411 @@
 
         private void align() {
-            if (mods != modCount) throw new ConcurrentModificationException();
+            if (mods != modCount) {
+                System.err.println("Warning: ConcurrentModification");
+                Thread.dumpStack();
+                //throw new ConcurrentModificationException();
+            }
             while (slot < data.length && data[slot] == null) {
                 slot++;

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -89 +89 @@
     public RelationListDialog() {
         super(tr("Relations"), "relationlist", tr("Open a list of all relations."),
-                Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")), KeyEvent.VK_R, Shortcut.GROUP_LAYER), 150);
+                Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")), KeyEvent.VK_R,
+                    Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
 
         // create the list of relations

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -1 @@
-
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs.properties;
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.dialogs.relation;