Changeset 4668 in josm

Timestamp:

Dec 20, 2011 6:15:44 PM (17 months ago)

Author:

bastiK

Message:

session support (first part, see #4029)

Idea: Save and load the current session, i.e. list of open layers and possibly more.
This change includes only support for reading session files and only for osm-data layers.

session.svg: Public Domain

Location:

trunk

Files:

• images/session.png (added)
• images_nodist/session.svg (added)
• src/org/openstreetmap/josm/actions/SessionLoadAction.java (added)
• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (6 diffs)
• src/org/openstreetmap/josm/io/OsmImporter.java (modified) (4 diffs)
• src/org/openstreetmap/josm/io/session (added)
• src/org/openstreetmap/josm/io/session/OsmDataSessionImporter.java (added)
• src/org/openstreetmap/josm/io/session/SessionLayerImporter.java (added)
• src/org/openstreetmap/josm/io/session/SessionReader.java (added)
• src/org/openstreetmap/josm/tools/MultiMap.java (modified) (3 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -70 +70 @@
 import org.openstreetmap.josm.actions.SaveAsAction;
 import org.openstreetmap.josm.actions.SelectAllAction;
+import org.openstreetmap.josm.actions.SessionLoadAction;
 import org.openstreetmap.josm.actions.ShowStatusReportAction;
 import org.openstreetmap.josm.actions.SimplifyWayAction;
@@ -98 +99 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetSearchAction;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -117 +119 @@
     public final JosmAction save = new SaveAction();
     public final JosmAction saveAs = new SaveAsAction();
+    public final JosmAction sessionLoad = new SessionLoadAction();
     public final JosmAction gpxExport = new GpxExportAction();
     public final DownloadAction download = new DownloadAction();
@@ -190 +193 @@
 
     public final JMenu fileMenu = addMenu(marktr("File"), KeyEvent.VK_F, 0, ht("/Menu/File"));
+    public final JMenu sessionMenu = new JMenu(tr("Session")); // submenu of the file menu
     public final JMenu editMenu = addMenu(marktr("Edit"), KeyEvent.VK_E, 1, ht("/Menu/Edit"));
     public final JMenu viewMenu = addMenu(marktr("View"), KeyEvent.VK_V, 2, ht("/Menu/View"));
@@ -206 +210 @@
     public JMenu audioMenu = null;
     public final JMenu helpMenu = addMenu(marktr("Help"), KeyEvent.VK_H, 7, ht("/Menu/Help"));
+
     public final int defaultMenuPos = 7;
 
@@ -357 +362 @@
         add(fileMenu, save);
         add(fileMenu, saveAs);
+        if (Main.pref.getBoolean("session")) {
+            sessionMenu.setToolTipText(tr("Save and load the current session (list of layers, etc.)"));
+            sessionMenu.setIcon(ImageProvider.get("session"));
+            add(sessionMenu, sessionLoad);
+            fileMenu.add(sessionMenu);
+        }
         add(fileMenu, gpxExport);
         fileMenu.addSeparator();

trunk/src/org/openstreetmap/josm/io/OsmImporter.java

@@ -22 +22 @@
 public class OsmImporter extends FileImporter {
 
+    private OsmDataLayer layer;
+    private Runnable postLayerTask;
+
     public OsmImporter() {
         super(new ExtensionFileFilter("osm,xml", "osm", tr("OSM Server Files") + " (*.osm *.xml)"));
@@ -30 +33 @@
     }
 
-    @Override public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
+    @Override
+    public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
         try {
             FileInputStream in = new FileInputStream(file);
@@ -41 +45 @@
 
     protected void importData(InputStream in, final File associatedFile) throws IllegalDataException {
-        final DataSet dataSet = OsmReader.parseDataSet(in, NullProgressMonitor.INSTANCE);
-        final OsmDataLayer layer = new OsmDataLayer(dataSet, associatedFile.getName(), associatedFile);
-        addDataLayer(dataSet, layer, associatedFile.getPath()); 
-    }
-        
-    protected void addDataLayer(final DataSet dataSet, final OsmDataLayer layer, final String filePath) { 
+        loadLayer(in, associatedFile, associatedFile.getName(), NullProgressMonitor.INSTANCE);
         // FIXME: remove UI stuff from IO subsystem
-        //
         Runnable uiStuff = new Runnable() {
             @Override
             public void run() {
-                if (dataSet.allPrimitives().isEmpty()) {
-                    JOptionPane.showMessageDialog(
-                            Main.parent,
-                            tr("No data found in file {0}.", filePath),
-                            tr("Open OSM file"),
-                            JOptionPane.INFORMATION_MESSAGE);
-                }
                 Main.main.addLayer(layer);
+                postLayerTask.run();
                 layer.onPostLoadFromFile();
             }
@@ -69 +61 @@
         }
     }
+
+    /**
+     * Load osm data layer from InputStream.
+     * associatedFile can be null if the stream does not come from a file.
+     */
+    public void loadLayer(InputStream in, final File associatedFile, final String layerName, ProgressMonitor progressMonitor) throws IllegalDataException {
+        final DataSet dataSet = OsmReader.parseDataSet(in, progressMonitor);
+        String name = associatedFile == null ? OsmDataLayer.createNewName() : associatedFile.getName();
+        layer = new OsmDataLayer(dataSet, layerName, associatedFile);
+        postLayerTask = new Runnable() {
+            @Override
+            public void run() {
+                if (dataSet.allPrimitives().isEmpty()) {
+                    String msg;
+                    if (associatedFile == null) {
+                        msg = tr("No data found for layer ''{0}''.", layerName);
+                    } else {
+                        msg = tr("No data found in file ''{0}''.", associatedFile.getPath());
+                    }
+                    JOptionPane.showMessageDialog(
+                            Main.parent,
+                            msg,
+                            tr("Open OSM file"),
+                            JOptionPane.INFORMATION_MESSAGE);
+                }
+                layer.onPostLoadFromFile();
+            }
+        };
+    }
+
+    public OsmDataLayer getLayer() {
+        return layer;
+    }
+
+    public Runnable getPostLayerTask() {
+        return postLayerTask;
+    }
 }

trunk/src/org/openstreetmap/josm/tools/MultiMap.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -13 +15 @@
  *
  * Corresponds to Google guava LinkedHashMultimap and Apache Collections MultiValueMap
- * but it is an independent (simplistic) implementation.
+ * but it is an independent (simple) implementation.
  *
  */
@@ -116 +118 @@
         return map.values();
     }
+
+    /**
+     * Removes a cerain key=value mapping
+     *
+     * @return true, if something was removed
+     */
+    public boolean remove(A key, B value) {
+        Set<B> values = get(key);
+        if (values != null) {
+            return values.remove(value);
+        }
+        return false;
+    }
+
+    /**
+     * Removes all mappings for a certain key
+     */
+    public LinkedHashSet<B> remove(A key) {
+        return map.remove(key);
+    }
+
+    public String toString() {
+        List<String> entries = new ArrayList<String>(map.size());
+        for (A key : map.keySet()) {
+            entries.add(key + "->{" + Utils.join(",", map.get(key)) + "}");
+        }
+        return "(" + Utils.join(",", entries) + ")";
+    }
 }

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -19 +19 @@
 import java.security.NoSuchAlgorithmException;
 import java.text.MessageFormat;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 /**
@@ -62 +64 @@
                 return new FilteredCollection<T>(collection, predicate);
         }
-    
+
     /**
      * Filter a collection by (sub)class.
@@ -233 +235 @@
     /**
      * <p>Utility method for closing an input stream.</p>
-     * 
+     *
      * @param is the input stream. May be null.
      */
@@ -247 +249 @@
     /**
      * <p>Utility method for closing an output stream.</p>
-     * 
+     *
      * @param os the output stream. May be null.
      */
@@ -261 +263 @@
     /**
      * <p>Utility method for closing a reader.</p>
-     * 
+     *
      * @param reader the reader. May be null.
      */
@@ -355 +357 @@
         return new String(hexChars);
     }
+
+    /**
+     * Topological sort.
+     *
+     * @param dependencies contains mappings (key -> value). In the final list of sorted objects, the key will come
+     * after the value. (In other words, the key depends on the value(s).)
+     * There must not be cyclic dependencies.
+     * @return the list of sorted objects
+     */
+    public static <T> List<T> topologicalSort(final MultiMap<T,T> dependencies) {
+        MultiMap<T,T> deps = new MultiMap<T,T>();
+        for (T key : dependencies.keySet()) {
+            deps.putVoid(key);
+            for (T val : dependencies.get(key)) {
+                deps.putVoid(val);
+                deps.put(key, val);
+            }
+        }
+
+        int size = deps.size();
+        List<T> sorted = new ArrayList<T>();
+        for (int i=0; i<size; ++i) {
+            T parentless = null;
+            for (T key : deps.keySet()) {
+                if (deps.get(key).size() == 0) {
+                    parentless = key;
+                    break;
+                }
+            }
+            if (parentless == null) throw new RuntimeException();
+            sorted.add(parentless);
+            deps.remove(parentless);
+            for (T key : deps.keySet()) {
+                deps.remove(key, parentless);
+            }
+        }
+        if (sorted.size() != size) throw new RuntimeException();
+        return sorted;
+    }
 }