Changeset 12084 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

Timestamp:

2017-05-07T17:34:41+02:00 (7 years ago)

Author:

bastiK

Message:

offset bookmarks: migrate preferences from lists to key=value maps (+add getters & setters) (see #14734)

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -54 +54 @@
 import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
@@ -783 +784 @@
 
         private static boolean confirmEulaAcceptance(PreferenceTabbedPane gui, String eulaUrl) {
-            URL url = null;
+            URL url;
             try {
                 url = new URL(eulaUrl.replaceAll("\\{lang\\}", LanguageInfo.getWikiLanguagePrefix()));
-                JosmEditorPane htmlPane = null;
+                JosmEditorPane htmlPane;
                 try {
                     htmlPane = new JosmEditorPane(url);
@@ -904 +905 @@
                 switch (column) {
                 case 0:
-                    if (info.projectionCode == null) return "";
-                    return info.projectionCode;
+                    if (info.getProjectionCode() == null) return "";
+                    return info.getProjectionCode();
                 case 1:
-                    return info.layerName;
+                    return info.getImageryName();
                 case 2:
-                    return info.name;
+                    return info.getName();
                 case 3:
-                    return info.dx;
+                    return info.getOffset().east();
                 case 4:
-                    return info.dy;
+                    return info.getOffset().north();
                 default:
                     throw new ArrayIndexOutOfBoundsException();
@@ -924 +925 @@
                 switch (column) {
                 case 1:
-                    info.layerName = o.toString();
+                    info.setImageryName(o.toString());
                     break;
                 case 2:
-                    info.name = o.toString();
+                    info.setName(o.toString());
                     break;
                 case 3:
-                    info.dx = Double.parseDouble((String) o);
+                    double dx = Double.parseDouble((String) o);
+                    info.setOffset(new EastNorth(dx, info.getOffset().north()));
                     break;
                 case 4:
-                    info.dy = Double.parseDouble((String) o);
+                    double dy = Double.parseDouble((String) o);
+                    info.setOffset(new EastNorth(info.getOffset().east(), dy));
                     break;
                 default: