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 2008/01/31 21:15:10 UTC
svn commit: r617208 - in /incubator/uima/uimaj/trunk/uimaj-core/src:
main/java/org/apache/uima/ main/java/org/apache/uima/analysis_engine/impl/
main/java/org/apache/uima/analysis_engine/service/impl/
main/java/org/apache/uima/cas/impl/ main/java/org/ap...
Author: schor
Date: Thu Jan 31 12:14:57 2008
New Revision: 617208
URL: http://svn.apache.org/viewvc?rev=617208&view=rev
Log:
[UIMA-736]
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEnginePerformanceReports.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java Thu Jan 31 12:14:57 2008
@@ -419,9 +419,9 @@
// add parameters to the aAdditionalParams map
Map aAdditionalParams = new HashMap();
- aAdditionalParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, new Integer(
+ aAdditionalParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(
aMaxSimultaneousRequests));
- aAdditionalParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, new Integer(aTimeoutPeriod));
+ aAdditionalParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, Integer.valueOf(aTimeoutPeriod));
return (AnalysisEngine) produceResource(AnalysisEngine.class, aSpecifier, aAdditionalParams);
}
@@ -555,9 +555,9 @@
// add parameters to the aAdditionalParams map
Map aAdditionalParams = new HashMap();
- aAdditionalParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, new Integer(
+ aAdditionalParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(
aMaxSimultaneousRequests));
- aAdditionalParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, new Integer(aTimeoutPeriod));
+ aAdditionalParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, Integer.valueOf(aTimeoutPeriod));
return (TextAnalysisEngine) produceResource(TextAnalysisEngine.class, aSpecifier,
aAdditionalParams);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java Thu Jan 31 12:14:57 2008
@@ -107,7 +107,7 @@
if (ae == null) // timeout elapsed
{
throw new AnalysisEngineProcessException(AnalysisEngineProcessException.TIMEOUT_ELAPSED,
- new Object[] { new Integer(getTimeout()) });
+ new Object[] { Integer.valueOf(getTimeout()) });
}
return ae.process(aCAS, aResultSpec);
} finally {
@@ -129,7 +129,7 @@
if (ae == null) // timeout elapsed
{
throw new AnalysisEngineProcessException(AnalysisEngineProcessException.TIMEOUT_ELAPSED,
- new Object[] { new Integer(getTimeout()) });
+ new Object[] { Integer.valueOf(getTimeout()) });
}
ae.process(aCAS, aResultSpec);
buildProcessTraceFromMBeanStats(aTrace);
@@ -149,7 +149,7 @@
if (ae == null) // timeout elapsed
{
throw new AnalysisEngineProcessException(AnalysisEngineProcessException.TIMEOUT_ELAPSED,
- new Object[] { new Integer(getTimeout()) });
+ new Object[] { Integer.valueOf(getTimeout()) });
}
return ae.processAndOutputNewCASes(aCAS);
} finally {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java Thu Jan 31 12:14:57 2008
@@ -64,7 +64,7 @@
Integer numInstances = (Integer) aResourceInitParams
.get(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS);
if (numInstances == null) {
- numInstances = new Integer(1);
+ numInstances = Integer.valueOf(1);
}
mCasPool = new CasPool(numInstances.intValue(), getAnalysisEngine());
@@ -84,9 +84,9 @@
public void initialize(ResourceSpecifier aResourceSpecifier, int aNumSimultaneousRequests,
int aTimeout) throws ResourceInitializationException {
Map initParams = new HashMap();
- initParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, new Integer(
+ initParams.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(
aNumSimultaneousRequests));
- initParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, new Integer(aTimeout));
+ initParams.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, Integer.valueOf(aTimeout));
this.initialize(aResourceSpecifier, initParams);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Thu Jan 31 12:14:57 2008
@@ -528,7 +528,7 @@
}
FSIndexRepository getSofaIndexRepository(int aSofaRef) {
- return (FSIndexRepositoryImpl) this.svd.sofa2indexMap.get(new Integer(aSofaRef));
+ return (FSIndexRepositoryImpl) this.svd.sofa2indexMap.get(Integer.valueOf(aSofaRef));
}
void setSofaIndexRepository(SofaFS aSofa, FSIndexRepository indxRepos) {
@@ -536,7 +536,7 @@
}
void setSofaIndexRepository(int aSofaRef, FSIndexRepository indxRepos) {
- this.svd.sofa2indexMap.put(new Integer(aSofaRef), indxRepos);
+ this.svd.sofa2indexMap.put(Integer.valueOf(aSofaRef), indxRepos);
}
/**
@@ -1039,7 +1039,7 @@
// freshen the initial view
((CASImpl) initialView).refreshView(this.svd.baseCAS, null);
- this.svd.sofaNbr2ViewMap.put(new Integer(1), initialView);
+ this.svd.sofaNbr2ViewMap.put(Integer.valueOf(1), initialView);
this.svd.viewCount = 1;
// deserialize heap
@@ -1661,7 +1661,7 @@
// byte
public void setFeatureValue(int addr, int feat, byte v) {
- Byte bytevalue = new Byte(v);
+ Byte bytevalue = Byte.valueOf(v);
setFeatureValue(addr, feat, bytevalue.intValue());
}
@@ -2193,7 +2193,7 @@
// For internal use only
public CAS getView(int sofaNum) {
- return (CAS) this.svd.sofaNbr2ViewMap.get(new Integer(sofaNum));
+ return (CAS) this.svd.sofaNbr2ViewMap.get(Integer.valueOf(sofaNum));
}
/**
@@ -2230,10 +2230,10 @@
return getView(aSofa).getJCas();
/*
* // If a JCas already exists for this Sofa, return it JCas aJCas = (JCas)
- * this.svd.baseCAS.sofa2jcasMap.get(new Integer(aSofa.getSofaRef())); if
+ * this.svd.baseCAS.sofa2jcasMap.get(Integer.valueOf(aSofa.getSofaRef())); if
* (null != aJCas) { return aJCas; } // Get view of aSofa CASImpl view =
* (CASImpl) getView(aSofa); // wrap in JCas aJCas = view.getJCas();
- * this.sofa2jcasMap.put(new Integer(aSofa.getSofaRef()), aJCas); return
+ * this.sofa2jcasMap.put(Integer.valueOf(aSofa.getSofaRef()), aJCas); return
* aJCas;
*/
}
@@ -2253,13 +2253,13 @@
// For internal platform use only
CAS getInitialView() {
- CAS couldBeThis = (CAS) this.svd.sofaNbr2ViewMap.get(new Integer(1));
+ CAS couldBeThis = (CAS) this.svd.sofaNbr2ViewMap.get(Integer.valueOf(1));
if (couldBeThis != null) {
return couldBeThis;
}
// create the initial view, without a Sofa
CAS aView = new CASImpl(this.svd.baseCAS, null);
- this.svd.sofaNbr2ViewMap.put(new Integer(1), aView);
+ this.svd.sofaNbr2ViewMap.put(Integer.valueOf(1), aView);
assert (this.svd.viewCount <= 1);
this.svd.viewCount = 1;
return aView;
@@ -2335,7 +2335,7 @@
*/
public CAS getView(SofaFS aSofa) {
final int sofaNbr = aSofa.getSofaRef();
- final Integer sofaNbrInteger = new Integer(sofaNbr);
+ final Integer sofaNbrInteger = Integer.valueOf(sofaNbr);
CASImpl aView = (CASImpl) this.svd.sofaNbr2ViewMap.get(sofaNbrInteger);
if (null == aView) {
@@ -3669,7 +3669,7 @@
}
public String getViewName() {
- if (this == this.svd.sofaNbr2ViewMap.get(new Integer(1))) {
+ if (this == this.svd.sofaNbr2ViewMap.get(Integer.valueOf(1))) {
return CAS.NAME_DEFAULT_SOFA;
} else if (this.mySofaRef > 0) {
return this.getSofa().getSofaID();
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DebugFSLogicalStructure.java Thu Jan 31 12:14:57 2008
@@ -283,19 +283,19 @@
DebugNameValuePair nv = new DebugNameValuePair(feat.getShortName(), null);
String rangeTypeName = feat.getRange().getName();
if ("uima.cas.Integer".equals(rangeTypeName))
- nv.setValue(new Integer(fs.getIntValue(feat)));
+ nv.setValue(Integer.valueOf(fs.getIntValue(feat)));
else if ("uima.cas.Float".equals(rangeTypeName))
- nv.setValue(new Float(fs.getFloatValue(feat)));
+ nv.setValue(Float.valueOf(fs.getFloatValue(feat)));
else if ("uima.cas.Boolean".equals(rangeTypeName))
- nv.setValue(new Boolean(fs.getBooleanValue(feat)));
+ nv.setValue(Boolean.valueOf(fs.getBooleanValue(feat)));
else if ("uima.cas.Byte".equals(rangeTypeName))
- nv.setValue(new Byte(fs.getByteValue(feat)));
+ nv.setValue(Byte.valueOf(fs.getByteValue(feat)));
else if ("uima.cas.Short".equals(rangeTypeName))
- nv.setValue(new Short(fs.getShortValue(feat)));
+ nv.setValue(Short.valueOf(fs.getShortValue(feat)));
else if ("uima.cas.Long".equals(rangeTypeName))
- nv.setValue(new Long(fs.getLongValue(feat)));
+ nv.setValue(Long.valueOf(fs.getLongValue(feat)));
else if ("uima.cas.Double".equals(rangeTypeName))
- nv.setValue(new Double(fs.getDoubleValue(feat)));
+ nv.setValue(Double.valueOf(fs.getDoubleValue(feat)));
else if ("uima.cas.String".equals(rangeTypeName))
nv.setValue(fs.getStringValue(feat));
else
@@ -447,7 +447,7 @@
Set alreadySeen = new HashSet();
FeatureStructure nextFs;
for (FeatureStructure currentFs = fs; currentFs.getType() != emptyFSList; currentFs = nextFs) {
- list.add(new Float(currentFs.getFloatValue(headFeature)));
+ list.add(Float.valueOf(currentFs.getFloatValue(headFeature)));
nextFs = currentFs.getFeatureValue(tailFeature);
if (alreadySeen.contains(nextFs)) {
return loopInList(list);
@@ -471,7 +471,7 @@
Set alreadySeen = new HashSet();
FeatureStructure nextFs;
for (FeatureStructure currentFs = fs; currentFs.getType() != emptyFSList; currentFs = nextFs) {
- list.add(new Integer(currentFs.getIntValue(headFeature)));
+ list.add(Integer.valueOf(currentFs.getIntValue(headFeature)));
nextFs = currentFs.getFeatureValue(tailFeature);
if (alreadySeen.contains(nextFs)) {
return loopInList(list);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java Thu Jan 31 12:14:57 2008
@@ -104,7 +104,7 @@
*/
public void eq(float f) {
this.codes.add(EQ);
- this.values.add(new Float(f));
+ this.values.add(Float.valueOf(f));
}
/**
@@ -115,7 +115,7 @@
*/
public void lt(float f) {
this.codes.add(LT);
- this.values.add(new Float(f));
+ this.values.add(Float.valueOf(f));
}
/**
@@ -126,7 +126,7 @@
*/
public void leq(float f) {
this.codes.add(LEQ);
- this.values.add(new Float(f));
+ this.values.add(Float.valueOf(f));
}
/**
@@ -137,7 +137,7 @@
*/
public void gt(float f) {
this.codes.add(GT);
- this.values.add(new Float(f));
+ this.values.add(Float.valueOf(f));
}
/**
@@ -148,7 +148,7 @@
*/
public void geq(float f) {
this.codes.add(GEQ);
- this.values.add(new Float(f));
+ this.values.add(Float.valueOf(f));
}
public String toString() {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureValuePathImpl.java Thu Jan 31 12:14:57 2008
@@ -270,7 +270,7 @@
switch (typeClass) {
case LowLevelCAS.TYPE_CLASS_FLOATARRAY:
int position = getArrayIndex(arraySize);
- return new Float(cas.ll_getFloatArrayValue(arrayFS, position, false));
+ return Float.valueOf(cas.ll_getFloatArrayValue(arrayFS, position, false));
case LowLevelCAS.TYPE_CLASS_FSARRAY:
int childFS = getFsAtIndex(arrayFS, cas, arraySize);
return this.childPath.evaluateAsFloat(childFS, cas);
@@ -310,7 +310,7 @@
int typeClass = cas.ll_getTypeClass(this.featureRangeType);
switch (typeClass) {
case LowLevelCAS.TYPE_CLASS_FLOAT:
- return new Float(cas.ll_getFloatValue(currentFS, this.featureCode, CAS_TYPE_CHECKS));
+ return Float.valueOf(cas.ll_getFloatValue(currentFS, this.featureCode, CAS_TYPE_CHECKS));
default:
throw new IllegalStateException("feature path does not denote a float");
}
@@ -356,7 +356,7 @@
} else {
// this snippet denotes a float array, just collect it
for (int i = 0; i < arraySize; i++) {
- result[i] = new Float(cas.ll_getFloatArrayValue(arrayFS, i));
+ result[i] = Float.valueOf(cas.ll_getFloatArrayValue(arrayFS, i));
}
}
return result;
@@ -427,7 +427,7 @@
switch (typeClass) {
case LowLevelCAS.TYPE_CLASS_INTARRAY:
int position = getArrayIndex(arraySize);
- return new Integer(cas.ll_getIntArrayValue(arrayFS, position, false));
+ return Integer.valueOf(cas.ll_getIntArrayValue(arrayFS, position, false));
case LowLevelCAS.TYPE_CLASS_FSARRAY:
int childFS = getFsAtIndex(arrayFS, cas, arraySize);
return this.childPath.evaluateAsInt(childFS, cas);
@@ -463,14 +463,14 @@
} else if (this.isCoveredTextFeature || this.isTypeNameFeature) {
throw new IllegalStateException("feature path does not denote an int");
} else if (this.isFsIdFeature) {
- return new Integer(currentFS);
+ return Integer.valueOf(currentFS);
} else if (this.isUniqueIdFeature) {
- return new Integer(currentFS); // TODO: return currentFs + chunkId
+ return Integer.valueOf(currentFS); // TODO: return currentFs + chunkId
} else {
int typeClass = cas.ll_getTypeClass(this.featureRangeType);
switch (typeClass) {
case LowLevelCAS.TYPE_CLASS_INT:
- return new Integer(cas.ll_getIntValue(currentFS, this.featureCode, CAS_TYPE_CHECKS));
+ return Integer.valueOf(cas.ll_getIntValue(currentFS, this.featureCode, CAS_TYPE_CHECKS));
default:
throw new IllegalStateException("feature path does not denote an int");
}
@@ -516,7 +516,7 @@
} else {
// this snippet denotes an int array, just collect it
for (int i = 0; i < arraySize; i++) {
- result[i] = new Integer(cas.ll_getIntArrayValue(arrayFS, i));
+ result[i] = Integer.valueOf(cas.ll_getIntArrayValue(arrayFS, i));
}
}
return result;
@@ -1092,11 +1092,11 @@
case TYPE_CLASS_STRINGLIST:
return cas.ll_getStringValue(listFS, this.headFeature);
case TYPE_CLASS_INTEGERLIST:
- return new Integer(cas.ll_getIntValue(listFS, this.headFeature));
+ return Integer.valueOf(cas.ll_getIntValue(listFS, this.headFeature));
case TYPE_CLASS_FLOATLIST:
- return new Float(cas.ll_getFloatValue(listFS, this.headFeature));
+ return Float.valueOf(cas.ll_getFloatValue(listFS, this.headFeature));
case TYPE_CLASS_FSLIST:
- return new Integer(cas.ll_getRefValue(listFS, this.headFeature));
+ return Integer.valueOf(cas.ll_getRefValue(listFS, this.headFeature));
default:
return null;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java Thu Jan 31 12:14:57 2008
@@ -593,7 +593,7 @@
if (feat == null) { // feature does not exist in typesystem
if (outOfTypeSystemData != null) {
// Add to Out-Of-Typesystem data (APL)
- Integer addrInteger = new Integer(addr);
+ Integer addrInteger = Integer.valueOf(addr);
List ootsAttrs = (List) outOfTypeSystemData.extraFeatureValues.get(addrInteger);
if (ootsAttrs == null) {
ootsAttrs = new ArrayList();
@@ -817,7 +817,7 @@
// this feature may be a ref to an out-of-typesystem FS.
// add it to the Out-of-typesystem features list (APL)
if (featVal != 0 && outOfTypeSystemData != null) {
- Integer addrInteger = new Integer(addr);
+ Integer addrInteger = Integer.valueOf(addr);
List ootsAttrs = (List) outOfTypeSystemData.extraFeatureValues.get(addrInteger);
if (ootsAttrs == null) {
ootsAttrs = new ArrayList();
@@ -850,7 +850,7 @@
// this element may be a ref to an out-of-typesystem FS.
// add it to the Out-of-typesystem array elements list (APL)
if (arrayVal != 0 && outOfTypeSystemData != null) {
- Integer arrayAddrInteger = new Integer(addr);
+ Integer arrayAddrInteger = Integer.valueOf(addr);
List ootsElements = (List) outOfTypeSystemData.arrayElements.get(arrayAddrInteger);
if (ootsElements == null) {
ootsElements = new ArrayList();
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java Thu Jan 31 12:14:57 2008
@@ -562,7 +562,7 @@
if (heapVal == CASImpl.NULL && mOutOfTypeSystemData != null) {
// This array element may have been a reference to an OOTS
// FS.
- List ootsElems = (List) mOutOfTypeSystemData.arrayElements.get(new Integer(addr));
+ List ootsElems = (List) mOutOfTypeSystemData.arrayElements.get(Integer.valueOf(addr));
if (ootsElems != null) {
Iterator iter = ootsElems.iterator();
while (iter.hasNext()) // TODO: iteration could be slow
@@ -670,7 +670,7 @@
* @param addr
*/
private void encodeOutOfTypeSystemFeatures(int addr, AttributesImpl attrs) {
- List attrList = (List) mOutOfTypeSystemData.extraFeatureValues.get(new Integer(addr));
+ List attrList = (List) mOutOfTypeSystemData.extraFeatureValues.get(Integer.valueOf(addr));
if (attrList != null) {
Iterator it = attrList.iterator();
while (it.hasNext()) {
@@ -693,7 +693,7 @@
* @param addr
*/
private void enqueueOutOfTypeSystemFeatures(int addr) {
- List attrList = (List) mOutOfTypeSystemData.extraFeatureValues.get(new Integer(addr));
+ List attrList = (List) mOutOfTypeSystemData.extraFeatureValues.get(Integer.valueOf(addr));
if (attrList != null) {
Iterator it = attrList.iterator();
while (it.hasNext()) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java Thu Jan 31 12:14:57 2008
@@ -1270,7 +1270,7 @@
//if we're doing a merge, we can't update the shared map because we could
//have duplicate xmi:id values in the different parts of the merge.
//instead we keep a local mapping used only within this deserialization.
- localXmiIdToFsAddrMap.put(xmiId, new Integer(fsAddr));
+ localXmiIdToFsAddrMap.put(xmiId, Integer.valueOf(fsAddr));
}
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiSerializationSharedData.java Thu Jan 31 12:14:57 2008
@@ -102,7 +102,7 @@
void addIdMapping(int fsAddr, int xmiId) {
fsAddrToXmiIdMap.put(fsAddr, Integer.toString(xmiId));
- xmiIdToFsAddrMap.put(xmiId, new Integer(fsAddr));
+ xmiIdToFsAddrMap.put(xmiId, Integer.valueOf(fsAddr));
if (xmiId > maxXmiId)
maxXmiId = xmiId;
}
@@ -117,7 +117,7 @@
// to be sure we get a unique Id, increment maxXmiId and use that
String idStr = Integer.toString(++maxXmiId);
fsAddrToXmiIdMap.put(fsAddr, idStr);
- xmiIdToFsAddrMap.put(maxXmiId, new Integer(fsAddr));
+ xmiIdToFsAddrMap.put(maxXmiId, Integer.valueOf(fsAddr));
return idStr;
}
}
@@ -212,7 +212,7 @@
* @param featVal value of the feature, as a string
*/
public void addOutOfTypeSystemAttribute(int addr, String featName, String featVal) {
- Integer key = new Integer(addr);
+ Integer key = Integer.valueOf(addr);
OotsElementData oed = (OotsElementData)this.ootsFeatures.get(key);
if (oed == null) {
oed = new OotsElementData();
@@ -229,7 +229,7 @@
* @param featVal values of the feature, as a List of strings
*/
public void addOutOfTypeSystemChildElements(int addr, String featName, List featVals) {
- Integer key = new Integer(addr);
+ Integer key = Integer.valueOf(addr);
OotsElementData oed = (OotsElementData)this.ootsFeatures.get(key);
if (oed == null) {
oed = new OotsElementData();
@@ -250,7 +250,7 @@
* (both attributes and child elements)
*/
public OotsElementData getOutOfTypeSystemFeatures(int addr) {
- Integer key = new Integer(addr);
+ Integer key = Integer.valueOf(addr);
return (OotsElementData)this.ootsFeatures.get(key);
}
@@ -270,7 +270,7 @@
* reference to an out-of-typesystem FS.
*/
public List getOutOfTypeSystemArrayElements(int addr) {
- return (List)this.ootsArrayElements.get(new Integer(addr));
+ return (List)this.ootsArrayElements.get(Integer.valueOf(addr));
}
@@ -281,7 +281,7 @@
* @param xmiId xmi:id of the out-of-typesystem element that is the value at the given index
*/
public void addOutOfTypeSystemArrayElement(int addr, int index, int xmiId) {
- Integer key = new Integer(addr);
+ Integer key = Integer.valueOf(addr);
List list = (List)this.ootsArrayElements.get(key);
if (list == null) {
list = new ArrayList();
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/PrimitiveValueImpl.java Thu Jan 31 12:14:57 2008
@@ -37,11 +37,11 @@
}
public PrimitiveValueImpl(int aValue) {
- aValueObject = new Integer(aValue);
+ aValueObject = Integer.valueOf(aValue);
}
public PrimitiveValueImpl(float aValue) {
- aValueObject = new Float(aValue);
+ aValueObject = Float.valueOf(aValue);
}
public String toString() {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringToIntMap.java Thu Jan 31 12:14:57 2008
@@ -89,7 +89,7 @@
} else {
rc = i.intValue();
}
- i = new Integer(value);
+ i = Integer.valueOf(value);
this.map.put(key, i);
return rc;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SymbolTable.java Thu Jan 31 12:14:57 2008
@@ -136,7 +136,7 @@
abs = this.hashtable.size();
rel = abs2rel(abs);
// System.out.println("Adding symbol " + symbol + " at pos: " + i);
- this.hashtable.put(symbol, new Integer(rel));
+ this.hashtable.put(symbol, Integer.valueOf(rel));
this.symbols.insertElementAt(symbol, abs);
}
return rel;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java Thu Jan 31 12:14:57 2008
@@ -806,7 +806,7 @@
if (null != fs) {
fs.jcasType = jcasView.getType(type);
} else {
- initargs[0] = new Integer(addr);
+ initargs[0] = Integer.valueOf(addr);
initargs[1] = jcasView.getType(type);
try {
fs = (TOP) c.newInstance(initargs);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppAnalysisComponent.java Thu Jan 31 12:14:57 2008
@@ -388,7 +388,7 @@
log.logrb(Level.SEVERE, CLASS_NAME.getName(), "logJTafException", LOG_RESOURCE_BUNDLE,
"UIMA_taf_internal_exception__SEVERE",
- new Object[] { new Long(errorCode), errorName });
+ new Object[] { Long.valueOf(errorCode), errorName });
}
Exception et = e.getEmbeddedException();
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEnginePerformanceReports.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEnginePerformanceReports.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEnginePerformanceReports.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/AnalysisEnginePerformanceReports.java Thu Jan 31 12:14:57 2008
@@ -72,7 +72,7 @@
if (ProcessTraceEvent.ANALYSIS.equals(aEvent.getType())) {
mAnalysisTime += aEvent.getDuration();
String componentName = aEvent.getComponentName();
- mAnnotatorAnalysisTimes.put(componentName, new Integer(aEvent.getDuration()));
+ mAnnotatorAnalysisTimes.put(componentName, Integer.valueOf(aEvent.getDuration()));
} else if (ProcessTraceEvent.ANALYSIS_ENGINE.equals(aEvent.getType())) {
// framework overhead is difference between this event's duration and
// combined duration of all ANLAYSIS or ANALYSIS_ENGINE subevents
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java Thu Jan 31 12:14:57 2008
@@ -496,7 +496,7 @@
aggDesc2.getMetaData().getConfigurationParameterDeclarations().setConfigurationParameters(
new ConfigurationParameter[] { p3 });
aggDesc2.getMetaData().getConfigurationParameterSettings().setParameterSettings(
- new NameValuePair[] { new NameValuePair_impl("IntParam", new Integer(42)) });
+ new NameValuePair[] { new NameValuePair_impl("IntParam", Integer.valueOf(42)) });
// instantiate TextAnalysisEngine
AggregateAnalysisEngine_impl aggAe2 = new AggregateAnalysisEngine_impl();
aggAe2.initialize(aggDesc2, null);
@@ -505,7 +505,7 @@
// to the value of StringParam
assertEquals("Test1", TestAnnotator.stringParamValue);
// reconfigure
- aggAe2.setConfigParameterValue("IntParam", new Integer(0));
+ aggAe2.setConfigParameterValue("IntParam", Integer.valueOf(0));
aggAe2.reconfigure();
// test again - should not have changed
assertEquals("Test1", TestAnnotator.stringParamValue);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java Thu Jan 31 12:14:57 2008
@@ -118,8 +118,8 @@
// initialize a new TAE with parameters
HashMap map = new HashMap();
- map.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, new Integer(5));
- map.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, new Integer(60000));
+ map.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(5));
+ map.put(AnalysisEngine.PARAM_TIMEOUT_PERIOD, Integer.valueOf(60000));
MultiprocessingAnalysisEngine_impl mtae2 = new MultiprocessingAnalysisEngine_impl();
result = mtae2.initialize(mSimpleDesc, map);
Assert.assertTrue(result);
@@ -196,7 +196,7 @@
// multiple threads!
MultiprocessingAnalysisEngine_impl ae = new MultiprocessingAnalysisEngine_impl();
Map params = new HashMap();
- params.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, new Integer(3));
+ params.put(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS, Integer.valueOf(3));
ae.initialize(mAggDesc, params);
final int NUM_THREADS = 4;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FeaturePathTest.java Thu Jan 31 12:14:57 2008
@@ -89,7 +89,7 @@
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(new Short((short) 12), featurePath.getShortValue(cas
+ assertEquals(Short.valueOf((short) 12), featurePath.getShortValue(cas
.getDocumentAnnotation()));
assertEquals("12", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
@@ -107,7 +107,7 @@
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(new Float(1.12f), featurePath.getFloatValue(cas
+ assertEquals(Float.valueOf(1.12f), featurePath.getFloatValue(cas
.getDocumentAnnotation()));
assertEquals("1.12", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
@@ -125,7 +125,7 @@
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(new Double(100.5), featurePath.getDoubleValue(cas
+ assertEquals(Double.valueOf(100.5), featurePath.getDoubleValue(cas
.getDocumentAnnotation()));
assertEquals("100.5", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
@@ -143,7 +143,7 @@
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(new Long(2000), featurePath.getLongValue(cas
+ assertEquals(Long.valueOf(2000), featurePath.getLongValue(cas
.getDocumentAnnotation()));
assertEquals("2000", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
@@ -161,7 +161,7 @@
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(new Integer(5), featurePath.getIntValue(cas
+ assertEquals(Integer.valueOf(5), featurePath.getIntValue(cas
.getDocumentAnnotation()));
assertEquals("5", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
@@ -179,7 +179,7 @@
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(new Boolean(true), featurePath.getBooleanValue(cas
+ assertEquals(Boolean.valueOf(true), featurePath.getBooleanValue(cas
.getDocumentAnnotation()));
assertEquals("true", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
@@ -197,7 +197,7 @@
featurePath.initialize(path);
assertEquals(path, featurePath.getFeaturePath());
featurePath.typeInit(cas.getDocumentAnnotation().getType());
- assertEquals(new Byte((byte) 127), featurePath.getByteValue(cas
+ assertEquals(Byte.valueOf((byte) 127), featurePath.getByteValue(cas
.getDocumentAnnotation()));
assertEquals("127", featurePath.getValueAsString(cas
.getDocumentAnnotation()));
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java Thu Jan 31 12:14:57 2008
@@ -985,7 +985,7 @@
GetNumChildrenTestHandler(XmiCasSerializer xmiSer) {
this.xmiSer = xmiSer;
- childCountStack.push(new Integer(1));
+ childCountStack.push(Integer.valueOf(1));
}
/* (non-Javadoc)
@@ -994,7 +994,7 @@
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
// TODO Auto-generated method stub
super.startElement(uri, localName, qName, attributes);
- childCountStack.push(new Integer(xmiSer.getNumChildren()));
+ childCountStack.push(Integer.valueOf(xmiSer.getNumChildren()));
}
/* (non-Javadoc)
@@ -1010,7 +1010,7 @@
//decremenet child count of our parent
count = (Integer)childCountStack.pop();
- childCountStack.push(new Integer(count.intValue() - 1));
+ childCountStack.push(Integer.valueOf(count.intValue() - 1));
}
/* (non-Javadoc)
@@ -1020,7 +1020,7 @@
// text node is considered a child
if (length > 0) {
Integer count = (Integer)childCountStack.pop();
- childCountStack.push(new Integer(count.intValue() - 1));
+ childCountStack.push(Integer.valueOf(count.intValue() - 1));
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/examples/cpm/sofa/TransAnnotator.java Thu Jan 31 12:14:57 2008
@@ -115,12 +115,12 @@
private String Translate(String word) {
String lword = word.toLowerCase();
if (Arrays.equals(wThis, lword.toCharArray()))
- return new String("das");
+ return "das";
if (Arrays.equals(wBeer, lword.toCharArray()))
- return new String("bier");
+ return "bier";
if (Arrays.equals(wIs, lword.toCharArray()))
- return new String("ist");
- return new String("gut");
+ return "ist";
+ return "gut";
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java Thu Jan 31 12:14:57 2008
@@ -135,12 +135,12 @@
String[] strArr = (String[]) mContext.getConfigParameterValue("StringArrayParam");
Assert.assertEquals(Arrays.asList(new String[] { "one", "two" }), Arrays.asList(strArr));
Integer integer = (Integer) mContext.getConfigParameterValue("IntegerParam");
- Assert.assertEquals(new Integer(42), integer);
+ Assert.assertEquals(Integer.valueOf(42), integer);
Integer[] intArr = (Integer[]) mContext.getConfigParameterValue("IntegerArrayParam");
- Assert.assertEquals(Arrays.asList(new Integer[] { new Integer(1), new Integer(2),
- new Integer(3) }), Arrays.asList(intArr));
+ Assert.assertEquals(Arrays.asList(new Integer[] { Integer.valueOf(1), Integer.valueOf(2),
+ Integer.valueOf(3) }), Arrays.asList(intArr));
Float flt = (Float) mContext.getConfigParameterValue("FloatParam");
- Assert.assertEquals(new Float(3.14), flt);
+ Assert.assertEquals(Float.valueOf(3.14F), flt);
// default fallback
String str2 = (String) mContext2.getConfigParameterValue("StringParam");
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java Thu Jan 31 12:14:57 2008
@@ -102,13 +102,13 @@
"StringArrayParam", "BooleanArrayParam", "IntegerArrayParam", "FloatArrayParam" };
String theStr = "hello world";
- Boolean theBool = new Boolean(false);
- Integer theInt = new Integer(42);
- Float theFloat = new Float(2.718281828459045);
+ Boolean theBool = Boolean.valueOf(false);
+ Integer theInt = Integer.valueOf(42);
+ Float theFloat = Float.valueOf(2.718281828459045F);
String[] theStrArr = { "the", "quick", "brown", "fox" };
- Boolean[] theBoolArr = { new Boolean(false), new Boolean(true) };
- Integer[] theIntArr = { new Integer(1), new Integer(2), new Integer(3) };
- Float[] theFloatArr = { new Float(3.0), new Float(3.1), new Float(3.14) };
+ Boolean[] theBoolArr = { Boolean.valueOf(false), Boolean.valueOf(true) };
+ Integer[] theIntArr = { Integer.valueOf(1), Integer.valueOf(2), Integer.valueOf(3) };
+ Float[] theFloatArr = { Float.valueOf(3.0F), Float.valueOf(3.1F), Float.valueOf(3.14F) };
Object[] values = new Object[] { theStr, theBool, theInt, theFloat, theStrArr, theBoolArr,
theIntArr, theFloatArr };
@@ -127,7 +127,7 @@
// invalid settings
// wrong type
Exception ex = null;
- testResource1.setConfigParameterValue("StringParam", new Integer(13));
+ testResource1.setConfigParameterValue("StringParam", Integer.valueOf(13));
try {
testResource1.reconfigure();
} catch (ResourceConfigurationException e) {
@@ -146,8 +146,8 @@
// inappropriate array
ex = null;
- testResource1.setConfigParameterValue("FloatParam", new Float[] { new Float(0.1),
- new Float(0.2), new Float(0.3) });
+ testResource1.setConfigParameterValue("FloatParam", new Float[] { Float.valueOf(0.1F),
+ Float.valueOf(0.2F), Float.valueOf(0.3F) });
try {
testResource1.reconfigure();
} catch (ResourceConfigurationException e) {
@@ -157,7 +157,7 @@
// array required
ex = null;
- testResource1.setConfigParameterValue("BooleanArrayParam", new Boolean(true));
+ testResource1.setConfigParameterValue("BooleanArrayParam", Boolean.valueOf(true));
try {
testResource1.reconfigure();
} catch (ResourceConfigurationException e) {
@@ -194,14 +194,14 @@
new String[] { "StringParam", "StringArrayParam", "IntegerParam", "IntegerArrayParam" },
new String[] { "StringParam", "StringArrayParam", "FloatParam", "FloatArrayParam" } };
Object[][] grpValues = new Object[][] {
- new Object[] { "test", new String[] { "foo", "bar" }, new Integer(1024),
- new Integer[] { new Integer(1), new Integer(3), new Integer(5) } },
- new Object[] { "blah", new String[] { "abc", "def" }, new Integer(32768),
- new Integer[] { new Integer(-1), new Integer(-3), new Integer(-5) } },
- new Object[] { "?", new String[] { "+", "-" }, new Integer(112376),
- new Integer[] { new Integer(-1), new Integer(0), new Integer(1) } },
- new Object[] { "different", new String[] { "test", "ing" }, new Float(49.95),
- new Float[] { new Float(3.14), new Float(2.71), new Float(1.4) } } };
+ new Object[] { "test", new String[] { "foo", "bar" }, Integer.valueOf(1024),
+ new Integer[] { Integer.valueOf(1), Integer.valueOf(3), Integer.valueOf(5) } },
+ new Object[] { "blah", new String[] { "abc", "def" }, Integer.valueOf(32768),
+ new Integer[] { Integer.valueOf(-1), Integer.valueOf(-3), Integer.valueOf(-5) } },
+ new Object[] { "?", new String[] { "+", "-" }, Integer.valueOf(112376),
+ new Integer[] { Integer.valueOf(-1), Integer.valueOf(0), Integer.valueOf(1) } },
+ new Object[] { "different", new String[] { "test", "ing" }, Float.valueOf(49.95F),
+ new Float[] { Float.valueOf(3.14F), Float.valueOf(2.71F), Float.valueOf(1.4F) } } };
for (int i = 0; i < groupNames.length; i++) {
String[] paramsInGrp = grpParamNames[i];
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java Thu Jan 31 12:14:57 2008
@@ -31,7 +31,6 @@
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
-import org.apache.uima.impl.UIMAFramework_impl;
import org.apache.uima.internal.util.SerializationUtils;
import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
import org.apache.uima.resource.metadata.MetaDataObject;
@@ -67,25 +66,25 @@
apple1 = new TestFruitObject();
apple1.setAttributeValue("name", "Apple");
apple1.setAttributeValue("color", "red");
- apple1.setAttributeValue("avgWeightLbs", new Float(0.3));
- apple1.setAttributeValue("avgCostCents", new Integer(40));
- apple1.setAttributeValue("citrus", new Boolean(false));
+ apple1.setAttributeValue("avgWeightLbs", Float.valueOf(0.3F));
+ apple1.setAttributeValue("avgCostCents", Integer.valueOf(40));
+ apple1.setAttributeValue("citrus", Boolean.valueOf(false));
apple1.setAttributeValue("commonUses", new String[] { "baking", "snack" });
apple2 = new TestFruitObject();
apple2.setAttributeValue("name", "Apple");
apple2.setAttributeValue("color", "red");
- apple2.setAttributeValue("avgWeightLbs", new Float(0.3));
- apple2.setAttributeValue("avgCostCents", new Integer(40));
- apple2.setAttributeValue("citrus", new Boolean(false));
+ apple2.setAttributeValue("avgWeightLbs", Float.valueOf(0.3F));
+ apple2.setAttributeValue("avgCostCents", Integer.valueOf(40));
+ apple2.setAttributeValue("citrus", Boolean.valueOf(false));
apple2.setAttributeValue("commonUses", new String[] { "baking", "snack" });
orange = new TestFruitObject();
orange.setAttributeValue("name", "Orange");
orange.setAttributeValue("color", "orange");
- orange.setAttributeValue("avgWeightLbs", new Float(0.2));
- orange.setAttributeValue("avgCostCents", new Integer(50));
- orange.setAttributeValue("citrus", new Boolean(true));
+ orange.setAttributeValue("avgWeightLbs", Float.valueOf(0.2F));
+ orange.setAttributeValue("avgCostCents", Integer.valueOf(50));
+ orange.setAttributeValue("citrus", Boolean.valueOf(true));
orange.setAttributeValue("commonUses", new String[] { "snack", "juice" });
// create a fruit bag containing these three objects
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java?rev=617208&r1=617207&r2=617208&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java Thu Jan 31 12:14:57 2008
@@ -347,7 +347,7 @@
public void testEquals() throws Exception {
Level level = Level.SEVERE;
- Integer myInt = new Integer(70000);
+ Integer myInt = Integer.valueOf(70000);
// check if level is equal to "SEVERE"
Assert.assertTrue(level.equals(Level.SEVERE));
@@ -359,7 +359,7 @@
public void testisGreaterOrEqual() throws Exception {
Level level = Level.INFO;
- Integer myInt = new Integer(20000);
+ Integer myInt = Integer.valueOf(20000);
// check if level "ALL" is greater or equal to "INFO"
Assert.assertFalse(level.isGreaterOrEqual(Level.ALL));