Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java?rev=1461836&r1=1461835&r2=1461836&view=diff ============================================================================== --- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java (original) +++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/CasCreationUtils.java Wed Mar 27 20:18:38 2013 @@ -129,7 +129,7 @@ public class CasCreationUtils { * analysis engines. * * @param aDescription - * description of the anlaysis engine that will process this CAS. This is used to + * description of the analysis engine that will process this CAS. This is used to * set up the CAS's type system and indexes. * * @return a new CAS instance @@ -147,7 +147,7 @@ public class CasCreationUtils { * analysis engines. * * @param aDescription - * description of the anlaysis engine that will process this CAS. This is used to + * description of the analysis engine that will process this CAS. This is used to * set up the CAS's type system and indexes. * @param aPerformanceTuningSettings * Properties object containing framework performance tuning settings using key @@ -661,7 +661,7 @@ public class CasCreationUtils { * @param aCASMgr * the <code>CASMgr</code> object whose type system is to be modified. * @param aTypeSystem - * desription of type system to install + * description of type system to install * * @throws ResourceInitializationException * if an error occurs during modification of the type system @@ -1012,7 +1012,7 @@ public class CasCreationUtils { * together * * @throws ResourceInitializationException - * if an incompatibiliy exists or if an import could not be resolved + * if an incompatibility exists or if an import could not be resolved */ public static TypeSystemDescription mergeTypeSystems(Collection<? extends TypeSystemDescription> aTypeSystems, ResourceManager aResourceManager) throws ResourceInitializationException { @@ -1230,7 +1230,7 @@ public class CasCreationUtils { * systems together * * @throws ResourceInitializationException - * if an incompatibiliy exists or if an import could not be resolved + * if an incompatibility exists or if an import could not be resolved */ public static TypeSystemDescription mergeDelegateAnalysisEngineTypeSystems( AnalysisEngineDescription aAggregateDescription, ResourceManager aResourceManager) @@ -1500,7 +1500,7 @@ public class CasCreationUtils { * Set}s containing Descriptor URLs (Strings) where those types are declared. You * may pass null if you are not interested in this information. * @param aOutputFailedRemotes - * If this paramter is non-null, and if a remote AE could not be contacted, then an + * If this parameter is non-null, and if a remote AE could not be contacted, then an * entry will be added to this map. The key will be the context name (e.g., * /myDelegate1/nestedRemoteDelegate) of the failed remote, and the value will be * the Exception that occurred. If this parameter is null, an exception will be @@ -1509,7 +1509,7 @@ public class CasCreationUtils { * @return an object containing the merged TypeSystem, TypePriorities, and FS Index definitions. * * @throws ResourceInitializationException - * if an incompatibiliy exists or if an import could not be resolved + * if an incompatibility exists or if an import could not be resolved */ public static ProcessingResourceMetaData mergeDelegateAnalysisEngineMetaData( AnalysisEngineDescription aAggregateDescription, ResourceManager aResourceManager, @@ -1979,7 +1979,7 @@ public class CasCreationUtils { /** * Gets a list of ProcessingResourceMetadata objects from a list containing either * ResourceSpecifiers, ProcessingResourceMetadata objects, or subparts of - * ProcessingResourceMetadata objects (type sypstems, indexes, or type priorities). Subparts will + * ProcessingResourceMetadata objects (type systems, indexes, or type priorities). Subparts will * be wrapped inside a ProcessingResourceMetadata object. All objects will be cloned, so that * further processing (such as import resolution) does not affect the caller. * <p>
Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java?rev=1461836&r1=1461835&r2=1461836&view=diff ============================================================================== --- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java (original) +++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/CasToInlineXml.java Wed Mar 27 20:18:38 2013 @@ -103,7 +103,7 @@ public class CasToInlineXml { * CAS to generate from * @param aFilter * constraint that determines which annotations are included in the output. If null (or - * ommitted), all annotations are included. + * omitted), all annotations are included. */ public String generateXML(CAS aCAS, FSMatchConstraint aFilter) throws CASException { ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java?rev=1461836&r1=1461835&r2=1461836&view=diff ============================================================================== --- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java (original) +++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/JCasPool.java Wed Mar 27 20:18:38 2013 @@ -200,7 +200,7 @@ public class JCasPool { * Utility method used in the constructor to fill the pool with CAS instances. * * @param aMetaData - * metadata including the type sytsem for the CASes + * metadata including the type system for the CASes * * @throws ResourceInitializationException * if the Resource instances could not be created Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Level.java URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Level.java?rev=1461836&r1=1461835&r2=1461836&view=diff ============================================================================== --- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Level.java (original) +++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Level.java Wed Mar 27 20:18:38 2013 @@ -122,7 +122,7 @@ public class Level { } /** - * method isOn() returns ture if the message level is not OFF + * method isOn() returns true if the message level is not OFF * * @return boolean true if the message level is less than OFF */ Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Logger.java URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Logger.java?rev=1461836&r1=1461835&r2=1461836&view=diff ============================================================================== --- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Logger.java (original) +++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Logger.java Wed Mar 27 20:18:38 2013 @@ -251,7 +251,7 @@ public void setOutputStream(OutputStream * messages produced by annotators. To change the logging level for an annotator, use * <code>UIMAFramework.getLogger(YourAnnotatorClass.class).setLevel(level)</code>. * <p> - * If you need more flexibilty it configuring the logger, consider using the standard Java logger + * If you need more flexibility it configuring the logger, consider using the standard Java logger * properties file or the java.util.logging APIs. * * @param level Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Progress.java URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Progress.java?rev=1461836&r1=1461835&r2=1461836&view=diff ============================================================================== --- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Progress.java (original) +++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/Progress.java Wed Mar 27 20:18:38 2013 @@ -53,7 +53,7 @@ public interface Progress extends java.i public String getUnit(); /** - * Returns true if the progress staistics are approximate, for example if the total number of + * Returns true if the progress statistics are approximate, for example if the total number of * entities in the collection is not known. * * @return true if the statistics are approximate, false if they are exact Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java?rev=1461836&r1=1461835&r2=1461836&view=diff ============================================================================== --- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java (original) +++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/TCasToInlineXml.java Wed Mar 27 20:18:38 2013 @@ -90,7 +90,7 @@ public class TCasToInlineXml implements * CAS to generate from * @param aFilter * constraint that determines which annotations are included in the output. If null (or - * ommitted), all annotations are included. + * omitted), all annotations are included. */ public String generateXML(CAS aCAS, FSMatchConstraint aFilter) throws CASException { ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java?rev=1461836&r1=1461835&r2=1461836&view=diff ============================================================================== --- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java (original) +++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/java/org/apache/uima/util/XMLParser.java Wed Mar 27 20:18:38 2013 @@ -70,7 +70,7 @@ import org.w3c.dom.Element; public interface XMLParser { /** - * Enables or disables XML scheam validation. + * Enables or disables XML schema validation. * * @param aEnable * true to enable validation, false to disable validation @@ -819,7 +819,7 @@ public interface XMLParser { /** * Whether to expand <envVarRef>VARNAME</envVarRef> elements by substituting the - * value of the System proprery VARNAME. + * value of the System property VARNAME. */ public boolean expandEnvVarRefs; @@ -835,7 +835,7 @@ public interface XMLParser { * Whether to expand <xi:include> elements according to the XInclude spec. * @param aExpandEnvVarRefs * Whether to expand <envVarRef>VARNAME</envVarRef> elements by - * substituting the value of the System proprery VARNAME. + * substituting the value of the System property VARNAME. * @deprecated XInclude is no longer supported */ @Deprecated @@ -849,7 +849,7 @@ public interface XMLParser { * * @param aExpandEnvVarRefs * Whether to expand <envVarRef>VARNAME</envVarRef> elements by - * substituting the value of the System proprery VARNAME. + * substituting the value of the System property VARNAME. */ public ParsingOptions(boolean aExpandEnvVarRefs) { expandEnvVarRefs = aExpandEnvVarRefs; Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties?rev=1461836&r1=1461835&r2=1461836&view=diff ============================================================================== --- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties (original) +++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/main/resources/org/apache/uima/UIMAException_Messages.properties Wed Mar 27 20:18:38 2013 @@ -24,7 +24,7 @@ #----------------------------- #UIMARuntimeException #----------------------------- -cas_released_to_wrong_cas_manager = CasManager.release(CAS) was called with a CAS that does not belong \ +cas_released_to_wrong_cas_manager = CasManager.releaseCas(CAS) was called with a CAS that does not belong \ to this CasManager. uima_ecore_not_found = The Ecore model for the UIMA built-in types (uima.ecore) was not found in the classpath. Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/cas/impl/ ('svn:mergeinfo' removed) Modified: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java URL: http://svn.apache.org/viewvc/uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java?rev=1461836&r1=1461835&r2=1461836&view=diff ============================================================================== --- uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java (original) +++ uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java Wed Mar 27 20:18:38 2013 @@ -223,7 +223,7 @@ public class MetaDataObject_implTest ext // test special cases - // single-property object where propety name is ommitted from XML + // single-property object where propety name is omitted from XML String xmlStr = "<fruitBag><fruit><name>banana</name><color>yellow</color></fruit>" + "<fruit><name>raspberry</name><color>red</color></fruit></fruitBag>"; Document xmlDoc = docBuilder.parse(new ByteArrayInputStream(xmlStr.getBytes())); Propchange: uima/uimaj/branches/filteredCompress-uima-2498/uimaj-core/src/test/resources/ ('svn:mergeinfo' removed)
