Changeset 12825 in josm for trunk/src/org/openstreetmap/josm/data/preferences

Timestamp:

2017-09-11T20:43:41+02:00 (8 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - make FileWatcher generic so it has no more dependence on MapCSS

Location:

trunk/src/org/openstreetmap/josm/data/preferences/sources

Files:

• ExtendedSourceEntry.java (modified) (1 diff)
• MapPaintPrefHelper.java (modified) (3 diffs)
• PresetPrefHelper.java (modified) (2 diffs)
• SourceEntry.java (modified) (6 diffs)
• SourcePrefHelper.java (modified) (1 diff)
• ValidatorPrefHelper.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/sources/ExtendedSourceEntry.java

@@ -28 +28 @@
     /**
      * Constructs a new {@code ExtendedSourceEntry}.
+     * @param type type of source entry
      * @param simpleFileName file name used for display
      * @param url URL that {@link org.openstreetmap.josm.io.CachedFile} understands
+     * @since 12825
      */
-    public ExtendedSourceEntry(String simpleFileName, String url) {
-        super(url, null, null, true);
+    public ExtendedSourceEntry(SourceType type, String simpleFileName, String url) {
+        super(type, url, null, null, true);
         this.simpleFileName = simpleFileName;
     }

trunk/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java

@@ -30 +30 @@
      */
     public MapPaintPrefHelper() {
-        super("mappaint.style.entries");
+        super("mappaint.style.entries", SourceType.MAP_PAINT_STYLE);
     }
 
@@ -80 +80 @@
     @Override
     public Collection<ExtendedSourceEntry> getDefault() {
-        ExtendedSourceEntry defJosmMapcss = new ExtendedSourceEntry("elemstyles.mapcss", "resource://styles/standard/elemstyles.mapcss");
+        ExtendedSourceEntry defJosmMapcss = new ExtendedSourceEntry(type, "elemstyles.mapcss", "resource://styles/standard/elemstyles.mapcss");
         defJosmMapcss.active = true;
         defJosmMapcss.name = "standard";
         defJosmMapcss.title = tr("JOSM default (MapCSS)");
         defJosmMapcss.description = tr("Internal style to be used as base for runtime switchable overlay styles");
-        ExtendedSourceEntry defPL2 = new ExtendedSourceEntry("potlatch2.mapcss", "resource://styles/standard/potlatch2.mapcss");
+        ExtendedSourceEntry defPL2 = new ExtendedSourceEntry(type, "potlatch2.mapcss", "resource://styles/standard/potlatch2.mapcss");
         defPL2.active = false;
         defPL2.name = "standard";
@@ -108 +108 @@
     @Override
     public SourceEntry deserialize(Map<String, String> s) {
-        return new SourceEntry(s.get("url"), s.get("ptoken"), s.get("title"), Boolean.parseBoolean(s.get("active")));
+        return new SourceEntry(type, s.get("url"), s.get("ptoken"), s.get("title"), Boolean.parseBoolean(s.get("active")));
     }
 }

trunk/src/org/openstreetmap/josm/data/preferences/sources/PresetPrefHelper.java

@@ -24 +24 @@
      */
     public PresetPrefHelper() {
-        super("taggingpreset.entries");
+        super("taggingpreset.entries", SourceType.TAGGING_PRESET);
     }
 
     @Override
     public Collection<ExtendedSourceEntry> getDefault() {
-        ExtendedSourceEntry i = new ExtendedSourceEntry("defaultpresets.xml", "resource://data/defaultpresets.xml");
+        ExtendedSourceEntry i = new ExtendedSourceEntry(type, "defaultpresets.xml", "resource://data/defaultpresets.xml");
         i.title = tr("Internal Preset");
         i.description = tr("The default preset for JOSM");
@@ -45 +45 @@
     @Override
     public SourceEntry deserialize(Map<String, String> s) {
-        return new SourceEntry(s.get("url"), null, s.get("title"), true);
+        return new SourceEntry(type, s.get("url"), null, s.get("title"), true);
     }
 }

trunk/src/org/openstreetmap/josm/data/preferences/sources/SourceEntry.java

@@ -19 +19 @@
 
     /**
+     * The type of source entry.
+     * @since 12825
+     **/
+    public final SourceType type;
+
+    /**
      *  A URL can be anything that CachedFile understands, i.e.
      *  a local file, http://, or a file from the current jar
@@ -58 +64 @@
     /**
      * Constructs a new {@code SourceEntry}.
+     * @param type type of source entry
      * @param url URL that {@link org.openstreetmap.josm.io.CachedFile} understands
      * @param isZip if url is a zip file and the resource is inside the zip file
@@ -70 +77 @@
      * @see #title
      * @see #active
-     */
-    public SourceEntry(String url, boolean isZip, String zipEntryPath, String name, String title, boolean active) {
+     * @since 12825
+     */
+    public SourceEntry(SourceType type, String url, boolean isZip, String zipEntryPath, String name, String title, boolean active) {
+        this.type = type;
         this.url = url;
         this.isZip = isZip;
@@ -82 +91 @@
     /**
      * Constructs a new {@code SourceEntry}.
+     * @param type type of source entry
      * @param url URL that {@link org.openstreetmap.josm.io.CachedFile} understands
      * @param name Source name
@@ -90 +100 @@
      * @see #title
      * @see #active
-     */
-    public SourceEntry(String url, String name, String title, boolean active) {
-        this(url, false, null, name, title, active);
+     * @since 12825
+     */
+    public SourceEntry(SourceType type, String url, String name, String title, boolean active) {
+        this(type, url, false, null, name, title, active);
     }
 
@@ -100 +111 @@
      */
     public SourceEntry(SourceEntry e) {
+        this.type = e.type;
         this.url = e.url;
         this.isZip = e.isZip;

trunk/src/org/openstreetmap/josm/data/preferences/sources/SourcePrefHelper.java

@@ -19 +19 @@
 
     private final String pref;
+    protected final SourceType type;
 
     /**
      * Constructs a new {@code SourcePrefHelper} for the given preference key.
      * @param pref The preference key
+     * @param type The source type
+     * @since 12825
      */
-    public SourcePrefHelper(String pref) {
+    public SourcePrefHelper(String pref, SourceType type) {
         this.pref = pref;
+        this.type = type;
     }
 

trunk/src/org/openstreetmap/josm/data/preferences/sources/ValidatorPrefHelper.java

@@ -55 +55 @@
      */
     public ValidatorPrefHelper() {
-        super(MapCSSTagChecker.ENTRIES_PREF_KEY);
+        super(MapCSSTagChecker.ENTRIES_PREF_KEY, SourceType.TAGCHECKER_RULE);
     }
 
@@ -80 +80 @@
     }
 
-    private static void addDefault(List<ExtendedSourceEntry> defaults, String filename, String title, String description) {
-        ExtendedSourceEntry i = new ExtendedSourceEntry(filename+".mapcss", "resource://data/validator/"+filename+".mapcss");
+    private void addDefault(List<ExtendedSourceEntry> defaults, String filename, String title, String description) {
+        ExtendedSourceEntry i = new ExtendedSourceEntry(type, filename+".mapcss", "resource://data/validator/"+filename+".mapcss");
         i.title = title;
         i.description = description;
@@ -98 +98 @@
     @Override
     public SourceEntry deserialize(Map<String, String> s) {
-        return new SourceEntry(s.get("url"), null, s.get("title"), Boolean.parseBoolean(s.get("active")));
+        return new SourceEntry(type, s.get("url"), null, s.get("title"), Boolean.parseBoolean(s.get("active")));
     }
 }