Author: schor
Date: Wed May 25 14:24:10 2016
New Revision: 1745492
URL: http://svn.apache.org/viewvc?rev=1745492&view=rev
Log:
[UIMA-4674] switch refs to type system constants to always use the
TypeSystemConstants interface
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java?rev=1745492&r1=1745491&r2=1745492&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CasSerializerSupport.java
Wed May 25 14:24:10 2016
@@ -1217,10 +1217,10 @@ public class CasSerializerSupport {
*/
public static final int classifyType(TypeImpl ti) {
switch (ti.getCode()) {
- case TypeSystemImpl.intListTypeCode: return TYPE_CLASS_INTLIST;
- case TypeSystemImpl.floatListTypeCode: return TYPE_CLASS_FLOATLIST;
- case TypeSystemImpl.stringListTypeCode: return TYPE_CLASS_STRINGLIST;
- case TypeSystemImpl.fsListTypeCode: return TYPE_CLASS_FSLIST;
+ case TypeSystemConstants.intListTypeCode: return TYPE_CLASS_INTLIST;
+ case TypeSystemConstants.floatListTypeCode: return TYPE_CLASS_FLOATLIST;
+ case TypeSystemConstants.stringListTypeCode: return TYPE_CLASS_STRINGLIST;
+ case TypeSystemConstants.fsListTypeCode: return TYPE_CLASS_FSLIST;
default : return TypeSystemImpl.getTypeClass(ti);
}
}
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java?rev=1745492&r1=1745491&r2=1745492&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSClassRegistry.java
Wed May 25 14:24:10 2016
@@ -279,7 +279,7 @@ public class FSClassRegistry {
* - The second pass performs the conformance checks between the
loaded JCas cover classes, and the current type system.
* This depends on having the TypeImpl's javaClass field be accurate
(reflect any loaded JCas types)
*/
- maybeLoadJCasAndSubtypes(ts, ts.topType,
ts.jcasClassesInfo[TypeSystemImpl.topTypeCode]);
+ maybeLoadJCasAndSubtypes(ts, ts.topType,
ts.jcasClassesInfo[TypeSystemConstants.topTypeCode]);
checkConformance(ts, ts.topType);
// setupGettersSetters(ts, ts.topType, jcasClassesInfo);
}
@@ -605,7 +605,7 @@ public class FSClassRegistry {
* @return the info for this JCas that is shared across all type systems
under this class loader
*/
private static JCasClassInfo createJCasClassInfo(Class<?> jcasClass,
TypeImpl ti, int jcasType) {
- boolean noGenerator = ti.getCode() == TypeSystemImpl.sofaTypeCode ||
+ boolean noGenerator = ti.getCode() == TypeSystemConstants.sofaTypeCode ||
Modifier.isAbstract(jcasClass.getModifiers());
Object generator = noGenerator ? null : createGenerator(jcasClass,
ti.isArray());
JCasClassInfo jcasClassInfo = new JCasClassInfo(jcasClass, generator,
jcasType);
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java?rev=1745492&r1=1745491&r2=1745492&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureImpl.java
Wed May 25 14:24:10 2016
@@ -94,7 +94,7 @@ public class FeatureImpl implements Feat
this.slotKind = slotKind;
this.shortName = shortName;
this.isMultipleRefsAllowed = isMultipleRefsAllowed;
- this.isAnnotBaseSofaRef = (highestDefiningType.getCode() ==
TypeSystemImpl.annotBaseTypeCode) &&
shortName.equals(CAS.FEATURE_BASE_NAME_SOFA);
+ this.isAnnotBaseSofaRef = (highestDefiningType.getCode() ==
TypeSystemConstants.annotBaseTypeCode) &&
shortName.equals(CAS.FEATURE_BASE_NAME_SOFA);
this.isInInt = tsi.isInInt(rangeType);
this.rangeTypeClass = CasSerializerSupport.classifyType(rangeType);
typeImpl.addFeature(this); // might throw if existing feature with
different range
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java?rev=1745492&r1=1745491&r2=1745492&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FsIndex_singletype.java
Wed May 25 14:24:10 2016
@@ -224,30 +224,30 @@ public abstract class FsIndex_singletype
result = Misc.compareStrings(fs1._getStringValueNc(fi),
fs2._getStringValueNc(fi));
} else {
switch (keyTypeCodes[i]) {
- case TypeSystemImpl.booleanTypeCode:
+ case TypeSystemConstants.booleanTypeCode:
result = Integer.compare(fs1._getBooleanValueNc(fi) ? 1 : 0,
fs2._getBooleanValueNc(fi) ? 1 : 0);
break;
- case TypeSystemImpl.byteTypeCode:
+ case TypeSystemConstants.byteTypeCode:
result = Integer.compare(fs1._getByteValueNc(fi),
fs2._getByteValueNc(fi));
break;
- case TypeSystemImpl.shortTypeCode:
+ case TypeSystemConstants.shortTypeCode:
result = Integer.compare(fs1._getShortValueNc(fi),
fs2._getShortValueNc(fi));
break;
- case TypeSystemImpl.intTypeCode:
+ case TypeSystemConstants.intTypeCode:
result = Integer.compare(fs1._getIntValueNc(fi),
fs2._getIntValueNc(fi));
break;
- case TypeSystemImpl.longTypeCode:
+ case TypeSystemConstants.longTypeCode:
result = Long.compare(fs1._getLongValueNc(fi),
fs2._getLongValueNc(fi));
break;
- case TypeSystemImpl.floatTypeCode:
+ case TypeSystemConstants.floatTypeCode:
result = Float.compare(fs1._getFloatValueNc(fi),
fs2._getFloatValueNc(fi));
break;
- case TypeSystemImpl.doubleTypeCode:
+ case TypeSystemConstants.doubleTypeCode:
result = Double.compare(fs1._getDoubleValueNc(fi),
fs2._getDoubleValueNc(fi));
break;
// next is compared above before the switch
-// case TypeSystemImpl.stringTypeCode:
+// case TypeSystemConstants.stringTypeCode:
// result = Misc.compareStrings(fs1.getStringValueNc(fi),
fs2.getStringValueNc(fi));
// break;
} // end of switch
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java?rev=1745492&r1=1745491&r2=1745492&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
Wed May 25 14:24:10 2016
@@ -599,21 +599,21 @@ public class TypeImpl implements Type, C
// public String getJavaDescriptor() {
// // built-ins
// switch (typeCode) {
-// case TypeSystemImpl.booleanTypeCode: return "Z";
-// case TypeSystemImpl.byteTypeCode: return "B";
-// case TypeSystemImpl.shortTypeCode: return "S";
-// case TypeSystemImpl.intTypeCode: return "I";
-// case TypeSystemImpl.floatTypeCode: return "F";
-// case TypeSystemImpl.longTypeCode: return "J";
-// case TypeSystemImpl.doubleTypeCode: return "D";
-// case TypeSystemImpl.booleanArrayTypeCode: return "[Z";
-// case TypeSystemImpl.byteArrayTypeCode: return "[B";
-// case TypeSystemImpl.shortArrayTypeCode: return "[S";
-// case TypeSystemImpl.intArrayTypeCode: return "[I";
-// case TypeSystemImpl.floatArrayTypeCode: return "[F";
-// case TypeSystemImpl.longArrayTypeCode: return "[J";
-// case TypeSystemImpl.doubleArrayTypeCode: return "[D";
-// case TypeSystemImpl.stringArrayTypeCode: return "[Ljava/lang/String;";
+// case TypeSystemConstants.booleanTypeCode: return "Z";
+// case TypeSystemConstants.byteTypeCode: return "B";
+// case TypeSystemConstants.shortTypeCode: return "S";
+// case TypeSystemConstants.intTypeCode: return "I";
+// case TypeSystemConstants.floatTypeCode: return "F";
+// case TypeSystemConstants.longTypeCode: return "J";
+// case TypeSystemConstants.doubleTypeCode: return "D";
+// case TypeSystemConstants.booleanArrayTypeCode: return "[Z";
+// case TypeSystemConstants.byteArrayTypeCode: return "[B";
+// case TypeSystemConstants.shortArrayTypeCode: return "[S";
+// case TypeSystemConstants.intArrayTypeCode: return "[I";
+// case TypeSystemConstants.floatArrayTypeCode: return "[F";
+// case TypeSystemConstants.longArrayTypeCode: return "[J";
+// case TypeSystemConstants.doubleArrayTypeCode: return "[D";
+// case TypeSystemConstants.stringArrayTypeCode: return
"[Ljava/lang/String;";
// }
//
// if (isStringSubtype()) {
@@ -820,7 +820,7 @@ public class TypeImpl implements Type, C
(v instanceof String && isStringOrStringSubtype()) ||
((v instanceof FeatureStructureImplC) &&
subsumes( ((FeatureStructureImplC)v)._getTypeImpl())) ||
- this.getCode() == TypeSystemImpl.javaObjectTypeCode;
+ this.getCode() == TypeSystemConstants.javaObjectTypeCode;
}
int computeDepthFirstCode(int level) {
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?rev=1745492&r1=1745491&r2=1745492&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
Wed May 25 14:24:10 2016
@@ -85,7 +85,7 @@ public class XmiCasDeserializer {
private final static boolean IS_EXISTING_FS = false;
// SofaFS type
- private final static int sofaTypeCode = TypeSystemImpl.sofaTypeCode;
+ private final static int sofaTypeCode = TypeSystemConstants.sofaTypeCode;
private final static Pattern whiteSpace = Pattern.compile("\\s+");
@@ -587,7 +587,7 @@ public class XmiCasDeserializer {
doDeferFsOrThrow(idStr, nameSpaceURI, localName,
qualifiedName, attrs);
return; // no further processing of this element when
deferred. Subelements recorded though.
} else {
- if (currentType.getCode() == TypeSystemImpl.docTypeCode) { //
documentAnnotation
+ if (currentType.getCode() == TypeSystemConstants.docTypeCode)
{ // documentAnnotation
fs = casView.getDocumentAnnotation(); // gets existing one
or creates a new one
} else {
fs = casView.createFS(currentType); // not document
annotation
@@ -747,7 +747,7 @@ public class XmiCasDeserializer {
// // translate sofa's xmi:id into its sofanum
// int sofaXmiId = Integer.parseInt(sofa);
// int sofaAddr = getFsForXmiId(sofaXmiId);
-// sofaNum = casBeingFilled.getFeatureValue(sofaAddr,
TypeSystemImpl.sofaNumFeatCode);
+// sofaNum = casBeingFilled.getFeatureValue(sofaAddr,
TypeSystemConstants.sofaNumFeatCode);
// }
// indexRep = (FSIndexRepositoryImpl) indexRepositories.get(sofaNum);
@@ -851,7 +851,7 @@ public class XmiCasDeserializer {
// before looping over all features for this FS, remove this FS if in
any index.
// we do this once, before the feature setting loop, because that loop
may set a sofa Ref which is
// invalid (to be fixed up later). But the removal code needs a valid
sofa ref.
- if (!isNewFs || fs._getTypeCode() == TypeSystemImpl.docTypeCode) {
+ if (!isNewFs || fs._getTypeCode() == TypeSystemConstants.docTypeCode) {
casBeingFilled.removeFromCorruptableIndexAnyView(fs,
casBeingFilled.getAddbackSingle());
// else clause not needed because caller does ll_createFS which sets
this anyways
// } else {
@@ -892,7 +892,7 @@ public class XmiCasDeserializer {
}
} // end of all features loop
- if (!isNewFs || fs._getTypeCode() == TypeSystemImpl.docTypeCode) {
+ if (!isNewFs || fs._getTypeCode() == TypeSystemConstants.docTypeCode) {
casBeingFilled.addbackSingle(fs);
}
@@ -1003,7 +1003,7 @@ public class XmiCasDeserializer {
* @throws SAXException -
*/
private void handleFeatSingleValue(TOP fs, FeatureImpl fi, String featVal)
throws SAXException {
- if ((fs instanceof AnnotationBase) && (fi.getCode() ==
TypeSystemImpl.annotBaseSofaFeatCode)) {
+ if ((fs instanceof AnnotationBase) && (fi.getCode() ==
TypeSystemConstants.annotBaseSofaFeatCode)) {
// the sofa feature is set when the FS is created, can't be set
separately
return;
}
@@ -1644,7 +1644,7 @@ public class XmiCasDeserializer {
} else if (currentType != null) {
- if (currentType.isArray() && currentType.getCode() !=
TypeSystemImpl.byteArrayTypeCode) {
+ if (currentType.isArray() && currentType.getCode() !=
TypeSystemConstants.byteArrayTypeCode) {
// create the array now. elements may have been provided either
as
// attributes or child elements, but not both.
// BUT - not byte arrays! They are created immediately, to avoid
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java?rev=1745492&r1=1745491&r2=1745492&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/util/CasCopier.java
Wed May 25 14:24:10 2016
@@ -33,6 +33,7 @@ import org.apache.uima.cas.SofaFS;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.cas.impl.TypeSystemConstants;
import org.apache.uima.cas.impl.TypeSystemImpl;
import org.apache.uima.internal.util.Int2ObjListMap;
import org.apache.uima.internal.util.Misc;
@@ -1018,7 +1019,7 @@ public class CasCopier {
* DocumentAnnotation that CAS.getDocumentAnnotation() would return.
*/
private <T extends FeatureStructure> boolean isDocumentAnnotation(T aFS) {
- if (((TOP)aFS)._getTypeCode() != TypeSystemImpl.docTypeCode) {
+ if (((TOP)aFS)._getTypeCode() != TypeSystemConstants.docTypeCode) {
return false;
}
if (srcCasDocumentAnnotation == null) {
