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/19 19:08:51 UTC
svn commit: r805882 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource:
./ impl/ service/impl/
Author: joern
Date: Wed Aug 19 17:08:50 2009
New Revision: 805882
URL: http://svn.apache.org/viewvc?rev=805882&view=rev
Log:
UIMA-1504 Generify the additionalParams Map through the uimaj-core codebase
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_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/service/impl/ResourceService_impl.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java?rev=805882&r1=805881&r2=805882&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java Wed Aug 19 17:08:50 2009
@@ -72,7 +72,7 @@
* @throws UIMA_IllegalStateException
* if this method is called more than once on a single Resource instance.
*/
- public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
+ public boolean initialize(ResourceSpecifier aSpecifier, Map<String, Object> aAdditionalParams)
throws ResourceInitializationException;
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java?rev=805882&r1=805881&r2=805882&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java Wed Aug 19 17:08:50 2009
@@ -218,7 +218,7 @@
* if an initialization failure occurs
*/
public void initializeExternalResources(ResourceManagerConfiguration aConfiguration,
- String aQualifiedContextName, Map aAdditionalParams)
+ String aQualifiedContextName, Map<String, Object> aAdditionalParams)
throws ResourceInitializationException;
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java?rev=805882&r1=805881&r2=805882&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java Wed Aug 19 17:08:50 2009
@@ -58,7 +58,7 @@
* @see org.apache.uima.resource.Resource#initialize(org.apache.uima.resource.ResourceSpecifier,
* java.util.Map)
*/
- public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
+ public boolean initialize(ResourceSpecifier aSpecifier, Map<String, Object> aAdditionalParams)
throws ResourceInitializationException {
// get name of resource, to be used in error messages
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java?rev=805882&r1=805881&r2=805882&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java Wed Aug 19 17:08:50 2009
@@ -64,7 +64,7 @@
*
* @see org.apache.uima.resource.Resource#initialize(ResourceSpecifier)
*/
- public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
+ public boolean initialize(ResourceSpecifier aSpecifier, Map<String, Object> aAdditionalParams)
throws ResourceInitializationException {
// aSpecifier must be a ConfigurableDataResourceSpecifier
if (!(aSpecifier instanceof ConfigurableDataResourceSpecifier)) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java?rev=805882&r1=805881&r2=805882&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java Wed Aug 19 17:08:50 2009
@@ -65,7 +65,7 @@
*
* @see org.apache.uima.resource.Resource#initialize(ResourceSpecifier)
*/
- public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
+ public boolean initialize(ResourceSpecifier aSpecifier, Map<String, Object> aAdditionalParams)
throws ResourceInitializationException {
// aSpecifier must be a FileResourceSpecifier
if (!(aSpecifier instanceof FileResourceSpecifier))
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java?rev=805882&r1=805881&r2=805882&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java Wed Aug 19 17:08:50 2009
@@ -47,13 +47,13 @@
private String mFileUrlSuffix;
/** Initialization parameters to be passed to DataResources. */
- private Map mResourceInitParams;
+ private Map<String, Object> mResourceInitParams;
/**
* @see org.apache.uima.resource.Resource#initialize(org.apache.uima.resource.ResourceSpecifier,
* java.util.Map)
*/
- public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
+ public boolean initialize(ResourceSpecifier aSpecifier, Map<String, Object> aAdditionalParams)
throws ResourceInitializationException {
// aSpecifier must be a FileLanguageResourceSpecifier
if (!(aSpecifier instanceof FileLanguageResourceSpecifier))
@@ -67,7 +67,7 @@
mFileUrlSuffix = spec.getFileUrlSuffix();
// store initialization parameters to be passed on to DataReources
- mResourceInitParams = (aAdditionalParams == null) ? new HashMap() : new HashMap(
+ mResourceInitParams = (aAdditionalParams == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(
aAdditionalParams);
return true;
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=805882&r1=805881&r2=805882&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 19 17:08:50 2009
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -183,7 +182,7 @@
// try to instantiate dummy resource - this checks config params
// and resources
DummyResource dummy = new DummyResource();
- Map params = new HashMap();
+ Map<String, Object> params = new HashMap<String, Object>();
params.put(Resource.PARAM_RESOURCE_MANAGER, aResourceManager);
dummy.initialize(this, params);
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=805882&r1=805881&r2=805882&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 19 17:08:50 2009
@@ -67,7 +67,7 @@
/**
* Map from qualified key names (declared in resource dependency XML) to Resource objects.
*/
- protected Map mResourceMap = Collections.synchronizedMap(new HashMap());
+ protected Map<String, Object> mResourceMap = Collections.synchronizedMap(new HashMap<String, Object>());
/**
* Internal map from resource names (declared in resource declaration XML) to ResourceRegistration
@@ -406,7 +406,7 @@
* java.lang.String, java.util.Map)
*/
public void initializeExternalResources(ResourceManagerConfiguration aConfiguration,
- String aQualifiedContextName, Map aAdditionalParams)
+ String aQualifiedContextName, Map<String, Object> aAdditionalParams)
throws ResourceInitializationException {
// register resources
ExternalResourceDescription[] resources = aConfiguration.getExternalResources();
@@ -530,9 +530,9 @@
* Instantiates a resource and inserts it in the internal resource map.
*/
private void registerResource(String aName, ExternalResourceDescription aResourceDescription,
- String aDefiningContext, Map aResourceInitParams) throws ResourceInitializationException {
+ String aDefiningContext, Map<String, Object> aResourceInitParams) throws ResourceInitializationException {
// add the relative path resolver to the resource init. params
- Map initParams = (aResourceInitParams == null) ? new HashMap() : new HashMap(
+ Map<String, Object> initParams = (aResourceInitParams == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(
aResourceInitParams);
initParams.put(DataResource.PARAM_RELATIVE_PATH_RESOLVER, getRelativePathResolver());
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java?rev=805882&r1=805881&r2=805882&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java Wed Aug 19 17:08:50 2009
@@ -51,7 +51,7 @@
* @param aResourceInitParams
* additional parameters to be passed on to the Resource Factory.
*/
- public void initialize(ResourceSpecifier aResourceSpecifier, Map aResourceInitParams)
+ public void initialize(ResourceSpecifier aResourceSpecifier, Map<String, Object> aResourceInitParams)
throws ResourceInitializationException {
// create Resource
mResource = UIMAFramework.produceResource(getResourceClass(), aResourceSpecifier,