GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — minor re-org while looking at Jython integration · D-I-R-M/processing4@b53a17c

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • java/src/processing/mode/java
    • ExportPrompt.java
    • JavaBuild.java
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎java/src/processing/mode/java/ExportPrompt.java‎

Copy file name to clipboardExpand all lines: java/src/processing/mode/java/ExportPrompt.java
+9-6Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/*
44
Part of the Processing project - http://processing.org
55
6-
Copyright (c) 2012-22 The Processing Foundation
6+
Copyright (c) 2012-23 The Processing Foundation
77
Copyright (c) 2004-12 Ben Fry and Casey Reas
88
Copyright (c) 2001-04 Massachusetts Institute of Technology
99
@@ -28,6 +28,7 @@
2828
import processing.app.Preferences;
2929
import processing.app.SketchException;
3030
import processing.app.ui.ColorChooser;
31+
import processing.app.ui.Editor;
3132
import processing.core.PApplet;
3233
import processing.data.StringDict;
3334
import processing.data.StringList;
@@ -50,12 +51,14 @@ public class ExportPrompt {
5051
"https://github.com/processing/processing4/wiki/Exporting-Applications#macos";
5152
static final String EXPORT_VARIANTS = "export.application.variants";
5253

54+
static public final String JAVA_DOWNLOAD_URL = "https://adoptium.net/";
55+
5356
final JButton exportButton = new JButton(Language.text("prompt.export"));
5457
final JButton cancelButton = new JButton(Language.text("prompt.cancel"));
5558

5659
List<JCheckBox> variantButtons;
5760

58-
final JavaEditor editor;
61+
final Editor editor;
5962

6063
static ExportPrompt inst;
6164

@@ -212,7 +215,7 @@ protected boolean trigger() throws IOException, SketchException {
212215
final String warning2b =
213216
"Users will need to ";
214217
final String warning3 =
215-
"<a href=\"" + JavaBuild.JAVA_DOWNLOAD_URL + "\">" +
218+
"<a href=\"" + JAVA_DOWNLOAD_URL + "\">" +
216219
"install OpenJDK " + PApplet.javaPlatform + "</a>.";
217220

218221
// both are needed because they change as the user hits the checkbox
@@ -222,7 +225,7 @@ protected boolean trigger() throws IOException, SketchException {
222225
final JLabel warningLabel = new JLabel(embed ? embedWarning : nopeWarning);
223226
warningLabel.addMouseListener(new MouseAdapter() {
224227
public void mousePressed(MouseEvent event) {
225-
Platform.openURL(JavaBuild.JAVA_DOWNLOAD_URL);
228+
Platform.openURL(JAVA_DOWNLOAD_URL);
226229
}
227230
});
228231
warningLabel.setBorder(new EmptyBorder(3, 13, 3, 13));
@@ -257,13 +260,13 @@ public void mousePressed(MouseEvent event) {
257260
signPanel.setBorder(new TitledBorder(Language.text("export.code_signing")));
258261

259262
String thePain =
260-
"Applications on macOS must be \u201Csigned\u201D and \u201Cnotarized,\u201D " +
263+
"Applications on macOS must be “signed” and “notarized,”" +
261264
"or they will be reported as damaged or unsafe. ";
262265

263266
//if (false && new File("/usr/bin/codesign_allocate").exists()) {
264267
if (JavaBuild.isXcodeInstalled()) {
265268
thePain += "<br/>" +
266-
"This application will be \u201Cself-signed\u201D which means that " +
269+
"This application will be “self-signed” which means that " +
267270
"macOS may complain that it comes from an unidentified developer. " +
268271
"If the application will not run, try right-clicking the app and " +
269272
"selecting Open from the pop-up menu. " +
Collapse file

‎java/src/processing/mode/java/JavaBuild.java‎

Copy file name to clipboardExpand all lines: java/src/processing/mode/java/JavaBuild.java
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ public class JavaBuild {
4848
static public final String PACKAGE_REGEX =
4949
"(?:^|\\s|;)package\\s+(\\S+)\\;";
5050

51-
static public final String JAVA_DOWNLOAD_URL = "https://adoptium.net/";
5251
static public final String MIN_JAVA_VERSION = "17";
5352

5453
protected Sketch sketch;
@@ -951,7 +950,7 @@ protected boolean exportApplication(File destFolder,
951950
XML config = new XML("launch4jConfig");
952951
config.addChild("headerType").setContent("gui");
953952
config.addChild("dontWrapJar").setContent("true");
954-
config.addChild("downloadUrl").setContent(JAVA_DOWNLOAD_URL);
953+
config.addChild("downloadUrl").setContent(ExportPrompt.JAVA_DOWNLOAD_URL);
955954

956955
File exeFile = new File(destFolder, sketch.getName() + ".exe");
957956
config.addChild("outfile").setContent(exeFile.getAbsolutePath());

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.