mirror of
https://github.com/processing/processing4.git
synced 2026-02-23 15:25:51 +01:00
deal with VerifyError with new 7u72 and bad tools, also convert line endings, continue work with Canvas embedding
This commit is contained in:
Ben Fry
@@ -1113,6 +1113,10 @@ public abstract class Editor extends JFrame implements RunnerListener {
|
||||
// TODO Once the dust settles on 2.x, change this to Base.showError()
|
||||
// and open the Tools folder instead of showing System.err.println().
|
||||
|
||||
} catch (VerifyError ve) {
|
||||
System.err.println("\"" + tool.getMenuTitle() + "\" is not " +
|
||||
"compatible with this version of Processing");
|
||||
|
||||
} catch (NoSuchMethodError nsme) {
|
||||
System.err.println("\"" + tool.getMenuTitle() + "\" is not " +
|
||||
"compatible with this version of Processing");
|
||||
|
||||
@@ -1,156 +1,158 @@
|
||||
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
|
||||
|
||||
/*
|
||||
Part of the Processing project - http://processing.org
|
||||
|
||||
Copyright (c) 2013 The Processing Foundation
|
||||
Copyright (c) 2011-12 Ben Fry and Casey Reas
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License version 2
|
||||
as published by the Free Software Foundation.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
package processing.app.contrib;
|
||||
|
||||
import java.io.*;
|
||||
import java.net.URLClassLoader;
|
||||
//import java.net.*;
|
||||
import java.util.*;
|
||||
|
||||
import processing.app.Base;
|
||||
//import processing.app.Base;
|
||||
import processing.app.Editor;
|
||||
import processing.app.tools.Tool;
|
||||
|
||||
|
||||
public class ToolContribution extends LocalContribution implements Tool {
|
||||
private Tool tool;
|
||||
|
||||
|
||||
static public ToolContribution load(File folder) {
|
||||
try {
|
||||
return new ToolContribution(folder);
|
||||
} catch (IgnorableException ig) {
|
||||
Base.log(ig.getMessage());
|
||||
} catch (Error err) {
|
||||
// Handles UnsupportedClassVersionError and others
|
||||
err.printStackTrace();
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
private ToolContribution(File folder) throws Exception {
|
||||
super(folder);
|
||||
|
||||
String className = initLoader(null);
|
||||
if (className != null) {
|
||||
Class<?> toolClass = loader.loadClass(className);
|
||||
tool = (Tool) toolClass.newInstance();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Method to close the ClassLoader so that the archives are no longer "locked" and
|
||||
* a tool can be removed without restart.
|
||||
*/
|
||||
public void clearClassLoader(Base base) {
|
||||
try {
|
||||
((URLClassLoader) this.loader).close();
|
||||
} catch (IOException e1) {
|
||||
e1.printStackTrace();
|
||||
}
|
||||
Iterator<Editor> editorIter = base.getEditors().iterator();
|
||||
while (editorIter.hasNext()) {
|
||||
Editor editor = editorIter.next();
|
||||
ArrayList<ToolContribution> contribTools = editor.contribTools;
|
||||
for (ToolContribution toolContrib : contribTools)
|
||||
if (toolContrib.getName().equals(this.name)) {
|
||||
try {
|
||||
((URLClassLoader) toolContrib.loader).close();
|
||||
editor.contribTools.remove(toolContrib);
|
||||
break;
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
// base.getActiveEditor().rebuildToolMenu();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// static protected List<File> discover(File folder) {
|
||||
// File[] folders = listCandidates(folder, "tool");
|
||||
// if (folders == null) {
|
||||
// return new ArrayList<File>();
|
||||
// } else {
|
||||
// return Arrays.asList(folders);
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
static public ArrayList<ToolContribution> loadAll(File toolsFolder) {
|
||||
File[] list = ContributionType.TOOL.listCandidates(toolsFolder);
|
||||
ArrayList<ToolContribution> outgoing = new ArrayList<ToolContribution>();
|
||||
// If toolsFolder does not exist or is inaccessible (stranger things have
|
||||
// happened, and are reported as bugs) list will come back null.
|
||||
if (list != null) {
|
||||
for (File folder : list) {
|
||||
try {
|
||||
ToolContribution tc = load(folder);
|
||||
if (tc != null) {
|
||||
outgoing.add(tc);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
return outgoing;
|
||||
}
|
||||
|
||||
|
||||
// Editor editor; // used to send error messages
|
||||
|
||||
public void init(Editor editor) {
|
||||
// try {
|
||||
// this.editor = editor;
|
||||
tool.init(editor);
|
||||
// } catch (NoSuchMethodError nsme) {
|
||||
// editor.statusError(tool.getMenuTitle() + " is not compatible with this version of Processing");
|
||||
// nsme.printStackTrace();
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
public void run() {
|
||||
// try {
|
||||
tool.run();
|
||||
// } catch (NoSuchMethodError nsme) {
|
||||
// editor.statusError(tool.getMenuTitle() + " is not compatible with this version of Processing");
|
||||
// nsme.printStackTrace();
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
public String getMenuTitle() {
|
||||
return tool.getMenuTitle();
|
||||
}
|
||||
|
||||
|
||||
public ContributionType getType() {
|
||||
return ContributionType.TOOL;
|
||||
}
|
||||
}
|
||||
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
|
||||
|
||||
/*
|
||||
Part of the Processing project - http://processing.org
|
||||
|
||||
Copyright (c) 2013 The Processing Foundation
|
||||
Copyright (c) 2011-12 Ben Fry and Casey Reas
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License version 2
|
||||
as published by the Free Software Foundation.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
package processing.app.contrib;
|
||||
|
||||
import java.io.*;
|
||||
import java.net.URLClassLoader;
|
||||
//import java.net.*;
|
||||
import java.util.*;
|
||||
|
||||
import processing.app.Base;
|
||||
//import processing.app.Base;
|
||||
import processing.app.Editor;
|
||||
import processing.app.tools.Tool;
|
||||
|
||||
|
||||
public class ToolContribution extends LocalContribution implements Tool {
|
||||
private Tool tool;
|
||||
|
||||
|
||||
static public ToolContribution load(File folder) {
|
||||
try {
|
||||
return new ToolContribution(folder);
|
||||
|
||||
} catch (IgnorableException ig) {
|
||||
Base.log(ig.getMessage());
|
||||
|
||||
} catch (VerifyError ve) { // incompatible
|
||||
// avoid the excessive error spew that happens here
|
||||
|
||||
} catch (Throwable e) { // unknown error
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
private ToolContribution(File folder) throws Throwable {
|
||||
super(folder);
|
||||
|
||||
String className = initLoader(null);
|
||||
if (className != null) {
|
||||
Class<?> toolClass = loader.loadClass(className);
|
||||
tool = (Tool) toolClass.newInstance();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Method to close the ClassLoader so that the archives are no longer "locked" and
|
||||
* a tool can be removed without restart.
|
||||
*/
|
||||
public void clearClassLoader(Base base) {
|
||||
try {
|
||||
((URLClassLoader) this.loader).close();
|
||||
} catch (IOException e1) {
|
||||
e1.printStackTrace();
|
||||
}
|
||||
Iterator<Editor> editorIter = base.getEditors().iterator();
|
||||
while (editorIter.hasNext()) {
|
||||
Editor editor = editorIter.next();
|
||||
ArrayList<ToolContribution> contribTools = editor.contribTools;
|
||||
for (ToolContribution toolContrib : contribTools)
|
||||
if (toolContrib.getName().equals(this.name)) {
|
||||
try {
|
||||
((URLClassLoader) toolContrib.loader).close();
|
||||
editor.contribTools.remove(toolContrib);
|
||||
break;
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
// base.getActiveEditor().rebuildToolMenu();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// static protected List<File> discover(File folder) {
|
||||
// File[] folders = listCandidates(folder, "tool");
|
||||
// if (folders == null) {
|
||||
// return new ArrayList<File>();
|
||||
// } else {
|
||||
// return Arrays.asList(folders);
|
||||
// }
|
||||
// }
|
||||
|
||||
|
||||
static public ArrayList<ToolContribution> loadAll(File toolsFolder) {
|
||||
File[] list = ContributionType.TOOL.listCandidates(toolsFolder);
|
||||
ArrayList<ToolContribution> outgoing = new ArrayList<ToolContribution>();
|
||||
// If toolsFolder does not exist or is inaccessible (stranger things have
|
||||
// happened, and are reported as bugs) list will come back null.
|
||||
if (list != null) {
|
||||
for (File folder : list) {
|
||||
try {
|
||||
ToolContribution tc = load(folder);
|
||||
if (tc != null) {
|
||||
outgoing.add(tc);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
return outgoing;
|
||||
}
|
||||
|
||||
|
||||
// Editor editor; // used to send error messages
|
||||
|
||||
public void init(Editor editor) {
|
||||
// try {
|
||||
// this.editor = editor;
|
||||
tool.init(editor);
|
||||
// } catch (NoSuchMethodError nsme) {
|
||||
// editor.statusError(tool.getMenuTitle() + " is not compatible with this version of Processing");
|
||||
// nsme.printStackTrace();
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
public void run() {
|
||||
// try {
|
||||
tool.run();
|
||||
// } catch (NoSuchMethodError nsme) {
|
||||
// editor.statusError(tool.getMenuTitle() + " is not compatible with this version of Processing");
|
||||
// nsme.printStackTrace();
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
public String getMenuTitle() {
|
||||
return tool.getMenuTitle();
|
||||
}
|
||||
|
||||
|
||||
public ContributionType getType() {
|
||||
return ContributionType.TOOL;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user