Changeset 4221 in josm

Timestamp:

Jul 10, 2011 9:11:08 PM (23 months 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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/RelationListDialog.java (modified) (5 diffs)
• dialogs/relation/GenericRelationEditor.java (modified) (4 diffs)
• tagging/TaggingPreset.java (modified) (4 diffs)
• tagging/TaggingPresetSearchDialog.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);
+            }
         }
 

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

@@ -44 +44 @@
 import javax.swing.JToolBar;
 import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -282 +283 @@
         cellEditorTextField.setBorder(BorderFactory.createEmptyBorder(1,1,1,1));
         cellEditorTextField.addFocusListener(
-            new FocusAdapter() {
-                @Override public void focusGained(FocusEvent e) {
-                    cellEditorTextField.selectAll();
+                new FocusAdapter() {
+                    @Override public void focusGained(FocusEvent e) {
+                        cellEditorTextField.selectAll();
+                    }
                 }
-            }
         );
         DefaultCellEditor cellEditor = new DefaultCellEditor(cellEditorTextField);
@@ -1100 +1101 @@
          */
         protected void applyNewRelation() {
-            Relation newRelation = new Relation();
+            final Relation newRelation = new Relation();
             tagEditorPanel.getModel().applyToPrimitive(newRelation);
             memberTableModel.applyToRelation(newRelation);
@@ -1130 +1131 @@
                     GenericRelationEditor.this
             );
+            SwingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                        // Relation list gets update in EDT so selecting my be postponed to following EDT run
+                    Main.map.relationListDialog.selectRelation(newRelation);
+                }
+            });
         }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -785 +785 @@
             if (rows != -1)
             {
-                double height = renderer.getListCellRendererComponent(list, 
-                    new PresetListEntry("x"), 0, false, false).getPreferredSize().getHeight() * rows;
+                double height = renderer.getListCellRendererComponent(list,
+                        new PresetListEntry("x"), 0, false, false).getPreferredSize().getHeight() * rows;
                 sp.setPreferredSize(new Dimension((int) sp.getPreferredSize().getWidth(), (int) height));
             }
@@ -1098 +1098 @@
         putValue("toolbar", "tagging_" + getRawName());
         putValue(OPTIONAL_TOOLTIP_TEXT, (group != null ?
-            tr("Use preset ''{0}'' of group ''{1}''", getLocaleName(), group.getName()) :
-            tr("Use preset ''{0}''", getLocaleName())));
-   }
+                tr("Use preset ''{0}'' of group ''{1}''", getLocaleName(), group.getName()) :
+                    tr("Use preset ''{0}''", getLocaleName())));
+    }
 
     public String getLocaleName() {
@@ -1369 +1369 @@
             }
         } else if (answer == DIALOG_ANSWER_NEW_RELATION) {
-            List<Command> cmds = new ArrayList<Command>(2);
             final Relation r = new Relation();
             final Collection<RelationMember> members = new HashSet<RelationMember>();
@@ -1375 +1374 @@
                 r.put(t.getKey(), t.getValue());
             }
-            for(OsmPrimitive osm : sel) {
+            for(OsmPrimitive osm : Main.main.getCurrentDataSet().getSelected()) {
                 RelationMember rm = new RelationMember("", osm);
                 r.addMember(rm);

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSearchDialog.java

@@ -40 +40 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference;
@@ -56 +57 @@
     private int CLASSIFICATION_GROUP_MATCH = 200;
     private int CLASSIFICATION_TAGS_MATCH = 100;
+
+    private final BooleanProperty SEARCH_IN_TAGS = new BooleanProperty("taggingpreset.dialog.search-in-tags", true);
+    private final BooleanProperty ONLY_APPLICABLE  = new BooleanProperty("taggingpreset.dialog.only-applicable-to-selection", true);
 
     private static class ResultListCellRenderer extends DefaultListCellRenderer {
@@ -286 +290 @@
             ckOnlyApplicable.setEnabled(false);
         } else {
-            ckOnlyApplicable.setSelected(true);
+            ckOnlyApplicable.setSelected(ONLY_APPLICABLE.get());
             ckOnlyApplicable.addItemListener(new ItemListener() {
                 @Override
@@ -297 +301 @@
         ckSearchInTags = new JCheckBox();
         ckSearchInTags.setText(tr("Search in tags"));
-        ckSearchInTags.setSelected(Main.pref.getBoolean("taggingpreset.dialog.search-in-tags", true));
+        ckSearchInTags.setSelected(SEARCH_IN_TAGS.get());
         ckSearchInTags.addItemListener(new ItemListener() {
             @Override
@@ -432 +436 @@
         }
 
-        Main.pref.put("taggingpreset.dialog.search-in-tags", ckSearchInTags.isSelected());
+        SEARCH_IN_TAGS.put(ckSearchInTags.isSelected());
+        if (ckOnlyApplicable.isEnabled()) {
+            ONLY_APPLICABLE.put(ckOnlyApplicable.isSelected());
+        }
     }