Changeset 6271 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

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

Author:

Don-vip

Message:

fix #9116 - Remember active layer in session

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• SessionLoadAction.java (modified) (3 diffs)
• SessionSaveAsAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java

@@ -67 +67 @@
         private final boolean zip;
         private List<Layer> layers;
+        private Layer active;
         private List<Runnable> postLoadTasks;
         private ViewportData viewport;
@@ -122 +123 @@
                             if (canceled) return;
                             Main.main.addLayer(l);
+                        }
+                        if (active != null) {
+                            Main.map.mapView.setActiveLayer(active);
                         }
                         if (noMap) {
@@ -158 +162 @@
                     reader.loadSession(file, zip, monitor);
                     layers = reader.getLayers();
+                    active = reader.getActive();
                     postLoadTasks = reader.getPostLoadTasks();
                     viewport = reader.getViewport();

trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java

@@ -123 +123 @@
             layersOut.add(layer);
         }
-
-        SessionWriter sw = new SessionWriter(layersOut, exporters, dependencies, zip);
+        
+        int active = -1;
+        Layer activeLayer = Main.map.mapView.getActiveLayer();
+        if (activeLayer != null) {
+            active = layersOut.indexOf(activeLayer);
+        }
+
+        SessionWriter sw = new SessionWriter(layersOut, active, exporters, dependencies, zip);
         try {
             sw.write(file);
@@ -157 +163 @@
         }
 
+        /**
+         * Initializes action.
+         */
         public void initialize() {
             layers = new ArrayList<Layer>(Main.map.mapView.getAllLayersAsList());
@@ -196 +205 @@
         }
 
-        public Component build() {
+        protected Component build() {
             JPanel p = new JPanel(new GridBagLayout());
             JPanel ip = new JPanel(new GridBagLayout());