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/08/12 17:08:49 UTC
svn commit: r803550 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource:
./ impl/ metadata/impl/
Author: joern
Date: Wed Aug 12 15:08:48 2009
New Revision: 803550
URL: http://svn.apache.org/viewvc?rev=803550&view=rev
Log:
UIMA-1488 Generics for org.apache.uima.resoruce classes
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Session_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorityList_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java Wed Aug 12 15:08:48 2009
@@ -54,15 +54,15 @@
this.resourceManager = aResourceManager;
}
- public CasDefinition(Collection aMetaDataToMerge, ResourceManager aResourceManager)
+ public CasDefinition(Collection<ProcessingResourceMetaData> aMetaDataToMerge, ResourceManager aResourceManager)
throws ResourceInitializationException {
// extract TypeSystems, TypePriorities, and FsIndexes from metadata
- List typeSystems = new ArrayList();
- List typePrioritiesList = new ArrayList();
- List fsIndexes = new ArrayList();
- Iterator it = aMetaDataToMerge.iterator();
+ List<TypeSystemDescription> typeSystems = new ArrayList<TypeSystemDescription>();
+ List<TypePriorities> typePrioritiesList = new ArrayList<TypePriorities>();
+ List<FsIndexCollection> fsIndexes = new ArrayList<FsIndexCollection>();
+ Iterator<ProcessingResourceMetaData> it = aMetaDataToMerge.iterator();
while (it.hasNext()) {
- ProcessingResourceMetaData md = (ProcessingResourceMetaData) it.next();
+ ProcessingResourceMetaData md = it.next();
if (md.getTypeSystem() != null)
typeSystems.add(md.getTypeSystem());
if (md.getTypePriorities() != null)
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java Wed Aug 12 15:08:48 2009
@@ -51,13 +51,13 @@
public class CasManager_impl implements CasManager {
private ResourceManager mResourceManager;
- private ArrayList mMetaDataList = new ArrayList();
+ private List<ProcessingResourceMetaData> mMetaDataList = new ArrayList<ProcessingResourceMetaData>();
- private Map mRequestorToCasPoolMap = new HashMap();
+ private Map<String, CasPool> mRequestorToCasPoolMap = new HashMap<String, CasPool>();
- private Map mCasToCasPoolMap = new HashMap();
+ private Map<CAS, CasPool> mCasToCasPoolMap = new HashMap<CAS, CasPool>();
- private Map mCasToUimaContextMap = new HashMap();
+ private Map<CAS, UimaContext> mCasToUimaContextMap = new HashMap<CAS, UimaContext>();
private CasDefinition mCasDefinition = null;
@@ -239,7 +239,7 @@
}
}
- protected Map getCasToCasPoolMap() {
+ protected Map<CAS, CasPool> getCasToCasPoolMap() {
return mCasToCasPoolMap;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java Wed Aug 12 15:08:48 2009
@@ -23,6 +23,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -61,19 +62,19 @@
/**
* Map from context name to ConfigurationParameterDeclarations for that context.
*/
- private Map mContextNameToParamDeclsMap = new HashMap();
+ private Map<String, ConfigurationParameterDeclarations> mContextNameToParamDeclsMap = new HashMap<String, ConfigurationParameterDeclarations>();
/**
* Map the fully-qualified name of a parameter to the fully-qualified name of the parameter it is
* linked to (from which it takes its value).
*/
- private Map mLinkMap = new HashMap();
+ private Map<String, String> mLinkMap = new HashMap<String, String>();
/**
* Set of parameters (fully qualified names) that explicitly declare overrides. This is used to
* prevent implicit (name-based) overrides for these parameters.
*/
- private Set mExplicitlyOverridingParameters = new HashSet();
+ private Set<String> mExplicitlyOverridingParameters = new HashSet<String>();
/**
* Current session. Used to store parmater overrides.
@@ -413,7 +414,7 @@
*/
private NameValuePair[] getParamSettings(String aGroupName, ConfigurationParameter[] aParams,
String aContextName) {
- ArrayList result = new ArrayList();
+ List<NameValuePair> result = new ArrayList<NameValuePair>();
// iterate over config. param _declarations_
if (aParams != null) {
for (int i = 0; i < aParams.length; i++) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java Wed Aug 12 15:08:48 2009
@@ -36,7 +36,7 @@
* Map containing configuration parameter values and links for parameter values shared by all
* sessions.
*/
- private Map mSharedParamMap = Collections.synchronizedMap(new HashMap());
+ private Map<String, Object> mSharedParamMap = Collections.synchronizedMap(new HashMap<String, Object>());
/*
* (non-Javadoc)
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java Wed Aug 12 15:08:48 2009
@@ -95,7 +95,7 @@
* @see org.apache.uima.resource.RelativePathResolver#setDataPath(java.lang.String)
*/
public void setDataPath(String aPath) throws MalformedURLException {
- List urls = new ArrayList();
+ List<URL> urls = new ArrayList<URL>();
// tokenize based on path.separator system property
String pathSepChar = System.getProperty("path.separator");
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceCreationSpecifier_impl.java Wed Aug 12 15:08:48 2009
@@ -23,7 +23,9 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.uima.UIMAFramework;
import org.apache.uima.resource.ExternalResourceDependency;
@@ -55,7 +57,7 @@
private ResourceMetaData mMetaData;
- private ArrayList mExternalResourceDependencies = new ArrayList();
+ private List<ExternalResourceDependency> mExternalResourceDependencies = new ArrayList<ExternalResourceDependency>();
private ResourceManagerConfiguration mResourceManagerConfiguration;
@@ -124,7 +126,7 @@
*/
public void setExternalResourceDependencies(ExternalResourceDependency[] aDependencies) {
// can't just clear the ArrayList since that breaks clone(). Create a new list.
- mExternalResourceDependencies = new ArrayList();
+ mExternalResourceDependencies = new ArrayList<ExternalResourceDependency>();
if (aDependencies != null) {
for (int i = 0; i < aDependencies.length; i++) {
mExternalResourceDependencies.add(aDependencies[i]);
@@ -136,9 +138,7 @@
* @see org.apache.uima.analysis_engine.AnalysisEngineDescription#getExternalResourceDependency(java.lang.String)
*/
public ExternalResourceDependency getExternalResourceDependency(String aKey) {
- Iterator it = mExternalResourceDependencies.iterator();
- while (it.hasNext()) {
- ExternalResourceDependency dep = (ExternalResourceDependency) it.next();
+ for (ExternalResourceDependency dep : mExternalResourceDependencies) {
if (aKey.equals(dep.getKey()))
return dep;
}
@@ -247,7 +247,7 @@
} else {
ConfigurationParameter[] commonParams = cfgParamDecls.getCommonParameters();
// check for duplicates in common params
- HashSet commonParamNames = new HashSet();
+ Set<String> commonParamNames = new HashSet<String>();
if (commonParams != null) {
for (int i = 0; i < commonParams.length; i++) {
if (!commonParamNames.add(commonParams[i].getName())) {
@@ -261,15 +261,15 @@
// check for duplicates in groups
ConfigurationGroup[] groups = cfgParamDecls.getConfigurationGroups();
if (groups != null) {
- HashMap groupToParamSetMap = new HashMap(); // map from group name to HashSet of param names
+ Map<String, Set<String>> groupToParamSetMap = new HashMap<String, Set<String>>(); // map from group name to HashSet of param names
// in that group
for (int i = 0; i < groups.length; i++) {
String[] names = groups[i].getNames();
for (int j = 0; j < names.length; j++) {
- HashSet paramNamesInGroup = (HashSet) groupToParamSetMap.get(names[j]);
+ Set<String> paramNamesInGroup = groupToParamSetMap.get(names[j]);
if (paramNamesInGroup == null) {
// first time we've seen this group. create an entry and add common params
- paramNamesInGroup = new HashSet(commonParamNames);
+ paramNamesInGroup = new HashSet<String>(commonParamNames);
}
// check for duplicate parameter names
@@ -305,7 +305,7 @@
*/
protected void checkForDuplicateParameterNames(ConfigurationParameter[] aParams)
throws ResourceInitializationException {
- HashSet paramNames = new HashSet();
+ Set<String> paramNames = new HashSet<String>();
for (int i = 0; i < aParams.length; i++) {
if (!paramNames.add(aParams[i].getName())) {
throw new ResourceInitializationException(
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java Wed Aug 12 15:08:48 2009
@@ -73,20 +73,20 @@
* Internal map from resource names (declared in resource declaration XML) to ResourceRegistration
* objects. Used during initialization only.
*/
- protected Map mInternalResourceRegistrationMap = Collections.synchronizedMap(new HashMap());
+ protected Map<String, ResourceRegistration> mInternalResourceRegistrationMap = Collections.synchronizedMap(new HashMap<String, ResourceRegistration>());
/**
* Map from String keys to Class objects. For ParameterizedResources only, stores the
* implementation class corresponding to each resource name.
*/
- protected Map mParameterizedResourceImplClassMap = Collections.synchronizedMap(new HashMap());
+ protected Map<String, Class> mParameterizedResourceImplClassMap = Collections.synchronizedMap(new HashMap<String, Class>());
/**
* Internal map from resource names (declared in resource declaration XML) to Class objects. Used
* internally during resource initialization.
*/
- protected Map mInternalParameterizedResourceImplClassMap = Collections
- .synchronizedMap(new HashMap());
+ protected Map<String, Class> mInternalParameterizedResourceImplClassMap = Collections
+ .synchronizedMap(new HashMap<String, Class>());
/**
* Map from ArrayList(0:String,1:DataResource) keys to Resource objects. For
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Session_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Session_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Session_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Session_impl.java Wed Aug 12 15:08:48 2009
@@ -32,7 +32,7 @@
private static final long serialVersionUID = -8525494546736102324L;
- private Map mMap = Collections.synchronizedMap(new HashMap());
+ private Map<String, Object> mMap = Collections.synchronizedMap(new HashMap<String, Object>());
/*
* (non-Javadoc)
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java Wed Aug 12 15:08:48 2009
@@ -155,16 +155,16 @@
*/
public void setLanguagesSupported(String[] aLanguageIDs) {
// create a list of existing preconditions
- List preconditions = new ArrayList();
+ List<Precondition> preconditions = new ArrayList<Precondition>();
Precondition[] precondArray = getPreconditions();
if (precondArray != null) {
preconditions.addAll(Arrays.asList(precondArray));
}
// remove any existing LanguagePrecondtiions
- Iterator i = preconditions.iterator();
+ Iterator<Precondition> i = preconditions.iterator();
while (i.hasNext()) {
- Precondition p = (Precondition) i.next();
+ Precondition p = i.next();
if (p instanceof LanguagePrecondition) {
i.remove();
}
@@ -188,14 +188,14 @@
*/
public void setMimeTypesSupported(String[] aMimeTypes) {
// create a list of existing preconditions
- List preconditions = new ArrayList();
+ List<Precondition> preconditions = new ArrayList<Precondition>();
Precondition[] precondArray = getPreconditions();
if (precondArray != null) {
preconditions.addAll(Arrays.asList(precondArray));
}
// remove any existing MimeTypePrecondtiions
- Iterator i = preconditions.iterator();
+ Iterator<Precondition> i = preconditions.iterator();
while (i.hasNext()) {
Precondition p = (Precondition) i.next();
if (p instanceof MimeTypePrecondition) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationGroup_impl.java Wed Aug 12 15:08:48 2009
@@ -20,6 +20,7 @@
package org.apache.uima.resource.metadata.impl;
import java.util.ArrayList;
+import java.util.List;
import java.util.StringTokenizer;
import org.apache.uima.resource.metadata.ConfigurationGroup;
@@ -139,7 +140,7 @@
}
// treat names as a space-separated list
StringTokenizer tokenizer = new StringTokenizer(names, " \t");
- ArrayList nameList = new ArrayList();
+ List<String> nameList = new ArrayList<String>();
while (tokenizer.hasMoreTokens()) {
nameList.add(tokenizer.nextToken());
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java Wed Aug 12 15:08:48 2009
@@ -20,6 +20,7 @@
package org.apache.uima.resource.metadata.impl;
import java.util.ArrayList;
+import java.util.List;
import org.apache.uima.UIMA_IllegalArgumentException;
import org.apache.uima.resource.metadata.ConfigurationGroup;
@@ -27,6 +28,7 @@
import org.apache.uima.resource.metadata.ConfigurationParameterDeclarations;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLParser;
+import org.apache.uima.util.XMLizable;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -169,7 +171,7 @@
* @see org.apache.uima.resource.ConfigurationParameterDeclarations#getConfigurationGroup(java.lang.String)
*/
public ConfigurationGroup[] getConfigurationGroupDeclarations(String aGroupName) {
- ArrayList results = new ArrayList();
+ List<ConfigurationGroup> results = new ArrayList<ConfigurationGroup>();
ConfigurationGroup[] grps = getConfigurationGroups();
if (grps != null) {
for (int i = 0; i < grps.length; i++) {
@@ -316,8 +318,8 @@
}
// read parameters, commonParameters, and configurationGroups
- ArrayList params = new ArrayList();
- ArrayList groups = new ArrayList();
+ List<XMLizable> params = new ArrayList<XMLizable>();
+ List<XMLizable> groups = new ArrayList<XMLizable>();
NodeList childNodes = aElement.getChildNodes();
for (int i = 0; i < childNodes.getLength(); i++) {
Node curNode = childNodes.item(i);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java Wed Aug 12 15:08:48 2009
@@ -30,6 +30,7 @@
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.NameClassPair;
import org.apache.uima.util.XMLParser;
+import org.apache.uima.util.XMLizable;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -55,7 +56,7 @@
* Settings for parameters in groups. This HashMap has <code>String</code> keys (the group name)
* and <code>NameValuePair[]</code> values (the parmeter names and their values).
*/
- private Map mSettingsForGroups = new HashMap();
+ private Map<String, NameValuePair[]> mSettingsForGroups = new HashMap<String, NameValuePair[]>();
/**
* @see org.apache.uima.resource.ConfigurationParameterSettings#getParameterSettings()
@@ -78,7 +79,7 @@
/**
* @see org.apache.uima.resource.ConfigurationParameterSettings#getSettingsForGroups()
*/
- public Map getSettingsForGroups() {
+ public Map<String, NameValuePair[]> getSettingsForGroups() {
return mSettingsForGroups;
}
@@ -221,8 +222,8 @@
*
* @see org.apache.uima.resource.MetaDataObject#listAttributes()
*/
- public List listAttributes() {
- List result = super.listAttributes();
+ public List<NameClassPair> listAttributes() {
+ List<NameClassPair> result = super.listAttributes();
result.add(new NameClassPair("settingsForGroups", Map.class.getName()));
return result;
}
@@ -236,7 +237,7 @@
*/
public void buildFromXMLElement(Element aElement, XMLParser aParser,
XMLParser.ParsingOptions aOptions) throws InvalidXMLException {
- ArrayList nvps = new ArrayList();
+ List<XMLizable> nvps = new ArrayList<XMLizable>();
// get all child nodes
NodeList childNodes = aElement.getChildNodes();
for (int i = 0; i < childNodes.getLength(); i++) {
@@ -249,7 +250,7 @@
} else if ("settingsForGroup".equals(elem.getTagName())) {
String key = elem.getAttribute("name");
- ArrayList vals = new ArrayList();
+ List<XMLizable> vals = new ArrayList<XMLizable>();
NodeList arrayNodes = elem.getChildNodes();
for (int j = 0; j < arrayNodes.getLength(); j++) {
Node curArrayNode = arrayNodes.item(j);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java Wed Aug 12 15:08:48 2009
@@ -285,7 +285,7 @@
// iterate through children, and for each element construct a value,
// adding it to a list
- List valueList = new ArrayList();
+ List<String> valueList = new ArrayList<String>();
for (int i = 0; i < numChildren; i++) {
Node curNode = elems.item(i);
if (curNode instanceof Element) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java Wed Aug 12 15:08:48 2009
@@ -33,7 +33,6 @@
import org.apache.uima.resource.metadata.FsIndexCollection;
import org.apache.uima.resource.metadata.FsIndexDescription;
import org.apache.uima.resource.metadata.Import;
-import org.apache.uima.resource.metadata.TypePriorities;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLInputSource;
import org.apache.uima.util.XMLizable;
@@ -191,21 +190,21 @@
* @see org.apache.uima.resource.metadata.TypeSystemDescription#resolveImports()
*/
public void resolveImports() throws InvalidXMLException {
- resolveImports(new TreeSet(), UIMAFramework.newDefaultResourceManager());
+ resolveImports(new TreeSet<String>(), UIMAFramework.newDefaultResourceManager());
}
public void resolveImports(ResourceManager aResourceManager) throws InvalidXMLException {
- resolveImports(new TreeSet(), aResourceManager);
+ resolveImports(new TreeSet<String>(), aResourceManager);
}
- public void resolveImports(Collection aAlreadyImportedFsIndexURLs,
+ public void resolveImports(Collection<String> aAlreadyImportedFsIndexURLs,
ResourceManager aResourceManager) throws InvalidXMLException {
// add our own URL, if known, to the collection of already imported URLs
if (getSourceUrl() != null) {
aAlreadyImportedFsIndexURLs.add(getSourceUrl().toString());
}
- List importedIndexes = new ArrayList();
+ List<FsIndexDescription> importedIndexes = new ArrayList<FsIndexDescription>();
Import[] imports = getImports();
for (int i = 0; i < imports.length; i++) {
// make sure Import's relative path base is set, to allow for users who create
@@ -241,8 +240,8 @@
this.setImports(new Import[0]);
}
- private void resolveImport(URL aURL, Collection aAlreadyImportedFsIndexCollectionURLs,
- Collection aResults, ResourceManager aResourceManager) throws InvalidXMLException,
+ private void resolveImport(URL aURL, Collection<String> aAlreadyImportedFsIndexCollectionURLs,
+ Collection<FsIndexDescription> aResults, ResourceManager aResourceManager) throws InvalidXMLException,
IOException {
//check the import cache
FsIndexCollection desc;
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=803550&r1=803549&r2=803550&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 Wed Aug 12 15:08:48 2009
@@ -157,10 +157,10 @@
*/
public Class getAttributeClass(String aName) {
try {
- List attrList = listAttributes();
- Iterator it = attrList.iterator();
+ List<NameClassPair> attrList = listAttributes();
+ Iterator<NameClassPair> it = attrList.iterator();
while (it.hasNext()) {
- NameClassPair ncp = (NameClassPair) it.next();
+ NameClassPair ncp = it.next();
if (ncp.getName().equals(aName)) {
return Class.forName(ncp.getClassName());
}
@@ -286,8 +286,8 @@
mSourceUrl = aUrl;
// set recursively on subobjects
- List attrs = listAttributes();
- Iterator i = attrs.iterator();
+ List<NameClassPair> attrs = listAttributes();
+ Iterator<NameClassPair> i = attrs.iterator();
while (i.hasNext()) {
String attrName = ((NameClassPair) i.next()).getName();
Object val = getAttributeValue(attrName);
@@ -328,8 +328,8 @@
}
// now clone all values that are MetaDataObjects
- List attrs = listAttributes();
- Iterator i = attrs.iterator();
+ List<NameClassPair> attrs = listAttributes();
+ Iterator<NameClassPair> i = attrs.iterator();
while (i.hasNext()) {
String attrName = ((NameClassPair) i.next()).getName();
Object val = getAttributeValue(attrName);
@@ -360,8 +360,8 @@
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append(getClass().getName()).append(": \n");
- List attrList = listAttributes();
- Iterator i = attrList.iterator();
+ List<NameClassPair> attrList = listAttributes();
+ Iterator<NameClassPair> i = attrList.iterator();
while (i.hasNext()) {
NameClassPair ncp = (NameClassPair) i.next();
buf.append(ncp.getName() + " = ");
@@ -397,16 +397,16 @@
}
MetaDataObject mdo = (MetaDataObject) aObj;
// get the attributes (and classes) for the two objects
- List theseAttrs = this.listAttributes();
- List thoseAttrs = mdo.listAttributes();
+ List<NameClassPair> theseAttrs = this.listAttributes();
+ List<NameClassPair> thoseAttrs = mdo.listAttributes();
// attribute lists must be same length
if (theseAttrs.size() != thoseAttrs.size()) {
return false;
}
// iterate through all attributes in this object
- Iterator i = theseAttrs.iterator();
+ Iterator<NameClassPair> i = theseAttrs.iterator();
while (i.hasNext()) {
- NameClassPair ncp = (NameClassPair) i.next();
+ NameClassPair ncp = i.next();
// other object must contain this attribute
if (!thoseAttrs.contains(ncp)) {
return false;
@@ -496,8 +496,8 @@
int hashCode = 0;
// add the hash codes of all attributes
- List attrs = listAttributes();
- Iterator i = attrs.iterator();
+ List<NameClassPair> attrs = listAttributes();
+ Iterator<NameClassPair> i = attrs.iterator();
while (i.hasNext()) {
String attrName = ((NameClassPair) i.next()).getName();
Object val = getAttributeValue(attrName);
@@ -884,7 +884,7 @@
getXmlizationInfo().elementTagName, aElement.getTagName() });
// get child elements, each of which represents a property
- List foundProperties = new ArrayList();
+ List<String> foundProperties = new ArrayList<String>();
NodeList childNodes = aElement.getChildNodes();
for (int i = 0; i < childNodes.getLength(); i++) {
Node curNode = childNodes.item(i);
@@ -1092,7 +1092,7 @@
* if no acceptable object is described by aElement
*/
protected void readUnknownPropertyValueFromXMLElement(Element aElement, XMLParser aParser,
- XMLParser.ParsingOptions aOptions, List aKnownPropertyNames) throws InvalidXMLException {
+ XMLParser.ParsingOptions aOptions, List<String> aKnownPropertyNames) throws InvalidXMLException {
boolean success = false;
try {
Object valueObj = aParser.buildObjectOrPrimitive(aElement, aOptions);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java Wed Aug 12 15:08:48 2009
@@ -266,21 +266,21 @@
* @see org.apache.uima.resource.metadata.TypeSystemDescription#resolveImports()
*/
public void resolveImports() throws InvalidXMLException {
- resolveImports(new TreeSet(), UIMAFramework.newDefaultResourceManager());
+ resolveImports(new TreeSet<String>(), UIMAFramework.newDefaultResourceManager());
}
public void resolveImports(ResourceManager aResourceManager) throws InvalidXMLException {
- resolveImports(new TreeSet(), aResourceManager);
+ resolveImports(new TreeSet<String>(), aResourceManager);
}
- public void resolveImports(Collection aAlreadyImportedURLs, ResourceManager aResourceManager)
+ public void resolveImports(Collection<String> aAlreadyImportedURLs, ResourceManager aResourceManager)
throws InvalidXMLException {
// add our own URL, if known, to the collection of already imported URLs
if (getSourceUrl() != null) {
aAlreadyImportedURLs.add(getSourceUrl().toString());
}
- List importedResources = new ArrayList();
- List importedBindings = new ArrayList();
+ List<ExternalResourceDescription> importedResources = new ArrayList<ExternalResourceDescription>();
+ List<ExternalResourceBinding> importedBindings = new ArrayList<ExternalResourceBinding>();
Import[] imports = getImports();
for (int i = 0; i < imports.length; i++) {
// make sure Import's relative path base is set, to allow for users who create
@@ -330,8 +330,8 @@
this.setImports(new Import[0]);
}
- private void resolveImport(URL aURL, Collection aAlreadyImportedURLs,
- Collection aResultResources, Collection aResultBindings, ResourceManager aResourceManager)
+ private void resolveImport(URL aURL, Collection<String> aAlreadyImportedURLs,
+ Collection<ExternalResourceDescription> aResultResources, Collection<ExternalResourceBinding> aResultBindings, ResourceManager aResourceManager)
throws InvalidXMLException, IOException {
XMLInputSource input = new XMLInputSource(aURL);
ResourceManagerConfiguration desc = UIMAFramework.getXMLParser()
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java Wed Aug 12 15:08:48 2009
@@ -23,6 +23,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import java.util.Map.Entry;
import org.apache.uima.resource.ResourceConfigurationException;
import org.apache.uima.resource.ResourceManager;
@@ -235,13 +236,13 @@
if (nvps.length > 0) {
validateConfigurationParameterSettings(nvps, null, cfgParamDecls);
} else {
- Map settingsForGroups = cfgParamSettings.getSettingsForGroups();
- Set entrySet = settingsForGroups.entrySet();
- Iterator it = entrySet.iterator();
+ Map<String, NameValuePair[]> settingsForGroups = cfgParamSettings.getSettingsForGroups();
+ Set<Map.Entry<String, NameValuePair[]>> entrySet = settingsForGroups.entrySet();
+ Iterator<Entry<String, NameValuePair[]>> it = entrySet.iterator();
while (it.hasNext()) {
- Map.Entry entry = (Map.Entry) it.next();
- String groupName = (String) entry.getKey();
- nvps = (NameValuePair[]) entry.getValue();
+ Map.Entry<String, NameValuePair[]> entry = it.next();
+ String groupName = entry.getKey();
+ nvps = entry.getValue();
if (nvps != null) {
validateConfigurationParameterSettings(nvps, groupName, cfgParamDecls);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java Wed Aug 12 15:08:48 2009
@@ -42,8 +42,6 @@
/**
* Reference implementation of {@link TypePriorities}.
- *
- *
*/
public class TypePriorities_impl extends MetaDataObject_impl implements TypePriorities {
@@ -59,7 +57,7 @@
private Import[] mImports = new Import[0];
- private ArrayList mPriorityLists = new ArrayList();
+ private List<TypePriorityList> mPriorityLists = new ArrayList<TypePriorityList>();
/**
* @see org.apache.uima.resource.ResourceMetaData#getName()
@@ -187,21 +185,21 @@
* @see org.apache.uima.resource.metadata.TypeSystemDescription#resolveImports()
*/
public void resolveImports() throws InvalidXMLException {
- resolveImports(new TreeSet(), UIMAFramework.newDefaultResourceManager());
+ resolveImports(new TreeSet<String>(), UIMAFramework.newDefaultResourceManager());
}
public void resolveImports(ResourceManager aResourceManager) throws InvalidXMLException {
- resolveImports(new TreeSet(), aResourceManager);
+ resolveImports(new TreeSet<String>(), aResourceManager);
}
- public void resolveImports(Collection aAlreadyImportedTypePrioritiesURLs,
+ public void resolveImports(Collection<String> aAlreadyImportedTypePrioritiesURLs,
ResourceManager aResourceManager) throws InvalidXMLException {
// add our own URL, if known, to the collection of already imported URLs
if (getSourceUrl() != null) {
aAlreadyImportedTypePrioritiesURLs.add(getSourceUrl().toString());
}
- List importedPriorityLists = new ArrayList();
+ List<TypePriorityList> importedPriorityLists = new ArrayList<TypePriorityList>();
Import[] imports = getImports();
for (int i = 0; i < imports.length; i++) {
// make sure Import's relative path base is set, to allow for users who create
@@ -239,8 +237,8 @@
this.setImports(new Import[0]);
}
- private void resolveImport(URL aURL, Collection aAlreadyImportedTypePrioritiesURLs,
- Collection aResults, ResourceManager aResourceManager) throws InvalidXMLException,
+ private void resolveImport(URL aURL, Collection<String> aAlreadyImportedTypePrioritiesURLs,
+ Collection<TypePriorityList> aResults, ResourceManager aResourceManager) throws InvalidXMLException,
IOException {
//check the import cache
TypePriorities desc;
@@ -282,10 +280,10 @@
*/
public Object clone() {
TypePriorities_impl clone = (TypePriorities_impl) super.clone();
- clone.mPriorityLists = new ArrayList();
- Iterator priListIter = mPriorityLists.iterator();
+ clone.mPriorityLists = new ArrayList<TypePriorityList>();
+ Iterator<TypePriorityList> priListIter = mPriorityLists.iterator();
while (priListIter.hasNext()) {
- TypePriorityList priList = (TypePriorityList) priListIter.next();
+ TypePriorityList priList = priListIter.next();
clone.addPriorityList((TypePriorityList) priList.clone());
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorityList_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorityList_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorityList_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorityList_impl.java Wed Aug 12 15:08:48 2009
@@ -20,7 +20,7 @@
package org.apache.uima.resource.metadata.impl;
import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.List;
import org.apache.uima.resource.metadata.TypePriorityList;
@@ -33,7 +33,7 @@
static final long serialVersionUID = 4700170375564691096L;
- private ArrayList mTypeNames = new ArrayList();
+ private List<String> mTypeNames = new ArrayList<String>();
/**
* @see org.apache.uima.analysis_engine.metadata.TypePriorityList#getTypes()
@@ -75,10 +75,8 @@
public Object clone() {
TypePriorityList_impl clone = (TypePriorityList_impl) super.clone();
- clone.mTypeNames = new ArrayList();
- Iterator typeNameIter = mTypeNames.iterator();
- while (typeNameIter.hasNext()) {
- String name = (String) typeNameIter.next();
+ clone.mTypeNames = new ArrayList<String>();
+ for (String name : mTypeNames) {
clone.addType(name);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java?rev=803550&r1=803549&r2=803550&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java Wed Aug 12 15:08:48 2009
@@ -200,21 +200,21 @@
* @see org.apache.uima.resource.metadata.TypeSystemDescription#resolveImports()
*/
public void resolveImports() throws InvalidXMLException {
- resolveImports(new TreeSet(), UIMAFramework.newDefaultResourceManager());
+ resolveImports(new TreeSet<String>(), UIMAFramework.newDefaultResourceManager());
}
public void resolveImports(ResourceManager aResourceManager) throws InvalidXMLException {
- resolveImports(new TreeSet(), aResourceManager);
+ resolveImports(new TreeSet<String>(), aResourceManager);
}
- public void resolveImports(Collection aAlreadyImportedTypeSystemURLs,
+ public void resolveImports(Collection<String> aAlreadyImportedTypeSystemURLs,
ResourceManager aResourceManager) throws InvalidXMLException {
// add our own URL, if known, to the collection of already imported URLs
if (getSourceUrl() != null) {
aAlreadyImportedTypeSystemURLs.add(getSourceUrl().toString());
}
- List importedTypes = new ArrayList();
+ List<TypeDescription> importedTypes = new ArrayList<TypeDescription>();
Import[] imports = getImports();
for (int i = 0; i < imports.length; i++) {
// make sure Import's relative path base is set, to allow for users who create
@@ -249,8 +249,8 @@
this.setImports(new Import[0]);
}
- private void resolveImport(URL aURL, Collection aAlreadyImportedTypeSystemURLs,
- Collection aResults, ResourceManager aResourceManager) throws InvalidXMLException,
+ private void resolveImport(URL aURL, Collection<String> aAlreadyImportedTypeSystemURLs,
+ Collection<TypeDescription> aResults, ResourceManager aResourceManager) throws InvalidXMLException,
IOException {
//check the import cache
TypeSystemDescription desc;