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/05/13 19:29:03 UTC
svn commit: r1743730 -
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/
Author: schor
Date: Fri May 13 19:29:03 2016
New Revision: 1743730
URL: http://svn.apache.org/viewvc?rev=1743730&view=rev
Log:
[UIMA-4674] _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-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.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/TypeSystemImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.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/cas/impl/XmiCasSerializer.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java?rev=1743730&r1=1743729&r2=1743730&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LinearTypeOrderBuilderImpl.java Fri May 13 19:29:03 2016
@@ -111,8 +111,8 @@ public class LinearTypeOrderBuilderImpl
*/
@Override
public int compare(FeatureStructure fs1, FeatureStructure fs2) {
- TypeImpl t1 = ((FeatureStructureImplC)fs1)._typeImpl;
- TypeImpl t2 = ((FeatureStructureImplC)fs2)._typeImpl;
+ TypeImpl t1 = ((FeatureStructureImplC)fs1)._getTypeImpl();
+ TypeImpl t2 = ((FeatureStructureImplC)fs2)._getTypeImpl();
if (t1 == t2) return 0;
return Short.compare(this.typeCodeToOrder[t1.getCode()],
this.typeCodeToOrder[t2.getCode()]);
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=1743730&r1=1743729&r2=1743730&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 Fri May 13 19:29:03 2016
@@ -819,7 +819,7 @@ public class TypeImpl implements Type, C
return (v == null && (isRefType || isStringOrStringSubtype())) ||
(v instanceof String && isStringOrStringSubtype()) ||
((v instanceof FeatureStructureImplC) &&
- subsumes( ((FeatureStructureImplC)v)._typeImpl)) ||
+ subsumes( ((FeatureStructureImplC)v)._getTypeImpl())) ||
this.getCode() == TypeSystemImpl.javaObjectTypeCode;
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java?rev=1743730&r1=1743729&r2=1743730&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java Fri May 13 19:29:03 2016
@@ -2505,8 +2505,8 @@ public class TypeSystemImpl implements T
*/
void fixupFSArrayTypes(TypeImpl featRange, TOP arrayFs) {
if (featRange.isTypedFsArray()) {
- if (arrayFs._typeImpl.getComponentType().subsumesStrictly(featRange.getComponentType())) {
- arrayFs._typeImpl = featRange; // replace more general type with more specific type
+ if (arrayFs._getTypeImpl().getComponentType().subsumesStrictly(featRange.getComponentType())) {
+ arrayFs._setTypeImpl(featRange); // replace more general type with more specific type
}
}
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java?rev=1743730&r1=1743729&r2=1743730&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java Fri May 13 19:29:03 2016
@@ -588,7 +588,7 @@ public class XCASDeserializer {
// Create a feature value from a string representation.
private void handleFeature(TOP fs, String featName, String featVal, boolean lenient)
throws SAXParseException {
- Type type = fs._typeImpl;
+ Type type = fs._getTypeImpl();
handleFeature(type, fs, featName, featVal, lenient);
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java?rev=1743730&r1=1743729&r2=1743730&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java Fri May 13 19:29:03 2016
@@ -142,7 +142,7 @@ public class XCASSerializer {
// at this point we don't know if this FS is indexed
queued.put(fs, NOT_INDEXED);
queue.push(fs);
- final int typeClass = classifyType(fs._typeImpl);
+ final int typeClass = classifyType(fs._getTypeImpl());
if (typeClass == LowLevelCAS.TYPE_CLASS_FS) {
if (mOutOfTypeSystemData != null) {
enqueueOutOfTypeSystemFeatures(fs);
@@ -363,7 +363,7 @@ public class XCASSerializer {
for (int i = 0; i < max; i++) {
TOP fs = indexedFSs.get(i);
int typeCode = fs._getTypeCode();
- final int typeClass = classifyType(fs._typeImpl);
+ final int typeClass = classifyType(fs._getTypeImpl());
if (typeClass == LowLevelCAS.TYPE_CLASS_FS) {
if (mOutOfTypeSystemData != null) {
enqueueOutOfTypeSystemFeatures(fs);
@@ -429,7 +429,7 @@ public class XCASSerializer {
// actually referenced.
// xmlStack.addAttribute(ID_ATTR_NAME, Integer.toString(fs_id));
addAttribute(workAttrs, ID_ATTR_NAME, Integer.toString(fs._id));
- final int typeClass = classifyType(fs._typeImpl);
+ final int typeClass = classifyType(fs._getTypeImpl());
// Call special code according to the type of the FS (special
// treatment
// for arrays).
@@ -508,7 +508,7 @@ public class XCASSerializer {
}
private void encodeFSArray(FSArray fs, AttributesImpl attrs) throws SAXException {
- String typeName = fs._typeImpl.getName();
+ String typeName = fs._getTypeImpl().getName();
final int size = fs.size();
// int pos = cas.getArrayStartAddress(fs_id);
// xmlStack.addAttribute(ARRAY_SIZE_ATTR, Integer.toString(size));
@@ -569,7 +569,7 @@ public class XCASSerializer {
* Encode features of a regular (non-array) FS.
*/
private void encodeFeatures(TOP fs, AttributesImpl attrs) {
- TypeImpl ti = fs._typeImpl;
+ TypeImpl ti = fs._getTypeImpl();
for (FeatureImpl fi : ti.getFeatureImpls()) {
String attrValue;
@@ -586,7 +586,7 @@ public class XCASSerializer {
}
private void enqueueFeatures(TOP fs, int heapValue) {
- TypeImpl ti = fs._typeImpl;
+ TypeImpl ti = fs._getTypeImpl();
for (FeatureImpl fi : ti.getFeatureImpls()) {
if (fi.getRangeImpl().isRefType) {
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=1743730&r1=1743729&r2=1743730&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 Fri May 13 19:29:03 2016
@@ -816,7 +816,7 @@ public class XmiCasDeserializer {
// Hang on to FS for setting content feature (things coded as child xml elements)
this.currentFs = fs;
String attrName, attrValue;
- final TypeImpl type = fs._typeImpl;
+ final TypeImpl type = fs._getTypeImpl();
final int typeCode = type.getCode();
// if (fs instanceof Sofa) {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java?rev=1743730&r1=1743729&r2=1743730&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java Fri May 13 19:29:03 2016
@@ -878,7 +878,7 @@ public class XmiCasSerializer {
// // set isSofa flag to apply SofaID mapping and to store sofaNum->xmi:id mapping
// isSofa = true;
// }
- for (final FeatureImpl fi : fs._typeImpl.getFeatureImpls()) {
+ for (final FeatureImpl fi : fs._getTypeImpl().getFeatureImpls()) {
if (cds.isFiltering) {
// skip features that aren't in the target type system
@@ -1050,7 +1050,7 @@ public class XmiCasSerializer {
} else { // not null
String xmiId = cds.getXmiId(elemFS);
if (cds.isFiltering) { // return as null any references to types not in target TS
- String typeName = elemFS._typeImpl.getName();
+ String typeName = elemFS._getTypeImpl().getName();
if (cds.filterTypeSystem.getType(typeName) == null) {
xmiId = "0";
}