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

disabling offline reference, hopefully temporary (see #524)

Browse Source
This commit is contained in:
Ben Fry
2022-08-02 07:05:44 -04:00
parent f60eecd1a9
commit f2233b749f
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/src/processing/mode/java/JavaEditor.java
+16 -8
View File
@@ -274,7 +274,7 @@ public class JavaEditor extends Editor {
JMenu menu = new JMenu(Language.text("menu.help"));
JMenuItem item;
// macosx already has its own about menu
// macOS already has its own about menu
if (!Platform.isMacOS()) {
item = new JMenuItem(Language.text("menu.help.about"));
item.addActionListener(e -> new About(JavaEditor.this));
@@ -288,17 +288,19 @@ public class JavaEditor extends Editor {
} catch (IOException ioe) {
Messages.showWarning("Unwelcome Error",
"Please report this error to\n" +
"https://github.com/processing/processing/issues", ioe);
"https://github.com/processing/processing4/issues", ioe);
}
});
menu.add(item);
item = new JMenuItem(Language.text("menu.help.environment"));
item.addActionListener(e -> showReference("environment/index.html"));
//item.addActionListener(e -> showReference("environment/index.html"));
item.addActionListener(e -> Platform.openURL("https://processing.org/reference/"));
menu.add(item);
item = new JMenuItem(Language.text("menu.help.reference"));
item.addActionListener(e -> showReference("index.html"));
//item.addActionListener(e -> showReference("index.html"));
item.addActionListener(e -> Platform.openURL("https://processing.org/environment/"));
menu.add(item);
item = Toolkit.newJMenuItemShift(Language.text("menu.help.find_in_reference"), 'F');
@@ -812,7 +814,7 @@ public class JavaEditor extends Editor {
}
public void showReference(String filename) {
public void showReference(String name) {
if (useReferenceServer == null) {
File referenceZip = new File(mode.getFolder(), "reference.zip");
if (referenceZip.exists()) {
@@ -830,12 +832,18 @@ public class JavaEditor extends Editor {
}
if (useReferenceServer) {
String url = referenceServer.getPrefix() + "reference/" + filename;
String url = referenceServer.getPrefix() + "reference/" + name;
Platform.openURL(url);
} else {
File file = new File(mode.getReferenceFolder(), filename);
showReferenceFile(file);
File file = new File(mode.getReferenceFolder(), name);
if (file.exists()) {
showReferenceFile(file);
} else {
// Offline reference (temporarily) removed in 4.0 beta 9
// https://github.com/processing/processing4/issues/524
Platform.openURL("https://processing.org/reference/" + name);
}
}
}