svn commit: r540312 [1/4] - in /incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: cas/admin/ cas/impl/ jcas/impl/

[sc...@apache.org]

Author: schor
Date: Mon May 21 14:49:16 2007
New Revision: 540312

URL: http://svn.apache.org/viewvc?view=rev&rev=540312
Log:
[UIMA-409] This is the main update for 409.  I believe I merged in all of Thilo's changes.

Modified:
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASFactory.java
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.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/CASMgrSerializer.java
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASSerializer.java
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSLeafIndexImpl.java
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortArrayFSImpl.java
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.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/XmiCasSerializer.java
    incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASFactory.java?view=diff&rev=540312&r1=540311&r2=540312
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASFactory.java Mon May 21 14:49:16 2007
@@ -98,7 +98,6 @@
    */
   public static TypeSystemMgr createTypeSystem() {
     TypeSystemImpl ts = new TypeSystemImpl();
-    CASImpl.setupTSDefault(ts);
     return ts;
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java?view=diff&rev=540312&r1=540311&r2=540312
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java Mon May 21 14:49:16 2007
@@ -70,7 +70,7 @@
    * @see org.apache.uima.cas.text.AnnotationFS#getStart()
    */
   public int getBegin() {
-    return this.casImpl.getFeatureValue(addr, this.casImpl.startFeatCode);
+    return this.casImpl.getFeatureValue(addr, this.casImpl.getTypeSystemImpl().startFeatCode);
     // return ((CASImpl) this.casImpl).getStartFeat(this.addr);
   }
 
@@ -78,7 +78,7 @@
    * @see org.apache.uima.cas.text.AnnotationFS#getEnd()
    */
   public int getEnd() {
-    return this.casImpl.getFeatureValue(addr, this.casImpl.endFeatCode);
+    return this.casImpl.getFeatureValue(addr, this.casImpl.getTypeSystemImpl().endFeatCode);
     // return ((CASImpl) this.casImpl).getEndFeat(this.addr);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java?view=diff&rev=540312&r1=540311&r2=540312
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java Mon May 21 14:49:16 2007
@@ -70,21 +70,21 @@
    * @see org.apache.uima.cas.ArrayFS#copyFromArray(FeatureStructure[], int, int, int)
    */
   public void copyFromArray(byte[] src, int srcOffset, int destOffset, int length) {
-    copyFromJavaArray(src, srcOffset, this.casImpl.byteHeap.heap, destOffset, length);
+    copyFromJavaArray(src, srcOffset, this.casImpl.getByteHeap().heap, destOffset, length);
   }
 
   /**
    * @see org.apache.uima.cas.ArrayFS#copyToArray(int, FeatureStructure[], int, int)
    */
   public void copyToArray(int srcOffset, byte[] dest, int destOffset, int length) {
-    copyToJavaArray(this.casImpl.byteHeap.heap, srcOffset, dest, destOffset, length);
+    copyToJavaArray(this.casImpl.getByteHeap().heap, srcOffset, dest, destOffset, length);
   }
 
   /**
    * @see org.apache.uima.cas.ArrayFS#toArray()
    */
   public byte[] toArray() {
-    return (byte[]) toArray(this.casImpl.byteHeap.heap);
+    return (byte[]) toArray(this.casImpl.getByteHeap().heap);
   }
 
   /**
@@ -92,8 +92,8 @@
    */
   public void copyToArray(int srcOffset, String[] dest, int destOffset, int length) {
     casImpl.checkArrayBounds(addr, srcOffset, length);
-    final int startOffset = srcOffset + casImpl.heap.heap[casImpl.getArrayStartAddress(addr)];
-    final byte[] heap = this.casImpl.byteHeap.heap;
+    final int startOffset = srcOffset + casImpl.getHeap().heap[casImpl.getArrayStartAddress(addr)];
+    final byte[] heap = this.casImpl.getByteHeap().heap;
     for (int i = 0; i < length; i++) {
       dest[i + destOffset] = Byte.toString(heap[i + startOffset]);
     }
@@ -104,8 +104,8 @@
    */
   public void copyFromArray(String[] src, int srcOffset, int destOffset, int length) {
     this.casImpl.checkArrayBounds(this.addr, destOffset, length);
-    final int startOffset = destOffset + casImpl.heap.heap[casImpl.getArrayStartAddress(this.addr)];
-    byte[] heap = this.casImpl.byteHeap.heap;
+    final int startOffset = destOffset + casImpl.getHeap().heap[casImpl.getArrayStartAddress(this.addr)];
+    byte[] heap = this.casImpl.getByteHeap().heap;
     for (int i = 0; i < length; i++) {
       heap[i + startOffset] = Byte.parseByte(src[i + srcOffset]);
     }