Author: schor
Date: Thu Jun 2 16:14:59 2016
New Revision: 1746599
URL: http://svn.apache.org/viewvc?rev=1746599&view=rev
Log:
[UIMA-4673] [UIMA-4674] support for array values for some type impl things.
_typeImpl not final (to support ll_setInt backward compatibility), change refs
to it to _getTypeImpl() for protection
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java?rev=1746599&r1=1746598&r2=1746599&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/cvd/FSNode.java
Thu Jun 2 16:14:59 2016
@@ -27,6 +27,7 @@ import org.apache.uima.cas.Feature;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.SlotKinds.SlotKind;
+import org.apache.uima.internal.util.Misc;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.jcas.cas.BooleanArray;
import org.apache.uima.jcas.cas.ByteArray;
@@ -40,7 +41,6 @@ import org.apache.uima.jcas.cas.ShortArr
import org.apache.uima.jcas.cas.StringArray;
import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.util.Misc;
/**
* A node in the FS Tree Model
@@ -240,7 +240,7 @@ public class FSNode extends FSTreeNode {
this.children = FSTreeModel.createArrayChildren(0, arrayLength,
arrayNodes, this.fSTreeModel);
} else {
this.children = new ArrayList<FSTreeNode>(type.getNumberOfFeatures());
- List<FeatureImpl> feats = type.getFeatureImpls();
+ FeatureImpl[] feats = type.getFeatureImpls();
for (FeatureImpl f : feats) {
SlotKind kind = f.getSlotKind();
int nc = k2nc(kind);
@@ -399,7 +399,7 @@ public class FSNode extends FSTreeNode {
}
TypeImpl getType() {
- return fs._typeImpl;
+ return fs._getTypeImpl();
}
public boolean isAnnotation() {
