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 2015/11/18 15:24:15 UTC
svn commit: r1714998 - in /uima/uimaj/trunk/uimaj-tools/src/main:
java/org/apache/uima/tools/jcasgen/JCas_TypeTemplate.java
javajet/jcasgen/templates/JCas_Type.javajet
Author: schor
Date: Wed Nov 18 14:24:14 2015
New Revision: 1714998
URL: http://svn.apache.org/viewvc?rev=1714998&view=rev
Log:
[UIMA-4554] remove no longer used generator
Modified:
uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCas_TypeTemplate.java
uima/uimaj/trunk/uimaj-tools/src/main/javajet/jcasgen/templates/JCas_Type.javajet
Modified: uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCas_TypeTemplate.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCas_TypeTemplate.java?rev=1714998&r1=1714997&r2=1714998&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCas_TypeTemplate.java (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCas_TypeTemplate.java Wed Nov 18 14:24:14 2015
@@ -42,7 +42,7 @@ public class JCas_TypeTemplate implement
stringBuffer.append(jg.packageName);
stringBuffer.append(";\n");
}
- stringBuffer.append("\nimport org.apache.uima.jcas.JCas;\nimport org.apache.uima.jcas.JCasRegistry;\nimport org.apache.uima.cas.impl.CASImpl;\nimport org.apache.uima.cas.impl.FSGenerator;\nimport org.apache.uima.cas.FeatureStructure;\nimport org.apache.uima.cas.impl.TypeImpl;\nimport org.apache.uima.cas.Type;\n");
+ stringBuffer.append("\nimport org.apache.uima.jcas.JCas;\nimport org.apache.uima.jcas.JCasRegistry;\nimport org.apache.uima.cas.impl.TypeImpl;\nimport org.apache.uima.cas.Type;\n");
if (td.getFeatures().length > 0) {
stringBuffer.append("import org.apache.uima.cas.impl.FeatureImpl;\nimport org.apache.uima.cas.Feature;\n");
}
@@ -65,21 +65,7 @@ public class JCas_TypeTemplate implement
stringBuffer.append(typeName_Type);
stringBuffer.append(" extends ");
stringBuffer.append(jg.getJavaName(td.getSupertypeName()) + "_Type");
- stringBuffer.append(" {\n /** @generated \n * @return the generator for this type\n */\n @Override\n protected FSGenerator getFSGenerator() {return fsGenerator;}\n /** @generated */\n private final FSGenerator fsGenerator = \n new FSGenerator() {\n public FeatureStructure createFS(int addr, CASImpl cas) {\n if (");
- stringBuffer.append(typeName_Type);
- stringBuffer.append(".this.useExistingInstance) {\n // Return eq fs instance if already created\n FeatureStructure fs = ");
- stringBuffer.append(typeName_Type);
- stringBuffer.append(".this.jcas.getJfsFromCaddr(addr);\n if (null == fs) {\n fs = new ");
- stringBuffer.append(typeName);
- stringBuffer.append("(addr, ");
- stringBuffer.append(typeName_Type);
- stringBuffer.append(".this);\n ");
- stringBuffer.append(typeName_Type);
- stringBuffer.append(".this.jcas.putJfsFromCaddr(addr, fs);\n return fs;\n }\n return fs;\n } else return new ");
- stringBuffer.append(typeName);
- stringBuffer.append("(addr, ");
- stringBuffer.append(typeName_Type);
- stringBuffer.append(".this);\n }\n };\n /** @generated */\n @SuppressWarnings (\"hiding\")\n public final static int typeIndexID = ");
+ stringBuffer.append(" {\n /** @generated */\n @SuppressWarnings (\"hiding\")\n public final static int typeIndexID = ");
stringBuffer.append(typeName);
stringBuffer.append(".typeIndexID;\n /** @generated \n @modifiable */\n @SuppressWarnings (\"hiding\")\n public final static boolean featOkTst = JCasRegistry.getFeatOkTst(\"");
stringBuffer.append(td.getName());
Modified: uima/uimaj/trunk/uimaj-tools/src/main/javajet/jcasgen/templates/JCas_Type.javajet
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/javajet/jcasgen/templates/JCas_Type.javajet?rev=1714998&r1=1714997&r2=1714998&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/javajet/jcasgen/templates/JCas_Type.javajet (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/javajet/jcasgen/templates/JCas_Type.javajet Wed Nov 18 14:24:14 2015
@@ -29,9 +29,6 @@ package <%=jg.packageName%>;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.Type;
<% if (td.getFeatures().length > 0) {%>
@@ -50,27 +47,6 @@ import <%=imp%>;
* Updated by JCasGen <%=jg.getDate()%>
* @generated */
public class <%=typeName_Type%> extends <%=jg.getJavaName(td.getSupertypeName()) + "_Type"%> {
- /** @generated
- * @return the generator for this type
- */
- @Override
- protected FSGenerator getFSGenerator() {return fsGenerator;}
- /** @generated */
- private final FSGenerator fsGenerator =
- new FSGenerator() {
- public FeatureStructure createFS(int addr, CASImpl cas) {
- if (<%=typeName_Type%>.this.useExistingInstance) {
- // Return eq fs instance if already created
- FeatureStructure fs = <%=typeName_Type%>.this.jcas.getJfsFromCaddr(addr);
- if (null == fs) {
- fs = new <%=typeName%>(addr, <%=typeName_Type%>.this);
- <%=typeName_Type%>.this.jcas.putJfsFromCaddr(addr, fs);
- return fs;
- }
- return fs;
- } else return new <%=typeName%>(addr, <%=typeName_Type%>.this);
- }
- };
/** @generated */
@SuppressWarnings ("hiding")
public final static int typeIndexID = <%=typeName%>.typeIndexID;