Changeset 431 in josm for trunk

Timestamp:

2007-10-26T21:58:25+02:00 (17 years ago)

Author:

gebner

Message:

Make the applet code work again.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/ServerSidePreferences.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/MainApplet.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MapStatus.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (1 diff)
• start.html (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java

@@ -12 +12 @@
 import java.io.StringReader;
 import java.net.HttpURLConnection;
+import java.net.URLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -46 +47 @@
                         try {
                                 System.out.println("reading preferences from "+serverUrl);
-                                HttpURLConnection con = (HttpURLConnection)serverUrl.openConnection();
-                                addAuth(con);
+                                URLConnection con = serverUrl.openConnection();
+                                if (con instanceof HttpURLConnection) addAuth((HttpURLConnection) con);
                                 con.connect();
                                 BufferedReader reader = new BufferedReader(new InputStreamReader(con.getInputStream()));
@@ -55 +56 @@
                                         b.append("\n");
                                 }
-                                con.disconnect();
+                                if (con instanceof HttpURLConnection) ((HttpURLConnection) con).disconnect();
                                 return b.toString();
                         } catch (IOException e) {
@@ -122 +123 @@
                 if (!properties.containsKey("osm-server.password") && password != null)
                         properties.put("osm-server.password", password);
-                Reader in = new StringReader(connection.download());
+                String cont = connection.download();
+                if (cont == null) return;
+                Reader in = new StringReader(cont);
                 try {
                         XmlObjectParser.Uniform<Prop> parser = new XmlObjectParser.Uniform<Prop>(in, "tag", Prop.class);
@@ -176 +179 @@
                 } catch (MalformedURLException e) {
                         e.printStackTrace();
+                } catch (IllegalArgumentException e) {
+                        e.printStackTrace();
                 } catch (IOException e) {
                         e.printStackTrace();

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.applet.AppletStub;
+import java.applet.AppletContext;
 import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
+import java.io.File;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.Collection;
@@ -14 +18 @@
 
 import javax.swing.JApplet;
+import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -55 +60 @@
 
         private Map<String, Collection<String>> args = new HashMap<String, Collection<String>>();
-        private UploadPreferencesAction uploadPreferences = new UploadPreferencesAction(); 
 
         @Override public String[][] getParameterInfo() {
@@ -101 +105 @@
                 // remove offending stuff from JOSM (that would break the SecurityManager)
                 m.remove(m.fileMenu);
-                m.editMenu.add(uploadPreferences);
+                m.editMenu.add(new UploadPreferencesAction());
                 m.open.setEnabled(false);
                 m.exit.setEnabled(false);
@@ -118 +122 @@
                 return v;
         }
+
+        public static void main(String[] args) {
+                final JFrame frame = new JFrame("Java OpenStreetMap Applet");
+                MainApplet applet = new MainApplet();
+                applet.setStub(new AppletStub() {
+                        public void appletResize(int w, int h) {
+                                frame.resize(w, h);
+                        }
+
+                        public AppletContext getAppletContext() {
+                                return null;
+                        }
+
+                        public URL getCodeBase() {
+                                try {
+                                        return new File(".").toURI().toURL();
+                                } catch (Exception e) {
+                                        e.printStackTrace();
+                                        return null;
+                                }
+                        }
+
+                        public URL getDocumentBase() {
+                                return getCodeBase();
+                        }
+
+                        public String getParameter(String k) {
+                                return null;
+                        }
+
+                        public boolean isActive() {
+                                return true;
+                        }
+                });
+                applet.init();
+                applet.start();
+                frame.setContentPane(applet);
+                frame.setVisible(true);
+        }
 }

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

@@ -101 +101 @@
 
                 // status line below the map
-                if (!Main.applet)
-                statusLine = new MapStatus(this);
+                statusLine = new MapStatus(this);
         }
 

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

@@ -17 +17 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.lang.reflect.InvocationTargetException;
 import java.text.DecimalFormat;
@@ -270 +272 @@
                 // Listen to keyboard/mouse events for pressing/releasing alt key and
                 // inform the collector.
-        Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener(){
-                public void eventDispatched(AWTEvent event) {
-                        synchronized (collector) {
-                                mouseState.modifiers = ((InputEvent)event).getModifiersEx();
-                                if (event instanceof MouseEvent)
-                                        mouseState.mousePos = ((MouseEvent)event).getPoint();
-                                collector.notify();
-                        }
-                }
-        }, AWTEvent.KEY_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK | AWTEvent.MOUSE_MOTION_EVENT_MASK);
+                try {
+                        Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener(){
+                                public void eventDispatched(AWTEvent event) {
+                                        synchronized (collector) {
+                                                mouseState.modifiers = ((InputEvent)event).getModifiersEx();
+                                                if (event instanceof MouseEvent)
+                                                        mouseState.mousePos = ((MouseEvent)event).getPoint();
+                                                collector.notify();
+                                        }
+                                }
+                        }, AWTEvent.KEY_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK | AWTEvent.MOUSE_MOTION_EVENT_MASK);
+                } catch (SecurityException ex) {
+                        mapFrame.mapView.addMouseMotionListener(new MouseMotionListener() {
+                                public void mouseMoved(MouseEvent e) {
+                                        synchronized (collector) {
+                                                mouseState.modifiers = e.getModifiersEx();
+                                                mouseState.mousePos = e.getPoint();
+                                                collector.notify();
+                                        }
+                                }
+
+                                public void mouseDragged(MouseEvent e) {
+                                        mouseMoved(e);
+                                }
+                        });
+
+                        mapFrame.mapView.addKeyListener(new KeyAdapter() {
+                                public void keyPressed(KeyEvent e) {
+                                        synchronized (collector) {
+                                                mouseState.modifiers = e.getModifiersEx();
+                                                collector.notify();
+                                        }
+                                }
+
+                                public void keyReleased(KeyEvent e) {
+                                        keyReleased(e);
+                                }
+                        });
+                }
         }
 

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

@@ -167 +167 @@
 
         static {
-                sources.add(ClassLoader.getSystemClassLoader());
+                try {
+                        sources.add(ClassLoader.getSystemClassLoader());
+                } catch (SecurityException ex) {
+                        sources.add(ImageProvider.class.getClassLoader());
+                }
         }
 }

trunk/start.html

@@ -1 +1 @@
 <applet 
   code="org/openstreetmap/josm/gui/MainApplet.class" 
-  archive="dist/josm-custom.jar,lib/gettext-commons-0.9.jar,lib/metadata-extractor-2.3.1.jar,lib/MinML2.jar" 
+  archive="dist/josm-custom.jar" 
   width="800" 
-  height="600"
-  username="foo"
-  password="bar"
-/>
+  height="600">
+</applet>