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:59:34 UTC
svn commit: r792260 - 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:59:33 2009
New Revision: 792260
URL: http://svn.apache.org/viewvc?rev=792260&view=rev
Log:
UIMA-1342 Corrected method indentation
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/ResultSpecification.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/AnnotatorContext_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/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/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/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/CpeDescription.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/jcas/JCas.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/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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -182,7 +182,7 @@
* @deprecated As of v2.0, {@link #createAnalysisEngineDescription()} should be used instead.
*/
@Deprecated
-public TaeDescription createTaeDescription();
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -457,7 +457,7 @@
* instead.
*/
@Deprecated
-public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier)
+ public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier)
throws ResourceInitializationException {
return (TextAnalysisEngine) produceResource(TextAnalysisEngine.class, aSpecifier, null);
}
@@ -487,7 +487,7 @@
* instead.
*/
@Deprecated
-public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier, Map aAdditionalParams)
+ public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier, Map aAdditionalParams)
throws ResourceInitializationException {
return (TextAnalysisEngine) produceResource(TextAnalysisEngine.class, aSpecifier,
aAdditionalParams);
@@ -522,7 +522,7 @@
* should be used instead.
*/
@Deprecated
-public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier,
+ public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier,
ResourceManager aResourceManager, Map aAdditionalParams)
throws ResourceInitializationException {
return (TextAnalysisEngine) produceResource(TextAnalysisEngine.class, aSpecifier,
@@ -563,7 +563,7 @@
* used instead.
*/
@Deprecated
-public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier,
+ public static TextAnalysisEngine produceTAE(ResourceSpecifier aSpecifier,
int aMaxSimultaneousRequests, int aTimeoutPeriod) throws ResourceInitializationException {
// add parameters to the aAdditionalParams map
Map aAdditionalParams = new HashMap();
@@ -743,7 +743,7 @@
* {@link org.apache.uima.examples.XmlDetagger} for an example.
*/
@Deprecated
-public static CasInitializer produceCasInitializer(ResourceSpecifier aSpecifier)
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -349,7 +349,7 @@
* Use {#link #process(CAS)} instead.
*/
@Deprecated
-public void process(AnalysisProcessData aProcessData, ResultSpecification aResultSpec)
+ 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/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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -255,7 +255,7 @@
* @deprecated as of 2.2.2 Now called automatically internally when needed
*/
@Deprecated
-public void compile(TypeSystem aTypeSystem);
+ 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/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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -428,7 +428,7 @@
* framework will automatically do the necessary Sofa mappings.
*/
@Deprecated
-public SofaID mapToSofaID(String aSofaName);
+ public SofaID mapToSofaID(String aSofaName);
/**
*
@@ -439,6 +439,6 @@
* framework will automatically do the necessary Sofa mappings.
*/
@Deprecated
-public SofaID[] getSofaMappings();
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -253,7 +253,7 @@
* @deprecated
*/
@Deprecated
-public void process(org.apache.uima.analysis_engine.AnalysisProcessData aProcessData,
+ 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/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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -266,7 +266,7 @@
* @deprecated
*/
@Deprecated
-public SofaID mapToSofaID(String aSofaName) {
+ public SofaID mapToSofaID(String aSofaName) {
return mUimaContext.mapToSofaID(aSofaName);
}
@@ -275,7 +275,7 @@
* @deprecated
*/
@Deprecated
-public SofaID[] getSofaMappings() {
+ public SofaID[] getSofaMappings() {
return mUimaContext.getSofaMappings();
}
}
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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -409,7 +409,7 @@
* @deprecated
*/
@Deprecated
-protected AnalysisProcessData_impl createAnalysisProcessData() {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -582,7 +582,7 @@
* call {@link #getSofa()} if you truly need to access the SofaFS object.
*/
@Deprecated
-SofaFS getSofa(SofaID sofaID);
+ SofaFS getSofa(SofaID sofaID);
/**
* Get the Sofa feature structure associated with this CAS view.
@@ -636,7 +636,7 @@
* @deprecated As of v2.0, use {@link #getView(String)} followed by {@link #getJCas()}.
*/
@Deprecated
-JCas getJCas(SofaID aSofaID) throws CASException;
+ 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/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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -52,7 +52,7 @@
* @deprecated Use {@link #reset reset()} instead.
*/
@Deprecated
-void flush() throws CASAdminException;
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -570,7 +570,7 @@
* @deprecated
*/
@Deprecated
-public SofaFS createSofa(SofaID sofaID, String mimeType) {
+ 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
@@ -628,7 +628,7 @@
* @deprecated
*/
@Deprecated
-public SofaFS getSofa(SofaID sofaID) {
+ public SofaFS getSofa(SofaID sofaID) {
// extract absolute SofaName string from the ID
return getSofa(sofaID.getSofaID());
}
@@ -831,7 +831,7 @@
* @deprecated
*/
@Deprecated
-public void commitFS(FeatureStructure fs) {
+ public void commitFS(FeatureStructure fs) {
getIndexRepository().addFS(fs);
}
@@ -936,7 +936,7 @@
* @deprecated Use {@link #reset reset()}instead.
*/
@Deprecated
-public void flush() {
+ public void flush() {
reset();
}
@@ -2557,7 +2557,7 @@
* @deprecated
*/
@Deprecated
-public JCas getJCas(SofaID aSofaID) throws CASException {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -97,7 +97,7 @@
* @deprecated
*/
@Deprecated
-public Vector getAppropriateFeatures() {
+ public Vector getAppropriateFeatures() {
return new Vector(getFeatures());
}
@@ -207,7 +207,7 @@
* @deprecated
*/
@Deprecated
-public Feature getFeature(String featureName) {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -306,7 +306,7 @@
* one. Change also your possible calls to ts.commit() - see comment on that method.
*/
@Deprecated
-public TypeSystemImpl(CASImpl cas) {
+ public TypeSystemImpl(CASImpl cas) {
this();
}
@@ -1105,7 +1105,7 @@
* @deprecated
*/
@Deprecated
-public Feature getFeature(String featureName) {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -1429,7 +1429,7 @@
* is never used by this implementation.
*/
@Deprecated
-public XmiCasSerializer(TypeSystem ts, UimaContext uimaContext, Map nsUriToSchemaLocationMap) {
+ public XmiCasSerializer(TypeSystem ts, UimaContext uimaContext, Map nsUriToSchemaLocationMap) {
this(ts, nsUriToSchemaLocationMap);
}
@@ -1448,7 +1448,7 @@
* never used by this implementation.
*/
@Deprecated
-public XmiCasSerializer(TypeSystem ts, UimaContext uimaContext) {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -109,7 +109,7 @@
* @deprecated Use {@link #getIndexed()} instead
*/
@Deprecated
-public boolean isIndexed();
+ public boolean isIndexed();
/**
* Sets whether this FeatureStructure should be indexed if the CasData is converted to a CAS
@@ -120,7 +120,7 @@
* @deprecated Use {@link #setIndexed(int[])} instead
*/
@Deprecated
-public void setIndexed(boolean aIndexed);
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -107,7 +107,7 @@
* @deprecated
*/
@Deprecated
-public boolean isIndexed() {
+ public boolean isIndexed() {
return mIndexed.length > 0;
}
@@ -123,7 +123,7 @@
* @deprecated
*/
@Deprecated
-public void setIndexed(boolean b) {
+ 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/CollectionReader.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/CollectionReader.java?rev=792260&r1=792259&r2=792260&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:59:33 2009
@@ -92,7 +92,7 @@
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
@Deprecated
-public CasInitializer getCasInitializer();
+ public CasInitializer getCasInitializer();
/**
* Assigns a CAS Initializer for this Collection Reader to use. Note that CollectionReader
@@ -105,6 +105,6 @@
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
@Deprecated
-public void setCasInitializer(CasInitializer aCasInitializer);
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -140,7 +140,7 @@
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
@Deprecated
-public CasInitializer getCasInitializer() {
+ public CasInitializer getCasInitializer() {
return mCasInitializer;
}
@@ -153,7 +153,7 @@
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
@Deprecated
-public void setCasInitializer(CasInitializer aCasInitializer) {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -79,7 +79,7 @@
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
@Deprecated
-public CasDataInitializer getCasDataInitializer();
+ public CasDataInitializer getCasDataInitializer();
/**
* Assigns a CAS Data Initializer for this Collection Reader to use. Note that* CollectionReader
@@ -92,6 +92,6 @@
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
@Deprecated
-public void setCasInitializer(CasDataInitializer aCasDataInitializer);
+ public void setCasInitializer(CasDataInitializer aCasDataInitializer);
}
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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -58,7 +58,7 @@
* @deprecated Doesn't support the new import syntax. Use setCpeComponentDescriptor() instead.
*/
@Deprecated
-public void setDescriptor(String aDescriptor) throws CpeDescriptorException;
+ public void setDescriptor(String aDescriptor) throws CpeDescriptorException;
/**
* Returns CasProcessor descriptor.
@@ -67,7 +67,7 @@
* @deprecated Doesn't support the new import syntax. Use getCpeComponentDescriptor().findAbsoluteUrl() instead.
*/
@Deprecated
-public String getDescriptor();
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -39,7 +39,7 @@
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
@Deprecated
-public void setCasInitializer(CpeCollectionReaderCasInitializer aCasInitializer)
+ public void setCasInitializer(CpeCollectionReaderCasInitializer aCasInitializer)
throws CpeDescriptorException;
/**
@@ -52,7 +52,7 @@
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
@Deprecated
-public CpeCollectionReaderCasInitializer getCasInitializer() throws CpeDescriptorException;
+ 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/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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -71,7 +71,7 @@
* @deprecated As of v2.0 CAS Initializers are deprecated.
*/
@Deprecated
-public CpeCollectionReaderCasInitializer addCasInitializer(String aCasInitializerPath)
+ public CpeCollectionReaderCasInitializer addCasInitializer(String aCasInitializerPath)
throws CpeDescriptorException;
/**
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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -185,7 +185,7 @@
* @deprecated since v2.0
*/
@Deprecated
-public TaeDescription createTaeDescription() {
+ public TaeDescription createTaeDescription() {
return (TaeDescription) createObject(TaeDescription.class);
}
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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -119,7 +119,7 @@
* @deprecated use instance.jcasType instead - faster
*/
@Deprecated
-public abstract TOP_Type getType(TOP instance);
+ 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
@@ -165,7 +165,7 @@
* call {@link #getSofa()} if you truly need to access the SofaFS object.
*/
@Deprecated
-public abstract Sofa getSofa(SofaID sofaID);
+ public abstract Sofa getSofa(SofaID sofaID);
/**
* Get the Sofa feature structure associated with this JCas view.
@@ -266,7 +266,7 @@
* @deprecated not required, does nothing
*/
@Deprecated
-public abstract void processInit();
+ public abstract void processInit();
/**
* Get the view for a Sofa (subject of analysis). The view provides access to the Sofa data and
@@ -324,7 +324,7 @@
* @deprecated As of v2.0, use {@link #createView(String)} instead.
*/
@Deprecated
-SofaFS createSofa(SofaID sofaID, String mimeType);
+ 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/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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -123,7 +123,7 @@
* @deprecated
*/
@Deprecated
-public int getStart() {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -1130,7 +1130,7 @@
* @deprecated Use setMainComponentId() method instead.
*/
@Deprecated
-public synchronized void updateMainComponentId(String id) {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -243,7 +243,7 @@
* @deprecated
*/
@Deprecated
-public Import getImport() {
+ public Import getImport() {
if (mImports.length > 0) {
return mImports[0];
} else {
@@ -256,7 +256,7 @@
* @deprecated
*/
@Deprecated
-public void setImport(Import aImport) {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -77,7 +77,7 @@
* {@link #JCasPool(int, AnalysisEngine)} instead.
*/
@Deprecated
-public JCasPool(int aNumInstances, TextAnalysisEngine aTextAnalysisEngine)
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -45,7 +45,7 @@
* the message to be logged with message level INFO
*/
@Deprecated
-public void log(String aMessage);
+ public void log(String aMessage);
/**
* Logs an internationalized message.
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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -131,7 +131,7 @@
* @deprecated Use {@link #getURL()} instead.
*/
@Deprecated
-public File getRelativePathBase() {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -288,7 +288,7 @@
* instead.
*/
@Deprecated
-public TaeDescription parseTaeDescription(XMLInputSource aInput) throws InvalidXMLException;
+ public TaeDescription parseTaeDescription(XMLInputSource aInput) throws InvalidXMLException;
/**
* Parses a TaeDescription from an XML input stream.
@@ -307,7 +307,7 @@
* should be used instead.
*/
@Deprecated
-public TaeDescription parseTaeDescription(XMLInputSource aInput, ParsingOptions aOptions)
+ public TaeDescription parseTaeDescription(XMLInputSource aInput, ParsingOptions aOptions)
throws InvalidXMLException;
/**
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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -105,7 +105,7 @@
* the message to be logged
*/
@Deprecated
-public void log(String aMessage) {
+ public void log(String aMessage) {
if (isLoggable(Level.INFO)) {
if (aMessage == null || aMessage.equals(""))
return;
@@ -124,7 +124,7 @@
* @see org.apache.uima.util.Logger#log(java.lang.String, java.lang.String, java.lang.Object[])
*/
@Deprecated
-public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments) {
+ public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments) {
if (isLoggable(Level.INFO)) {
if (aMessageKey == null || aMessageKey.equals(""))
return;
@@ -146,7 +146,7 @@
* the exception to be logged
*/
@Deprecated
-public void logException(Exception aException) {
+ public void logException(Exception aException) {
if (isLoggable(Level.INFO)) {
if (aException == null)
return;
@@ -165,7 +165,7 @@
* @deprecated use external configuration possibility
*/
@Deprecated
-public void setOutputStream(OutputStream out) {
+ 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);
@@ -192,7 +192,7 @@
* @deprecated use external configuration possibility
*/
@Deprecated
-public void setOutputStream(PrintStream out) {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -99,7 +99,7 @@
* the message to be logged
*/
@Deprecated
-public void log(String aMessage) {
+ public void log(String aMessage) {
if (isLoggable(Level.INFO)) {
if (aMessage == null || aMessage.equals(""))
return;
@@ -118,7 +118,7 @@
* java.lang.Object[])
*/
@Deprecated
-public void log(String aResourceBundleName, String aMessageKey,
+ public void log(String aResourceBundleName, String aMessageKey,
Object[] aArguments) {
if (isLoggable(Level.INFO)) {
if (aMessageKey == null || aMessageKey.equals(""))
@@ -139,7 +139,7 @@
* the exception to be logged
*/
@Deprecated
-public void logException(Exception aException) {
+ public void logException(Exception aException) {
if (isLoggable(Level.INFO)) {
if (aException == null)
return;
@@ -157,7 +157,7 @@
* @deprecated use external configuration possibility
*/
@Deprecated
-public void setOutputStream(OutputStream out) {
+ public void setOutputStream(OutputStream out) {
throw new UnsupportedOperationException(
"Method setOutputStream(OutputStream out) not supported");
}
@@ -167,7 +167,7 @@
* @deprecated use external configuration possibility
*/
@Deprecated
-public void setOutputStream(PrintStream out) {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -98,7 +98,7 @@
* the message to be logged
*/
@Deprecated
-public void log(String aMessage) {
+ public void log(String aMessage) {
if (isLoggable(Level.INFO) && mOut != null) {
mOut.print(new Date());
mOut.print(": " + Level.INFO.toString() + ": ");
@@ -114,7 +114,7 @@
* @see org.apache.uima.util.Logger#log(java.lang.String, java.lang.String, java.lang.Object[])
*/
@Deprecated
-public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments) {
+ public void log(String aResourceBundleName, String aMessageKey, Object[] aArguments) {
if (isLoggable(Level.INFO)) {
log(I18nUtil.localizeMessage(aResourceBundleName, aMessageKey, aArguments,
getExtensionClassLoader()));
@@ -130,7 +130,7 @@
* the exception to be logged
*/
@Deprecated
-public void logException(Exception aException) {
+ public void logException(Exception aException) {
if (isLoggable(Level.INFO) && mOut != null) {
mOut.print(new Date());
mOut.print(": " + Level.INFO.toString() + ": ");
@@ -144,7 +144,7 @@
* @see org.apache.uima.util.Logger#setOutputStream(java.io.OutputStream)
*/
@Deprecated
-public void setOutputStream(OutputStream out) {
+ public void setOutputStream(OutputStream out) {
if (out == null || out instanceof PrintStream) {
mOut = (PrintStream) out;
} else {
@@ -158,7 +158,7 @@
* @see org.apache.uima.util.Logger#setOutputStream(java.io.PrintStream)
*/
@Deprecated
-public void setOutputStream(PrintStream out) {
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -100,7 +100,7 @@
* @deprecated Use {@link #SaxDeserializer_impl(XMLParser, XMLParser.ParsingOptions)} instead.
*/
@Deprecated
-public SaxDeserializer_impl(XMLParser aUimaXmlParser, String aNamespaceForSchema, URL aSchemaUrl,
+ 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=792260&r1=792259&r2=792260&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:59:33 2009
@@ -513,7 +513,7 @@
* @deprecated since v2.0
*/
@Deprecated
-public TaeDescription parseTaeDescription(XMLInputSource aInput) throws InvalidXMLException {
+ public TaeDescription parseTaeDescription(XMLInputSource aInput) throws InvalidXMLException {
return parseTaeDescription(aInput, DEFAULT_PARSING_OPTIONS);
}
@@ -532,7 +532,7 @@
* @deprecated since v2.0
*/
@Deprecated
-public TaeDescription parseTaeDescription(XMLInputSource aInput, ParsingOptions aOptions)
+ public TaeDescription parseTaeDescription(XMLInputSource aInput, ParsingOptions aOptions)
throws InvalidXMLException {
// attempt to locate resource specifier schema
URL schemaURL = getResourceSpecifierSchemaUrl();