Changeset 103 in josm

Timestamp:

2006-07-01T00:56:23+02:00 (19 years ago)

Author:

imi

Message:

• fixed unicode compatibility
• added Layer menu which mirrors the layer list context menu
• added "convert to data layer" for all gps layers
• removed raw gpx import and 0.2 osm-file import
• removed dependency to JDOM

Files:

• .classpath (modified) (1 diff)
• CONTRIBUTION (modified) (1 diff)
• images/converttoosm.png (added)
• lib/jdom.jar (deleted)
• src/org/openstreetmap/josm/Main.java (modified) (6 diffs)
• src/org/openstreetmap/josm/actions/DownloadAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/GpxExportAction.java (modified) (7 diffs)
• src/org/openstreetmap/josm/actions/OpenAction.java (modified) (7 diffs)
• src/org/openstreetmap/josm/actions/SaveAction.java (modified) (4 diffs)
• src/org/openstreetmap/josm/actions/UploadAction.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/MapStatus.java (modified) (12 diffs)
• src/org/openstreetmap/josm/gui/MapView.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/dialogs/LayerList.java (modified) (11 diffs)
• src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/layer/Layer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java (modified) (7 diffs)
• src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/io/GpxReader.java (deleted)
• src/org/openstreetmap/josm/io/GpxWriter.java (modified) (7 diffs)
• src/org/openstreetmap/josm/io/OsmConnection.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmIdReader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/OsmReader.java (modified) (4 diffs)
• src/org/openstreetmap/josm/io/OsmReaderOld.java (deleted)
• src/org/openstreetmap/josm/io/OsmServerReader.java (modified) (8 diffs)
• src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (7 diffs)
• src/org/openstreetmap/josm/io/OsmWriter.java (modified) (5 diffs)
• src/org/openstreetmap/josm/io/ProgressReader.java (modified) (4 diffs)
• src/org/openstreetmap/josm/io/RawCsvReader.java (modified) (5 diffs)
• src/org/openstreetmap/josm/io/RawGpsReader.java (modified) (2 diffs)
• src/org/openstreetmap/josm/test/GpxWriterTest.java (deleted)
• src/org/openstreetmap/josm/test/OsmWriterTest.java (deleted)
• src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (modified) (1 diff)

.classpath

@@ -4 +4 @@
         <classpathentry including="images/" kind="src" path=""/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-        <classpathentry kind="lib" path="lib/jdom.jar"/>
         <classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
         <classpathentry kind="lib" path="lib/MinML2.jar"/>

CONTRIBUTION

@@ -1 @@
-One XML Parser is JDOM 1.0 which comes from www.jdom.org and
-is licensed under "JDOM license", a modified Apache License
-with Aknowledgement removed. The other XML Parser is MinML2
-from http://www.wilson.co.uk/xml/minml2.htm. The license is 
+The XML Parser is MinML2 from 
+http://www.wilson.co.uk/xml/minml2.htm. The license is 
 attached below.
 

src/org/openstreetmap/josm/Main.java

@@ -94 +94 @@
                         panel.setVisible(true);
                         map.mapView.addLayerChangeListener(new LayerChangeListener(){
-                                public void activeLayerChange(final Layer oldLayer, final Layer newLayer) {}
+                                public void activeLayerChange(final Layer oldLayer, final Layer newLayer) {
+                                        setLayerMenu(newLayer.getMenuEntries());
+                                }
                                 public void layerAdded(final Layer newLayer) {
                                         if (newLayer instanceof OsmDataLayer)
@@ -102 +104 @@
                                         if (oldLayer instanceof OsmDataLayer)
                                                 Main.main.editLayer().listenerCommands.add(redoUndoListener);
+                                        if (map.mapView.getAllLayers().isEmpty())
+                                                setLayerMenu(null);
                                 }
                         });
@@ -110 +114 @@
         }
 
+        /**
+         * Set the layer menu (changed when active layer changes).
+         */
+        public final void setLayerMenu(Component[] entries) {
+                if (entries == null || entries.length == 0)
+                        layerMenu.setVisible(false);
+                else {
+                        layerMenu.removeAll();
+                        for (Component c : entries)
+                                layerMenu.add(c);
+                        layerMenu.setVisible(true);
+                }
+        }
+        
         /**
          * Remove the specified layer from the map. If it is the last layer, remove the map as well.
@@ -141 +159 @@
 
 
-                final JMenu layerMenu = new JMenu("Layer");
+                final JMenu connectionMenu = new JMenu("Connection");
+                connectionMenu.setMnemonic('C');
+                connectionMenu.add(downloadAction);
+                connectionMenu.add(uploadAction);
+                mainMenu.add(connectionMenu);
+
+                layerMenu = new JMenu("Layer");
                 layerMenu.setMnemonic('L');
-                layerMenu.add(downloadAction);
-                layerMenu.add(uploadAction);
-                layerMenu.addSeparator();
                 mainMenu.add(layerMenu);
-
+                layerMenu.setVisible(false);
+                
                 final JMenu editMenu = new JMenu("Edit");
                 editMenu.setMnemonic('E');
@@ -185 +207 @@
         public final void addLayer(final Layer layer) {
                 if (map == null) {
-                        final MapFrame mapFrame = new MapFrame(layer);
+                        final MapFrame mapFrame = new MapFrame();
                         setMapFrame(mapFrame);
                         mapFrame.selectMapMode((MapMode)mapFrame.getDefaultButtonAction());
                         mapFrame.setVisible(true);
                         mapFrame.setVisibleDialogs();
-                } else
-                        map.mapView.addLayer(layer);
+                }
+                map.mapView.addLayer(layer);
         }
         /**
@@ -232 +254 @@
                 }
         };
+        private JMenu layerMenu;
 
         /**

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

@@ -30 +30 @@
 import javax.swing.event.ListSelectionListener;
 
-import org.jdom.JDOMException;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -99 +98 @@
                 }
 
-                @Override public void realRun() throws IOException, JDOMException {
+                @Override public void realRun() throws IOException, SAXException {
                         rawData = reader.parseRawGps();
                 }

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

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Calendar;
@@ -58 +58 @@
                         return;
 
+                exportGpx(file, this.layer == null ? Main.main.editLayer() : this.layer);
+        }
+
+        public static void exportGpx(File file, Layer layer) {
                 String fn = file.getPath();
                 if (fn.indexOf('.') == -1) {
@@ -113 +117 @@
                 
                 try {
-                        Layer layer = this.layer == null ? Main.main.editLayer() : this.layer;
-                        FileWriter out = new FileWriter(file);
-                        GpxWriter w = new GpxWriter(out, layer.name, desc.getText(),
+                        GpxWriter w = new GpxWriter(new FileOutputStream(file), layer.name, desc.getText(),
                                         authorName.getText(), email.getText(), copyright.getText(),
                                         copyrightYear.getText(), keywords.getText());
@@ -122 +124 @@
                         else
                                 w.output(Main.ds);
-                        out.close();
+                        w.close();
                 } catch (IOException x) {
                         x.printStackTrace();
@@ -128 +130 @@
                 }               
         }
-
+        
         /**
          * Add all those listeners to handle the enable state of the fields.
@@ -137 +139 @@
          * @param warning 
          */
-        private void addDependencies(
+        private static void addDependencies(
                         final JCheckBox author, 
                         final JTextField authorName,
@@ -204 +206 @@
         }
 
-        private void enableCopyright(final JTextField copyright, final JButton predefined, final JTextField copyrightYear, final JLabel copyrightLabel, final JLabel copyrightYearLabel, final JLabel warning, boolean enable) {
+        private static void enableCopyright(final JTextField copyright, final JButton predefined, final JTextField copyrightYear, final JLabel copyrightLabel, final JLabel copyrightYearLabel, final JLabel warning, boolean enable) {
                 copyright.setEnabled(enable);
                 predefined.setEnabled(enable);

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

@@ -5 +5 @@
 import java.awt.event.KeyEvent;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
@@ -14 +15 @@
 import javax.swing.KeyStroke;
 
-import org.jdom.JDOMException;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -20 +20 @@
 import org.openstreetmap.josm.gui.layer.RawGpsLayer;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
-import org.openstreetmap.josm.io.GpxReader;
 import org.openstreetmap.josm.io.OsmReader;
-import org.openstreetmap.josm.io.OsmReaderOld;
 import org.openstreetmap.josm.io.RawCsvReader;
 import org.openstreetmap.josm.io.RawGpsReader;
@@ -60 +58 @@
                                 Collection<Collection<GpsPoint>> data;
                                 if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) {
-                                        data = new RawGpsReader(new FileReader(filename)).parse();
+                                        data = RawGpsReader.parse(new FileInputStream(filename));
                                 } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) {
                                         data = new LinkedList<Collection<GpsPoint>>();
@@ -69 +67 @@
                         } else {
                                 DataSet dataSet;
-                                if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) {
-                                        JOptionPane.showMessageDialog(Main.parent, "Warning: Soon, it will be no longer possible to open GPX files as osm data. Please convert your files to .osm format.");
-                                        dataSet = new GpxReader(new FileReader(filename)).parse();
-                                } else if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(fn)) {
-                                        try {
-                                                // temporary allow loading of old xml format.
-                                                dataSet = OsmReader.parseDataSet(new FileReader(filename), null, null);
-                                        } catch (SAXException x) {
-                                                if (x.getMessage().equals("Unknown version null")) {
-                                                        int answer = JOptionPane.showConfirmDialog(Main.parent, 
-                                                                        fn+" seems to be an old 0.2 API XML file.\n" +
-                                                                        "JOSM can try to open it with the old parser. This option\n" +
-                                                                        "will not be available in future JOSM version. You should\n" +
-                                                                        "immediatly save the file, if successfull imported.",
-                                                                        "Load as 0.2 API file?",
-                                                                        JOptionPane.YES_NO_OPTION);
-                                                        if (answer != JOptionPane.YES_OPTION)
-                                                                return;
-                                                        dataSet = new OsmReaderOld(new FileReader(filename)).parse();
-                                                } else 
-                                                        throw x;
-                                        }                                       
+                                if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(fn)) {
+                                        dataSet = OsmReader.parseDataSet(new FileInputStream(filename), null, null);
                                 } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) {
                                         JOptionPane.showMessageDialog(Main.parent, fn+": CSV Data import for non-GPS data is not implemented yet.");
@@ -101 +79 @@
                         }
                 } catch (SAXException x) {
-                        x.printStackTrace();
-                        JOptionPane.showMessageDialog(Main.parent, "Error while parsing "+fn+": "+x.getMessage());
-                } catch (JDOMException x) {
                         x.printStackTrace();
                         JOptionPane.showMessageDialog(Main.parent, "Error while parsing "+fn+": "+x.getMessage());
@@ -121 +96 @@
                 if (!ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn))
                         return false;
-                return JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(
-                                Main.parent, "Do you want to open "+fn+" as raw gps data?",
-                                "Open as raw data?", JOptionPane.YES_NO_OPTION);
+                return true;
         }
 }

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

@@ -5 +5 @@
 import java.awt.event.KeyEvent;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
 
@@ -14 +14 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.Segment;
-import org.openstreetmap.josm.io.GpxWriter;
 import org.openstreetmap.josm.io.OsmWriter;
 
@@ -64 +62 @@
                                 file = new File(fn);
                         }
-                        FileWriter fileWriter;
                         if (ExtensionFileFilter.filters[ExtensionFileFilter.GPX].acceptName(fn)) {
-                                for (Segment ls : Main.ds.segments) {
-                                        if (ls.incomplete) {
-                                                JOptionPane.showMessageDialog(Main.parent, "Export of data containing incomplete ways to GPX is not implemented.\nBe aware, that in future versions of JOSM, GPX support will be kept at a minimum.\nPlease use .osm or .xml as extension for the better OSM support.");
-                                                return;
-                                        }
-                                }
-                                new GpxWriter(fileWriter = new FileWriter(file), Main.ds).output();
-                        } else if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(fn))
-                                OsmWriter.output(fileWriter = new FileWriter(file), Main.ds, false);
-                        else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) {
+                                GpxExportAction.exportGpx(file, Main.main.editLayer());
+                                Main.main.editLayer().cleanData(null, false);
+                                return;
+                        } else if (ExtensionFileFilter.filters[ExtensionFileFilter.OSM].acceptName(fn)) {
+                                OsmWriter.output(new FileOutputStream(file), Main.ds, false);
+                                Main.main.editLayer().cleanData(null, false);
+                        } else if (ExtensionFileFilter.filters[ExtensionFileFilter.CSV].acceptName(fn)) {
                                 JOptionPane.showMessageDialog(Main.parent, "CSV output not supported yet.");
                                 return;
@@ -82 +76 @@
                                 return;
                         }
-                        fileWriter.close();
-                        Main.main.editLayer().cleanData(null, false);
                 } catch (IOException e) {
                         e.printStackTrace();

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

@@ -15 +15 @@
 import javax.swing.KeyStroke;
 
-import org.jdom.JDOMException;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -22 +21 @@
 import org.openstreetmap.josm.io.OsmServerWriter;
 import org.openstreetmap.josm.tools.GBC;
+import org.xml.sax.SAXException;
 
 /**
@@ -73 +73 @@
 
                 PleaseWaitRunnable uploadTask = new PleaseWaitRunnable("Uploading data"){
-                        @Override protected void realRun() throws JDOMException {
+                        @Override protected void realRun() throws SAXException {
                                 server.setProgressInformation(currentAction, progress);
                                 server.uploadOsm(all);

src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -164 +164 @@
         
         public String getTimeStr() {
-                return timestamp == null ? null : new SimpleDateFormat("y-M-d H:m:s").format(timestamp);
+                return timestamp == null ? null : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(timestamp);
         }
 }

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

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.dialogs.SelectionListDialog;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
-import org.openstreetmap.josm.gui.layer.Layer;
 
 /**
@@ -69 +68 @@
          * @param layer The first layer in the mapView. 
          */
-        public MapFrame(Layer layer) {
+        public MapFrame() {
                 setSize(400,400);
                 setLayout(new BorderLayout());
@@ -75 +74 @@
                 final AutoScaleAction autoScaleAction = new AutoScaleAction(this);
                 add(mapView = new MapView(autoScaleAction), BorderLayout.CENTER);
-                mapView.addLayer(layer);
 
                 // toolbar

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

@@ -44 +44 @@
  */
 public class MapStatus extends JPanel {
-        
+
         /**
          * The MapView this status belongs. 
@@ -57 +57 @@
          */
         JTextField nameText = new JTextField(30);
-        
+
         /**
          * The collector class that waits for notification and then update
@@ -77 +77 @@
                  */
                 private Popup popup;
-                
+
                 private MapFrame parent;
-                
+
                 public Collector(MapFrame parent) {
                         this.parent = parent;
                 }
-                
+
                 /**
                  * Execution function for the Collector.
@@ -100 +100 @@
                                         continue; // freeze display when holding down ctrl
 
+                                if (mv.center == null)
+                                        continue;
+
                                 // This try/catch is a hack to stop the flooding bug reports about this.
                                 // The exception needed to handle with in the first place, means that this
@@ -106 +109 @@
                                 try {
                                         Collection<OsmPrimitive> osms = mv.getAllNearest(ms.mousePos);
-                                        
+
                                         if (osms == null && osmStatus == null && ms.modifiers == oldModifiers)
                                                 continue;
                                         if (osms != null && osms.equals(osmStatus) && ms.modifiers == oldModifiers)
                                                 continue;
-                                        
+
                                         osmStatus = osms;
                                         oldModifiers = ms.modifiers;
-                                        
+
                                         OsmPrimitive osmNearest = null;
                                         // Set the text label in the bottom status bar
@@ -124 +127 @@
                                         } else
                                                 nameText.setText("");
-                                        
+
                                         // Popup Information
                                         if ((ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0 && osms != null) {
                                                 if (popup != null)
                                                         popup.hide();
-                                                
+
                                                 JPanel c = new JPanel(new GridBagLayout());
                                                 for (final OsmPrimitive osm : osms) {
@@ -160 +163 @@
                                                         c.add(l, GBC.eol());
                                                 }
-                                                
+
                                                 Point p = mv.getLocationOnScreen();
                                                 popup = PopupFactory.getSharedInstance().getPopup(mv, c, p.x+ms.mousePos.x+16, p.y+ms.mousePos.y+16);
@@ -173 +176 @@
                 }
         }
-        
+
         /**
          * Everything, the collector is interested of. Access must be synchronized.
@@ -186 +189 @@
          */
         MouseState mouseState = new MouseState();
-        
+
         /**
          * Construct a new MapStatus and attach it to the map view.
@@ -193 +196 @@
         public MapStatus(final MapFrame mapFrame) {
                 this.mv = mapFrame.mapView;
-                
+
                 // Listen for mouse movements and set the position text field
                 mv.addMouseMotionListener(new MouseMotionListener(){
@@ -207 +210 @@
                         }
                 });
-                
+
                 positionText.setEditable(false);
                 nameText.setEditable(false);
@@ -216 +219 @@
                 add(new JLabel(" Object "));
                 add(nameText);
-                
+
                 // The background thread
                 final Collector collector = new Collector(mapFrame);
                 new Thread(collector).start();
-                
+
                 // Listen to keyboard/mouse events for pressing/releasing alt key and
                 // inform the collector.

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

@@ -207 +207 @@
          */
         @Override public void paint(Graphics g) {
+                if (center == null)
+                        return; // no data loaded yet.
                 g.setColor(SimplePaintVisitor.getPreferencesColor("background", Color.BLACK));
                 g.fillRect(0, 0, getWidth(), getHeight());

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

@@ -19 +19 @@
 import javax.swing.JProgressBar;
 
-import org.jdom.JDOMException;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.GBC;
@@ -77 +76 @@
                         x.printStackTrace();
                         errorMessage = "Error while parsing: "+x.getMessage();
-                } catch (JDOMException x) {
-                        x.printStackTrace();
-                        errorMessage = "Error while parsing: "+x.getMessage();
                 } catch (FileNotFoundException x) {
                         x.printStackTrace();
@@ -101 +97 @@
          * is called. finish() is called in any case.
          */
-        protected abstract void realRun() throws SAXException, JDOMException, IOException;
+        protected abstract void realRun() throws SAXException, IOException;
 
         /**

src/org/openstreetmap/josm/gui/dialogs/LayerList.java

@@ -43 +43 @@
 public class LayerList extends ToggleDialog implements LayerChangeListener {
 
+        /**
+         * The last layerlist created. Used to update the list in the Show/Hide and Delete actions.
+         * TODO: Replace with Listener-Pattern.
+         */
+        static JList instance;
+
         public final static class DeleteLayerAction extends AbstractAction {
 
-        private final JList layers;
-        private final Layer layer;
-
-        public DeleteLayerAction(JList layers, Layer layer) {
-            super("Delete", ImageProvider.get("dialogs", "delete"));
-            putValue(SHORT_DESCRIPTION, "Delete the selected layer.");
-            this.layers = layers;
-            this.layer = layer;
-        }
-
-        public void actionPerformed(ActionEvent e) {
-            int sel = layers.getSelectedIndex();
-            if (layer != null)
-                Main.main.removeLayer(layer);
-            else
-                Main.main.removeLayer((Layer)layers.getSelectedValue());
-            if (sel >= layers.getModel().getSize())
-                sel = layers.getModel().getSize()-1;
-            if (layers.getSelectedValue() == null)
-                layers.setSelectedIndex(sel);
-        }
-    }
-
-    public final static class ShowHideLayerAction extends AbstractAction {
-        private final Layer layer;
-        private final JList layers;
-
-        public ShowHideLayerAction(JList layers, Layer layer) {
-            super("Show/Hide", ImageProvider.get("dialogs", "showhide"));
-            putValue(SHORT_DESCRIPTION, "Toggle visible state of the selected layer.");
-            this.layer = layer;
-            this.layers = layers;
-        }
-
-        public void actionPerformed(ActionEvent e) {
-            Layer l = layer == null ? (Layer)layers.getSelectedValue() : layer;
-            l.visible = !l.visible;
-                Main.map.mapView.repaint();
-                layers.repaint();
-        }
-    }
-
-    /**
+                private final Layer layer;
+
+                public DeleteLayerAction(Layer layer) {
+                        super("Delete", ImageProvider.get("dialogs", "delete"));
+                        putValue(SHORT_DESCRIPTION, "Delete the selected layer.");
+                        this.layer = layer;
+                }
+
+                public void actionPerformed(ActionEvent e) {
+                        int sel = instance.getSelectedIndex();
+                        if (layer != null)
+                                Main.main.removeLayer(layer);
+                        else
+                                Main.main.removeLayer((Layer)instance.getSelectedValue());
+                        if (sel >= instance.getModel().getSize())
+                                sel = instance.getModel().getSize()-1;
+                        if (instance.getSelectedValue() == null)
+                                instance.setSelectedIndex(sel);
+                }
+        }
+
+        public final static class ShowHideLayerAction extends AbstractAction {
+                private final Layer layer;
+
+                public ShowHideLayerAction(Layer layer) {
+                        super("Show/Hide", ImageProvider.get("dialogs", "showhide"));
+                        putValue(SHORT_DESCRIPTION, "Toggle visible state of the selected layer.");
+                        this.layer = layer;
+                }
+
+                public void actionPerformed(ActionEvent e) {
+                        Layer l = layer == null ? (Layer)instance.getSelectedValue() : layer;
+                        l.visible = !l.visible;
+                        Main.map.mapView.repaint();
+                        instance.repaint();
+                }
+        }
+
+        /**
          * The data model for the list component.
          */
         DefaultListModel model = new DefaultListModel();
-        /**
-         * The list component holding all layers.
-         */
-        JList layers = new JList(model);
         /**
          * The merge action. This is only called, if the current selection and its
@@ -111 +109 @@
          * Button for delete layer.
          */
-        private Action deleteAction = new DeleteLayerAction(layers, null);
+        private Action deleteAction = new DeleteLayerAction(null);
 
         /**
@@ -118 +116 @@
         public LayerList(MapFrame mapFrame) {
                 super("Layers", "layerlist", "Open a list of all loaded layers.", KeyEvent.VK_L);
+                instance = new JList(model);
                 setPreferredSize(new Dimension(320,100));
-                add(new JScrollPane(layers), BorderLayout.CENTER);
-                layers.setBackground(UIManager.getColor("Button.background"));
-                layers.setCellRenderer(new DefaultListCellRenderer(){
+                add(new JScrollPane(instance), BorderLayout.CENTER);
+                instance.setBackground(UIManager.getColor("Button.background"));
+                instance.setCellRenderer(new DefaultListCellRenderer(){
                         @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
                                 Layer layer = (Layer)value;
@@ -141 +140 @@
                         model.addElement(l);
 
-                layers.setSelectedValue(mapView.getActiveLayer(), true);
-                layers.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-                layers.addListSelectionListener(new ListSelectionListener(){
+                instance.setSelectedValue(mapView.getActiveLayer(), true);
+                instance.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+                instance.addListSelectionListener(new ListSelectionListener(){
                         public void valueChanged(ListSelectionEvent e) {
-                                if (layers.getModel().getSize() == 0)
+                                if (instance.getModel().getSize() == 0)
                                         return;
-                                if (layers.getSelectedIndex() == -1)
-                                        layers.setSelectedIndex(e.getFirstIndex());
-                                mapView.setActiveLayer((Layer)layers.getSelectedValue());
+                                if (instance.getSelectedIndex() == -1)
+                                        instance.setSelectedIndex(e.getFirstIndex());
+                                mapView.setActiveLayer((Layer)instance.getSelectedValue());
                         }
                 });
                 mapView.addLayerChangeListener(this);
 
-                layers.addMouseListener(new MouseAdapter(){
+                instance.addMouseListener(new MouseAdapter(){
                         private void openPopup(MouseEvent e) {
-                                int index = layers.locationToIndex(e.getPoint());
-                                Layer layer = (Layer)layers.getModel().getElementAt(index);
-                                LayerListPopup menu = new LayerListPopup(layers, layer);
+                                int index = instance.locationToIndex(e.getPoint());
+                                Layer layer = (Layer)instance.getModel().getElementAt(index);
+                                LayerListPopup menu = new LayerListPopup(instance, layer);
                                 menu.show(LayerList.this, e.getX(), e.getY());
                         }
@@ -170 +169 @@
                         }
                 });
-                
-                
+
+
                 // Buttons
                 JPanel buttonPanel = new JPanel(new GridLayout(1, 5));
@@ -177 +176 @@
                 ActionListener upDown = new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                Layer l = (Layer)layers.getSelectedValue();
-                                int sel = layers.getSelectedIndex();
+                                Layer l = (Layer)instance.getSelectedValue();
+                                int sel = instance.getSelectedIndex();
                                 int selDest = e.getActionCommand().equals("up") ? sel-1 : sel+1;
                                 mapView.moveLayer(l, selDest);
                                 model.set(sel, model.get(selDest));
                                 model.set(selDest, l);
-                                layers.setSelectedIndex(selDest);
+                                instance.setSelectedIndex(selDest);
                                 updateButtonEnabled();
                                 mapView.repaint();
@@ -193 +192 @@
                 upButton.setActionCommand("up");
                 buttonPanel.add(upButton);
-                
+
                 downButton.setToolTipText("Move the selected layer one row down.");
                 downButton.addActionListener(upDown);
                 downButton.setActionCommand("down");
                 buttonPanel.add(downButton);
-                
-                JButton showHideButton = new JButton(new ShowHideLayerAction(layers, null));
-        showHideButton.setText("");
-        buttonPanel.add(showHideButton);
-                
-        JButton deleteButton = new JButton(deleteAction);
-        deleteButton.setText("");
-        buttonPanel.add(deleteButton);
+
+                JButton showHideButton = new JButton(new ShowHideLayerAction(null));
+                showHideButton.setText("");
+                buttonPanel.add(showHideButton);
+
+                JButton deleteButton = new JButton(deleteAction);
+                deleteButton.setText("");
+                buttonPanel.add(deleteButton);
 
                 mergeButton.setToolTipText("Merge the selected layer into the layer directly below.");
                 mergeButton.addActionListener(new ActionListener(){
                         public void actionPerformed(ActionEvent e) {
-                                Layer lFrom = (Layer)layers.getSelectedValue();
-                                Layer lTo = (Layer)model.get(layers.getSelectedIndex()+1);
+                                Layer lFrom = (Layer)instance.getSelectedValue();
+                                Layer lTo = (Layer)model.get(instance.getSelectedIndex()+1);
                                 lTo.mergeFrom(lFrom);
-                                layers.setSelectedValue(lTo, true);
+                                instance.setSelectedValue(lTo, true);
                                 mapView.removeLayer(lFrom);
                         }
@@ -220 +219 @@
 
                 add(buttonPanel, BorderLayout.SOUTH);
-                
+
                 updateButtonEnabled();
         }
@@ -228 +227 @@
          */
         void updateButtonEnabled() {
-                int sel = layers.getSelectedIndex();
-                Layer l = (Layer)layers.getSelectedValue();
+                int sel = instance.getSelectedIndex();
+                Layer l = (Layer)instance.getSelectedValue();
                 boolean enable = model.getSize() > 1;
                 enable = enable && sel < model.getSize()-1;
@@ -249 +248 @@
         public void layerRemoved(Layer oldLayer) {
                 model.removeElement(oldLayer);
-                if (layers.getSelectedIndex() == -1)
-                        layers.setSelectedIndex(0);
+                if (instance.getSelectedIndex() == -1)
+                        instance.setSelectedIndex(0);
                 updateButtonEnabled();
         }
@@ -258 +257 @@
          */
         public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                if (newLayer != layers.getSelectedValue())
-                        layers.setSelectedValue(newLayer, true);
+                if (newLayer != instance.getSelectedValue())
+                        instance.setSelectedValue(newLayer, true);
                 updateButtonEnabled();
         }

src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.dialogs;
 
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 
@@ -29 +30 @@
 
         public LayerListPopup(final JList layers, final Layer layer) {
-                add(new LayerList.ShowHideLayerAction(layers, layer));
-                add(new LayerList.DeleteLayerAction(layers, layer));
-                addSeparator();
-
-                layer.addMenuEntries(this);
+                for (Component c : layer.getMenuEntries())
+                        add(c);
         }
 }

src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -11 +11 @@
 import java.awt.event.MouseEvent;
 import java.io.IOException;
-import java.io.Reader;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -73 +73 @@
                         try {
                         URLConnection con = url.openConnection();
-                        Reader in = new ProgressReader(con, progress, currentAction);
+                        InputStream in = new ProgressReader(con, progress, currentAction);
                                 currentAction.setText("Downloading...");
                                 Map<Long, String> ids = idReader.parseIds(in);

src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java

@@ -36 +36 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
+import javax.swing.JSeparator;
 import javax.swing.JTextField;
 import javax.swing.JToggleButton;
@@ -51 +51 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.dialogs.LayerList;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
@@ -314 +315 @@
         }
 
-        @Override public void addMenuEntries(JPopupMenu menu) {
+        @Override public Component[] getMenuEntries() {
                 JMenuItem sync = new JMenuItem("Sync clock", ImageProvider.get("clock"));
                 sync.addActionListener(new ActionListener(){
@@ -338 +339 @@
                         }
                 });
-                menu.add(sync);
-
-                menu.addSeparator();
-                menu.add(new LayerListPopup.InfoAction(this));
+                return new Component[]{
+                                new JMenuItem(new LayerList.ShowHideLayerAction(this)),
+                                new JMenuItem(new LayerList.DeleteLayerAction(this)),
+                                new JSeparator(),
+                                sync,
+                                new JSeparator(), 
+                                new JMenuItem(new LayerListPopup.InfoAction(this))};
         }
 

src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.layer;
 
+import java.awt.Component;
 import java.awt.Graphics;
 
 import javax.swing.Icon;
-import javax.swing.JPopupMenu;
 
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -82 +82 @@
         abstract public Object getInfoComponent();
         
-        abstract public void addMenuEntries(JPopupMenu menu);
+        abstract public Component[] getMenuEntries();
         
         /**

src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.layer;
 
+import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.GridBagLayout;
@@ -16 +17 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
+import javax.swing.JSeparator;
 
 import org.openstreetmap.josm.Main;
@@ -33 +34 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
+import org.openstreetmap.josm.gui.dialogs.LayerList;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.tools.GBC;
@@ -309 +311 @@
         }
 
-        @Override public void addMenuEntries(final JPopupMenu menu) {
-                menu.add(new JMenuItem(new SaveAction()));
-                menu.add(new JMenuItem(new GpxExportAction(this)));
-                menu.addSeparator();
-                menu.add(new LayerListPopup.InfoAction(this));
+        @Override public Component[] getMenuEntries() {
+                return new Component[]{
+                                new JMenuItem(new LayerList.ShowHideLayerAction(this)),
+                                new JMenuItem(new LayerList.DeleteLayerAction(this)),
+                                new JSeparator(),
+                                new JMenuItem(new SaveAction()),
+                                new JMenuItem(new GpxExportAction(this)),
+                                new JSeparator(),
+                                new JMenuItem(new LayerListPopup.InfoAction(this))};
         }
 }

src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java

@@ -2 +2 @@
 
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Point;
@@ -16 +17 @@
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
+import javax.swing.JSeparator;
 import javax.swing.filechooser.FileFilter;
 
@@ -30 +31 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.dialogs.LayerList;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.tools.ColorHelper;
@@ -42 +44 @@
 public class RawGpsLayer extends Layer implements PreferenceChangedListener {
 
-        public class ConvertToOsmAction extends AbstractAction {
-                public ConvertToOsmAction() {
-                        super("Convert layer to OSM");
+        public class ConvertToDataLayerAction extends AbstractAction {
+                public ConvertToDataLayerAction() {
+                        super("Convert to data layer", ImageProvider.get("converttoosm"));
         }
                 public void actionPerformed(ActionEvent e) {
@@ -154 +156 @@
         }
 
-        @Override public void addMenuEntries(JPopupMenu menu) {
-                menu.add(new JMenuItem(new GpxExportAction(this)));
-                
+        @Override public Component[] getMenuEntries() {
                 JMenuItem color = new JMenuItem("Customize Color", ImageProvider.get("colorchooser"));
                 color.addActionListener(new ActionListener(){
@@ -177 +177 @@
                         }
                 });
-                menu.add(color);
                 
                 JMenuItem tagimage = new JMenuItem("Import images", ImageProvider.get("tagimages"));
@@ -213 +212 @@
             }
                 });
-                menu.add(tagimage);
-                
-                menu.add(new JMenuItem(new ConvertToOsmAction()));
-                
-                menu.addSeparator();
-                menu.add(new LayerListPopup.InfoAction(this));
+                return new Component[]{
+                                new JMenuItem(new LayerList.ShowHideLayerAction(this)),
+                                new JMenuItem(new LayerList.DeleteLayerAction(this)),
+                                new JSeparator(),
+                                new JMenuItem(new GpxExportAction(this)),
+                                color,
+                                tagimage,
+                                new JMenuItem(new ConvertToDataLayerAction()),
+                                new JSeparator(),
+                                new JMenuItem(new LayerListPopup.InfoAction(this))};
     }
 

src/org/openstreetmap/josm/gui/layer/WmsServerLayer.java

@@ -1 +1 @@
 package org.openstreetmap.josm.gui.layer;
 
+import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Image;
@@ -6 +7 @@
 
 import javax.swing.Icon;
-import javax.swing.JPopupMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JSeparator;
 
 import org.openstreetmap.josm.Main;
@@ -14 +16 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.dialogs.LayerList;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -95 +98 @@
         }
 
-        @Override public void addMenuEntries(JPopupMenu menu) {
-                menu.addSeparator();
-                menu.add(new LayerListPopup.InfoAction(this));
+        @Override public Component[] getMenuEntries() {
+                return new Component[]{
+                                new JMenuItem(new LayerList.ShowHideLayerAction(this)),
+                                new JMenuItem(new LayerList.DeleteLayerAction(this)),
+                                new JSeparator(),
+                                new JMenuItem(new LayerListPopup.InfoAction(this))};
     }
 }

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

@@ -1 +1 @@
 package org.openstreetmap.josm.io;
 
-import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.Writer;
+import java.io.UnsupportedEncodingException;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.Map.Entry;
-
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
@@ -39 +31 @@
 
         /**
-         * The GPX namespace used.
-         */
-        public static final Namespace GPX = Namespace.getNamespace("http://www.topografix.com/GPX/1/0");
-        /**
-         * The OSM namespace used (for extensions).
-         */
-        public static final Namespace OSM = Namespace.getNamespace("osm", "http://www.openstreetmap.org");
-        /**
-         * The JOSM namespace (for JOSM-extensions).
-         */
-        public static final Namespace JOSM = Namespace.getNamespace("josm", "http://wiki.eigenheimstrasse.de/wiki/JOSM");
-
-        /**
          * This is the output writer to store the resulting data in.
          */
         private PrintWriter out;
-        /**
-         * The dataset beeing processed.
-         */
-        private DataSet ds;
-        /**
-         * Map all new primitives to the element which hold them. After inserting everything,
-         * the writer sets ids to every element that was in the list and had more than one
-         * element using it. 
-         */
-        private HashMap<OsmPrimitive, Collection<Element>> usedNewPrimitives = new HashMap<OsmPrimitive, Collection<Element>>();
-        /**
-         * The counter for new created objects used more than once.
-         * Starting at -1 and goes down.
-         */
-        private long newIdCounter = -1;
-        
-        /**
-         * Create a GpxWrite from an output writer. As example to write in a file,
-         * use FileWriter.
-         *
-         * @param out The Writer to store the result data in.
-         */
-        public GpxWriter(Writer out, DataSet ds) {
-                this.out = new PrintWriter(out);
-                this.ds = ds;
-        }
-
-
-        /**
-         * Do the output in the former set writer.
-         * @exception IOException In case of IO errors, throw this exception.
-         */
-        public void output() throws IOException {
-                Element root = parseDataSet();
-                root.addNamespaceDeclaration(OSM);
-                root.addNamespaceDeclaration(JOSM);
-                Document d = new Document(root);
-                XMLOutputter xmlOut = new XMLOutputter(Format.getPrettyFormat());
-                xmlOut.output(d, out);
-        }
-
-
-        /**
-         * Write the whole DataSet in an JDom-Element and return the new element.
-         * @return The created element, out of the dataset.
-         */
-        @SuppressWarnings("unchecked")
-        private Element parseDataSet() {
-                Element e = new Element("gpx", GPX);
-                e.setAttribute("version", "1.0");
-                e.setAttribute("creator", "JOSM");
-                // for getting all unreferenced waypoints in the wpt-list
-                LinkedList<Node> unrefNodes = new LinkedList<Node>(ds.nodes);
-                // for getting all unreferenced segments
-                LinkedList<Segment> unrefLs = new LinkedList<Segment>(ds.segments);
-
-                // ways
-                for (Way w : ds.ways) {
-                        if (w.deleted && w.id == 0)
-                                continue;
-                        Element tElem = new Element("trk", GPX);
-                        HashMap<String, String> keys = null;
-                        if (w.keys != null) {
-                                keys = new HashMap<String, String>(w.keys);
-                                addAndRemovePropertyTag("name", tElem, keys);
-                                addAndRemovePropertyTag("cmt", tElem, keys);
-                                addAndRemovePropertyTag("desc", tElem, keys);
-                                addAndRemovePropertyTag("src", tElem, keys);
-                                addAndRemovePropertyLinkTag(tElem, keys);
-                                addAndRemovePropertyTag("number", tElem, keys);
-                                addAndRemovePropertyTag("type", tElem, keys);
-                        }
-                        addPropertyExtensions(tElem, keys, w);
-
-                        // segments
-                        for (Segment ls : w.segments) {
-                                if (ls.incomplete)
-                                        continue;
-                                tElem.getChildren().add(parseSegment(ls));
-                                unrefNodes.remove(ls.from);
-                                unrefNodes.remove(ls.to);
-                                unrefLs.remove(ls);
-                        }
-
-                        e.getChildren().add(tElem);
-                }
-                
-                // encode pending segments as ways
-                for (Segment ls : unrefLs) {
-                        if (ls.deleted && ls.id == 0)
-                                continue;
-                        Element t = new Element("trk", GPX);
-                        t.getChildren().add(parseSegment(ls));
-                        unrefNodes.remove(ls.from);
-                        unrefNodes.remove(ls.to);
-                        Element ext = new Element("extensions", GPX);
-                        ext.getChildren().add(new Element("segment", JOSM));
-                        t.getChildren().add(ext);
-                        e.getChildren().add(t);
-                }
-
-                // waypoints (missing nodes)
-                for (Node n : unrefNodes) {
-                        if (n.deleted && n.id == 0)
-                                continue;
-                        e.getChildren().add(parseWaypoint(n, "wpt"));
-                }
-
-                // link all ids used more than once
-                for (Entry<OsmPrimitive, Collection<Element>> entry : usedNewPrimitives.entrySet()) {
-                        if (entry.getValue().size() > 1) {
-                                long id = newIdCounter--;
-                                for (Element element : entry.getValue()) {
-                                        Element ext = element.getChild("extensions", GPX);
-                                        if (ext == null)
-                                                element.getChildren().add(ext = new Element("extensions", GPX));
-                                        ext.getChildren().add(new Element("uid", JOSM).setText(""+id));
-                                }
-                        }
-                }
-
-                return e;
-        }
-
-
-        /**
-         * Parse a segment and store it into a JDOM-Element. Return that element.
-         */
-        @SuppressWarnings("unchecked")
-        private Element parseSegment(Segment ls) {
-                Element lsElem = new Element("trkseg", GPX);
-                addPropertyExtensions(lsElem, ls.keys, ls);
-                lsElem.getChildren().add(parseWaypoint(ls.from, "trkpt"));
-                lsElem.getChildren().add(parseWaypoint(ls.to, "trkpt"));
-                return lsElem;
-        }
-
-        /**
-         * Parse a waypoint (node) and store it into an JDOM-Element. Return that
-         * element.
-         * 
-         * @param n The Node to parse and store
-         * @param name The name of the tag (different names for nodes in GPX)
-         * @return The resulting GPX-Element
-         */
-        private Element parseWaypoint(Node n, String name) {
-                Element e = new Element(name, GPX);
-                e.setAttribute("lat", Double.toString(n.coor.lat()));
-                e.setAttribute("lon", Double.toString(n.coor.lon()));
-                HashMap<String, String> keys = null;
-                if (n.keys != null) {
-                        keys = new HashMap<String, String>(n.keys);
-                        addAndRemovePropertyTag("ele", e, keys);
-                        addAndRemovePropertyTag("time", e, keys);
-                        addAndRemovePropertyTag("magvar", e, keys);
-                        addAndRemovePropertyTag("geoidheight", e, keys);
-                        addAndRemovePropertyTag("name", e, keys);
-                        addAndRemovePropertyTag("cmt", e, keys);
-                        addAndRemovePropertyTag("desc", e, keys);
-                        addAndRemovePropertyTag("src", e, keys);
-                        addAndRemovePropertyLinkTag(e, keys);
-                        addAndRemovePropertyTag("sym", e, keys);
-                        addAndRemovePropertyTag("type", e, keys);
-                        addAndRemovePropertyTag("fix", e, keys);
-                        addAndRemovePropertyTag("sat", e, keys);
-                        addAndRemovePropertyTag("hdop", e, keys);
-                        addAndRemovePropertyTag("vdop", e, keys);
-                        addAndRemovePropertyTag("pdop", e, keys);
-                        addAndRemovePropertyTag("ageofdgpsdata", e, keys);
-                        addAndRemovePropertyTag("dgpsid", e, keys);
-                }
-                addPropertyExtensions(e, keys, n);
-                return e;
-        }
-
-
-        /**
-         * Add a link-tag to the element, if the property list contain a value named 
-         * "link". The property is removed from the map afterwards.
-         * 
-         * For the format, @see GpxReader#parseKeyValueLink(OsmPrimitive, Element).
-         * @param e             The element to add the link to.
-         * @param keys  The map containing the link property.
-         */
-        @SuppressWarnings("unchecked")
-        private void addAndRemovePropertyLinkTag(Element e, Map<String, String> keys) {
-                String value = keys.get("link");
-                if (value != null) {
-                        StringTokenizer st = new StringTokenizer(value, ";");
-                        if (st.countTokens() != 2)
-                                return;
-                        Element link = new Element("link", GPX);
-                        link.getChildren().add(new Element("type", GPX).setText(st.nextToken()));
-                        link.getChildren().add(0,new Element("text", GPX).setText(st.nextToken()));
-                        e.getChildren().add(link);
-                        keys.remove("link");
-                }
-        }
-
-
-        /**
-         * Helper to add a property with a given name as tag to the element. This
-         * will look like &lt;name&gt;<i>keys.get(name)</i>&lt;/name&gt; 
-         * 
-         * After adding, the property is removed from the map.
-         * 
-         * If the property does not exist, nothing is done.
-         * 
-         * @param name The properties name
-         * @param e The element to add the tag to.
-         * @param osm The data to get the property from.
-         */
-        @SuppressWarnings("unchecked")
-        private void addAndRemovePropertyTag(String name, Element e, Map<String, String> keys) {
-                String value = keys.get(name);
-                if (value != null) {
-                        e.getChildren().add(new Element(name, GPX).setText(value));
-                        keys.remove(name);
-                }
-        }
-        
-        /**
-         * Add the property in the entry as &lt;extensions&gt; to the element 
-         * @param e             The element to add the property to.
-         * @param prop  The property to add.
-         */
-        @SuppressWarnings("unchecked")
-        private void addPropertyExtensions(Element e, Map<String, String> keys, OsmPrimitive osm) {
-                LinkedList<Element> extensions = new LinkedList<Element>();
-                if (keys != null && !keys.isEmpty()) {
-                        for (Entry<String, String> prop : keys.entrySet()) {
-                                Element propElement = new Element("property", OSM);
-                                propElement.setAttribute("key", prop.getKey());
-                                propElement.setAttribute("value", prop.getValue());
-                                extensions.add(propElement);
-                        }
-                }
-                
-                if (osm.id != 0) {
-                        Element propElement = new Element("uid", JOSM);
-                        propElement.setText(""+osm.id);
-                        extensions.add(propElement);
-                } else {
-                        Collection<Element> l = usedNewPrimitives.get(osm);
-                        if (l == null)
-                                l = new LinkedList<Element>();
-                        l.add(e);
-                        usedNewPrimitives.put(osm, l);
-                }
-                if (osm.modified) {
-                        Element modElement = new Element("modified", JOSM);
-                        extensions.add(modElement);
-                }
-                if (osm.deleted) {
-                        Element modElement = new Element("deleted", JOSM);
-                        extensions.add(modElement);
-                }
-                
-                if (extensions.isEmpty())
-                        return;
-
-                Element ext = e.getChild("extensions", GPX);
-                if (ext == null)
-                        e.getChildren().add(ext = new Element("extensions", GPX));
-                ext.getChildren().addAll(extensions);
-        }
-
-
-        public GpxWriter(Writer writer, String name, String desc, String author, String email, String copyright, String year, String keywords) {
-                out = writer instanceof PrintWriter ? (PrintWriter)writer : new PrintWriter(writer);
+
+        public GpxWriter(OutputStream os, String name, String desc, String author, String email, String copyright, String year, String keywords) {
+                try {
+                        out = new PrintWriter(new OutputStreamWriter(os, "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                        throw new RuntimeException(e);
+                }
                 out.println(XmlWriter.header());
                 out.println("<gpx version='1.1' creator='JOSM' xmlns='http://www.topografix.com/GPX/1/1'>");
@@ -373 +89 @@
                 out.println("    <bounds minlat='"+b.min.lat()+"' minlon='"+b.min.lon()+"' maxlat='"+b.max.lat()+"' maxlon='"+b.max.lon()+"' />");
                 out.println("  </metadata>");
-                
+
                 // add ways
                 for (Way w : data.ways) {
@@ -407 +123 @@
                         all.remove(w);
                 }
-                
+
                 // add remaining segments
                 Collection<Segment> segments = new LinkedList<Segment>();
@@ -426 +142 @@
                         out.println("  </trk>");
                 }
-                
+
                 // finally add the remaining nodes
                 for (OsmPrimitive osm : all)
                         if (osm instanceof Node)
                                 outputNode((Node)osm, true);
-                
+
                 out.println("</gpx>");
         }
@@ -453 +169 @@
                 out.println("    <bounds minlat='"+b.min.lat()+"' minlon='"+b.min.lon()+"' maxlat='"+b.max.lat()+"' maxlon='"+b.max.lon()+"' />");
                 out.println("  </metadata>");
-                
+
                 out.println("  <trk>");
                 for (Collection<GpsPoint> c : data) {
@@ -508 +224 @@
                         out.println(" />");
         }
+
+        public void close() {
+                out.flush();
+                out.close();
+        }
 }

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

@@ -26 +26 @@
 public class OsmConnection {
 
+        public static class OsmParseException extends Exception {
+                public OsmParseException() {super();}
+                public OsmParseException(String message, Throwable cause) {super(message, cause);}
+                public OsmParseException(String message) {super(message);}
+                public OsmParseException(Throwable cause) {super(cause);}
+        }
+        
         protected boolean cancel = false;
         protected HttpURLConnection activeConnection;

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

@@ -2 +2 @@
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.HashMap;
@@ -33 +35 @@
     }
 
-        public Map<Long, String> parseIds(Reader in) throws IOException, SAXException {
-        this.in = in;
+        public Map<Long, String> parseIds(InputStream in) throws IOException, SAXException {
+        this.in = new InputStreamReader(in, "UTF-8");
                 try {
-                parse(in);
+                parse(this.in);
         } catch (SAXException e) {
                 if (!cancel)

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

@@ -2 +2 @@
 
 import java.io.IOException;
-import java.io.Reader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -56 +57 @@
          */
         private Map<Long, Node> nodes = new HashMap<Long, Node>();
-        
+
         private static class OsmPrimitiveData extends OsmPrimitive {
                 @Override public void visit(Visitor visitor) {}
@@ -68 +69 @@
                         osm.deleted = deleted;
                         osm.timestamp = timestamp;
-        }
-        }
-        
+                }
+        }
+
         /**
          * Data structure for the remaining segment objects
@@ -200 +201 @@
          * Parse the given input source and return the dataset.
          */
-        public static DataSet parseDataSet(Reader source, JLabel currentAction, BoundedRangeModel progress) throws SAXException, IOException {
+        public static DataSet parseDataSet(InputStream source, JLabel currentAction, BoundedRangeModel progress) throws SAXException, IOException {
                 OsmReader osm = new OsmReader();
 
                 // phase 1: Parse nodes and read in raw segments and ways
-                osm.new Parser().parse(source);
+                osm.new Parser().parse(new InputStreamReader(source, "UTF-8"));
                 if (progress != null)
                         progress.setValue(0);

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

@@ -2 +2 @@
 
 import java.io.IOException;
-import java.io.Reader;
+import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -8 +8 @@
 import java.util.LinkedList;
 
-import org.jdom.JDOMException;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -46 +45 @@
          *              ways.
          */
-        public Collection<Collection<GpsPoint>> parseRawGps() throws IOException, JDOMException {
+        public Collection<Collection<GpsPoint>> parseRawGps() throws IOException, SAXException {
                 try {
                         String url = Main.pref.get("osm-server.url")+"/0.3/trackpoints?bbox="+lon1+","+lat1+","+lon2+","+lat2+"&page=";
@@ -54 +53 @@
                         for (int i = 0;;++i) {
                                 currentAction.setText("Downloading points "+(i*5000)+" to "+((i+1)*5000)+"...");
-                                Reader r = getReader(url+i);
-                                if (r == null)
+                                InputStream in = getInputStream(url+i);
+                                if (in == null)
                                         break;
-                                RawGpsReader gpsReader = new RawGpsReader(r);
-                                Collection<Collection<GpsPoint>> allWays = gpsReader.parse();
+                                Collection<Collection<GpsPoint>> allWays = RawGpsReader.parse(in);
                                 boolean foundSomething = false;
                                 for (Collection<GpsPoint> t : allWays) {
@@ -68 +66 @@
                                 if (!foundSomething)
                                         break;
-                                r.close();
+                                in.close();
                                 activeConnection = null;
                         }
@@ -78 +76 @@
                                 return null;
                         throw e;
-                } catch (JDOMException e) {
+                } catch (SAXException e) {
                         throw e;
                 } catch (Exception e) {
@@ -96 +94 @@
         public DataSet parseOsm() throws SAXException, IOException {
                 try {
-                        final Reader r = getReader(Main.pref.get("osm-server.url")+"/0.3/map?bbox="+lon1+","+lat1+","+lon2+","+lat2);
-                        if (r == null)
+                        final InputStream in = getInputStream(Main.pref.get("osm-server.url")+"/0.3/map?bbox="+lon1+","+lat1+","+lon2+","+lat2);
+                        if (in == null)
                                 return null;
                         currentAction.setText("Downloading OSM data...");
-                        final DataSet data = OsmReader.parseDataSet(r, currentAction, progress);
-                        r.close();
+                        final DataSet data = OsmReader.parseDataSet(in, currentAction, progress);
+                        in.close();
                         activeConnection = null;
                         return data;
@@ -126 +124 @@
          * @return An reader reading the input stream (servers answer) or <code>null</code>.
          */
-        private Reader getReader(String urlStr) throws IOException {
+        private InputStream getInputStream(String urlStr) throws IOException {
                 System.out.println("download: "+urlStr);
                 initAuthentication();

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

@@ -2 +2 @@
 
 import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.io.Writer;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -14 +13 @@
 import java.util.LinkedList;
 
-import org.jdom.JDOMException;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
@@ -22 +20 @@
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.xml.sax.SAXException;
 
 /**
@@ -55 +54 @@
          * does not want to send the data.
          */
-        public void uploadOsm(Collection<OsmPrimitive> list) throws JDOMException {
+        public void uploadOsm(Collection<OsmPrimitive> list) throws SAXException {
                 processed = new LinkedList<OsmPrimitive>();
                 initAuthentication();
@@ -73 +72 @@
                         }
                 } catch (RuntimeException e) {
-                        throw new JDOMException("An error occoured: ", e);
+                        throw new SAXException("An error occoured: ", e);
                 }
         }
@@ -162 +161 @@
 
                         if (addBody) {
-                                Writer out = new OutputStreamWriter(activeConnection.getOutputStream());
+                                OutputStream out = activeConnection.getOutputStream();
                                 OsmWriter.outputSingle(out, osm, true);
                                 out.close();
@@ -176 +175 @@
                                 return; // everything fine.. was already deleted.
                         if (retCode != 200) {
-                                StringWriter o = new StringWriter();
+                                ByteArrayOutputStream o = new ByteArrayOutputStream();
                                 OsmWriter.outputSingle(o, osm, true);
-                                System.out.println(o.getBuffer().toString());
+                                System.out.println(new String(o.toByteArray(), "UTF-8").toString());
                                 throw new RuntimeException(retCode+" "+retMsg);
                         }

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

@@ -1 +1 @@
 package org.openstreetmap.josm.io;
 
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.Writer;
+import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Map.Entry;
@@ -44 +46 @@
          *              is lost and id's remain 0 instead of decrementing from -1)
          */
-        public static void output(Writer out, DataSet ds, boolean osmConform) {
+        public static void output(OutputStream out, DataSet ds, boolean osmConform) {
                 OsmWriter writer = new OsmWriter(out, osmConform);
                 writer.out.println("<?xml version='1.0' encoding='UTF-8'?>");
@@ -55 +57 @@
                         writer.visit(w);
                 writer.out.println("</osm>");
+                writer.close();
         }
 
-        public static void outputSingle(Writer out, OsmPrimitive osm, boolean osmConform) {
+        public static void outputSingle(OutputStream out, OsmPrimitive osm, boolean osmConform) {
                 OsmWriter writer = new OsmWriter(out, osmConform);
                 writer.out.println(XmlWriter.header());
@@ -63 +66 @@
                 osm.visit(writer);
                 writer.out.println("</osm>");
+                writer.close();
         }
 
-        private OsmWriter(Writer out, boolean osmConform) {
-                if (out instanceof PrintWriter)
-                        this.out = (PrintWriter)out;
-                else
-                        this.out = new PrintWriter(out);
+        private OsmWriter(OutputStream out, boolean osmConform) {
+                try {
+                this.out = new PrintWriter(new OutputStreamWriter(out, "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+                throw new RuntimeException(e);
+        }
                 this.osmConform = osmConform;
         }
@@ -141 +146 @@
                 }
         }
+
+        public void close() {
+            out.close();
+    }
 }

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

@@ -2 +2 @@
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -13 +14 @@
  * @author Imi
  */
-public class ProgressReader extends Reader {
+public class ProgressReader extends InputStream {
 
         private final Reader in;
@@ -36 +37 @@
         }
 
-        @Override public int read(char[] cbuf, int off, int len) throws IOException {
-                int read = in.read(cbuf, off, len);
-                readSoFar += read;
+        @Override public int read() throws IOException {
+                int read = in.read();
+                readSoFar++;
 
                 String progStr = " ("+readSoFar+"/";
@@ -55 +56 @@
                 progress.setValue(readSoFar);
                 return read;
-        }
-
+    }
 }

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

@@ -9 +9 @@
 import java.util.StringTokenizer;
 
-import org.jdom.JDOMException;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
+import org.xml.sax.SAXException;
 
 /**
@@ -29 +29 @@
         }
 
-        public Collection<GpsPoint> parse() throws JDOMException, IOException {
+        public Collection<GpsPoint> parse() throws SAXException, IOException {
                 Collection<GpsPoint> data = new LinkedList<GpsPoint>();
                 String formatStr = Main.pref.get("csv.importstring");
@@ -35 +35 @@
                         formatStr = in.readLine();
                 if (formatStr == null)
-                        throw new JDOMException("Could not detect data format string.");
+                        throw new SAXException("Could not detect data format string.");
 
                 // get delimiter
@@ -58 +58 @@
                 if (!format.contains("lat") || !format.contains("lon")) {
                         if (Main.pref.get("csv.importstring").equals(""))
-                                throw new JDOMException("Format string in data is incomplete or not found. Try setting an manual format string in Preferences.");
-                        throw new JDOMException("Format string is incomplete. Need at least 'lat' and 'lon' specification");
+                                throw new SAXException("Format string in data is incomplete or not found. Try setting an manual format string in Preferences.");
+                        throw new SAXException("Format string is incomplete. Need at least 'lat' and 'lon' specification");
                 }
 
@@ -79 +79 @@
                                                 st.nextToken();
                                         else
-                                                throw new JDOMException("Unknown data type: '"+token+"'."+(Main.pref.get("csv.importstring").equals("") ? " Maybe add an format string in preferences." : ""));
+                                                throw new SAXException("Unknown data type: '"+token+"'."+(Main.pref.get("csv.importstring").equals("") ? " Maybe add an format string in preferences." : ""));
                                 }
                                 data.add(new GpsPoint(new LatLon(lat, lon), time));
                         }
                 } catch (RuntimeException e) {
-                        throw new JDOMException("Parsing error in line "+lineNo, e);
+                        throw new SAXException("Parsing error in line "+lineNo, e);
                 }
                 return data;

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

@@ -2 +2 @@
 
 import java.io.IOException;
-import java.io.Reader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.Collection;
 import java.util.LinkedList;
 
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.input.SAXBuilder;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.layer.RawGpsLayer.GpsPoint;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+
+import uk.co.wilson.xml.MinML2;
 
 /**
@@ -20 +21 @@
 public class RawGpsReader {
 
-        /**
-         * The data source from this reader.
-         */
-        public Reader source;
-        
-        /**
-         * Construct a gps reader from an input reader source.
-         * @param source The source to read the raw gps data from. The data must be
-         *              in GPX format.
-         */
-        public RawGpsReader(Reader source) {
-                this.source = source;
+        private static class Parser extends MinML2 {
+                /**
+                 * Current track to be read. The last entry is the current trkpt.
+                 * If in wpt-mode, it contain only one GpsPoint.
+                 */
+                private Collection<GpsPoint> current = new LinkedList<GpsPoint>();
+                public Collection<Collection<GpsPoint>> data = new LinkedList<Collection<GpsPoint>>();
+                private LatLon currentLatLon;
+                private String currentTime;
+
+                @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
+                        if (qName.equals("wpt") || qName.equals("trkpt")) {
+                                try {
+                        double lat = Double.parseDouble(atts.getValue("lat"));
+                        double lon = Double.parseDouble(atts.getValue("lon"));
+                                if (Math.abs(lat) > 90)
+                                        throw new SAXException("Data error: lat value '"+lat+"' is out of bound.");
+                                if (Math.abs(lon) > 180)
+                                        throw new SAXException("Data error: lon value '"+lon+"' is out of bound.");
+                        currentLatLon = new LatLon(lat, lon);
+                } catch (NumberFormatException e) {
+                        e.printStackTrace();
+                        throw new SAXException(e);
+                }
+                        } else if (qName.equals("time")) {
+                                currentTime = "";
+                        }
+                }
+
+                @Override public void characters(char[] ch, int start, int length) {
+                        if (currentTime != null && currentTime.equals(""))
+                                currentTime = new String(ch, start, length);
+                }
+
+                @Override public void endElement(String namespaceURI, String localName, String qName) {
+                        if (qName.equals("wpt") || qName.equals("trkpt")) {
+                                current.add(new GpsPoint(currentLatLon, currentTime));
+                        } else if (qName.equals("trkseg") || qName.equals("trk") || qName.equals("gpx"))
+                                newTrack();
+        }
+
+                private void newTrack() {
+                        if (!current.isEmpty()) {
+                                data.add(current);
+                                current = new LinkedList<GpsPoint>();
+                        }
+                }
         }
 
         /**
-         * The gpx namespace.
-         */
-        private Namespace GPX = Namespace.getNamespace("http://www.topografix.com/GPX/1/0");
-        
-        /**
          * Parse and return the read data
          */
-        public Collection<Collection<GpsPoint>> parse() throws JDOMException, IOException {
-                final SAXBuilder builder = new SAXBuilder();
-                builder.setValidation(false);
-                Element root = builder.build(source).getRootElement();
-                return parseData(root);
-        }
-
-        /**
-         * Parse and return the whole data thing.
-         * @param root
-         * @return
-         */
-        @SuppressWarnings("unchecked")
-        private Collection<Collection<GpsPoint>> parseData(Element root) throws JDOMException {
-                Collection<Collection<GpsPoint>> data = new LinkedList<Collection<GpsPoint>>();
-
-                // workaround for bug where the server adds /gpx.asd to the namespace
-                GPX = Namespace.getNamespace(root.getNamespaceURI());
-                
-                for (Object o : root.getChildren("wpt", GPX)) {
-                        Collection<GpsPoint> line = new LinkedList<GpsPoint>();
-                        line.add(new GpsPoint(
-                                        new LatLon(parseDouble((Element)o, LatLonAttr.lat), parseDouble((Element)o, LatLonAttr.lon)),
-                                        ((Element)o).getChildText("time", GPX)));
-                        data.add(line);
-                }
-                for (Object o : root.getChildren("trk", GPX)) {
-                        for (Object seg : ((Element)o).getChildren("trkseg", GPX)) {
-                                Collection<GpsPoint> data1 = new LinkedList<GpsPoint>();
-                                for (Object trkObj : ((Element)seg).getChildren("trkpt", GPX)) {
-                                        data1.add(new GpsPoint(
-                                                        new LatLon(parseDouble((Element)trkObj, LatLonAttr.lat), parseDouble((Element)trkObj, LatLonAttr.lon)),
-                                                        ((Element)trkObj).getChildText("time", GPX)));
-                                }
-                                Collection<GpsPoint> line = data1;
-                                if (!line.isEmpty())
-                                        data.add(line);
-                        }
-                }
-                return data;
-        }
-
-        private enum LatLonAttr {lat, lon}
-        /**
-         * Return a parsed float value from the element behind the object o.
-         * @param o An object of dynamic type org.jdom.Element (will be casted).
-         * @param attr The name of the attribute.
-         * @throws JDOMException If the absolute of the value is out of bound.
-         */
-        private double parseDouble(Element e, LatLonAttr attr) throws JDOMException {
-                double d = Double.parseDouble(e.getAttributeValue(attr.toString()));
-                if (Math.abs(d) > (attr == LatLonAttr.lat ? 90 : 180))
-                        throw new JDOMException("Data error: "+attr+" value '"+d+"' is out of bound.");
-                return d;
+        public static Collection<Collection<GpsPoint>> parse(InputStream source) throws SAXException, IOException {
+                Parser parser = new Parser();
+                parser.parse(new InputStreamReader(source, "UTF-8"));
+                return parser.data;
         }
 }

src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

@@ -29 +29 @@
                 e.printStackTrace();
                 if (Main.parent != null) {
+                        if (e instanceof OutOfMemoryError) {
+                                JOptionPane.showMessageDialog(Main.parent, "You are out of memory. Strange things may happen.\nPlease restart JOSM and load smaller data sets.");
+                                return;
+                        }
+                        
                         Object[] options = new String[]{"Do nothing", "Report Bug"};
                         int answer = JOptionPane.showOptionDialog(Main.parent, "An unexpected exception occoured.\n\n" +