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/09/18 20:39:38 UTC
svn commit: r1808774 - in /uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main: java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java javajet/jcasgen/templates/JCasType.javajet

Author: schor
Date: Mon Sep 18 20:39:38 2017
New Revision: 1808774

URL: http://svn.apache.org/viewvc?rev=1808774&view=rev
Log:
[UIMA-5578] Fix wrong type and missing imports in JCasGen generated code

Modified:
    uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java
    uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet

Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java?rev=1808774&r1=1808773&r2=1808774&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java Mon Sep 18 20:39:38 2017
@@ -44,7 +44,7 @@ public class JCasTypeTemplate implements
    else 
      jg.error.newError(IError.WARN, 
 		jg.getString("pkgMissing", new Object[] {td.getName()}), null); 
-    stringBuilder.append("\nimport org.apache.uima.cas.impl.CASImpl;\nimport org.apache.uima.cas.impl.TypeImpl;\nimport org.apache.uima.cas.impl.TypeSystemImpl;\nimport org.apache.uima.jcas.JCas; \nimport org.apache.uima.jcas.JCasRegistry;\n\n\n");
+    stringBuilder.append("\nimport java.lang.invoke.CallSite;\nimport java.lang.invoke.MethodHandle;\n\nimport org.apache.uima.cas.impl.CASImpl;\nimport org.apache.uima.cas.impl.TypeImpl;\nimport org.apache.uima.cas.impl.TypeSystemImpl;\nimport org.apache.uima.jcas.JCas; \nimport org.apache.uima.jcas.JCasRegistry;\n\n\n");
    for(Iterator i=jg.collectImports(td, false).iterator(); i.hasNext();) { 
     stringBuilder.append("import ");
     stringBuilder.append((String)i.next());
@@ -92,7 +92,7 @@ public class JCasTypeTemplate implements
      
      localData   .append("  public final static String _FeatName_").append(featName).append(" = \"").append(featName).append("\";\n");
      
-     featRegistry.append("  private final static int _FC_").append(featName)
+     featRegistry.append("  private final static CallSite _FC_").append(featName)
                  .append(" = TypeSystemImpl.createCallSite(").append(typeName).append(".class, ")
                  .append("\"").append(featName).append("\");\n"); 
      featRegistry.append("  private final static MethodHandle _FH_").append(featName)

Modified: uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet?rev=1808774&r1=1808773&r2=1808774&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet Mon Sep 18 20:39:38 2017
@@ -32,6 +32,9 @@ package <%=jg.packageName%>;
      jg.error.newError(IError.WARN, 
 		jg.getString("pkgMissing", new Object[] {td.getName()}), null); %>
 
+import java.lang.invoke.CallSite;
+import java.lang.invoke.MethodHandle;
+
 import org.apache.uima.cas.impl.CASImpl;
 import org.apache.uima.cas.impl.TypeImpl;
 import org.apache.uima.cas.impl.TypeSystemImpl;
@@ -98,7 +101,7 @@ public class <%=typeName%> extends <%=jg
      
      localData   .append("  public final static String _FeatName_").append(featName).append(" = \"").append(featName).append("\";\n");
      
-     featRegistry.append("  private final static int _FC_").append(featName)
+     featRegistry.append("  private final static CallSite _FC_").append(featName)
                  .append(" = TypeSystemImpl.createCallSite(").append(typeName).append(".class, ")
                  .append("\"").append(featName).append("\");\n"); 
      featRegistry.append("  private final static MethodHandle _FH_").append(featName)