Changeset 266 in josm

Timestamp:

2007-06-30T13:08:56+02:00 (18 years ago)

Author:

imi

Message:

• added "Getting Started" welcome screen
• added latest JOSM version in About dialog
• set "draw boundaries" to on by default

Files:

• images/dialogs/search.png (modified) ( previous)
• images/getting_started.png (added)
• src/org/openstreetmap/josm/Main.java (modified) (5 diffs)
• src/org/openstreetmap/josm/actions/AboutAction.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/GettingStarted.java (added)
• src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java (modified) (1 diff)
• test/org/openstreetmap/josm/gui/annotation/AnnotationPresetTest.java (modified) (1 diff)

src/org/openstreetmap/josm/Main.java

@@ -11 +11 @@
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Arrays;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -42 +42 @@
 import org.openstreetmap.josm.data.projection.Epsg4326;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.gui.GettingStarted;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.gui.MapFrame;
@@ -125 +126 @@
                 if (map != null) {
                         map.fillPanel(panel);
-                        panel.setVisible(true);
                         map.mapView.addLayerChangeListener(new LayerChangeListener(){
                                 public void activeLayerChange(final Layer oldLayer, final Layer newLayer) {
@@ -143 +143 @@
                         if (map.mapView.editLayer != null)
                                 map.mapView.editLayer.listenerCommands.add(redoUndoListener);
-                } else
+                } else {
                         old.destroy();
+                        panel.add(new GettingStarted(), BorderLayout.CENTER);
+                }
+                panel.setVisible(true);
                 redoUndoListener.commandChanged(0,0);
 
@@ -183 +186 @@
                 main = this;
                 contentPane.add(panel, BorderLayout.CENTER);
+                panel.add(new GettingStarted(), BorderLayout.CENTER);
                 menu = new MainMenu();
 

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

@@ -10 +10 @@
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.URL;
@@ -15 +16 @@
 import java.util.regex.Pattern;
 
+import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -21 +23 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTextArea;
+import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
@@ -39 +42 @@
         public static final String version;
 
-        private static JTextArea revision;
+        private final static JTextArea revision;
         private static String time;
 
         static {
-                JTextArea revision = loadFile(Main.class.getResource("/REVISION"));
+                revision = loadFile(Main.class.getResource("/REVISION"));
 
                 Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
@@ -65 +68 @@
 
                 JPanel info = new JPanel(new GridBagLayout());
-                info.add(new JLabel(tr("Java OpenStreetMap Editor Version {0}",version)), GBC.eop());
-                info.add(new JLabel(tr("last change at {0}",time)), GBC.eop());
-                info.add(new JLabel(tr("Java Version {0}",System.getProperty("java.version"))), GBC.eop());
+                info.add(new JLabel(tr("Java OpenStreetMap Editor Version {0}",version)), GBC.eol());
+                info.add(new JLabel(tr("last change at {0}",time)), GBC.eol());
+                info.add(new JLabel(tr("Java Version {0}",System.getProperty("java.version"))), GBC.eol());
+                info.add(new JLabel(tr("Latest Version on JOSM homepage is")), GBC.std().insets(0,0,5,0));
+                final JLabel checkVersionLabel = new JLabel("<html><em>"+tr("checking...")+"</em></html>");
+                info.add(checkVersionLabel, GBC.eol());
+                new Thread(){
+                        @Override public void run() {
+                                final String version = checkLatestVersion();
+                                try {
+                                        if (version == null)
+                                                throw new NullPointerException();
+                        SwingUtilities.invokeAndWait(new Runnable(){
+                                public void run() {
+                                        checkVersionLabel.setText(version);
+                            }
+                        });
+                } catch (Exception e) {
+                        checkVersionLabel.setText("failed.");
+                }
+            }
+                }.start();
+                
+                info.add(GBC.glue(0,10), GBC.eol());
+                
                 info.add(new JLabel(tr("Homepage")), GBC.std().insets(0,0,10,0));
-                info.add(new UrlLabel("http://josm.eigenheimstrasse.de"), GBC.eol());
+                info.add(new UrlLabel("http://josm.openstreetmap.de"), GBC.eol());
                 info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(0,0,10,0));
-                info.add(new UrlLabel("http://josm.eigenheimstrasse.de/newticket"), GBC.eol());
+                info.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eol());
                 info.add(new JLabel(tr("News about JOSM")), GBC.std().insets(0,0,10,0));
                 info.add(new UrlLabel("http://www.opengeodata.org/?cat=17"), GBC.eol());
 
-
                 about.addTab(tr("Info"), info);
-                about.addTab(tr("Readme"), new JScrollPane(readme));
-                about.addTab(tr("Revision"), new JScrollPane(revision));
-                about.addTab(tr("Contribution"), new JScrollPane(contribution));
+                about.addTab(tr("Readme"), createScrollPane(readme));
+                about.addTab(tr("Revision"), createScrollPane(revision));
+                about.addTab(tr("Contribution"), createScrollPane(contribution));
 
                 about.setPreferredSize(new Dimension(500,300));
@@ -86 +110 @@
                                 JOptionPane.INFORMATION_MESSAGE, ImageProvider.get("logo"));
         }
+
+        private JScrollPane createScrollPane(JTextArea area) {
+                area.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+                area.setOpaque(false);
+            JScrollPane sp = new JScrollPane(area);
+                sp.setBorder(null);
+                sp.setOpaque(false);
+            return sp;
+    }
+
+        /**
+         * Retrieve the latest JOSM version from the JOSM homepage.
+         * @return An string with the latest version or "UNKNOWN" in case
+         *              of problems (e.g. no internet connection).
+         */
+        public static String checkLatestVersion() {
+        String latest;
+        try {
+                InputStream s = new URL("http://josm.openstreetmap.de/current").openStream();
+                latest = new BufferedReader(new InputStreamReader(s)).readLine();
+                s.close();
+        } catch (IOException x) {
+                x.printStackTrace();
+                return "UNKNOWN";
+        }
+        return latest;
+    }
 
         /**

src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java

@@ -56 +56 @@
                 // downloaded area
                 sourceBounds.setToolTipText(tr("Draw the boundaries of data loaded from the server."));
-                sourceBounds.setSelected(Main.pref.getBoolean("draw.data.downloaded_area"));
+                sourceBounds.setSelected(Main.pref.getBoolean("draw.data.downloaded_area", true));
                 gui.display.add(sourceBounds, GBC.eop().insets(20,0,0,0));
         }

test/org/openstreetmap/josm/gui/annotation/AnnotationPresetTest.java

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Label;
 import org.openstreetmap.josm.gui.annotation.AnnotationPreset.Text;
-import org.openstreetmap.josm.tools.ImageProvider;
 
 public class AnnotationPresetTest extends TestCase {