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

Timestamp:

2005-12-22T01:32:33+01:00 (18 years ago)

Author:

imi

Message:

• prepared for uploading.
• fixed gpx export/import with uid and modified flag

File:

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

src/org/openstreetmap/josm/Main.java

@@ -17 +17 @@
 import org.openstreetmap.josm.actions.ExitAction;
 import org.openstreetmap.josm.actions.OpenAction;
-import org.openstreetmap.josm.actions.OpenOsmServerAction;
+import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.actions.RedoAction;
 import org.openstreetmap.josm.actions.SaveAction;
 import org.openstreetmap.josm.actions.UndoAction;
+import org.openstreetmap.josm.actions.UploadAction;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.Preferences.PreferencesException;
@@ -79 +80 @@
                 
                 // creating actions
-                OpenOsmServerAction openServerAction = new OpenOsmServerAction();
+                DownloadAction downloadAction = new DownloadAction();
+                UploadAction uploadAction = new UploadAction();
                 OpenAction openAction = new OpenAction();
                 SaveAction saveAction = new SaveAction();
@@ -103 +105 @@
                 JMenu connectionMenu = new JMenu("Connection");
                 connectionMenu.setMnemonic('C');
-                connectionMenu.add(openServerAction);
+                connectionMenu.add(downloadAction);
+                connectionMenu.add(uploadAction);
                 mainMenu.add(connectionMenu);
                 
@@ -123 +126 @@
                 JToolBar toolBar = new JToolBar();
                 toolBar.setFloatable(false);
-                toolBar.add(openServerAction);
+                toolBar.add(downloadAction);
+                toolBar.add(uploadAction);
                 toolBar.add(openAction);
                 toolBar.add(saveAction);