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/05/13 00:52:06 UTC
svn commit: r774120 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: ./
analysis_component/ analysis_engine/ analysis_engine/asb/
analysis_engine/metadata/ cas/ cas/text/ cas_data/ collection/
collection/metadata/ flow/ jcas/ ...
Author: joern
Date: Tue May 12 22:52:05 2009
New Revision: 774120
URL: http://svn.apache.org/viewvc?rev=774120&view=rev
Log:
UIMA-1341
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/CompositeResourceFactory.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContext.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowConstraints.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ConstraintFactory.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTreeNode.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/CasData.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/EntityProcessStatus.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecutable.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowController.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerContext.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifierList.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexCollection.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MetaDataObject.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorities.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeSystemDescription.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/ProcessTrace.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/ProcessTraceEvent.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/CompositeResourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/CompositeResourceFactory.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/CompositeResourceFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/CompositeResourceFactory.java Tue May 12 22:52:05 2009
@@ -19,6 +19,8 @@
package org.apache.uima;
+import org.apache.uima.resource.ResourceSpecifier;
+
/**
* A type of {@link ResourceFactory} that produces resources by delegating to other Resource
* Factories.
@@ -41,5 +43,5 @@
* @param aFactory
* the factory used to create resources from resource specifiers of the given type
*/
- public void registerFactory(Class aResourceSpecifierInterface, ResourceFactory aFactory);
+ public void registerFactory(Class<? extends ResourceSpecifier> aResourceSpecifierInterface, ResourceFactory aFactory);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContext.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContext.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContext.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContext.java Tue May 12 22:52:05 2009
@@ -429,7 +429,7 @@
* for the current call.
* <p>
* Note that Session support is NOT implemented in any of the service wrappers (Vinci, SOAP) currently
- * provided in the UIMA SDK.
+ * provided in the UIMA SDK.
*
* @return the current Session object
*/
@@ -446,6 +446,7 @@
* now be obtained directly by the method {@link CAS#getView(String)}, and the
* framework will automatically do the necessary Sofa mappings.
*/
+ @Deprecated
public SofaID mapToSofaID(String aSofaName);
/**
@@ -464,6 +465,7 @@
* now be obtained directly by the method {@link CAS#getView(String)}, and the
* framework will automatically do the necessary Sofa mappings.
*/
+ @Deprecated
public SofaID[] getSofaMappings();
/**
@@ -480,5 +482,5 @@
*
* @return an empty CAS. This will be an implementation of <code>aCasInterface</code>.
*/
- public AbstractCas getEmptyCas(Class aCasInterface);
+ public AbstractCas getEmptyCas(Class<? extends AbstractCas> aCasInterface);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UimaContextAdmin.java Tue May 12 22:52:05 2009
@@ -62,7 +62,7 @@
* @param aSofaMappings
* mappings from child's sofa name to parent's sofa name. May be null.
*/
- public UimaContextAdmin createChild(String aContextName, Map aSofaMappings);
+ public UimaContextAdmin createChild(String aContextName, Map<String, String> aSofaMappings);
/**
* Sets the Logger for this UimaContext. If this method is not called, the default logger ({@link org.apache.uima.UIMAFramework#getLogger()})
@@ -160,14 +160,14 @@
public ComponentInfo getComponentInfo();
/**
- * Gets an unmodifiable Map containing the mapping of component sofa name to
+ * Gets an unmodifiable Map containing the mapping of component sofa name to
* absolute sofa ID.
* @return the Sofa map for this component
*/
- public Map getSofaMap();
+ public Map<String, String> getSofaMap();
/**
- * Called internally by the framework whenever the AnalysisComponent returns a CAS
+ * Called internally by the framework whenever the AnalysisComponent returns a CAS
* from its next() method or calls cas.release(). Used to monitor the number of CASes
* that the AnalysisComponent is using at any one time.
* @param aCAS the CAS that was returned or released
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/AnalysisComponent.java Tue May 12 22:52:05 2009
@@ -77,7 +77,7 @@
* The AnalysisComponent is permitted to make changes to this CAS. Once <code>hasNext</code>
* returns false, the AnalysisComponent releases control of the initial CAS. This means that the
* AnalysisComponent must finish all updates to the initial CAS prior to returning false from
- * <code>hasNext<code>.
+ * <code>hasNext<code>.
* <p>
* However, if the <code>process</code> method is called a second time, before <code>hasNext</code> has returned
* false, this is a signal to the AnalysisComponent to cancel all processing of the previous CAS and begin
@@ -197,7 +197,7 @@
*
* @return the required CAS interface. This must specify a subtype of {@link AbstractCas}.
*/
- Class getRequiredCasInterface();
+ Class<? extends AbstractCas> getRequiredCasInterface();
/**
* Returns the maximum number of CAS instances that this AnalysisComponent expects to use at the
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineDescription.java Tue May 12 22:52:05 2009
@@ -161,7 +161,7 @@
* @throws InvalidXMLException
* if import resolution failed
*/
- public Map getDelegateAnalysisEngineSpecifiers() throws InvalidXMLException;
+ public Map<String, ResourceSpecifier> getDelegateAnalysisEngineSpecifiers() throws InvalidXMLException;
/**
* For an aggregate AnalysisEngine only, retrieves a collection of {@link ResourceSpecifier}s
@@ -194,7 +194,7 @@
* @throws InvalidXMLException
* if import resolution failed
*/
- public Map getDelegateAnalysisEngineSpecifiers(ResourceManager aResourceManager)
+ public Map<String, ResourceSpecifier> getDelegateAnalysisEngineSpecifiers(ResourceManager aResourceManager)
throws InvalidXMLException;
/**
@@ -211,7 +211,7 @@
* {@link org.apache.uima.resource.metadata.Import} objects as values. This Map may be
* modified to add or remove imports or specifiers.
*/
- public Map getDelegateAnalysisEngineSpecifiersWithImports();
+ public Map<String, ResourceSpecifier> getDelegateAnalysisEngineSpecifiersWithImports();
/**
* For an aggregate AnalysisEngine only, gets the declaration of which FlowController should be
@@ -257,7 +257,7 @@
* @throws InvalidXMLException
* if import resolution failed
*/
- public Map getAllComponentSpecifiers(ResourceManager aResourceManager) throws InvalidXMLException;
+ public Map<String, ResourceSpecifier> getAllComponentSpecifiers(ResourceManager aResourceManager) throws InvalidXMLException;
/**
* Retrieves the metadata that describes the AnalysisEngine. This includes the AnalysisEngine's
@@ -363,7 +363,7 @@
* @throws InvalidXMLException
* if an import target does not exist or is invalid
*/
- public void resolveImports(Collection aAlreadyImportedDelegateAeUrls,
+ public void resolveImports(Collection<String> aAlreadyImportedDelegateAeUrls,
ResourceManager aResourceManager) throws InvalidXMLException;
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java Tue May 12 22:52:05 2009
@@ -100,7 +100,7 @@
*
* @return a map from String keys to AnalysisEngineManagement objects
*/
- Map getComponents();
+ Map<String, AnalysisEngineManagement> getComponents();
/**
* Resets all of the performance statistics to zero. For an Aggregate Analysis Engine, also resets
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java Tue May 12 22:52:05 2009
@@ -91,7 +91,7 @@
* @throws org.apache.uima.UIMA_IllegalStateException
* if {@link #setup()} has not been called yet.
*/
- public Map getComponentAnalysisEngineMetaData();
+ public Map<String, AnalysisEngineMetaData> getComponentAnalysisEngineMetaData();
/**
* Gets the metadata for all components known to this ASB. This includes the FlowController as
@@ -100,7 +100,7 @@
* @return a Map from String keys (the same keys used in the aggregate AE descriptor) to
* {@link ProcessingResourceMetaData} values.
*/
- public Map getAllComponentMetaData();
+ public Map<String, ProcessingResourceMetaData> getAllComponentMetaData();
/**
* Gets references to the component AnalysisEngines known to this <code>ASB</code>.
@@ -112,7 +112,7 @@
* @throws org.apache.uima.UIMA_IllegalStateException
* if {@link #setup()} has not been called yet.
*/
- public Map getComponentAnalysisEngines();
+ public Map<String, AnalysisEngine> getComponentAnalysisEngines();
/**
* Invokes the processing of the aggregate on the given input CAS. This returns a CasIterator that
@@ -136,6 +136,6 @@
* well as the component AnalysisEngines.
*
* @return an instance of {@link FlowControllerContainer}
- */
+ */
public FlowControllerContainer getFlowControllerContainer();
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowConstraints.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowConstraints.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowConstraints.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/FlowConstraints.java Tue May 12 22:52:05 2009
@@ -60,5 +60,5 @@
* values (the new IDs). Any identifiers that do not appear in this Map will not be
* remapped.
*/
- public void remapIDs(Map aIDMap);
+ public void remapIDs(Map<String, String> aIDMap);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java Tue May 12 22:52:05 2009
@@ -268,6 +268,7 @@
* @deprecated As of v2.0, this is replaced by {@link #NAME_DEFAULT_SOFA}, and the value has
* changed. In general, user code should not need to refer to this name.
*/
+ @Deprecated
static final String NAME_DEFAULT_TEXT_SOFA = "_InitialView";
/**
@@ -769,6 +770,7 @@
*
* @deprecated As of v2.0, use {@link #createView(String)} instead.
*/
+ @Deprecated
SofaFS createSofa(SofaID sofaID, String mimeType);
/**
@@ -821,7 +823,7 @@
* The <code>FSListIterator</code> to be wrapped.
* @return An equivalent <code>ListIterator</code>.
*/
- ListIterator fs2listIterator(FSIterator it);
+ ListIterator<FeatureStructure> fs2listIterator(FSIterator it);
/**
* Reset the CAS, emptying it of all content. Feature structures and iterators will no longer be
@@ -1000,39 +1002,39 @@
/**
* Get iterator over all views in this CAS. Each view provides access to Sofa data
- * and the index repository that contains metadata (annotations and other feature
+ * and the index repository that contains metadata (annotations and other feature
* structures) pertaining to that Sofa.
*
* @return an iterator which returns all views. Each object returned by
* the iterator is of type CAS.
*/
- Iterator getViewIterator();
+ Iterator<CAS> getViewIterator();
/**
* Get iterator over all views with the given name prefix. Each view provides access to Sofa data
- * and the index repository that contains metadata (annotations and other feature
+ * and the index repository that contains metadata (annotations and other feature
* structures) pertaining to that Sofa.
* <p>
- * When passed the prefix <i>namePrefix</i>, the iterator will return all views who
- * name is either exactly equal to <i>namePrefix</i> or is of the form
+ * When passed the prefix <i>namePrefix</i>, the iterator will return all views who
+ * name is either exactly equal to <i>namePrefix</i> or is of the form
* <i>namePrefix</i><code>.</code><i>suffix</i>, where <i>suffix</i> can be any String.
*
- * @param localViewNamePrefix the local name prefix, before any sofa name mapping
+ * @param localViewNamePrefix the local name prefix, before any sofa name mapping
* is done, for this view (note: this is the same as the associated Sofa name prefix).
*
- * @return an iterator which returns all views with the given name prefix.
+ * @return an iterator which returns all views with the given name prefix.
* Each object returned by the iterator is of type CAS.
*/
- Iterator getViewIterator(String localViewNamePrefix);
+ Iterator<CAS> getViewIterator(String localViewNamePrefix);
/**
- * Sets a mark and returns the marker object set with the current mark which can be used to query when certain FSs
+ * Sets a mark and returns the marker object set with the current mark which can be used to query when certain FSs
* were created. This can then be used to identify FSs as added before or after the mark was set and
* to identify FSs modified after the mark is set.
*
* Note: this method may only be called from an application. Calling it from an annotator
* will trigger a runtime exception.
- *
+ *
*
* @return a marker object.
*/
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ConstraintFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ConstraintFactory.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ConstraintFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ConstraintFactory.java Tue May 12 22:52:05 2009
@@ -113,7 +113,7 @@
* The constraint to be embedded.
* @return A new FSMatchConstraint.
*/
- public abstract FSMatchConstraint embedConstraint(ArrayList path, FSConstraint constraint);
+ public abstract FSMatchConstraint embedConstraint(ArrayList<Feature> path, FSConstraint constraint);
/**
* Conjoin two constraints.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FSIndexRepository.java Tue May 12 22:52:05 2009
@@ -55,14 +55,14 @@
*
* @return All labels.
*/
- Iterator getLabels();
+ Iterator<String> getLabels();
/**
* Get all indexes in this repository.
*
* @return All indexes.
*/
- Iterator getIndexes();
+ Iterator<FSIndex> getIndexes();
/**
* Add a feature structure to all appropriate indexes in the repository. If no indexes exist for
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/Type.java Tue May 12 22:52:05 2009
@@ -65,7 +65,8 @@
* @return The Vector of features.
* @deprecated Use {@link #getFeatures() getFeatures()} instead.
*/
- Vector getAppropriateFeatures();
+ @Deprecated
+ Vector<Feature> getAppropriateFeatures();
/**
* Get a vector of the features for which this type is a subtype of the features' domain (i.e.,
@@ -74,7 +75,7 @@
*
* @return The List of features defined for this type.
*/
- List getFeatures();
+ List<Feature> getFeatures();
/**
* Get the number of features for which this type defines the domain. This includes inherited
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java Tue May 12 22:52:05 2009
@@ -89,7 +89,7 @@
*
* @return The iterator.
*/
- Iterator getTypeIterator();
+ Iterator<Type> getTypeIterator();
/**
* Get the top type, i.e., the root of the type system.
@@ -106,7 +106,8 @@
* @return A vector of the directly subsumed types.
* @deprecated Use {@link #getDirectSubtypes(Type) getDirectSubtypes(Type)} instead.
*/
- Vector getDirectlySubsumedTypes(Type type);
+ @Deprecated
+ Vector<Type> getDirectlySubsumedTypes(Type type);
/**
* Get a List of the types directly subsumed by a given type.
@@ -115,7 +116,7 @@
* The input type.
* @return A List of the directly subsumed types.
*/
- List getDirectSubtypes(Type type);
+ List<Type> getDirectSubtypes(Type type);
/**
* Return the list of all types subsumed by the input type. Note: the list does not include the
@@ -125,7 +126,7 @@
* Input type.
* @return The list of types subsumed by <code>type</code>.
*/
- List getProperlySubsumedTypes(Type type);
+ List<Type> getProperlySubsumedTypes(Type type);
/**
* Get the parent type for input type.
@@ -152,7 +153,7 @@
*
* @return An iterator over the features.
*/
- Iterator getFeatures();
+ Iterator<Feature> getFeatures();
/**
* Create a type name space object for the name parameter.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTreeNode.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTreeNode.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTreeNode.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationTreeNode.java Tue May 12 22:52:05 2009
@@ -74,7 +74,7 @@
*
* @return An ArrayList of the children.
*/
- ArrayList getChildren();
+ ArrayList<AnnotationTreeNode> getChildren();
/**
* Return the annotation for this node.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/CasData.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/CasData.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/CasData.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/CasData.java Tue May 12 22:52:05 2009
@@ -49,7 +49,7 @@
*
* @return an iterator over {@link FeatureStructure} objects.
*/
- public Iterator getFeatureStructures();
+ public Iterator<FeatureStructure> getFeatureStructures();
/**
* Adds a FeatureStructure to the list of top-level FeatureStructures contained in this CasData.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/EntityProcessStatus.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/EntityProcessStatus.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/EntityProcessStatus.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/EntityProcessStatus.java Tue May 12 22:52:05 2009
@@ -51,7 +51,7 @@
*
* @return the List of Exceptions, <code>null</code> if none
*/
- public List getExceptions();
+ public List<Exception> getExceptions();
/**
* Gets the name of the components in which Exceptions (if any) occurred. These could be the
@@ -59,7 +59,7 @@
*
* @return the name of the components that failed, <code>null</code> if there was no failure
*/
- public List getFailedComponentNames();
+ public List<String> getFailedComponentNames();
/**
* Gets the <code>ProcessTrace</code> object for the Entity's processing. The
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecutable.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecutable.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecutable.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CasProcessorExecutable.java Tue May 12 22:52:05 2009
@@ -80,11 +80,11 @@
*/
public void removeCasProcessorExecArg(int aIndex);
- public ArrayList getEnvs();
+ public ArrayList<CasProcessorRuntimeEnvParam> getEnvs();
/**
* @param params
*/
- public void setEnvs(ArrayList params);
+ public void setEnvs(ArrayList<CasProcessorRuntimeEnvParam> params);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowController.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowController.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowController.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowController.java Tue May 12 22:52:05 2009
@@ -153,7 +153,7 @@
*
* @return the required CAS interface. This must specify a subtype of {@link AbstractCas}.
*/
- Class getRequiredCasInterface();
+ Class<? extends AbstractCas> getRequiredCasInterface();
/**
* Notifies this FlowController that new Analysis Engines are now available to route CASes to.
@@ -169,11 +169,11 @@
* time between when the Analysis Engine MetaData map is updated and the time when this method
* completes.
*
- * @param aKeys a Collection of Strings, each of which is the key of an Analysis Engine to which
- * CASes can be routed. These are the same keys as used in
- * {@link FlowControllerContext#getAnalysisEngineMetaDataMap()}.
+ * @param aKeys a Collection of Strings, each of which is the key of an Analysis Engine to which
+ * CASes can be routed. These are the same keys as used in
+ * {@link FlowControllerContext#getAnalysisEngineMetaDataMap()}.
*/
- void addAnalysisEngines(Collection aKeys);
+ void addAnalysisEngines(Collection<String> aKeys);
/**
* Notifies this FlowController that some Analysis Engines are no longer available to route CASes to.
@@ -182,9 +182,9 @@
* and will remove the metadata for these new Analysis Engines.
* <p>
* It is not required for a FlowController implementation to support this method. It may throw
- * an exception if this operation is not supported
- * (see {@link AnalysisEngineProcessException#REMOVE_AE_FROM_FLOW_NOT_SUPPORTED}.
- * Also the FlowController may throw an Exception if it determines that it does not make sense for
+ * an exception if this operation is not supported
+ * (see {@link AnalysisEngineProcessException#REMOVE_AE_FROM_FLOW_NOT_SUPPORTED}.
+ * Also the FlowController may throw an Exception if it determines that it does not make sense for
* the flow to continue in the absence of the removed Analysis Engines
* (see {@link AnalysisEngineProcessException#FLOW_CANNOT_CONTINUE_AFTER_REMOVE}.
* <p>
@@ -194,10 +194,10 @@
* completes.
*
* @param aKeys a Collection of Strings, each of which is the key of an Analysis Engine to which CASes
- * may no longer be routed.
- *
- * @throws AnalysisEngineProcessException if the FlowController cannot continue with these
+ * may no longer be routed.
+ *
+ * @throws AnalysisEngineProcessException if the FlowController cannot continue with these
* Analysis Engines removed, or doesn't support removing Analysis Engines at all.
*/
- void removeAnalysisEngines(Collection aKeys) throws AnalysisEngineProcessException;
+ void removeAnalysisEngines(Collection<String> aKeys) throws AnalysisEngineProcessException;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerContext.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerContext.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerContext.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/FlowControllerContext.java Tue May 12 22:52:05 2009
@@ -42,7 +42,7 @@
*
* @return a map with <code>String</code> keys, and {@link AnalysisEngineMetaData} values
*/
- Map getAnalysisEngineMetaDataMap();
+ Map<String, AnalysisEngineMetaData> getAnalysisEngineMetaDataMap();
/**
* Gets the metadata of the Aggregate AnalysisEngine containing this FlowController. This includes
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JFSIndexRepository.java Tue May 12 22:52:05 2009
@@ -83,14 +83,14 @@
*
* @return All labels.
*/
- Iterator getLabels();
+ Iterator<String> getLabels();
/**
* Get all indexes in this repository.
*
* @return All indexes.
*/
- Iterator getIndexes();
+ Iterator<FSIndex> getIndexes();
/**
* Get the underlying FSIndexRepository associated with this JFSIndexRepository.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java Tue May 12 22:52:05 2009
@@ -21,7 +21,6 @@
import java.util.Properties;
-import org.apache.uima.UimaContext;
import org.apache.uima.UimaContextAdmin;
import org.apache.uima.cas.AbstractCas;
import org.apache.uima.cas.CAS;
@@ -60,7 +59,7 @@
* name to give to the pool. Must be unique among all pool names in this
* CAS manager, and care should be taken to assure that this does not match the
* qualified name of UIMA Contexts passed to {@link #defineCasPool(UimaContextAdmin, int, Properties)}.
- * This name is later passed to the {@link #getCas(String)} method, to check out
+ * This name is later passed to the {@link #getCas(String)} method, to check out
* CASes from the pool.
* @param aSize
* the minimum CAS pool size required
@@ -87,7 +86,7 @@
* if a CAS could not be created.
*/
void defineCasPool(UimaContextAdmin aRequestorContext, int aMinimumSize, Properties aPerformanceTuningSettings)
- throws ResourceInitializationException;
+ throws ResourceInitializationException;
/**
* Gets an empty CAS. An AnalysisEngine may only call this method after it has first called
@@ -107,7 +106,7 @@
* Create a new CAS using the CasDefinition stored in this CAS Manager. Note
* that this new CAS will not belong to any pool managed by this CAS Manager.
* If this method is called multiple times while the CasDefinition is constant,
- * each new CAS will share an identical TypeSystem object.
+ * each new CAS will share an identical TypeSystem object.
*
* @param aPerformanceTuningSettings
* settings, including initial CAS heap size, for the AE
@@ -124,7 +123,7 @@
* @param requiredInterface
* interface to get. Currently must be either CAS or JCas.
*/
- AbstractCas getCasInterface(CAS cas, Class requiredInterface);
+ AbstractCas getCasInterface(CAS cas, Class<? extends AbstractCas> requiredInterface);
/**
* Configures this CAS Manager so it can register an MBean for each of its CAS pools.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifierList.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifierList.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifierList.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceSpecifierList.java Tue May 12 22:52:05 2009
@@ -41,5 +41,5 @@
*
* @return an unmodifiable List of {@link ResourceSpecifier}s.
*/
- public List getResourceSpecifiers();
+ public List<ResourceSpecifier> getResourceSpecifiers();
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexCollection.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexCollection.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexCollection.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/FsIndexCollection.java Tue May 12 22:52:05 2009
@@ -226,6 +226,6 @@
* @throws InvalidXMLException
* if either the import target does not exist or is invalid
*/
- public void resolveImports(Collection aAlreadyImportedFsIndexCollectionURLs,
+ public void resolveImports(Collection<String> aAlreadyImportedFsIndexCollectionURLs,
ResourceManager aResourceManager) throws InvalidXMLException;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MetaDataObject.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MetaDataObject.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MetaDataObject.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/MetaDataObject.java Tue May 12 22:52:05 2009
@@ -24,6 +24,7 @@
import org.apache.uima.UIMA_IllegalArgumentException;
import org.apache.uima.UIMA_UnsupportedOperationException;
+import org.apache.uima.util.NameClassPair;
import org.apache.uima.util.XMLizable;
/**
@@ -52,7 +53,7 @@
* wrapper classes will be returned (e.g. <code>java.lang.Integer</code> instead of
* int).
*/
- public List listAttributes();
+ public List<NameClassPair> listAttributes();
/**
* Retrieves the value of an attribute of this <code>MetaDataObject</code>.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/ResourceManagerConfiguration.java Tue May 12 22:52:05 2009
@@ -143,6 +143,7 @@
* @deprecated Use {@link #getImports()} instead. There may be many imports; this method only
* returns the first.
*/
+ @Deprecated
public Import getImport();
/**
@@ -153,6 +154,7 @@
* manager configuration. Null indicates that there is no import.
* @deprecated Use {@link #setImports(Import[])} instead.
*/
+ @Deprecated
public void setImport(Import aImport);
/**
@@ -288,7 +290,7 @@
* @throws InvalidXMLException
* if either the import target does not exist or is invalid
*/
- public void resolveImports(Collection aAlreadyImportedURLs, ResourceManager aResourceManager)
+ public void resolveImports(Collection<String> aAlreadyImportedURLs, ResourceManager aResourceManager)
throws InvalidXMLException;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorities.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorities.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorities.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypePriorities.java Tue May 12 22:52:05 2009
@@ -223,6 +223,6 @@
* @throws InvalidXMLException
* if either the import target does not exist or is invalid
*/
- public void resolveImports(Collection aAlreadyImportedPriorityListURLs,
+ public void resolveImports(Collection<String> aAlreadyImportedPriorityListURLs,
ResourceManager aResourceManager) throws InvalidXMLException;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeSystemDescription.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeSystemDescription.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeSystemDescription.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/TypeSystemDescription.java Tue May 12 22:52:05 2009
@@ -217,6 +217,6 @@
* @throws InvalidXMLException
* if either the import target does not exist or is invalid
*/
- public void resolveImports(Collection aAlreadyImportedTypeSystemURLs,
+ public void resolveImports(Collection<String> aAlreadyImportedTypeSystemURLs,
ResourceManager aResourceManager) throws InvalidXMLException;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/ProcessTrace.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/ProcessTrace.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/ProcessTrace.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/ProcessTrace.java Tue May 12 22:52:05 2009
@@ -104,7 +104,7 @@
* @param aEventList
* a List of event object to be added to this <code>ProcessTrace</code>
*/
- public void addAll(List aEventList);
+ public void addAll(List<ProcessTraceEvent> aEventList);
/**
* Gets a list of {@link ProcessTraceEvent}s, in the order in which they were created. This is
@@ -112,7 +112,7 @@
*
* @return an unmodifiable List of {@link ProcessTraceEvent}s
*/
- public List getEvents();
+ public List<ProcessTraceEvent> getEvents();
/**
* Gets all events that have the given Component name.
@@ -125,7 +125,7 @@
*
* @return a List of ProcessTraceEvents having the given component name
*/
- public List getEventsByComponentName(String aComponentName, boolean aRecurseWithinMatch);
+ public List<ProcessTraceEvent> getEventsByComponentName(String aComponentName, boolean aRecurseWithinMatch);
/**
* Gets all events that have the given type
@@ -138,7 +138,7 @@
*
* @return a List of ProcessTraceEvents having the given type
*/
- public List getEventsByType(String aType, boolean aRecurseWithinMatch);
+ public List<ProcessTraceEvent> getEventsByType(String aType, boolean aRecurseWithinMatch);
/**
* Get a specified event.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/ProcessTraceEvent.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/ProcessTraceEvent.java?rev=774120&r1=774119&r2=774120&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/ProcessTraceEvent.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/ProcessTraceEvent.java Tue May 12 22:52:05 2009
@@ -70,7 +70,7 @@
*
* @return a List containing other <code>ProcessTraceEvent</code> objects
*/
- public List getSubEvents();
+ public List<ProcessTraceEvent> getSubEvents();
/**
* Gets the duration of this event, minus the sum of the durations of its direct sub-events.