Changeset 5391 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2012-08-04T16:33:49+02:00 (12 years ago)

Author:

bastiK

Message:

add session support for imagery layers

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (2 diffs)
• imagery/ImageryInfo.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1288 +1288 @@
     }
 
-    private <T> Map<String,String> serializeStruct(T struct, Class<T> klass) {
+    public static <T> Map<String,String> serializeStruct(T struct, Class<T> klass) {
         T structPrototype;
         try {
@@ -1321 +1321 @@
     }
 
-    private <T> T deserializeStruct(Map<String,String> hash, Class<T> klass) {
+    public static <T> T deserializeStruct(Map<String,String> hash, Class<T> klass) {
         T struct = null;
         try {

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

@@ -3 +3 @@
 
 import java.awt.Image;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -13 +13 @@
 import javax.swing.ImageIcon;
 
+import org.openstreetmap.gui.jmapviewer.Coordinate;
+import org.openstreetmap.gui.jmapviewer.interfaces.Attributed;
+import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource.Mapnik;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -19 +23 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.gui.jmapviewer.Coordinate;
-import org.openstreetmap.gui.jmapviewer.interfaces.Attributed;
-import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource.Mapnik;
-import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTileSource;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**