You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2014/12/13 14:35:50 UTC

svn commit: r1645241 [2/2] - in /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: ./ analysis_engine/asb/impl/ analysis_engine/impl/ analysis_engine/impl/compatibility/ analysis_engine/metadata/impl/ analysis_engine/service/impl/ cas/ cas/imp...

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/collection/metadata/CpeDescription.java Sat Dec 13 13:35:48 2014
@@ -30,7 +30,7 @@ import org.xml.sax.SAXException;
  * Java representation of a Collection Processing Engine (CPE) XML descriptor. Generate an instance
  * of this class by calling either the
  * {@link org.apache.uima.util.XMLParser#parseCpeDescription(XMLInputSource)} or
- * {@link org.apache.uima.collection.impl.metadata.cpe.CpeDescriptorFactory#produceDescriptor()}. A
+ *        org.apache.uima.collection.impl.metadata.cpe.CpeDescriptorFactory#produceDescriptor(). A
  * CPE instance can then be created by calling
  * {@link org.apache.uima.UIMAFramework#produceCollectionProcessingEngine(CpeDescription)}.
  */

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/AnalysisSequenceCapabilityNode.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/AnalysisSequenceCapabilityNode.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/AnalysisSequenceCapabilityNode.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/AnalysisSequenceCapabilityNode.java Sat Dec 13 13:35:48 2014
@@ -127,6 +127,7 @@ public class AnalysisSequenceCapabilityN
 
   /**
    * Sets this node's Result Specificatoin.
+   * @param aResultSpec -
    */
   public void setResultSpec(ResultSpecification aResultSpec) {
     mResultSpec = aResultSpec;

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/CapabilityLanguageFlowObject.java Sat Dec 13 13:35:48 2014
@@ -108,6 +108,7 @@ public class CapabilityLanguageFlowObjec
    * 
    * @param aFlowTable
    *          a flow table
+   * @param aParentController -         
    */
   public CapabilityLanguageFlowObject(Map<String, List<AnalysisSequenceCapabilityNode>> aFlowTable, 
       CapabilityLanguageFlowController aParentController) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/flow/impl/FlowControllerContext_impl.java Sat Dec 13 13:35:48 2014
@@ -39,9 +39,11 @@ public class FlowControllerContext_impl
   private AnalysisEngineMetaData mAggregateMetadata;
 
   /**
-   * @param aParentContext
-   * @param aContextName
-   * @param aSofaMappings
+   * @param aParentContext -
+   * @param aContextName -
+   * @param aSofaMappings -
+   * @param aAnalysisEngineMetaDataMap -
+   * @param aAggregateMetadata -
    */
   public FlowControllerContext_impl(UimaContextAdmin aParentContext, String aContextName,
           Map<String, String> aSofaMappings, Map<String, AnalysisEngineMetaData> aAnalysisEngineMetaDataMap,

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/ChildUimaContext_impl.java Sat Dec 13 13:35:48 2014
@@ -126,7 +126,7 @@ public class ChildUimaContext_impl exten
   /**
    * Set the Pear resource manager, to be used instead of any
    * containing Resource Manager.
-   * @param resourceManager
+   * @param resourceManager -
    */
   public void setPearResourceManager(ResourceManager resourceManager) {
     mPearResourceManager = resourceManager;

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UIMAFramework_impl.java Sat Dec 13 13:35:48 2014
@@ -445,6 +445,10 @@ public class UIMAFramework_impl extends
    *           if the XML parser could not be configured
    * @throws SAXException
    *           if factoryConfig.xml could not be parsed
+   * @throws ClassNotFoundException -
+   * @throws IllegalAccessException -
+   * @throws InstantiationException -
+   * @throws IOException -
    */
   protected void parseFactoryConfig() throws ParserConfigurationException, SAXException,
           IOException, ClassNotFoundException, InstantiationException, IllegalAccessException {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/impl/UimaContext_ImplBase.java Sat Dec 13 13:35:48 2014
@@ -180,6 +180,8 @@ public abstract class UimaContext_ImplBa
   
   /**
    * Constructor for non Root instances
+   * @param contextName -
+   * @param sofaMappings -
    */
   public UimaContext_ImplBase(String contextName, Map<String, String> sofaMappings) {
     mQualifiedContextName = contextName;

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/AnalysisEnginePool.java Sat Dec 13 13:35:48 2014
@@ -138,6 +138,7 @@ public class AnalysisEnginePool {
 
   /**
    * Gets metadata for AnalysisEngines in this pool.
+   * @return -
    */
   public AnalysisEngineMetaData getMetaData() {
     return (AnalysisEngineMetaData) mPool.getMetaData();
@@ -148,6 +149,7 @@ public class AnalysisEnginePool {
    * This version only called for setResultSpecification called from an appl on the
    * MultiprocessingAnalysisEngine directly.  process(cas, result-spec) calls
    * setResultSpecification on the individual analysis engine from the pool.
+   * @param aResultSpec -
    */
   public void setResultSpecification(ResultSpecification aResultSpec) {
     
@@ -180,6 +182,7 @@ public class AnalysisEnginePool {
   
   /**
    * @see org.apache.uima.resource.ConfigurableResource#reconfigure()
+   * @throws ResourceConfigurationException -
    */
   public synchronized void reconfigure() throws ResourceConfigurationException {
     // reconfigure each AnalysisEngine in the pool
@@ -206,6 +209,7 @@ public class AnalysisEnginePool {
 
   /**
    * Calls batchProcessComplete on all AEs in pool.
+   * @throws AnalysisEngineProcessException -
    */
   public synchronized void batchProcessComplete() throws AnalysisEngineProcessException {
     List<AnalysisEngine> toRelease = new ArrayList<AnalysisEngine>();
@@ -230,6 +234,7 @@ public class AnalysisEnginePool {
 
   /**
    * Calls collectionProcessComplete on all AEs in pool.
+   * @throws AnalysisEngineProcessException -
    */
   public synchronized void collectionProcessComplete() throws AnalysisEngineProcessException {
     List<AnalysisEngine> toRelease = new ArrayList<AnalysisEngine>();
@@ -264,6 +269,7 @@ public class AnalysisEnginePool {
 
   /**
    * Sets logger for all AnalysisEngines in pool.
+   * @param aLogger -
    */
   public synchronized void setLogger(Logger aLogger) {
     List<AnalysisEngine> toRelease = new ArrayList<AnalysisEngine>();

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/CharArrayString.java Sat Dec 13 13:35:48 2014
@@ -344,9 +344,9 @@ public class CharArrayString {
   /**
    * A static method to compute the hash code for a character range in an array.
    * 
-   * @param charArray
-   * @param startPos
-   * @param endPos
+   * @param charArray -
+   * @param startPos -
+   * @param endPos -
    * @return The hash code.
    * @pre charArray != null
    * @pre startPos &ge; 0

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/InstrumentationFacility_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/InstrumentationFacility_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/InstrumentationFacility_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/InstrumentationFacility_impl.java Sat Dec 13 13:35:48 2014
@@ -73,6 +73,7 @@ public class InstrumentationFacility_imp
   /**
    * Sets the process trace object wrapped by this instrumentation facility. This is not part of the
    * InstrumentationFacility interface.
+   * @param aProcessTrace -
    */
   public void setProcessTrace(ProcessTrace aProcessTrace) {
     mProcessTrace = aProcessTrace;

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntBitSet.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntBitSet.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntBitSet.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntBitSet.java Sat Dec 13 13:35:48 2014
@@ -31,7 +31,7 @@ import java.util.NoSuchElementException;
  *   
  * This impl is for use in a single thread case only
  * 
- * This impl supports offset, to let this bit set store items in a range n -> n + small number
+ * This impl supports offset, to let this bit set store items in a range n &rarr; n + small number
  * 
  * If using offset, you must add ints in a range equal to or above the offset
  * 
@@ -99,8 +99,8 @@ public class IntBitSet implements Positi
    
   /**
    * 
-   * @param key
-   * @return
+   * @param key -
+   * @return -
    */
   @Override
   public boolean contains(int key) {
@@ -114,7 +114,7 @@ public class IntBitSet implements Positi
   }
   /**
    * 
-   * @param key
+   * @param original_key -
    * @return true if this set did not already contain the specified element
    */
   @Override
@@ -135,7 +135,7 @@ public class IntBitSet implements Positi
   
   /**
    * 
-   * @param key -
+   * @param original_key -
    * @return true if this key was removed, false if not present
    */
   @Override

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntHashSet.java Sat Dec 13 13:35:48 2014
@@ -118,8 +118,8 @@ public class IntHashSet implements Posit
    * The number is such that you could add this many elements without
    *   triggering the capacity expansion.
    *   
-   * @param numberOfElements
-   * @return
+   * @param numberOfElements -
+   * @return -
    */
   public int tableSpace(int numberOfElements) {
     return tableSpace(numberOfElements, loadFactor);
@@ -127,8 +127,8 @@ public class IntHashSet implements Posit
   
   /**
    * 
-   * @param numberOfElements
-   * @param factor
+   * @param numberOfElements -
+   * @param factor -
    * @return capacity of the main table (either 2 byte or 4 byte entries)
    */
   public static int tableSpace(int numberOfElements, Float factor) {
@@ -363,7 +363,7 @@ public class IntHashSet implements Posit
   
   /**
    * 
-   * @param key
+   * @param rawKey -
    * @return true if this set did not already contain the specified element
    */
   @Override
@@ -418,8 +418,8 @@ public class IntHashSet implements Posit
   /**
    * mostPositive and mostNegative are not updated
    *   for removes.  So these values may be inaccurate,
-   *   but mostPositive is always >= actual most positive,
-   *   and mostNegative is always <= actual most negative.
+   *   but mostPositive is always &gt;= actual most positive,
+   *   and mostNegative is always &lt;= actual most negative.
    * No conversion from int to short
    * @param rawKey -
    * @return true if the key was present
@@ -461,7 +461,7 @@ public class IntHashSet implements Posit
   
   /**
    * 
-   * @return a value that is >= the actual most positive value in the table.
+   * @return a value that is &gt;= the actual most positive value in the table.
    *   it will be == unless a remove operation has removed a most positive value
    */
   public int getMostPositive() {
@@ -470,7 +470,7 @@ public class IntHashSet implements Posit
   
   /**
    * 
-   * @return a value that is <= the actual least positive value in the table.
+   * @return a value that is &lt;= the actual least positive value in the table.
    *   It will be == unless remove operations has removed a least positive value.
    */
   public int getMostNegative() {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntSet.java Sat Dec 13 13:35:48 2014
@@ -95,7 +95,9 @@ public class IntSet implements PositiveI
     return this.iVec.get(n);
   }
 
-  /** Removes the <code>n</code>-th element in this set. */
+  /** Removes the <code>n</code>-th element in this set.
+   * @param n - 
+   * */
   public void removeElementAt(int n) {
     this.iVec.remove(n);
   }

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntStack.java Sat Dec 13 13:35:48 2014
@@ -33,13 +33,18 @@ public class IntStack extends IntVector
     super();
   }
 
-  /** Creates an empty stack. */
+  /** Creates an empty stack.
+   * @param capacity - 
+   * */
   public IntStack(int capacity) {
     super(capacity);
   }
 
   /**
    * Creates an empty stack with specified capacity, growth_factor and multiplication limit
+   * @param capacity -
+   * @param growth_factor -
+   * @param multiplication_limit -
    */
   public IntStack(int capacity, int growth_factor, int multiplication_limit) {
     super(capacity, growth_factor, multiplication_limit);

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/IntVector.java Sat Dec 13 13:35:48 2014
@@ -122,7 +122,7 @@ public class IntVector implements Serial
 
   /**
    * Add an array of elements to the end.
-   * @param elements
+   * @param elements -
    */
   public void add(int[] elements) {
     add(elements, 0, elements.length);
@@ -130,9 +130,9 @@ public class IntVector implements Serial
   
   /**
    * Add a slice of elements to the end
-   * @param elements
-   * @param startpos
-   * @param endpos
+   * @param elements -
+   * @param startpos -
+   * @param endpos -
    */
   public void add(int[] elements, int startpos, int endpos) {
     final int len = endpos - startpos;
@@ -145,6 +145,7 @@ public class IntVector implements Serial
   /**
    * Add an element at the end of vector. Behaves like add(Object o) of
    * {@link java.util.Vector Vector}.
+   * @param element -
    */
   public void add(int element) {
     final int i = this.pos;
@@ -164,6 +165,8 @@ public class IntVector implements Serial
    * Add an element at a certain position in the vector. Elements later in the vector are shifted
    * right by one. If the position is past the end of the current vector, new <code>0</code>-valued
    * elements are added.
+   * @param index -
+   * @param element -
    */
   public void add(int index, int element) {
     if (index >= this.pos) {
@@ -196,6 +199,8 @@ public class IntVector implements Serial
 
   /**
    * Set an element at a certain position in the vector.
+   * @param index -
+   * @param element -
    */
   public void set(int index, int element) {
     if (index >= this.pos) {
@@ -208,6 +213,8 @@ public class IntVector implements Serial
    * Set an element at a certain position in the vector. Vector will grow.
    * Not apparently used (2014)
    * Seems for purposes of having pairs of adjacent elements, (e.g. map).
+   * @param index -
+   * @param element -
    */
   public void put(int index, int element) {
     ensure_size(index + 1);
@@ -217,6 +224,7 @@ public class IntVector implements Serial
   /**
    * Retrieve the element at index.
    * 
+   * @param index -
    * @return The element at <code>index</code>.
    * @exception ArrayIndexOutOfBoundsException
    *              If <code>index</code> is not a valid index.
@@ -275,6 +283,7 @@ public class IntVector implements Serial
    * element in this <code>IntVector</code> is equal to the <i>n</i>-th element in <code>o</code>
    * for all <i>n</i> &lt; <code>this.size()</code>.
    * 
+   * @param o -
    * @return <code>true</code> if the <code>IntVector</code>s are equal, <code>false</code>
    *         otherwise.
    */
@@ -310,7 +319,7 @@ public class IntVector implements Serial
 
   /**
    * Tests if the specified <code>int</code> is a component of this <code>IntVector</code>.
-   * 
+   * @param elem -
    * @return <code>true</code> if and only if the <code>int</code> is an element of this
    *         <code>IntVector</code>, <code>false</code> otherwise.
    */
@@ -322,7 +331,7 @@ public class IntVector implements Serial
    * Return the position of the first occurrence of <code>elem</code> in the IntVector, if it
    * exists.
    * 
-   * @param elem
+   * @param elem 
    *          The element we're looking for.
    * @return The position, or <code>-1</code> if it doesn't exist.
    */
@@ -350,7 +359,7 @@ public class IntVector implements Serial
   }
 
   /**
-   * Return the underlying int array, where the length of the returned array is equal to the
+   * @return the underlying int array, where the length of the returned array is equal to the
    * vector's size. This is not a copy!
    */
   public int[] toArray() {
@@ -397,7 +406,7 @@ public class IntVector implements Serial
   }
 
   /**
-   * Return a copy of the underlying array.
+   * @return a copy of the underlying array.
    */
   public int[] toArrayCopy() {
     final int max = this.size();
@@ -406,14 +415,16 @@ public class IntVector implements Serial
     return copy;
   }
 
-  /** Return the internal array. */
+  /** Return the internal array. 
+   * @return - 
+   */
   public int[] getArray() {
     return this.array;
   }
 
   /**
    * Returns the index of the first occurrence of the element specified in this vector.
-   * 
+   * @param element -
    * @return the index or <code>-1</code> if the element was not found.
    */
   public int indexOf(int element) {
@@ -438,7 +449,7 @@ public class IntVector implements Serial
    * Exploit this by assuming ascending, and testing if the 
    * element is above or below the mid-element, and ordering the
    * direction of the search.
-   * 
+   * @param element -
    * @return the index or <code>-1</code> if the element was not found.
    */
   public int indexOfOptimizeAscending(int element) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/JmxMBeanAgent.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/JmxMBeanAgent.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/JmxMBeanAgent.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/JmxMBeanAgent.java Sat Dec 13 13:35:48 2014
@@ -38,7 +38,7 @@ public class JmxMBeanAgent {
    * 
    * @param aMBean
    *          the MBean to register
-   * @param aMBeanServer
+   * @param aMBeanServerO
    *          server to register with. If null, the platform MBeanServer will be used if we are
    *          running under Java 1.5. Earlier versions of Java did not have a platform MBeanServer;
    *          in that case, this method will do nothing.
@@ -93,7 +93,7 @@ public class JmxMBeanAgent {
    * 
    * @param aMBean
    *          the MBean to register
-   * @param aMBeanServer
+   * @param aMBeanServerO
    *          server to unregister from. If null, the platform MBeanServer will be used if we are
    *          running under Java 1.5. Earlier versions of Java did not have a platform MBeanServer;
    *          in that case, this method will do nothing.

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/PositiveIntSet.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/PositiveIntSet.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/PositiveIntSet.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/PositiveIntSet.java Sat Dec 13 13:35:48 2014
@@ -83,18 +83,21 @@ public interface PositiveIntSet {
   
   /**
    * For FSBagIndex low level iterator use
+   * @param position -
    * @return the position of the next element, or -1;
    */
   int moveToNext(int position);
   
   /**
    * For FSBagIndex low level iterator use
+   * @param position -
    * @return the position of the next element, or -1;
    */
   int moveToPrevious(int position);
 
   /**
    * For FSBagIndex low level iterator use
+   * @param position -
    * @return true if the position is between the first and last element inclusive.
    */
   boolean isValid(int position);

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/PositiveIntSet_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/PositiveIntSet_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/PositiveIntSet_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/PositiveIntSet_impl.java Sat Dec 13 13:35:48 2014
@@ -33,13 +33,13 @@ import java.util.NoSuchElementException;
  * Optimize for small sets 
  * 
  * Graceful degradation for completely random integer operations on large sets; 
- *   keep O(1) operations, at the expense of extra space (< 3 x size).
+ *   keep O(1) operations, at the expense of extra space (&lt; 3 x size).
  * 
  *   Uses several different representations depending on the range of ints stored and the total number of ints stored.
  *   
  *     Sizes:  Tiny, medium, large 
  *     Ranges: semi-knowable, unknowable;  
- *               if semi-knowable, dense, small-range (< 65K), large-range
+ *               if semi-knowable, dense, small-range (&lt; 65K), large-range
  *     
  *     For all sizes, 
  *       if dense, use IntBitSet (with offset)
@@ -48,7 +48,7 @@ import java.util.NoSuchElementException;
  *       For large, (implies large-range, too) use IntHashSet  
  *       
  *       For medium,
- *         if small-range < 65K, use IntHashSet with offset 
+ *         if small-range &lt; 65K, use IntHashSet with offset 
  *         else use IntHashSet 
  *   
  *   Arrange switching between representations
@@ -104,9 +104,6 @@ public class PositiveIntSet_impl impleme
    *           The next two params are used only if initialSize is not 0.
    * @param estMin - the estimated minimum int value to be added
    * @param estMax - the estimated max int value to be added
-   * @param isBitSetDense - true if we should use a bit set
-   * @param offsetFlag - a number >= 0, the offset to use, or -1 to automatically
-   *                 calculate the offset based on the initialSize
    */
   public PositiveIntSet_impl(int initialSize, int estMin, int estMax) {
     if (initialSize == 0) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/ReplaceStringInFiles.java Sat Dec 13 13:35:48 2014
@@ -64,13 +64,15 @@ public class ReplaceStringInFiles {
   }
 
   /**
-   * @return If the given string argument occurs as a substring, ignoring case, within the given
-   *         string object, then the index of the first character of the first such substring is
-   *         returned; if it does not occur as a substring, <code>-1</code> is returned.
    * @param mainStr
    *          The given string object.
    * @param argStr
    *          The given string argument.
+   * @param start -
+   * @param caseSensitive -
+   * @return If the given string argument occurs as a substring, ignoring case, within the given
+   *         string object, then the index of the first character of the first such substring is
+   *         returned; if it does not occur as a substring, <code>-1</code> is returned.
    */
   public static int indexOfCaseSensitive(String mainStr, String argStr, int start,
           boolean caseSensitive) {
@@ -96,6 +98,7 @@ public class ReplaceStringInFiles {
    * @param res
    *          The result object, containing the result string and the number of times replacement
    *          happened.
+   * @param caseSensitive -         
    */
   public static final void replaceStringInString(String text, String toReplace, String replacement,
           ReplacementResult res, boolean caseSensitive) {
@@ -125,6 +128,7 @@ public class ReplaceStringInFiles {
    *          String which should be replaced.
    * @param replacement
    *          String it should be replaced with.
+   * @param caseSensitive -         
    * @throws IOException
    *           Whenever anything goes wrong reading or writing a file.
    */
@@ -179,7 +183,7 @@ public class ReplaceStringInFiles {
    * Replace a certain string with other strings in files. Example usage:<br>
    * <code>java org.apache.uima.util.ReplaceStringInFile /home/tom/stuff .prop $ROOT$ /home/tom/root</code>
    * 
-   * @param args
+   * @param args dir, extension toreplace replacement [-ignorecase]
    */
   public static void main(String[] args) {
     if (args.length != 4 && args.length != 5) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/SortedIntSet.java Sat Dec 13 13:35:48 2014
@@ -58,7 +58,8 @@ public class SortedIntSet {
   }
 
   /**
-   * @return <code>true</code> iff <code>ele</code is contained in
+   * @param ele - 
+   * @return <code>true</code> iff <code>ele</code> is contained in
    *  the set.
    */
   public boolean contains(int ele) {
@@ -68,6 +69,7 @@ public class SortedIntSet {
   /**
    * Add element to set.
    * 
+   * @param ele - 
    * @return <code>true</code> iff <code>ele</code> was not already contained in the set.
    */
   public boolean add(int ele) {
@@ -81,7 +83,7 @@ public class SortedIntSet {
 
   /**
    * Remove element from set.
-   * 
+   * @param ele - 
    * @return <code>true</code> iff <code>ele</code> was actually contained in the set.
    */
   public boolean remove(int ele) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringUtils.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringUtils.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringUtils.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/StringUtils.java Sat Dec 13 13:35:48 2014
@@ -51,6 +51,7 @@ public class StringUtils {
    *          Number of spaces to print.
    * @param writer
    *          Writer to print to.
+   * @throws IOException -
    */
   public static final void printSpaces(int n, Writer writer) throws IOException {
     for (int i = 0; i < n; i++) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextStringTokenizer.java Sat Dec 13 13:35:48 2014
@@ -394,7 +394,7 @@ public class TextStringTokenizer {
 
   /**
    * Get the type of an individual character.
-   * 
+   * @param c -
    * @return The char type.
    */
   public int getCharType(char c) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/TextTokenizer.java Sat Dec 13 13:35:48 2014
@@ -119,7 +119,7 @@ public class TextTokenizer {
 
   /**
    * Construct a tokenizer from a Java string.
-   * 
+   * @param string - 
    * @pre string != null
    */
   public TextTokenizer(String string) {
@@ -128,6 +128,7 @@ public class TextTokenizer {
 
   /**
    * Set the flag for showing whitespace tokens.
+   * @param b -
    */
   public void setShowWhitespace(boolean b) {
     this.showWhitespace = b;
@@ -135,6 +136,7 @@ public class TextTokenizer {
 
   /**
    * Set the flag for showing separator tokens.
+   * @param b -
    */
   public void setShowSeparators(boolean b) {
     this.showSeparators = b;
@@ -142,6 +144,7 @@ public class TextTokenizer {
 
   /**
    * Set the set of sentence delimiters.
+   * @param chars -
    */
   public void setEndOfSentenceChars(String chars) {
     if (chars == null) {
@@ -152,6 +155,7 @@ public class TextTokenizer {
 
   /**
    * Add to the set of sentence delimiters.
+   * @param chars -
    */
   public void addToEndOfSentenceChars(String chars) {
     if (chars == null) {
@@ -162,6 +166,7 @@ public class TextTokenizer {
 
   /**
    * Set the set of separator characters.
+   * @param chars -
    */
   public void setSeparators(String chars) {
     if (chars == null) {
@@ -172,6 +177,7 @@ public class TextTokenizer {
 
   /**
    * Add to the set of separator characters.
+   * @param chars -
    */
   public void addSeparators(String chars) {
     if (chars == null) {
@@ -182,6 +188,7 @@ public class TextTokenizer {
 
   /**
    * Set the set of whitespace characters (in addition to the Unicode whitespace chars).
+   * @param chars -
    */
   public void setWhitespaceChars(String chars) {
     if (chars == null) {
@@ -192,6 +199,7 @@ public class TextTokenizer {
 
   /**
    * Add to the set of whitespace characters.
+   * @param chars -
    */
   public void addWhitespaceChars(String chars) {
     if (chars == null) {
@@ -202,6 +210,7 @@ public class TextTokenizer {
 
   /**
    * Set the set of word characters.
+   * @param chars -
    */
   public void setWordChars(String chars) {
     if (chars == null) {
@@ -212,6 +221,7 @@ public class TextTokenizer {
 
   /**
    * Add to the set of word characters.
+   * @param chars -
    */
   public void addWordChars(String chars) {
     if (chars == null) {
@@ -234,7 +244,7 @@ public class TextTokenizer {
   }
 
   /**
-   * Return <code>true</code> iff there is a next token.
+   * @return <code>true</code> iff there is a next token.
    */
   public boolean hasNext() {
     if (this.nextComputed) {
@@ -244,7 +254,8 @@ public class TextTokenizer {
   }
 
   /**
-   * Return the next token.
+   * @return the next token.
+   * 
    */
   public String nextToken() {
     computeNextToken();
@@ -339,6 +350,8 @@ public class TextTokenizer {
 
   /**
    * Get the type of an individual character.
+   * @param c -
+   * @return -
    */
   public int getCharType(char c) {
     // First, check user-defined lists in the order end-of-sentence

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UIMAClassLoader.java Sat Dec 13 13:35:48 2014
@@ -142,6 +142,9 @@ public class UIMAClassLoader extends URL
 
   /**
    * Do not use this factory method - throws unsupportedOperationException
+   * @param urls -
+   * @return -
+   * @throws UnsupportedOperationException -
    */
   public static URLClassLoader newInstance(final URL[] urls) {
     throw new UnsupportedOperationException();
@@ -149,6 +152,10 @@ public class UIMAClassLoader extends URL
 
   /**
    * Do not use this factory method - throws unsupportedOperationException
+   * @param urls -
+   * @param parent -
+   * @return -
+   * @throws UnsupportedOperationException -
    */
   public static URLClassLoader newInstance(final URL[] urls, final ClassLoader parent) {
     throw new UnsupportedOperationException();

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/UtilError.java Sat Dec 13 13:35:48 2014
@@ -106,6 +106,8 @@ public class UtilError extends RuntimeEx
    * they are specified in the message catalog (i.e. add %1 first, %2 next, and so on). Adding a
    * <code>null String</code> has no effect! So if you don't know the value of an argument, use
    * something like <code>""</code> or <code>"UNKNOWN"</code>, but not <code>null</code>.
+   * @param s -
+   * @return -
    */
   public boolean addArgument(String s) {
     int i = 0;

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/CompIntArrayRBT.java Sat Dec 13 13:35:48 2014
@@ -37,7 +37,8 @@ public class CompIntArrayRBT extends Int
   /**
    * Constructor for CompIntArrayRBT.
    * 
-   * @param initialSize
+   * @param comp -
+   * @param initialSize -
    */
   public CompIntArrayRBT(IntComparator comp, int initialSize) {
     super(initialSize);

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/Int2IntRBT.java Sat Dec 13 13:35:48 2014
@@ -291,7 +291,7 @@ public class Int2IntRBT extends IntArray
 
   /**
    * Get the value for a given key
-   * @param k
+   * @param k  -
    * @return the value
    */
   public int get(final int k) {
@@ -314,7 +314,8 @@ public class Int2IntRBT extends IntArray
    * adds a k, v pair.  
    *   if k already present, replaces v.
    *   returns previous value, or 0 if no prev value
-   * @param k
+   * @param k -
+   * @param v -
    * @return previous value or 0 if key not previously present
    */
   public int put(final int k, final int v) {
@@ -388,8 +389,9 @@ public class Int2IntRBT extends IntArray
    *   *** NOT THREAD SAFE ***
    *   
    *   Tries to shorten the search path, conditionally
+   *   @param k -
+   *   @return -
    */
-  
   protected int findKeyFast(final int k) {
     final int node;
     if (lastNodeGotten == NIL) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBT.java Sat Dec 13 13:35:48 2014
@@ -371,7 +371,7 @@ public class IntArrayRBT extends IntArra
   
   /**
    * like add, but returns boolean flag true if not present before
-   * @param k 
+   * @param k -
    * @return true if added (not present before)
    */
   public boolean addAdded(int k) {
@@ -544,7 +544,7 @@ public class IntArrayRBT extends IntArra
   
   /**
    * Method iterator.
-   * 
+   * @param comp comparator  
    * @return IntListIterator
    */
   public ComparableIntIterator iterator(IntComparator comp) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTcommon.java Sat Dec 13 13:35:48 2014
@@ -271,7 +271,7 @@ public class IntArrayRBTcommon {
    * For color (a boolean), the size for stopping doubling is 32 * 2 * 1024 * 1024,
    *   so the # of words is the same.
    * 
-   * @param requiredSize
+   * @param requiredSize -
    */
   
   protected void ensureCapacityKlrp(int requiredSize) {       
@@ -451,7 +451,8 @@ public class IntArrayRBTcommon {
   }
   
   /**
-   * Find the first node such that k &lt;= key[node].
+   * @param k -
+   * @return the first node such that k &lt;= key[node].
    */
   protected int findKey(final int k) {
     return findKeyDown(k, this.root);
@@ -474,6 +475,8 @@ public class IntArrayRBTcommon {
 
   /**
    * Find the node such that key[node] &ge; k and key[previous(node)] &lt; k.
+   * @param k -
+   * @return the node such that key[node] &ge; k and key[previous(node)] &lt; k.
    */
   public int findInsertionPointNoDups(final int k) {
     int node = this.root;

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/IntRedBlackTree.java Sat Dec 13 13:35:48 2014
@@ -99,6 +99,7 @@ public class IntRedBlackTree {
    * 
    * @param key
    *          The key to be deleted.
+   * @return -
    */
   public final int remove(int key) throws java.util.NoSuchElementException {
     IntRBTNode node = IntRBTNode.find(this.root, key);

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RBTKeyValuePair.java Sat Dec 13 13:35:48 2014
@@ -20,7 +20,7 @@
 package org.apache.uima.internal.util.rb_trees;
 
 /**
- * Part of map<int, T> RedBlackTree
+ * Part of map&lt;int, T&gt; RedBlackTree
  * 
  * Represents a key-value pair of a red-black tree.
  * 

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/rb_trees/RedBlackTree.java Sat Dec 13 13:35:48 2014
@@ -142,6 +142,7 @@ public class RedBlackTree<T> implements
    * 
    * @param key
    *          The key to be deleted.
+   * @return -         
    */
   public final T remove(int key) {
     RBTNode<T> node = RBTNode.find(this.root, key);
@@ -257,7 +258,7 @@ public class RedBlackTree<T> implements
   }
 
   /**
-   * Return a copy of the red-black tree as a BinaryTree. The node values are key-value pairs
+   * @return a copy of the red-black tree as a BinaryTree. The node values are key-value pairs
    * (RBTKeyValuePair).
    */
   public BinaryTree getBinaryTree() {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/JCas.java Sat Dec 13 13:35:48 2014
@@ -222,7 +222,7 @@ public interface JCas extends AbstractCa
 
   /**
    * Gets the document annotation. The object returned from this method can be typecast to
-   * {@link org.apache.uima.jcas.tcas.DocumentAnnotation}.
+   * org.apache.uima.jcas.tcas.DocumentAnnotation
    * <p>
    * The reason that the return type of this method is not DocumentAnnotation is because of problems
    * that arise when using the UIMA Extension ClassLoader to load annotator classes. The
@@ -638,7 +638,7 @@ public interface JCas extends AbstractCa
   // temporarily omitted to enable some testing without updating cas wrappers 
 /**
  * Call this method to set up a region, 
- * ended by a {@link FSsTobeAddedback.close()} call on the returned object,
+ * ended by a close() call on the returned object,
  * You can use this or the {@link #protectIndices(Runnable)} method to protected
  * the indices.
  * <p>

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasHashMap.java Sat Dec 13 13:35:48 2014
@@ -87,7 +87,7 @@ import org.apache.uima.jcas.cas.TOP_Type
  * The implementation works as follows:
  * <p>
  * 1) The JCasHashMap is split into "n" sub-maps.   
- *    The number is the number of cores, but grows more slowly as the # of cores > 16. 
+ *    The number is the number of cores, but grows more slowly as the # of cores &gt; 16. 
  *    This number can be specified, but this is not currently exposed in the tuning parameters
  *    Locking occurs on the sub-maps; the outer method calls are not synchronized
  * 2) The number of sub maps is rounded to a power of 2, to allow the low order bits of the hash of the key 

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/jcas/impl/JCasImpl.java Sat Dec 13 13:35:48 2014
@@ -510,7 +510,6 @@ public class JCasImpl extends AbstractCa
    * 
    * @param cl
    *                class loader to switch to 
-   * @throws CASException passthru
    */
   public void switchClassLoader(ClassLoader cl) {
 
@@ -711,6 +710,7 @@ public class JCasImpl extends AbstractCa
    * @param cas
    *                a CAS instance
    * @return newly created and initialized JCas
+   * @throws CASException -
    */
   public static JCas getJCas(CASImpl cas) throws CASException {
     JCasImpl jcas = new JCasImpl(cas);
@@ -1015,8 +1015,8 @@ public class JCasImpl extends AbstractCa
   /**
    * Internal - throw missing feature exception at runtime
    * 
-   * @param feat
-   * @param type
+   * @param feat -
+   * @param type -
    */
   public void throwFeatMissing(String feat, String type) {
     CASRuntimeException e = new CASRuntimeException(CASRuntimeException.INAPPROP_FEAT,
@@ -1054,9 +1054,9 @@ public class JCasImpl extends AbstractCa
 
   // * Implementation of part of the Cas interface as part of JCas*
 
-  /**
+  /*
    * (Internal Use only) called by the CAS reset function - clears the hashtable holding the
-   * associations.
+   * associations. 
    */
   public static void clearData(CAS cas) {
     JCasImpl jcas = (JCasImpl) ((CASImpl) cas).getExistingJCas();

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java Sat Dec 13 13:35:48 2014
@@ -301,6 +301,7 @@ public class CasManager_impl implements
    *          The CAS
    * @param requiredInterface
    *          interface to get. Currently must be one of CAS or JCas.
+   * @return -         
    */
   public static AbstractCas getCasInterfaceStatic(CAS cas, Class<? extends AbstractCas> requiredInterface) {
     if (requiredInterface == CAS.class) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java Sat Dec 13 13:35:48 2014
@@ -162,7 +162,7 @@ public class RelativePathResolver_impl i
     mClassLoader = aClassLoader;
   }
 
-  /**
+  /*
    * Utility method that checks to see if a file exists at the specified URL.
    */
   protected boolean fileExistsAtUrl(URL aUrl) {
@@ -183,7 +183,7 @@ public class RelativePathResolver_impl i
   }
 
   /**
-   * Gets the base URLs that were parsed from the data path.
+   * @return the base URLs that were parsed from the data path.
    */
   protected URL[] getBaseUrls() {
     return mBaseUrls;

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ResourceManager_impl.java Sat Dec 13 13:35:48 2014
@@ -158,6 +158,7 @@ public class ResourceManager_impl implem
   /**
    * Creates a new <code>ResourceManager_impl</code> with a custom ClassLoader to use for locating
    * resources.
+   * @param aClassLoader -
    */
   public ResourceManager_impl(ClassLoader aClassLoader) {
     mResourceMap = Collections.synchronizedMap(new HashMap<String, Object>());
@@ -190,8 +191,8 @@ public class ResourceManager_impl implem
   * things including the Component Description Editor when
   * obtaining info from CustomResourceSpecifiers
   * https://issues.apache.org/jira/browse/UIMA-1722
-  * @param uimaCL
-  * @param resolveResource
+  * @param uimaCL -
+  * @param resolveResource -
   */
  public synchronized void setExtensionClassPath(UIMAClassLoader uimaCL, boolean resolveResource) {
    this.uimaCL = uimaCL;

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_impl.java Sat Dec 13 13:35:48 2014
@@ -229,7 +229,7 @@ public class ConfigurationParameterDecla
   }
 
   /**
-   * @see ConfigurationParameterDeclarations#removeConfigurationParameter(.ConfigurationParameter)
+   * @see ConfigurationParameterDeclarations#removeConfigurationParameter(ConfigurationParameter)
    */
   public void removeCommonParameter(ConfigurationParameter aConfigurationParameter) {
     ConfigurationParameter[] current = getCommonParameters();
@@ -271,7 +271,7 @@ public class ConfigurationParameterDecla
     }
   }
 
-  /** Utility method */
+  /* Utility method */
   protected ConfigurationParameter _getConfigurationParameter(ConfigurationParameter[] aParams,
           String aName) {
     if (aParams != null) {
@@ -340,7 +340,7 @@ public class ConfigurationParameterDecla
    * 
    * 9/2013: superclasses don't have this method, so can't be overridden.
    * 9/2013: method never called
-   * 
+   * @return - 
    */
   protected String getXMLAttributeString() {
     StringBuffer buf = new StringBuffer();

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterSettings_impl.java Sat Dec 13 13:35:48 2014
@@ -96,7 +96,7 @@ public class ConfigurationParameterSetti
   }
 
   /**
-   * @see ConfigurationParameterSettings#getParameterValue(java.lang.String)
+   * @see ConfigurationParameterSettings#getParameterValue(String)
    */
   public Object getParameterValue(String aParamName) {
     NameValuePair[] nvps = getParameterSettings();
@@ -303,7 +303,7 @@ public class ConfigurationParameterSetti
    * Overridden to write the settingsForGroups property, whose value is a Map, which is not
    * supported by the default XMLization routines.
    * 
-   * @see MetaDataObject_impl#writePropertyAsElement(PropertyXmlInfo, String, ContentHandler)
+   * @see MetaDataObject_impl#writePropertyAsElement(PropertyXmlInfo, String)
    */
   @Override
   protected void writePropertyAsElement(PropertyXmlInfo aPropInfo, String aNamespace) throws SAXException {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/FsIndexKeyDescription_impl.java Sat Dec 13 13:35:48 2014
@@ -95,7 +95,7 @@ public class FsIndexKeyDescription_impl
    * Overridden to handle XML export of the <code>typePriority</code> and <code>comparator</code>
    * properties.
    * 
-   * @see MetaDataObject_impl#writePropertyAsElement(PropertyXmlInfo, String, ContentHandler)
+   * @see MetaDataObject_impl#writePropertyAsElement(PropertyXmlInfo, String)
    */
   @Override
   protected void writePropertyAsElement(PropertyXmlInfo aPropInfo, String aNamespace) throws SAXException {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MetaDataObject_impl.java Sat Dec 13 13:35:48 2014
@@ -757,7 +757,7 @@ public abstract class MetaDataObject_imp
 
   /**
    * Gets the hash code for this object. The hash codes of two NameClassPairs <code>x</code> and
-   * </code>y</code> must be equal if <code>x.equals(y)</code> returns true;
+   * <code>y</code> must be equal if <code>x.equals(y)</code> returns true;
    * 
    * @return the hash code for this object
    */
@@ -936,9 +936,8 @@ public abstract class MetaDataObject_imp
    *          information on how to represent the property in XML
    * @param aNamespace
    *          XML namespace URI for this object
-   * @param aContentHandler
-   *          content handler to which this object will send events that describe its XML
    *          representation
+   * @throws SAXException -
    */
   protected void writePropertyAsElement(PropertyXmlInfo aPropInfo, String aNamespace) throws SAXException {
     final SerialContext sc = serialContext.get();
@@ -1026,9 +1025,7 @@ public abstract class MetaDataObject_imp
    *          in which case each element will be assigned a value appropriate to its class.
    * @param aNamespace
    *          the XML namespace URI for this object
-   * @param aContentHandler
-   *          the ContentHandler to which this object will write events that describe its XML
-   *          representation
+   * @throws SAXException -         
    */
   protected void writeArrayPropertyAsElement(String aPropName, Class aPropClass, Object aValue,
           String aArrayElementTagName, String aNamespace)
@@ -1105,8 +1102,6 @@ public abstract class MetaDataObject_imp
    *          will be written as an empty element
    * @param aNamespace
    *          namespace for this object
-   * @param aContentHandler
-   *          ContentHandler to which this object will send events describing its XML representation
    * @throws SAXException  passthru       
    */
   protected void writeMapPropertyToXml(String aPropName, String aXmlElementName,
@@ -1263,6 +1258,7 @@ public abstract class MetaDataObject_imp
    *          parser to use to construct complex values
    * @param aOptions
    *          option settings
+   * @throws InvalidXMLException -         
    */
   protected void readPropertyValueFromXMLElement(PropertyXmlInfo aPropXmlInfo, Element aElement,
           XMLParser aParser, XMLParser.ParsingOptions aOptions) throws InvalidXMLException {
@@ -1322,6 +1318,7 @@ public abstract class MetaDataObject_imp
    *          parser to use to construct complex values
    * @param aOptions
    *          option settings
+   * @throws InvalidXMLException -         
    */
   protected void readArrayPropertyValueFromXMLElement(PropertyXmlInfo aPropXmlInfo,
           Class aPropClass, Element aElement, XMLParser aParser, XMLParser.ParsingOptions aOptions)
@@ -1417,6 +1414,7 @@ public abstract class MetaDataObject_imp
    *          DOM element to read from
    * @param aParser
    *          parser to use to construct complex values
+   * @param aOptions -
    * @param aKnownPropertyNames
    *          List of propertiees that we've already values for (these values will not be
    *          overwritten)
@@ -1496,6 +1494,7 @@ public abstract class MetaDataObject_imp
    * @param aValueIsArray
    *          true if the value of the map entires is an array. This method only supports
    *          homogeneous arrays.
+   * @throws InvalidXMLException -         
    */
   protected void readMapPropertyFromXml(String aPropName, Element aElement,
           String aKeyXmlAttribute, String aValueTagName, XMLParser aParser,
@@ -1559,7 +1558,7 @@ public abstract class MetaDataObject_imp
    * @param aPrimitiveType
    *          <code>Class</code> object representing a primitive type
    * 
-   * @return <code>Class</object> object representing the wrapper type for
+   * @return <code>Class</code> object representing the wrapper type for
    *     <code>PrimitiveType</code>.  If <code>aPrimitiveType</code> is not
    *     a primitive type, it is itself returned.
    */

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MimeTypePrecondition_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MimeTypePrecondition_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MimeTypePrecondition_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/MimeTypePrecondition_impl.java Sat Dec 13 13:35:48 2014
@@ -92,7 +92,9 @@ public class MimeTypePrecondition_impl e
   }
 
   /**
-   * This method throws UNSUPPORTED_METHOD 
+   * This method throws UNSUPPORTED_METHOD
+   * @param aKey -
+   * @throws UIMA_UnsupportedOperationException - 
    */
   public void setMetaDataKeyName(String aKey) {
     throw new UIMA_UnsupportedOperationException(

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/ResourceMetaData_impl.java Sat Dec 13 13:35:48 2014
@@ -398,6 +398,7 @@ public class ResourceMetaData_impl exten
 
   /**
    * Static method to get XmlizationInfo, used by subclasses to set up their own XmlizationInfo.
+   * @return -
    */
   protected static XmlizationInfo getXmlizationInfoForClass() {
     return XMLIZATION_INFO;

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeDescription_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeDescription_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeDescription_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypeDescription_impl.java Sat Dec 13 13:35:48 2014
@@ -59,6 +59,7 @@ public class TypeDescription_impl extend
    * 
    * @param aName
    *          name of the Type
+   * @param aDescription -
    * @param aSupertypeName
    *          name of the type's supertype
    */

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/TypePriorities_impl.java Sat Dec 13 13:35:48 2014
@@ -282,10 +282,10 @@ public class TypePriorities_impl extends
   }
 
   /**
-   * Overridden to supress <priorityLists> tag for TAF compatibility
+   * Overridden to supress &lt;priorityLists&gt; tag for TAF compatibility
    * 
    * @see MetaDataObject_impl#writePropertyAsElement(org.apache.uima.resource.metadata.impl.PropertyXmlInfo,
-   *      java.lang.String, org.xml.sax.ContentHandler)
+   *      java.lang.String)
    */
   @Override
   protected void writePropertyAsElement(PropertyXmlInfo aPropInfo, String aNamespace) throws SAXException {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/service/impl/ResourceService_impl.java Sat Dec 13 13:35:48 2014
@@ -50,6 +50,7 @@ public class ResourceService_impl {
    *          for this service.
    * @param aResourceInitParams
    *          additional parameters to be passed on to the Resource Factory.
+   * @throws ResourceInitializationException - 
    */
   public void initialize(ResourceSpecifier aResourceSpecifier, Map<String, Object> aResourceInitParams)
           throws ResourceInitializationException {
@@ -60,7 +61,8 @@ public class ResourceService_impl {
 
   /**
    * Gets metadata for this Resource service.
-   * 
+   * @return -
+   * @throws ResourceServiceException -
    */
   public ResourceMetaData getMetaData() throws ResourceServiceException {
     return getResource().getMetaData();

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/impl/Filter_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/impl/Filter_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/impl/Filter_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/search/impl/Filter_impl.java Sat Dec 13 13:35:48 2014
@@ -47,8 +47,8 @@ public class Filter_impl extends MetaDat
   }
 
   /**
-   * @param aSyntax
-   * @param aExpression
+   * @param aSyntax -
+   * @param aExpression -
    */
   public Filter_impl(String aSyntax, String aExpression) {
     setSyntax(aSyntax);

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/OptimizeStrings.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/OptimizeStrings.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/OptimizeStrings.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/OptimizeStrings.java Sat Dec 13 13:35:48 2014
@@ -139,7 +139,7 @@ public class OptimizeStrings {
   /**
    * null strings not added
    * 0 length strings added
-   * @param s
+   * @param s -
    */
   public void add(String s) {
     if (inStrings.size() == (Integer.MAX_VALUE -1)) {
@@ -189,7 +189,7 @@ public class OptimizeStrings {
   /**
    * return a string which is made as a substring of the common string
    * 
-   * @param s
+   * @param s -
    * @return an equal string, made as substring of common string instance
    *         equal results return the same string
    */
@@ -220,8 +220,8 @@ public class OptimizeStrings {
   }
   
   /**
-   * given an index (not offset) to the sorted strings, 
-   * return the index of the segment it belongs to
+   * @param index an index (not offset) to the sorted strings, 
+   * @return the index of the segment it belongs to
    */
   public int getCommonStringIndex(int index) {
     for (int i = 0; i < lastIndexInCommonStringsA.length; i++) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTraceEvent_impl.java Sat Dec 13 13:35:48 2014
@@ -102,7 +102,7 @@ public class ProcessTraceEvent_impl impl
   }
 
   /**
-   * Sets the component name for this event
+   * @param aName the component name for this event
    */
   public void setComponentName(String aName) {
     mComponentName = aName;
@@ -116,7 +116,7 @@ public class ProcessTraceEvent_impl impl
   }
 
   /**
-   * Sets the type of this event
+   * @param aType the type of this event
    */
   public void setType(String aType) {
     mType = aType;
@@ -130,7 +130,7 @@ public class ProcessTraceEvent_impl impl
   }
 
   /**
-   * Sets the description for this event
+   * @param aDescription the description for this event
    */
   public void setDescription(String aDescription) {
     mDescription = aDescription;
@@ -144,14 +144,14 @@ public class ProcessTraceEvent_impl impl
   }
 
   /**
-   * Sets the duration for this event
+   * @param aDuration the duration for this event
    */
   public void setDuration(int aDuration) {
     mDuration = aDuration;
   }
 
   /**
-   * Adds to the duration of this event
+   * @param aAdditionalDuration Adds this to the duration of this event
    */
   public void addToDuration(long aAdditionalDuration) {
     mDuration += aAdditionalDuration;
@@ -165,7 +165,7 @@ public class ProcessTraceEvent_impl impl
   }
 
   /**
-   * Sets the Result Message for this event
+   * @param aResultMessage the Result Message for this event
    */
   public void setResultMessage(String aResultMessage) {
     mResultMessage = aResultMessage;
@@ -183,7 +183,7 @@ public class ProcessTraceEvent_impl impl
   }
 
   /**
-   * Adds a sub-event to this event.
+   * @param aEvent Adds this sub-event to this event.
    */
   public void addSubEvent(ProcessTraceEvent aEvent) {
     if (mSubEvents == null) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/ProcessTrace_impl.java Sat Dec 13 13:35:48 2014
@@ -328,7 +328,11 @@ public class ProcessTrace_impl implement
   }
 
   /**
-   * Utility method used by getEventsByComponentName(String)
+   * Utility method used by getEventsByComponentName(String)   * 
+   * @param aEvent -
+   * @param aComponentName -
+   * @param aRecurseAfterMatch -
+   * @param aResultList -
    */
   protected void getEventsByComponentName(ProcessTraceEvent aEvent, String aComponentName,
           boolean aRecurseAfterMatch, List<ProcessTraceEvent> aResultList) {
@@ -347,6 +351,11 @@ public class ProcessTrace_impl implement
 
   /**
    * Utility method used by getEventsByType(String)
+   * 
+   * @param aEvent -
+   * @param aType -
+   * @param aRecurseAfterMatch -
+   * @param aResultList -
    */
   protected void getEventsByType(ProcessTraceEvent aEvent, String aType,
           boolean aRecurseAfterMatch, List<ProcessTraceEvent> aResultList) {
@@ -363,7 +372,7 @@ public class ProcessTrace_impl implement
     }
   }
 
-  /**
+  /*
    * Utility method used by aggregate(ProcessTrace)
    */
   protected <T extends ProcessTraceEvent> T findCorrespondingEvent(List<T> aEventList, T aEvent) {
@@ -378,7 +387,7 @@ public class ProcessTrace_impl implement
     return null;
   }
 
-  /**
+  /*
    * Utility method used by aggregate(ProcessTrace)
    */
   protected void aggregateEvent(ProcessTraceEvent_impl aDest, ProcessTraceEvent_impl aSrc) {

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SerializationMeasures.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SerializationMeasures.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SerializationMeasures.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/SerializationMeasures.java Sat Dec 13 13:35:48 2014
@@ -77,7 +77,7 @@ public class SerializationMeasures {
    *     - the aux heaps
    *     - the string offsets, the string lengths
    *     
-   * Heap: xxxx  [name-of-delta: [Total: <TotalBytes>(negative%)  Histo: a(neg%) b(neg%) c(neg%) d(neg%) e(neg%)]]
+   * Heap: xxxx  [name-of-delta: [Total: &lt;TotalBytes&gt;(negative%)  Histo: a(neg%) b(neg%) c(neg%) d(neg%) e(neg%)]]
     *   2 styles: one uses only one counter, no delta  - used for byte, short, and long heaps
     *   other is for main heap, uses 4 deltas.
    *
@@ -170,7 +170,7 @@ public class SerializationMeasures {
     
     /**
      * v is the number of bytes to incr counter 0 by
-     * @param v
+     * @param v -
      */
     public void incrNoCompression(int v) {
       c[bytesPerCount - 1] += v;
@@ -344,7 +344,7 @@ public class SerializationMeasures {
 
   /**
    * accumulate results for multiple files
-   * @param o
+   * @param o -
    */
   public void accum(SerializationMeasures o) {
     int i = 0;

Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java?rev=1645241&r1=1645240&r2=1645241&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/util/impl/XMLParser_impl.java Sat Dec 13 13:35:48 2014
@@ -275,7 +275,7 @@ public class XMLParser_impl implements X
    * 
    * @return an <code>XMLizable</code> object constructed from the DOM element
    * 
-   * @throws InvaidXMLException
+   * @throws InvalidXMLException
    *           if the XML element does not specify a valid object
    */
   public XMLizable buildObject(Element aElement) throws InvalidXMLException {
@@ -290,7 +290,7 @@ public class XMLParser_impl implements X
    * 
    * @return an <code>XMLizable</code> object constructed from the DOM element
    * 
-   * @throws InvaidXMLException
+   * @throws InvalidXMLException
    *           if the XML element does not specify a valid object
    */
   public XMLizable buildObject(Element aElement, ParsingOptions aOptions)