Index: trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- trunk/src/org/openstreetmap/josm/Main.java (revision 10785)
+++ trunk/src/org/openstreetmap/josm/Main.java (revision 10786)
@@ -6,6 +6,4 @@
import java.awt.BorderLayout;
import java.awt.Component;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
import java.awt.Window;
import java.awt.event.KeyEvent;
@@ -47,5 +45,4 @@
import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JTextArea;
import javax.swing.KeyStroke;
import javax.swing.LookAndFeel;
@@ -83,5 +80,4 @@
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapFrameListener;
-import org.openstreetmap.josm.gui.help.HelpUtil;
import org.openstreetmap.josm.gui.io.SaveLayersDialog;
import org.openstreetmap.josm.gui.layer.AbstractModifiableLayer;
@@ -99,5 +95,4 @@
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.util.RedirectInputMap;
-import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.io.FileWatcher;
import org.openstreetmap.josm.io.OnlineResource;
@@ -1304,43 +1299,4 @@
}
- /**
- * Checks that JOSM is at least running with Java 8.
- * @since 7001
- */
- public static void checkJavaVersion() {
- String version = System.getProperty("java.version");
- if (version != null) {
- if (version.matches("^(1\\.)?[89].*"))
- return;
- if (version.matches("^(1\\.)?[567].*")) {
- JMultilineLabel ho = new JMultilineLabel(""+
- tr("JOSM requires Java version {0}.
"+
- "Detected Java version: {1}.
"+
- "You can - update your Java (JRE) or
"+
- "- use an earlier (Java {2} compatible) version of JOSM.
"+
- "More Info:", "8", version, "7")+"");
- JTextArea link = new JTextArea(HelpUtil.getWikiBaseHelpUrl()+"/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 exitStr = tr("Exit JOSM");
- final String continueStr = tr("Continue, try anyway");
- int ret = JOptionPane.showOptionDialog(null, panel, tr("Error"), JOptionPane.YES_NO_OPTION,
- JOptionPane.ERROR_MESSAGE, null, new String[] {exitStr, continueStr}, exitStr);
- if (ret == 0) {
- System.exit(0);
- }
- return;
- }
- }
- error("Could not recognize Java Version: "+version);
- }
-
/* ----------------------------------------------------------------------------------------- */
/* projection handling - Main is a registry for a single, global projection instance */
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 10785)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 10786)
@@ -298,5 +298,4 @@
public static void main(final String[] argArray) {
I18n.init();
- Main.checkJavaVersion();
// construct argument table