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 2017/10/13 17:24:57 UTC
svn commit: r1812155 - in /uima/uv3/uimaj-v3/trunk/uimaj-core/src:
main/java/org/apache/uima/cas/
test/java/org/apache/uima/analysis_engine/impl/
Author: schor
Date: Fri Oct 13 17:24:57 2017
New Revision: 1812155
URL: http://svn.apache.org/viewvc?rev=1812155&view=rev
Log:
no Jira - fix spelling in comment, fix test case in case type system commit returns different ts
Modified:
uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecTest.java
uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecWithTypeSystemTest.java
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java?rev=1812155&r1=1812154&r2=1812155&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/cas/TypeSystem.java Fri Oct 13 17:24:57 2017
@@ -80,7 +80,7 @@ public interface TypeSystem {
* The type of the elements of the resulting array type. This can be any type, even
* another array type.
* @return The array type with the corresponding component type.
- * If it doesn't exist, a new TypeImplArray is created for it.
+ * If it doesn't exist, a new TypeImpl_array is created for it.
*/
Type getArrayType(Type componentType);
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecTest.java?rev=1812155&r1=1812154&r2=1812155&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecTest.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecTest.java Fri Oct 13 17:24:57 2017
@@ -30,6 +30,7 @@ import org.apache.uima.analysis_engine.R
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
+import org.apache.uima.cas.TypeSystem;
import org.apache.uima.cas.admin.CASFactory;
import org.apache.uima.cas.admin.TypeSystemMgr;
import org.apache.uima.test.junit_extension.JUnitExtension;
@@ -49,11 +50,12 @@ public class ResultSpecTest extends Test
// types
- private static final TypeSystemMgr ts = CASFactory.createTypeSystem();
- private static final Type t1 = ts.addType("T1", ts.getTopType());
- private static final Feature f1 = ts.addFeature("F1", t1, t1);
- private static final Feature f1a = ts.addFeature("F1a", t1, t1);
- static {ts.commit();};
+ private static final TypeSystemMgr tsm = CASFactory.createTypeSystem();
+ private static final Type t1 = tsm.addType("T1", tsm.getTopType());
+ private static final Feature f1 = tsm.addFeature("F1", t1, t1);
+ private static final Feature f1a = tsm.addFeature("F1a", t1, t1);
+ private static final TypeSystem ts;
+ static {ts = tsm.commit();};
/**
* Tests for https://issues.apache.org/jira/browse/UIMA-1840
Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecWithTypeSystemTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecWithTypeSystemTest.java?rev=1812155&r1=1812154&r2=1812155&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecWithTypeSystemTest.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecWithTypeSystemTest.java Fri Oct 13 17:24:57 2017
@@ -47,16 +47,17 @@ public class ResultSpecWithTypeSystemTes
// types
- private static final TypeSystemMgr ts = CASFactory.createTypeSystem();
- private static final Type t1 = ts.addType("T1", ts.getTopType());
- private static final Type t2 = ts.addType("T2", t1);
- private static final Type t3 = ts.addType("T3", t2);
- private static final Type t4 = ts.addType("T4", t1); // doesn't inherit from t2
- private static final Feature f1 = ts.addFeature("F1", t1, t1);
- private static final Feature f2 = ts.addFeature("F2", t2, t3);
- private static final Feature f3 = ts.addFeature("F3", t3, t3);
- private static final Feature f4 = ts.addFeature("F4", t4, t4);
- static {ts.commit();};
+ private static final TypeSystemMgr tsm = CASFactory.createTypeSystem();
+ private static final Type t1 = tsm.addType("T1", tsm.getTopType());
+ private static final Type t2 = tsm.addType("T2", t1);
+ private static final Type t3 = tsm.addType("T3", t2);
+ private static final Type t4 = tsm.addType("T4", t1); // doesn't inherit from t2
+ private static final Feature f1 = tsm.addFeature("F1", t1, t1);
+ private static final Feature f2 = tsm.addFeature("F2", t2, t3);
+ private static final Feature f3 = tsm.addFeature("F3", t3, t3);
+ private static final Feature f4 = tsm.addFeature("F4", t4, t4);
+ private static final TypeSystem ts;
+ static {ts = tsm.commit();};
// TypeOrFeature instances
private static TypeOrFeature makeTof(String name, boolean isType, boolean allFeats) {