Author: schor
Date: Mon Nov 2 20:50:46 2015
New Revision: 1712152
URL: http://svn.apache.org/viewvc?rev=1712152&view=rev
Log: (empty)
Removed:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation_Type.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence_Type.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation_Type.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token_Type.java
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java?rev=1712152&r1=1712151&r2=1712152&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/CrossAnnotation.java
Mon Nov 2 20:50:46 2015
@@ -19,55 +19,91 @@
package org.apache.uima.cas.test;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.cas.TOP_Type;
-import org.apache.uima.jcas.tcas.Annotation;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
-/**
- * An annotation holding another annotation.
- */
-public class CrossAnnotation extends Annotation {
+import org.apache.uima.jcas.tcas.Annotation;
- public final static int typeIndexID =
org.apache.uima.jcas.JCasRegistry.register(CrossAnnotation.class);
+/**
+ * Updated by JCasGen Mon Nov 02 14:34:51 EST 2015
+ * XML source:
C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
+ * @generated */
+public class CrossAnnotation extends Annotation {
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static int typeIndexID =
JCasRegistry.register(CrossAnnotation.class);
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
public final static int type = typeIndexID;
-
- public int getTypeIndexID() {
- return typeIndexID;
- }
-
- // Never called. Disable default constructor
- protected CrossAnnotation() {
- //do nothing
- }
-
- /* Internal - Constructor used by generator */
- public CrossAnnotation(int addr, TOP_Type type) {
- super(addr, type);
- }
-
+ /** @generated
+ * @return index of the type
+ */
+ @Override
+ public int getTypeIndexID() {return typeIndexID;}
+
+
+ /* *****************
+ * Local Data *
+ * *****************/
+ private Annotation _F_otherAnnotation; //
+
+ /** Never called. Disable default constructor
+ * @generated */
+ protected CrossAnnotation() {/* intentionally empty block */}
+
+ /** Internal - constructor used by generator
+ * @generated
+ * @param casImpl the CAS this Feature Structure belongs to
+ * @param type the type of this Feature Structure
+ */
+ public CrossAnnotation(TypeImpl type, CASImpl casImpl) {
+ super(type, casImpl);
+ readObject();
+ }
+
+ /** @generated
+ * @param jcas JCas to which this Feature Structure belongs
+ */
public CrossAnnotation(JCas jcas) {
super(jcas);
- }
+ readObject();
+ }
- // *------------------*
- // * Feature: otherAnnotation
- /* getter for otherAnnotation * */
- public Annotation getOtherAnnotation() {
- if (CrossAnnotation_Type.featOkTst
- && ((CrossAnnotation_Type) jcasType).casFeat_otherAnnotation ==
null)
- this.jcasType.jcas.throwFeatMissing("otherAnnotation",
"uima.tcas.CrossAnnotation");
- return (Annotation)
(jcasType.ll_cas.ll_getFSForRef(jcasType.ll_cas.ll_getRefValue(addr,
- ((CrossAnnotation_Type) jcasType).casFeatCode_otherAnnotation)));
- }
-
- /* setter for otherAnnotation * */
+ /**
+ * <!-- begin-user-doc -->
+ * Write your own initialization here
+ * <!-- end-user-doc -->
+ *
+ * @generated modifiable
+ */
+ private void readObject() {/*default - does nothing empty block */}
+
+
+
+ //*--------------*
+ //* Feature: otherAnnotation
+
+ /** getter for otherAnnotation - gets
+ * @generated
+ * @return value of the feature
+ */
+ public Annotation getOtherAnnotation() { return _F_otherAnnotation;}
+
+ /** setter for otherAnnotation - sets
+ * @generated
+ * @param v value to set into the feature
+ */
public void setOtherAnnotation(Annotation v) {
- if (CrossAnnotation_Type.featOkTst
- && ((CrossAnnotation_Type) jcasType).casFeat_otherAnnotation ==
null)
- this.jcasType.jcas.throwFeatMissing("otherAnnotation",
"uima.tcas.CrossAnnotation");
- jcasType.ll_cas.ll_setRefValue(addr,
- ((CrossAnnotation_Type) jcasType).casFeatCode_otherAnnotation,
jcasType.ll_cas
- .ll_getFSRef(v));
+
+ _casView.setWithJournal(this,
_typeImpl.getFeatureByBaseName("otherAnnotation"), () -> _F_otherAnnotation =
v);
+ }
}
-}
+
+
\ No newline at end of file
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java?rev=1712152&r1=1712151&r2=1712152&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
Mon Nov 2 20:50:46 2015
@@ -16,64 +16,76 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+/* Apache UIMA v3 - First created by JCasGen Wed Oct 28 11:17:08 EDT 2015 */
-
-
-/* First created by JCasGen Thu Jun 21 11:28:13 MDT 2007 */
package org.apache.uima.cas.test;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
+
import org.apache.uima.jcas.tcas.Annotation;
/**
- * Updated by JCasGen Thu Jun 21 12:00:34 MDT 2007
- * XML source: C:/Documents and Settings/Philip/My
Documents/CSLR/workspace/UIMA-464/desc/TokensAndSentences.xml
+ * Updated by JCasGen Wed Oct 28 11:17:08 EDT 2015
+ * XML source:
C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Sentence extends Annotation {
/** @generated
* @ordered
*/
+ @SuppressWarnings ("hiding")
public final static int typeIndexID = JCasRegistry.register(Sentence.class);
/** @generated
* @ordered
*/
+ @SuppressWarnings ("hiding")
public final static int type = typeIndexID;
- /** @generated */
+ /** @generated
+ * @return index of the type
+ */
+ @Override
public int getTypeIndexID() {return typeIndexID;}
+
+ /* *****************
+ * Local Data *
+ * *****************/
+
+
/** Never called. Disable default constructor
* @generated */
- protected Sentence() {}
+ protected Sentence() {/* intentionally empty block */}
/** Internal - constructor used by generator
- * @generated */
- public Sentence(int addr, TOP_Type type) {
- super(addr, type);
+ * @generated
+ * @param casImpl the CAS this Feature Structure belongs to
+ * @param type the type of this Feature Structure
+ */
+ public Sentence(TypeImpl type, CASImpl casImpl) {
+ super(type, casImpl);
readObject();
}
- /** @generated */
+ /** @generated
+ * @param jcas JCas to which this Feature Structure belongs
+ */
public Sentence(JCas jcas) {
super(jcas);
readObject();
}
- /** @generated */
- public Sentence(JCas jcas, int begin, int end) {
- super(jcas);
- setBegin(begin);
- setEnd(end);
- readObject();
- }
-
- /** <!-- begin-user-doc -->
- * Write your own initialization here
- * <!-- end-user-doc -->
- @generated modifiable */
- private void readObject() {}
+ /**
+ * <!-- begin-user-doc -->
+ * Write your own initialization here
+ * <!-- end-user-doc -->
+ *
+ * @generated modifiable
+ */
+ private void readObject() {/*default - does nothing empty block */}
}
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java?rev=1712152&r1=1712151&r2=1712152&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/StringSubtypeAnnotation.java
Mon Nov 2 20:50:46 2015
@@ -18,61 +18,76 @@
*/
+
+/* Apache UIMA v3 - First created by JCasGen Wed Oct 28 14:10:07 EDT 2015 */
-/* First created by JCasGen Fri Dec 22 14:02:31 CET 2006 */
package org.apache.uima.cas.test;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.cas.TOP_Type;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+
import org.apache.uima.jcas.tcas.Annotation;
/**
- * Updated by JCasGen Fri Dec 22 14:02:31 CET 2006
- * XML source:
C:/code/trunk/uimaj-core/src/test/resources/CASTests/desc/StringSubtypeTest.xml
+ * Updated by JCasGen Wed Oct 28 14:10:07 EDT 2015
+ * XML source:
C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/resources/CASTests/desc/StringSubtypeTest.xml
* @generated */
public class StringSubtypeAnnotation extends Annotation {
/** @generated
* @ordered
*/
- public final static int typeIndexID =
org.apache.uima.jcas.JCasRegistry.register(StringSubtypeAnnotation.class);
+ @SuppressWarnings ("hiding")
+ public final static int typeIndexID =
JCasRegistry.register(StringSubtypeAnnotation.class);
/** @generated
* @ordered
*/
+ @SuppressWarnings ("hiding")
public final static int type = typeIndexID;
- /** @generated */
+ /** @generated
+ * @return index of the type
+ */
+ @Override
public int getTypeIndexID() {return typeIndexID;}
+
+ /* *****************
+ * Local Data *
+ * *****************/
+ private String _F_stringSetFeature; //
+
/** Never called. Disable default constructor
* @generated */
- protected StringSubtypeAnnotation() {}
+ protected StringSubtypeAnnotation() {/* intentionally empty block */}
/** Internal - constructor used by generator
- * @generated */
- public StringSubtypeAnnotation(int addr, TOP_Type type) {
- super(addr, type);
+ * @generated
+ * @param casImpl the CAS this Feature Structure belongs to
+ * @param type the type of this Feature Structure
+ */
+ public StringSubtypeAnnotation(TypeImpl type, CASImpl casImpl) {
+ super(type, casImpl);
readObject();
}
- /** @generated */
+ /** @generated
+ * @param jcas JCas to which this Feature Structure belongs
+ */
public StringSubtypeAnnotation(JCas jcas) {
super(jcas);
readObject();
}
-
- /** @generated */
- public StringSubtypeAnnotation(JCas jcas, int begin, int end) {
- super(jcas);
- setBegin(begin);
- setEnd(end);
- readObject();
- }
- /** <!-- begin-user-doc -->
- * Write your own initialization here
- * <!-- end-user-doc -->
- @generated modifiable */
- private void readObject() {}
+ /**
+ * <!-- begin-user-doc -->
+ * Write your own initialization here
+ * <!-- end-user-doc -->
+ *
+ * @generated modifiable
+ */
+ private void readObject() {/*default - does nothing empty block */}
@@ -80,18 +95,20 @@ public class StringSubtypeAnnotation ext
//* Feature: stringSetFeature
/** getter for stringSetFeature - gets
- * @generated */
- public String getStringSetFeature() {
- if (StringSubtypeAnnotation_Type.featOkTst &&
((StringSubtypeAnnotation_Type)jcasType).casFeat_stringSetFeature == null)
- this.jcasType.jcas.throwFeatMissing("stringSetFeature",
"org.apache.uima.cas.test.StringSubtypeAnnotation");
- return jcasType.ll_cas.ll_getStringValue(addr,
((StringSubtypeAnnotation_Type)jcasType).casFeatCode_stringSetFeature);}
+ * @generated
+ * @return value of the feature
+ */
+ public String getStringSetFeature() { return _F_stringSetFeature;}
/** setter for stringSetFeature - sets
- * @generated */
+ * @generated
+ * @param v value to set into the feature
+ */
public void setStringSetFeature(String v) {
- if (StringSubtypeAnnotation_Type.featOkTst &&
((StringSubtypeAnnotation_Type)jcasType).casFeat_stringSetFeature == null)
- this.jcasType.jcas.throwFeatMissing("stringSetFeature",
"org.apache.uima.cas.test.StringSubtypeAnnotation");
- jcasType.ll_cas.ll_setStringValue(addr,
((StringSubtypeAnnotation_Type)jcasType).casFeatCode_stringSetFeature, v);}
+
_typeImpl.getFeatureByBaseName("stringSetFeature").validateIsInAllowedValue(v);
+
+ _casView.setWithJournal(this,
_typeImpl.getFeatureByBaseName("stringSetFeature"), () -> _F_stringSetFeature =
v);
+ }
}
\ No newline at end of file
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java?rev=1712152&r1=1712151&r2=1712152&view=diff
==============================================================================
---
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
(original)
+++
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
Mon Nov 2 20:50:46 2015
@@ -1,79 +1,75 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
+
+/* Apache UIMA v3 - First created by JCasGen Wed Oct 28 11:25:30 EDT 2015 */
-/* First created by JCasGen Thu Jun 21 11:28:13 MDT 2007 */
package org.apache.uima.cas.test;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
+
import org.apache.uima.jcas.tcas.Annotation;
/**
- * Updated by JCasGen Thu Jun 21 12:00:34 MDT 2007
- * XML source: C:/Documents and Settings/Philip/My
Documents/CSLR/workspace/UIMA-464/desc/TokensAndSentences.xml
+ * Updated by JCasGen Wed Oct 28 11:25:30 EDT 2015
+ * XML source:
C:/au/svnCheckouts/branches/uimaj/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/jcas/test/generatedx.xml
* @generated */
public class Token extends Annotation {
/** @generated
* @ordered
*/
+ @SuppressWarnings ("hiding")
public final static int typeIndexID = JCasRegistry.register(Token.class);
/** @generated
* @ordered
*/
+ @SuppressWarnings ("hiding")
public final static int type = typeIndexID;
- /** @generated */
+ /** @generated
+ * @return index of the type
+ */
+ @Override
public int getTypeIndexID() {return typeIndexID;}
+
+ /* *****************
+ * Local Data *
+ * *****************/
+
+
/** Never called. Disable default constructor
* @generated */
- protected Token() {}
+ protected Token() {/* intentionally empty block */}
/** Internal - constructor used by generator
- * @generated */
- public Token(int addr, TOP_Type type) {
- super(addr, type);
+ * @generated
+ * @param casImpl the CAS this Feature Structure belongs to
+ * @param type the type of this Feature Structure
+ */
+ public Token(TypeImpl type, CASImpl casImpl) {
+ super(type, casImpl);
readObject();
}
- /** @generated */
+ /** @generated
+ * @param jcas JCas to which this Feature Structure belongs
+ */
public Token(JCas jcas) {
super(jcas);
readObject();
}
- /** @generated */
- public Token(JCas jcas, int begin, int end) {
- super(jcas);
- setBegin(begin);
- setEnd(end);
- readObject();
- }
-
- /** <!-- begin-user-doc -->
- * Write your own initialization here
- * <!-- end-user-doc -->
- @generated modifiable */
- private void readObject() {}
+ /**
+ * <!-- begin-user-doc -->
+ * Write your own initialization here
+ * <!-- end-user-doc -->
+ *
+ * @generated modifiable
+ */
+ private void readObject() {/*default - does nothing empty block */}
}
