Changeset 22 in josm for src/org/openstreetmap/josm/Main.java

Timestamp:

2005-10-23T22:13:33+02:00 (20 years ago)

Author:

imi

Message:

starting restructure of dataset. Checkpoint is broken!

File:

• src/org/openstreetmap/josm/Main.java (modified) (5 diffs)

src/org/openstreetmap/josm/Main.java

@@ -4 +4 @@
 import java.awt.BorderLayout;
 import java.awt.Container;
+import java.util.Collection;
+import java.util.LinkedList;
 
 import javax.swing.JFrame;
@@ -20 +22 @@
 import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.actions.SaveGpxAction;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.DataSet;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.Preferences.PreferencesException;
@@ -26 +30 @@
 
 /**
- * Main window class consisting of the mainframe MDI application.
+ * Main window class application.
  *  
  * @author imi
@@ -41 +45 @@
          */
         public final static Preferences pref = new Preferences();
+
+        /**
+         * The global command queue since last save. So if you reload the data from disk
+         * (or from OSM server, if nothing changed on server) and reapply the commands,
+         * you should get the same result as currently displaying.
+         */
+        public Collection<Command> commands = new LinkedList<Command>();
+
+        /**
+         * The global dataset.
+         */
+        public DataSet ds = new DataSet();
         
         /**
@@ -105 +121 @@
                 // creating toolbar
                 JToolBar toolBar = new JToolBar();
-                toolBar.setFloatable(false);
+                toolBar.setFloatable(true);
                 toolBar.add(openServerAction);
                 toolBar.add(openGpxAction);