Revision: 19193
http://sourceforge.net/p/gate/code/19193
Author: markagreenwood
Date: 2016-04-04 07:35:28 +0000 (Mon, 04 Apr 2016)
Log Message:
-----------
some more tidying up but for some reason the plugin manager still doesn't work
Modified Paths:
--------------
gate/branches/sawdust2/src/main/gate/Plugin.java
gate/branches/sawdust2/src/main/gate/gui/creole/manager/AvailablePlugins.java
Modified: gate/branches/sawdust2/src/main/gate/Plugin.java
===================================================================
--- gate/branches/sawdust2/src/main/gate/Plugin.java 2016-04-04 07:26:28 UTC
(rev 19192)
+++ gate/branches/sawdust2/src/main/gate/Plugin.java 2016-04-04 07:35:28 UTC
(rev 19193)
@@ -2,7 +2,6 @@
import gate.Gate.ResourceInfo;
import gate.creole.metadata.CreoleResource;
-import gate.gui.MainFrame;
import gate.util.asm.AnnotationVisitor;
import gate.util.asm.ClassReader;
import gate.util.asm.ClassVisitor;
@@ -26,8 +25,6 @@
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
-import javax.swing.SwingUtilities;
-
import org.apache.log4j.Logger;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.eclipse.aether.DefaultRepositorySystemSession;
Modified:
gate/branches/sawdust2/src/main/gate/gui/creole/manager/AvailablePlugins.java
===================================================================
---
gate/branches/sawdust2/src/main/gate/gui/creole/manager/AvailablePlugins.java
2016-04-04 07:26:28 UTC (rev 19192)
+++
gate/branches/sawdust2/src/main/gate/gui/creole/manager/AvailablePlugins.java
2016-04-04 07:35:28 UTC (rev 19193)
@@ -20,7 +20,6 @@
import gate.Gate;
import gate.Gate.ResourceInfo;
import gate.Plugin;
-import gate.Plugin.Directory;
import gate.creole.CreoleRegisterImpl;
import gate.gui.MainFrame;
import gate.resources.img.svg.AddIcon;
@@ -377,9 +376,8 @@
private Boolean getLoadNow(Plugin plugin) {
Boolean res = loadNowByURL.get(plugin);
- //TODO this seems bad
if(res == null) {
- res =
Gate.getCreoleRegister().getDirectories().contains(plugin.getBaseURL());
+ res = Gate.getCreoleRegister().getPlugins().contains(plugin);
loadNowByURL.put(plugin, res);
}
return res;
@@ -387,7 +385,6 @@
private Boolean getLoadAlways(Plugin plugin) {
Boolean res = loadAlwaysByURL.get(plugin);
- //TODO this seems bad
if(res == null) {
res = Gate.getAutoloadPlugins().contains(plugin);
loadAlwaysByURL.put(plugin, res);
@@ -547,7 +544,7 @@
protected boolean unsavedChanges() {
- Set<URL> creoleDirectories = Gate.getCreoleRegister().getDirectories();
+ List<Plugin> creoleDirectories = Gate.getCreoleRegister().getPlugins();
Iterator<Plugin> pluginIter = loadNowByURL.keySet().iterator();
while(pluginIter.hasNext()) {
@@ -572,7 +569,7 @@
protected Set<Plugin> updateAvailablePlugins() {
- Set<URL> creoleDirectories = Gate.getCreoleRegister().getDirectories();
+ List<Plugin> creoleDirectories = Gate.getCreoleRegister().getPlugins();
// update the data structures to reflect the user's choices
Iterator<Plugin> pluginIter = loadNowByURL.keySet().iterator();
@@ -588,9 +585,7 @@
}
if(!load && loaded) {
// remove the directory
-
- //TODO remove not working yet
- //Gate.getCreoleRegister().removeDirectory(aPluginURL);
+ Gate.getCreoleRegister().unregisterPlugin(aPluginURL);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
