eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-13 18:35:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove works across multiple open editors

Browse Source
This commit is contained in:
joelmoniz
2014-06-29 13:10:46 +05:30
parent 29dcaaf1e9
commit 40652baeef
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/processing/app/contrib/LocalContribution.java
View File

@@ -369,7 +369,8 @@ public abstract class LocalContribution extends Contribution {
}
if (getType() == ContributionType.TOOL) {
ToolContribution t = (ToolContribution) this;
editor.clearToolMenu();
for (Editor ed : editor.getBase().getEditors())
ed.clearToolMenu();
t.clearClassLoader(editor.getBase());
}
if (doBackup) {

36
app/src/processing/app/contrib/ToolContribution.java
View File

@@ -71,21 +71,29 @@ public class ToolContribution extends LocalContribution implements Tool {
// int botherToRemove = contribTools.indexOf(this);
// if (botherToRemove != -1) { // The poor thing doesn't even exist, and we're trying to remove it...
// contribTools.remove(botherToRemove);
ArrayList<ToolContribution> contribTools = base.getActiveEditor().contribTools;
for (ToolContribution toolContrib : contribTools)
if (toolContrib.getName().equals(this.name)) {
try {
System.out.println("Here " + name);
((URLClassLoader) this.loader).close();
((URLClassLoader) toolContrib.loader).close();
// The typecast should be safe, since the only case when loader is not of
// type URLClassLoader is when no archives were found in the first
// place...
} catch (IOException e) {
e.printStackTrace();
}
try {
((URLClassLoader) this.loader).close();
} catch (IOException e1) {
e1.printStackTrace();
}
List<Editor> editors = base.getEditors();
for (Editor editor : editors) {
ArrayList<ToolContribution> contribTools = editor.contribTools;
for (ToolContribution toolContrib : contribTools)
if (toolContrib.getName().equals(this.name)) {
try {
System.out.println("Here " + name);
((URLClassLoader) toolContrib.loader).close();
System.out.println(contribTools.size());
editor.contribTools.remove(toolContrib);
System.out.println(contribTools.size());
break;
} catch (IOException e) {
e.printStackTrace();
}
// base.getActiveEditor().rebuildToolMenu();
}
}
}
// }
}