eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 06:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

more consistency to Java version numbering

Browse Source
This commit is contained in:
Ben Fry
2015-06-16 08:32:15 -04:00
parent 3968090f16
commit 85bac36da6
4 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/src/processing/mode/java/JavaEditor.java
View File

@@ -825,8 +825,6 @@ public class JavaEditor extends Editor {
platformName = "Linux (" + Base.getNativeBits() + "-bit)";
}
final String javaPlatform =
PApplet.split(System.getProperty("java.version"), '.')[1];
boolean embed = Preferences.getBoolean("export.application.embed_java");
final String embedWarning =
"<html><div width=\"" + divWidth + "\"><font size=\"2\">" +
@@ -834,12 +832,12 @@ public class JavaEditor extends Editor {
"Embedding Java will make the " + platformName + " application " +
"larger, but it will be far more likely to work. " +
"Users on other platforms will need to " +
"<a href=\"\">install Java " + PApplet.javaVersionShort + "</a>.";
"<a href=\"\">install Java " + PApplet.javaPlatform + "</a>.";
final String nopeWarning =
"<html><div width=\"" + divWidth + "\"><font size=\"2\">" +
// "<html><body><font size=2>" +
"Users on all platforms will have to install the latest " +
"version of Java " + javaPlatform +
"version of Java " + PApplet.javaPlatform +
" from <a href=\"\">http://java.com/download</a>. " +
"<br/>&nbsp;";
//"from <a href=\"http://java.com/download\">java.com/download</a>.";