Revision: 16731
http://sourceforge.net/p/gate/code/16731
Author: johann_p
Date: 2013-07-08 18:52:28 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
Set the corpus not just for sub-controllers but for
all language analysers that get notified.
Modified Paths:
--------------
gate/trunk/src/gate/creole/ConditionalSerialAnalyserController.java
gate/trunk/src/gate/creole/SerialAnalyserController.java
Modified: gate/trunk/src/gate/creole/ConditionalSerialAnalyserController.java
===================================================================
--- gate/trunk/src/gate/creole/ConditionalSerialAnalyserController.java
2013-07-08 18:13:09 UTC (rev 16730)
+++ gate/trunk/src/gate/creole/ConditionalSerialAnalyserController.java
2013-07-08 18:52:28 UTC (rev 16731)
@@ -102,11 +102,9 @@
// This is necessary because the nested corpus controller will
immediately
// notify its own controller aware PRs and those should be able to
know about
// the corpus.
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
- }
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
+ }
pr.controllerExecutionStarted(this);
}
}
@@ -128,17 +126,13 @@
// successfully completed
if(!runningAsSubPipeline) {
for(ControllerAwarePR pr : getControllerAwarePRs()) {
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
- }
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
+ }
pr.controllerExecutionFinished(this);
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(null);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(null);
- }
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(null);
+ }
}
}
}
@@ -146,17 +140,13 @@
// aborted
if(!runningAsSubPipeline) {
for(ControllerAwarePR pr : getControllerAwarePRs()) {
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
- }
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
+ }
pr.controllerExecutionAborted(this, thrown);
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(null);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(null);
- }
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(null);
+ }
}
}
// rethrow the aborting exception or error
@@ -455,14 +445,8 @@
public void controllerExecutionStarted(Controller c)
throws ExecutionException {
for(ControllerAwarePR pr : getControllerAwarePRs()) {
- // If the pr is a nested corpus controller, make sure its corpus is set
- // This is necessary because the nested corpus controller will
immediately
- // notify its own controller aware PRs and those should be able to know
about
- // the corpus.
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
}
pr.controllerExecutionStarted(this);
}
@@ -473,21 +457,12 @@
public void controllerExecutionFinished(Controller c)
throws ExecutionException {
for(ControllerAwarePR pr : getControllerAwarePRs()) {
- // If the pr is a nested corpus controller, make sure its corpus is set
- // This is necessary because the nested corpus controller will
immediately
- // notify its own controller aware PRs and those should be able to know
about
- // the corpus.
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
}
pr.controllerExecutionFinished(this);
- // after notification, set the corpus back to null
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(null);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(null);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(null);
}
}
}
@@ -496,22 +471,13 @@
public void controllerExecutionAborted(Controller c, Throwable t)
throws ExecutionException {
for(ControllerAwarePR pr : getControllerAwarePRs()) {
- // If the pr is a nested corpus controller, make sure its corpus is set
- // This is necessary because the nested corpus controller will
immediately
- // notify its own controller aware PRs and those should be able to know
about
- // the corpus.
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
- }
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
+ }
pr.controllerExecutionAborted(c, t);
- // after notification, set the corpus back to null
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(null);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(null);
- }
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(null);
+ }
}
}
}
Modified: gate/trunk/src/gate/creole/SerialAnalyserController.java
===================================================================
--- gate/trunk/src/gate/creole/SerialAnalyserController.java 2013-07-08
18:13:09 UTC (rev 16730)
+++ gate/trunk/src/gate/creole/SerialAnalyserController.java 2013-07-08
18:52:28 UTC (rev 16731)
@@ -92,10 +92,8 @@
// running as a subpipeline of another corpus pipeline.
if(!runningAsSubPipeline) {
for(ControllerAwarePR pr : getControllerAwarePRs()) {
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
}
pr.controllerExecutionStarted(this);
}
@@ -118,16 +116,12 @@
// successfully completed
if(!runningAsSubPipeline) {
for(ControllerAwarePR pr : getControllerAwarePRs()) {
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
}
pr.controllerExecutionFinished(this);
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(null);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(null);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(null);
}
}
}
@@ -136,16 +130,12 @@
// aborted
if(!runningAsSubPipeline) {
for(ControllerAwarePR pr : getControllerAwarePRs()) {
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
}
pr.controllerExecutionAborted(this, thrown);
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(null);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(null);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(null);
}
}
}
@@ -406,14 +396,8 @@
public void controllerExecutionStarted(Controller c)
throws ExecutionException {
for(ControllerAwarePR pr : getControllerAwarePRs()) {
- // If the pr is a nested corpus controller, make sure its corpus is set
- // This is necessary because the nested corpus controller will
immediately
- // notify its own controller aware PRs and those should be able to know
about
- // the corpus.
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
}
pr.controllerExecutionFinished(this);
}
@@ -423,21 +407,12 @@
public void controllerExecutionFinished(Controller c)
throws ExecutionException {
for(ControllerAwarePR pr : getControllerAwarePRs()) {
- // If the pr is a nested corpus controller, make sure its corpus is set
- // This is necessary because the nested corpus controller will
immediately
- // notify its own controller aware PRs and those should be able to know
about
- // the corpus.
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
}
pr.controllerExecutionFinished(this);
- // after notification, set the corpus back to null
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(null);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(null);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(null);
}
}
}
@@ -446,21 +421,12 @@
public void controllerExecutionAborted(Controller c, Throwable t)
throws ExecutionException {
for(ControllerAwarePR pr : getControllerAwarePRs()) {
- // If the pr is a nested corpus controller, make sure its corpus is set
- // This is necessary because the nested corpus controller will
immediately
- // notify its own controller aware PRs and those should be able to know
about
- // the corpus.
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(corpus);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(corpus);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(corpus);
}
pr.controllerExecutionAborted(c, t);
- // after notification, set the corpus back to null
- if(pr instanceof ConditionalSerialAnalyserController) {
- ((ConditionalSerialAnalyserController)pr).setCorpus(null);
- } else if(pr instanceof SerialAnalyserController) {
- ((SerialAnalyserController)pr).setCorpus(null);
+ if(pr instanceof LanguageAnalyser) {
+ ((LanguageAnalyser)pr).setCorpus(null);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
