Changeset 15583 in josm

Timestamp:

2019-12-11T19:09:28+01:00 (6 years ago)

Author:

GerdP

Message:

see #18381: implement TaggingPresetListener to react on changes in tagging presets
regression from r15582

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/RelationChecker.java (modified) (4 diffs)
• data/validation/tests/TagChecker.java (modified) (4 diffs)
• gui/tagging/presets/TaggingPresetSelector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetListener;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
@@ -39 +40 @@
  * @since 3669
  */
-public class RelationChecker extends Test {
+public class RelationChecker extends Test implements TaggingPresetListener {
 
     // CHECKSTYLE.OFF: SingleSpaceSeparator
@@ -80 +81 @@
     @Override
     public void initialize() {
+        TaggingPresets.addListener(this);
         initializePresets();
     }
@@ -376 +378 @@
         return testError.getCode() == RELATION_EMPTY && !primitives.isEmpty() && primitives.iterator().next().isNew();
     }
+
+    @Override
+    public void taggingPresetsModified() {
+        relationpresets.clear();
+        initializePresets();
+    }
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -43 +43 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetListener;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.gui.tagging.presets.items.Check;
@@ -61 +62 @@
  * @since 3669
  */
-public class TagChecker extends TagTest {
+public class TagChecker extends TagTest implements TaggingPresetListener {
 
     /** The config file of ignored tags */
@@ -182 +183 @@
     @Override
     public void initialize() throws IOException {
+        TaggingPresets.addListener(this);
         initializeData();
         initializePresets();
@@ -1009 +1011 @@
         return false;
     }
+
+    @Override
+    public void taggingPresetsModified() {
+        try {
+            initializeData();
+            initializePresets();
+            analysePresets();
+        } catch (IOException e) {
+            Logging.error(e);
+        }
+    }
 }

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

@@ -53 +53 @@
  * @since 6068
  */
-public class TaggingPresetSelector extends SearchTextResultListPanel<TaggingPreset> implements DataSelectionListener {
+public class TaggingPresetSelector extends SearchTextResultListPanel<TaggingPreset>
+        implements DataSelectionListener, TaggingPresetListener {
 
     private static final int CLASSIFICATION_IN_FAVORITES = 300;
@@ -194 +195 @@
         lsResult.setCellRenderer(new ResultListCellRenderer());
         classifications.loadPresets(TaggingPresets.getTaggingPresets());
+        TaggingPresets.addListener(this);
 
         JPanel pnChecks = new JPanel();
@@ -437 +439 @@
         lsResult.setSelectedValue(p, true);
     }
+
+    @Override
+    public void taggingPresetsModified() {
+        classifications.clear();
+        classifications.loadPresets(TaggingPresets.getTaggingPresets());
+    }
 }