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/07/08 20:29:58 UTC
svn commit: r792251 - in
/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: ./
analysis_engine/ analysis_engine/annotator/ analysis_engine/impl/ cas/
cas/admin/ cas/impl/ cas_data/ cas_data/impl/ collection/
collection/base_cpm/ coll...
Author: joern
Date: Wed Jul 8 18:29:57 2009
New Revision: 792251
URL: http://svn.apache.org/viewvc?rev=792251&view=rev
Log:
UIMA-1342 Now also declares @Deprecated annotation
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisProcessData.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultSpecification.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TaeDescription.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TextAnalysisEngine.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContext.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisProcessData_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TaeDescription_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureValuePath.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SofaID.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASMgr.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureStructure.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializerDescription.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer_ImplBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader_ImplBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer_ImplBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessor.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReader.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderCasInitializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CasInitializerFactory_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/SofaID_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextAnalysisEnginePool.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/Logger.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SaxDeserializer_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/ResourceSpecifierFactory.java Wed Jul 8 18:29:57 2009
@@ -181,7 +181,8 @@
*
* @deprecated As of v2.0, {@link #createAnalysisEngineDescription()} should be used instead.
*/
- public TaeDescription createTaeDescription();
+ @Deprecated
+public TaeDescription createTaeDescription();
/**
* Creates a <code>ResourceMetaData</code>.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/UIMAFramework.java Wed Jul 8 18:29:57 2009
@@ -456,7 +456,8 @@
* @deprecated As of v2.0, {@link #produceAnalysisEngine(ResourceSpecifier)} should be used
* instead.
*/
- public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier)
+ @Deprecated
+public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier)
throws ResourceInitializationException {
return (TextAnalysisEngine) produceResource(TextAnalysisEngine.class, aSpecifier, null);
}
@@ -485,7 +486,8 @@
* @deprecated As of v2.0, {@link #produceAnalysisEngine(ResourceSpecifier,Map)} should be used
* instead.
*/
- public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier, Map aAdditionalParams)
+ @Deprecated
+public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier, Map aAdditionalParams)
throws ResourceInitializationException {
return (TextAnalysisEngine) produceResource(TextAnalysisEngine.class, aSpecifier,
aAdditionalParams);
@@ -519,7 +521,8 @@
* @deprecated As of v2.0, {@link #produceAnalysisEngine(ResourceSpecifier,ResourceManager,Map)}
* should be used instead.
*/
- public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier,
+ @Deprecated
+public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier,
ResourceManager aResourceManager, Map aAdditionalParams)
throws ResourceInitializationException {
return (TextAnalysisEngine) produceResource(TextAnalysisEngine.class, aSpecifier,
@@ -559,7 +562,8 @@
* @deprecated As of v2.0, {@link #produceAnalysisEngine(ResourceSpecifier,int,int)} should be
* used instead.
*/
- public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier,
+ @Deprecated
+public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier,
int aMaxSimultaneousRequests, int aTimeoutPeriod) throws ResourceInitializationException {
// add parameters to the aAdditionalParams map
Map aAdditionalParams = new HashMap();
@@ -738,7 +742,8 @@
* like HTML detagging should instead be implemented as a "multi-Sofa" annotator. See
* {@link org.apache.uima.examples.XmlDetagger} for an example.
*/
- public static CasInitializer produceCasInitializer(ResourceSpecifier aSpecifier)
+ @Deprecated
+public static CasInitializer produceCasInitializer(ResourceSpecifier aSpecifier)
throws ResourceInitializationException {
return (CasInitializer) produceResource(CasInitializer.class, aSpecifier, null);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java Wed Jul 8 18:29:57 2009
@@ -348,7 +348,8 @@
* @deprecated This is no longer used by the framework and was never intended for users to call.
* Use {#link #process(CAS)} instead.
*/
- public void process(AnalysisProcessData aProcessData, ResultSpecification aResultSpec)
+ @Deprecated
+public void process(AnalysisProcessData aProcessData, ResultSpecification aResultSpec)
throws ResultNotSupportedException, AnalysisEngineProcessException;
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisProcessData.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisProcessData.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisProcessData.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisProcessData.java Wed Jul 8 18:29:57 2009
@@ -41,6 +41,7 @@
*
* @deprecated
*/
+@Deprecated
public interface AnalysisProcessData {
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultSpecification.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultSpecification.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultSpecification.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultSpecification.java Wed Jul 8 18:29:57 2009
@@ -254,7 +254,8 @@
* the Type System used to determine which features belong to each Type
* @deprecated as of 2.2.2 Now called automatically internally when needed
*/
- public void compile(TypeSystem aTypeSystem);
+ @Deprecated
+public void compile(TypeSystem aTypeSystem);
/**
* Determines whether this <code>ResultSpecification</code> contains the specified Type for the
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TaeDescription.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TaeDescription.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TaeDescription.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TaeDescription.java Wed Jul 8 18:29:57 2009
@@ -25,6 +25,7 @@
* @deprecated As of v2.0, {@link AnalysisEngineDescription} should be used instead. This interface
* no longer defines any additional methods beyond those in AnalysisEngineDescription.
*/
+@Deprecated
public interface TaeDescription extends AnalysisEngineDescription {
// As of 2.0, no longer defines any additional methods beyond those in AnalysisEngineDescription
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TextAnalysisEngine.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TextAnalysisEngine.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TextAnalysisEngine.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/TextAnalysisEngine.java Wed Jul 8 18:29:57 2009
@@ -26,6 +26,7 @@
* @deprecated As of v2.0, {@link AnalysisEngine} should be used instead. This interface no longer
* defines any additional methods beyond those in AnalysisEngine.
*/
+@Deprecated
public interface TextAnalysisEngine extends AnalysisEngine {
// As of 2.0, no longer defines any additional methods beyond those in AnalysisEngineDescription
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContext.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContext.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContext.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContext.java Wed Jul 8 18:29:57 2009
@@ -427,7 +427,8 @@
* now be obtained directly by the method {@link CAS#getView(String)}, and the
* framework will automatically do the necessary Sofa mappings.
*/
- public SofaID mapToSofaID(String aSofaName);
+ @Deprecated
+public SofaID mapToSofaID(String aSofaName);
/**
*
@@ -437,6 +438,7 @@
* now be obtained directly by the method {@link CAS#getView(String)}, and the
* framework will automatically do the necessary Sofa mappings.
*/
- public SofaID[] getSofaMappings();
+ @Deprecated
+public SofaID[] getSofaMappings();
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java Wed Jul 8 18:29:57 2009
@@ -252,7 +252,8 @@
/**
* @deprecated
*/
- public void process(org.apache.uima.analysis_engine.AnalysisProcessData aProcessData,
+ @Deprecated
+public void process(org.apache.uima.analysis_engine.AnalysisProcessData aProcessData,
ResultSpecification aResultSpec) throws ResultNotSupportedException,
AnalysisEngineProcessException {
process(aProcessData.getCAS(), aResultSpec, aProcessData.getProcessTrace());
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisProcessData_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisProcessData_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisProcessData_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisProcessData_impl.java Wed Jul 8 18:29:57 2009
@@ -31,6 +31,7 @@
*
* @deprecated since v2.0
*/
+@Deprecated
public class AnalysisProcessData_impl implements AnalysisProcessData {
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_impl.java Wed Jul 8 18:29:57 2009
@@ -265,7 +265,8 @@
* @see org.apache.uima.analysis_engine.annotator.AnnotatorContext#mapToSofaID(java.lang.String)
* @deprecated
*/
- public SofaID mapToSofaID(String aSofaName) {
+ @Deprecated
+public SofaID mapToSofaID(String aSofaName) {
return mUimaContext.mapToSofaID(aSofaName);
}
@@ -273,7 +274,8 @@
* @see org.apache.uima.analysis_engine.annotator.AnnotatorContext#getSofaMappings()
* @deprecated
*/
- public SofaID[] getSofaMappings() {
+ @Deprecated
+public SofaID[] getSofaMappings() {
return mUimaContext.getSofaMappings();
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TaeDescription_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TaeDescription_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TaeDescription_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/TaeDescription_impl.java Wed Jul 8 18:29:57 2009
@@ -27,6 +27,7 @@
*
* @deprecated since v2.0
*/
+@Deprecated
public class TaeDescription_impl extends AnalysisEngineDescription_impl implements TaeDescription {
static final long serialVersionUID = 7829820134797529630L;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java Wed Jul 8 18:29:57 2009
@@ -408,7 +408,8 @@
/**
* @deprecated
*/
- protected AnalysisProcessData_impl createAnalysisProcessData() {
+ @Deprecated
+protected AnalysisProcessData_impl createAnalysisProcessData() {
try {
return new AnalysisProcessData_impl(newCAS(), getPerformanceTuningSettings());
} catch (ResourceInitializationException e) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CAS.java Wed Jul 8 18:29:57 2009
@@ -581,7 +581,8 @@
* @deprecated As of v2.0, use {#getView(String)}. From the view you can access the Sofa data, or
* call {@link #getSofa()} if you truly need to access the SofaFS object.
*/
- SofaFS getSofa(SofaID sofaID);
+ @Deprecated
+SofaFS getSofa(SofaID sofaID);
/**
* Get the Sofa feature structure associated with this CAS view.
@@ -634,7 +635,8 @@
*
* @deprecated As of v2.0, use {@link #getView(String)} followed by {@link #getJCas()}.
*/
- JCas getJCas(SofaID aSofaID) throws CASException;
+ @Deprecated
+JCas getJCas(SofaID aSofaID) throws CASException;
/**
* Get the view for a Sofa (subject of analysis). The view provides access to the Sofa data and
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureValuePath.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureValuePath.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureValuePath.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/FeatureValuePath.java Wed Jul 8 18:29:57 2009
@@ -81,6 +81,7 @@
*
* @deprecated use {@link org.apache.uima.cas.FeaturePath FeaturePath}
*/
+@Deprecated
public interface FeatureValuePath {
public Object evaluate(int currentFS, LowLevelCAS cas);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java Wed Jul 8 18:29:57 2009
@@ -24,6 +24,7 @@
*
* @deprecated The Constraint Parser is not supported in externally released versions of UIMA
*/
+@Deprecated
public class ParsingException extends Exception {
private static final long serialVersionUID = -8526988900901941980L;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SofaID.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SofaID.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SofaID.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/SofaID.java Wed Jul 8 18:29:57 2009
@@ -28,6 +28,7 @@
* @deprecated As of v2.0, this is no longer needed. CAS views can now be obtained directly using
* String identifiers, through the method {@link CAS#getView(String)}.
*/
+@Deprecated
public interface SofaID {
/**
* Set the Sofa ID of a Sofa FS in the CAS.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASMgr.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASMgr.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASMgr.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASMgr.java Wed Jul 8 18:29:57 2009
@@ -51,7 +51,8 @@
*
* @deprecated Use {@link #reset reset()} instead.
*/
- void flush() throws CASAdminException;
+ @Deprecated
+void flush() throws CASAdminException;
/**
* Flush this CAS instance of all transient data. This will delete all feature structures, but not
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/CASImpl.java Wed Jul 8 18:29:57 2009
@@ -569,7 +569,8 @@
/**
* @deprecated
*/
- public SofaFS createSofa(SofaID sofaID, String mimeType) {
+ @Deprecated
+public SofaFS createSofa(SofaID sofaID, String mimeType) {
// extract absolute SofaName string from the ID
SofaFS aSofa = createSofa(sofaID.getSofaID(), mimeType);
getView(aSofa); // will create the view, needed to make the
@@ -626,7 +627,8 @@
/**
* @deprecated
*/
- public SofaFS getSofa(SofaID sofaID) {
+ @Deprecated
+public SofaFS getSofa(SofaID sofaID) {
// extract absolute SofaName string from the ID
return getSofa(sofaID.getSofaID());
}
@@ -828,7 +830,8 @@
/**
* @deprecated
*/
- public void commitFS(FeatureStructure fs) {
+ @Deprecated
+public void commitFS(FeatureStructure fs) {
getIndexRepository().addFS(fs);
}
@@ -932,7 +935,8 @@
/**
* @deprecated Use {@link #reset reset()}instead.
*/
- public void flush() {
+ @Deprecated
+public void flush() {
reset();
}
@@ -2552,7 +2556,8 @@
/**
* @deprecated
*/
- public JCas getJCas(SofaID aSofaID) throws CASException {
+ @Deprecated
+public JCas getJCas(SofaID aSofaID) throws CASException {
SofaFS sofa = getSofa(aSofaID);
if (sofa == null) {
CASRuntimeException e = new CASRuntimeException(CASRuntimeException.SOFANAME_NOT_FOUND,
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeImpl.java Wed Jul 8 18:29:57 2009
@@ -96,7 +96,8 @@
* @return The vector.
* @deprecated
*/
- public Vector getAppropriateFeatures() {
+ @Deprecated
+public Vector getAppropriateFeatures() {
return new Vector(getFeatures());
}
@@ -205,7 +206,8 @@
/**
* @deprecated
*/
- public Feature getFeature(String featureName) {
+ @Deprecated
+public Feature getFeature(String featureName) {
return getFeatureByBaseName(featureName);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TypeSystemImpl.java Wed Jul 8 18:29:57 2009
@@ -305,7 +305,8 @@
* @deprecated Use 0 arg constructor. Type Systems are shared by many CASes, and can't point to
* one. Change also your possible calls to ts.commit() - see comment on that method.
*/
- public TypeSystemImpl(CASImpl cas) {
+ @Deprecated
+public TypeSystemImpl(CASImpl cas) {
this();
}
@@ -1103,7 +1104,8 @@
/**
* @deprecated
*/
- public Feature getFeature(String featureName) {
+ @Deprecated
+public Feature getFeature(String featureName) {
return getFeatureByFullName(featureName);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasSerializer.java Wed Jul 8 18:29:57 2009
@@ -1428,7 +1428,8 @@
* @deprecated Use {@link #XmiCasSerializer(TypeSystem, Map)} instead. The UimaContext reference
* is never used by this implementation.
*/
- public XmiCasSerializer(TypeSystem ts, UimaContext uimaContext, Map nsUriToSchemaLocationMap) {
+ @Deprecated
+public XmiCasSerializer(TypeSystem ts, UimaContext uimaContext, Map nsUriToSchemaLocationMap) {
this(ts, nsUriToSchemaLocationMap);
}
@@ -1446,7 +1447,8 @@
* @deprecated Use {@link #XmiCasSerializer(TypeSystem)} instead. The UimaContext reference is
* never used by this implementation.
*/
- public XmiCasSerializer(TypeSystem ts, UimaContext uimaContext) {
+ @Deprecated
+public XmiCasSerializer(TypeSystem ts, UimaContext uimaContext) {
this(ts);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureStructure.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureStructure.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureStructure.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/FeatureStructure.java Wed Jul 8 18:29:57 2009
@@ -108,7 +108,8 @@
* @return true if this FS should be indexed, false if not
* @deprecated Use {@link #getIndexed()} instead
*/
- public boolean isIndexed();
+ @Deprecated
+public boolean isIndexed();
/**
* Sets whether this FeatureStructure should be indexed if the CasData is converted to a CAS
@@ -118,7 +119,8 @@
* true if this FS should be indexed, false if not
* @deprecated Use {@link #setIndexed(int[])} instead
*/
- public void setIndexed(boolean aIndexed);
+ @Deprecated
+public void setIndexed(boolean aIndexed);
/**
* Gets the index repositories that this FeatureStrucutre should be indexed in if the CasData is
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas_data/impl/FeatureStructureImpl.java Wed Jul 8 18:29:57 2009
@@ -106,7 +106,8 @@
* @return
* @deprecated
*/
- public boolean isIndexed() {
+ @Deprecated
+public boolean isIndexed() {
return mIndexed.length > 0;
}
@@ -121,7 +122,8 @@
* @param b
* @deprecated
*/
- public void setIndexed(boolean b) {
+ @Deprecated
+public void setIndexed(boolean b) {
mIndexed = new int[] { 1 }; // index in first index repository for backwards compatibility
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer.java Wed Jul 8 18:29:57 2009
@@ -37,6 +37,7 @@
* {@link org.apache.uima.examples.XmlDetagger} for an example.
*
*/
+@Deprecated
public interface CasInitializer extends ConfigurableResource {
/**
* Informs this CasInitializer that the CAS TypeSystem has changed. The CollectionReader must call
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializerDescription.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializerDescription.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializerDescription.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializerDescription.java Wed Jul 8 18:29:57 2009
@@ -30,6 +30,7 @@
* like HTML detagging should instead be implemented as a "multi-Sofa" annotator. See
* {@link org.apache.uima.examples.XmlDetagger} for an example.
*/
+@Deprecated
public interface CasInitializerDescription extends ResourceCreationSpecifier {
/**
* Retrieves the metadata that describes the CasInitializer.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer_ImplBase.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CasInitializer_ImplBase.java Wed Jul 8 18:29:57 2009
@@ -38,6 +38,7 @@
* like HTML detagging should instead be implemented as a "multi-Sofa" annotator. See
* {@link org.apache.uima.examples.XmlDetagger} for an example.
*/
+@Deprecated
public abstract class CasInitializer_ImplBase extends ConfigurableResource_ImplBase implements
CasInitializer {
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java Wed Jul 8 18:29:57 2009
@@ -91,7 +91,8 @@
*
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
- public CasInitializer getCasInitializer();
+ @Deprecated
+public CasInitializer getCasInitializer();
/**
* Assigns a CAS Initializer for this Collection Reader to use. Note that CollectionReader
@@ -103,6 +104,7 @@
*
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
- public void setCasInitializer(CasInitializer aCasInitializer);
+ @Deprecated
+public void setCasInitializer(CasInitializer aCasInitializer);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader_ImplBase.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader_ImplBase.java Wed Jul 8 18:29:57 2009
@@ -44,7 +44,8 @@
/**
* @deprecated
*/
- private CasInitializer mCasInitializer;
+ @Deprecated
+private CasInitializer mCasInitializer;
/**
* current class
@@ -138,7 +139,8 @@
*
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
- public CasInitializer getCasInitializer() {
+ @Deprecated
+public CasInitializer getCasInitializer() {
return mCasInitializer;
}
@@ -150,7 +152,8 @@
*
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
- public void setCasInitializer(CasInitializer aCasInitializer) {
+ @Deprecated
+public void setCasInitializer(CasInitializer aCasInitializer) {
mCasInitializer = aCasInitializer;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataCollectionReader.java Wed Jul 8 18:29:57 2009
@@ -78,7 +78,8 @@
*
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
- public CasDataInitializer getCasDataInitializer();
+ @Deprecated
+public CasDataInitializer getCasDataInitializer();
/**
* Assigns a CAS Data Initializer for this Collection Reader to use. Note that* CollectionReader
@@ -90,6 +91,7 @@
*
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
- public void setCasInitializer(CasDataInitializer aCasDataInitializer);
+ @Deprecated
+public void setCasInitializer(CasDataInitializer aCasDataInitializer);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer.java Wed Jul 8 18:29:57 2009
@@ -39,6 +39,7 @@
* like HTML detagging should instead be implemented as a "multi-Sofa" annotator. See
* {@link org.apache.uima.examples.XmlDetagger} for an example.
*/
+@Deprecated
public interface CasDataInitializer extends ConfigurableResource {
/**
* Reads content and metadata from an Object and creates a <code>CasData</code>.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer_ImplBase.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/base_cpm/CasDataInitializer_ImplBase.java Wed Jul 8 18:29:57 2009
@@ -37,6 +37,7 @@
* {@link org.apache.uima.examples.XmlDetagger} for an example.
*
*/
+@Deprecated
public abstract class CasDataInitializer_ImplBase extends ConfigurableResource_ImplBase implements
CasDataInitializer {
public CasDataInitializer_ImplBase() {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java Wed Jul 8 18:29:57 2009
@@ -42,6 +42,7 @@
/**
* @deprecated As of v2.0, CAS Initializers are deprecated.
*/
+@Deprecated
public class CasInitializerDescription_impl extends ResourceCreationSpecifier_impl implements
CasInitializerDescription {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessor.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessor.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessor.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCasProcessor.java Wed Jul 8 18:29:57 2009
@@ -57,7 +57,8 @@
* @throws CpeDescriptorException
* @deprecated Doesn't support the new import syntax. Use setCpeComponentDescriptor() instead.
*/
- public void setDescriptor(String aDescriptor) throws CpeDescriptorException;
+ @Deprecated
+public void setDescriptor(String aDescriptor) throws CpeDescriptorException;
/**
* Returns CasProcessor descriptor.
@@ -65,7 +66,8 @@
* @return descriptor
* @deprecated Doesn't support the new import syntax. Use getCpeComponentDescriptor().findAbsoluteUrl() instead.
*/
- public String getDescriptor();
+ @Deprecated
+public String getDescriptor();
/**
* Returns the {@link CpeComponentDescriptor} instance associated with this Cas Processor. That
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReader.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReader.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReader.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReader.java Wed Jul 8 18:29:57 2009
@@ -38,7 +38,8 @@
*
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
- public void setCasInitializer(CpeCollectionReaderCasInitializer aCasInitializer)
+ @Deprecated
+public void setCasInitializer(CpeCollectionReaderCasInitializer aCasInitializer)
throws CpeDescriptorException;
/**
@@ -50,7 +51,8 @@
*
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
- public CpeCollectionReaderCasInitializer getCasInitializer() throws CpeDescriptorException;
+ @Deprecated
+public CpeCollectionReaderCasInitializer getCasInitializer() throws CpeDescriptorException;
/**
* Removes {@link org.apache.uima.collection.metadata.CpeCollectionReaderCasInitializer} from
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderCasInitializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderCasInitializer.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderCasInitializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeCollectionReaderCasInitializer.java Wed Jul 8 18:29:57 2009
@@ -28,6 +28,7 @@
*
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
+@Deprecated
public interface CpeCollectionReaderCasInitializer extends MetaDataObject {
/**
* Sets descriptor path containing configuration for the CasInitializer
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java Wed Jul 8 18:29:57 2009
@@ -70,7 +70,8 @@
*
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
- public CpeCollectionReaderCasInitializer addCasInitializer(String aCasInitializerPath)
+ @Deprecated
+public CpeCollectionReaderCasInitializer addCasInitializer(String aCasInitializerPath)
throws CpeDescriptorException;
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/SimpleStepWithResultSpec.java Wed Jul 8 18:29:57 2009
@@ -29,6 +29,7 @@
* @deprecated For backwards compatibility with Capability Language Flow only.
* User-developed Flow Controllers should not use this.
*/
+@Deprecated
public class SimpleStepWithResultSpec extends SimpleStep {
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CasInitializerFactory_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CasInitializerFactory_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CasInitializerFactory_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/CasInitializerFactory_impl.java Wed Jul 8 18:29:57 2009
@@ -35,6 +35,7 @@
*
* @deprecated As of v2.0, CAS Initializers are deprecated.
*/
+@Deprecated
public class CasInitializerFactory_impl implements ResourceFactory {
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ResourceSpecifierFactory_impl.java Wed Jul 8 18:29:57 2009
@@ -184,7 +184,8 @@
* @see org.apache.uima.ResourceSpecifierFactory#createTaeDescription()
* @deprecated since v2.0
*/
- public TaeDescription createTaeDescription() {
+ @Deprecated
+public TaeDescription createTaeDescription() {
return (TaeDescription) createObject(TaeDescription.class);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/SofaID_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/SofaID_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/SofaID_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/SofaID_impl.java Wed Jul 8 18:29:57 2009
@@ -27,6 +27,7 @@
*
* @deprecated
*/
+@Deprecated
public class SofaID_impl implements SofaID {
String mSofaID;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextAnalysisEnginePool.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextAnalysisEnginePool.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextAnalysisEnginePool.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextAnalysisEnginePool.java Wed Jul 8 18:29:57 2009
@@ -31,6 +31,7 @@
*
* @deprecated As of v2.0, use {@link org.apache.uima.internal.util.AnalysisEnginePool} instead.
*/
+@Deprecated
public class TextAnalysisEnginePool extends AnalysisEnginePool {
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java Wed Jul 8 18:29:57 2009
@@ -118,7 +118,8 @@
* @return the associated xxx_Type instance
* @deprecated use instance.jcasType instead - faster
*/
- public abstract TOP_Type getType(TOP instance);
+ @Deprecated
+public abstract TOP_Type getType(TOP instance);
/**
* Internal use - looks up a type-name-string in the CAS type system and returns the Cas Type
@@ -163,7 +164,8 @@
* @deprecated As of v2.0, use {#getView(String)}. From the view you can access the Sofa data, or
* call {@link #getSofa()} if you truly need to access the SofaFS object.
*/
- public abstract Sofa getSofa(SofaID sofaID);
+ @Deprecated
+public abstract Sofa getSofa(SofaID sofaID);
/**
* Get the Sofa feature structure associated with this JCas view.
@@ -263,7 +265,8 @@
*
* @deprecated not required, does nothing
*/
- public abstract void processInit();
+ @Deprecated
+public abstract void processInit();
/**
* Get the view for a Sofa (subject of analysis). The view provides access to the Sofa data and
@@ -320,7 +323,8 @@
*
* @deprecated As of v2.0, use {@link #createView(String)} instead.
*/
- SofaFS createSofa(SofaID sofaID, String mimeType);
+ @Deprecated
+SofaFS createSofa(SofaID sofaID, String mimeType);
/**
* Get iterator for all SofaFS in the CAS.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java Wed Jul 8 18:29:57 2009
@@ -76,6 +76,7 @@
* @deprecated As of v2.0, use {@link JCasImpl#createView(String)} to create a view, which will
* also create the Sofa for that view.
*/
+ @Deprecated
public Sofa(JCas jcas, SofaID ID, String mimeType) {
super(jcas);
final CASImpl casImpl = jcasType.casImpl;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/tcas/Annotation.java Wed Jul 8 18:29:57 2009
@@ -122,7 +122,8 @@
/**
* @deprecated
*/
- public int getStart() {
+ @Deprecated
+public int getStart() {
return getBegin();
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/InstallationDescriptor.java Wed Jul 8 18:29:57 2009
@@ -1129,7 +1129,8 @@
* The given new ID of the main component.
* @deprecated Use setMainComponentId() method instead.
*/
- public synchronized void updateMainComponentId(String id) {
+ @Deprecated
+public synchronized void updateMainComponentId(String id) {
setMainComponentId(id);
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceManagerConfiguration_impl.java Wed Jul 8 18:29:57 2009
@@ -242,7 +242,8 @@
* @see org.apache.uima.resource.metadata.ResourceManagerConfiguration#getImport()
* @deprecated
*/
- public Import getImport() {
+ @Deprecated
+public Import getImport() {
if (mImports.length > 0) {
return mImports[0];
} else {
@@ -254,7 +255,8 @@
* @see org.apache.uima.resource.metadata.ResourceManagerConfiguration#setImport(org.apache.uima.resource.metadata.Import)
* @deprecated
*/
- public void setImport(Import aImport) {
+ @Deprecated
+public void setImport(Import aImport) {
mImports = new Import[] { aImport };
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java Wed Jul 8 18:29:57 2009
@@ -76,7 +76,8 @@
* @deprecated As of v2.0, TextAnalysisEngine has been deprecated. Use
* {@link #JCasPool(int, AnalysisEngine)} instead.
*/
- public JCasPool(int aNumInstances, TextAnalysisEngine aTextAnalysisEngine)
+ @Deprecated
+public JCasPool(int aNumInstances, TextAnalysisEngine aTextAnalysisEngine)
throws ResourceInitializationException {
mNumInstances = aNumInstances;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/Logger.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/Logger.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/Logger.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/Logger.java Wed Jul 8 18:29:57 2009
@@ -44,7 +44,8 @@
* @param aMessage
* the message to be logged with message level INFO
*/
- public void log(String aMessage);
+ @Deprecated
+public void log(String aMessage);
/**
* Logs an internationalized message.
@@ -58,7 +59,8 @@
* @param aArguments
* arguments to message (may be null if none)
*/
- public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments);
+ @Deprecated
+public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments);
/**
* Logs an exception
@@ -68,7 +70,8 @@
* @param aException
* the exception to be logged with message level INFO
*/
- public void logException(Exception aException);
+ @Deprecated
+public void logException(Exception aException);
/**
* Sets the output stream to which log messages will go. Setting the output stream to
@@ -79,7 +82,8 @@
* @param aStream
* <code>PrintStream</code> to which log messages will be printed
*/
- public void setOutputStream(PrintStream aStream);
+ @Deprecated
+public void setOutputStream(PrintStream aStream);
/**
* Sets the output stream to which log messages will go. Setting the output stream to
@@ -90,7 +94,8 @@
* @param aStream
* <code>OutputStream</code> to which log messages will be printed
*/
- public void setOutputStream(OutputStream aStream);
+ @Deprecated
+public void setOutputStream(OutputStream aStream);
/**
* Logs a message.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java Wed Jul 8 18:29:57 2009
@@ -48,6 +48,7 @@
*
* @deprecated As of v2.0, use {@link org.apache.uima.util.CasToInlineXml} instead.
*/
+@Deprecated
public class TCasToInlineXml implements TCasFormatter {
/**
* This destroy method does nothing.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLInputSource.java Wed Jul 8 18:29:57 2009
@@ -130,7 +130,8 @@
*
* @deprecated Use {@link #getURL()} instead.
*/
- public File getRelativePathBase() {
+ @Deprecated
+public File getRelativePathBase() {
// use the parent directory as the base for relative path resolution
String path = mURL.getPath();
return new File(path).getParentFile();
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java Wed Jul 8 18:29:57 2009
@@ -287,7 +287,8 @@
* @deprecated As of v2.0, {@link #parseAnalysisEngineDescription(XMLInputSource)} should be used
* instead.
*/
- public TaeDescription parseTaeDescription(XMLInputSource aInput) throws InvalidXMLException;
+ @Deprecated
+public TaeDescription parseTaeDescription(XMLInputSource aInput) throws InvalidXMLException;
/**
* Parses a TaeDescription from an XML input stream.
@@ -305,7 +306,8 @@
* @deprecated As of v2.0, {@link #parseAnalysisEngineDescription(XMLInputSource,ParsingOptions)}
* should be used instead.
*/
- public TaeDescription parseTaeDescription(XMLInputSource aInput, ParsingOptions aOptions)
+ @Deprecated
+public TaeDescription parseTaeDescription(XMLInputSource aInput, ParsingOptions aOptions)
throws InvalidXMLException;
/**
@@ -812,7 +814,8 @@
*
* @deprecated XInclude is no longer supported
*/
- public boolean expandXIncludes;
+ @Deprecated
+ public boolean expandXIncludes;
/**
* Whether to expand <envVarRef>VARNAME</envVarRef> elements by substituting the
@@ -830,7 +833,8 @@
* substituting the value of the System proprery VARNAME.
* @deprecated XInclude is no longer supported
*/
- public ParsingOptions(boolean aExpandXIncludes, boolean aExpandEnvVarRefs) {
+ @Deprecated
+ public ParsingOptions(boolean aExpandXIncludes, boolean aExpandEnvVarRefs) {
expandXIncludes = aExpandXIncludes;
expandEnvVarRefs = aExpandEnvVarRefs;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/JSR47Logger_impl.java Wed Jul 8 18:29:57 2009
@@ -104,7 +104,8 @@
* @param aMessage
* the message to be logged
*/
- public void log(String aMessage) {
+ @Deprecated
+public void log(String aMessage) {
if (isLoggable(Level.INFO)) {
if (aMessage == null || aMessage.equals(""))
return;
@@ -122,7 +123,8 @@
*
* @see org.apache.uima.util.Logger#log(java.lang.String, java.lang.String, java.lang.Object[])
*/
- public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments) {
+ @Deprecated
+public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments) {
if (isLoggable(Level.INFO)) {
if (aMessageKey == null || aMessageKey.equals(""))
return;
@@ -143,7 +145,8 @@
* @param aException
* the exception to be logged
*/
- public void logException(Exception aException) {
+ @Deprecated
+public void logException(Exception aException) {
if (isLoggable(Level.INFO)) {
if (aException == null)
return;
@@ -161,7 +164,8 @@
*
* @deprecated use external configuration possibility
*/
- public void setOutputStream(OutputStream out) {
+ @Deprecated
+public void setOutputStream(OutputStream out) {
// if OutputStream is null set root logger level to OFF
if (out == null) {
LogManager.getLogManager().getLogger("").setLevel(java.util.logging.Level.OFF);
@@ -187,7 +191,8 @@
*
* @deprecated use external configuration possibility
*/
- public void setOutputStream(PrintStream out) {
+ @Deprecated
+public void setOutputStream(PrintStream out) {
// if PrintStream is null set root logger level to OFF
if (out == null) {
LogManager.getLogManager().getLogger("").setLevel(java.util.logging.Level.OFF);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Log4jLogger_impl.java Wed Jul 8 18:29:57 2009
@@ -98,7 +98,8 @@
* @param aMessage
* the message to be logged
*/
- public void log(String aMessage) {
+ @Deprecated
+public void log(String aMessage) {
if (isLoggable(Level.INFO)) {
if (aMessage == null || aMessage.equals(""))
return;
@@ -116,7 +117,8 @@
* @see org.apache.uima.util.Logger#log(java.lang.String, java.lang.String,
* java.lang.Object[])
*/
- public void log(String aResourceBundleName, String aMessageKey,
+ @Deprecated
+public void log(String aResourceBundleName, String aMessageKey,
Object[] aArguments) {
if (isLoggable(Level.INFO)) {
if (aMessageKey == null || aMessageKey.equals(""))
@@ -136,7 +138,8 @@
* @param aException
* the exception to be logged
*/
- public void logException(Exception aException) {
+ @Deprecated
+public void logException(Exception aException) {
if (isLoggable(Level.INFO)) {
if (aException == null)
return;
@@ -153,7 +156,8 @@
* @see org.apache.uima.util.Logger#setOutputStream(java.io.OutputStream)
* @deprecated use external configuration possibility
*/
- public void setOutputStream(OutputStream out) {
+ @Deprecated
+public void setOutputStream(OutputStream out) {
throw new UnsupportedOperationException(
"Method setOutputStream(OutputStream out) not supported");
}
@@ -162,7 +166,8 @@
* @see org.apache.uima.util.Logger#setOutputStream(java.io.PrintStream)
* @deprecated use external configuration possibility
*/
- public void setOutputStream(PrintStream out) {
+ @Deprecated
+public void setOutputStream(PrintStream out) {
throw new UnsupportedOperationException(
"Method setOutputStream(PrintStream out) not supported");
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/Logger_impl.java Wed Jul 8 18:29:57 2009
@@ -97,7 +97,8 @@
* @param aMessage
* the message to be logged
*/
- public void log(String aMessage) {
+ @Deprecated
+public void log(String aMessage) {
if (isLoggable(Level.INFO) && mOut != null) {
mOut.print(new Date());
mOut.print(": " + Level.INFO.toString() + ": ");
@@ -112,7 +113,8 @@
*
* @see org.apache.uima.util.Logger#log(java.lang.String, java.lang.String, java.lang.Object[])
*/
- public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments) {
+ @Deprecated
+public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments) {
if (isLoggable(Level.INFO)) {
log(I18nUtil.localizeMessage(aResourceBundleName, aMessageKey, aArguments,
getExtensionClassLoader()));
@@ -127,7 +129,8 @@
* @param aException
* the exception to be logged
*/
- public void logException(Exception aException) {
+ @Deprecated
+public void logException(Exception aException) {
if (isLoggable(Level.INFO) && mOut != null) {
mOut.print(new Date());
mOut.print(": " + Level.INFO.toString() + ": ");
@@ -140,7 +143,8 @@
*
* @see org.apache.uima.util.Logger#setOutputStream(java.io.OutputStream)
*/
- public void setOutputStream(OutputStream out) {
+ @Deprecated
+public void setOutputStream(OutputStream out) {
if (out == null || out instanceof PrintStream) {
mOut = (PrintStream) out;
} else {
@@ -153,7 +157,8 @@
*
* @see org.apache.uima.util.Logger#setOutputStream(java.io.PrintStream)
*/
- public void setOutputStream(PrintStream out) {
+ @Deprecated
+public void setOutputStream(PrintStream out) {
mOut = out;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SaxDeserializer_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SaxDeserializer_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SaxDeserializer_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SaxDeserializer_impl.java Wed Jul 8 18:29:57 2009
@@ -99,7 +99,8 @@
*
* @deprecated Use {@link #SaxDeserializer_impl(XMLParser, XMLParser.ParsingOptions)} instead.
*/
- public SaxDeserializer_impl(XMLParser aUimaXmlParser, String aNamespaceForSchema, URL aSchemaUrl,
+ @Deprecated
+public SaxDeserializer_impl(XMLParser aUimaXmlParser, String aNamespaceForSchema, URL aSchemaUrl,
XMLParser.ParsingOptions aOptions) {
this(aUimaXmlParser, aOptions);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java?rev=792251&r1=792250&r2=792251&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java Wed Jul 8 18:29:57 2009
@@ -512,7 +512,8 @@
*
* @deprecated since v2.0
*/
- public TaeDescription parseTaeDescription(XMLInputSource aInput) throws InvalidXMLException {
+ @Deprecated
+public TaeDescription parseTaeDescription(XMLInputSource aInput) throws InvalidXMLException {
return parseTaeDescription(aInput, DEFAULT_PARSING_OPTIONS);
}
@@ -530,7 +531,8 @@
*
* @deprecated since v2.0
*/
- public TaeDescription parseTaeDescription(XMLInputSource aInput, ParsingOptions aOptions)
+ @Deprecated
+public TaeDescription parseTaeDescription(XMLInputSource aInput, ParsingOptions aOptions)
throws InvalidXMLException {
// attempt to locate resource specifier schema
URL schemaURL = getResourceSpecifierSchemaUrl();
@@ -595,7 +597,8 @@
/**
* @deprecated
*/
- public CasInitializerDescription parseCasInitializerDescription(XMLInputSource aInput)
+ @Deprecated
+public CasInitializerDescription parseCasInitializerDescription(XMLInputSource aInput)
throws InvalidXMLException {
return parseCasInitializerDescription(aInput, DEFAULT_PARSING_OPTIONS);
}
@@ -603,7 +606,8 @@
/**
* @deprecated
*/
- public CasInitializerDescription parseCasInitializerDescription(XMLInputSource aInput,
+ @Deprecated
+public CasInitializerDescription parseCasInitializerDescription(XMLInputSource aInput,
ParsingOptions aOptions) throws InvalidXMLException {
// attempt to locate resource specifier schema
URL schemaURL = getResourceSpecifierSchemaUrl();