Changeset 6271 in josm for trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

Timestamp:

2013-09-30T02:51:34+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #9116 - Remember active layer in session

File:

• trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -89 +89 @@
     private ZipFile zipFile;
     private List<Layer> layers = new ArrayList<Layer>();
+    private int active = -1;
     private List<Runnable> postLoadTasks = new ArrayList<Runnable>();
     private ViewportData viewport;
@@ -97 +98 @@
     public List<Layer> getLayers() {
         return layers;
+    }
+
+    /**
+     * @return active layer, or {@code null} if not set
+     * @since 6271
+     */
+    public Layer getActive() {
+        // layers is in reverse order because of the way TreeMap is built
+        return (active >= 0 && active < layers.size()) ? layers.get(layers.size()-1-active) : null;
     }
 
@@ -327 +337 @@
         if (layersEl == null) return;
 
+        String activeAtt = layersEl.getAttribute("active");
+        try {
+            active = (activeAtt != null && !activeAtt.isEmpty()) ? Integer.parseInt(activeAtt)-1 : -1;
+        } catch (NumberFormatException e) {
+            Main.warn("Unsupported value for 'active' layer attribute. Ignoring it. Error was: "+e.getMessage());
+            active = -1;
+        }
+        
         MultiMap<Integer, Integer> deps = new MultiMap<Integer, Integer>();
         Map<Integer, Element> elems = new HashMap<Integer, Element>();