Changeset 8634 in josm for trunk/src/org

Timestamp:

2015-08-01T23:17:42+02:00 (9 years ago)

Author:

Don-vip

Message:

proper JOSM/JMapViewer integration

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -374 +374 @@
      */
     public ImageryInfo(ImageryPreferenceEntry e) {
+        super(e.name, e.url, e.id);
         CheckParameterUtil.ensureParameterNotNull(e.name, "name");
         CheckParameterUtil.ensureParameterNotNull(e.url, "url");
-        name = e.name;
-        id = e.id;
-        url = e.url;
         description = e.description;
         cookies = e.cookies;
@@ -422 +420 @@
      */
     public ImageryInfo(ImageryInfo i) {
-        this.name = i.name;
-        this.id = i.id;
-        this.url = i.url;
+        super(i.name, i.url, i.id);
         this.defaultEntry = i.defaultEntry;
         this.cookies = i.cookies;
@@ -680 +676 @@
      * Returns the entry name.
      * @return The entry name
-     */
-    @Override
-    public String getName() {
-        return this.name;
-    }
-
-    /**
-     * Returns the entry name.
-     * @return The entry name
      * @since 6968
      */
     public String getOriginalName() {
         return this.origName != null ? this.origName : this.name;
-    }
-
-    /**
-     * Sets the entry name.
-     * @param name The entry name
-     */
-    public void setName(String name) {
-        this.name = name;
     }
 
@@ -720 +699 @@
     }
 
-    /**
-     * Gets the entry id.
-     *
-     * Id can be null. This gets the configured id as is. Due to a user error,
-     * this may not be unique. Use {@link ImageryLayerInfo#getUniqueId} to ensure
-     * a unique value.
-     * @return the id
-     */
-    public String getId() {
-        return this.id;
-    }
-
-    /**
-     * Sets the entry id.
-     * @param id the entry id
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
     public void clearId() {
         if (this.id != null) {
@@ -746 +705 @@
             Main.pref.putCollection("imagery.layers.addedIds", newAddedIds);
         }
-        this.id = null;
-    }
-
-    /**
-     * Returns the entry URL.
-     * @return The entry URL
-     */
-    @Override
-    public String getUrl() {
-        return this.url;
-    }
-
-    /**
-     * Sets the entry URL.
-     * @param url The entry URL
-     */
-    public void setUrl(String url) {
-        this.url = url;
+        setId(null);
     }