svn commit: r1549655 - in /uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools: cpm/CpmPanel.java pear/install/InstallPear.java pear/merger/PMController.java pear/merger/PMUimaAgent.java

[sc...@apache.org]

Author: schor
Date: Mon Dec  9 19:25:25 2013
New Revision: 1549655

URL: http://svn.apache.org/r1549655
Log:
[UIMA-3484] javadoc fixes

Modified:
    uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java
    uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java
    uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMController.java
    uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java

Modified: uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java?rev=1549655&r1=1549654&r2=1549655&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/cpm/CpmPanel.java Mon Dec  9 19:25:25 2013
@@ -1885,7 +1885,7 @@ public class CpmPanel extends JPanel imp
   }
 
   /**
-   * MetaDataPanel used for Collection Reader & AE selection and configuration. Adds a reset method
+   * MetaDataPanel used for Collection Reader & AE selection and configuration. Adds a reset method
    * to clear out related components when specifier file selection changes.
    */
   static class ResetableMetaDataPanel extends MetaDataPanel {

Modified: uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java?rev=1549655&r1=1549654&r2=1549655&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java Mon Dec  9 19:25:25 2013
@@ -71,7 +71,7 @@ import org.apache.uima.tools.util.gui.Ab
 
 /**
  * This GUI is used to install a pear file locally in a directory chosen by the user and then run
- * the installed AE in CVD. <br />
+ * the installed AE in CVD. <br>
  * The required field is : The pear file must be specified. The User may or may not specify the
  * installation directory. If the installation directory is not specified, the current working
  * directory is used by default.

Modified: uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMController.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMController.java?rev=1549655&r1=1549654&r2=1549655&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMController.java (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMController.java Mon Dec  9 19:25:25 2013
@@ -126,7 +126,7 @@ public class PMController {
    * <ul>
    * <li>pear_file_1 ... pear_file_n - input PEAR files (required)</li>
    * <li>-n agg_name - a name of the output aggregate analysis engine (required) </li>
-   * <li>-f agg_pear_file - output aggregate PEAR file (optional). <br />
+   * <li>-f agg_pear_file - output aggregate PEAR file (optional). <br>
    * If the output PEAR file is not specified, the default output PEAR file is created in the
    * current working directory.</li>
     * </ul>

Modified: uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java?rev=1549655&r1=1549654&r2=1549655&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java (original)
+++ uima/uimaj/trunk/uimaj-tools/src/main/java/org/apache/uima/tools/pear/merger/PMUimaAgent.java Mon Dec  9 19:25:25 2013
@@ -181,17 +181,17 @@ public class PMUimaAgent {
   }
 
   /**
-   * Merges source <code>Capability<code> objects specified in a given 
-   * <code>ArrayList</code>, creating one <code>Capability<code> object 
+   * Merges source <code>Capability</code> objects specified in a given 
+   * <code>ArrayList</code>, creating one <code>Capability</code> object 
    * that contains all non-duplicated inputs and outputs of the source 
-   * <code>Capability<code> objects. Returns an array of 
-   * <code>Capability<code> objects, containing the merged object.
+   * <code>Capability</code> objects. Returns an array of 
+   * <code>Capability</code> objects, containing the merged object.
    * 
    * @param allCapabilities The given <code>ArrayList</code> of the source 
-   * <code>Capability<code> objects.
+   * <code>Capability</code> objects.
    * @param rsFactory The <code>ResourceSpecifierFactory</code> object 
-   * used to create new <code>Capability<code> object.
-   * @return Array of <code>Capability<code> objects, containing the merged 
+   * used to create new <code>Capability</code> object.
+   * @return Array of <code>Capability</code> objects, containing the merged 
    * object.
    */
   private static Capability[] mergeCapabilities(ArrayList allCapabilities,