Changeset 4221 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

Timestamp:

2011-07-10T21:11:08+02:00 (13 years ago)

Author:

jttt

Message:

Select new relation in relation list, save "apply only to selection" option in preset search dialog, make selected objects members of newly created relation

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (5 diffs)

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

@@ -14 +14 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -431 +430 @@
         public SelectAction(boolean add) {
             putValue(SHORT_DESCRIPTION, add ? tr("Add the selected relations to the current selection")
-            : tr("Set the current selection to the list of selected relations"));
+                    : tr("Set the current selection to the list of selected relations"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
             putValue(NAME, add ? tr("Select relation (add)") : tr("Select relation"));
@@ -446 +445 @@
                 selection.add(model.getRelation(i));
             }
-            if(add)
+            if(add) {
                 Main.map.mapView.getEditLayer().data.addSelected(selection);
-            else
+            } else {
                 Main.map.mapView.getEditLayer().data.setSelected(selection);
+            }
         }
 
@@ -469 +469 @@
         public SelectMembersAction(boolean add) {
             putValue(SHORT_DESCRIPTION,add ? tr("Add the members of all selected relations to current selection")
-            : tr("Select the members of all selected relations"));
+                    : tr("Select the members of all selected relations"));
             putValue(SMALL_ICON, ImageProvider.get("selectall"));
             putValue(NAME, add ? tr("Select members (add)") : tr("Select members"));
@@ -483 +483 @@
                 members.addAll(r.getMemberPrimitives());
             }
-            if(add)
+            if(add) {
                 Main.map.mapView.getEditLayer().data.addSelected(members);
-            else
+            } else {
                 Main.map.mapView.getEditLayer().data.setSelected(members);
+            }
         }