Changeset 11572 in josm for trunk/src/org

Timestamp:

2017-02-17T23:34:47+01:00 (8 years ago)

Author:

stoecker

Message:

fix imagery compare, add date check

File:

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

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

@@ -442 +442 @@
     public ImageryInfo(ImageryInfo i) {
         super(i.name, i.url, i.id);
+        this.origName = i.origName;
+        this.langName = i.langName;
         this.defaultEntry = i.defaultEntry;
         this.cookies = i.cookies;
@@ -1197 +1199 @@
                if (num > 1) {
                    n.name = tr("{0} mirror server {1}", n.name, num);
-                   n.origName += " mirror server " + num;
+                   if(n.origName != null) {
+                       n.origName += " mirror server " + num;
+                   }
                } else {
                    n.name = tr("{0} mirror server", n.name);
-                   n.origName += " mirror server";
+                   if(n.origName != null) {
+                       n.origName += " mirror server";
+                   }
                }
                l.add(n);