You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2013/04/27 00:43:07 UTC
svn commit: r1476429 - in /uima/sandbox/uimafit/trunk/uimafit/src:
main/java/org/apache/uima/fit/factory/ test/java/org/apache/uima/fit/factory/
Author: rec
Date: Fri Apr 26 22:43:06 2013
New Revision: 1476429
URL: http://svn.apache.org/r1476429
Log:
[UIMA-2845] createAggregateDescription takes type system as argument but never uses it.
- Removed argument because type system declarations are not allowed on aggregates
Modified:
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AggregateBuilder.java
uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AggregateBuilder.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AggregateBuilder.java?rev=1476429&r1=1476428&r2=1476429&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AggregateBuilder.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AggregateBuilder.java Fri Apr 26 22:43:06 2013
@@ -202,8 +202,8 @@ public class AggregateBuilder {
*/
public AnalysisEngine createAggregate() throws ResourceInitializationException {
return AnalysisEngineFactory.createAggregate(analysisEngineDescriptions, componentNames,
- typeSystemDescription, typePriorities,
- sofaMappings.toArray(new SofaMapping[sofaMappings.size()]), flowControllerDescription);
+ typePriorities, sofaMappings.toArray(new SofaMapping[sofaMappings.size()]),
+ flowControllerDescription);
}
/**
@@ -216,7 +216,7 @@ public class AggregateBuilder {
public AnalysisEngineDescription createAggregateDescription()
throws ResourceInitializationException {
return AnalysisEngineFactory.createAggregateDescription(analysisEngineDescriptions,
- componentNames, typeSystemDescription, typePriorities,
+ componentNames, typePriorities,
sofaMappings.toArray(new SofaMapping[sofaMappings.size()]), flowControllerDescription);
}
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java?rev=1476429&r1=1476428&r2=1476429&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/main/java/org/apache/uima/fit/factory/AnalysisEngineFactory.java Fri Apr 26 22:43:06 2013
@@ -410,17 +410,17 @@ public final class AnalysisEngineFactory
primitiveEngineDescriptions.add(primitiveDescription);
componentNames.add(componentClass.getName());
}
- return createAggregateDescription(primitiveEngineDescriptions, componentNames, typeSystem,
- typePriorities, sofaMappings, null);
+ return createAggregateDescription(primitiveEngineDescriptions, componentNames, typePriorities,
+ sofaMappings, null);
}
public static AnalysisEngine createAggregate(
List<AnalysisEngineDescription> analysisEngineDescriptions, List<String> componentNames,
- TypeSystemDescription typeSystem, TypePriorities typePriorities,
- SofaMapping[] sofaMappings) throws ResourceInitializationException {
+ TypePriorities typePriorities, SofaMapping[] sofaMappings)
+ throws ResourceInitializationException {
AnalysisEngineDescription desc = createAggregateDescription(analysisEngineDescriptions,
- componentNames, typeSystem, typePriorities, sofaMappings, null);
+ componentNames, typePriorities, sofaMappings, null);
// create the AnalysisEngine, initialize it and return it
AnalysisEngine engine = new AggregateAnalysisEngine_impl();
engine.initialize(desc, null);
@@ -439,7 +439,7 @@ public final class AnalysisEngineFactory
}
return createAggregateDescription(asList(analysisEngineDescriptions), asList(names), null,
- null, null, null);
+ null, null);
}
public static AnalysisEngineDescription createAggregateDescription(
@@ -457,18 +457,18 @@ public final class AnalysisEngineFactory
primitiveEngineDescriptions.add(primitiveDescription);
componentNames.add(componentClass.getName());
}
- return createAggregateDescription(primitiveEngineDescriptions, componentNames, typeSystem,
+ return createAggregateDescription(primitiveEngineDescriptions, componentNames,
typePriorities, sofaMappings, flowControllerDescription);
}
public static AnalysisEngine createAggregate(
List<AnalysisEngineDescription> analysisEngineDescriptions, List<String> componentNames,
- TypeSystemDescription typeSystem, TypePriorities typePriorities,
- SofaMapping[] sofaMappings, FlowControllerDescription flowControllerDescription)
+ TypePriorities typePriorities, SofaMapping[] sofaMappings,
+ FlowControllerDescription flowControllerDescription)
throws ResourceInitializationException {
AnalysisEngineDescription desc = createAggregateDescription(analysisEngineDescriptions,
- componentNames, typeSystem, typePriorities, sofaMappings, flowControllerDescription);
+ componentNames, typePriorities, sofaMappings, flowControllerDescription);
// create the AnalysisEngine, initialize it and return it
AnalysisEngine engine = new AggregateAnalysisEngine_impl();
engine.initialize(desc, null);
@@ -492,7 +492,7 @@ public final class AnalysisEngineFactory
}
return createAggregateDescription(asList(analysisEngineDescriptions), asList(names), null,
- null, null, flowControllerDescription);
+ null, flowControllerDescription);
}
/**
@@ -504,8 +504,8 @@ public final class AnalysisEngineFactory
*/
public static AnalysisEngineDescription createAggregateDescription(
List<AnalysisEngineDescription> analysisEngineDescriptions, List<String> componentNames,
- TypeSystemDescription typeSystem, TypePriorities typePriorities,
- SofaMapping[] sofaMappings, FlowControllerDescription flowControllerDescription)
+ TypePriorities typePriorities, SofaMapping[] sofaMappings,
+ FlowControllerDescription flowControllerDescription)
throws ResourceInitializationException {
if (componentNames == null) {
@@ -564,7 +564,7 @@ public final class AnalysisEngineFactory
if (sofaMappings != null) {
desc.setSofaMappings(sofaMappings);
}
-
+
return desc;
}
Modified: uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java?rev=1476429&r1=1476428&r2=1476429&view=diff
==============================================================================
--- uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java (original)
+++ uima/sandbox/uimafit/trunk/uimafit/src/test/java/org/apache/uima/fit/factory/AnalysisEngineFactoryTest.java Fri Apr 26 22:43:06 2013
@@ -195,7 +195,7 @@ public class AnalysisEngineFactoryTest e
List<String> componentNames = Arrays.asList("ann1", "ann2", "ann3");
AnalysisEngine aggregateEngine = AnalysisEngineFactory.createAggregate(primitiveDescriptors,
- componentNames, typeSystemDescription, null, sofaMappings);
+ componentNames, null, sofaMappings);
aggregateEngine.process(jCas);
@@ -508,7 +508,6 @@ public class AnalysisEngineFactoryTest e
descriptions.add(AnalysisEngineFactory.createPrimitiveDescription(NoOpAnnotator.class));
List<String> names = new ArrayList<String>();
- AnalysisEngineFactory.createAggregateDescription(descriptions, names,
- TypeSystemDescriptionFactory.createTypeSystemDescription(), null, null, null);
+ AnalysisEngineFactory.createAggregateDescription(descriptions, names, null, null, null);
}
}