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 2015/11/02 22:06:25 UTC
svn commit: r1712157 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src:
main/java/org/apache/uima/cas/ main/java/org/apache/uima/cas/impl/
main/java/org/apache/uima/jcas/cas/
test/java/org/apache/uima/analysis_engine/impl/ test/java/org/apach...
Author: schor
Date: Mon Nov 2 21:06:25 2015
New Revision: 1712157
URL: http://svn.apache.org/viewvc?rev=1712157&view=rev
Log:
[UIMA-4663] change get_id() to id()
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/FeatureStructure.java Mon Nov 2 21:06:25 2015
@@ -353,6 +353,6 @@ public interface FeatureStructure {
* return the unique (to this CAS) id of this feature structure
*/
- int get_id();
+ int id()();
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Mon Nov 2 21:06:25 2015
@@ -1143,7 +1143,7 @@ public class CASImpl extends AbstractCas
* @param nbrOfConsecutive
*/
private void logFSUpdate(FeatureStructureImplC fs, FeatureImpl fi, int arrayIndexStart, int nbrOfConsecutive) {
- if (this.svd.trackingMark != null && !this.svd.trackingMark.isNew(fs.get_id())) {
+ if (this.svd.trackingMark != null && !this.svd.trackingMark.isNew(fs.id()())) {
//log the FS
//create or use last FsChange element
@@ -1926,7 +1926,7 @@ public class CASImpl extends AbstractCas
Type ti = getTypeSystemImpl().ll_getTypeForCode(typeCode);
TOP fs = createFS(ti);
svd.cache_not_in_index = fs;
- return fs.get_id();
+ return fs.id()();
}
public final int ll_createFS(int typeCode, boolean doCheck) {
@@ -1945,7 +1945,7 @@ public class CASImpl extends AbstractCas
* @see org.apache.uima.cas.impl.LowLevelCAS#ll_createArray(int, int)
*/
public int ll_createArray(int typeCode, int arrayLength) {
- return createArray(typeCode, arrayLength).get_id();
+ return createArray(typeCode, arrayLength).id()();
}
public int ll_createByteArray(int arrayLength) {
@@ -2010,7 +2010,7 @@ public class CASImpl extends AbstractCas
if (null == fs) {
return NULL;
}
- return ((FeatureStructureImplC)fs).get_id();
+ return ((FeatureStructureImplC)fs).id()();
}
@SuppressWarnings("unchecked")
@@ -2039,11 +2039,11 @@ public class CASImpl extends AbstractCas
}
public final int ll_getRefValue(int fsRef, int featureCode) {
- return getFsFromId_checked(fsRef).getFeatureValue(getTypeSystemImpl().getFeatureForCode_checked(featureCode)).get_id();
+ return getFsFromId_checked(fsRef).getFeatureValue(getTypeSystemImpl().getFeatureForCode_checked(featureCode)).id()();
}
public final int ll_getRefValueFeatOffset(int fsRef, int featureOffset) {
- return ((FeatureStructureImplC)getFsFromId_checked(fsRef)._refData[featureOffset]).get_id();
+ return ((FeatureStructureImplC)getFsFromId_checked(fsRef)._refData[featureOffset]).id()();
}
public final int ll_getIntValue(int fsRef, int featureCode, boolean doTypeChecks) {
@@ -2431,7 +2431,7 @@ public class CASImpl extends AbstractCas
}
public final int ll_getRefArrayValue(int fsRef, int position) {
- return ((TOP)getRefArrayValue(((FSArray)getFsFromId_checked(fsRef)), position)).get_id();
+ return ((TOP)getRefArrayValue(((FSArray)getFsFromId_checked(fsRef)), position)).id()();
}
private void throwAccessTypeError(int fsRef, int typeCode) {
@@ -2994,7 +2994,7 @@ public class CASImpl extends AbstractCas
}
public int ll_createAnnotation(int typeCode, int begin, int end) {
- return createAnnotation(getTypeSystemImpl().getTypeForCode(typeCode), begin, end).get_id();
+ return createAnnotation(getTypeSystemImpl().getTypeForCode(typeCode), begin, end).id()();
}
/**
@@ -3118,7 +3118,7 @@ public class CASImpl extends AbstractCas
FSIterator<FeatureStructure> it = getIndexRepository().getIndex(CAS.STD_ANNOTATION_INDEX, getTypeSystemImpl().docType).iterator();
if (it.isValid()) {
- return it.get().get_id();
+ return it.get().id()();
}
return 0;
}
@@ -3186,7 +3186,7 @@ public class CASImpl extends AbstractCas
* @return the addr of the sofaFS associated with this view, or 0
*/
public int ll_getSofa() {
- return mySofaIsValid() ? mySofaRef.get_id() : 0;
+ return mySofaIsValid() ? mySofaRef.id()() : 0;
}
public String getViewName() {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSsTobeAddedback.java Mon Nov 2 21:06:25 2015
@@ -62,7 +62,7 @@ abstract class FSsTobeAddedback implemen
private void logPart(FeatureStructureImplC fs, FSIndexRepositoryImpl view) {
log(view);
- System.out.format(", fs_id = %,d", fs.get_id());
+ System.out.format(", fs_id = %,d", fs.id()());
}
protected void log(FeatureStructureImplC fs, FSIndexRepositoryImpl view, int count) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImplC.java Mon Nov 2 21:06:25 2015
@@ -224,7 +224,7 @@ public class FeatureStructureImplC imple
public final int getAddress() { return _id; };
@Override
- public final int get_id() {return _id; };
+ public final int id()() {return _id; };
// backwards compatibility
@Override
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_bag.java Mon Nov 2 21:06:25 2015
@@ -83,7 +83,7 @@ public class FsIndex_bag<T extends Featu
* For bag indexes, compare equal only if identical addresses
*/
public int compare(FeatureStructure fs1, FeatureStructure fs2) {
- return (fs1 == fs2) ? 0 : (fs1.get_id() < fs2.get_id()) ? -1 : 1;
+ return (fs1 == fs2) ? 0 : (fs1.id()() < fs2.id()()) ? -1 : 1;
}
/*
@@ -183,7 +183,7 @@ public class FsIndex_bag<T extends Featu
@Override
protected void bulkAddTo(IntVector fss) {
- this.index.stream().mapToInt(FeatureStructureImplC::get_id).forEach(fss::add);
+ this.index.stream().mapToInt(FeatureStructureImplC::id()).forEach(fss::add);
}
/* (non-Javadoc)
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_flat.java Mon Nov 2 21:06:25 2015
@@ -140,7 +140,7 @@ public class FsIndex_flat<T extends Feat
// ordered case
// r is index if found, otherwise, (-(insertion point) - 1).
- int r = Arrays.binarySearch(indexedFSs, (FeatureStructureImplC) fs, (FeatureStructureImplC f1, FeatureStructureImplC f2) -> Integer.compare(f1.get_id(), f2.get_id()));
+ int r = Arrays.binarySearch(indexedFSs, (FeatureStructureImplC) fs, (FeatureStructureImplC f1, FeatureStructureImplC f2) -> Integer.compare(f1.id()(), f2.id()()));
return (r == 0) ? fs : null;
}
@@ -168,7 +168,7 @@ public class FsIndex_flat<T extends Feat
@Override
protected void bulkAddTo(IntVector v) {
- Arrays.stream(indexedFSs).mapToInt(FeatureStructureImplC::get_id).forEach(v::add);
+ Arrays.stream(indexedFSs).mapToInt(FeatureStructureImplC::id()).forEach(v::add);
}
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_set_sorted.java Mon Nov 2 21:06:25 2015
@@ -60,7 +60,7 @@ public class FsIndex_set_sorted<T extend
(FeatureStructure o1, FeatureStructure o2) -> {
final int c = compare(o1, o2);
// augment normal comparator with one that compares IDs if everything else equal
- return (c == 0) ? (Integer.compare(o1.get_id(), o2.get_id())) : c;})
+ return (c == 0) ? (Integer.compare(o1.id()(), o2.id()())) : c;})
: new TreeSet<FeatureStructure>( (FeatureStructure o1, FeatureStructure o2) -> compare(o1, o2));
}
@@ -188,7 +188,7 @@ public class FsIndex_set_sorted<T extend
@Override
protected void bulkAddTo(IntVector v) {
- this.indexedFSs.stream().mapToInt(fs -> ((FeatureStructureImplC)fs).get_id()).forEach(v::add);
+ this.indexedFSs.stream().mapToInt(fs -> ((FeatureStructureImplC)fs).id()()).forEach(v::add);
}
NavigableSet<FeatureStructure> getNavigableSet() { //used by FsIterator_sorted to compute various derivitive nav sets
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_singletype.java Mon Nov 2 21:06:25 2015
@@ -52,7 +52,7 @@ public abstract class FsIterator_singlet
if (comparator != null) {
return comparator.compare(this.get(), o.get());
}
- return Integer.compare(this.get().get_id(), o.get().get_id());
+ return Integer.compare(this.get().id()(), o.get().id()());
}
@Override
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_subtypes_ordered.java Mon Nov 2 21:06:25 2015
@@ -240,7 +240,7 @@ public class FsIterator_subtypes_ordered
// addresses. We need to do this in order to be able to ensure that a
// reverse iterator produces the reverse order of the forward iterator.
if (d == 0) {
- d = fsLeft.get_id() - fsRight.get_id();
+ d = fsLeft.id()() - fsRight.id()();
}
return d * dir < 0;
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelIterator.java Mon Nov 2 21:06:25 2015
@@ -42,7 +42,7 @@ public interface LowLevelIterator<T exte
* Iff the iterator is not valid.
*/
default int ll_get() throws NoSuchElementException {
- return get().get_id();
+ return get().id()();
};
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/MarkerImpl.java Mon Nov 2 21:06:25 2015
@@ -57,7 +57,7 @@ public class MarkerImpl implements Marke
if (!isValid || !cas.isInCAS(fs)) {
throw new CASRuntimeException(CASRuntimeException.CAS_MISMATCH, "FS and Marker are not from the same CAS.");
}
- return isNew(fs.get_id());
+ return isNew(fs.id()());
}
public boolean isModified(FeatureStructure aFs) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java Mon Nov 2 21:06:25 2015
@@ -132,7 +132,7 @@ public class Subiterator<T extends Annot
this.fsIndexRepo = fsIndexRepo;
moveToStart();
- startId = isValid() ? get().get_id() : 0;
+ startId = isValid() ? get().id()() : 0;
}
@@ -159,7 +159,7 @@ public class Subiterator<T extends Annot
private void moveToExact(T targetAnnotation) {
it.moveTo(targetAnnotation); // move to left-most equal one
while (it.isValid()) { // advance to the exact equal one
- if (targetAnnotation.get_id() == it.get().get_id()) {
+ if (targetAnnotation.id()() == it.get().id()()) {
break;
}
it.moveToNext();
@@ -338,7 +338,7 @@ public class Subiterator<T extends Annot
return;
}
- if (isValid() && it.get().get_id() == startId) {
+ if (isValid() && it.get().id()() == startId) {
it.moveToFirst();
it.moveToPrevious(); // make it invalid
} else {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArray.java Mon Nov 2 21:06:25 2015
@@ -32,5 +32,5 @@ public interface CommonArray {
void copyValuesFrom(CommonArray v);
- int get_id();
+ int id()();
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java Mon Nov 2 21:06:25 2015
@@ -28,9 +28,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Random;
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import org.apache.uima.Constants;
import org.apache.uima.ResourceSpecifierFactory;
import org.apache.uima.UIMAFramework;
@@ -47,7 +44,6 @@ import org.apache.uima.flow.FlowControll
import org.apache.uima.flow.impl.FlowControllerDescription_impl;
import org.apache.uima.internal.util.MultiThreadUtils;
import org.apache.uima.internal.util.SerializationUtils;
-import org.apache.uima.internal.util.Utilities;
import org.apache.uima.resource.ConfigurationManager;
import org.apache.uima.resource.ExternalResourceDependency;
import org.apache.uima.resource.ExternalResourceDescription;
@@ -87,9 +83,13 @@ import org.apache.uima.test.junit_extens
import org.apache.uima.util.CasCreationUtils;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.Logger;
+import org.apache.uima.util.Misc;
import org.apache.uima.util.XMLInputSource;
import org.apache.uima.util.XMLParser;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
/**
* Test the AnalysisEngineDescription_impl class.
*
@@ -312,7 +312,7 @@ public class AnalysisEngineDescription_i
p.put(Resource.PARAM_CONFIG_MANAGER, configManager);
p.put(Resource.PARAM_RESOURCE_MANAGER, UIMAFramework.newDefaultResourceManager());
p.put(Resource.PARAM_UIMA_CONTEXT, uimaContext);
- int numberOfThreads = Math.min(50, Utilities.numberOfCores * 5);
+ int numberOfThreads = Math.min(50, Misc.numberOfCores * 5);
final AnalysisEngine[] aes = new AnalysisEngine[numberOfThreads];
System.out.format("test multicore initialize with %d threads%n",
numberOfThreads);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplTest.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplTest.java Mon Nov 2 21:06:25 2015
@@ -23,9 +23,8 @@ import java.util.Random;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.uima.UIMAFramework;
import org.apache.uima.internal.util.MultiThreadUtils;
-import org.apache.uima.internal.util.Utilities;
+import org.apache.uima.util.Misc;
import junit.framework.TestCase;
@@ -39,7 +38,7 @@ public class AnalysisEngineManagementImp
// Try multi-threaded
final Random random = new Random();
final Set<String> s = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
- int numberOfThreads = Math.min(50, Utilities.numberOfCores * 5);
+ int numberOfThreads = Math.min(50, Misc.numberOfCores * 5);
MultiThreadUtils.Run2isb run2isb = new MultiThreadUtils.Run2isb() {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/Id2FSTest.java Mon Nov 2 21:06:25 2015
@@ -53,7 +53,7 @@ public class Id2FSTest extends TestCase
TOP fs1 = new TOP(jcas);
- int lastUsedId = fs1.get_id();
+ int lastUsedId = fs1.id()();
assertEquals(fs1, cas.<TOP>getFsFromId(lastUsedId));
// make 20 more that could be gc'd
@@ -99,7 +99,7 @@ public class Id2FSTest extends TestCase
fs1 = new TOP(jcas);
id2fs.add(fs1);
- lastUsedId = fs1.get_id();
+ lastUsedId = fs1.id()();
assertEquals(fs1, id2fs.get(lastUsedId));
for (int i = 0; i < 20; i++) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java?rev=1712157&r1=1712156&r2=1712157&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java Mon Nov 2 21:06:25 2015
@@ -515,7 +515,7 @@ public class IteratorTest extends TestCa
assertEquals(setIndexOverTokens.size(), 20);
int i = 0;
for (FeatureStructure fs : setIndexOverTokens) {
- expected[i++] = fs.get_id();
+ expected[i++] = fs.id()();
}
LowLevelIndexRepository llir = this.cas.ll_getIndexRepository();
@@ -528,7 +528,7 @@ public class IteratorTest extends TestCa
assertEquals(setIndexOverSentences.size(), 20);
i = 0;
for (FeatureStructure fs : setIndexOverSentences) {
- expected[i++] = fs.get_id();
+ expected[i++] = fs.id()();
}
setIndexForType = llir.ll_getIndex(CASTestSetup.ANNOT_SET_INDEX, ((TypeImpl)sentenceType).getCode());
@@ -539,7 +539,7 @@ public class IteratorTest extends TestCa
assertEquals(setIndex.size(), 60);
i = 0;
for (FeatureStructure fs : setIndex) {
- expected[i++] = fs.get_id();
+ expected[i++] = fs.id()();
}