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 2016/12/06 22:43:58 UTC
svn commit: r1772991 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima:
analysis_engine/impl/ cas/ cas/admin/ cas/impl/ internal/util/ jcas/cas/
resource/ util/impl/
Author: schor
Date: Tue Dec 6 22:43:58 2016
New Revision: 1772991
URL: http://svn.apache.org/viewvc?rev=1772991&view=rev
Log:
no jira remove TODO for auto javadoc (makes filtering for TODO noisy). Also remove javaObject scaffolding - this is now done another way. Also, remove unused class "FsIterator_allViews"
Removed:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIterator_allViews.java
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.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/Heap.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/SlotKinds.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringSet.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Constants.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java Tue Dec 6 22:43:58 2016
@@ -97,23 +97,19 @@ public abstract class AnalysisEngineImpl
* @see org.apache.uima.analysis_engine.AnalysisEngine#batchProcessComplete()
*/
public void batchProcessComplete() throws AnalysisEngineProcessException {
- // TODO Auto-generated method stub
-
+
}
/* (non-Javadoc)
* @see org.apache.uima.analysis_engine.AnalysisEngine#collectionProcessComplete()
*/
public void collectionProcessComplete() throws AnalysisEngineProcessException {
- // TODO Auto-generated method stub
-
}
/* (non-Javadoc)
* @see org.apache.uima.analysis_engine.AnalysisEngine#processAndOutputNewCASes(org.apache.uima.cas.CAS)
*/
public CasIterator processAndOutputNewCASes(CAS aCAS) throws AnalysisEngineProcessException {
- // TODO Auto-generated method stub
return null;
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java Tue Dec 6 22:43:58 2016
@@ -32,7 +32,6 @@ public class ParsingException extends Ex
public ParsingException() {
super();
- // TODO Auto-generated constructor stub
}
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java Tue Dec 6 22:43:58 2016
@@ -122,7 +122,6 @@ public class CASAdminException extends U
*/
@Override
public String getResourceBundleName() {
- // TODO Auto-generated method stub
return resourceBundleName;
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationTreeNodeImpl.java Tue Dec 6 22:43:58 2016
@@ -25,11 +25,7 @@ import org.apache.uima.cas.CASRuntimeExc
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationTreeNode;
-/**
- * TODO: Create type comment for AnnotationTreeNodeImpl.
- *
- *
- */
+
public class AnnotationTreeNodeImpl<T extends AnnotationFS> implements AnnotationTreeNode<T> {
private T annot;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BinaryCasSerDes6.java Tue Dec 6 22:43:58 2016
@@ -1624,8 +1624,6 @@ public class BinaryCasSerDes6 implements
vPrevModHeapRef = writeDiff(heapRef_i, v, vPrevModHeapRef); break;
}
case Slot_StrRef: writeString(((StringArray)fs).get(index)); break;
-
- case Slot_JavaObjectRef: throw new UnsupportedOperationException();
default:
Misc.internalError();
@@ -1679,7 +1677,6 @@ public class BinaryCasSerDes6 implements
}
break;
case Slot_StrRef: writeString(fs._getStringValueNc(fi)); break;
- case Slot_JavaObjectRef: throw new UnsupportedOperationException();
default: Misc.internalError();
} // end of Switch
offset = bs.nextSetBit(offset + 1);
@@ -2060,7 +2057,6 @@ public class BinaryCasSerDes6 implements
}
break;
- case Slot_JavaObjectRef: throw new UnsupportedOperationException();
default: Misc.internalError();
} // end of switch
}
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=1772991&r1=1772990&r2=1772991&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 Tue Dec 6 22:43:58 2016
@@ -510,11 +510,12 @@ public class CASImpl extends AbstractCas
private boolean traceFSisCreate;
private final IntVector id2addr = traceFSs ? new IntVector() : null;
private int nextId2Addr = 1; // only for tracing, to convert id's to v2 addresses
-
+ final private int initialHeapSize;
private SharedViewData(CASImpl baseCAS, int initialHeapSize, TypeSystemImpl tsi) {
this.baseCAS = baseCAS;
this.tsi = tsi;
+ this.initialHeapSize = initialHeapSize;
bcsd = new BinaryCasSerDes(baseCAS);
id2fs = new Id2FS(initialHeapSize);
if (traceFSs) id2addr.add(0);
@@ -5132,6 +5133,14 @@ public class CASImpl extends AbstractCas
private void restorePearContext() {
svd.previousJCasClassLoader = svd.suspendPreviousJCasClassLoader;
}
+
+ /**
+ *
+ * @return the initial heap size specified or defaulted
+ */
+ public int getInitialHeapSize() {
+ return this.svd.initialHeapSize;
+ }
// int allocIntData(int sz) {
//
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/Heap.java Tue Dec 6 22:43:58 2016
@@ -146,7 +146,7 @@ public final class Heap {
}
// Set position and max.
this.pos = shortHeap.length;
-// this.max = this.initialSize; // TODO fix me
+// this.max = this.initialSize;
this.max = this.heap.length; // heap could be repl by short heap
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/SlotKinds.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/SlotKinds.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/SlotKinds.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/SlotKinds.java Tue Dec 6 22:43:58 2016
@@ -126,8 +126,6 @@ public class SlotKinds {
Slot_Boolean( ! CAN_BE_NEGATIVE, 4, IN_MAIN_HEAP),
// next used to capture original heap size
Slot_MainHeap( IGNORED, 4, !IN_MAIN_HEAP),
- //TODO fix this
- Slot_JavaObjectRef( CAN_BE_NEGATIVE, 4, IN_MAIN_HEAP);
;
public final boolean canBeNegative;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringSet.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringSet.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringSet.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringSet.java Tue Dec 6 22:43:58 2016
@@ -23,7 +23,8 @@ import java.util.ArrayList;
import java.util.HashMap;
/**
- * Like string heap, but keeps strings in a set
+ * Like string heap, but keeps strings in a hashmap (for quick testing) and an array list.
+ * This is used to emulate how v2 keeps strings, to support backwards compatibility for low-level access
*
*/
final class StringSet {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2ObjHashMap.java Tue Dec 6 22:43:58 2016
@@ -217,8 +217,13 @@ public class Int2ObjHashMap<T> {
* @param clazz
* @param initialCapacity
*/
- private Int2ObjHashMap(Class<T> clazz, int initialCapacity,
- int sizeWhichTriggersExpansion, int size, int[] keys, T [] values) {
+ private Int2ObjHashMap(
+ Class<T> clazz,
+ int initialCapacity,
+ int sizeWhichTriggersExpansion,
+ int size,
+ int[] keys,
+ T[] values) {
this.componentType = clazz;
this.initialCapacity = Misc.nextHigherPowerOf2(initialCapacity);
this.sizeWhichTriggersExpansion = sizeWhichTriggersExpansion;
@@ -229,6 +234,7 @@ public class Int2ObjHashMap<T> {
}
private void newTableKeepSize(int capacity) {
+ // minimum size is 16
capacity = Math.max(16, Misc.nextHigherPowerOf2(capacity));
keys = new int[capacity];
values = (T[]) Array.newInstance(componentType, capacity);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSArrayList.java Tue Dec 6 22:43:58 2016
@@ -47,7 +47,7 @@ import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.util.impl.Constants;
-// TODO: Auto-generated Javadoc
+
/**
* An ArrayList type containing Feature Structures, for UIMA
* - Has all the methods of List
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/FSHashSet.java Tue Dec 6 22:43:58 2016
@@ -280,7 +280,7 @@ public final class FSHashSet <T extends
* @param <N> the generic type
* @param a the a
* @return the N[]
- * @see java.util.AbstractCollection#toArray(T[])
+ * @see java.util.AbstractCollection#toArray(Object[])
*/
public <N> N[] toArray(N[] a) {
if (isSaveNeeded) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java Tue Dec 6 22:43:58 2016
@@ -141,6 +141,8 @@ public interface ResourceManager {
*
* @param aName
* the name of a resource
+ *
+ * @param <N> the type of the Class
*
* @return the Class for the resource named <code>aName</code>, <code>null</code> if there is
* no resource registered under that name.
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Constants.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Constants.java?rev=1772991&r1=1772990&r2=1772991&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Constants.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/impl/Constants.java Tue Dec 6 22:43:58 2016
@@ -38,4 +38,5 @@ public interface Constants {
static File[] EMPTY_FILE_ARRAY = new File[0];
static URL[] EMPTY_URL_ARRAY = new URL[0];
static ConfigurationParameter[] EMPTY_CONFIG_PARM_ARRAY = new ConfigurationParameter[0];
+ static Object[] EMPTY_OBJ_ARRAY = new Object[0];
}