You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2014/11/23 20:35:57 UTC
svn commit: r1641249 - in
/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: jcas/
jcas/impl/ pear/tools/ pear/util/ resource/impl/ resource/metadata/impl/
Author: schor
Date: Sun Nov 23 19:35:56 2014
New Revision: 1641249
URL: http://svn.apache.org/r1641249
Log:
no Jira - clean up unneeded casts, unnecessary imports, compare logic tests between boolean and true/false, replace a loop with arraycopy
Modified:
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceState_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObjectSerializer_indent.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObjectSerializer_plain.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java Sun Nov 23 19:35:56 2014
@@ -45,7 +45,6 @@ import org.apache.uima.cas.impl.LowLevel
import org.apache.uima.cas.impl.LowLevelIndexRepository;
import org.apache.uima.cas.text.AnnotationIndex;
import org.apache.uima.jcas.cas.FSArray;
-import org.apache.uima.jcas.cas.FloatArray;
import org.apache.uima.jcas.cas.IntegerArray;
import org.apache.uima.jcas.cas.Sofa;
import org.apache.uima.jcas.cas.StringArray;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java Sun Nov 23 19:35:56 2014
@@ -519,7 +519,7 @@ public class JCasImpl extends AbstractCa
instantiateJCas_Types(cl);
}
final JCasSharedView sv = this.sharedView;
- sv.cAddr2Jfs = (JCasHashMap) sv.cAddr2JfsByClassLoader.get(cl);
+ sv.cAddr2Jfs = sv.cAddr2JfsByClassLoader.get(cl);
if (null == sv.cAddr2Jfs) {
// initial size low because this is the use case where a Pear isolation is happening,
// it is more likely that the PEAR is only doing a subset of the JCas things
@@ -676,7 +676,7 @@ public class JCasImpl extends AbstractCa
Type topType = ts.getTopType();
Type superType = null;
while (typeIt.hasNext()) {
- Type t = (Type) typeIt.next();
+ Type t = typeIt.next();
if (builtInsWithNoJCas.contains(t.getName()))
continue;
// comment here
@@ -1070,7 +1070,7 @@ public class JCasImpl extends AbstractCa
sv.fsArray0L = null;
sv.integerArray0L = null;
}
- sv.cAddr2Jfs = (JCasHashMap) sv.cAddr2JfsByClassLoader
+ sv.cAddr2Jfs = sv.cAddr2JfsByClassLoader
.get(((CASImpl) cas).getJCasClassLoader());
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationController.java Sun Nov 23 19:35:56 2014
@@ -663,7 +663,7 @@ public class InstallationController {
Hashtable<String, ComponentInfo> dlgComponents = insdObject.getDelegateComponents();
Enumeration<String> dlgCompIds = dlgComponents.keys();
while (dlgCompIds.hasMoreElements()) {
- String dlgCompId = (String) dlgCompIds.nextElement();
+ String dlgCompId = dlgCompIds.nextElement();
if (!deleteInstalledFiles(dlgCompId, parentDir, true))
done = false;
}
@@ -1446,7 +1446,7 @@ public class InstallationController {
// process next delegate component
String dlgId = dlgIdList.nextElement();
String dlgRootPath = _installationTable.get(dlgId);
- InstallationDescriptor dlgInsD = (InstallationDescriptor) _installationInsDs.get(dlgId);
+ InstallationDescriptor dlgInsD = _installationInsDs.get(dlgId);
String dlgClassPath = buildComponentClassPath(dlgRootPath, dlgInsD, true);
if (dlgClassPath.length() > 0) {
if (cpBuffer.length() > 0
@@ -1481,7 +1481,7 @@ public class InstallationController {
// process next delegate component
String dlgId = dlgIdList.nextElement();
String dlgRootPath = _installationTable.get(dlgId);
- InstallationDescriptor dlgInsD = (InstallationDescriptor) _installationInsDs.get(dlgId);
+ InstallationDescriptor dlgInsD = _installationInsDs.get(dlgId);
String dlgPath = buildComponentPath(dlgRootPath, dlgInsD);
if (dlgPath.length() > 0) {
if (pBuffer.length() > 0
@@ -1513,8 +1513,8 @@ public class InstallationController {
Enumeration<String> dlgIdList = _installationTable.keys();
while (dlgIdList.hasMoreElements()) {
// process next delegate component
- String dlgId = (String) dlgIdList.nextElement();
- InstallationDescriptor dlgInsD = (InstallationDescriptor) _installationInsDs.get(dlgId);
+ String dlgId = dlgIdList.nextElement();
+ InstallationDescriptor dlgInsD = _installationInsDs.get(dlgId);
Properties dlgEnvVars = buildTableOfEnvVars(dlgInsD);
envVars = StringUtil.appendProperties(envVars, dlgEnvVars, false);
}
@@ -1841,7 +1841,7 @@ public class InstallationController {
String id = dlgIdList.next();
String idRoot = LocalInstallationAgent.COMP_ROOT_PREFIX + id
+ LocalInstallationAgent.COMP_ROOT_SUFFIX;
- packageConfig.setProperty(idRoot, ((String) _installationTable.get(id)).replace('\\', '/'));
+ packageConfig.setProperty(idRoot, _installationTable.get(id).replace('\\', '/'));
}
// save pear config file
OutputStream oStream = null;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java Sun Nov 23 19:35:56 2014
@@ -724,7 +724,7 @@ public class InstallationDescriptor impl
* @return The specifications of the given network component parameter.
*/
public synchronized Properties getMainComponentNetworkParam(String paramName) {
- return (_mainComponent != null && _mainComponent.networkParams != null) ? (Properties) _mainComponent.networkParams
+ return (_mainComponent != null && _mainComponent.networkParams != null) ? _mainComponent.networkParams
.get(paramName)
: null;
}
@@ -798,7 +798,7 @@ public class InstallationDescriptor impl
*/
public synchronized void setDelegateComponentDesc(String id, String descFilePath) {
String dlgId = id.trim();
- ComponentInfo dCompInfo = (ComponentInfo) _delegateComponents.get(dlgId);
+ ComponentInfo dCompInfo = _delegateComponents.get(dlgId);
if (dCompInfo != null) {
if (dCompInfo.rootDirPath == null) // set relative path
dCompInfo.descFilePath = descFilePath.trim().replace('\\', '/');
@@ -820,7 +820,7 @@ public class InstallationDescriptor impl
*/
public synchronized void setDelegateComponentName(String id, String name) {
String dlgId = id.trim();
- ComponentInfo dCompInfo = (ComponentInfo) _delegateComponents.get(dlgId);
+ ComponentInfo dCompInfo = _delegateComponents.get(dlgId);
if (dCompInfo != null)
dCompInfo.name = name.trim();
}
@@ -837,7 +837,7 @@ public class InstallationDescriptor impl
*/
public synchronized void setDelegateComponentProperty(String id, String propName, String propValue) {
String dlgId = id.trim();
- ComponentInfo dCompInfo = (ComponentInfo) _delegateComponents.get(dlgId);
+ ComponentInfo dCompInfo = _delegateComponents.get(dlgId);
if (dCompInfo != null) {
if (dCompInfo.props == null)
dCompInfo.props = new Properties();
@@ -855,7 +855,7 @@ public class InstallationDescriptor impl
*/
public synchronized void setDelegateComponentRoot(String id, String rootDirPath) {
String dlgId = id.trim();
- ComponentInfo dCompInfo = (ComponentInfo) _delegateComponents.get(dlgId);
+ ComponentInfo dCompInfo = _delegateComponents.get(dlgId);
if (dCompInfo != null) {
dCompInfo.rootDirPath = rootDirPath.trim().replace('\\', '/');
// substitute $dlg_comp_id$root macros in the
@@ -1071,7 +1071,7 @@ public class InstallationDescriptor impl
// substitute $main_root macros in all specs of actions
Iterator<ActionInfo> list = getInstallationActions().iterator();
while (list.hasNext()) {
- ActionInfo action = (ActionInfo) list.next();
+ ActionInfo action = list.next();
Enumeration<Object> keys = action.params.keys();
while (keys.hasMoreElements()) {
String key = (String) keys.nextElement();
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptorHandler.java Sun Nov 23 19:35:56 2014
@@ -286,7 +286,7 @@ public class InstallationDescriptorHandl
oWriter.println();
Iterator<String> nameList = netParamNames.iterator();
while (nameList.hasNext()) {
- String name = (String) nameList.next();
+ String name = nameList.next();
Properties attributes = insdObject.getMainComponentNetworkParam(name);
XMLUtil.printXMLElement(name, attributes, null, oWriter, 3);
oWriter.println();
@@ -344,7 +344,7 @@ public class InstallationDescriptorHandl
oWriter.println();
// 3rd level elements
String dlgId = dlgList.next();
- InstallationDescriptor.ComponentInfo dlgInfo = (InstallationDescriptor.ComponentInfo) dlgTable
+ InstallationDescriptor.ComponentInfo dlgInfo = dlgTable
.get(dlgId);
XMLUtil.printXMLElement(ID_TAG, dlgId, oWriter, 3);
oWriter.println();
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationProcessor.java Sun Nov 23 19:35:56 2014
@@ -352,7 +352,7 @@ public class InstallationProcessor {
// perform required actions
Iterator<InstallationDescriptor.ActionInfo> actionList = _insdObject.getInstallationActions().iterator();
while (actionList.hasNext()) {
- InstallationDescriptor.ActionInfo action = (InstallationDescriptor.ActionInfo) actionList
+ InstallationDescriptor.ActionInfo action = actionList
.next();
// substitute string 'variables' in action parameters
substituteStringVariablesInAction(action.params);
@@ -404,8 +404,8 @@ public class InstallationProcessor {
// substitute '$dlg_comp_id$root'
regexList = _pathSubstitutionTable.keys();
while (regexList.hasMoreElements()) {
- String regex = (String) regexList.nextElement();
- String replacement = (String) _pathSubstitutionTable.get(regex);
+ String regex = regexList.nextElement();
+ String replacement = _pathSubstitutionTable.get(regex);
paramValue = paramValue.replaceAll(regex, StringUtil.toRegExpReplacement(replacement));
}
// reset (modified) property value
@@ -457,8 +457,8 @@ public class InstallationProcessor {
// substitute '$dlg_comp__id$root'
regexList = _pathSubstitutionTable.keys();
while (regexList.hasMoreElements()) {
- String regex = (String) regexList.nextElement();
- replacement = (String) _pathSubstitutionTable.get(regex);
+ String regex = regexList.nextElement();
+ replacement = _pathSubstitutionTable.get(regex);
FileUtil.replaceStringInFile(file, regex, replacement);
}
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java Sun Nov 23 19:35:56 2014
@@ -156,7 +156,7 @@ public class LocalInstallationAgent {
// substitute $comp_id$root macros for all delegates
Iterator<String> idList = insdObject.getDelegateComponents().keySet().iterator();
while (idList.hasNext()) {
- String id = (String) idList.next();
+ String id = idList.next();
String idRoot = COMP_ROOT_PREFIX + id + COMP_ROOT_SUFFIX;
String compRootPath = packageConfig.getProperty(idRoot);
// substitute '$dlg_comp_id$root_rel'
@@ -346,7 +346,7 @@ public class LocalInstallationAgent {
// backup and localize files in desc dir
dirList = descDirFiles.iterator();
while (dirList.hasNext()) {
- File orgFile = (File) dirList.next();
+ File orgFile = dirList.next();
String bakFileName = orgFile.getName().concat(BACKUP_FILE_SUFFIX);
File bakFile = new File(orgFile.getParent(), bakFileName);
if (FileUtil.copyFile(orgFile, bakFile)) {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java Sun Nov 23 19:35:56 2014
@@ -610,7 +610,7 @@ public class FileUtil {
// add directories to the list
Enumeration<JarEntry> entries = archive.entries();
while (entries.hasMoreElements()) {
- JarEntry entry = (JarEntry) entries.nextElement();
+ JarEntry entry = entries.nextElement();
File file = new File(rootDir, entry.getName());
if (!entry.isDirectory())
listOfFiles.add(file);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java Sun Nov 23 19:35:56 2014
@@ -91,7 +91,7 @@ public class UIMAUtil {
* descriptor file.
*/
public static Exception getLastErrorForXmlDesc(File xmlDescFile) {
- return (Exception) __errTableByUri.get(xmlDescFile.getAbsolutePath());
+ return __errTableByUri.get(xmlDescFile.getAbsolutePath());
}
/**
@@ -104,7 +104,7 @@ public class UIMAUtil {
* descriptor URL.
*/
public static Exception getLastErrorForXmlDesc(URL xmlDescUrl) {
- return (Exception) __errTableByUri.get(xmlDescUrl.toString());
+ return __errTableByUri.get(xmlDescUrl.toString());
}
/**
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java Sun Nov 23 19:35:56 2014
@@ -165,7 +165,7 @@ public class CasManager_impl implements
* @see org.apache.uima.resource.CasManager#getCAS(org.apache.uima.analysis_engine.AnalysisEngine)
*/
public CAS getCas(String aRequestorContextName) {
- CasPool pool = (CasPool) mRequestorToCasPoolMap.get(aRequestorContextName);
+ CasPool pool = mRequestorToCasPoolMap.get(aRequestorContextName);
if (pool == null) {
throw new UIMARuntimeException(UIMARuntimeException.REQUESTED_TOO_MANY_CAS_INSTANCES,
new Object[] { aRequestorContextName, "1", "0" });
@@ -187,7 +187,7 @@ public class CasManager_impl implements
CASImpl baseCas = (aCAS instanceof JCas) ? ((JCas)aCAS).getCasImpl().getBaseCAS()
: ((CASImpl)aCAS).getBaseCAS();
- CasPool pool = (CasPool) mCasToCasPoolMap.get(baseCas);
+ CasPool pool = mCasToCasPoolMap.get(baseCas);
if (pool == null) {
// CAS doesn't belong to this CasManager!
throw new UIMARuntimeException(UIMARuntimeException.CAS_RELEASED_TO_WRONG_CAS_MANAGER,
@@ -231,7 +231,7 @@ public class CasManager_impl implements
Properties aPerformanceTuningSettings) throws ResourceInitializationException {
int poolSize = getCasPoolSize(aRequestorContextName, aMinimumSize);
if (poolSize > 0) {
- CasPool pool = (CasPool) mRequestorToCasPoolMap.get(aRequestorContextName);
+ CasPool pool = mRequestorToCasPoolMap.get(aRequestorContextName);
if (pool == null) {
// this requestor hasn't requested a CAS before
pool = new CasPool(poolSize, this, aPerformanceTuningSettings);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java Sun Nov 23 19:35:56 2014
@@ -22,10 +22,8 @@ package org.apache.uima.resource.impl;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.uima.UIMAFramework;
import org.apache.uima.UIMARuntimeException;
@@ -38,7 +36,6 @@ import org.apache.uima.resource.metadata
import org.apache.uima.resource.metadata.ConfigurationParameterDeclarations;
import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
import org.apache.uima.resource.metadata.NameValuePair;
-import org.apache.uima.resource.metadata.OperationalProperties;
import org.apache.uima.resource.metadata.ResourceMetaData;
import org.apache.uima.util.Settings;
@@ -186,7 +183,7 @@ public abstract class ConfigurationManag
// if that fails, look up in default group if one is defined
String defaultGroup = null;
- ConfigurationParameterDeclarations decls = (ConfigurationParameterDeclarations) mContextNameToParamDeclsMap
+ ConfigurationParameterDeclarations decls = mContextNameToParamDeclsMap
.get(computeParentContextName(aQualifiedParameterName));
if (decls != null) {
defaultGroup = decls.getDefaultGroupName();
@@ -205,7 +202,7 @@ public abstract class ConfigurationManag
*/
public Object getConfigParameterValue(String aQualifiedParameterName, String aGroupName) {
// get parameter search strategy for this context
- ConfigurationParameterDeclarations decls = (ConfigurationParameterDeclarations) mContextNameToParamDeclsMap
+ ConfigurationParameterDeclarations decls = mContextNameToParamDeclsMap
.get(computeParentContextName(aQualifiedParameterName));
if (decls != null) {
return getConfigParameterValue(aQualifiedParameterName, aGroupName,
@@ -267,7 +264,7 @@ public abstract class ConfigurationManag
* @see org.apache.uima.resource.ConfigurationManager#getConfigParameterDeclarations(java.lang.String)
*/
public ConfigurationParameterDeclarations getConfigParameterDeclarations(String aContextName) {
- return (ConfigurationParameterDeclarations) mContextNameToParamDeclsMap.get(aContextName);
+ return mContextNameToParamDeclsMap.get(aContextName);
}
/*
@@ -278,7 +275,7 @@ public abstract class ConfigurationManag
*/
public ConfigurationParameterSettings getCurrentConfigParameterSettings(String aContextName) {
// get declarations
- ConfigurationParameterDeclarations decls = (ConfigurationParameterDeclarations) mContextNameToParamDeclsMap
+ ConfigurationParameterDeclarations decls = mContextNameToParamDeclsMap
.get(aContextName);
ConfigurationParameterSettings settings = UIMAFramework.getResourceSpecifierFactory()
@@ -389,7 +386,7 @@ public abstract class ConfigurationManag
* the complete name of that parameter is returned. Otherwise, null is returned.
*/
protected String getLink(String aCompleteName) {
- return (String) mLinkMap.get(aCompleteName);
+ return mLinkMap.get(aCompleteName);
}
/**
@@ -486,7 +483,7 @@ public abstract class ConfigurationManag
private void validateConfigurationParameterSettings(String aContext)
throws ResourceConfigurationException {
// get declarations
- ConfigurationParameterDeclarations decls = (ConfigurationParameterDeclarations) mContextNameToParamDeclsMap
+ ConfigurationParameterDeclarations decls = mContextNameToParamDeclsMap
.get(aContext);
// check that all required parameters have values
ConfigurationParameter[] params = decls.getConfigurationParameters();
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java Sun Nov 23 19:35:56 2014
@@ -450,7 +450,7 @@ public class ResourceManager_impl implem
String name = resources[i].getName();
// check for existing resource registration under this name
- ResourceRegistration registration = (ResourceRegistration) mInternalResourceRegistrationMap
+ ResourceRegistration registration = mInternalResourceRegistrationMap
.get(name);
if (registration == null) {
registerResource(name, resources[i], aQualifiedContextName, aAdditionalParams);
@@ -476,7 +476,7 @@ public class ResourceManager_impl implem
// apply bindings
ExternalResourceBinding[] bindings = aConfiguration.getExternalResourceBindings();
for (int i = 0; i < bindings.length; i++) {
- ResourceRegistration registration = (ResourceRegistration) mInternalResourceRegistrationMap
+ ResourceRegistration registration = mInternalResourceRegistrationMap
.get(bindings[i].getResourceName());
if (registration == null) {
throw new ResourceInitializationException(
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceState_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceState_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceState_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceState_impl.java Sun Nov 23 19:35:56 2014
@@ -19,7 +19,6 @@
package org.apache.uima.resource.impl;
-import org.apache.uima.resource.Resource_ImplBase;
import org.apache.uima.resource.metadata.NameValuePair;
/**
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/Capability_impl.java Sun Nov 23 19:35:56 2014
@@ -198,7 +198,7 @@ public class Capability_impl extends Met
// remove any existing MimeTypePrecondtiions
Iterator<Precondition> i = preconditions.iterator();
while (i.hasNext()) {
- Precondition p = (Precondition) i.next();
+ Precondition p = i.next();
if (p instanceof MimeTypePrecondition) {
i.remove();
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java Sun Nov 23 19:35:56 2014
@@ -118,7 +118,7 @@ public class ConfigurationParameterSetti
if (aGroupName == null) {
return getParameterValue(aParamName);
} else {
- NameValuePair[] nvps = (NameValuePair[]) mSettingsForGroups.get(aGroupName);
+ NameValuePair[] nvps = mSettingsForGroups.get(aGroupName);
if (nvps != null) {
for (int i = 0; i < nvps.length; i++) {
if (aParamName.equals(nvps[i].getName())) {
@@ -183,7 +183,7 @@ public class ConfigurationParameterSetti
} else {
if (aValue != null) // setting a value
{
- NameValuePair[] nvps = (NameValuePair[]) mSettingsForGroups.get(aGroupName);
+ NameValuePair[] nvps = mSettingsForGroups.get(aGroupName);
if (nvps == null) // create new group
{
NameValuePair newNVP = new NameValuePair_impl(aParamName, aValue);
@@ -204,7 +204,7 @@ public class ConfigurationParameterSetti
}
} else // clearing a value
{
- NameValuePair[] nvps = (NameValuePair[]) mSettingsForGroups.get(aGroupName);
+ NameValuePair[] nvps = mSettingsForGroups.get(aGroupName);
if (nvps != null) {
for (int i = 0; i < nvps.length; i++) {
if (aParamName.equals(nvps[i].getName())) {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameter_impl.java Sun Nov 23 19:35:56 2014
@@ -175,7 +175,7 @@ public class ConfigurationParameter_impl
* @see org.apache.uima.resource.metadata.ConfigurationParameter#getOverrides()
*/
public String[] getOverrides() {
- return (String[]) mOverrides.clone();
+ return mOverrides.clone();
}
/*
@@ -187,7 +187,7 @@ public class ConfigurationParameter_impl
if (aOverrides == null)
mOverrides = new String[0];
else
- mOverrides = (String[]) aOverrides.clone();
+ mOverrides = aOverrides.clone();
}
/*
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexCollection_impl.java Sun Nov 23 19:35:56 2014
@@ -242,7 +242,7 @@ public class FsIndexCollection_impl exte
+ importedIndexes.size()];
System.arraycopy(existingIndexes, 0, newIndexes, 0, existingIndexes.length);
for (int i = 0; i < importedIndexes.size(); i++) {
- newIndexes[existingIndexes.length + i] = (FsIndexDescription) importedIndexes.get(i);
+ newIndexes[existingIndexes.length + i] = importedIndexes.get(i);
}
this.setFsIndexes(newIndexes);
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java Sun Nov 23 19:35:56 2014
@@ -21,8 +21,6 @@ package org.apache.uima.resource.metadat
import org.apache.uima.internal.util.XMLUtils;
import org.apache.uima.resource.metadata.FsIndexKeyDescription;
-import org.apache.uima.resource.metadata.impl.MetaDataObject_impl.SerialContext;
-import org.apache.uima.resource.metadata.impl.MetaDataObject_impl.Serializer;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLParser;
import org.w3c.dom.Element;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObjectSerializer_indent.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObjectSerializer_indent.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObjectSerializer_indent.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObjectSerializer_indent.java Sun Nov 23 19:35:56 2014
@@ -30,7 +30,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
@@ -434,7 +433,7 @@ class MetaDataObjectSerializer_indent ex
if (!lineEnd.equals("\n")) {
cmt = cmt.replace("\n", lineEnd);
}
- ((LexicalHandler) cc).comment(cmt.toCharArray(), 0, cmt.length());
+ cc.comment(cmt.toCharArray(), 0, cmt.length());
} else {
String s = p.getTextContent();
cc.characters(s.toCharArray(), 0, s.length());
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObjectSerializer_plain.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObjectSerializer_plain.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObjectSerializer_plain.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObjectSerializer_plain.java Sun Nov 23 19:35:56 2014
@@ -19,7 +19,6 @@
package org.apache.uima.resource.metadata.impl;
-import org.apache.uima.util.XMLizable;
import org.w3c.dom.Node;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java Sun Nov 23 19:35:56 2014
@@ -36,7 +36,6 @@ import org.apache.uima.resource.metadata
import org.apache.uima.resource.metadata.ResourceManagerConfiguration;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLInputSource;
-import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
/**
@@ -320,7 +319,7 @@ public class ResourceManagerConfiguratio
+ importedResources.size()];
System.arraycopy(existingResources, 0, newResources, 0, existingResources.length);
for (int i = 0; i < importedResources.size(); i++) {
- newResources[existingResources.length + i] = (ExternalResourceDescription) importedResources
+ newResources[existingResources.length + i] = importedResources
.get(i);
}
this.setExternalResources(newResources);
@@ -335,7 +334,7 @@ public class ResourceManagerConfiguratio
+ importedBindings.size()];
System.arraycopy(existingBindings, 0, newBindings, 0, existingBindings.length);
for (int i = 0; i < importedBindings.size(); i++) {
- newBindings[existingBindings.length + i] = (ExternalResourceBinding) importedBindings.get(i);
+ newBindings[existingBindings.length + i] = importedBindings.get(i);
}
this.setExternalResourceBindings(newBindings);
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java Sun Nov 23 19:35:56 2014
@@ -22,8 +22,8 @@ package org.apache.uima.resource.metadat
import java.lang.reflect.Array;
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
import org.apache.uima.UIMAFramework;
import org.apache.uima.resource.ResourceConfigurationException;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java Sun Nov 23 19:35:56 2014
@@ -24,7 +24,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;
@@ -40,7 +39,6 @@ import org.apache.uima.resource.metadata
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLInputSource;
import org.apache.uima.util.XMLizable;
-import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
/**
@@ -252,7 +250,7 @@ public class TypePriorities_impl extends
+ importedPriorityLists.size()];
System.arraycopy(existingPriorityLists, 0, newPriorityLists, 0, existingPriorityLists.length);
for (int i = 0; i < importedPriorityLists.size(); i++) {
- newPriorityLists[existingPriorityLists.length + i] = (TypePriorityList) importedPriorityLists
+ newPriorityLists[existingPriorityLists.length + i] = importedPriorityLists
.get(i);
}
this.setPriorityLists(newPriorityLists);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java?rev=1641249&r1=1641248&r2=1641249&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeSystemDescription_impl.java Sun Nov 23 19:35:56 2014
@@ -246,7 +246,7 @@ public class TypeSystemDescription_impl
TypeDescription[] newTypes = new TypeDescription[existingTypes.length + importedTypes.size()];
System.arraycopy(existingTypes, 0, newTypes, 0, existingTypes.length);
for (int i = 0; i < importedTypes.size(); i++) {
- newTypes[existingTypes.length + i] = (TypeDescription) importedTypes.get(i);
+ newTypes[existingTypes.length + i] = importedTypes.get(i);
}
this.setTypes(newTypes);
}