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:27:08 UTC
svn commit: r1641247 - in
/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima:
analysis_component/ analysis_engine/asb/impl/ analysis_engine/impl/
analysis_engine/impl/compatibility/ analysis_engine/metadata/impl/
analysis_engine/service/impl/ c...
Author: schor
Date: Sun Nov 23 19:27:07 2014
New Revision: 1641247
URL: http://svn.apache.org/r1641247
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/analysis_component/CasMultiplier_ImplBase.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasMultiplier_ImplBase.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsType.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/CapabilityLanguageFlow_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/ServiceDataCargo.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanConstraint.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSeqAddrMaps.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasMultiplier_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasMultiplier_ImplBase.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasMultiplier_ImplBase.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/CasMultiplier_ImplBase.java Sun Nov 23 19:27:07 2014
@@ -107,7 +107,7 @@ public abstract class CasMultiplier_Impl
* @return an empty CAS
*/
protected final CAS getEmptyCAS() {
- return (CAS) getContext().getEmptyCas(CAS.class);
+ return getContext().getEmptyCas(CAS.class);
}
/**
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasMultiplier_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasMultiplier_ImplBase.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasMultiplier_ImplBase.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_component/JCasMultiplier_ImplBase.java Sun Nov 23 19:27:07 2014
@@ -83,6 +83,6 @@ public abstract class JCasMultiplier_Imp
* @return an empty JCas
*/
protected final JCas getEmptyJCas() {
- return (JCas) getContext().getEmptyCas(JCas.class);
+ return getContext().getEmptyCas(JCas.class);
}
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java Sun Nov 23 19:27:07 2014
@@ -505,7 +505,7 @@ public class ASB_impl extends Resource_I
if (casIteratorStack.isEmpty()) {
return null; // there are no more CAS Iterators to obtain CASes from
}
- StackFrame frame = (StackFrame) casIteratorStack.peek();
+ StackFrame frame = casIteratorStack.peek();
try {
if (frame.casIterator.hasNext()) {
cas = frame.casIterator.next();
@@ -553,7 +553,7 @@ public class ASB_impl extends Resource_I
//Simple Step
if (nextStep instanceof SimpleStep) {
String nextAeKey = ((SimpleStep) nextStep).getAnalysisEngineKey();
- AnalysisEngine nextAe = (AnalysisEngine) mComponentAnalysisEngineMap.get(nextAeKey);
+ AnalysisEngine nextAe = mComponentAnalysisEngineMap.get(nextAeKey);
if (nextAe != null) {
//check if we have to set result spec, to support capability language flow
if (nextStep instanceof SimpleStepWithResultSpec) {
@@ -612,7 +612,7 @@ public class ASB_impl extends Resource_I
String nextAeKey = destinations.get(0);
destinations.remove(0);
//execute this step as we would a single step
- AnalysisEngine nextAe = (AnalysisEngine) mComponentAnalysisEngineMap.get(nextAeKey);
+ AnalysisEngine nextAe = mComponentAnalysisEngineMap.get(nextAeKey);
if (nextAe != null) {
// invoke next AE in flow
CasIterator casIter = null;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java Sun Nov 23 19:27:07 2014
@@ -219,7 +219,7 @@ public class AggregateAnalysisEngine_imp
// now iterate over components and call their setResultSpecification methods
Iterator<AnalysisEngine> componentIter = _getASB().getComponentAnalysisEngines().values().iterator();
while (componentIter.hasNext()) {
- AnalysisEngine ae = (AnalysisEngine) componentIter.next();
+ AnalysisEngine ae = componentIter.next();
ae.setResultSpecification(resultSpecForComponents);
}
}
@@ -290,7 +290,7 @@ public class AggregateAnalysisEngine_imp
Map<String, AnalysisEngine> components = this._getASB().getComponentAnalysisEngines();
Iterator<AnalysisEngine> it = components.values().iterator();
while (it.hasNext()) {
- ConfigurableResource component = (ConfigurableResource) it.next();
+ ConfigurableResource component = it.next();
component.reconfigure();
}
//and the FlowController
@@ -332,7 +332,7 @@ public class AggregateAnalysisEngine_imp
//call components in the order specified in the flow
if (orderedNodes != null) {
for (int i = 0; i < orderedNodes.length; i++) {
- AnalysisEngine component = (AnalysisEngine)components.remove(orderedNodes[i]);
+ AnalysisEngine component = components.remove(orderedNodes[i]);
component.collectionProcessComplete();
}
}
@@ -610,7 +610,7 @@ public class AggregateAnalysisEngine_imp
if (ae instanceof AnalysisEngineImplBase) {
ProcessTrace subPT = ((AnalysisEngineImplBase) ae).buildProcessTraceFromMBeanStats();
if (subPT.getEvents().size() > 0) {
- procEvt.addSubEvent((ProcessTraceEvent) subPT.getEvents().get(0));
+ procEvt.addSubEvent(subPT.getEvents().get(0));
}
}
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java Sun Nov 23 19:27:07 2014
@@ -445,7 +445,7 @@ public class AnalysisEngineDescription_i
componentSpecifier = getFlowControllerDeclaration().getSpecifier();
} else {
try {
- componentSpecifier = (ResourceSpecifier) getDelegateAnalysisEngineSpecifiers().get(key);
+ componentSpecifier = getDelegateAnalysisEngineSpecifiers().get(key);
} catch (InvalidXMLException e) {
throw new ResourceInitializationException(e);
}
@@ -490,7 +490,7 @@ public class AnalysisEngineDescription_i
+ sofaMappings[s].getComponentSofaName();
String aggSofaName = sofaMappings[s].getAggregateSofaName();
// check for double-mapping
- String existingMapping = (String) sofamap.get(compoundKey);
+ String existingMapping = sofamap.get(compoundKey);
if (existingMapping != null && !existingMapping.equals(aggSofaName)) {
throw new ResourceInitializationException(
ResourceInitializationException.SOFA_MAPPING_CONFLICT, new Object[] {
@@ -539,7 +539,7 @@ public class AnalysisEngineDescription_i
// all component output sofas must be mapped to aggregate output sofas
String[] outputSofas = caps[i].getOutputSofas();
for (int j = 0; j < outputSofas.length; j++) {
- String aggSofa = (String) sofamap.get(componentKey + "@/@" + outputSofas[j]);
+ String aggSofa = sofamap.get(componentKey + "@/@" + outputSofas[j]);
if (aggSofa == null) // no declared mapping, name remains unchanged
{
aggSofa = outputSofas[j];
@@ -555,7 +555,7 @@ public class AnalysisEngineDescription_i
// all component input sofas must be mapped to aggregate input OR output sofas
String[] inputSofas = caps[i].getInputSofas();
for (int j = 0; j < inputSofas.length; j++) {
- String aggSofa = (String) sofamap.get(componentKey + "@/@" + inputSofas[j]);
+ String aggSofa = sofamap.get(componentKey + "@/@" + inputSofas[j]);
if (aggSofa == null) // no declared mapping, name remains unchanged
{
aggSofa = inputSofas[j];
@@ -569,7 +569,7 @@ public class AnalysisEngineDescription_i
}
// also check default text sofa
- String aggDefSofa = (String) sofamap.get(componentKey + "@/@" + CAS.NAME_DEFAULT_SOFA);
+ String aggDefSofa = sofamap.get(componentKey + "@/@" + CAS.NAME_DEFAULT_SOFA);
if (aggDefSofa != null) {
if (capabilitiesContainSofa(aggDefSofa, true)) {
correctlyMappedAggregateOutputs.add(aggDefSofa);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PearAnalysisEngineWrapper.java Sun Nov 23 19:27:07 2014
@@ -23,9 +23,9 @@ import java.io.IOException;
import java.net.MalformedURLException;
import java.util.HashMap;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.WeakHashMap;
-import java.util.Map.Entry;
import org.apache.uima.UIMAFramework;
import org.apache.uima.UimaContext;
@@ -44,7 +44,6 @@ import org.apache.uima.resource.Resource
import org.apache.uima.resource.ResourceConfigurationException;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceManager;
-import org.apache.uima.resource.ResourceManagerPearWrapper;
import org.apache.uima.resource.ResourceProcessException;
import org.apache.uima.resource.ResourceSpecifier;
import org.apache.uima.resource.impl.ResourceManager_impl;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/PrimitiveAnalysisEngine_impl.java Sun Nov 23 19:27:07 2014
@@ -46,7 +46,6 @@ import org.apache.uima.resource.Resource
import org.apache.uima.resource.ResourceCreationSpecifier;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceSpecifier;
-import org.apache.uima.resource.impl.ResourceCreationSpecifier_impl;
import org.apache.uima.resource.metadata.ProcessingResourceMetaData;
import org.apache.uima.resource.metadata.ResourceMetaData;
import org.apache.uima.util.Level;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/ResultSpecification_impl.java Sun Nov 23 19:27:07 2014
@@ -213,7 +213,7 @@ public final class ResultSpecification_i
private TypeOrFeature[] getResultTypesAndFeatures(boolean skipLanguageFilter, String language) {
List<TypeOrFeature> r = new ArrayList<TypeOrFeature>();
- if (rsTypesMap.nbrOfTypes() == 0 && needsCompilation == false) {
+ if (rsTypesMap.nbrOfTypes() == 0 && !needsCompilation) {
// being called on results of intersection
// probably by a test case, not a normal call
// attempt to construct a plausible representation
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsType.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsType.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsType.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/RsType.java Sun Nov 23 19:27:07 2014
@@ -19,6 +19,8 @@
package org.apache.uima.analysis_engine.impl;
+import static org.apache.uima.analysis_engine.impl.ResultSpecification_impl.equalsOrBothNull;
+
import java.util.ArrayList;
import java.util.List;
@@ -26,8 +28,6 @@ import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
-import static org.apache.uima.analysis_engine.impl.ResultSpecification_impl.equalsOrBothNull;
-
/**
* Holds types and/or features with language specs
*
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java Sun Nov 23 19:27:07 2014
@@ -38,7 +38,6 @@ import org.apache.uima.analysis_engine.m
import org.apache.uima.cas.AbstractCas;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.admin.CASMgr;
-import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.collection.CasConsumerDescription;
import org.apache.uima.impl.UimaContext_ImplBase;
import org.apache.uima.impl.Util;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnnotatorAdapter.java Sun Nov 23 19:27:07 2014
@@ -161,7 +161,7 @@ public class AnnotatorAdapter implements
*/
private ResultSpecification getResultSpecForLanguage(String language) {
// we cache this since it is called for each document
- ResultSpecification rs = (ResultSpecification) mLanguageToResultSpecMap.get(language);
+ ResultSpecification rs = mLanguageToResultSpecMap.get(language);
if (rs == null) {
TypeOrFeature[] tofs = mDefaultResultSpecification.getResultTypesAndFeatures(language);
if (tofs.length > 0) {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java Sun Nov 23 19:27:07 2014
@@ -192,7 +192,7 @@ public class CollectionReaderAdapter imp
*/
public AbstractCas next() throws AnalysisEngineProcessException {
// get a new CAS
- CAS cas = (CAS) mUimaContext.getEmptyCas(CAS.class);
+ CAS cas = mUimaContext.getEmptyCas(CAS.class);
// check if type system changed; if so, notify CollectionReader
checkTypeSystemChange(cas);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/AnalysisEngineMetaData_impl.java Sun Nov 23 19:27:07 2014
@@ -40,7 +40,6 @@ import org.apache.uima.util.InvalidXMLEx
import org.apache.uima.util.XMLParser;
import org.apache.uima.util.XMLParser.ParsingOptions;
import org.w3c.dom.Element;
-import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
/**
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/CapabilityLanguageFlow_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/CapabilityLanguageFlow_impl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/CapabilityLanguageFlow_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/metadata/impl/CapabilityLanguageFlow_impl.java Sun Nov 23 19:27:07 2014
@@ -85,7 +85,7 @@ public class CapabilityLanguageFlow_impl
String[] newFlow = new String[oldFlow.length];
for (int i = 0; i < oldFlow.length; i++) {
- String newID = (String) aIDMap.get(oldFlow[i]);
+ String newID = aIDMap.get(oldFlow[i]);
if (newID != null) {
newFlow[i] = newID;
} else {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/ServiceDataCargo.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/ServiceDataCargo.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/ServiceDataCargo.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/ServiceDataCargo.java Sun Nov 23 19:27:07 2014
@@ -23,10 +23,10 @@ import java.io.Serializable;
import org.apache.uima.analysis_engine.AnalysisProcessData;
import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.CASException;
import org.apache.uima.cas.admin.CASMgr;
import org.apache.uima.cas.impl.CASCompleteSerializer;
import org.apache.uima.cas.impl.Serialization;
-import org.apache.uima.cas.CASException;
import org.apache.uima.util.ProcessTrace;
/**
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanConstraint.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanConstraint.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanConstraint.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanConstraint.java Sun Nov 23 19:27:07 2014
@@ -49,13 +49,13 @@ public class BooleanConstraint extends P
}
Feature feat;
for (int i = 0; i < max; i++) {
- feat = fs.getType().getFeatureByBaseName((String) this.featNames.get(i));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(i));
if (feat == null) {
return false;
}
fs = fs.getFeatureValue(feat);
}
- feat = fs.getType().getFeatureByBaseName((String) this.featNames.get(max));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(max));
if (feat == null) {
return false;
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Sun Nov 23 19:27:07 2014
@@ -611,7 +611,7 @@ public class CASImpl extends AbstractCas
}
FSIndexRepository getSofaIndexRepository(int aSofaRef) {
- return (FSIndexRepositoryImpl) this.svd.sofa2indexMap.get(Integer.valueOf(aSofaRef));
+ return this.svd.sofa2indexMap.get(Integer.valueOf(aSofaRef));
}
void setSofaIndexRepository(SofaFS aSofa, FSIndexRepository indxRepos) {
@@ -692,7 +692,7 @@ public class CASImpl extends AbstractCas
private SofaFS getSofa(String sofaName) {
FSIterator<SofaFS> iterator = this.svd.baseCAS.getSofaIterator();
while (iterator.isValid()) {
- SofaFS sofa = (SofaFS) iterator.get();
+ SofaFS sofa = iterator.get();
if (sofaName.equals(getStringValue(((FeatureStructureImpl) sofa).getAddress(),
this.svd.casMetadata.ts.sofaIdFeatCode))) {
return sofa;
@@ -1601,7 +1601,7 @@ public class CASImpl extends AbstractCas
final Feature idFeat = getTypeSystem().getFeatureByFullName(CAS.FEATURE_FULL_NAME_SOFAID);
// Add FSs to index repository for each View
while (iterator.isValid()) {
- SofaFS sofa = (SofaFS) iterator.get();
+ SofaFS sofa = iterator.get();
String id = getLowLevelCAS().ll_getStringValue(((FeatureStructureImpl) sofa).getAddress(),
((FeatureImpl) idFeat).getCode());
if (CAS.NAME_DEFAULT_SOFA.equals(id)) {
@@ -1660,7 +1660,7 @@ public class CASImpl extends AbstractCas
// Register all Sofas
while (iterator.isValid()) {
- SofaFS sofa = (SofaFS) iterator.get();
+ SofaFS sofa = iterator.get();
String id = getLowLevelCAS().ll_getStringValue(((FeatureStructureImpl) sofa).getAddress(), idFeatCode);
if (CAS.NAME_DEFAULT_SOFA.equals(id)) {
this.registerInitialSofa();
@@ -2698,7 +2698,7 @@ public class CASImpl extends AbstractCas
// For internal use only
public CAS getView(int sofaNum) {
- return (CAS) this.svd.sofaNbr2ViewMap.get(Integer.valueOf(sofaNum));
+ return this.svd.sofaNbr2ViewMap.get(Integer.valueOf(sofaNum));
}
@@ -2753,7 +2753,7 @@ public class CASImpl extends AbstractCas
// For internal platform use only
CAS getInitialView() {
- CAS couldBeThis = (CAS) this.svd.sofaNbr2ViewMap.get(Integer.valueOf(1));
+ CAS couldBeThis = this.svd.sofaNbr2ViewMap.get(Integer.valueOf(1));
if (couldBeThis != null) {
return couldBeThis;
}
@@ -4250,7 +4250,7 @@ public class CASImpl extends AbstractCas
it.moveToNext();
}
for (int i = 0; i < list.size(); i++) {
- getIndexRepository().removeFS((FeatureStructure) list.get(i));
+ getIndexRepository().removeFS(list.get(i));
}
// Create a new document annotation.
AnnotationFS doc = createAnnotation(ts.docType, 0, length);
@@ -4281,7 +4281,7 @@ public class CASImpl extends AbstractCas
}
FSIterator<AnnotationFS> it = getAnnotationIndex(this.svd.casMetadata.ts.docType).iterator();
if (it.isValid()) {
- return (AnnotationFS) it.get();
+ return it.get();
}
return createDocumentAnnotation(0);
}
@@ -4581,7 +4581,7 @@ public class CASImpl extends AbstractCas
List<CAS> viewList = new ArrayList<CAS>();
FSIterator<SofaFS> sofaIter = getSofaIterator();
while (sofaIter.hasNext()) {
- SofaFS sofa = (SofaFS) sofaIter.next();
+ SofaFS sofa = sofaIter.next();
String sofaId = sofa.getSofaID();
if (sofaId.startsWith(absolutePrefix)) {
if ((sofaId.length() == absolutePrefix.length())
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java Sun Nov 23 19:27:07 2014
@@ -200,7 +200,7 @@ public class CASMgrSerializer implements
final Iterator<String> namesIt = ir.getLabels();
// Add the names to the list, filtering out auto-indexes.
while (namesIt.hasNext()) {
- String name = (String) namesIt.next();
+ String name = namesIt.next();
if (ir.getIndex(name).getIndexingStrategy() != FSIndex.DEFAULT_BAG_INDEX) {
names.add(name);
}
@@ -213,7 +213,7 @@ public class CASMgrSerializer implements
// Fill the name array.
for (int i = 0; i < numNames; i++) {
// Get the next label.
- label = (String) names.get(i);
+ label = names.get(i);
// Add the label.
this.indexNames[i] = label;
}
@@ -321,7 +321,7 @@ public class CASMgrSerializer implements
}
this.stringSubtypeValues = new String[strVals.size()];
for (int i = 0; i < strVals.size(); i++) {
- this.stringSubtypeValues[i] = (String) strVals.get(i);
+ this.stringSubtypeValues[i] = strVals.get(i);
}
}
@@ -383,9 +383,10 @@ public class CASMgrSerializer implements
private String[] getSubarray(String[] array, int from, int to) {
String[] sub = new String[to - from];
- for (int i = from; i < to; i++) {
- sub[i - from] = array[i];
- }
+ System.arraycopy(array, from, sub, 0, to-from);
+// for (int i = from; i < to; i++) {
+// sub[i - from] = array[i];
+// }
return sub;
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSeqAddrMaps.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSeqAddrMaps.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSeqAddrMaps.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSeqAddrMaps.java Sun Nov 23 19:27:07 2014
@@ -19,12 +19,8 @@
package org.apache.uima.cas.impl;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.uima.internal.util.IntVector;
import org.apache.uima.internal.util.rb_trees.Int2IntRBT;
-import org.apache.uima.internal.util.rb_trees.IntRedBlackTree;
/**
* Manage the conversion of Items (FSrefs) to relative sequential index number, and back
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java Sun Nov 23 19:27:07 2014
@@ -808,7 +808,7 @@ public class CasSerializerSupport {
// doing dynamic determination of multi-refs
if (alreadyVisited) {
return !multiRefFSs.contains(featVal); // enqueue in the "queue" section, first time this happens
- };
+ }
return true; // enqueue this item. May or may not be eventually written embedded
// but we enqueue to track multi-use
}
@@ -1207,7 +1207,7 @@ public class CasSerializerSupport {
public String getNameSpacePrefix(String uimaTypeName, String nsUri, int lastDotIndex) {
// determine what namespace prefix to use
- String prefix = (String) nsUriToPrefixMap.get(nsUri);
+ String prefix = nsUriToPrefixMap.get(nsUri);
if (prefix == null) {
if (lastDotIndex != -1) { // have namespace
int secondLastDotIndex = uimaTypeName.lastIndexOf('.', lastDotIndex-1);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java Sun Nov 23 19:27:07 2014
@@ -333,7 +333,7 @@ public class DebugFSLogicalStructure {
}
private static FeatureStructure[] getIndexContents(FSIterator<? extends FeatureStructure> it) {
- return (FeatureStructure[]) iteratorToArray(it, FeatureStructure.class);
+ return iteratorToArray(it, FeatureStructure.class);
}
private static FeatureStructure[] getIndexContents(FSIndex<? extends FeatureStructure> fsIndex) {
@@ -407,7 +407,7 @@ public class DebugFSLogicalStructure {
Iterator<String> it = cas.getIndexRepository().getLabels();
List<IndexInfo> ll = new ArrayList<IndexInfo>();
while (it.hasNext()) {
- ll.add(new IndexInfo(cas, (String) it.next()));
+ ll.add(new IndexInfo(cas, it.next()));
}
return ll.toArray(new IndexInfo[ll.size()]);
@@ -417,7 +417,7 @@ public class DebugFSLogicalStructure {
Iterator<SofaFS> sofaIt = cas.getSofaIterator();
List<ViewInfo> r = new ArrayList<ViewInfo>();
while (sofaIt.hasNext()) {
- SofaFS item = (SofaFS) sofaIt.next();
+ SofaFS item = sofaIt.next();
CAS oCas = cas.getView(item);
if (oCas != cas)
r.add(new ViewInfo(oCas));
@@ -457,7 +457,7 @@ public class DebugFSLogicalStructure {
}
float[] floatArray = new float[list.size()];
for (int i = 0; i < floatArray.length; i++) {
- floatArray[i] = ((Float) list.get(i)).floatValue();
+ floatArray[i] = list.get(i).floatValue();
}
return floatArray;
}
@@ -481,7 +481,7 @@ public class DebugFSLogicalStructure {
}
int[] intArray = new int[list.size()];
for (int i = 0; i < intArray.length; i++) {
- intArray[i] = ((Integer) list.get(i)).intValue();
+ intArray[i] = list.get(i).intValue();
}
return intArray;
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java Sun Nov 23 19:27:07 2014
@@ -47,7 +47,7 @@ class EmbeddedConstraint extends PathCon
// compile(((FeatureStructureImpl) fs).getCAS().getTypeSystem());
final int max = this.featNames.size();
for (int i = 0; i < max; i++) {
- Feature feat = fs.getType().getFeatureByBaseName((String) this.featNames.get(i));
+ Feature feat = fs.getType().getFeatureByBaseName(this.featNames.get(i));
if (feat == null) {
return false;
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java Sun Nov 23 19:27:07 2014
@@ -219,7 +219,7 @@ public class FSClassRegistry {
}
public boolean swapInGeneratorsForClassLoader(ClassLoader cl, CASImpl casImpl) {
- FSGenerator[] cachedGenerators = (FSGenerator[]) generatorsByClassLoader.get(cl);
+ FSGenerator[] cachedGenerators = generatorsByClassLoader.get(cl);
if (cachedGenerators != null) {
casImpl.setLocalFsGenerators(cachedGenerators);
return true;
@@ -269,6 +269,6 @@ public class FSClassRegistry {
*/
public synchronized FSGenerator [] getNewFSGeneratorSet() {
- return (FSGenerator [])this.generators.clone();
+ return this.generators.clone();
}
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java Sun Nov 23 19:27:07 2014
@@ -153,14 +153,14 @@ class FSFloatConstraintImpl implements F
public String toString() {
if (this.codes.size() == 1) {
- return toString(this.codes.get(0)) + " " + ((Float) this.values.get(0)).toString();
+ return toString(this.codes.get(0)) + " " + this.values.get(0).toString();
}
StringBuffer buf = new StringBuffer();
buf.append("( ");
for (int i = 0; i < this.codes.size(); i++) {
buf.append(toString(this.codes.get(i)));
buf.append(' ');
- buf.append(((Float) this.values.get(i)).toString());
+ buf.append(this.values.get(i).toString());
buf.append(' ');
}
buf.append(')');
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java Sun Nov 23 19:27:07 2014
@@ -1986,7 +1986,7 @@ public class FSIndexRepositoryImpl imple
if (kind == FSIndex.BAG_INDEX && !found_in_bag) {
if (FSBagIndex.USE_POSITIVE_INT_SET) {
found_in_bag = ((FSBagIndex)index_for_this_typeCode).ll_contains(fsAddr);
- if (found_in_bag == false) {
+ if (!found_in_bag) {
return false;
}
continue; // may still return false if no set or sorted indexes
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java Sun Nov 23 19:27:07 2014
@@ -390,7 +390,7 @@ public abstract class FeatureStructureIm
boolean addReference(int ref) {
if (this.tree.containsKey(ref)) {
- String refName = (String) this.tree.get(ref);
+ String refName = this.tree.get(ref);
if (refName == null) {
refName = refNamePrefix + Integer.toString(this.count);
++this.count;
@@ -403,7 +403,7 @@ public abstract class FeatureStructureIm
}
String getLabel(int ref) {
- return (String) this.tree.get(ref);
+ return this.tree.get(ref);
}
int printInfo(int ref) {
@@ -588,7 +588,7 @@ public abstract class FeatureStructureIm
String stringVal;
for (int i = 0; i < feats.size(); i++) {
StringUtils.printSpaces(indent, buf);
- feat = (Feature) feats.get(i);
+ feat = feats.get(i);
buf.append(feat.getShortName() + ": ");
approp = feat.getRange();
// System.out.println("Range type: " + approp);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java Sun Nov 23 19:27:07 2014
@@ -975,13 +975,13 @@ public class FeatureValuePathImpl implem
if (this.isArrayOrList && (this.arrayIndex != USE_ALL_ENTRIES)) {
// in the case of, say, authornames[0], the feature is of type
// string array, but it will evaluate to a string.
- this.valueTypeName = (String) CONTAINER_TO_ELEMENTYPE_MAP.get(type.getName());
+ this.valueTypeName = CONTAINER_TO_ELEMENTYPE_MAP.get(type.getName());
} else if (this.isListType) { // here, we can assume that
// arrayIndex =
// USE_ALL_ENTRIES
// we don't return lists, but arrays, so we need to map the type
// accordingly
- this.valueTypeName = (String) LIST_TO_ARRAYTYPE_MAP.get(type.getName());
+ this.valueTypeName = LIST_TO_ARRAYTYPE_MAP.get(type.getName());
} else {
this.valueTypeName = SIMPLE_VAL_TYPES[Arrays.binarySearch(SIMPLE_VAL_TYPES, type.getName())];
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java Sun Nov 23 19:27:07 2014
@@ -54,13 +54,13 @@ class FloatConstraint extends PathConstr
}
Feature feat;
for (int i = 0; i < max; i++) {
- feat = fs.getType().getFeatureByBaseName((String) this.featNames.get(i));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(i));
if (feat == null) {
return false;
}
fs = fs.getFeatureValue(feat);
}
- feat = fs.getType().getFeatureByBaseName((String) this.featNames.get(max));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(max));
if (feat == null) {
return false;
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java Sun Nov 23 19:27:07 2014
@@ -54,13 +54,13 @@ class IntConstraint extends PathConstrai
}
Feature feat;
for (int i = 0; i < max; i++) {
- feat = fs.getType().getFeatureByBaseName((String) this.featNames.get(i));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(i));
if (feat == null) {
return false;
}
fs = fs.getFeatureValue(feat);
}
- feat = fs.getType().getFeatureByBaseName((String) this.featNames.get(max));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(max));
if (feat == null) {
return false;
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java Sun Nov 23 19:27:07 2014
@@ -185,7 +185,7 @@ public class LinearTypeOrderBuilderImpl
}
private Node getNode(String name) {
- Node node = (Node) this.nodeMap.get(name);
+ Node node = this.nodeMap.get(name);
if (node == null) {
node = new Node(name);
this.nodeMap.put(name, node);
@@ -347,7 +347,7 @@ public class LinearTypeOrderBuilderImpl
boolean doIn = true;
boolean doOut = true;
for (Iterator<Type> ni = typesToModify.iterator(); ni.hasNext();) {
- type = (Type) ni.next();
+ type = ni.next();
String typeName = type.getName();
final Node n = this.order.getNode(typeName);
if (doIn && (nIn != null)) {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ListUtils.java Sun Nov 23 19:27:07 2014
@@ -26,8 +26,8 @@ import java.util.ListIterator;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.impl.XmiSerializationSharedData.OotsElementData;
-import org.apache.uima.internal.util.PositiveIntSet_impl;
import org.apache.uima.internal.util.IntVector;
+import org.apache.uima.internal.util.PositiveIntSet_impl;
import org.apache.uima.internal.util.XmlAttribute;
import org.apache.uima.util.Level;
import org.apache.uima.util.Logger;
@@ -264,7 +264,7 @@ public class ListUtils {
OotsElementData oed = sharedData.getOutOfTypeSystemFeatures(curNode);
if (oed != null) {
assert oed.attributes.size() == 1; //only the head feature can possibly be here
- XmlAttribute attr = (XmlAttribute)oed.attributes.get(0);
+ XmlAttribute attr = oed.attributes.get(0);
assert CAS.FEATURE_BASE_NAME_HEAD.equals(attr.name);
out.append(attr.value);
} else {
@@ -656,7 +656,7 @@ public class ListUtils {
}
String curValue = cas.getStringForCode(cas.getHeapValue(curNode
+ cas.getFeatureOffset(stringHeadFeat)));
- String newValue = (String)stringValues.get(i++);
+ String newValue = stringValues.get(i++);
if (!curValue.equals(newValue)) {
cas.setFeatureValue(curNode, stringHeadFeat, cas.addString(newValue));
}
@@ -681,7 +681,7 @@ public class ListUtils {
}
String curValue = cas.getStringForCode(cas.getHeapValue(curNode
+ cas.getFeatureOffset(stringHeadFeat)));
- String newValue = (String)stringValues.get(i++);
+ String newValue = stringValues.get(i++);
if (!curValue.equals(newValue)) {
cas.setFeatureValue(curNode, stringHeadFeat, cas.addString(newValue));
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java Sun Nov 23 19:27:07 2014
@@ -54,13 +54,13 @@ class StringConstraint extends PathConst
}
Feature feat;
for (int i = 0; i < max; i++) {
- feat = fs.getType().getFeatureByBaseName((String) this.featNames.get(i));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(i));
if (feat == null) {
return false;
}
fs = fs.getFeatureValue(feat);
}
- feat = fs.getType().getFeatureByBaseName((String) this.featNames.get(max));
+ feat = fs.getType().getFeatureByBaseName(this.featNames.get(max));
if (feat == null) {
return false;
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java Sun Nov 23 19:27:07 2014
@@ -89,7 +89,7 @@ public class Subiterator<T extends Annot
it.moveToNext();
}
// Skip annotations whose start is before the start parameter.
- while (it.isValid() && ((AnnotationFS) it.get()).getBegin() < start) {
+ while (it.isValid() && it.get().getBegin() < start) {
it.moveToNext();
}
T current;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java Sun Nov 23 19:27:07 2014
@@ -84,7 +84,7 @@ public class UnambiguousIteratorImpl<T e
it.moveToFirst();
// Skip annotations with begin positions before the given start
// position.
- while (it.isValid() && start > ((AnnotationFS) it.get()).getBegin()) {
+ while (it.isValid() && start > it.get().getBegin()) {
it.moveToNext();
}
// Add annotations.
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java Sun Nov 23 19:27:07 2014
@@ -764,7 +764,7 @@ public class XCASDeserializer {
// "Resolving references for non-id data (" + idLess.size() + ").");
// time = System.currentTimeMillis();
for (int i = 0; i < idLess.size(); i++) {
- finalizeFS((FSInfo) idLess.get(i));
+ finalizeFS(idLess.get(i));
}
// time = System.currentTimeMillis() - time;
// System.out.println("Done in " + new TimeSpan(time));
@@ -798,7 +798,7 @@ public class XCASDeserializer {
feat = feats[i];
if (cas.ll_isRefType(ts.range(feats[i]))) {
int featVal = cas.getFeatureValue(addr, feat);
- fsValInfo = (FSInfo) fsTree.get(featVal);
+ fsValInfo = fsTree.get(featVal);
if (fsValInfo == null) {
cas.setFeatureValue(addr, feat, CASImpl.NULL);
// this feature may be a ref to an out-of-typesystem FS.
@@ -846,7 +846,7 @@ public class XCASDeserializer {
FSInfo fsValInfo;
for (int i = 0; i < size; i++) {
int arrayVal = cas.getArrayValue(addr, i);
- fsValInfo = (FSInfo) fsTree.get(arrayVal);
+ fsValInfo = fsTree.get(arrayVal);
if (fsValInfo == null) {
cas.setArrayValue(addr, i, CASImpl.NULL);
// this element may be a ref to an out-of-typesystem FS.
@@ -884,7 +884,7 @@ public class XCASDeserializer {
if (val >= 0) // negative numbers represent null and are left unchanged
{
// attempt to locate target in type system
- FSInfo fsValInfo = (FSInfo) fsTree.get(val);
+ FSInfo fsValInfo = fsTree.get(val);
if (fsValInfo != null) {
entry.setValue(Integer.toString(fsValInfo.addr));
} else
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java Sun Nov 23 19:27:07 2014
@@ -561,7 +561,7 @@ public class XCASSerializer {
{
ArrayElement ootsElem = iter.next();
if (ootsElem.index == i) {
- val = (String) mOutOfTypeSystemData.idMap.get(ootsElem.value);
+ val = mOutOfTypeSystemData.idMap.get(ootsElem.value);
break;
}
}
@@ -664,7 +664,7 @@ public class XCASSerializer {
if (attr[0].startsWith("_ref_")) {
if (attr[1].startsWith("a")) { // reference to OOTS FS
// - remap
- attr[1] = (String) mOutOfTypeSystemData.idMap.get(attr[1]);
+ attr[1] = mOutOfTypeSystemData.idMap.get(attr[1]);
}
}
addAttribute(attrs, attr[0], attr[1]);
@@ -680,7 +680,7 @@ public class XCASSerializer {
if (attrList != null) {
Iterator<String[]> it = attrList.iterator();
while (it.hasNext()) {
- String[] attr = (String[]) it.next();
+ String[] attr = it.next();
// remap ID if necessary
if (attr[0].startsWith("_ref_")) {
// references whose ID starts with the character 'a' are references to out of type
@@ -743,7 +743,7 @@ public class XCASSerializer {
// to another OOTS FS;
// we need to remap those IDs to the actual IDs used
// in the XCAS
- attrVal = (String) mOutOfTypeSystemData.idMap.get(attrVal);
+ attrVal = mOutOfTypeSystemData.idMap.get(attrVal);
}
}
addAttribute(workAttrs, attrName, attrVal);
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java Sun Nov 23 19:27:07 2014
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -269,7 +268,7 @@ public class XmiCasDeserializer {
//new Sofas start at 2
this.nextSofaNum = 2;
} else {
- this.nextSofaNum = ((CASImpl)this.casBeingFilled).getBaseSofaCount() + 1;
+ this.nextSofaNum = this.casBeingFilled.getBaseSofaCount() + 1;
}
this.deserializedFsAddrs = new IntVector();
this.fsListNodesFromMultivaluedProperties = new IntVector();
@@ -283,7 +282,7 @@ public class XmiCasDeserializer {
//a mergePoint was specified)
FSIterator<SofaFS> sofaIter = this.casBeingFilled.getSofaIterator();
while(sofaIter.hasNext()) {
- SofaFS sofa = (SofaFS)sofaIter.next();
+ SofaFS sofa = sofaIter.next();
if (sofa.getSofaRef() == 1) {
casBeingFilled.registerInitialSofa();
} else {
@@ -392,7 +391,7 @@ public class XmiCasDeserializer {
int colonIndex = qualifiedName.indexOf(':');
if (colonIndex != -1) {
String prefix = qualifiedName.substring(0, colonIndex);
- nameSpaceURI = (String) nsPrefixToUriMap.get(prefix);
+ nameSpaceURI = nsPrefixToUriMap.get(prefix);
if (nameSpaceURI == null) {
// unbound namespace. Rather than failing, just assume a reasonable default.
nameSpaceURI = "http:///" + prefix + ".ecore";
@@ -1221,7 +1220,7 @@ public class XmiCasDeserializer {
casArray = fs.getAddress();
for (int i = 0; i < values.size(); i++) {
- String stringVal = (String) values.get(i);
+ String stringVal = values.get(i);
casBeingFilled.setArrayValueFromString(casArray, i, stringVal);
}
@@ -1728,7 +1727,7 @@ public class XmiCasDeserializer {
//if we're merging, then we use a local id map for FSs above the
//merge point, since each of the different XMI CASes being merged
//can use these same ids for different FSs.
- Integer localAddr = (Integer)localXmiIdToFsAddrMap.get(xmiId);
+ Integer localAddr = localXmiIdToFsAddrMap.get(xmiId);
if (localAddr != null) {
return localAddr.intValue();
} else {
@@ -1771,7 +1770,7 @@ public class XmiCasDeserializer {
Iterator<String> iter = featVals.iterator();
XmlElementName elemName = new XmlElementName(null,featName,featName);
while (iter.hasNext()) {
- ootsElem.childElements.add(new XmlElementNameAndContents(elemName, (String)iter.next()));
+ ootsElem.childElements.add(new XmlElementNameAndContents(elemName, iter.next()));
}
}
@@ -2102,7 +2101,7 @@ public class XmiCasDeserializer {
*/
private String xmiElementName2uimaTypeName(String nsUri, String localName) throws SAXException {
// check map first to see if we've already computed the namespace mapping
- String uimaNamespace = (String) xmiNamespaceToUimaNamespaceMap.get(nsUri);
+ String uimaNamespace = xmiNamespaceToUimaNamespaceMap.get(nsUri);
if (uimaNamespace == null) {
// check for the special "no-namespace" URI, which is used for UIMA types with no namespace
if (XmiCasSerializer.DEFAULT_NAMESPACE_URI.equals(nsUri)) {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java?rev=1641247&r1=1641246&r2=1641247&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java Sun Nov 23 19:27:07 2014
@@ -224,7 +224,7 @@ public class XmiSerializationSharedData
*/
public void addOutOfTypeSystemAttribute(int addr, String featName, String featVal) {
Integer key = Integer.valueOf(addr);
- OotsElementData oed = (OotsElementData)this.ootsFeatures.get(key);
+ OotsElementData oed = this.ootsFeatures.get(key);
if (oed == null) {
oed = new OotsElementData();
this.ootsFeatures.put(key, oed);
@@ -241,7 +241,7 @@ public class XmiSerializationSharedData
*/
public void addOutOfTypeSystemChildElements(int addr, String featName, List<String> featVals) {
Integer key = Integer.valueOf(addr);
- OotsElementData oed = (OotsElementData)this.ootsFeatures.get(key);
+ OotsElementData oed = this.ootsFeatures.get(key);
if (oed == null) {
oed = new OotsElementData();
this.ootsFeatures.put(key, oed);
@@ -262,7 +262,7 @@ public class XmiSerializationSharedData
*/
public OotsElementData getOutOfTypeSystemFeatures(int addr) {
Integer key = Integer.valueOf(addr);
- return (OotsElementData)this.ootsFeatures.get(key);
+ return this.ootsFeatures.get(key);
}
/**