svn commit: r1711780 - /uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java

[sc...@apache.org]

Author: schor
Date: Sun Nov  1 14:38:42 2015
New Revision: 1711780

URL: http://svn.apache.org/viewvc?rev=1711780&view=rev
Log:
[UIMA-4673] renames of internal type impl classes

Modified:
    uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java?rev=1711780&r1=1711779&r2=1711780&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASMgrSerializer.java Sun Nov  1 14:38:42 2015
@@ -261,7 +261,7 @@ public class CASMgrSerializer implements
       // array.
       this.comparatorIndex[i] = compPos;
       // Get the comparator.
-      comp = ((FSIndexImpl) indexVector.get(i)).getComparator();
+      comp = ((FSIndex_Impl) indexVector.get(i)).getComparatorForIndexSpecs();
       // Encode the type of the comparator.
       comps.add(((TypeImpl) comp.getType()).getCode());
       // How many keys in the comparator?
@@ -293,7 +293,9 @@ public class CASMgrSerializer implements
   }
 
   public void addTypeSystem(TypeSystemImpl ts) {
-    this.typeNames = symbolTable2StringArray(ts.getTypeNameST());
+    this.typeNames = ts.types()
+                       .map(type -> type.getName())
+                       .toArray(String[]::new);
     encodeTypeInheritance(ts);
     encodeFeatureDecls(ts);
     encodeStringSubtypes(ts);
@@ -305,11 +307,11 @@ public class CASMgrSerializer implements
     this.stringSubtypes = new int[size];
     this.stringSubtypeValuePos = new int[size];
     List<String> strVals = new ArrayList<String>();
-    StringTypeImpl type;
+    TypeImplString type;
     int pos = 0, typeCode;
     String[] stringSet;
     for (int i = 0; i < size; i++) {
-      type = (StringTypeImpl) list.get(i);
+      type = (TypeImplString) list.get(i);
       typeCode = type.getCode();
       this.stringSubtypes[i] = typeCode;
       this.stringSubtypeValuePos[i] = pos;
@@ -438,7 +440,7 @@ public class CASMgrSerializer implements
         } else if (TypeSystemImpl.isArrayTypeNameButNotBuiltIn(name)) {
         	  ts.getArrayType(ts.getType(TypeSystemImpl.getArrayComponentName(name)));
         } else {
-            ts.addType(name, this.typeInheritance[i]);
+            ts.addType(name, ts.ll_getTypeForCode(this.typeInheritance[i]));
         }
       }
 //    }
@@ -451,7 +453,9 @@ public class CASMgrSerializer implements
 //      } else {
         name = this.featureNames[i];
 //      }
-      ts.addFeature(name, this.featDecls[i * 3], this.featDecls[(i * 3) + 1],
+      ts.addFeature(name, 
+                    ts.ll_getTypeForCode(this.featDecls[i * 3]), 
+                    ts.ll_getTypeForCode(this.featDecls[(i * 3) + 1]),
                     this.featDecls[(i * 3) + 2] == 1);
     }
     return ts;