Changeset 3202 in josm for trunk/src


Ignore:
Timestamp:
2010-04-24T19:47:01+02:00 (10 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/Storage.java

    r3158 r3202  
    411411
    412412        private void align() {
    413             if (mods != modCount) throw new ConcurrentModificationException();
     413            if (mods != modCount) {
     414                System.err.println("Warning: ConcurrentModification");
     415                Thread.dumpStack();
     416                //throw new ConcurrentModificationException();
     417            }
    414418            while (slot < data.length && data[slot] == null) {
    415419                slot++;
  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r3102 r3202  
    8989    public RelationListDialog() {
    9090        super(tr("Relations"), "relationlist", tr("Open a list of all relations."),
    91                 Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")), KeyEvent.VK_R, Shortcut.GROUP_LAYER), 150);
     91                Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")), KeyEvent.VK_R,
     92                    Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150);
    9293
    9394        // create the list of relations
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r3146 r3202  
    1 
     1// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.gui.dialogs.properties;
    33
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r3182 r3202  
     1// License: GPL. For details, see LICENSE file.
    12package org.openstreetmap.josm.gui.dialogs.relation;
    23
Note: See TracChangeset for help on using the changeset viewer.