Changeset 10363 in josm for trunk/src/org

Timestamp:

2016-06-12T20:40:45+02:00 (8 years ago)

Author:

stoecker

Message:

gsoc-core - patch by Michael Zangl - fix #12955 - remove deprecation usage

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/PowerLines.java (modified) (4 diffs)
• gui/tagging/presets/TaggingPreset.java (modified) (9 diffs)

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

@@ -42 +42 @@
     /** Values for {@code power} key interpreted as power stations */
     protected static final Collection<String> POWER_STATION_TAGS = Arrays.asList("station", "sub_station", "substation", "plant", "generator");
+    /** Values for {@code building} key interpreted as power stations */
+    protected static final Collection<String> BUILDING_STATION_TAGS = Arrays.asList("transformer_tower");
     /** Values for {@code power} key interpreted as allowed power items */
     protected static final Collection<String> POWER_ALLOWED_TAGS = Arrays.asList("switch", "transformer", "busbar", "generator", "switchgear",
@@ -174 +176 @@
      */
     protected static final boolean isPowerStation(OsmPrimitive p) {
-        return isPowerIn(p, POWER_STATION_TAGS);
+        return isPowerIn(p, POWER_STATION_TAGS) || isBuildingIn(p, BUILDING_STATION_TAGS);
     }
 
@@ -196 +198 @@
 
     /**
-     * Helper function to check if power tags is a certain value.
+     * Helper function to check if power tag is a certain value.
      * @param p The primitive to be tested
      * @param values List of possible values
@@ -203 +205 @@
     private static boolean isPowerIn(OsmPrimitive p, Collection<String> values) {
         String v = p.get("power");
+        return v != null && values != null && values.contains(v);
+    }
+
+    /**
+     * Helper function to check if building tag is a certain value.
+     * @param p The primitive to be tested
+     * @param values List of possible values
+     * @return {@code true} if power key is set and equal to possible values
+     */
+    private static boolean isBuildingIn(OsmPrimitive p, Collection<String> values) {
+        String v = p.get("building");
         return v != null && values != null && values.contains(v);
     }

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

@@ -43 +43 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
-import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
 import org.openstreetmap.josm.gui.tagging.presets.items.Key;
@@ -75 +75 @@
  * @since 294
  */
-public class TaggingPreset extends AbstractAction implements MapView.LayerChangeListener, Predicate<OsmPrimitive> {
+public class TaggingPreset extends AbstractAction implements ActiveLayerChangeListener, Predicate<OsmPrimitive> {
 
     public static final int DIALOG_ANSWER_APPLY = 1;
@@ -113 +113 @@
      */
     public TaggingPreset() {
-        MapView.addLayerChangeListener(this);
+        Main.getLayerManager().addActiveLayerChangeListener(this);
         updateEnabledState();
     }
@@ -480 +480 @@
     }
 
+    /**
+     * Gets a list of tags that are set by this preset.
+     * @return The list of tags.
+     */
     public List<Tag> getChangedTags() {
         List<Tag> result = new ArrayList<>();
@@ -488 +492 @@
     }
 
+    /**
+     * Create a command to change the given list of tags.
+     * @param sel The primitives to change the tags for
+     * @param changedTags The tags to change
+     * @return A command that changes the tags.
+     */
     public static Command createCommand(Collection<OsmPrimitive> sel, List<Tag> changedTags) {
         List<Command> cmds = new ArrayList<>();
@@ -514 +524 @@
 
     @Override
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        updateEnabledState();
-    }
-
-    @Override
-    public void layerAdded(Layer newLayer) {
-        updateEnabledState();
-    }
-
-    @Override
-    public void layerRemoved(Layer oldLayer) {
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
         updateEnabledState();
     }
@@ -533 +533 @@
     }
 
+    /**
+     * Determines whether this preset matches the types.
+     * @param t The types that must match
+     * @return <code>true</code> if all types match.
+     */
     public boolean typeMatches(Collection<TaggingPresetType> t) {
         return t == null || types == null || types.containsAll(t);
@@ -558 +563 @@
      */
     public boolean matches(Collection<TaggingPresetType> t, Map<String, String> tags, boolean onlyShowable) {
-        if (onlyShowable && !isShowable())
+        if ((onlyShowable && !isShowable()) || !typeMatches(t)) {
             return false;
-        else if (!typeMatches(t))
-            return false;
-        else
+        } else {
             return TaggingPresetItem.matches(data, tags);
+        }
     }
 
@@ -590 +594 @@
     }
 
+    /**
+     * Gets a string describing this preset that can be used for the toolbar
+     * @return A String that can be passed on to the toolbar
+     * @see ToolbarPreferences#addCustomButton(String, int, boolean)
+     */
     public String getToolbarString() {
         ToolbarPreferences.ActionParser actionParser = new ToolbarPreferences.ActionParser(null);