Changeset 7100 in josm for trunk/src/org/openstreetmap/josm/gui/tagging

Timestamp:

2014-05-11T01:01:33+02:00 (10 years ago)

Author:

Don-vip

Message:

refactor tagging presets to allow presets-dependent unit tests to update them correctly at runtime

Location:

trunk/src/org/openstreetmap/josm/gui/tagging

Files:

• TaggingPreset.java (modified) (6 diffs)
• TaggingPresetItems.java (modified) (2 diffs)
• TaggingPresetListener.java (added)
• TaggingPresetSelector.java (modified) (11 diffs)
• TaggingPresets.java (added)

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

@@ -44 +44 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Link;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Role;
@@ -199 +198 @@
     private static class PresetPanel extends JPanel {
         boolean hasElements = false;
-        PresetPanel()
-        {
+        PresetPanel() {
             super(new GridBagLayout());
         }
@@ -262 +260 @@
     }
 
-    public boolean isShowable()
-    {
-        for(TaggingPresetItem i : data)
-        {
+    public boolean isShowable() {
+        for(TaggingPresetItem i : data) {
             if(!(i instanceof TaggingPresetItems.Optional || i instanceof TaggingPresetItems.Space || i instanceof TaggingPresetItems.Key))
                 return true;
@@ -495 +491 @@
 
     public static Collection<TaggingPreset> getMatchingPresets(final Collection<TaggingPresetType> t, final Map<String, String> tags, final boolean onlyShowable) {
-        return Utils.filter(TaggingPresetPreference.taggingPresets, new Predicate<TaggingPreset>() {
+        return Utils.filter(TaggingPresets.getTaggingPresets(), new Predicate<TaggingPreset>() {
             @Override
             public boolean evaluate(TaggingPreset object) {
@@ -508 +504 @@
     public class ToolbarButtonAction extends AbstractAction {
         private final int toolbarIndex;
+
+        /**
+         * Constructs a new {@code ToolbarButtonAction}.
+         */
         public ToolbarButtonAction() {
             super("", ImageProvider.get("styles/standard/waypoint","pin"));
@@ -524 +524 @@
 
     public String getToolbarString() {
-        ToolbarPreferences.ActionDefinition aDef
-            = new ToolbarPreferences.ActionDefinition(this);
         ToolbarPreferences.ActionParser actionParser = new ToolbarPreferences.ActionParser(null);
-        return actionParser.saveAction(aDef);
+        return actionParser.saveAction(new ToolbarPreferences.ActionDefinition(this));
     }
 }

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

@@ -50 +50 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
@@ -402 +401 @@
         boolean addToPanel(JPanel p, Collection<OsmPrimitive> sel, boolean presetInitiallyMatches) {
             final String presetName = preset_name;
-            final TaggingPreset t = Utils.filter(TaggingPresetPreference.taggingPresets, new Predicate<TaggingPreset>() {
+            final TaggingPreset t = Utils.filter(TaggingPresets.getTaggingPresets(), new Predicate<TaggingPreset>() {
                 @Override
                 public boolean evaluate(TaggingPreset object) {

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

@@ -47 +47 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Key;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.KeyedItem;
@@ -60 +59 @@
  */
 public class TaggingPresetSelector extends JPanel implements SelectionChangedListener {
-    
+
     private static final int CLASSIFICATION_IN_FAVORITES = 300;
     private static final int CLASSIFICATION_NAME_MATCH = 300;
@@ -68 +67 @@
     private static final BooleanProperty SEARCH_IN_TAGS = new BooleanProperty("taggingpreset.dialog.search-in-tags", true);
     private static final BooleanProperty ONLY_APPLICABLE  = new BooleanProperty("taggingpreset.dialog.only-applicable-to-selection", true);
-    
+
     private JosmTextField edSearchText;
     private JList<TaggingPreset> lsResult;
@@ -208 +207 @@
     public TaggingPresetSelector(boolean displayOnlyApplicable, boolean displaySearchInTags) {
         super(new BorderLayout());
-        if (TaggingPresetPreference.taggingPresets!=null) {
-            loadPresets(TaggingPresetPreference.taggingPresets);
-        }
-        
+        loadPresets(TaggingPresets.getTaggingPresets());
+
         edSearchText = new JosmTextField();
         edSearchText.getDocument().addDocumentListener(new DocumentListener() {
@@ -304 +301 @@
         lsResult.addMouseListener(new PopupMenuLauncher(popupMenu));
     }
-    
+
     private void selectPreset(int newIndex) {
         if (newIndex < 0) {
@@ -389 +386 @@
 
     }
-    
+
     private EnumSet<TaggingPresetType> getTypesInSelection() {
         if (typesInSelectionDirty) {
@@ -412 +409 @@
         return typesInSelection;
     }
-    
+
     @Override
     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
@@ -426 +423 @@
         filterPresets();
     }
-    
+
     public void init(Collection<TaggingPreset> presets) {
         classifications.clear();
@@ -432 +429 @@
         init();
     }
-    
+
     public void clearSelection() {
         lsResult.getSelectionModel().clearSelection();
     }
-    
+
     /**
      * Save checkbox values in preferences for future reuse
@@ -448 +445 @@
         }
     }
-    
+
     /**
      * Determines, which preset is selected at the current moment
@@ -483 +480 @@
         lsResult.setSelectedValue(p, true);
     }
-    
+
     public int getItemCount() {
         return lsResultModel.getSize();
     }
-    
+
     public void setDblClickListener(ActionListener dblClickListener) {
         this.dblClickListener = dblClickListener;
     }
-    
+
     public void setClickListener(ActionListener clickListener) {
         this.clickListener = clickListener;
     }
-    
+
     public void addSelectionListener(final ActionListener selectListener) {
         lsResult.getSelectionModel().addListSelectionListener(new ListSelectionListener() {