Revision: 18342 http://sourceforge.net/p/gate/code/18342 Author: markagreenwood Date: 2014-09-16 14:55:53 +0000 (Tue, 16 Sep 2014) Log Message: ----------- simplified by no longer listening for creole events -- the class only responded to datastoreClosed and the code in there was conflicting with the listener in MainFrame causing an NPE now that things are all being done on the EDT and in a slightly differing order to before
Modified Paths: -------------- gate/trunk/src/main/gate/gui/NameBearerHandle.java Modified: gate/trunk/src/main/gate/gui/NameBearerHandle.java =================================================================== --- gate/trunk/src/main/gate/gui/NameBearerHandle.java 2014-09-16 12:19:23 UTC (rev 18341) +++ gate/trunk/src/main/gate/gui/NameBearerHandle.java 2014-09-16 14:55:53 UTC (rev 18342) @@ -98,7 +98,7 @@ * large and small views, etc. */ public class NameBearerHandle implements Handle, StatusListener, - ProgressListener, CreoleListener { + ProgressListener { public NameBearerHandle(NameBearer target, Window window) { this.target = target; @@ -141,8 +141,6 @@ this.icon = MainFrame.getIcon(iconName); - Gate.getCreoleRegister().addCreoleListener(this); - if(target instanceof ActionsPublisher) actionPublishers.add((ActionsPublisher)target); @@ -1465,9 +1463,7 @@ */ @Override public void cleanup() { - removeViews(); - Gate.getCreoleRegister().removeCreoleListener(this); target = null; } @@ -1548,29 +1544,4 @@ public Window getWindow() { return window; } - - @Override - public void resourceLoaded(CreoleEvent e) { - } - - @Override - public void resourceUnloaded(CreoleEvent e) { - } - - @Override - public void resourceRenamed(Resource resource, String oldName, String newName) { - } - - @Override - public void datastoreOpened(CreoleEvent e) { - } - - @Override - public void datastoreCreated(CreoleEvent e) { - } - - @Override - public void datastoreClosed(CreoleEvent e) { - if(getTarget() == e.getDatastore()) cleanup(); - } }// class DefaultResourceHandle This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Want excitement? Manually upgrade your production database. When you want reliability, choose Perforce. Perforce version control. Predictably reliable. http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk _______________________________________________ GATE-cvs mailing list GATE-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gate-cvs