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/12/29 16:34:27 UTC
svn commit: r1776449 - in
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima:
cas/impl/ jcas/cas/ jcas/tcas/
Author: schor
Date: Thu Dec 29 16:34:26 2016
New Revision: 1776449
URL: http://svn.apache.org/viewvc?rev=1776449&view=rev
Log:
[UIMA-5233] mark v2 compatibility only classes as deprecated, move some of these v2 classes to the right package.
Added:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java
- copied, changed from r1776448, uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBaseImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java
- copied, changed from r1776448, uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java
- copied, changed from r1776448, uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArrayFSImpl.java
Removed:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBaseImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArrayFSImpl.java
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanArrayFSImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/DoubleArrayFSImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatArrayFSImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntArrayFSImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortArrayFSImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ArrayFSImpl.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java
Copied: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java (from r1776448, uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBaseImpl.java)
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java?p2=uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java&p1=uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBaseImpl.java&r1=1776448&r2=1776449&rev=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBaseImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java Thu Dec 29 16:34:26 2016
@@ -16,13 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.jcas.cas;
+package org.apache.uima.cas.impl;
import org.apache.uima.cas.AnnotationBaseFS;
/**
* For backwards compatibility only with V2 *
+ * @deprecated use AnnotationBase instead
*/
+@Deprecated
public interface AnnotationBaseImpl extends AnnotationBaseFS {
}
Copied: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java (from r1776448, uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationImpl.java)
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java?p2=uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java&p1=uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationImpl.java&r1=1776448&r2=1776449&rev=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImpl.java Thu Dec 29 16:34:26 2016
@@ -16,13 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.jcas.cas;
+package org.apache.uima.cas.impl;
import org.apache.uima.cas.text.AnnotationFS;
/**
* For backwards compatibility only with V2
+ * @deprecated
*/
+@Deprecated
public interface AnnotationImpl extends AnnotationFS {
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanArrayFSImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanArrayFSImpl.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanArrayFSImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/BooleanArrayFSImpl.java Thu Dec 29 16:34:26 2016
@@ -22,8 +22,10 @@ import org.apache.uima.cas.BooleanArrayF
/**
* V2 compatibility only
- * The non-JCas cover class for String Array
+ * The non-JCas cover class for Boolean Array
+ * @deprecated use BooleanARray instead
*/
+@Deprecated
public interface BooleanArrayFSImpl extends BooleanArrayFS {
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/ByteArrayFSImpl.java Thu Dec 29 16:34:26 2016
@@ -22,8 +22,10 @@ import org.apache.uima.cas.ByteArrayFS;
/**
* V2 compatibility only
- * The non-JCas cover class for String Array
+ * The non-JCas cover class for Byte Array
+ * @deprecated use ByteArray instead
*/
+@Deprecated
public interface ByteArrayFSImpl extends ByteArrayFS {
}
Copied: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java (from r1776448, uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArrayFSImpl.java)
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java?p2=uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java&p1=uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArrayFSImpl.java&r1=1776448&r2=1776449&rev=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/CommonArrayFSImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/CommonArrayFSImpl.java Thu Dec 29 16:34:26 2016
@@ -16,13 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.jcas.cas;
+package org.apache.uima.cas.impl;
import org.apache.uima.cas.CommonArrayFS;
/**
* For v2 backwards compatibility
+ * @deprecated
*/
+@Deprecated
public interface CommonArrayFSImpl extends CommonArrayFS {
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/DoubleArrayFSImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/DoubleArrayFSImpl.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/DoubleArrayFSImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/DoubleArrayFSImpl.java Thu Dec 29 16:34:26 2016
@@ -23,7 +23,9 @@ import org.apache.uima.cas.DoubleArrayFS
/**
* V2 compatibility only
* The non-JCas cover class for Double Array
+ * @deprecated use DoubleArray instead
*/
+@Deprecated
public interface DoubleArrayFSImpl extends DoubleArrayFS {
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java Thu Dec 29 16:34:26 2016
@@ -26,7 +26,9 @@ import org.apache.uima.cas.FeatureStruct
* Methods here downcast to FeatureStructureImplC
*
* Methods here - only those not in v2's FeatureStructure
+ * @deprecated use TOP instead
*/
+@Deprecated
public interface FeatureStructureImpl extends FeatureStructure {
int getAddress();
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatArrayFSImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatArrayFSImpl.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatArrayFSImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatArrayFSImpl.java Thu Dec 29 16:34:26 2016
@@ -23,7 +23,9 @@ import org.apache.uima.cas.FloatArrayFS;
/**
* V2 compatibility only
* The non-JCas cover class for Float Array
+ * @deprecated use FloatArray instead
*/
+@Deprecated
public interface FloatArrayFSImpl extends FloatArrayFS {
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntArrayFSImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntArrayFSImpl.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntArrayFSImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntArrayFSImpl.java Thu Dec 29 16:34:26 2016
@@ -23,7 +23,9 @@ import org.apache.uima.cas.IntArrayFS;
/**
* V2 compatibility only
* The non-JCas cover class for Integer Array
+ * @deprecated use IntegerArray instead
*/
+@Deprecated
public interface IntArrayFSImpl extends IntArrayFS {
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongArrayFSImpl.java Thu Dec 29 16:34:26 2016
@@ -23,7 +23,9 @@ import org.apache.uima.cas.LongArrayFS;
/**
* V2 compatibility only
* The non-JCas cover class for Long Array
+ * @deprecated use LongArray instead
*/
+@Deprecated
public interface LongArrayFSImpl extends LongArrayFS {
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortArrayFSImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortArrayFSImpl.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortArrayFSImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/ShortArrayFSImpl.java Thu Dec 29 16:34:26 2016
@@ -23,7 +23,9 @@ import org.apache.uima.cas.ShortArrayFS;
/**
* V2 compatibility only
* The non-JCas cover class for Short Array
+ * @deprecated use ShortArray instead
*/
+@Deprecated
public interface ShortArrayFSImpl extends ShortArrayFS {
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java Thu Dec 29 16:34:26 2016
@@ -20,6 +20,11 @@ package org.apache.uima.cas.impl;
import org.apache.uima.cas.SofaFS;
+/**
+ * v2 backwards compatibility
+ * @deprecated use Sofa instead
+ */
+@Deprecated
public interface SofaFSImpl extends SofaFS {
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringArrayFSImpl.java Thu Dec 29 16:34:26 2016
@@ -23,7 +23,9 @@ import org.apache.uima.cas.StringArrayFS
/**
* V2 compatibility only
* The non-JCas cover class for String Array
+ * @deprecated use StringArray instead
*/
+@Deprecated
public interface StringArrayFSImpl extends StringArrayFS {
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java Thu Dec 29 16:34:26 2016
@@ -19,11 +19,11 @@
package org.apache.uima.jcas.cas;
-import org.apache.uima.cas.AnnotationBaseFS;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.impl.AnnotationBaseImpl;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TypeImpl;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ArrayFSImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ArrayFSImpl.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ArrayFSImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/cas/ArrayFSImpl.java Thu Dec 29 16:34:26 2016
@@ -23,7 +23,9 @@ import org.apache.uima.cas.ArrayFS;
/**
* For backwards compatibility with V2, only
* Only has methods not in ArrayFS or CommonArrayFSImpl
+ * @deprecated use FSArray instead
*/
+@Deprecated
public interface ArrayFSImpl extends ArrayFS {
}
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java?rev=1776449&r1=1776448&r2=1776449&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java Thu Dec 29 16:34:26 2016
@@ -20,6 +20,7 @@
package org.apache.uima.jcas.tcas;
import org.apache.uima.cas.admin.LinearTypeOrder;
+import org.apache.uima.cas.impl.AnnotationImpl;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
@@ -27,7 +28,6 @@ import org.apache.uima.cas.text.Annotati
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.jcas.cas.AnnotationBase;
-import org.apache.uima.jcas.cas.AnnotationImpl;
/**
* the JCas class model for the CAS type uima.cas.Annotation. It defines two integer valued features