Changeset 33774 in osm for applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetWatcher.java

Timestamp:

2017-11-05T19:09:17+01:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 12840

File:

• applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetWatcher.java (modified) (7 diffs)

applications/editors/josm/plugins/imagery_offset_db/src/iodb/ImageryOffsetWatcher.java

@@ -3 +3 @@
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -116 +115 @@
             return;
         }
-        AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();
+        AbstractTileSourceLayer<?> layer = ImageryOffsetTools.getTopImageryLayer();
         if (layer == null) {
             setOffsetGood(true);
@@ -158 +157 @@
      */
     public void markGood() {
-        AbstractTileSourceLayer layer = ImageryOffsetTools.getTopImageryLayer();
+        AbstractTileSourceLayer<?> layer = ImageryOffsetTools.getTopImageryLayer();
         if (layer != null) {
             TileSourceDisplaySettings displaySettings = layer.getDisplaySettings();
@@ -205 +204 @@
         Layer newLayer = e.getAddedLayer();
         if (newLayer instanceof AbstractTileSourceLayer)
-            loadLayerOffset((AbstractTileSourceLayer) newLayer);
+            loadLayerOffset((AbstractTileSourceLayer<?>) newLayer);
         checkOffset();
     }
@@ -223 +222 @@
      * projections: nobody uses them anyway.
      */
-    private void storeLayerOffset(AbstractTileSourceLayer layer) {
+    private void storeLayerOffset(AbstractTileSourceLayer<?> layer) {
         String id = ImageryOffsetTools.getImageryID(layer);
         if (!Main.pref.getBoolean("iodb.remember.offsets", true) || id == null)
             return;
-        Collection<String> offsets = new LinkedList<>(Main.pref.getCollection("iodb.stored.offsets"));
+        List<String> offsets = new LinkedList<>(Main.pref.getList("iodb.stored.offsets"));
         for (Iterator<String> iter = offsets.iterator(); iter.hasNext();) {
             String[] offset = iter.next().split(":");
@@ -236 +235 @@
         offsets.add(id + ":" + center.lat() + ":" + center.lon() + ":" +
                 layer.getDisplaySettings().getDx() + ":" + layer.getDisplaySettings().getDy());
-        Main.pref.putCollection("iodb.stored.offsets", offsets);
+        Main.pref.putList("iodb.stored.offsets", offsets);
     }
 
@@ -242 +241 @@
      * Loads the current imagery layer offset from preferences.
      */
-    private void loadLayerOffset(AbstractTileSourceLayer layer) {
+    private void loadLayerOffset(AbstractTileSourceLayer<?> layer) {
         String id = ImageryOffsetTools.getImageryID(layer);
         if (!Main.pref.getBoolean("iodb.remember.offsets", true) || id == null)
             return;
-        Collection<String> offsets = Main.pref.getCollection("iodb.stored.offsets");
+        List<String> offsets = Main.pref.getList("iodb.stored.offsets");
         for (String offset : offsets) {
             String[] parts = offset.split(":");