You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2009/09/01 10:06:41 UTC
svn commit: r809876 - in
/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima:
cas_data/impl/vinci/ collection/impl/cpm/ collection/impl/cpm/container/
collection/impl/cpm/engine/ collection/impl/cpm/utils/
collection/impl/cpm/vinci/cas_...
Author: joern
Date: Tue Sep 1 08:06:40 2009
New Revision: 809876
URL: http://svn.apache.org/viewvc?rev=809876&view=rev
Log:
UIMA-1342 Use @Deprecated annotation also
Modified:
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/cas_data/impl/vinci/VinciCasDataConverter.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/JavaTimer.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Timer.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/cas_data/VinciPrimitiveValue.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderCasInitializerImpl.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/cas_data/impl/vinci/VinciCasDataConverter.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/cas_data/impl/vinci/VinciCasDataConverter.java?rev=809876&r1=809875&r2=809876&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/cas_data/impl/vinci/VinciCasDataConverter.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/cas_data/impl/vinci/VinciCasDataConverter.java Tue Sep 1 08:06:40 2009
@@ -124,7 +124,8 @@
*
* @deprecated Use appendVinciFrameToCasData(Aframe, CasData) or vinciFrameToCasData(AFrame)
*/
- public void vinciFrameToCasData(AFrame aCasFrame, CasData aCasData) throws SAXException {
+ @Deprecated
+public void vinciFrameToCasData(AFrame aCasFrame, CasData aCasData) throws SAXException {
appendVinciFrameToCasData(aCasFrame, aCasData);
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java?rev=809876&r1=809875&r2=809876&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/BaseCPMImpl.java Tue Sep 1 08:06:40 2009
@@ -558,7 +558,8 @@
* @see org.apache.uima.collection.base_cpm.BaseCPM#process(org.apache.uima.collection.base_cpm.BaseCollectionReader)
* @deprecated
*/
- public void process(BaseCollectionReader aCollectionReader)
+ @Deprecated
+public void process(BaseCollectionReader aCollectionReader)
throws ResourceInitializationException {
// Retrieve number of entities to process from the CPM configuration
try {
@@ -611,7 +612,8 @@
* int)
* @deprecated
*/
- public void process(BaseCollectionReader aCollectionReader, int aBatchSize)
+ @Deprecated
+public void process(BaseCollectionReader aCollectionReader, int aBatchSize)
throws ResourceInitializationException {
// Let the application define the size of Collection.
num2Process = aBatchSize;
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java?rev=809876&r1=809875&r2=809876&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/ProcessingContainer_Impl.java Tue Sep 1 08:06:40 2009
@@ -518,7 +518,8 @@
*
* @deprecated
*/
- public void setLastCas(Object aCasObject) {
+ @Deprecated
+public void setLastCas(Object aCasObject) {
lastCas = aCasObject;
}
@@ -527,7 +528,8 @@
*
* @deprecated
*/
- public Object getLastCas() {
+ @Deprecated
+public Object getLastCas() {
return lastCas;
}
@@ -1080,14 +1082,16 @@
/**
* @deprecated
*/
- public void start() {
+ @Deprecated
+public void start() {
new Thread(this);
}
/**
* @deprecated
*/
- public void stop() {
+ @Deprecated
+public void stop() {
}
/**
@@ -1198,21 +1202,24 @@
/**
* @deprecated
*/
- public boolean isLocal() {
+ @Deprecated
+public boolean isLocal() {
return isLocal;
}
/**
* @deprecated
*/
- public boolean isRemote() {
+ @Deprecated
+public boolean isRemote() {
return isRemote;
}
/**
* @deprecated
*/
- public boolean isIntegrated() {
+ @Deprecated
+public boolean isIntegrated() {
return isIntegrated;
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java?rev=809876&r1=809875&r2=809876&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/engine/CPMEngine.java Tue Sep 1 08:06:40 2009
@@ -592,7 +592,8 @@
* @deprecated
*
*/
- public void asynchStop() {
+ @Deprecated
+public void asynchStop() {
if (UIMAFramework.getLogger().isLoggable(Level.INFO)) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.INFO, this.getClass().getName(),
"process", CPMUtils.CPM_LOG_RESOURCE_BUNDLE, "UIMA_CPM_terminate_pipelines__INFO",
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/JavaTimer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/JavaTimer.java?rev=809876&r1=809875&r2=809876&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/JavaTimer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/JavaTimer.java Tue Sep 1 08:06:40 2009
@@ -28,6 +28,7 @@
*
*/
+@Deprecated
public class JavaTimer implements Timer, Serializable {
private static final long serialVersionUID = 5399135137398839124L;
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Timer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Timer.java?rev=809876&r1=809875&r2=809876&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Timer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/utils/Timer.java Tue Sep 1 08:06:40 2009
@@ -26,6 +26,7 @@
*
*/
+@Deprecated
public interface Timer {
// starts the time
public void start();
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/cas_data/VinciPrimitiveValue.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/cas_data/VinciPrimitiveValue.java?rev=809876&r1=809875&r2=809876&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/cas_data/VinciPrimitiveValue.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/vinci/cas_data/VinciPrimitiveValue.java Tue Sep 1 08:06:40 2009
@@ -25,6 +25,7 @@
/**
* @deprecated Use PrimitiveValueImpl instead. This is just here for backwards compatibility.
*/
+@Deprecated
public class VinciPrimitiveValue extends PrimitiveValueImpl implements PrimitiveValue {
private static final long serialVersionUID = 1668126114372701948L;
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java?rev=809876&r1=809875&r2=809876&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CasProcessorCpeObject.java Tue Sep 1 08:06:40 2009
@@ -149,7 +149,8 @@
* @deprecated Doesn't support the new import syntax. Use getCpeComponentDescriptor().findAbsoluteUrl() instead.
*/
- public String getDescriptor() {
+ @Deprecated
+public String getDescriptor() {
if (descriptor != null && descriptor.getInclude() != null) {
return descriptor.getInclude().get();
}
@@ -366,7 +367,8 @@
* @param aSoFa
* @throws CpeDescriptorException
*/
- public void setSOFA(String aSoFa) throws CpeDescriptorException {
+ @Deprecated
+public void setSOFA(String aSoFa) throws CpeDescriptorException {
// if (casProcessor != null )
// {
// casProcessor.setContentTag(aSoFa);
@@ -377,7 +379,8 @@
* @deprecated (non-Javadoc)
* @see org.apache.uima.collection.metadata.CpeCasProcessor#getSOFA()
*/
- public String getSOFA() {
+ @Deprecated
+public String getSOFA() {
// if (casProcessor != null )
// {
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderCasInitializerImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderCasInitializerImpl.java?rev=809876&r1=809875&r2=809876&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderCasInitializerImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeCollectionReaderCasInitializerImpl.java Tue Sep 1 08:06:40 2009
@@ -35,6 +35,7 @@
/**
* @deprecated As of v2.0, CAS Initializers are deprecated.
*/
+@Deprecated
public class CpeCollectionReaderCasInitializerImpl extends MetaDataObject_impl implements
CpeCollectionReaderCasInitializer {
private static final long serialVersionUID = -6284616239685904940L;
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java?rev=809876&r1=809875&r2=809876&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptionImpl.java Tue Sep 1 08:06:40 2009
@@ -114,7 +114,8 @@
/**
* @deprecated As of v2.0, CAS Initializers are deprecated.
*/
- public CpeCollectionReaderCasInitializer addCasInitializer(String aInitializerDescriptorPath)
+ @Deprecated
+public CpeCollectionReaderCasInitializer addCasInitializer(String aInitializerDescriptorPath)
throws CpeDescriptorException {
if (collectionReader == null) {
collectionReader = CpeDescriptorFactory.produceCollectionReader();
@@ -165,7 +166,8 @@
/**
* @deprecated
*/
- public void setInputQueueSize(int aSize) throws CpeDescriptorException {
+ @Deprecated
+public void setInputQueueSize(int aSize) throws CpeDescriptorException {
if (casProcessors == null) {
casProcessors = CpeDescriptorFactory.produceCasProcessors();
}
@@ -182,7 +184,8 @@
/**
* @deprecated
*/
- public void setOutputQueueSize(int aSize) throws CpeDescriptorException {
+ @Deprecated
+public void setOutputQueueSize(int aSize) throws CpeDescriptorException {
if (casProcessors == null) {
casProcessors = CpeDescriptorFactory.produceCasProcessors();
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java?rev=809876&r1=809875&r2=809876&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/metadata/cpe/CpeDescriptorFactory.java Tue Sep 1 08:06:40 2009
@@ -181,7 +181,8 @@
*
* @deprecated As of v2.0, CAS Initializers are deprecated.
*/
- public static CpeCollectionReaderCasInitializer produceCollectionReaderCasInitializer(
+ @Deprecated
+public static CpeCollectionReaderCasInitializer produceCollectionReaderCasInitializer(
String aPath, CpeDescription aDescriptor) throws CpeDescriptorException {
if (aDescriptor == null) {
aDescriptor = produceDescriptor();
@@ -196,7 +197,8 @@
* @param aInitializerDescriptorPath
* @deprecated As of v2.0, CAS Initializers are deprecated.
*/
- protected static CpeCollectionReaderCasInitializer produceCollectionReaderCasInitializer(
+ @Deprecated
+protected static CpeCollectionReaderCasInitializer produceCollectionReaderCasInitializer(
String aInitializerDescriptorPath) {
try {
return produceCollectionReaderCasInitializer(aInitializerDescriptorPath, null);