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:32:46 UTC
svn commit: r1641248 - in
/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: cas_data/impl/
collection/ collection/base_cpm/ collection/metadata/ flow/impl/ impl/
internal/util/ internal/util/rb_trees/
Author: schor
Date: Sun Nov 23 19:32:45 2014
New Revision: 1641248
URL: http://svn.apache.org/r1641248
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/cas_data/impl/FeatureStructureImpl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCPM.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/BrowserUtil.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharacterUtils.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMALogFormatter.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java
uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java Sun Nov 23 19:32:45 2014
@@ -59,7 +59,7 @@ public class FeatureStructureImpl implem
}
public FeatureValue getFeatureValue(String aFeatureName) {
- return (FeatureValue) mFeatureMap.get(aFeatureName);
+ return mFeatureMap.get(aFeatureName);
}
public void setFeatureValue(String aFeatureType, FeatureValue aValue) {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasConsumer.java Sun Nov 23 19:32:45 2014
@@ -19,8 +19,12 @@
package org.apache.uima.collection;
+import java.util.Map;
+
import org.apache.uima.collection.base_cpm.CasObjectProcessor;
import org.apache.uima.resource.ConfigurableResource;
+import org.apache.uima.resource.ResourceSpecifier;
+import org.apache.uima.util.XMLInputSource;
/**
* Any component that operates on analysis results produced by a UIMA analysis engine. CAS Consumers
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java Sun Nov 23 19:32:45 2014
@@ -20,12 +20,15 @@
package org.apache.uima.collection;
import java.io.IOException;
+import java.util.Map;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.TypeSystem;
import org.apache.uima.collection.base_cpm.BaseCollectionReader;
import org.apache.uima.resource.ConfigurableResource;
import org.apache.uima.resource.ResourceInitializationException;
+import org.apache.uima.resource.ResourceSpecifier;
+import org.apache.uima.util.XMLInputSource;
/**
* A <code>CollectionReader</code> is used to iterate over the elements of a Collection. Iteration
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCPM.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCPM.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCPM.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/BaseCPM.java Sun Nov 23 19:32:45 2014
@@ -19,9 +19,6 @@
package org.apache.uima.collection.base_cpm;
-import java.io.IOException;
-
-import org.apache.uima.UIMA_IllegalStateException;
import org.apache.uima.resource.ResourceConfigurationException;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.util.ProcessTrace;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataConsumer.java Sun Nov 23 19:32:45 2014
@@ -20,10 +20,13 @@
package org.apache.uima.collection.base_cpm;
import java.io.IOException;
+import java.util.Map;
import org.apache.uima.resource.ConfigurableResource;
import org.apache.uima.resource.ResourceProcessException;
+import org.apache.uima.resource.ResourceSpecifier;
import org.apache.uima.util.ProcessTrace;
+import org.apache.uima.util.XMLInputSource;
/**
* Any component that operates on analysis results produced by a UIMA CasDataProcessor.
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java Sun Nov 23 19:32:45 2014
@@ -22,10 +22,9 @@ package org.apache.uima.collection.metad
import java.io.IOException;
import java.io.OutputStream;
-import org.xml.sax.SAXException;
-
import org.apache.uima.resource.metadata.MetaDataObject;
import org.apache.uima.util.XMLInputSource;
+import org.xml.sax.SAXException;
/**
* Java representation of a Collection Processing Engine (CPE) XML descriptor. Generate an instance
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowController.java Sun Nov 23 19:32:45 2014
@@ -73,7 +73,7 @@ public class CapabilityLanguageFlowContr
*/
public void initialize(FlowControllerContext aContext) throws ResourceInitializationException {
super.initialize(aContext);
- mComponentMetaDataMap = (Map<String, AnalysisEngineMetaData>)aContext.getAnalysisEngineMetaDataMap();
+ mComponentMetaDataMap = aContext.getAnalysisEngineMetaDataMap();
// build a list of AnalysisSequenceNodes from the capabilityLanguageFlow
mStaticSequence = new ArrayList<AnalysisSequenceCapabilityNode>();
@@ -240,7 +240,7 @@ public class CapabilityLanguageFlowContr
// should be called is false if this engine produces none of the
// needed outputs of the aggregate
- if (shouldEngineBeCalled == true) {
+ if (shouldEngineBeCalled) {
// tell this component which output types/features need to be produced
// note: As an exception to the way normal result-specifications are produced,
// here we *don't* add the types/features which are input to
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java Sun Nov 23 19:32:45 2014
@@ -256,9 +256,9 @@ public class CapabilityLanguageFlowObjec
// if flow is available get next node
if (flow != null) {
if (flow.size() > mIndex) {
- node = (AnalysisSequenceCapabilityNode) flow.get(mIndex++);
+ node = flow.get(mIndex++);
while (node == null && flow.size() > mIndex) {
- node = (AnalysisSequenceCapabilityNode) flow.get(mIndex++);
+ node = flow.get(mIndex++);
}
}
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FixedFlowController.java Sun Nov 23 19:32:45 2014
@@ -22,9 +22,7 @@ package org.apache.uima.flow.impl;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -241,13 +239,13 @@ public class FixedFlowController extends
// if next step is a CasMultiplier, set wasPassedToCasMultiplier to true for next time
// TODO: optimize
- AnalysisEngineMetaData md = (AnalysisEngineMetaData) getContext()
+ AnalysisEngineMetaData md = getContext()
.getAnalysisEngineMetaDataMap().get(mSequence.get(currentStep));
if (md.getOperationalProperties().getOutputsNewCASes())
wasPassedToCasMultiplier = true;
// now send the CAS to the next AE in sequence.
- return new SimpleStep((String)mSequence.get(currentStep++));
+ return new SimpleStep(mSequence.get(currentStep++));
}
/*
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/RootUimaContext_impl.java Sun Nov 23 19:32:45 2014
@@ -19,8 +19,6 @@
package org.apache.uima.impl;
-import java.util.TreeMap;
-
import org.apache.uima.UIMAFramework;
import org.apache.uima.UimaContext;
import org.apache.uima.UimaContextAdmin;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java Sun Nov 23 19:32:45 2014
@@ -575,14 +575,14 @@ public abstract class UimaContext_ImplBa
String nameToMap = aSofaName;
String absoluteSofaName = null;
if (index < 0) {
- absoluteSofaName = (String) mSofaMappings.get(nameToMap);
+ absoluteSofaName = mSofaMappings.get(nameToMap);
if (absoluteSofaName == null)
absoluteSofaName = nameToMap;
} else {
nameToMap = aSofaName.substring(0, index);
String rest = aSofaName.substring(index);
- String absoluteRoot = (String) mSofaMappings.get(nameToMap);
+ String absoluteRoot = mSofaMappings.get(nameToMap);
if (absoluteRoot == null)
absoluteRoot = nameToMap;
absoluteSofaName = absoluteRoot + rest;
@@ -620,8 +620,8 @@ public abstract class UimaContext_ImplBa
while (iter.hasNext()) {
Map.Entry<String, String> elem = iter.next();
SofaID sofaid = new SofaID_impl();
- sofaid.setComponentSofaName((String) elem.getKey());
- sofaid.setSofaID((String) elem.getValue());
+ sofaid.setComponentSofaName(elem.getKey());
+ sofaid.setSofaID(elem.getValue());
sofaArr[i] = sofaid;
i++;
}
@@ -755,13 +755,13 @@ public abstract class UimaContext_ImplBa
String nameToMap = aSofaName;
String absoluteSofaName = null;
if (index < 0) {
- absoluteSofaName = (String) mSofaMappings.get(nameToMap);
+ absoluteSofaName = mSofaMappings.get(nameToMap);
if (absoluteSofaName == null)
absoluteSofaName = nameToMap;
} else {
nameToMap = aSofaName.substring(0, index);
String rest = aSofaName.substring(index);
- String absoluteRoot = (String) mSofaMappings.get(nameToMap);
+ String absoluteRoot = mSofaMappings.get(nameToMap);
if (absoluteRoot == null)
absoluteRoot = nameToMap;
absoluteSofaName = absoluteRoot + rest;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/BrowserUtil.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/BrowserUtil.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/BrowserUtil.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/BrowserUtil.java Sun Nov 23 19:32:45 2014
@@ -156,7 +156,7 @@ public class BrowserUtil {
// check for available browsers
boolean browserAvailableBrowser = false;
int i = 0;
- while (i < __browserLauncher.length && browserAvailableBrowser == false) {
+ while (i < __browserLauncher.length && !browserAvailableBrowser) {
// check if current browser is available
process = Runtime.getRuntime().exec(new String[] { "which", __browserLauncher[i] });
try {
@@ -171,7 +171,7 @@ public class BrowserUtil {
}
}
// no browser found, return null
- if(browserAvailableBrowser == false) {
+ if(!browserAvailableBrowser) {
process = null;
}
break;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArraySpanMap.java Sun Nov 23 19:32:45 2014
@@ -102,7 +102,7 @@ public class CharArraySpanMap {
boolean found = false;
int i = 0;
while (i < listLen) {
- entry = (Entry) entryList.get(i);
+ entry = entryList.get(i);
if (strLen != entry.length) {
++i;
continue;
@@ -130,7 +130,7 @@ public class CharArraySpanMap {
int i = 0, k;
int max;
while (i < listLen) {
- entry = (Entry) entryList.get(i);
+ entry = entryList.get(i);
if (strLen != entry.length) {
++i;
continue;
@@ -167,7 +167,7 @@ public class CharArraySpanMap {
ArrayList<Entry> list = this.map[hashCode % this.map.length];
final int listPos = isInList(s, list);
if (listPos >= 0) {
- Entry entry = (Entry) list.get(listPos);
+ Entry entry = list.get(listPos);
entry.value = value;
return;
}
@@ -206,7 +206,7 @@ public class CharArraySpanMap {
final int hashCode = CharArrayString.hashCode(characterArray, start, (start + length));
final ArrayList<Entry> list = this.map[hashCode % this.map.length];
final int listPos = isInList(characterArray, start, length, list);
- return (listPos >= 0) ? ((Entry) list.get(listPos)).value : null;
+ return (listPos >= 0) ? list.get(listPos).value : null;
}
private final void addString(String s) {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharacterUtils.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharacterUtils.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharacterUtils.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharacterUtils.java Sun Nov 23 19:32:45 2014
@@ -177,7 +177,7 @@ public class CharacterUtils {
if (i != 0) {
System.out.print("\n" + spaces + " | ");
}
- range = (CharRange) charRanges.get(i);
+ range = charRanges.get(i);
if (range.start == range.end) {
System.out.print(" '" + toUnicodeChar(range.start) + "'");
} else {
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CommandLineParser.java Sun Nov 23 19:32:45 2014
@@ -128,7 +128,7 @@ public class CommandLineParser {
while (i < args.length) {
String cmdLineArg = args[i];
if (this.paramMap.containsKey(cmdLineArg)) {
- CmdLineParam metaParam = (CmdLineParam) this.paramMap.get(cmdLineArg);
+ CmdLineParam metaParam = this.paramMap.get(cmdLineArg);
if (metaParam.hasArg) {
++i;
if (i >= args.length) {
@@ -195,7 +195,7 @@ public class CommandLineParser {
*/
public String getParamArgument(String paramName) {
if (isKnownParameter(paramName)) {
- return (String) this.cmdLineMap.get(this.paramMap.get(paramName));
+ return this.cmdLineMap.get(this.paramMap.get(paramName));
}
return null;
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/GraphNode.java Sun Nov 23 19:32:45 2014
@@ -75,7 +75,7 @@ public class GraphNode {
*/
public GraphNode getSuccessor(int i) {
if (i >= 0 && i < this.successors.size()) {
- return (GraphNode) this.successors.get(i);
+ return this.successors.get(i);
}
throw new UtilError(UtilError.ILLEGAL_SUCCESSOR_INDEX);
}
@@ -108,7 +108,7 @@ public class GraphNode {
*/
public GraphNode getPredecessor(int i) {
if (i >= 0 && i < this.predecessors.size()) {
- return (GraphNode) this.predecessors.get(i);
+ return this.predecessors.get(i);
}
throw new UtilError(UtilError.ILLEGAL_PREDECESSOR_INDEX);
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ResourcePool.java Sun Nov 23 19:32:45 2014
@@ -109,7 +109,7 @@ public class ResourcePool {
*/
public synchronized Resource getResource() {
if (!mFreeInstances.isEmpty()) {
- Resource r = (Resource) mFreeInstances.remove(0);
+ Resource r = mFreeInstances.remove(0);
/*
* UIMAFramework.getLogger().log( "Acquired resource " + r.getMetaData().getUUID() + " from
* pool.");
@@ -195,7 +195,7 @@ public class ResourcePool {
public synchronized void destroy() {
Iterator<Resource> i = mAllInstances.iterator();
while (i.hasNext()) {
- Resource current = (Resource) i.next();
+ Resource current = i.next();
current.destroy();
}
mAllInstances.clear();
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java Sun Nov 23 19:32:45 2014
@@ -65,7 +65,7 @@ public class StringToIntMap {
* <code>key</code> is actually defined in the map.
*/
public int get(String key) {
- Integer i = (Integer) this.map.get(key);
+ Integer i = this.map.get(key);
if (i == null) {
return DEFAULT_VALUE;
}
@@ -82,7 +82,7 @@ public class StringToIntMap {
* @return The previous value of <code>key</code>, if it was set. <code>0</code> else.
*/
public int put(String key, int value) {
- Integer i = (Integer) this.map.get(key);
+ Integer i = this.map.get(key);
int rc;
if (i == null) {
rc = 0;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java Sun Nov 23 19:32:45 2014
@@ -101,7 +101,7 @@ public class SymbolTable {
SymbolTable copy = new SymbolTable(this.start);
int max = this.int2symbolMap.size();
for (int i = 0; i < max; i++) {
- copy.set((String) this.int2symbolMap.get(i));
+ copy.set(this.int2symbolMap.get(i));
}
return copy;
}
@@ -128,7 +128,7 @@ public class SymbolTable {
*/
public int set(String symbol) {
if (this.symbol2intMap.containsKey(symbol)) {
- return ((Integer) this.symbol2intMap.get(symbol)).intValue();
+ return this.symbol2intMap.get(symbol).intValue();
}
int rel;
int abs;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java Sun Nov 23 19:32:45 2014
@@ -81,7 +81,7 @@ public class UIMAClassLoader extends URL
// transform all classpath entries to an URL and add them to an URL array
for (int i = 0; i < max; i++) {
- urlArray[i] = (new File((String) pathList.get(i))).toURI().toURL();
+ urlArray[i] = (new File(pathList.get(i))).toURI().toURL();
// calling toURI() first handles spaces in classpath
}
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMALogFormatter.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMALogFormatter.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMALogFormatter.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMALogFormatter.java Sun Nov 23 19:32:45 2014
@@ -21,7 +21,6 @@ package org.apache.uima.internal.util;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.text.MessageFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.logging.Formatter;
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/XMLUtils.java Sun Nov 23 19:32:45 2014
@@ -27,10 +27,6 @@ import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
/**
* Some utilities for working with XML.
Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java?rev=1641248&r1=1641247&r2=1641248&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRBTNode.java Sun Nov 23 19:32:45 2014
@@ -526,7 +526,7 @@ class IntRBTNode {
if (addressStack.empty()) {
node = null;
} else {
- node = (IntRBTNode) nodeStack.pop();
+ node = nodeStack.pop();
address = addressStack.pop();
v.set(address, v.size() + offset);
}