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/11/03 19:22:44 UTC
svn commit: r1767952 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main:
java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java
javajet/jcasgen/templates/JCasType.javajet
Author: schor
Date: Thu Nov 3 19:22:44 2016
New Revision: 1767952
URL: http://svn.apache.org/viewvc?rev=1767952&view=rev
Log:
[UIMA-4674] add static final strings with type and feature names
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java?rev=1767952&r1=1767951&r2=1767952&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/JCasTypeTemplate.java Thu Nov 3 19:22:44 2016
@@ -63,7 +63,9 @@ public class JCasTypeTemplate implements
stringBuilder.append(typeName);
stringBuilder.append(" extends ");
stringBuilder.append(jg.getJavaName(td.getSupertypeName()));
- stringBuilder.append(" {\n /** @generated\n * @ordered \n */\n @SuppressWarnings (\"hiding\")\n public final static int typeIndexID = JCasRegistry.register(");
+ stringBuilder.append(" {\n \n /** @generated\n * @ordered \n */\n @SuppressWarnings (\"hiding\")\n public final static String _TypeName = \"");
+ stringBuilder.append(jg.getJavaNameWithPkg(td.getName()));
+ stringBuilder.append("\";\n \n /** @generated\n * @ordered \n */\n @SuppressWarnings (\"hiding\")\n public final static int typeIndexID = JCasRegistry.register(");
stringBuilder.append(typeName);
stringBuilder.append(".class);\n /** @generated\n * @ordered \n */\n @SuppressWarnings (\"hiding\")\n public final static int type = typeIndexID;\n /** @generated\n * @return index of the type \n */\n @Override\n public int getTypeIndexID() {return typeIndexID;}\n \n ");
@@ -88,12 +90,14 @@ public class JCasTypeTemplate implements
String rangeType = jg.getJavaRangeType(fd);
String elemType = jg.getJavaRangeArrayElementType(fd);
- localData.append(" private ").append(rangeType).append(" _F_").append(featName).append("; // ").append(featDescCmt).append('\n');
+ localData .append(" public final static String _FeatName_").append(featName).append(" = \"").append(featName).append("\";\n");
featRegistry.append(" public final static int _FI_").append(featName).append(" = TypeSystemImpl.getAdjustedFeatureOffset(\"")
.append(featName).append("\");\n");
} /* of Features iteration */
stringBuilder.append("\n /* *******************\n * Feature Offsets *\n * *******************/ \n \n");
+ stringBuilder.append(localData);
+ stringBuilder.append("\n\n");
stringBuilder.append(featRegistry);
stringBuilder.append("\n \n /** Never called. Disable default constructor\n * @generated */\n protected ");
stringBuilder.append(typeName);
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet?rev=1767952&r1=1767951&r2=1767952&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/javajet/jcasgen/templates/JCasType.javajet Thu Nov 3 19:22:44 2016
@@ -51,6 +51,13 @@ import <%=(String)i.next()%>;
* XML source: <%=jg.xmlSourceFileName%>
* @generated */
public class <%=typeName%> extends <%=jg.getJavaName(td.getSupertypeName())%> {
+
+ /** @generated
+ * @ordered
+ */
+ @SuppressWarnings ("hiding")
+ public final static String _TypeName = "<%=jg.getJavaNameWithPkg(td.getName())%>";
+
/** @generated
* @ordered
*/
@@ -89,7 +96,7 @@ public class <%=typeName%> extends <%=jg
String rangeType = jg.getJavaRangeType(fd);
String elemType = jg.getJavaRangeArrayElementType(fd);
- localData.append(" private ").append(rangeType).append(" _F_").append(featName).append("; // ").append(featDescCmt).append('\n');
+ localData .append(" public final static String _FeatName_").append(featName).append(" = \"").append(featName).append("\";\n");
featRegistry.append(" public final static int _FI_").append(featName).append(" = TypeSystemImpl.getAdjustedFeatureOffset(\"")
.append(featName).append("\");\n");
@@ -99,6 +106,8 @@ public class <%=typeName%> extends <%=jg
* Feature Offsets *
* *******************/
+<%=localData%>
+
<%=featRegistry%>
/** Never called. Disable default constructor