Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 3416)
+++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 3417)
@@ -1,4 +1,3 @@
// License: GPL. Copyright 2007 by Immanuel Scholz and others
-//Licence: GPL
package org.openstreetmap.josm.gui;
@@ -6,4 +5,6 @@
import java.awt.EventQueue;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.Toolkit;
import java.awt.event.WindowAdapter;
@@ -23,4 +24,8 @@
import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
import org.openstreetmap.josm.Main;
@@ -134,4 +139,5 @@
public static void main(final String[] argArray) {
I18n.init();
+ checkJava6();
Policy.setPolicy(new Policy() {
@@ -277,4 +283,5 @@
*/
public static void removeObsoletePreferences() {
+
String[] obsolete = {
"proxy.anonymous", // 01/2010 - not needed anymore. Can be removed mid 2010
@@ -288,3 +295,37 @@
}
}
+
+ private static void checkJava6() {
+ String version = System.getProperty("java.version");
+ if (version != null) {
+ if (version.startsWith("1.6") || version.startsWith("6"))
+ return;
+ if (version.startsWith("1.5") || version.startsWith("5")) {
+ JLabel ho = new JLabel(""+
+ tr("JOSM requires Java version 6.
"+
+ "Detected Java version: {0}.
"+
+ "You can - update your Java (JRE) or
"+
+ "- use an earlier (Java 5 compatible) version of JOSM.
"+
+ "More Info:", version)+"");
+ JTextArea link = new JTextArea("http://josm.openstreetmap.de/wiki/Help/SystemRequirements");
+ link.setEditable(false);
+ link.setBackground(panel.getBackground());
+ JPanel panel = new JPanel(new GridBagLayout());
+ GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridwidth = GridBagConstraints.REMAINDER;
+ gbc.anchor = GridBagConstraints.WEST;
+ gbc.weightx = 1.0;
+ panel.add(ho, gbc);
+ panel.add(link, gbc);
+ final String EXIT = tr("Exit JOSM");
+ final String CONTINUE = tr("Continue, try anyway");
+ int ret = JOptionPane.showOptionDialog(null, panel, tr("Error"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE, null, new String[] {EXIT, CONTINUE}, EXIT);
+ if (ret == 0) {
+ System.exit(0);
+ }
+ return;
+ }
+ }
+ System.err.println("Error: Could not recognize Java Version: "+version);
+ }
}