Changeset 1706 in josm

Timestamp:

Jun 27, 2009 12:37:10 PM (4 years ago)

Author:

stoecker

Message:

fixed some design issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/SplitWayAction.java (modified) (5 diffs)
• corrector/ReverseWayTagCorrector.java (modified) (2 diffs)
• gui/dialogs/CommandStackDialog.java (modified) (1 diff)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -263 +263 @@
 
         }
+        Boolean warnmerole=false;
         Boolean warnme=false;
         // now copy all relations to new way also
@@ -268 +269 @@
             if (r.deleted || r.incomplete) continue;
             Relation c = null;
+            String type = "";
             int i = 0;
+
+            if(r.keys != null)
+                type = r.keys.get("type");
 
             for (RelationMember rm : r.members) {
@@ -274 +279 @@
                     if (rm.member == selectedWay)
                     {
+                        if(!("route".equals(type)) && !("multipolygon".equals(type)))
+                            warnme = true;
                         if (c == null)
                             c = new Relation(r);
@@ -284 +291 @@
                             em.member = wayToAdd;
                             em.role = rm.role;
-                            if(em.role.length() > 0)
-                                warnme = true;
+                            if(em.role.length() > 0 && !("multipolygon".equals(type)))
+                                warnmerole = true;
 
                             j++;
@@ -302 +309 @@
                 commandList.add(new ChangeCommand(r, c));
         }
-        if(warnme)
+        if(warnmerole)
             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."));
+        else if(warnme)
+            JOptionPane.showMessageDialog(Main.parent, tr("A relation membership was copied to all new ways.\nYou should verify this and correct it when necessary."));
 
         NameVisitor v = new NameVisitor();

trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java

@@ -37 +37 @@
                     "^(" + a + "|" + b + ")(" + SEPARATOR + "|$)",
                     Pattern.CASE_INSENSITIVE);
-            endPattern = Pattern.compile(
+            endPattern = Pattern.compile("^.*" +
                     SEPARATOR + "(" + a + "|" + b + ")$",
                     Pattern.CASE_INSENSITIVE);
@@ -64 +64 @@
             new PrefixSuffixSwitcher[] {
                 new PrefixSuffixSwitcher("left", "right"),
-                new PrefixSuffixSwitcher("forward", "backward")
+                new PrefixSuffixSwitcher("forward", "backward"),
+                new PrefixSuffixSwitcher("forwards", "backwards")
             };
 

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

@@ -29 +29 @@
     public CommandStackDialog(final MapFrame mapFrame) {
         super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."),
-        Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}", tr("Command Stack")), KeyEvent.VK_O, Shortcut.GROUP_LAYER), 100);
+        Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}", tr("Command Stack")), KeyEvent.VK_O, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 100);
         Main.main.undoRedo.listenerCommands.add(this);
 

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

@@ -265 +265 @@
 
         buttonPanel.add(createButton(marktr("Remove"),"remove",
-                tr("Remove the member in the current table row from this relation"), KeyEvent.VK_M, new ActionListener() {
+                tr("Remove the member in the current table row from this relation"), KeyEvent.VK_X, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 int[] rows = memberTable.getSelectedRows();