Changeset 1706 in josm


Ignore:
Timestamp:
2009-06-27T12:37:10+02:00 (10 years ago)
Author:
stoecker
Message:

fixed some design issues

Location:
trunk/src/org/openstreetmap/josm
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

    r1609 r1706  
    263263
    264264        }
     265        Boolean warnmerole=false;
    265266        Boolean warnme=false;
    266267        // now copy all relations to new way also
     
    268269            if (r.deleted || r.incomplete) continue;
    269270            Relation c = null;
     271            String type = "";
    270272            int i = 0;
     273
     274            if(r.keys != null)
     275                type = r.keys.get("type");
    271276
    272277            for (RelationMember rm : r.members) {
     
    274279                    if (rm.member == selectedWay)
    275280                    {
     281                        if(!("route".equals(type)) && !("multipolygon".equals(type)))
     282                            warnme = true;
    276283                        if (c == null)
    277284                            c = new Relation(r);
     
    284291                            em.member = wayToAdd;
    285292                            em.role = rm.role;
    286                             if(em.role.length() > 0)
    287                                 warnme = true;
     293                            if(em.role.length() > 0 && !("multipolygon".equals(type)))
     294                                warnmerole = true;
    288295
    289296                            j++;
     
    302309                commandList.add(new ChangeCommand(r, c));
    303310        }
    304         if(warnme)
     311        if(warnmerole)
    305312            JOptionPane.showMessageDialog(Main.parent, tr("A role based relation membership was copied to all new ways.\nYou should verify this and correct it when necessary."));
     313        else if(warnme)
     314            JOptionPane.showMessageDialog(Main.parent, tr("A relation membership was copied to all new ways.\nYou should verify this and correct it when necessary."));
    306315
    307316        NameVisitor v = new NameVisitor();
  • trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

    r1614 r1706  
    3737                    "^(" + a + "|" + b + ")(" + SEPARATOR + "|$)",
    3838                    Pattern.CASE_INSENSITIVE);
    39             endPattern = Pattern.compile(
     39            endPattern = Pattern.compile("^.*" +
    4040                    SEPARATOR + "(" + a + "|" + b + ")$",
    4141                    Pattern.CASE_INSENSITIVE);
     
    6464            new PrefixSuffixSwitcher[] {
    6565                new PrefixSuffixSwitcher("left", "right"),
    66                 new PrefixSuffixSwitcher("forward", "backward")
     66                new PrefixSuffixSwitcher("forward", "backward"),
     67                new PrefixSuffixSwitcher("forwards", "backwards")
    6768            };
    6869
  • trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

    r1228 r1706  
    2929    public CommandStackDialog(final MapFrame mapFrame) {
    3030        super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."),
    31         Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}", tr("Command Stack")), KeyEvent.VK_O, Shortcut.GROUP_LAYER), 100);
     31        Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}", tr("Command Stack")), KeyEvent.VK_O, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 100);
    3232        Main.main.undoRedo.listenerCommands.add(this);
    3333
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r1696 r1706  
    265265
    266266        buttonPanel.add(createButton(marktr("Remove"),"remove",
    267                 tr("Remove the member in the current table row from this relation"), KeyEvent.VK_M, new ActionListener() {
     267                tr("Remove the member in the current table row from this relation"), KeyEvent.VK_X, new ActionListener() {
    268268            public void actionPerformed(ActionEvent e) {
    269269                int[] rows = memberTable.getSelectedRows();
Note: See TracChangeset for help on using the changeset viewer.