You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2009/07/23 20:34:48 UTC
svn commit: r797182 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: flow/
flow/impl/ impl/ resource/metadata/impl/
Author: joern
Date: Thu Jul 23 18:34:47 2009
New Revision: 797182
URL: http://svn.apache.org/viewvc?rev=797182&view=rev
Log:
UIMA-1452 Added some generics manually to these classes
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/CasFlowController_ImplBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowController_ImplBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlowController_ImplBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/CasFlowController_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/CasFlowController_ImplBase.java?rev=797182&r1=797181&r2=797182&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/CasFlowController_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/CasFlowController_ImplBase.java Thu Jul 23 18:34:47 2009
@@ -35,7 +35,7 @@
*
* @see org.apache.uima.flow.FlowController#getRequiredCasInterface()
*/
- public Class getRequiredCasInterface() {
+ public Class<CAS> getRequiredCasInterface() {
return CAS.class;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowController_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowController_ImplBase.java?rev=797182&r1=797181&r2=797182&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowController_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowController_ImplBase.java Thu Jul 23 18:34:47 2009
@@ -92,7 +92,7 @@
* AnalysisEngines to the flow.
* @see org.apache.uima.flow.FlowController#addAnalysisEngines(java.util.Collection)
*/
- public void addAnalysisEngines(Collection aKeys) {
+ public void addAnalysisEngines(Collection<String> aKeys) {
//does nothing by default
}
@@ -101,7 +101,7 @@
* this to support removing AnalysisEngines from the flow.
* @see org.apache.uima.flow.FlowController#removeAnalysisEngines(java.util.Collection)
*/
- public void removeAnalysisEngines(Collection aKeys) throws AnalysisEngineProcessException {
+ public void removeAnalysisEngines(Collection<String> aKeys) throws AnalysisEngineProcessException {
throw new AnalysisEngineProcessException(
AnalysisEngineProcessException.REMOVE_AE_FROM_FLOW_NOT_SUPPORTED,
new Object[] { getClass().getName() });
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlowController_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlowController_ImplBase.java?rev=797182&r1=797181&r2=797182&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlowController_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/JCasFlowController_ImplBase.java Thu Jul 23 18:34:47 2009
@@ -32,7 +32,7 @@
*
* @see org.apache.uima.flow.FlowController#getRequiredCasInterface()
*/
- public Class getRequiredCasInterface() {
+ public Class<JCas> getRequiredCasInterface() {
return JCas.class;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java?rev=797182&r1=797181&r2=797182&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/ParallelStep.java Thu Jul 23 18:34:47 2009
@@ -31,6 +31,9 @@
* method will be called again to determine the next destination for the CAS.
*/
public class ParallelStep extends Step {
+
+ private Collection<String> mKeys;
+
/**
* Creates a new ParallelStep
*
@@ -39,7 +42,7 @@
* should be routed. Each String must bee one of the keys in the FlowController's
* {@link FlowControllerContext#getAnalysisEngineMetaDataMap()}.
*/
- public ParallelStep(Collection aAnalysisEngineKeys) {
+ public ParallelStep(Collection<String> aAnalysisEngineKeys) {
setAnalysisEngineKeys(aAnalysisEngineKeys);
}
@@ -49,7 +52,7 @@
* @return an unmodifiable Collection of Strings, where each String is the key of an Analysis Engine to
* which the CAS should be routed.
*/
- public Collection getAnalysisEngineKeys() {
+ public Collection<String> getAnalysisEngineKeys() {
return mKeys;
}
@@ -62,9 +65,7 @@
* should be routed. Each String must bee one of the keys in the FlowController's
* {@link FlowControllerContext#getAnalysisEngineMetaDataMap()}.
*/
- public void setAnalysisEngineKeys(Collection aKeys) {
+ public void setAnalysisEngineKeys(Collection<String> aKeys) {
mKeys = Collections.unmodifiableCollection(aKeys);
}
-
- private Collection mKeys;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java?rev=797182&r1=797181&r2=797182&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java Thu Jul 23 18:34:47 2009
@@ -317,19 +317,19 @@
mParentController.getLastResultSpecForComponent().clear();
// get all language key from the table
- Set keys = mFlowTable.keySet();
+ Set<String> keys = mFlowTable.keySet();
// loop over all languages
- Iterator it = keys.iterator();
+ Iterator<String> it = keys.iterator();
while (it.hasNext()) {
// get sequence for current language
- List sequence = (List) mFlowTable.get(it.next());
+ List<AnalysisSequenceCapabilityNode> sequence = mFlowTable.get(it.next());
// loop over all nodes in the sequence
for (int i = 0; i < sequence.size(); i++) {
// get current annotator node
- AnalysisSequenceCapabilityNode node = (AnalysisSequenceCapabilityNode) sequence.get(i);
+ AnalysisSequenceCapabilityNode node = sequence.get(i);
if (node != null) {
// recompile result spec
node.getResultSpec().setTypeSystem(mLastTypeSystem);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java?rev=797182&r1=797181&r2=797182&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java Thu Jul 23 18:34:47 2009
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
import org.apache.uima.UIMAFramework;
import org.apache.uima.UIMARuntimeException;
@@ -50,7 +51,7 @@
public class FixedFlowController extends CasFlowController_ImplBase {
/**
- * Key for the configuation parameter that determines what should happen to a
+ * Key for the configuration parameter that determines what should happen to a
* CAS after it has been input to a CAS Multiplier. Possible values are:
* continue: the CAS continues on to the next element in the flow
* stop: the CAS will no longer continue in the flow, and will be returned from the
@@ -71,14 +72,14 @@
private static final int ACTION_DROP_IF_NEW_CAS_PRODUCED = 3;
- private ArrayList mSequence;
+ private List<String> mSequence;
private int mActionAfterCasMultiplier;
public void initialize(FlowControllerContext aContext) throws ResourceInitializationException {
super.initialize(aContext);
FlowConstraints flowConstraints = aContext.getAggregateMetadata().getFlowConstraints();
- mSequence = new ArrayList();
+ mSequence = new ArrayList<String>();
if (flowConstraints instanceof FixedFlow) {
String[] sequence = ((FixedFlow) flowConstraints).getFixedFlow();
mSequence.addAll(Arrays.asList(sequence));
@@ -117,7 +118,7 @@
/* (non-Javadoc)
* @see org.apache.uima.flow.FlowController_ImplBase#addAnalysisEngines(java.util.Collection)
*/
- public void addAnalysisEngines(Collection aKeys) {
+ public void addAnalysisEngines(Collection<String> aKeys) {
// Append new keys to end of Sequence
mSequence.addAll(aKeys);
}
@@ -125,7 +126,7 @@
/* (non-Javadoc)
* @see org.apache.uima.flow.FlowController_ImplBase#removeAnalysisEngines(java.util.Collection)
*/
- public void removeAnalysisEngines(Collection aKeys) throws AnalysisEngineProcessException {
+ public void removeAnalysisEngines(Collection<String> aKeys) throws AnalysisEngineProcessException {
//Remove keys from Sequence
mSequence.removeAll(aKeys);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java?rev=797182&r1=797181&r2=797182&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java Thu Jul 23 18:34:47 2009
@@ -34,7 +34,7 @@
public class FlowControllerContext_impl extends ChildUimaContext_impl implements
FlowControllerContext {
- private Map mAnalysisEngineMetaDataMap;
+ private Map<String, AnalysisEngineMetaData> mAnalysisEngineMetaDataMap;
private AnalysisEngineMetaData mAggregateMetadata;
@@ -44,7 +44,7 @@
* @param aSofaMappings
*/
public FlowControllerContext_impl(UimaContextAdmin aParentContext, String aContextName,
- Map aSofaMappings, Map aAnalysisEngineMetaDataMap,
+ Map<String, String> aSofaMappings, Map<String, AnalysisEngineMetaData> aAnalysisEngineMetaDataMap,
AnalysisEngineMetaData aAggregateMetadata) {
super(aParentContext, aContextName, aSofaMappings);
mAnalysisEngineMetaDataMap = Collections.unmodifiableMap(aAnalysisEngineMetaDataMap);
@@ -60,7 +60,7 @@
*
* @see org.apache.uima.flow.FlowControllerContext#getAnalysisEngineMetaDataMap()
*/
- public Map getAnalysisEngineMetaDataMap() {
+ public Map<String, AnalysisEngineMetaData> getAnalysisEngineMetaDataMap() {
return mAnalysisEngineMetaDataMap;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java?rev=797182&r1=797181&r2=797182&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java Thu Jul 23 18:34:47 2009
@@ -72,7 +72,7 @@
* (non-Javadoc) Creates a child context.
*/
public ChildUimaContext_impl(UimaContextAdmin aParentContext, String aContextName,
- Map aSofaMappings) {
+ Map<String, String> aSofaMappings) {
mRootContext = aParentContext.getRootContext();
mLogger = aParentContext.getRootContext().getLogger();
mQualifiedContextName = aParentContext.getQualifiedContextName() + aContextName + '/';
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java?rev=797182&r1=797181&r2=797182&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java Thu Jul 23 18:34:47 2009
@@ -80,7 +80,7 @@
mConfigurationManager = aConfigurationManager;
mQualifiedContextName = "/";
mSession = new Session_impl();
- mSofaMappings = new TreeMap();
+ mSofaMappings = new TreeMap<String, String>();
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java?rev=797182&r1=797181&r2=797182&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java Thu Jul 23 18:34:47 2009
@@ -31,6 +31,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -76,7 +77,7 @@
* component engines. The key is the component sofa name and the value is the absolute sofa name
* assigned by a top level aggregate in this process.
*/
- protected Map mSofaMappings;
+ protected Map<String, String> mSofaMappings;
/**
* Size of the CAS pool used to support the {@link #getEmptyCas(Class)} method.
@@ -142,23 +143,23 @@
*
* @see org.apache.uima.UimaContextAdmin#createChild(java.lang.String)
*/
- public UimaContextAdmin createChild(String aContextName, Map aSofaMappings) {
+ public UimaContextAdmin createChild(String aContextName, Map<String, String> aSofaMappings) {
// The aSofaMappings parameter, if present, defines the mapping between the child
// context's sofa names and this context's sofa names. This context's sofa names
// may again be remapped (according to the mSofaMappings field). We need to
// produce the absolute mapping and pass that into the child context's constructor.
// child context's mappings are originally equivalent to this context's mappings
- Map childSofaMap = new TreeMap();
+ Map<String, String> childSofaMap = new TreeMap<String, String>();
childSofaMap.putAll(mSofaMappings);
if (aSofaMappings != null) {
// iterate through remappings list (aSofaMappings) and apply them
- Iterator it = aSofaMappings.entrySet().iterator();
+ Iterator<Map.Entry<String, String>> it = aSofaMappings.entrySet().iterator();
while (it.hasNext()) {
- Map.Entry entry = (Map.Entry) it.next();
- String childSofaName = (String) entry.getKey();
- String thisContextSofaName = (String) entry.getValue();
- String absoluteSofaName = (String) mSofaMappings.get(thisContextSofaName);
+ Map.Entry<String, String> entry = it.next();
+ String childSofaName = entry.getKey();
+ String thisContextSofaName = entry.getValue();
+ String absoluteSofaName = mSofaMappings.get(thisContextSofaName);
if (absoluteSofaName == null) {
absoluteSofaName = thisContextSofaName;
}
@@ -420,7 +421,7 @@
if (groups == null) {
return new String[0];
} else {
- Set names = new TreeSet();
+ Set<String> names = new TreeSet<String>();
for (int i = 0; i < groups.length; i++) {
names.addAll(Arrays.asList(groups[i].getNames()));
}
@@ -460,7 +461,7 @@
if (groups.length == 0) {
return new String[0];
} else {
- ArrayList names = new ArrayList();
+ List<String> names = new ArrayList<String>();
ConfigurationParameter[] commonParams = getConfigurationManager()
.getConfigParameterDeclarations(getQualifiedContextName()).getCommonParameters();
if (commonParams != null) {
@@ -547,7 +548,7 @@
/* (non-Javadoc)
* @see org.apache.uima.UimaContextAdmin#getSofaMap()
*/
- public Map getSofaMap() {
+ public Map<String, String> getSofaMap() {
return Collections.unmodifiableMap(mSofaMappings);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java?rev=797182&r1=797181&r2=797182&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java Thu Jul 23 18:34:47 2009
@@ -100,10 +100,10 @@
*
* @see org.apache.uima.resource.MetaDataObject#listAttributes()
*/
- public List listAttributes() {
+ public List<NameClassPair> listAttributes() {
try {
PropertyDescriptor[] props = getPropertyDescriptors();
- List resultList = new ArrayList(props.length);
+ List<NameClassPair> resultList = new ArrayList<NameClassPair>(props.length);
for (int i = 0; i < props.length; i++) {
// only list properties with read and write methods,
// and don't include the SourceUrl property, which is for