You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2006/11/28 23:25:57 UTC
svn commit: r480252 [2/16] - in /incubator/uima/uimaj/trunk/uimaj-core/src:
main/java/org/apache/uima/ main/java/org/apache/uima/analysis_component/
main/java/org/apache/uima/analysis_engine/
main/java/org/apache/uima/analysis_engine/annotator/ main/ja...
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineProcessException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineProcessException.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineProcessException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineProcessException.java Tue Nov 28 14:25:39 2006
@@ -106,7 +106,7 @@
* arguments.
*/
public AnalysisEngineProcessException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments) {
+ Object[] aArguments) {
super(aResourceBundleName, aMessageKey, aArguments);
}
@@ -127,7 +127,7 @@
* the original exception that caused this exception to be thrown, if any
*/
public AnalysisEngineProcessException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments, Throwable aCause) {
+ Object[] aArguments, Throwable aCause) {
super(aResourceBundleName, aMessageKey, aArguments, aCause);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultNotSupportedException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultNotSupportedException.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultNotSupportedException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/ResultNotSupportedException.java Tue Nov 28 14:25:39 2006
@@ -39,7 +39,7 @@
* constructed to satisfy the requested result."
*/
public static final String NO_SEQUENCE_FOUND = "no_sequence_found";
-
+
/**
* Creates a new exception with a null message.
*/
@@ -72,7 +72,7 @@
* arguments.
*/
public ResultNotSupportedException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments) {
+ Object[] aArguments) {
super(aResourceBundleName, aMessageKey, aArguments);
}
@@ -93,7 +93,7 @@
* the original exception that caused this exception to be thrown, if any
*/
public ResultNotSupportedException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments, Throwable aCause) {
+ Object[] aArguments, Throwable aCause) {
super(aResourceBundleName, aMessageKey, aArguments, aCause);
}
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?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- 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 Tue Nov 28 14:25:39 2006
@@ -26,5 +26,5 @@
* no longer defines any additional methods beyond those in AnalysisEngineDescription.
*/
public interface TaeDescription extends AnalysisEngineDescription {
- //As of 2.0, no longer defines any additional methods beyond those in 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?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- 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 Tue Nov 28 14:25:39 2006
@@ -27,5 +27,5 @@
* defines any additional methods beyond those in AnalysisEngine.
*/
public interface TextAnalysisEngine extends AnalysisEngine {
- //As of 2.0, no longer defines any additional methods beyond those in 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/annotator/AnnotatorConfigurationException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorConfigurationException.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorConfigurationException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorConfigurationException.java Tue Nov 28 14:25:39 2006
@@ -54,7 +54,6 @@
*/
public static final String RESOURCE_NOT_FOUND = "annotator_resource_not_found";
-
/**
* Creates a new exception with a null message.
*/
@@ -87,7 +86,7 @@
* arguments.
*/
public AnnotatorConfigurationException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments) {
+ Object[] aArguments) {
super(aResourceBundleName, aMessageKey, aArguments);
}
@@ -108,7 +107,7 @@
* the original exception that caused this exception to be thrown, if any
*/
public AnnotatorConfigurationException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments, Throwable aCause) {
+ Object[] aArguments, Throwable aCause) {
super(aResourceBundleName, aMessageKey, aArguments, aCause);
}
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?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- 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 Tue Nov 28 14:25:39 2006
@@ -79,7 +79,7 @@
* if an internal failure has occurred in the <code>AnnotatorContext</code>.
*/
public Object getConfigParameterValue(String aGroupName, String aParamName)
- throws AnnotatorContextException;
+ throws AnnotatorContextException;
/**
* Gets the names of all configuration parameter groups.
@@ -249,7 +249,7 @@
* @see org.apache.uima.UimaContext#getResourceAsStream(String,String[])
*/
public InputStream getResourceAsStream(String aKey, String[] aParams)
- throws AnnotatorContextException;
+ throws AnnotatorContextException;
/**
* Retrieves the named resource object. This can be used to acquire references to external
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContextException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContextException.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContextException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorContextException.java Tue Nov 28 14:25:39 2006
@@ -63,7 +63,7 @@
* arguments.
*/
public AnnotatorContextException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments) {
+ Object[] aArguments) {
super(aResourceBundleName, aMessageKey, aArguments);
}
@@ -84,7 +84,7 @@
* the original exception that caused this exception to be thrown, if any
*/
public AnnotatorContextException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments, Throwable aCause) {
+ Object[] aArguments, Throwable aCause) {
super(aResourceBundleName, aMessageKey, aArguments, aCause);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorInitializationException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorInitializationException.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorInitializationException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorInitializationException.java Tue Nov 28 14:25:39 2006
@@ -80,7 +80,7 @@
* arguments.
*/
public AnnotatorInitializationException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments) {
+ Object[] aArguments) {
super(aResourceBundleName, aMessageKey, aArguments);
}
@@ -101,7 +101,7 @@
* the original exception that caused this exception to be thrown, if any
*/
public AnnotatorInitializationException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments, Throwable aCause) {
+ Object[] aArguments, Throwable aCause) {
super(aResourceBundleName, aMessageKey, aArguments, aCause);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorProcessException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorProcessException.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorProcessException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/AnnotatorProcessException.java Tue Nov 28 14:25:39 2006
@@ -62,7 +62,7 @@
* arguments.
*/
public AnnotatorProcessException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments) {
+ Object[] aArguments) {
super(aResourceBundleName, aMessageKey, aArguments);
}
@@ -83,7 +83,7 @@
* the original exception that caused this exception to be thrown, if any
*/
public AnnotatorProcessException(String aResourceBundleName, String aMessageKey,
- Object[] aArguments, Throwable aCause) {
+ Object[] aArguments, Throwable aCause) {
super(aResourceBundleName, aMessageKey, aArguments, aCause);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/Annotator_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/Annotator_ImplBase.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/Annotator_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/Annotator_ImplBase.java Tue Nov 28 14:25:39 2006
@@ -45,7 +45,7 @@
* @see org.apache.uima.analysis_engine.annotator.BaseAnnotator#initialize(org.apache.uima.analysis_engine.annotator.AnnotatorContext)
*/
public void initialize(AnnotatorContext aContext) throws AnnotatorInitializationException,
- AnnotatorConfigurationException {
+ AnnotatorConfigurationException {
mContext = aContext;
}
@@ -58,7 +58,7 @@
* @see org.apache.uima.analysis_engine.annotator.BaseAnnotator#typeSystemInit(org.apache.uima.cas.TypeSystem)
*/
public void typeSystemInit(TypeSystem aTypeSystem) throws AnnotatorInitializationException,
- AnnotatorConfigurationException {
+ AnnotatorConfigurationException {
mTypeSystem = aTypeSystem;
}
@@ -68,7 +68,7 @@
* @see org.apache.uima.analysis_engine.annotator.BaseAnnotator#destroy()
*/
public void destroy() {
- //no default behavior
+ // no default behavior
}
/**
@@ -79,7 +79,7 @@
* @see org.apache.uima.analysis_engine.annotator.BaseAnnotator#reconfigure()
*/
public void reconfigure() throws AnnotatorConfigurationException,
- AnnotatorInitializationException {
+ AnnotatorInitializationException {
destroy();
initialize(getContext());
if (mTypeSystem != null) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/BaseAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/BaseAnnotator.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/BaseAnnotator.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/BaseAnnotator.java Tue Nov 28 14:25:39 2006
@@ -45,7 +45,7 @@
* if the configuration specified for this annotator is invalid.
*/
public void initialize(AnnotatorContext aContext) throws AnnotatorInitializationException,
- AnnotatorConfigurationException;
+ AnnotatorConfigurationException;
/**
* Informs this annotator that the CAS TypeSystem has changed. The Analysis Engine calls this
@@ -62,7 +62,7 @@
* if the configuration specified for this annotator is invalid.
*/
public void typeSystemInit(TypeSystem aTypeSystem) throws AnnotatorInitializationException,
- AnnotatorConfigurationException;
+ AnnotatorConfigurationException;
/**
* Alerts this annotator that the values of its configuration parameters or external resources
@@ -78,7 +78,7 @@
* if the annotator fails to reinitialize itself based on the new configuration.
*/
public void reconfigure() throws AnnotatorConfigurationException,
- AnnotatorInitializationException;
+ AnnotatorInitializationException;
/**
* Frees all resources held by this annotator. The Analysis Engine calls this method only once,
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator_ImplBase.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/GenericAnnotator_ImplBase.java Tue Nov 28 14:25:39 2006
@@ -25,6 +25,6 @@
* {@link org.apache.uima.analysis_component.JCasAnnotator_ImplBase}.
*/
public abstract class GenericAnnotator_ImplBase extends Annotator_ImplBase implements
- GenericAnnotator {
- //overrides no methods
+ GenericAnnotator {
+ // overrides no methods
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator_ImplBase.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/annotator/JTextAnnotator_ImplBase.java Tue Nov 28 14:25:39 2006
@@ -24,5 +24,5 @@
* {@link org.apache.uima.analysis_component.JCasAnnotator_ImplBase}.
*/
public abstract class JTextAnnotator_ImplBase extends Annotator_ImplBase implements JTextAnnotator {
- //overrides no methods
+ // overrides no methods
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/ASB.java Tue Nov 28 14:25:39 2006
@@ -77,8 +77,8 @@
* <code>aComponentSpecifiers</code>.
*/
public void setup(Map aComponentSpecifiers, UimaContextAdmin aParentContext,
- FlowControllerDeclaration aFlowControllerDeclaration,
- AnalysisEngineMetaData aAggregateMetadata) throws ResourceInitializationException;
+ FlowControllerDeclaration aFlowControllerDeclaration,
+ AnalysisEngineMetaData aAggregateMetadata) throws ResourceInitializationException;
/**
* Gets metadata for all of the component AnalysisEngines known to this <code>ASB</code>.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/ASB_impl.java Tue Nov 28 14:25:39 2006
@@ -115,7 +115,7 @@
* UimaContext of the Aggregate AE containing this ASB.
*/
private UimaContextAdmin mAggregateUimaContext;
-
+
/**
* Initializes this ASB.
*
@@ -131,9 +131,9 @@
* @see org.apache.uima.resource.Resource#initialize(ResourceSpecifier)
*/
public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
- throws ResourceInitializationException {
+ throws ResourceInitializationException {
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.CONFIG, CLASS_NAME.getName(), "initialize",
- LOG_RESOURCE_BUNDLE, "UIMA_asb_init_begin__CONFIG");
+ LOG_RESOURCE_BUNDLE, "UIMA_asb_init_begin__CONFIG");
if (!(aSpecifier instanceof ResourceCreationSpecifier)) {
return false;
}
@@ -151,7 +151,7 @@
// mInitParams.remove(mInitParams.get(Resource.PARAM_AGGREGATE_SOFA_MAPPINGS));
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.CONFIG, CLASS_NAME.getName(), "initialize",
- LOG_RESOURCE_BUNDLE, "UIMA_asb_init_successful__CONFIG");
+ LOG_RESOURCE_BUNDLE, "UIMA_asb_init_successful__CONFIG");
return true;
}
@@ -186,8 +186,8 @@
* @throws ResourceInitializationException
*/
public void setup(Map aSpecifiers, UimaContextAdmin aParentContext,
- FlowControllerDeclaration aFlowControllerDeclaration,
- AnalysisEngineMetaData aAggregateMetadata) throws ResourceInitializationException {
+ FlowControllerDeclaration aFlowControllerDeclaration,
+ AnalysisEngineMetaData aAggregateMetadata) throws ResourceInitializationException {
mAggregateUimaContext = aParentContext;
// clear the delegate AnalysisEngine and AnalysisEngineMetaData maps
@@ -214,7 +214,7 @@
if (mSofaMappings[s].getComponentSofaName() == null)
mSofaMappings[s].setComponentSofaName(CAS.NAME_DEFAULT_TEXT_SOFA);
sofamap.put(mSofaMappings[s].getComponentSofaName(), mSofaMappings[s]
- .getAggregateSofaName());
+ .getAggregateSofaName());
}
}
}
@@ -229,7 +229,7 @@
// if running in "validation mode", don't try to connnect to any services
if (mInitParams.containsKey(AnalysisEngineImplBase.PARAM_VERIFICATION_MODE)
- && !(spec instanceof ResourceCreationSpecifier)) {
+ && !(spec instanceof ResourceCreationSpecifier)) {
// but we need placeholder entries in maps to satisfy later checking
ae = new DummyAnalysisEngine();
} else {
@@ -248,7 +248,7 @@
// make Maps unmodifiable
mComponentAnalysisEngineMap = Collections.unmodifiableMap(mComponentAnalysisEngineMap);
mComponentAnalysisEngineMetaDataMap = Collections
- .unmodifiableMap(mComponentAnalysisEngineMetaDataMap);
+ .unmodifiableMap(mComponentAnalysisEngineMetaDataMap);
mOutputNewCASes = aAggregateMetadata.getOperationalProperties().getOutputsNewCASes();
@@ -258,7 +258,7 @@
// initialize the AllComponentMetaData map to include AEs plus the FlowController
mAllComponentMetaDataMap = new HashMap(mComponentAnalysisEngineMetaDataMap);
mAllComponentMetaDataMap.put(aFlowControllerDeclaration.getKey(), mFlowControllerContainer
- .getMetaData());
+ .getMetaData());
mAllComponentMetaDataMap = Collections.unmodifiableMap(mAllComponentMetaDataMap);
}
@@ -266,8 +266,8 @@
* Initializes the FlowController for this aggregate.
*/
protected void initFlowController(FlowControllerDeclaration aFlowControllerDeclaration,
- UimaContextAdmin aParentContext, AnalysisEngineMetaData aAggregateMetadata)
- throws ResourceInitializationException {
+ UimaContextAdmin aParentContext, AnalysisEngineMetaData aAggregateMetadata)
+ throws ResourceInitializationException {
String key = aFlowControllerDeclaration.getKey();
if (key == null || key.length() == 0) {
key = "_FlowController"; // default key
@@ -286,17 +286,17 @@
if (mSofaMappings[s].getComponentSofaName() == null)
mSofaMappings[s].setComponentSofaName(CAS.NAME_DEFAULT_TEXT_SOFA);
sofamap.put(mSofaMappings[s].getComponentSofaName(), mSofaMappings[s]
- .getAggregateSofaName());
+ .getAggregateSofaName());
}
}
}
FlowControllerContext ctxt = new FlowControllerContext_impl(aParentContext, key, sofamap,
- getComponentAnalysisEngineMetaData(), aAggregateMetadata);
+ getComponentAnalysisEngineMetaData(), aAggregateMetadata);
flowControllerParams.put(PARAM_UIMA_CONTEXT, ctxt);
flowControllerParams.put(PARAM_RESOURCE_MANAGER, getResourceManager());
mFlowControllerContainer = new FlowControllerContainer();
mFlowControllerContainer.initialize(aFlowControllerDeclaration.getSpecifier(),
- flowControllerParams);
+ flowControllerParams);
}
/**
@@ -422,7 +422,7 @@
toReturn = processUntilNextOutputCas();
if (toReturn == null) {
throw new UIMA_IllegalStateException(UIMA_IllegalStateException.NO_NEXT_CAS,
- new Object[0]);
+ new Object[0]);
}
nextCas = null;
getMBean().incrementCASesProcessed();
@@ -491,7 +491,7 @@
cas = frame.originalCas;
flow = frame.originalCasFlow;
cas.setCurrentComponentInfo(null); // this CAS is done being processed by the
- // previous AnalysisComponent
+ // previous AnalysisComponent
casIteratorStack.pop(); // remove this state from the stack now
}
}
@@ -530,13 +530,13 @@
}
} else {
throw new AnalysisEngineProcessException(
- AnalysisEngineProcessException.UNKNOWN_ID_IN_SEQUENCE,
- new Object[] { nextAeKey });
+ AnalysisEngineProcessException.UNKNOWN_ID_IN_SEQUENCE,
+ new Object[] { nextAeKey });
}
} else {
throw new AnalysisEngineProcessException(
- AnalysisEngineProcessException.UNSUPPORTED_STEP_TYPE,
- new Object[] { nextStep.getClass() });
+ AnalysisEngineProcessException.UNSUPPORTED_STEP_TYPE, new Object[] { nextStep
+ .getClass() });
}
nextStep = flow.next();
}
@@ -550,7 +550,7 @@
if (cas == mInputCas) {
if (finalStep.getForceCasToBeDropped()) {
throw new AnalysisEngineProcessException(
- AnalysisEngineProcessException.ILLEGAL_DROP_CAS, new Object[0]);
+ AnalysisEngineProcessException.ILLEGAL_DROP_CAS, new Object[0]);
}
return null;
}
@@ -581,7 +581,7 @@
*/
static class StackFrame {
StackFrame(CasIterator casIterator, CAS originalCas, FlowContainer originalCasFlow,
- String lastAeKey) {
+ String lastAeKey) {
this.casIterator = casIterator;
this.originalCas = originalCas;
this.originalCasFlow = originalCasFlow;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowContainer.java Tue Nov 28 14:25:39 2006
@@ -49,13 +49,13 @@
}
public FlowContainer newCasProduced(CAS newCAS, String producedBy)
- throws AnalysisEngineProcessException {
+ throws AnalysisEngineProcessException {
mTimer.startIt();
try {
// set the current component info of the CAS, so that it knows the sofa
// mappings for the component that's about to process it (the FlowController)
newCAS.setCurrentComponentInfo(mFlowControllerContainer.getUimaContextAdmin()
- .getComponentInfo());
+ .getComponentInfo());
// Get the right view of the CAS. Sofa-aware components get the base CAS.
// Sofa-unaware components get whatever is mapped to the default text sofa.
@@ -96,6 +96,6 @@
*/
public AnalysisEngineManagementImpl getMBean() {
return (AnalysisEngineManagementImpl) mFlowControllerContainer.getUimaContextAdmin()
- .getManagementInterface();
+ .getManagementInterface();
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/asb/impl/FlowControllerContainer.java Tue Nov 28 14:25:39 2006
@@ -61,15 +61,14 @@
* java.util.Map)
*/
public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
- throws ResourceInitializationException {
+ throws ResourceInitializationException {
try {
// specifier must be a FlowControllerDescription. (Eventually, we
// might support remote specifiers, but not yet)
if (!(aSpecifier instanceof FlowControllerDescription)) {
throw new ResourceInitializationException(
- ResourceInitializationException.NOT_A_FLOW_CONTROLLER_DESCRIPTOR,
- new Object[] { aSpecifier.getSourceUrlString(),
- aSpecifier.getClass().getName() });
+ ResourceInitializationException.NOT_A_FLOW_CONTROLLER_DESCRIPTOR, new Object[] {
+ aSpecifier.getSourceUrlString(), aSpecifier.getClass().getName() });
}
ResourceCreationSpecifier desc = (ResourceCreationSpecifier) aSpecifier;
@@ -77,10 +76,10 @@
// org.apache.uima.java (new style) or JEDII (old style)
final String fwImpl = desc.getFrameworkImplementation();
if (fwImpl == null
- || !(fwImpl.startsWith("org.apache.uima.java") || fwImpl.startsWith("JEDII"))) {
+ || !(fwImpl.startsWith("org.apache.uima.java") || fwImpl.startsWith("JEDII"))) {
throw new ResourceInitializationException(
- ResourceInitializationException.UNSUPPORTED_FRAMEWORK_IMPLEMENTATION,
- new Object[] { fwImpl, aSpecifier.getSourceUrlString() });
+ ResourceInitializationException.UNSUPPORTED_FRAMEWORK_IMPLEMENTATION, new Object[] {
+ fwImpl, aSpecifier.getSourceUrlString() });
}
super.initialize(aSpecifier, aAdditionalParams);
@@ -226,14 +225,14 @@
* Instantiates the FlowController class specified in the descriptor.
*/
private FlowController instantiateFlowController(ResourceCreationSpecifier aDescriptor)
- throws ResourceInitializationException {
+ throws ResourceInitializationException {
String flowControllerClassName;
flowControllerClassName = aDescriptor.getImplementationName();
if (flowControllerClassName == null || flowControllerClassName.length() == 0) {
throw new ResourceInitializationException(
- ResourceInitializationException.MISSING_IMPLEMENTATION_CLASS_NAME,
- new Object[] { aDescriptor.getSourceUrlString() });
+ ResourceInitializationException.MISSING_IMPLEMENTATION_CLASS_NAME,
+ new Object[] { aDescriptor.getSourceUrlString() });
}
// load annotator class
Class flowControllerClass = null;
@@ -250,7 +249,7 @@
}
} catch (ClassNotFoundException e) {
throw new ResourceInitializationException(ResourceInitializationException.CLASS_NOT_FOUND,
- new Object[] { flowControllerClassName, aDescriptor.getSourceUrlString() }, e);
+ new Object[] { flowControllerClassName, aDescriptor.getSourceUrlString() }, e);
}
Object userObject;
@@ -258,14 +257,13 @@
userObject = flowControllerClass.newInstance();
} catch (Exception e) {
throw new ResourceInitializationException(
- ResourceInitializationException.COULD_NOT_INSTANTIATE, new Object[] {
- flowControllerClassName, aDescriptor.getSourceUrlString() }, e);
+ ResourceInitializationException.COULD_NOT_INSTANTIATE, new Object[] {
+ flowControllerClassName, aDescriptor.getSourceUrlString() }, e);
}
if (!(userObject instanceof FlowController)) {
throw new ResourceInitializationException(
- ResourceInitializationException.RESOURCE_DOES_NOT_IMPLEMENT_INTERFACE,
- new Object[] { flowControllerClassName, FlowController.class,
- aDescriptor.getSourceUrlString() });
+ ResourceInitializationException.RESOURCE_DOES_NOT_IMPLEMENT_INTERFACE, new Object[] {
+ flowControllerClassName, FlowController.class, aDescriptor.getSourceUrlString() });
}
return (FlowController) userObject;
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AggregateAnalysisEngine_impl.java Tue Nov 28 14:25:39 2006
@@ -101,7 +101,7 @@
* @see org.apache.uima.resource.Resource#initialize(ResourceSpecifier, Map)
*/
public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
- throws ResourceInitializationException {
+ throws ResourceInitializationException {
try {
// aSpecifier must be a AnalysisEngineDescription
if (!(aSpecifier instanceof AnalysisEngineDescription)) {
@@ -126,7 +126,7 @@
AnalysisEngineMetaData md = mDescription.getAnalysisEngineMetaData();
getLogger().logrb(Level.CONFIG, CLASS_NAME.getName(), "initialize", LOG_RESOURCE_BUNDLE,
- "UIMA_analysis_engine_init_begin__CONFIG", md.getName());
+ "UIMA_analysis_engine_init_begin__CONFIG", md.getName());
// Normalize language codes. Need to do this since a wide variety of
// spellings are acceptable according to ISO.
@@ -145,10 +145,10 @@
mDescription.getDelegateAnalysisEngineSpecifiers(getResourceManager());
if (mDescription.getFlowControllerDeclaration() != null) {
if (mDescription.getFlowControllerDeclaration().getImport() == null
- && mDescription.getFlowControllerDeclaration().getSpecifier() == null) {
+ && mDescription.getFlowControllerDeclaration().getSpecifier() == null) {
throw new ResourceInitializationException(
- ResourceInitializationException.EMPTY_FLOW_CONTROLLER_DECLARATION,
- new Object[] { getMetaData().getName(), mDescription.getSourceUrl() });
+ ResourceInitializationException.EMPTY_FLOW_CONTROLLER_DECLARATION,
+ new Object[] { getMetaData().getName(), mDescription.getSourceUrl() });
}
mDescription.getFlowControllerDeclaration().resolveImports(getResourceManager());
@@ -173,7 +173,7 @@
// put configuration parameter settings into the aAdditionalParams map to be
// passed on to delegate AEs
aAdditionalParams.put(Resource.PARAM_CONFIG_PARAM_SETTINGS,
- getCurrentConfigParameterSettings());
+ getCurrentConfigParameterSettings());
// add resource manager (initialized by superclass) to aAdditionalParams map
// so that delegate AEs will share it
@@ -186,12 +186,12 @@
resetResultSpecificationToDefault();
getLogger().logrb(Level.CONFIG, CLASS_NAME.getName(), "initialize", LOG_RESOURCE_BUNDLE,
- "UIMA_analysis_engine_init_successful__CONFIG", md.getName());
+ "UIMA_analysis_engine_init_successful__CONFIG", md.getName());
return true;
} catch (ResourceConfigurationException e) {
throw new ResourceInitializationException(
- ResourceInitializationException.ERROR_INITIALIZING_FROM_DESCRIPTOR,
- new Object[] { getMetaData().getName(), aSpecifier.getSourceUrlString() });
+ ResourceInitializationException.ERROR_INITIALIZING_FROM_DESCRIPTOR, new Object[] {
+ getMetaData().getName(), aSpecifier.getSourceUrlString() });
}
}
@@ -244,7 +244,7 @@
if (mASB != null)
mASB.destroy();
getLogger().logrb(Level.CONFIG, CLASS_NAME.getName(), "initialize", LOG_RESOURCE_BUNDLE,
- "UIMA_analysis_engine_destroyed__CONFIG", getMetaData().getName());
+ "UIMA_analysis_engine_destroyed__CONFIG", getMetaData().getName());
super.destroy();
}
@@ -255,13 +255,13 @@
// logging and instrumentation
String resourceName = getMetaData().getName();
getLogger().logrb(Level.FINE, CLASS_NAME.getName(), "process", LOG_RESOURCE_BUNDLE,
- "UIMA_analysis_engine_process_begin__FINE", resourceName);
+ "UIMA_analysis_engine_process_begin__FINE", resourceName);
try {
CasIterator iterator = _getASB().process(aCAS);
// log end of event
getLogger().logrb(Level.FINE, CLASS_NAME.getName(), "process", LOG_RESOURCE_BUNDLE,
- "UIMA_analysis_engine_process_end__FINE", resourceName);
+ "UIMA_analysis_engine_process_end__FINE", resourceName);
return iterator;
} catch (Exception e) {
// log and rethrow exception
@@ -327,7 +327,7 @@
* if an initialization failure occurs
*/
protected void initializeAggregateAnalysisEngine(AnalysisEngineDescription aDescription,
- Map aAdditionalParams) throws ResourceInitializationException {
+ Map aAdditionalParams) throws ResourceInitializationException {
// Create and configure the ASB - the ASB will create and initialize
// the component AnalysisEngines and the FlowController. This method also retrieves
// the component AnalysisEngines' metadata from the ASB, so it can be access via the
@@ -353,7 +353,7 @@
* if the ASB or a delegate AnalysisEngine could not be created.
*/
protected void initASB(AnalysisEngineDescription aAnalysisEngineDescription, Map aAdditionalParams)
- throws ResourceInitializationException {
+ throws ResourceInitializationException {
// add this analysis engine's name to the parameters sent to the ASB
Map asbParams = new HashMap(aAdditionalParams);
asbParams.put(ASB.PARAM_AGGREGATE_ANALYSIS_ENGINE_NAME, this.getMetaData().getName());
@@ -362,16 +362,16 @@
// Pass sofa mappings defined in this aggregate as additional ASB parameters
// System.out.println("remapping sofa names");
asbParams.put(Resource.PARAM_AGGREGATE_SOFA_MAPPINGS, aAnalysisEngineDescription
- .getSofaMappings());
+ .getSofaMappings());
// Get FlowController specifier from the aggregate descriptor. If none, use
// default FixedFlow specifier.
FlowControllerDeclaration flowControllerDecl = aAnalysisEngineDescription
- .getFlowControllerDeclaration();
+ .getFlowControllerDeclaration();
if (flowControllerDecl != null) {
try {
aAnalysisEngineDescription.getFlowControllerDeclaration().resolveImports(
- getResourceManager());
+ getResourceManager());
} catch (InvalidXMLException e) {
throw new ResourceInitializationException(e);
}
@@ -385,7 +385,7 @@
dummyAsbSpecifier.setMetaData(new ResourceMetaData_impl());
mASB.initialize(dummyAsbSpecifier, asbParams);
mASB.setup(_getComponentCasProcessorSpecifierMap(), getUimaContextAdmin(), flowControllerDecl,
- getAnalysisEngineMetaData());
+ getAnalysisEngineMetaData());
// Get delegate AnalysisEngine metadata from the ASB
mComponentMetaData = _getASB().getAllComponentMetaData();
@@ -434,11 +434,11 @@
// now do merge
TypeSystemDescription aggTypeDesc = CasCreationUtils.mergeTypeSystems(typeSystems,
- getResourceManager());
+ getResourceManager());
TypePriorities aggTypePriorities = CasCreationUtils.mergeTypePriorities(typePriorities,
- getResourceManager());
+ getResourceManager());
FsIndexCollection aggIndexColl = CasCreationUtils.mergeFsIndexes(fsIndexCollections,
- getResourceManager());
+ getResourceManager());
// assign results of merge to this aggregate AE's metadata
AnalysisEngineMetaData aggregateMD = this.getAnalysisEngineMetaData();
@@ -472,17 +472,17 @@
OperationalProperties componentProps = md.getOperationalProperties();
if (componentProps != null) {
if (aggProps.isMultipleDeploymentAllowed()
- && !componentProps.isMultipleDeploymentAllowed()) {
+ && !componentProps.isMultipleDeploymentAllowed()) {
throw new ResourceInitializationException(
- ResourceInitializationException.INVALID_MULTIPLE_DEPLOYMENT_ALLOWED,
- new Object[] { getAnalysisEngineMetaData().getName(), md.getName(),
- getAnalysisEngineMetaData().getSourceUrlString() });
+ ResourceInitializationException.INVALID_MULTIPLE_DEPLOYMENT_ALLOWED,
+ new Object[] { getAnalysisEngineMetaData().getName(), md.getName(),
+ getAnalysisEngineMetaData().getSourceUrlString() });
}
if (!aggProps.getModifiesCas() && componentProps.getModifiesCas()) {
throw new ResourceInitializationException(
- ResourceInitializationException.INVALID_MODIFIES_CAS, new Object[] {
- getAnalysisEngineMetaData().getName(), md.getName(),
- getAnalysisEngineMetaData().getSourceUrlString() });
+ ResourceInitializationException.INVALID_MODIFIES_CAS, new Object[] {
+ getAnalysisEngineMetaData().getName(), md.getName(),
+ getAnalysisEngineMetaData().getSourceUrlString() });
}
if (componentProps.getOutputsNewCASes()) {
atLeastOneCasMultiplier = true;
@@ -491,9 +491,9 @@
}
if (aggProps.getOutputsNewCASes() && !atLeastOneCasMultiplier) {
throw new ResourceInitializationException(
- ResourceInitializationException.INVALID_OUTPUTS_NEW_CASES, new Object[] {
- getAnalysisEngineMetaData().getName(),
- getAnalysisEngineMetaData().getSourceUrlString() });
+ ResourceInitializationException.INVALID_OUTPUTS_NEW_CASES, new Object[] {
+ getAnalysisEngineMetaData().getName(),
+ getAnalysisEngineMetaData().getSourceUrlString() });
}
}
}
@@ -507,7 +507,7 @@
if (getAnalysisEngineMetaData().getFlowConstraints() instanceof CapabilityLanguageFlow) {
flowControllerDesc = CapabilityLanguageFlowController.getDescription();
} else {
- flowControllerDesc= FixedFlowController.getDescription();
+ flowControllerDesc = FixedFlowController.getDescription();
}
FlowControllerDeclaration decl = new FlowControllerDeclaration_impl();
@@ -559,7 +559,7 @@
protected void buildProcessTraceFromMBeanStats(ProcessTrace trace) {
if (isProcessTraceEnabled()) {
ProcessTraceEvent_impl procEvt = new ProcessTraceEvent_impl(getMetaData().getName(),
- "Analysis", "");
+ "Analysis", "");
procEvt.setDuration((int) getMBean().getAnalysisTimeSinceMark());
trace.addEvent(procEvt);
@@ -578,7 +578,7 @@
FlowControllerContainer fcc = ((ASB_impl) _getASB()).getFlowControllerContainer();
int flowControllerTime = (int) fcc.getMBean().getAnalysisTimeSinceMark();
ProcessTraceEvent_impl flowControllerEvent = new ProcessTraceEvent_impl(fcc.getMetaData()
- .getName(), "Analysis", "");
+ .getName(), "Analysis", "");
flowControllerEvent.setDuration(flowControllerTime);
procEvt.addSubEvent(flowControllerEvent);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_impl.java Tue Nov 28 14:25:39 2006
@@ -73,12 +73,13 @@
*
*/
public class AnalysisEngineDescription_impl extends ResourceCreationSpecifier_impl implements
- AnalysisEngineDescription {
+ AnalysisEngineDescription {
/**
* resource bundle for log messages
*/
private static final String LOG_RESOURCE_BUNDLE = "org.apache.uima.impl.log_messages";
+
/**
* Name of the "delegateAnalysisEngineSpecifiers" property. Change this if interface changes.
*/
@@ -121,7 +122,7 @@
// Set default operational properties. These are used if the
// descriptor is constructed programatically, rather than parsed.
OperationalProperties opProps = UIMAFramework.getResourceSpecifierFactory()
- .createOperationalProperties();
+ .createOperationalProperties();
opProps.setModifiesCas(true);
opProps.setMultipleDeploymentAllowed(true);
opProps.setOutputsNewCASes(false);
@@ -182,7 +183,7 @@
* @see org.apache.uima.analysis_engine.AnalysisEngineDescription#getDelegateAnalysisEngineSpecifiers()
*/
public Map getDelegateAnalysisEngineSpecifiers(ResourceManager aResourceManager)
- throws InvalidXMLException {
+ throws InvalidXMLException {
resolveDelegateAnalysisEngineImports(aResourceManager);
return Collections.unmodifiableMap(mDelegateAnalysisEngineSpecifiers);
}
@@ -221,7 +222,7 @@
if (getFlowControllerDeclaration() != null) {
getFlowControllerDeclaration().resolveImports(aResourceManager);
map.put(getFlowControllerDeclaration().getKey(), getFlowControllerDeclaration()
- .getSpecifier());
+ .getSpecifier());
}
return Collections.unmodifiableMap(map);
}
@@ -271,7 +272,7 @@
* @see org.apache.uima.analysis_engine.AnalysisEngineDescription#doFullValidation(org.apache.uima.resource.ResourceManager)
*/
public void doFullValidation(ResourceManager aResourceManager)
- throws ResourceInitializationException {
+ throws ResourceInitializationException {
// attempt to instantiate AE in "verification mode"
Map m = new HashMap();
m.put(AnalysisEngineImplBase.PARAM_VERIFICATION_MODE, Boolean.TRUE);
@@ -301,8 +302,8 @@
// TypeSystem may not be specified for an Aggregate Analysis Engine
if (!isPrimitive() && getAnalysisEngineMetaData().getTypeSystem() != null) {
throw new ResourceInitializationException(
- ResourceInitializationException.AGGREGATE_AE_TYPE_SYSTEM,
- new Object[] { getSourceUrlString() });
+ ResourceInitializationException.AGGREGATE_AE_TYPE_SYSTEM,
+ new Object[] { getSourceUrlString() });
}
}
@@ -323,27 +324,27 @@
* if there is an invalid parameter override declaration
*/
protected void checkForInvalidParameterOverrides(ConfigurationParameter[] aParams,
- String aGroupName) throws ResourceInitializationException {
+ String aGroupName) throws ResourceInitializationException {
for (int i = 0; i < aParams.length; i++) {
String[] overrides = aParams[i].getOverrides();
if (overrides.length > 0 && isPrimitive()) {
throw new ResourceInitializationException(
- ResourceInitializationException.PARAM_OVERRIDE_IN_PRIMITIVE, new Object[] {
- aParams[i].getName(), getMetaData().getName(), getSourceUrlString() });
+ ResourceInitializationException.PARAM_OVERRIDE_IN_PRIMITIVE, new Object[] {
+ aParams[i].getName(), getMetaData().getName(), getSourceUrlString() });
} else if (overrides.length == 0 && !isPrimitive()) {
UIMAFramework.getLogger(this.getClass()).logrb(Level.WARNING, this.getClass().getName(),
- "checkForInvalidParameterOverrides", LOG_RESOURCE_BUNDLE,
- "UIMA_aggregate_param_no_overrides__WARNING",
- new Object[] { getMetaData().getName(), aParams[i].getName() });
+ "checkForInvalidParameterOverrides", LOG_RESOURCE_BUNDLE,
+ "UIMA_aggregate_param_no_overrides__WARNING",
+ new Object[] { getMetaData().getName(), aParams[i].getName() });
}
for (int j = 0; j < overrides.length; j++) {
// overrides should be of form delegateKey/paramName
int slashPos = overrides[j].indexOf('/');
if (slashPos <= 0 || slashPos >= overrides[j].length()) {
throw new ResourceInitializationException(
- ResourceInitializationException.INVALID_PARAM_OVERRIDE_SYNTAX,
- new Object[] { overrides[j], aParams[i].getName(),
- getMetaData().getName(), getSourceUrlString() });
+ ResourceInitializationException.INVALID_PARAM_OVERRIDE_SYNTAX, new Object[] {
+ overrides[j], aParams[i].getName(), getMetaData().getName(),
+ getSourceUrlString() });
}
String delegateKey = overrides[j].substring(0, slashPos);
String paramName = overrides[j].substring(slashPos + 1);
@@ -351,23 +352,22 @@
ResourceSpecifier componentSpecifier = getComponentSpecifier(delegateKey);
if (componentSpecifier == null) {
throw new ResourceInitializationException(
- ResourceInitializationException.INVALID_PARAM_OVERRIDE_NONEXISTENT_DELEGATE,
- new Object[] { overrides[j], aParams[i].getName(),
- getMetaData().getName(), delegateKey, getSourceUrlString() });
+ ResourceInitializationException.INVALID_PARAM_OVERRIDE_NONEXISTENT_DELEGATE,
+ new Object[] { overrides[j], aParams[i].getName(), getMetaData().getName(),
+ delegateKey, getSourceUrlString() });
}
if (componentSpecifier instanceof ResourceCreationSpecifier) {
ConfigurationParameter overriddenParam = null;
ConfigurationParameterDeclarations delegateParamDecls = ((ResourceCreationSpecifier) componentSpecifier)
- .getMetaData().getConfigurationParameterDeclarations();
+ .getMetaData().getConfigurationParameterDeclarations();
if (aGroupName == null) // param not in group
{
overriddenParam = delegateParamDecls.getConfigurationParameter(null, paramName);
if (overriddenParam == null) {
throw new ResourceInitializationException(
- ResourceInitializationException.INVALID_PARAM_OVERRIDE_NONEXISTENT_PARAMETER,
- new Object[] { overrides[j], aParams[i].getName(),
- getMetaData().getName(), delegateKey, paramName,
- getSourceUrlString() });
+ ResourceInitializationException.INVALID_PARAM_OVERRIDE_NONEXISTENT_PARAMETER,
+ new Object[] { overrides[j], aParams[i].getName(), getMetaData().getName(),
+ delegateKey, paramName, getSourceUrlString() });
}
} else {
@@ -375,10 +375,9 @@
overriddenParam = delegateParamDecls.getConfigurationParameter(aGroupName, paramName);
if (overriddenParam == null) {
throw new ResourceInitializationException(
- ResourceInitializationException.INVALID_PARAM_OVERRIDE_NONEXISTENT_PARAMETER_IN_GROUP,
- new Object[] { overrides[j], aParams[i].getName(),
- getMetaData().getName(), delegateKey, paramName, aGroupName,
- getSourceUrlString() });
+ ResourceInitializationException.INVALID_PARAM_OVERRIDE_NONEXISTENT_PARAMETER_IN_GROUP,
+ new Object[] { overrides[j], aParams[i].getName(), getMetaData().getName(),
+ delegateKey, paramName, aGroupName, getSourceUrlString() });
}
}
}
@@ -400,7 +399,7 @@
public ResourceSpecifier getComponentSpecifier(String key) throws ResourceInitializationException {
ResourceSpecifier componentSpecifier;
if (getFlowControllerDeclaration() != null
- && key.equals(getFlowControllerDeclaration().getKey())) {
+ && key.equals(getFlowControllerDeclaration().getKey())) {
try {
getFlowControllerDeclaration().resolveImports();
} catch (InvalidXMLException e) {
@@ -436,34 +435,32 @@
ResourceSpecifier componentSpec = getComponentSpecifier(componentKey);
if (componentSpec == null) {
throw new ResourceInitializationException(
- ResourceInitializationException.SOFA_MAPPING_HAS_UNDEFINED_COMPONENT_KEY,
- new Object[] { componentKey, sofaMappings[s].getAggregateSofaName(),
- aggName, getSourceUrlString() });
+ ResourceInitializationException.SOFA_MAPPING_HAS_UNDEFINED_COMPONENT_KEY,
+ new Object[] { componentKey, sofaMappings[s].getAggregateSofaName(), aggName,
+ getSourceUrlString() });
}
String componentSofaName = sofaMappings[s].getComponentSofaName();
if (componentSofaName == null) {
componentSofaName = CAS.NAME_DEFAULT_SOFA;
} else if (componentSpec instanceof AnalysisEngineDescription
- && !CAS.NAME_DEFAULT_SOFA.equals(componentSofaName)
- && !declaresSofa((AnalysisEngineDescription) componentSpec,
- componentSofaName)) {
+ && !CAS.NAME_DEFAULT_SOFA.equals(componentSofaName)
+ && !declaresSofa((AnalysisEngineDescription) componentSpec, componentSofaName)) {
throw new ResourceInitializationException(
- ResourceInitializationException.SOFA_MAPPING_HAS_UNDEFINED_COMPONENT_SOFA,
- new Object[] { componentKey, componentSofaName,
- sofaMappings[s].getAggregateSofaName(), aggName, getSourceUrlString() });
+ ResourceInitializationException.SOFA_MAPPING_HAS_UNDEFINED_COMPONENT_SOFA,
+ new Object[] { componentKey, componentSofaName,
+ sofaMappings[s].getAggregateSofaName(), aggName, getSourceUrlString() });
}
String compoundKey = sofaMappings[s].getComponentKey() + "@/@"
- + sofaMappings[s].getComponentSofaName();
+ + sofaMappings[s].getComponentSofaName();
String aggSofaName = sofaMappings[s].getAggregateSofaName();
// check for double-mapping
String existingMapping = (String) sofamap.get(compoundKey);
if (existingMapping != null && !existingMapping.equals(aggSofaName)) {
throw new ResourceInitializationException(
- ResourceInitializationException.SOFA_MAPPING_CONFLICT, new Object[] {
- sofaMappings[s].getComponentSofaName(),
- sofaMappings[s].getComponentKey(), aggName, existingMapping,
- aggSofaName, getSourceUrlString() });
+ ResourceInitializationException.SOFA_MAPPING_CONFLICT, new Object[] {
+ sofaMappings[s].getComponentSofaName(), sofaMappings[s].getComponentKey(),
+ aggName, existingMapping, aggSofaName, getSourceUrlString() });
} else {
sofamap.put(compoundKey, aggSofaName);
}
@@ -502,7 +499,7 @@
if (delegateSpec instanceof AnalysisEngineDescription) {
Capability[] caps = ((AnalysisEngineDescription) delegateSpec).getAnalysisEngineMetaData()
- .getCapabilities();
+ .getCapabilities();
for (int i = 0; i < caps.length; i++) {
// all component output sofas must be mapped to aggregate output sofas
String[] outputSofas = caps[i].getOutputSofas();
@@ -514,9 +511,8 @@
}
if (!capabilitiesContainSofa(aggSofa, true)) {
throw new ResourceInitializationException(
- ResourceInitializationException.OUTPUT_SOFA_NOT_DECLARED_IN_AGGREGATE,
- new Object[] { outputSofas[j], componentKey, aggName,
- getSourceUrlString() });
+ ResourceInitializationException.OUTPUT_SOFA_NOT_DECLARED_IN_AGGREGATE,
+ new Object[] { outputSofas[j], componentKey, aggName, getSourceUrlString() });
}
correctlyMappedAggregateOutputs.add(aggSofa);
}
@@ -531,9 +527,8 @@
}
if (!capabilitiesContainSofa(aggSofa, false) && !capabilitiesContainSofa(aggSofa, true)) {
throw new ResourceInitializationException(
- ResourceInitializationException.INPUT_SOFA_HAS_NO_SOURCE,
- new Object[] { inputSofas[j], componentKey, aggName,
- getSourceUrlString() });
+ ResourceInitializationException.INPUT_SOFA_HAS_NO_SOURCE, new Object[] {
+ inputSofas[j], componentKey, aggName, getSourceUrlString() });
}
correctlyMappedAggregateInputs.add(aggSofa);
}
@@ -563,16 +558,16 @@
for (int j = 0; j < sofas.length; j++) {
if (!correctlyMappedAggregateOutputs.contains(sofas[j])) {
throw new ResourceInitializationException(
- ResourceInitializationException.AGGREGATE_SOFA_NOT_MAPPED,
- new Object[] { sofas[j], aggName, getSourceUrlString() });
+ ResourceInitializationException.AGGREGATE_SOFA_NOT_MAPPED, new Object[] {
+ sofas[j], aggName, getSourceUrlString() });
}
}
sofas = caps[i].getInputSofas();
for (int j = 0; j < sofas.length; j++) {
if (!correctlyMappedAggregateInputs.contains(sofas[j])) {
throw new ResourceInitializationException(
- ResourceInitializationException.AGGREGATE_SOFA_NOT_MAPPED,
- new Object[] { sofas[j], aggName, getSourceUrlString() });
+ ResourceInitializationException.AGGREGATE_SOFA_NOT_MAPPED, new Object[] {
+ sofas[j], aggName, getSourceUrlString() });
}
}
}
@@ -621,7 +616,7 @@
public List listAttributes() {
List result = super.listAttributes();
result.add(new NameClassPair(PROP_DELEGATE_ANALYSIS_ENGINE_SPECIFIERS_WITH_IMPORTS, Map.class
- .getName()));
+ .getName()));
return result;
}
@@ -632,7 +627,7 @@
* boolean)
*/
public void toXML(OutputStream aOutputStream, boolean aPreserveDelegateAnalysisEngineImports)
- throws SAXException, IOException {
+ throws SAXException, IOException {
if (aPreserveDelegateAnalysisEngineImports) {
// trick the writePropertyAsElement method into thinking that
// imports haven't been resolved yet
@@ -651,7 +646,7 @@
* @see org.apache.uima.analysis_engine.AnalysisEngineDescription#toXML(java.io.Writer, boolean)
*/
public void toXML(Writer aWriter, boolean aPreserveDelegateAnalysisEngineImports)
- throws SAXException, IOException {
+ throws SAXException, IOException {
if (aPreserveDelegateAnalysisEngineImports) {
// trick the writePropertyAsElement method into thinking that
// imports haven't been resolved yet
@@ -671,7 +666,7 @@
* boolean, boolean)
*/
public void toXML(ContentHandler aContentHandler, boolean aWriteDefaultNamespaceAttribute,
- boolean aPreserveDelegateAnalysisEngineImports) throws SAXException {
+ boolean aPreserveDelegateAnalysisEngineImports) throws SAXException {
if (aPreserveDelegateAnalysisEngineImports) {
// trick the writePropertyAsElement method into thinking that
// imports haven't been resolved yet
@@ -690,7 +685,7 @@
* @see org.apache.uima.analysis_engine.AnalysisEngineDescription#resolveDelegateAnalysisEngineImports(org.apache.uima.resource.ResourceManager)
*/
protected void resolveDelegateAnalysisEngineImports(ResourceManager aResourceManager)
- throws InvalidXMLException {
+ throws InvalidXMLException {
HashSet keys = new HashSet(); // keep track of keys we've encountered
// so we can remove stale entries
Iterator entryIterator = getDelegateAnalysisEngineSpecifiersWithImports().entrySet().iterator();
@@ -718,7 +713,7 @@
input = new XMLInputSource(url);
} catch (IOException e) {
throw new InvalidXMLException(InvalidXMLException.IMPORT_FAILED_COULD_NOT_READ_FROM_URL,
- new Object[] { url, aeImport.getSourceUrlString() }, e);
+ new Object[] { url, aeImport.getSourceUrlString() }, e);
}
ResourceSpecifier spec = UIMAFramework.getXMLParser().parseResourceSpecifier(input);
@@ -757,7 +752,7 @@
* @see org.apache.uima.MetaDataObject_impl#writePropertyAsElement(PropertyXmlInfo,String,ContentHandler)
*/
protected void writePropertyAsElement(PropertyXmlInfo aPropInfo, String aNamespace,
- ContentHandler aContentHandler) throws SAXException {
+ ContentHandler aContentHandler) throws SAXException {
if (PROP_DELEGATE_ANALYSIS_ENGINE_SPECIFIERS_WITH_IMPORTS.equals(aPropInfo.propertyName)) {
// special logic here -- if imports have been resolved, then we want
// to write
@@ -771,7 +766,7 @@
propName = PROP_DELEGATE_ANALYSIS_ENGINE_SPECIFIERS_WITH_IMPORTS;
}
writeMapPropertyToXml(propName, ELEM_DELEGATE_ANALYSIS_ENGINE_SPECIFIERS, "key",
- "delegateAnalysisEngine", aPropInfo.omitIfNull, aNamespace, aContentHandler);
+ "delegateAnalysisEngine", aPropInfo.omitIfNull, aNamespace, aContentHandler);
} else {
// for all other attributes, use the default superclass behavior
super.writePropertyAsElement(aPropInfo, aNamespace, aContentHandler);
@@ -787,11 +782,11 @@
* org.w3c.dom.Element, org.apache.uima.util.XMLParser)
*/
protected void readPropertyValueFromXMLElement(PropertyXmlInfo aPropXmlInfo, Element aElement,
- XMLParser aParser, XMLParser.ParsingOptions aOptions) throws InvalidXMLException {
+ XMLParser aParser, XMLParser.ParsingOptions aOptions) throws InvalidXMLException {
String propName = aPropXmlInfo.propertyName;
if (PROP_DELEGATE_ANALYSIS_ENGINE_SPECIFIERS_WITH_IMPORTS.equals(propName)) {
readMapPropertyFromXml(propName, aElement, "key", "delegateAnalysisEngine", aParser,
- aOptions, false);
+ aOptions, false);
} else {
// for all other attributes, use the default superclass behavior
super.readPropertyValueFromXMLElement(aPropXmlInfo, aElement, aParser, aOptions);
@@ -802,11 +797,11 @@
* Overridden to set default operational properties if they are not specified in descriptor.
*/
public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions)
- throws InvalidXMLException {
+ throws InvalidXMLException {
super.buildFromXMLElement(aElement, aParser, aOptions);
if (getAnalysisEngineMetaData().getOperationalProperties() == null) {
OperationalProperties opProps = UIMAFramework.getResourceSpecifierFactory()
- .createOperationalProperties();
+ .createOperationalProperties();
opProps.setModifiesCas(true);
opProps.setMultipleDeploymentAllowed(true);
getAnalysisEngineMetaData().setOperationalProperties(opProps);
@@ -816,26 +811,25 @@
protected XmlizationInfo getXmlizationInfo() {
return XMLIZATION_INFO;
}
-
+
/**
- * Static method to get XmlizationInfo, used by subclasses to
- * set up their own XmlizationInfo.
+ * Static method to get XmlizationInfo, used by subclasses to set up their own XmlizationInfo.
*/
protected static XmlizationInfo getXmlizationInfoForClass() {
return XMLIZATION_INFO;
}
static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo(
- "analysisEngineDescription", new PropertyXmlInfo[] {
- new PropertyXmlInfo("frameworkImplementation"),
- new PropertyXmlInfo("primitive"),
- new PropertyXmlInfo("annotatorImplementationName"),
- new PropertyXmlInfo("delegateAnalysisEngineSpecifiersWithImports",
- "delegateAnalysisEngineSpecifiers"), // NOTE: custom
- // XMLization
- new PropertyXmlInfo("flowControllerDeclaration", null),
- new PropertyXmlInfo("metaData", null),
- new PropertyXmlInfo("externalResourceDependencies"),
- new PropertyXmlInfo("resourceManagerConfiguration", null),
- new PropertyXmlInfo("sofaMappings") });
+ "analysisEngineDescription", new PropertyXmlInfo[] {
+ new PropertyXmlInfo("frameworkImplementation"),
+ new PropertyXmlInfo("primitive"),
+ new PropertyXmlInfo("annotatorImplementationName"),
+ new PropertyXmlInfo("delegateAnalysisEngineSpecifiersWithImports",
+ "delegateAnalysisEngineSpecifiers"), // NOTE: custom
+ // XMLization
+ new PropertyXmlInfo("flowControllerDeclaration", null),
+ new PropertyXmlInfo("metaData", null),
+ new PropertyXmlInfo("externalResourceDependencies"),
+ new PropertyXmlInfo("resourceManagerConfiguration", null),
+ new PropertyXmlInfo("sofaMappings") });
}
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?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- 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 Tue Nov 28 14:25:39 2006
@@ -64,7 +64,7 @@
*
*/
public abstract class AnalysisEngineImplBase extends ConfigurableResource_ImplBase implements
- TextAnalysisEngine {
+ TextAnalysisEngine {
/**
* resource bundle for log messages
@@ -81,7 +81,7 @@
* Performance Tuning setting in effect for this Analysis Engine.
*/
private Properties mPerformanceTuningSettings = UIMAFramework
- .getDefaultPerformanceTuningProperties();
+ .getDefaultPerformanceTuningProperties();
private UimaTimer mProcessTimer = UIMAFramework.newTimer();
@@ -99,7 +99,7 @@
* java.util.Map)
*/
public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
- throws ResourceInitializationException {
+ throws ResourceInitializationException {
boolean result = super.initialize(aSpecifier, aAdditionalParams);
if (result) {
// add our metadata to the CasManager, so that it will pick up our
@@ -190,7 +190,7 @@
* org.apache.uima.analysis_engine.ResultSpecification)
*/
public ProcessTrace process(CAS aCAS, ResultSpecification aResultSpec)
- throws ResultNotSupportedException, AnalysisEngineProcessException {
+ throws ResultNotSupportedException, AnalysisEngineProcessException {
setResultSpecification(aResultSpec);
return process(aCAS);
}
@@ -200,7 +200,7 @@
* org.apache.uima.analysis_engine.ResultSpecification, org.apache.uima.util.ProcessTrace)
*/
public void process(CAS aCAS, ResultSpecification aResultSpec, ProcessTrace aTrace)
- throws ResultNotSupportedException, AnalysisEngineProcessException {
+ throws ResultNotSupportedException, AnalysisEngineProcessException {
setResultSpecification(aResultSpec);
process(aCAS);
buildProcessTraceFromMBeanStats(aTrace);
@@ -228,7 +228,7 @@
* org.apache.uima.analysis_engine.ResultSpecification)
*/
public ProcessTrace process(JCas aJCas, ResultSpecification aResultSpec)
- throws ResultNotSupportedException, AnalysisEngineProcessException {
+ throws ResultNotSupportedException, AnalysisEngineProcessException {
return process(aJCas.getCas(), aResultSpec);
}
@@ -237,7 +237,7 @@
* org.apache.uima.analysis_engine.ResultSpecification, org.apache.uima.util.ProcessTrace)
*/
public void process(JCas aJCas, ResultSpecification aResultSpec, ProcessTrace aTrace)
- throws ResultNotSupportedException, AnalysisEngineProcessException {
+ throws ResultNotSupportedException, AnalysisEngineProcessException {
process(aJCas.getCas(), aResultSpec, aTrace);
}
@@ -245,8 +245,8 @@
* @deprecated
*/
public void process(org.apache.uima.analysis_engine.AnalysisProcessData aProcessData,
- ResultSpecification aResultSpec) throws ResultNotSupportedException,
- AnalysisEngineProcessException {
+ ResultSpecification aResultSpec) throws ResultNotSupportedException,
+ AnalysisEngineProcessException {
process(aProcessData.getCAS(), aResultSpec, aProcessData.getProcessTrace());
}
@@ -374,13 +374,13 @@
}
public void batchProcessComplete(ProcessTrace aTrace) throws ResourceProcessException,
- IOException {
+ IOException {
batchProcessComplete();
}
public void collectionProcessComplete(ProcessTrace aTrace) throws ResourceProcessException,
- IOException {
+ IOException {
collectionProcessComplete();
}
@@ -394,7 +394,7 @@
protected void setPerformanceTuningSettings(Properties aSettings) {
mPerformanceTuningSettings = (Properties) aSettings.clone();
String procTrEnabled = mPerformanceTuningSettings
- .getProperty(UIMAFramework.PROCESS_TRACE_ENABLED);
+ .getProperty(UIMAFramework.PROCESS_TRACE_ENABLED);
mProcessTraceEnabled = procTrEnabled == null || procTrEnabled.equalsIgnoreCase("true");
}
@@ -423,7 +423,7 @@
*/
protected ConfigurationParameterSettings getCurrentConfigParameterSettings() {
return getUimaContextAdmin().getConfigurationManager().getCurrentConfigParameterSettings(
- getUimaContextAdmin().getQualifiedContextName());
+ getUimaContextAdmin().getQualifiedContextName());
}
/**
@@ -493,7 +493,7 @@
int analysisTime = (int) getMBean().getAnalysisTimeSinceMark();
if (analysisTime > 0) {
ProcessTraceEvent_impl analysisEvent = new ProcessTraceEvent_impl(getMetaData().getName(),
- "Analysis", "");
+ "Analysis", "");
analysisEvent.setDuration(analysisTime);
if (serviceCallEvent != null) {
serviceCallEvent.addSubEvent(analysisEvent);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java Tue Nov 28 14:25:39 2006
@@ -35,7 +35,7 @@
*
*/
public class AnalysisEngineManagementImpl implements AnalysisEngineManagementImplMBean,
- AnalysisEngineManagement {
+ AnalysisEngineManagement {
private static final long serialVersionUID = 1988620286191379887L;
@@ -46,7 +46,7 @@
* (those representing top-level AEs and CPEs).
*/
private static Set usedRootNames = new HashSet();
-
+
private String name;
private long numProcessed;
@@ -214,7 +214,7 @@
// compute the unique name
// first get the rootMBean and assign it a unique name if it doesn't already have one)
AnalysisEngineManagementImpl rootMBean = (AnalysisEngineManagementImpl) aContext
- .getRootContext().getManagementInterface();
+ .getRootContext().getManagementInterface();
if (rootMBean.getUniqueMBeanName() == null) {
// try to find a unique name for the root MBean
String baseRootName = rootMBean.getName();
@@ -251,7 +251,7 @@
return prefix + "name=" + contextName.substring(0, contextName.length() - 1);
} else {
String newPrefix = prefix + "p" + depth + "=" + contextName.substring(0, firstSlash)
- + " Components,";
+ + " Components,";
return makeMBeanName(newPrefix, contextName.substring(firstSlash + 1), depth + 1);
}
}
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?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- 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 Tue Nov 28 14:25:39 2006
@@ -159,7 +159,7 @@
* java.lang.String[])
*/
public InputStream getResourceAsStream(String aKey, String[] aParams)
- throws AnnotatorContextException {
+ throws AnnotatorContextException {
try {
return mUimaContext.getResourceAsStream(aKey, aParams);
} catch (ResourceAccessException e) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/EmptyCasIterator.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/EmptyCasIterator.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/EmptyCasIterator.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/EmptyCasIterator.java Tue Nov 28 14:25:39 2006
@@ -50,6 +50,6 @@
* @see org.apache.uima.analysis_engine.CasIterator#release()
*/
public void release() {
- //nothing to do
+ // nothing to do
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_impl.java Tue Nov 28 14:25:39 2006
@@ -42,7 +42,7 @@
* instances to put in the pool.
*/
public class MultiprocessingAnalysisEngine_impl extends AnalysisEngineImplBase implements
- TextAnalysisEngine {
+ TextAnalysisEngine {
/**
* AnalysisEngine pool used to serve process requests.
@@ -60,7 +60,7 @@
* java.util.Map)
*/
public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
- throws ResourceInitializationException {
+ throws ResourceInitializationException {
super.initialize(aSpecifier, aAdditionalParams);
// Read parameters from the aAdditionalParams map.
@@ -75,7 +75,7 @@
// determine size of Analysis Engine pool and timeout period
Integer poolSizeInteger = (Integer) aAdditionalParams.get(PARAM_NUM_SIMULTANEOUS_REQUESTS);
int poolSize = (poolSizeInteger != null) ? poolSizeInteger.intValue()
- : DEFAULT_NUM_SIMULTANEOUS_REQUESTS;
+ : DEFAULT_NUM_SIMULTANEOUS_REQUESTS;
Integer timeoutInteger = (Integer) aAdditionalParams.get(PARAM_TIMEOUT_PERIOD);
mTimeout = (timeoutInteger != null) ? timeoutInteger.intValue() : DEFAULT_TIMEOUT_PERIOD;
@@ -101,7 +101,7 @@
if (ae == null) // timeout elapsed
{
throw new AnalysisEngineProcessException(AnalysisEngineProcessException.TIMEOUT_ELAPSED,
- new Object[] { new Integer(getTimeout()) });
+ new Object[] { new Integer(getTimeout()) });
}
return ae.processAndOutputNewCASes(aCAS);