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/09/02 13:40:53 UTC
svn commit: r1758955 -
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
Author: schor
Date: Fri Sep 2 13:40:53 2016
New Revision: 1758955
URL: http://svn.apache.org/viewvc?rev=1758955&view=rev
Log:
no jira merge catchup
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java (contents, props changed)
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java?rev=1758955&r1=1758954&r2=1758955&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java Fri Sep 2 13:40:53 2016
@@ -453,13 +453,15 @@ public class JCasImpl extends AbstractCa
// per JCas instance - so don't need to synch.
// private final Object[] constructorArgsFor_Type = new Object[2];
- /**
- * Make the instance of the JCas xxx_Type class for this CAS. Note: not all types will have
- * xxx_Type. Instance creation does the typeSystemInit kind of function, as well.
- *
- * returns true if a new instance of a _Type class was created
- */
-
+// /**
+// * Make the instance of the JCas xxx_Type class for this CAS. Note: not all types will have
+// * xxx_Type. Instance creation does the typeSystemInit kind of function, as well.
+// *
+// * @param jcasTypeInfo -
+// * @param alreadyLoaded -
+// * @param fsGenerators updated by side effect with new instances of the _Type class
+// * @return true if a new instance of a _Type class was created
+// */
// private <T extends TOP> boolean makeInstanceOf_Type(LoadedJCasType<T> jcasTypeInfo, boolean alreadyLoaded,
// FSGenerator<?>[] fsGenerators) {
//
@@ -514,27 +516,27 @@ public class JCasImpl extends AbstractCa
// return true;
// }
- /**
- * Make the instance of the JCas xxx_Type class for this CAS. Note: not all types will have
- * xxx_Type. Instance creation does the typeSystemInit kind of function, as well.
- */
- /*
- * private void makeInstanceOf_Type(Type casType, Class clas, CASImpl cas) { Constructor c; Field
- * typeIndexField = null; int typeIndex; try { c = clas.getDeclaredConstructor(jcasBaseAndType);
- * try {
- *
- * typeIndexField = clas.getDeclaredField("typeIndexID"); } catch (NoSuchFieldException e) { try { //
- * old version has the index in the base type String name = clas.getName(); Class clas2 =
- * Class.forName(name.substring(0, name.length() - 5), true, cas .getJCasClassLoader()); // drop
- * _Type typeIndexField = clas2.getDeclaredField("typeIndexID"); } catch (NoSuchFieldException e2) {
- * logAndThrow(e2); } catch (ClassNotFoundException e3) { logAndThrow(e3); } } typeIndex =
- * typeIndexField.getInt(null); // null - static instance var TOP_Type x_Type_instance =
- * (TOP_Type) c.newInstance(new Object[] { this, casType }); typeArray[typeIndex] =
- * x_Type_instance; } catch (SecurityException e) { logAndThrow(e); } catch (NoSuchMethodException
- * e) { logAndThrow(e); } catch (InstantiationException e) { logAndThrow(e); } catch
- * (IllegalAccessException e) { logAndThrow(e); } catch (InvocationTargetException e) {
- * logAndThrow(e); } catch (ArrayIndexOutOfBoundsException e) { logAndThrow(e); } }
- */
+// /**
+// * Make the instance of the JCas xxx_Type class for this CAS. Note: not all types will have
+// * xxx_Type. Instance creation does the typeSystemInit kind of function, as well.
+// */
+// /*
+// * private void makeInstanceOf_Type(Type casType, Class clas, CASImpl cas) { Constructor c; Field
+// * typeIndexField = null; int typeIndex; try { c = clas.getDeclaredConstructor(jcasBaseAndType);
+// * try {
+// *
+// * typeIndexField = clas.getDeclaredField("typeIndexID"); } catch (NoSuchFieldException e) { try { //
+// * old version has the index in the base type String name = clas.getName(); Class clas2 =
+// * Class.forName(name.substring(0, name.length() - 5), true, cas .getJCasClassLoader()); // drop
+// * _Type typeIndexField = clas2.getDeclaredField("typeIndexID"); } catch (NoSuchFieldException e2) {
+// * logAndThrow(e2); } catch (ClassNotFoundException e3) { logAndThrow(e3); } } typeIndex =
+// * typeIndexField.getInt(null); // null - static instance var TOP_Type x_Type_instance =
+// * (TOP_Type) c.newInstance(new Object[] { this, casType }); typeArray[typeIndex] =
+// * x_Type_instance; } catch (SecurityException e) { logAndThrow(e); } catch (NoSuchMethodException
+// * e) { logAndThrow(e); } catch (InstantiationException e) { logAndThrow(e); } catch
+// * (IllegalAccessException e) { logAndThrow(e); } catch (InvocationTargetException e) {
+// * logAndThrow(e); } catch (ArrayIndexOutOfBoundsException e) { logAndThrow(e); } }
+// */
/*
* (non-Javadoc)
Propchange: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Sep 2 13:40:53 2016
@@ -0,0 +1,8 @@
+/incubator/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java:932400-933272
+/uima/uimaj/branches/2.6.0-json/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java:1616936-1617592
+/uima/uimaj/branches/depend-on-july-9-build-tools/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java:963167-964468
+/uima/uimaj/branches/depend-on-parent-pom-4/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java:961329-961745
+/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java:1436573-1462257
+/uima/uimaj/branches/mavenAlign/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java:933273-944396
+/uima/uimaj/branches/test-parent-pom-6/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java:1024030
+/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java:1690273-1758859