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/22 16:03:22 UTC
svn commit: r478180 - in /incubator/uima/uimaj/trunk/uimaj-core/src:
main/java/org/apache/uima/analysis_engine/impl/
main/java/org/apache/uima/analysis_engine/impl/compatibility/
main/java/org/apache/uima/cas/ main/java/org/apache/uima/cas/admin/ main/...
Author: alally
Date: Wed Nov 22 07:03:20 2006
New Revision: 478180
URL: http://svn.apache.org/viewvc?view=rev&rev=478180
Log:
UIMA-48: fixed some trivial compiler warnings
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_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/analysis_engine/impl/compatibility/CollectionReaderAdapter.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CASException.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CASRuntimeException.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ComponentInfo.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTIndex.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TCASSerializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.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/text/TCASException.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/TCASRuntimeException.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.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/pear/util/UIMAUtil.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/impl/Mapping_impl.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppEngine.java
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/LoggerPrintStream.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java
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=478180&r1=478179&r2=478180
==============================================================================
--- 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 Wed Nov 22 07:03:20 2006
@@ -37,6 +37,8 @@
public class AnalysisEngineManagementImpl implements AnalysisEngineManagementImplMBean,
AnalysisEngineManagement {
+ private static final long serialVersionUID = 1988620286191379887L;
+
static final DecimalFormat format = new DecimalFormat("0.##");
/**
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=478180&r1=478179&r2=478180
==============================================================================
--- 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 Wed Nov 22 07:03:20 2006
@@ -19,7 +19,6 @@
package org.apache.uima.analysis_engine.impl;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -32,10 +31,8 @@
import org.apache.uima.internal.util.AnalysisEnginePool;
import org.apache.uima.resource.ResourceConfigurationException;
import org.apache.uima.resource.ResourceInitializationException;
-import org.apache.uima.resource.ResourceProcessException;
import org.apache.uima.resource.ResourceSpecifier;
import org.apache.uima.util.Logger;
-import org.apache.uima.util.ProcessTrace;
/**
* An {@link AnalysisEngine} implementation that can process multiple {@link CAS} objects
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?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- 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 Nov 22 07:03:20 2006
@@ -36,10 +36,8 @@
import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
import org.apache.uima.cas.AbstractCas;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.TypeSystem;
import org.apache.uima.cas.admin.CASMgr;
import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.TCASImpl;
import org.apache.uima.impl.UimaContext_ImplBase;
import org.apache.uima.internal.util.UUIDGenerator;
import org.apache.uima.jcas.impl.JCas;
@@ -94,7 +92,6 @@
/**
* For a primitive AnalysisEngine only, the Annotator instance that contains the analysis logic.
*/
- // private BaseAnnotator mAnnotator;
private UimacppAnalysisEngine mAnnotator;
/**
@@ -103,17 +100,6 @@
*/
private AnnotatorContext_impl mAnnotatorContext;
- /**
- * The ResultSpecification to pass to the process call.
- */
- private ResultSpecification mDefaultResultSpecification;
-
- /**
- * For a primitive AE only, the last CAS TypeSystem that was sent to the Annotator's
- * typeSystemInit() method.
- */
- private TypeSystem mLastAnnotatorTypeSystem;
-
private boolean mSofaAware = false;
/**
@@ -215,7 +201,7 @@
if (aResultSpec == null) {
resetResultSpecificationToDefault();
} else {
- mDefaultResultSpecification = aResultSpec;
+ mAnnotator.setResultSpecification(aResultSpec);
}
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/CollectionReaderAdapter.java Wed Nov 22 07:03:20 2006
@@ -36,7 +36,6 @@
import org.apache.uima.collection.CollectionException;
import org.apache.uima.collection.CollectionReader;
import org.apache.uima.jcas.impl.JCas;
-import org.apache.uima.resource.CasManager;
import org.apache.uima.resource.Resource;
import org.apache.uima.resource.ResourceConfigurationException;
import org.apache.uima.resource.ResourceInitializationException;
@@ -51,8 +50,6 @@
private UimaContext mUimaContext;
- private CasManager mCasManager;
-
private boolean mSofaAware;
/**
@@ -86,8 +83,6 @@
paramsMap.put(Resource.PARAM_UIMA_CONTEXT, aContext);
mCollectionReader.initialize(desc, paramsMap);
mUimaContext = aContext;
- mCasManager = mCollectionReader.getResourceManager().getCasManager();
-
}
/*
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CASException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CASException.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CASException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CASException.java Wed Nov 22 07:03:20 2006
@@ -28,6 +28,8 @@
*/
public class CASException extends Exception {
+ private static final long serialVersionUID = 2990279532203726966L;
+
private static final String resource_file = "org.apache.uima.cas.cas_exception";
private static final String missing_resource_error = "Could not load message catalog: "
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CASRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CASRuntimeException.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CASRuntimeException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/CASRuntimeException.java Wed Nov 22 07:03:20 2006
@@ -28,6 +28,8 @@
*/
public class CASRuntimeException extends RuntimeException {
+ private static final long serialVersionUID = 2597111625069248081L;
+
private static final String resource_file = "org.apache.uima.cas.cas_runtime_exception";
private static final String missing_resource_error = "Could not load message catalog: "
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ComponentInfo.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ComponentInfo.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ComponentInfo.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ComponentInfo.java Wed Nov 22 07:03:20 2006
@@ -19,7 +19,6 @@
package org.apache.uima.cas;
-import java.util.Map;
/**
* Information that a CAS needs to know about the component that's currently operating on it.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/ParsingException.java Wed Nov 22 07:03:20 2006
@@ -26,6 +26,8 @@
*/
public class ParsingException extends Exception {
+ private static final long serialVersionUID = -8526988900901941980L;
+
/**
*
*/
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/admin/CASAdminException.java Wed Nov 22 07:03:20 2006
@@ -29,6 +29,8 @@
*/
public class CASAdminException extends RuntimeException {
+ private static final long serialVersionUID = 3968205828762300170L;
+
private static final String resource_file = "org.apache.uima.cas.admin.admin_errors";
private static final String missing_resource_error = "Could not load message catalog: "
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationBaseImpl.java Wed Nov 22 07:03:20 2006
@@ -22,7 +22,6 @@
import org.apache.uima.cas.AnnotationBaseFS;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.text.AnnotationFS;
/**
* Class comment for AnnotationImpl.java goes here.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/AnnotationImplException.java Wed Nov 22 07:03:20 2006
@@ -29,6 +29,8 @@
*/
public class AnnotationImplException extends Exception {
+ private static final long serialVersionUID = 2924905396059850361L;
+
private static final String resource_file = "org.apache.uima.cas.impl.annot_impl";
private static final String missing_resource_error = "Could not load message catalog: "
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/ConjunctiveConstraint.java Wed Nov 22 07:03:20 2006
@@ -30,6 +30,8 @@
*/
class ConjunctiveConstraint implements FSMatchConstraint {
+ private static final long serialVersionUID = 2306345325747964023L;
+
private FSMatchConstraint c1;
private FSMatchConstraint c2;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/DisjunctiveConstraint.java Wed Nov 22 07:03:20 2006
@@ -30,6 +30,8 @@
*/
class DisjunctiveConstraint implements FSMatchConstraint {
+ private static final long serialVersionUID = -6178223997976826183L;
+
private FSMatchConstraint c1;
private FSMatchConstraint c2;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/EmbeddedConstraint.java Wed Nov 22 07:03:20 2006
@@ -34,6 +34,8 @@
*/
class EmbeddedConstraint extends PathConstraint implements FSMatchConstraint {
+ private static final long serialVersionUID = -4938331720540592033L;
+
private FSMatchConstraint cons;
private EmbeddedConstraint() {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSFloatConstraintImpl.java Wed Nov 22 07:03:20 2006
@@ -32,6 +32,8 @@
*/
class FSFloatConstraintImpl implements FSFloatConstraint {
+ private static final long serialVersionUID = 4649271745827863437L;
+
private static final int LT = 0;
private static final int LEQ = 1;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIntConstraintImpl.java Wed Nov 22 07:03:20 2006
@@ -30,6 +30,8 @@
*/
class FSIntConstraintImpl implements FSIntConstraint {
+ private static final long serialVersionUID = -4828985717069908575L;
+
private static final int LT = 0;
private static final int LEQ = 1;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTIndex.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTIndex.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTIndex.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSRBTIndex.java Wed Nov 22 07:03:20 2006
@@ -33,7 +33,7 @@
*
*
*/
-// may not be used - no refs to it on 6-2006
+// TODO: may not be used - no refs to it on 6-2006
class FSRBTIndex extends FSLeafIndexImpl {
private CompIntArrayRBT tree;
@@ -77,7 +77,7 @@
public ComparableIntPointerIterator pointerIterator(IntComparator comp,
int[] detectIllegalIndexUpdates, int typeCode) {
- return ((CompIntArrayRBT) this.tree).pointerIterator(comp, detectIllegalIndexUpdates, typeCode);
+ return this.tree.pointerIterator(comp, detectIllegalIndexUpdates, typeCode);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSStringConstraintImpl.java Wed Nov 22 07:03:20 2006
@@ -29,6 +29,8 @@
*/
class FSStringConstraintImpl implements FSStringConstraint {
+ private static final long serialVersionUID = -7167266553385439718L;
+
private String string;
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSTypeConstraintImpl.java Wed Nov 22 07:03:20 2006
@@ -37,6 +37,8 @@
*/
class FSTypeConstraintImpl implements FSTypeConstraint {
+ private static final long serialVersionUID = 7557683109761796280L;
+
private HashMap nameMap;
private transient SortedIntSet typeSet = new SortedIntSet();
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FloatConstraint.java Wed Nov 22 07:03:20 2006
@@ -29,8 +29,10 @@
*
* @version $Revision: 1.1 $
*/
-class FloatConstraint extends PathConstraint implements FSMatchConstraint {
+class FloatConstraint extends PathConstraint implements FSMatchConstraint {
+ private static final long serialVersionUID = -6954254545913068934L;
+
private FSFloatConstraint floatConstraint;
private FloatConstraint() {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/IntConstraint.java Wed Nov 22 07:03:20 2006
@@ -31,6 +31,8 @@
*/
class IntConstraint extends PathConstraint implements FSMatchConstraint {
+ private static final long serialVersionUID = 1661917047353431836L;
+
private FSIntConstraint intConstraint;
private IntConstraint() {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LongHeap.java Wed Nov 22 07:03:20 2006
@@ -51,7 +51,7 @@
}
void resetToZeros() {
- Arrays.fill(this.heap, 0, this.heapPos, (long) NULL);
+ Arrays.fill(this.heap, 0, this.heapPos, NULL);
}
// Getters
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/LowLevelException.java Wed Nov 22 07:03:20 2006
@@ -29,6 +29,8 @@
*/
public class LowLevelException extends RuntimeException {
+ private static final long serialVersionUID = -3115614380676282900L;
+
private static final String resource_file = "org.apache.uima.cas.impl.ll_runtimeException";
private static final String missing_resource_error = "Could not load message catalog: "
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/SofaFSImpl.java Wed Nov 22 07:03:20 2006
@@ -19,22 +19,14 @@
package org.apache.uima.cas.impl;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.ByteBuffer;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.FloatArrayFS;
-import org.apache.uima.cas.IntArrayFS;
import org.apache.uima.cas.SofaFS;
import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.TCAS;
/**
* Implementation of the {@link org.apache.uima.cas.SofaFS SofaFS} interface.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/StringConstraint.java Wed Nov 22 07:03:20 2006
@@ -31,6 +31,8 @@
*/
class StringConstraint extends PathConstraint implements FSMatchConstraint {
+ private static final long serialVersionUID = 1443969254449621891L;
+
private FSStringConstraint stringConstraint;
private StringConstraint() {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TCASSerializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TCASSerializer.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TCASSerializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/TCASSerializer.java Wed Nov 22 07:03:20 2006
@@ -26,6 +26,8 @@
*/
public class TCASSerializer extends CASSerializer {
+ private static final long serialVersionUID = 242121702771579810L;
+
public String documentText;
public String documentLanguage;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASDeserializer.java Wed Nov 22 07:03:20 2006
@@ -173,13 +173,6 @@
// working with initial view
private int nextIndex;
- // private FeatureStructureImplC currentFS;
-
- private XCASDeserializerHandler(CASImpl cas) {
- this(cas, null);
- }
-
- // APL
private XCASDeserializerHandler(CASImpl aCAS, OutOfTypeSystemData ootsData) {
super();
this.cas = aCAS.getBaseCAS();
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XCASSerializer.java Wed Nov 22 07:03:20 2006
@@ -26,25 +26,19 @@
import java.util.Map;
import java.util.Vector;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
import org.apache.uima.UimaContext;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.FSIndex;
-import org.apache.uima.cas.FSIterator;
-import org.apache.uima.cas.SofaFS;
import org.apache.uima.cas.TypeSystem;
-import org.apache.uima.cas.text.TCAS;
-import org.apache.uima.util.XMLSerializer;
import org.apache.uima.internal.util.IntStack;
import org.apache.uima.internal.util.IntVector;
import org.apache.uima.internal.util.StringUtils;
import org.apache.uima.internal.util.rb_trees.IntRedBlackTree;
+import org.apache.uima.util.XMLSerializer;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
-;
/**
* XCAS serializer. Create a serializer from a type system, then encode individual CASes by writing
@@ -117,8 +111,6 @@
// Out-Of-TypeSystem Data to be included in produced XCAS. (APL)
private OutOfTypeSystemData mOutOfTypeSystemData;
- FeatureStructureImplC fs;
-
// We write to a SAXDocStack, a simplified interface to a
// ContentHandler.
private XCASDocSerializer(ContentHandler ch, CASImpl cas) {
@@ -134,7 +126,9 @@
this.indexReps = new IntVector();
this.sofaTypeCode = cas.ll_getTypeSystem().ll_getCodeForType(
cas.getTypeSystem().getType(CAS.TYPE_NAME_SOFA));
- fs = new FeatureStructureImplC(cas, 0);
+
+ //Why was this here? Was never being read anywhere:
+ //fs = new FeatureStructureImplC(cas, 0);
}
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/XmiCasDeserializer.java Wed Nov 22 07:03:20 2006
@@ -470,10 +470,10 @@
}
private void handleFeature(final Type type, int addr, String featName, String featVal,
- boolean lenient) throws SAXParseException {
+ boolean aLenient) throws SAXParseException {
final FeatureImpl feat = (FeatureImpl) type.getFeatureByBaseName(featName);
if (feat == null) {
- if (!lenient) {
+ if (!aLenient) {
throw createException(XCASParsingException.UNKNOWN_FEATURE, featName);
}
return;
@@ -482,10 +482,10 @@
}
private void handleFeature(final Type type, int addr, String featName, List featVals,
- boolean lenient) throws SAXParseException {
+ boolean aLenient) throws SAXParseException {
final FeatureImpl feat = (FeatureImpl) type.getFeatureByBaseName(featName);
if (feat == null) {
- if (!lenient) {
+ if (!aLenient) {
throw createException(XCASParsingException.UNKNOWN_FEATURE, featName);
}
return;
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?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- 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 Nov 22 07:03:20 2006
@@ -768,9 +768,9 @@
attrs.addAttribute(null, null, attrName, cdataType, attrValue);
}
- private void startElement(XmlElementName name, Attributes attrs, int numChildren)
+ private void startElement(XmlElementName name, Attributes attrs, int aNumChildren)
throws SAXException {
- XmiCasSerializer.this.numChildren = numChildren;
+ XmiCasSerializer.this.numChildren = aNumChildren;
// don't include NS URI here. That causes XMI serializer to
// include the xmlns attribute in every element. Instead we
// explicitly added these attributes to the root element.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/TCASException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/TCASException.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/TCASException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/TCASException.java Wed Nov 22 07:03:20 2006
@@ -29,6 +29,8 @@
*/
public class TCASException extends Exception {
+ private static final long serialVersionUID = 2256510263846030412L;
+
private static final String resource_file = "org.apache.uima.cas.text.tcas_errors";
private static final String missing_resource_error = "Could not load message catalog: "
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/TCASRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/TCASRuntimeException.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/TCASRuntimeException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/TCASRuntimeException.java Wed Nov 22 07:03:20 2006
@@ -29,6 +29,8 @@
*/
public class TCASRuntimeException extends RuntimeException {
+ private static final long serialVersionUID = -4233241847620125372L;
+
private static final String resource_file = "org.apache.uima.cas.text.tcas_runtime_exc";
private static final String missing_resource_error = "Could not load message catalog: "
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasConsumerDescription_impl.java Wed Nov 22 07:03:20 2006
@@ -45,6 +45,9 @@
*/
public class CasConsumerDescription_impl extends ResourceCreationSpecifier_impl implements
CasConsumerDescription {
+
+ private static final long serialVersionUID = -3876854246385758053L;
+
/**
* Creates a new CasConsumerDescription_impl. Initializes the MetaData and FrameworkImplementation
* attributes.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CasInitializerDescription_impl.java Wed Nov 22 07:03:20 2006
@@ -44,6 +44,9 @@
*/
public class CasInitializerDescription_impl extends ResourceCreationSpecifier_impl implements
CasInitializerDescription {
+
+ private static final long serialVersionUID = -4559482063745943204L;
+
/**
* Creates a new CasInitializerDescription_impl. Initializes the MetaData and
* FrameworkImplementation attributes.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/impl/CollectionReaderDescription_impl.java Wed Nov 22 07:03:20 2006
@@ -48,6 +48,8 @@
public class CollectionReaderDescription_impl extends ResourceCreationSpecifier_impl implements
CollectionReaderDescription {
+ private static final long serialVersionUID = -6654886877117758267L;
+
/**
* Creates a new ProcessingResourceMetaData_impl. Initializes the MetaData and
* FrameworkImplementation attributes.
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java Wed Nov 22 07:03:20 2006
@@ -28,6 +28,8 @@
*/
public class IntStack extends IntVector {
+ private static final long serialVersionUID = 6396213817151546621L;
+
/** Creates an empty stack. */
public IntStack() {
super();
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java Wed Nov 22 07:03:20 2006
@@ -30,6 +30,8 @@
*/
public class IntVector implements Serializable {
+ private static final long serialVersionUID = 4829243434421992519L;
+
private static final int default_size = 16;
private static final int default_growth_factor = 2;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java Wed Nov 22 07:03:20 2006
@@ -28,6 +28,8 @@
*/
public class UtilError extends RuntimeException {
+ private static final long serialVersionUID = -6708991281527442356L;
+
private static final String resource_file = "org.apache.uima.util.UtilError";
private static final String missing_resource_error = "Could not load message catalog: "
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/AnnotationBase.java Wed Nov 22 07:03:20 2006
@@ -21,13 +21,7 @@
import org.apache.uima.cas.AnnotationBaseFS;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.CASException;
import org.apache.uima.cas.SofaFS;
-import org.apache.uima.cas.impl.AnnotationImpl;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.TCASImpl;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.jcas.cas.TOP_Type;
import org.apache.uima.jcas.impl.JCas;
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/Sofa.java Wed Nov 22 07:03:20 2006
@@ -30,7 +30,6 @@
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.TCASImpl;
-import org.apache.uima.cas.text.TCAS;
import org.apache.uima.jcas.impl.JCas;
/**
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/cas/TOP_Type.java Wed Nov 22 07:03:20 2006
@@ -149,7 +149,7 @@
this.jcas = jcas;
this.casImpl = jcas.getCasImpl();
this.ll_cas = this.casImpl;
- this.casType = (TypeImpl) casType;
+ this.casType = casType;
this.instanceOf_Type = this;
this.casTypeCode = ((TypeImpl) this.casType).getCode();
this.lowLevelTypeChecks = false;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCas.java Wed Nov 22 07:03:20 2006
@@ -53,7 +53,6 @@
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.FeaturePath;
import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.SofaFS;
import org.apache.uima.cas.SofaID;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
@@ -766,7 +765,7 @@
}
public JCas getJCas(Sofa sofa) throws CASException {
- return (JCas) casImpl.getJCas(sofa);
+ return casImpl.getJCas(sofa);
}
public FSIterator getSofaIterator() {
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?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- 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 Nov 22 07:03:20 2006
@@ -32,12 +32,18 @@
*/
public class InstallationDescriptor implements Serializable {
+
+ private static final long serialVersionUID = 4884186903126810934L;
+
/**
* The <code>ActionInfo</code> class defines 'installation action' attributes.
*
* @author LK
*/
public static class ActionInfo implements Serializable {
+
+ private static final long serialVersionUID = -3459024334454685063L;
+
/*
* Action IDs
*/
@@ -115,6 +121,9 @@
* @author LK
*/
public static class ComponentInfo implements Serializable {
+
+ private static final long serialVersionUID = 3269238133625161794L;
+
/**
* Constructor that takes component ID as an argument.
*
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java Wed Nov 22 07:03:20 2006
@@ -19,18 +19,21 @@
package org.apache.uima.pear.util;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
import java.net.URL;
import java.util.Hashtable;
-import org.apache.uima.*;
+import org.apache.uima.UIMAException;
+import org.apache.uima.UIMAFramework;
+import org.apache.uima.UIMARuntimeException;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
-import org.apache.uima.collection.*;
-import org.apache.uima.collection.metadata.CpeDescription;
-import org.apache.uima.resource.metadata.ResourceManagerConfiguration;
-import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.collection.CasConsumerDescription;
+import org.apache.uima.collection.CasInitializerDescription;
+import org.apache.uima.collection.CollectionReaderDescription;
import org.apache.uima.resource.ResourceSpecifier;
-import org.apache.uima.util.*;
+import org.apache.uima.util.XMLInputSource;
+import org.apache.uima.util.XMLParser;
/**
* The <code>UIMAUtil</code> class provides convenient methods for handling UIMA specific objects.
@@ -202,7 +205,7 @@
xmlDescUrl);
try {
// try parsing CPE configuration
- CpeDescription cpeDesc = xmlParser.parseCpeDescription(xmlSource);
+ xmlParser.parseCpeDescription(xmlSource);
uimaCompCtg = CPE_CONFIGURATION_CTG;
__errTableByUri.remove(xmlDescFile);
} catch (UIMAException err) {
@@ -221,7 +224,7 @@
xmlDescUrl);
try {
// try parsing TS description
- TypeSystemDescription tsDesc = xmlParser.parseTypeSystemDescription(xmlSource);
+ xmlParser.parseTypeSystemDescription(xmlSource);
uimaCompCtg = TYPE_SYSTEM_CTG;
__errTableByUri.remove(xmlDescFile);
} catch (UIMAException err) {
@@ -239,8 +242,7 @@
xmlSource = new XMLInputSource(xmlDescFile);
try {
// try parsing RES manager configuration
- ResourceManagerConfiguration rmDesc = xmlParser
- .parseResourceManagerConfiguration(xmlSource);
+ xmlParser.parseResourceManagerConfiguration(xmlSource);
uimaCompCtg = REUSABLE_RESOURCE_CTG;
__errTableByUri.remove(xmlDescFile);
} catch (UIMAException err) {
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java Wed Nov 22 07:03:20 2006
@@ -57,7 +57,7 @@
throws ResourceInitializationException {
// extract TypeSystems, TypePriorities, and FsIndexes from metadata
List typeSystems = new ArrayList();
- List typePriorities = new ArrayList();
+ List typePrioritiesList = new ArrayList();
List fsIndexes = new ArrayList();
Iterator it = aMetaDataToMerge.iterator();
while (it.hasNext()) {
@@ -65,13 +65,13 @@
if (md.getTypeSystem() != null)
typeSystems.add(md.getTypeSystem());
if (md.getTypePriorities() != null)
- typePriorities.add(md.getTypePriorities());
+ typePrioritiesList.add(md.getTypePriorities());
if (md.getFsIndexCollection() != null)
fsIndexes.add(md.getFsIndexCollection());
}
// merge TypePriorities and FsIndexes
- TypePriorities aggTypePriorities = CasCreationUtils.mergeTypePriorities(typePriorities,
+ TypePriorities aggTypePriorities = CasCreationUtils.mergeTypePriorities(typePrioritiesList,
aResourceManager);
FsIndexCollection aggIndexColl = CasCreationUtils.mergeFsIndexes(fsIndexes, aResourceManager);
TypeSystemDescription aggTypeDesc = CasCreationUtils.mergeTypeSystems(typeSystems,
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java Wed Nov 22 07:03:20 2006
@@ -21,7 +21,6 @@
import java.util.Properties;
-import org.apache.uima.UimaContext;
import org.apache.uima.cas.AbstractCas;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.CasOwner;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java Wed Nov 22 07:03:20 2006
@@ -31,6 +31,9 @@
import org.apache.uima.util.XMLParser.ParsingOptions;
public class Parameter_impl extends MetaDataObject_impl implements Parameter {
+
+ private static final long serialVersionUID = -853121388957306954L;
+
String name;
String value;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/impl/Mapping_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/impl/Mapping_impl.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/impl/Mapping_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/impl/Mapping_impl.java Wed Nov 22 07:03:20 2006
@@ -28,6 +28,9 @@
*
*/
public class Mapping_impl extends MetaDataObject_impl implements Mapping {
+
+ private static final long serialVersionUID = -2371976614485187381L;
+
private String mFeature;
private String mIndexName;
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/CppUimajEngine.java Wed Nov 22 07:03:20 2006
@@ -25,8 +25,6 @@
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
-import org.xml.sax.SAXException;
-
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
@@ -45,9 +43,8 @@
import org.apache.uima.resource.ResourceSpecifier;
import org.apache.uima.resource.metadata.Capability;
import org.apache.uima.util.InvalidXMLException;
-import org.apache.uima.util.Level;
-import org.apache.uima.util.Logger;
import org.apache.uima.util.XMLInputSource;
+import org.xml.sax.SAXException;
public class CppUimajEngine {
private String exceptionString = "";
@@ -170,7 +167,7 @@
public int process(String doc, int[] heapArray, int[] fsIndex, String[] stringTable,
int[] resultSpecTypes, int[] resultSpecFeatures, int sofaNum,
- byte[] byteHeapArray, short[] shortHeapArray, long[] longHeapArray) {
+ byte[] aByteHeapArray, short[] aShortHeapArray, long[] aLongHeapArray) {
int result = 0;
try {
// System.err.println("CppUimajEngine.process() called");
@@ -185,9 +182,9 @@
serializer.fsIndex = fsIndex;
serializer.stringTable = stringTable;
- serializer.byteHeapArray = byteHeapArray;
- serializer.shortHeapArray = shortHeapArray;
- serializer.longHeapArray = longHeapArray;
+ serializer.byteHeapArray = aByteHeapArray;
+ serializer.shortHeapArray = aShortHeapArray;
+ serializer.longHeapArray = aLongHeapArray;
casImpl.reinit(serializer);
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppEngine.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppEngine.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppEngine.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/uimacpp/UimacppEngine.java Wed Nov 22 07:03:20 2006
@@ -19,26 +19,25 @@
package org.apache.uima.uimacpp;
-import org.apache.uima.UIMAFramework;
import org.apache.uima.UIMARuntimeException;
import org.apache.uima.analysis_engine.ResultSpecification;
import org.apache.uima.analysis_engine.TypeOrFeature;
+import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.Feature;
+import org.apache.uima.cas.SofaFS;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.TypeSystem;
+import org.apache.uima.cas.admin.CASMgr;
+import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.CASMgrSerializer;
+import org.apache.uima.cas.impl.CASSerializer;
import org.apache.uima.cas.impl.FeatureImpl;
import org.apache.uima.cas.impl.Serialization;
-import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.TCASImpl;
-import org.apache.uima.cas.impl.CASSerializer;
import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.impl.TypeSystemImpl;
-import org.apache.uima.cas.CAS;
import org.apache.uima.cas.text.TCAS;
-import org.apache.uima.cas.admin.CASMgr;
import org.apache.uima.internal.util.IntVector;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.TypeSystem;
-import org.apache.uima.cas.Feature;
-import org.apache.uima.cas.SofaFS;
public class UimacppEngine {
@@ -137,39 +136,40 @@
private native void releaseSegmentJNI() throws InternalTafException;
- /**
+ /*
* serialized CAS data components - supported args to getSerializedDataJNI and
- * getSegmentSerializedDataJNI
+ * getSegmentSerializedDataJNI. Many of these are unread and have been commented
+ * out but left here for documentation purposes.
*/
- private static final int TYPE_INH = 0;
-
- private static final int FEATURE_DEF = 1;
-
- private static final int FEATURE_OFFSET = 2;
-
- private static final int TYPE_SYMBOLS = 3;
-
- private static final int FEATURE_SYMBOLS = 4;
-
- private static final int TOPTYPE = 5;
-
- private static final int TYPE_PRIORITIES = 6;
+// private static final int TYPE_INH = 0;
+//
+// private static final int FEATURE_DEF = 1;
+//
+// private static final int FEATURE_OFFSET = 2;
+//
+// private static final int TYPE_SYMBOLS = 3;
+//
+// private static final int FEATURE_SYMBOLS = 4;
+//
+// private static final int TOPTYPE = 5;
+//
+// private static final int TYPE_PRIORITIES = 6;
private static final int FSHEAP = 10;
private static final int STRINGSYMBOL = 11;
- private static final int DOCUMENT = 20;
+// private static final int DOCUMENT = 20;
private static final int INDEXEDFSS = 30;
- private static final int INDEXID = 40;
-
- private static final int INDEXKIND = 41;
-
- private static final int COMPARATORDEF = 42;
-
- private static final int COMPARATORSTART = 43;
+// private static final int INDEXID = 40;
+//
+// private static final int INDEXKIND = 41;
+//
+// private static final int COMPARATORDEF = 42;
+//
+// private static final int COMPARATORSTART = 43;
private static final int BYTEHEAP = 12;
@@ -338,8 +338,6 @@
cas = aCas;
try {
- CASMgr casMgr = (CASMgr) cas;
-
resetJNI();
if (!casIsEmpty) {
@@ -508,8 +506,6 @@
case 5020:
case 10000:
throw new OutOfMemoryError();
- default:
- ;
}
// TafException tafException = new TafException(
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/LoggerPrintStream.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/LoggerPrintStream.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/LoggerPrintStream.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/LoggerPrintStream.java Wed Nov 22 07:03:20 2006
@@ -132,7 +132,7 @@
flush();
}
- public void write(byte[] buf, int off, int len) {
+ public void write(byte[] aBuf, int off, int len) {
// raw bytes not supported
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java Wed Nov 22 07:03:20 2006
@@ -152,8 +152,6 @@
Assert.assertTrue(result);
CAS cas1 = mtae.newCAS();
- // should be a TCAS
- Assert.assertTrue(cas1 instanceof CAS);
// should have the type foo.Bar
assertNotNull(cas1.getTypeSystem().getType("foo.Bar"));
@@ -177,13 +175,8 @@
Assert.assertTrue(result);
CAS cas5 = mtae2.newCAS();
- // should be a TCAS
- Assert.assertTrue(cas5 instanceof CAS);
// should have the type foo.Bar
assertNotNull(cas5.getTypeSystem().getType("foo.Bar"));
- } catch (ResourceInitializationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
} catch (Exception e) {
JUnitExtension.handleException(e);
}
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java?view=diff&rev=478180&r1=478179&r2=478180
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java Wed Nov 22 07:03:20 2006
@@ -47,7 +47,7 @@
private static String CI_DESC_NAME = "ci.xml";
- private static String CPE_DESC_NAME = "cpe.xml";
+// private static String CPE_DESC_NAME = "cpe.xml";
private static String CR_DESC_NAME = "cr.xml";
@@ -120,15 +120,15 @@
Assert.assertTrue(UIMAUtil.COLLECTION_READER_CTG.equals(UIMAUtil
.identifyUimaComponentCategory(crDescFile)));
}
- // /**
- // * Runs test case for Type System descriptor.
- // */
- // public void testTsDescriptor() throws Exception {
- // File tsDescFile =
- // new File( _junitTestBasePath, TEST_FOLDER + "/" + TS_DESC_NAME );
- // if( ! tsDescFile.isFile() )
- // throw new FileNotFoundException( "TS descriptor not found" );
- // Assert.assertTrue( UIMAUtil.TYPE_SYSTEM_CTG.equals(
- // UIMAUtil.identifyUimaComponentCategory( tsDescFile ) ) );
- // }
+ /**
+ * Runs test case for Type System descriptor.
+ */
+ public void testTsDescriptor() throws Exception {
+ File tsDescFile =
+ new File( _junitTestBasePath, TEST_FOLDER + "/" + TS_DESC_NAME );
+ if( ! tsDescFile.isFile() )
+ throw new FileNotFoundException( "TS descriptor not found" );
+ Assert.assertTrue( UIMAUtil.TYPE_SYSTEM_CTG.equals(
+ UIMAUtil.identifyUimaComponentCategory( tsDescFile ) ) );
+ }
}