Changeset 169 in josm for src/org

Timestamp:

2006-11-28T19:58:41+01:00 (18 years ago)

Author:

imi

Message:

• added "new empty map" action
• added osm-server.version property (set the OSM server verion. For expert users only)
• added first support for ongoing 0.4 server api
• fixed Class-Path manifest attribute for plugins (" " is Seperator)

Location:

src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• actions/NewAction.java (added)
• actions/PreferencesAction.java (modified) (1 diff)
• gui/MainApplication.java (modified) (2 diffs)
• gui/MainMenu.java (modified) (3 diffs)
• gui/MapView.java (modified) (1 diff)
• io/OsmReader.java (modified) (2 diffs)
• io/OsmServerWriter.java (modified) (1 diff)
• io/OsmWriter.java (modified) (2 diffs)
• plugins/PluginInformation.java (modified) (1 diff)

src/org/openstreetmap/josm/Main.java

@@ -168 +168 @@
                 toolBar.add(menu.upload);
                 toolBar.addSeparator();
+                toolBar.add(menu.newAction);
                 toolBar.add(menu.open);
                 toolBar.add(menu.save);
@@ -323 +324 @@
         }
 
+        public static boolean breakBecauseUnsavedChanges() {
+            if (map != null) {
+                boolean modified = false;
+                boolean uploadedModified = false;
+                for (final Layer l : map.mapView.getAllLayers()) {
+                        if (l instanceof OsmDataLayer && ((OsmDataLayer)l).isModified()) {
+                                modified = true;
+                                uploadedModified = ((OsmDataLayer)l).uploadedModified;
+                                break;
+                        }
+                }
+                if (modified) {
+                        final String msg = uploadedModified ? "\n"+tr("Hint: Some changes came from uploading new data to the server.") : "";
+                        final int answer = JOptionPane.showConfirmDialog(
+                                        parent, tr("There are unsaved changes. Discard the changes and continue?")+msg,
+                                        tr("Unsaved Changes"), JOptionPane.YES_NO_OPTION);
+                        if (answer != JOptionPane.YES_OPTION)
+                                return true;
+                }
+            }
+            return false;
+    }
+        
         private static void downloadFromParamString(final boolean rawGps, String s) {
                 if (s.startsWith("http:")) {

src/org/openstreetmap/josm/actions/PreferencesAction.java

@@ -36 +36 @@
                 JPanel prefPanel = new JPanel(new GridBagLayout());
                 prefPanel.add(prefDlg, GBC.eol().fill(GBC.BOTH));
-                
+
                 JOptionPane pane = new JOptionPane(prefPanel, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
                 JDialog dlg = pane.createDialog(Main.parent, tr("Preferences"));
+                
+                if (dlg.getWidth() > 600)
+                        dlg.setSize(600, dlg.getHeight());
+                if (dlg.getHeight() > 450)
+                        dlg.setSize(dlg.getWidth(), 450);
+
                 dlg.setVisible(true);
                 if (pane.getValue() instanceof Integer && (Integer)pane.getValue() == JOptionPane.OK_OPTION)

src/org/openstreetmap/josm/gui/MainApplication.java

@@ -20 +20 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.plugins.PluginException;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -42 +40 @@
                 mainFrame.addWindowListener(new WindowAdapter(){
                         @Override public void windowClosing(final WindowEvent arg0) {
-                                if (Main.map != null) {
-                                        boolean modified = false;
-                                        boolean uploadedModified = false;
-                                        for (final Layer l : Main.map.mapView.getAllLayers()) {
-                                                if (l instanceof OsmDataLayer && ((OsmDataLayer)l).isModified()) {
-                                                        modified = true;
-                                                        uploadedModified = ((OsmDataLayer)l).uploadedModified;
-                                                        break;
-                                                }
-                                        }
-                                        if (modified) {
-                                                final String msg = uploadedModified ? "\n"+tr("Hint: Some changes came from uploading new data to the server.") : "";
-                                                final int answer = JOptionPane.showConfirmDialog(
-                                                                Main.parent, tr("There are unsaved changes. Really quit?")+msg,
-                                                                tr("Unsaved Changes"), JOptionPane.YES_NO_OPTION);
-                                                if (answer != JOptionPane.YES_OPTION)
-                                                        return;
-                                        }
-                                }
+                                if (Main.breakBecauseUnsavedChanges())
+                                        return;
                                 System.exit(0);
                         }

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

@@ -16 +16 @@
 import org.openstreetmap.josm.actions.GpxExportAction;
 import org.openstreetmap.josm.actions.HelpAction;
+import org.openstreetmap.josm.actions.NewAction;
 import org.openstreetmap.josm.actions.OpenAction;
 import org.openstreetmap.josm.actions.PreferencesAction;
@@ -37 +38 @@
         public final UndoAction undo = new UndoAction();
         public final RedoAction redo = new RedoAction();
+        public final NewAction newAction = new NewAction();
         public final OpenAction open = new OpenAction();
         public final DownloadAction download = new DownloadAction();
@@ -62 +64 @@
         public MainMenu() {
                 fileMenu.setMnemonic('F');
+                fileMenu.add(newAction);
                 fileMenu.add(open);
                 fileMenu.add(save);

src/org/openstreetmap/josm/gui/MapView.java

@@ -113 +113 @@
                         if (editLayer != null) {
                                 editLayer.mergeFrom(layer);
+                                if (autoScale)
+                                        recalculateCenterScale();
                                 repaint();
                                 return;

src/org/openstreetmap/josm/io/OsmReader.java

@@ -14 +14 @@
 
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -100 +101 @@
                                         if (atts == null)
                                                 throw new SAXException(tr("Unknown version"));
-                                        if (!"0.3".equals(atts.getValue("version")))
+                                        if (!Main.pref.get("osm-server.version", "0.3").equals(atts.getValue("version")))
                                                 throw new SAXException(tr("Unknown version")+": "+atts.getValue("version"));
                                 } else if (qName.equals("node")) {

src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -153 +153 @@
                         OsmPrimitive osm, boolean addBody) {
                 try {
-                        URL url = new URL(Main.pref.get("osm-server.url") + "/0.3/" + urlSuffix + "/" + osm.id);
+                        String version = Main.pref.get("osm-server.version", "0.3");
+                        URL url = new URL(
+                                        Main.pref.get("osm-server.url") +
+                                        "/" + version +
+                                        "/" + urlSuffix + 
+                                        "/" + ((version.equals("0.4") && osm.id==0) ? "create":osm.id));
                         System.out.println("upload to: "+url);
-                        activeConnection = (HttpURLConnection) url.openConnection();
+                        activeConnection = (HttpURLConnection)url.openConnection();
                         activeConnection.setConnectTimeout(15000);
                         activeConnection.setRequestMethod(requestMethod);

src/org/openstreetmap/josm/io/OsmWriter.java

@@ -5 +5 @@
 import java.util.Map.Entry;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -33 +34 @@
         public abstract static class Osm implements OsmWriterInterface {
                 public void header(PrintWriter out) {
-                        out.println("<osm version='0.3' generator='JOSM'>");
+                        out.print("<osm version='");
+                        out.print(Main.pref.get("osm-server.version", "0.3"));
+                        out.println("' generator='JOSM'>");
                 }
                 public void footer(PrintWriter out) {

src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -48 +48 @@
                         String classPath = attr.getValue("Class-Path");
                         if (classPath != null) {
-                                for (String s : classPath.split(classPath.contains(";") ? ";" : ":")) {
-                                        if (!s.startsWith("/") && !s.startsWith("\\") && !s.matches("^.:"))
+                                String[] cp = classPath.split(" ");
+                                StringBuilder entry = new StringBuilder();
+                                for (String s : cp) {
+                                        entry.append(s);
+                                        if (s.endsWith("\\")) {
+                                                entry.setLength(entry.length()-1);
+                                                entry.append("%20"); // append the split character " " as html-encode
+                                                continue;
+                                        }
+                                        s = entry.toString();
+                                        entry = new StringBuilder();
+                                        if (!s.startsWith("/") && !s.startsWith("\\") && !s.matches("^.\\:"))
                                                 s = file.getParent() + File.separator + s;
                                         libraries.add(new URL(getURLString(s)));