You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2009/10/28 18:26:38 UTC
svn commit: r830686 -
/incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Author: cwiklik
Date: Wed Oct 28 17:26:38 2009
New Revision: 830686
URL: http://svn.apache.org/viewvc?rev=830686&view=rev
Log:
UIMA-1640 Modified to merge FC type system
Modified:
incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
Modified: incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java?rev=830686&r1=830685&r2=830686&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java (original)
+++ incubator/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/controller/AggregateAnalysisEngineController_impl.java Wed Oct 28 17:26:38 2009
@@ -32,13 +32,11 @@
import org.apache.uima.UIMAFramework;
import org.apache.uima.aae.AsynchAECasManager;
-import org.apache.uima.aae.EECasManager_impl;
import org.apache.uima.aae.InProcessCache;
import org.apache.uima.aae.InputChannel;
import org.apache.uima.aae.UIMAEE_Constants;
import org.apache.uima.aae.UimaClassFactory;
import org.apache.uima.aae.InProcessCache.CacheEntry;
-import org.apache.uima.aae.controller.BaseAnalysisEngineController.ServiceState;
import org.apache.uima.aae.controller.LocalCache.CasStateEntry;
import org.apache.uima.aae.delegate.ControllerDelegate;
import org.apache.uima.aae.delegate.Delegate;
@@ -2464,11 +2462,15 @@
if (errorHandlerChain == null) {
plugInDefaultErrorHandlerChain();
}
-
- // Create CAS Pool with a given Context.
AnalysisEngineDescription specifier = (AnalysisEngineDescription) super.getResourceSpecifier();
aggregateMetadata = specifier.getAnalysisEngineMetaData();
+ flowControllerContainer = UimaClassFactory.produceAggregateFlowControllerContainer(specifier,
+ flowControllerDescriptor, analysisEngineMetaDataMap, getUimaContextAdmin(),
+ ((AnalysisEngineDescription) getResourceSpecifier()).getSofaMappings(), super
+ .getManagementInterface());
if (isTopLevelComponent()) {
+ // Add FC's meta
+ getCasManagerWrapper().addMetadata((ProcessingResourceMetaData)flowControllerContainer.getMetaData());
// Top level component is the outer most component in the containment hierarchy.
getCasManagerWrapper().initialize("AggregateContext");
aggregateMetadata.setTypeSystem(getCasManagerWrapper().getMetadata().getTypeSystem());
@@ -2477,12 +2479,6 @@
aggregateMetadata.setFsIndexCollection(getCasManagerWrapper().getMetadata()
.getFsIndexCollection());
}
-
- flowControllerContainer = UimaClassFactory.produceAggregateFlowControllerContainer(specifier,
- flowControllerDescriptor, analysisEngineMetaDataMap, getUimaContextAdmin(),
- ((AnalysisEngineDescription) getResourceSpecifier()).getSofaMappings(), super
- .getManagementInterface());
-
if (disabledDelegateList.size() > 0) {
flowControllerContainer.removeAnalysisEngines(disabledDelegateList);
}