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

rewrite installer to use EditorStatus for progress

Browse Source
This commit is contained in:
Ben Fry
2021-08-06 20:02:06 -04:00
parent e369f9754a
commit 40998a7da5
2 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/Base.java
+29 -33
View File
@@ -1342,43 +1342,39 @@ public class Base {
} else if (path.endsWith(CONTRIB_BUNDLE_EXT)) {
EventQueue.invokeLater(() -> {
Frame frame = getActiveEditor();
if (frame == null) {
frame = new Frame(); // just use a dummy
}
File contribFile = new File(path);
String baseName = contribFile.getName();
baseName = baseName.substring(0, baseName.length() - CONTRIB_BUNDLE_EXT.length());
int result =
Messages.showYesNoQuestion(frame, "How to Handle " + CONTRIB_BUNDLE_EXT,
"Install " + baseName + "?",
"Libraries, Modes, and Tools should<br>" +
"only be installed from trusted sources.");
if (result == JOptionPane.YES_OPTION) {
try {
JOptionPane pane = new JOptionPane();
pane.setMessage("Installing " + baseName + "...");
JProgressBar progress = new JProgressBar();
progress.setIndeterminate(true);
pane.add(progress, 1);
JDialog dialog = pane.createDialog(frame, "One Moment Please");
dialog.setModal(false);
dialog.setVisible(true);
Editor editor = getActiveEditor();
if (editor == null) {
// Shouldn't really happen, but if it's still null, it's a no-go
Messages.showWarning("Failure is the only option",
"Please open an Editor window before installing an extension.");
} else {
File contribFile = new File(path);
String baseName = contribFile.getName();
baseName = baseName.substring(0, baseName.length() - CONTRIB_BUNDLE_EXT.length());
int result =
Messages.showYesNoQuestion(editor, "How to Handle " + CONTRIB_BUNDLE_EXT,
"Install " + baseName + "?",
"Libraries, Modes, and Tools should<br>" +
"only be installed from trusted sources.");
// do the work of the actual install
LocalContribution contrib =
AvailableContribution.install(this, new File(path));
if (result == JOptionPane.YES_OPTION) {
try {
editor.statusNotice("Installing " + baseName + "...");
editor.startIndeterminate();
//ProgressMonitor pm = new ProgressMonitor(frame, "Installing " + baseName + "...", null, 0, 100)
// close the progress monitor
dialog.dispose();
//pm.close();
// do the work of the actual install
LocalContribution contrib =
AvailableContribution.install(this, new File(path));
if (contrib == null) {
Messages.showWarning("Error During Installation", "Could not install contrib from " + path);
editor.stopIndeterminate();
editor.statusEmpty();
if (contrib == null) {
Messages.showWarning("Error During Installation", "Could not install contrib from " + path);
}
} catch (IOException e) {
Messages.showWarning("Exception During Installation", "Could not install contrib from " + path, e);
}
} catch (IOException e) {
Messages.showWarning("Exception During Installation", "Could not install contrib from " + path, e);
}
}
});
todo.txt
+3
View File
@@ -27,6 +27,9 @@ X rewrite download handler to just use a simple <get>
_ remove the rest of the jre downloader code
X initial code to install a contrib from a pdex file
_ test to make sure it's behaving properly
o handleNew() returns an Editor object
o unlikely to break anything, but it is a signature change
X nope, nevermind, not gonna do it
Sam updates
X can we get rid of pdexEnabled? does the current code work w/ java tabs?