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 2016/11/13 16:08:26 UTC

svn commit: r1769510 [6/8] - in /uima/uimaj/branches/experiment-v3-jcas: uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/ uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/ uimaj-component-test-util/src/main/java/org/ap...

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Jg.java Sun Nov 13 16:08:24 2016
@@ -73,6 +73,7 @@ import org.apache.uima.util.InvalidXMLEx
 import org.apache.uima.util.XMLInputSource;
 import org.apache.uima.util.XMLizable;
 
+// TODO: Auto-generated Javadoc
 /**
  * Class holds type plugin-wide collections and static methods. Also implements the runnable that is
  * called to do the processing
@@ -81,17 +82,26 @@ import org.apache.uima.util.XMLizable;
 public class Jg {
 
   /**
-   * Interface implemeted by JCAS code generation's templates
-   *
+   * Interface implemeted by JCAS code generation's templates.
    */
   public interface IJCasTypeTemplate {
+    
+    /**
+     * Generate.
+     *
+     * @param argument the argument
+     * @return the string
+     */
     public String generate(Object argument);
   }
 
+  /** The Constant jControlModel. */
   static final String jControlModel = "jMergeCtl.xml";
 
+  /** The Constant featureDescriptionArray0. */
   static final FeatureDescription[] featureDescriptionArray0 = new FeatureDescription[0];
 
+  /** The Constant reservedFeatureNames. */
   static final Collection reservedFeatureNames = new ArrayList();
   {
 
@@ -117,11 +127,13 @@ public class Jg {
    */
   static final Set noGenTypes = new HashSet();
 
+  /** The Constant casCreateProperties. */
   public static final Properties casCreateProperties = new Properties();
   static {
     casCreateProperties.setProperty(UIMAFramework.CAS_INITIAL_HEAP_SIZE, "200");
   }
 
+  /** The Constant extendableBuiltInTypes. */
   static final Map extendableBuiltInTypes = new HashMap();
 
   // create a hash map of built-in types, where the
@@ -130,8 +142,10 @@ public class Jg {
   // representing the features. These will be merged with the
   // specified features. Supertype features are not included.
 
+  /** The Constant emptyFds. */
   static final FeatureDescription[] emptyFds = new FeatureDescription[0];
 
+  /** The built in type system. */
   static TypeSystem builtInTypeSystem;
 
   static {
@@ -167,7 +181,7 @@ public class Jg {
       for (int i = 0; i < features.size(); i++) {
         FeatureDescription fd = UIMAFramework.getResourceSpecifierFactory()
                 .createFeatureDescription();
-        Feature f = (Feature) features.get(i);
+        Feature f = features.get(i);
         fd.setName(f.getShortName());
         fd.setRangeTypeName(f.getRange().getName());
         fds[i] = fd;
@@ -176,14 +190,28 @@ public class Jg {
     }
   }
 
+  /** The built in types. */
   // table builtInTypes initialized inside TypeInfo constructor
   static Map<String, TypeInfo> builtInTypes = new HashMap<>();
 
+  /**
+   * Adds the built in type info.
+   *
+   * @param casName the cas name
+   * @param javaName the java name
+   * @param casElementName the cas element name
+   */
   static private void addBuiltInTypeInfo(String casName, String javaName, String casElementName) {
     TypeInfo ti = new TypeInfo(casName, javaName, casElementName);
     builtInTypes.put(casName, ti);
   }
 
+  /**
+   * Adds the built in type info.
+   *
+   * @param casName the cas name
+   * @param javaName the java name
+   */
   static private void addBuiltInTypeInfo(String casName, String javaName) {
     addBuiltInTypeInfo(casName, javaName, null);
   }
@@ -236,6 +264,7 @@ public class Jg {
     addBuiltInTypeInfo("uima.cas.Sofa", "org.apache.uima.jcas.cas.Sofa");
   }
 
+  /** The resource bundle. */
   // Resource bundle.
   private static ResourceBundle resourceBundle;
   static {
@@ -247,48 +276,72 @@ public class Jg {
     }
   }
 
+  /** The imports. */
   // Instance fields
   final Map imports = new HashMap(); // can't be final - one per instance running
 
+  /** The imports. */
   final Map _imports = new HashMap();
 
+  /** The class path. */
   String classPath = "";
 
+  /** The xml source file name. */
   String xmlSourceFileName;
 
+  /** The cas. */
   CAS cas;
 
+  /** The gui. */
   GUI gui;
 
+  /** The merger. */
   IMerge merger;
 
+  /** The progress monitor. */
   IProgressMonitor progressMonitor;
 
+  /** The error. */
   public IError error; // referenced by the plugin
 
+  /** The waiter. */
   Waiter waiter;
 
+  /** The package name. */
   String packageName;
 
+  /** The simple class name. */
   String simpleClassName;
 
+  /** The type system. */
   private TypeSystem typeSystem = null;
 
+  /** The cas string type. */
   private Type casStringType;
 
+  /** The tcas annotation type. */
   private Type tcasAnnotationType;
 
+  /** The merged types adding features. */
   private Map<String, Set<String>> mergedTypesAddingFeatures = new TreeMap<String, Set<String>>(); // a Map of types and the xml files that were merged to create them 
 
+  /** The project path dir. */
   private String projectPathDir;  
 
+  /** The limit J cas gen to project scope. */
   private boolean limitJCasGenToProjectScope;
 
+  /**
+   * Instantiates a new jg.
+   */
   public Jg() { // default constructor
   }
 
   /**
    * Returns the string from the plugin's resource bundle, or 'key' if not found.
+   *
+   * @param key the key
+   * @return the resource string
    */
   public String getResourceString(String key) {
     ResourceBundle bundle = getResourceBundle();
@@ -299,23 +352,40 @@ public class Jg {
     }
   }
 
+  /**
+   * Gets the string.
+   *
+   * @param key the key
+   * @param substitutions the substitutions
+   * @return the string
+   */
   public String getString(String key, Object[] substitutions) {
     return MessageFormat.format(getResourceString(key), substitutions);
   }
 
   /**
-   * Returns the plugin's resource bundle,
+   * Returns the plugin's resource bundle,.
+   *
+   * @return the resource bundle
    */
   public ResourceBundle getResourceBundle() {
     return resourceBundle;
   }
 
+  /**
+   * The Class ErrorExit.
+   */
   public static class ErrorExit extends RuntimeException {
+    
+    /** The Constant serialVersionUID. */
     private static final long serialVersionUID = -3314235749649859540L;
   }
 
   // ************
   // * driveGui *
+  /**
+   * Drive gui.
+   */
   // ************
   public void driveGui() {
     // usingGui = true;
@@ -341,12 +411,29 @@ public class Jg {
     waiter.waitforGUI();
   }
 
+  /**
+   * The main method.
+   *
+   * @param args the arguments
+   */
   // exits with -1 if failure
   public static void main(String[] args) {
     int rc = (new Jg()).main0(args, null, null, new LogThrowErrorImpl());
     System.exit(rc);
   }
 
+  /**
+   * Main for cde.
+   *
+   * @param aMerger the a merger
+   * @param aProgressMonitor the a progress monitor
+   * @param aError the a error
+   * @param inputFile the input file
+   * @param outputDirectory the output directory
+   * @param tds the tds
+   * @param aCas the a cas
+   * @throws IOException Signals that an I/O exception has occurred.
+   */
   public void mainForCde(IMerge aMerger, IProgressMonitor aProgressMonitor, IError aError,
           String inputFile, String outputDirectory, TypeDescription[] tds, CASImpl aCas)
           throws IOException {
@@ -354,6 +441,21 @@ public class Jg {
                inputFile, outputDirectory, tds, aCas, "", false, null);
   }
   
+  /**
+   * Main for cde.
+   *
+   * @param aMerger the a merger
+   * @param aProgressMonitor the a progress monitor
+   * @param aError the a error
+   * @param inputFile the input file
+   * @param outputDirectory the output directory
+   * @param tds the tds
+   * @param aCas the a cas
+   * @param projectPathDir the project path dir
+   * @param limitJCasGenToProjectScope the limit J cas gen to project scope
+   * @param mergedTypesAddingFeatures the merged types adding features
+   * @throws IOException Signals that an I/O exception has occurred.
+   */
   public void mainForCde(IMerge aMerger, IProgressMonitor aProgressMonitor, IError aError,
           String inputFile, String outputDirectory, TypeDescription[] tds, CASImpl aCas, 
           String projectPathDir, boolean limitJCasGenToProjectScope, 
@@ -373,6 +475,22 @@ public class Jg {
     }    
   }
 
+  /**
+   * Main generate all types from templates.
+   *
+   * @param aMerger the a merger
+   * @param aProgressMonitor the a progress monitor
+   * @param aError the a error
+   * @param inputFile the input file
+   * @param outputDirectory the output directory
+   * @param tds the tds
+   * @param aCas the a cas
+   * @param jcasTypeClass the jcas type class
+   * @param jcas_TypeClass the jcas type class
+   * @throws IOException Signals that an I/O exception has occurred.
+   * @throws InstantiationException the instantiation exception
+   * @throws IllegalAccessException the illegal access exception
+   */
   // use template classes to generate code
   public void mainGenerateAllTypesFromTemplates(IMerge aMerger, IProgressMonitor aProgressMonitor,
       IError aError, String inputFile, String outputDirectory, TypeDescription[] tds,
@@ -384,6 +502,24 @@ public class Jg {
              jcasTypeClass, "", false, null);
   }
   
+  /**
+   * Main generate all types from templates.
+   *
+   * @param aMerger the a merger
+   * @param aProgressMonitor the a progress monitor
+   * @param aError the a error
+   * @param inputFile the input file
+   * @param outputDirectory the output directory
+   * @param tds the tds
+   * @param aCas the a cas
+   * @param jcasTypeClass the jcas type class
+   * @param projectPathDir the project path dir
+   * @param limitJCasGenToProjectScope the limit J cas gen to project scope
+   * @param mergedTypesAddingFeatures the merged types adding features
+   * @throws IOException Signals that an I/O exception has occurred.
+   * @throws InstantiationException the instantiation exception
+   * @throws IllegalAccessException the illegal access exception
+   */
   public void mainGenerateAllTypesFromTemplates(IMerge aMerger, IProgressMonitor aProgressMonitor,
           IError aError, String inputFile, String outputDirectory, TypeDescription[] tds,
           CASImpl aCas, Class jcasTypeClass, // Template class
@@ -402,6 +538,15 @@ public class Jg {
     generateAllTypesFromTemplates(outputDirectory, tds, aCas, jcasTypeClass);
   }
 
+  /**
+   * Main 0.
+   *
+   * @param args the args
+   * @param aMerger the a merger
+   * @param aProgressMonitor the a progress monitor
+   * @param aError the a error
+   * @return the int
+   */
   public int main0(String[] args, IMerge aMerger, IProgressMonitor aProgressMonitor, IError aError) {
     this.merger = aMerger;
     this.error = aError;
@@ -432,7 +577,9 @@ public class Jg {
    *   -jcasgenoutput  xxxx
    *   -jcasgenclasspath xxxx
    *   
-   * @param arguments
+   *
+   * @param arguments the arguments
+   * @return the int
    */
   public int main1(String[] arguments) {
     boolean hadError = false;
@@ -583,6 +730,12 @@ public class Jg {
     return (hadError) ? -1 : 0;    
   }
 
+  /**
+   * Make merge message.
+   *
+   * @param m the m
+   * @return the string
+   */
   // message: TypeName = ".....", URLs defining this type = "xxxx", "xxxx", ....
   private String makeMergeMessage(Map m) {
     StringBuffer sb = new StringBuffer();
@@ -607,6 +760,17 @@ public class Jg {
     return sb.toString();
   }
 
+  /**
+   * Generate all types from templates.
+   *
+   * @param outputDirectory the output directory
+   * @param tds the tds
+   * @param aCas the a cas
+   * @param jcasTypeClass the jcas type class
+   * @throws IOException Signals that an I/O exception has occurred.
+   * @throws InstantiationException the instantiation exception
+   * @throws IllegalAccessException the illegal access exception
+   */
   // This is also the interface for CDE
   private void generateAllTypesFromTemplates(String outputDirectory, TypeDescription[] tds,
           CASImpl aCas, Class jcasTypeClass) throws IOException,
@@ -712,7 +876,11 @@ public class Jg {
   /**
    * return true if td is not defined in this project, of
    *   it is defined, but is also in merged and any of the other
-   *   merged urls are not defined in this project
+   *   merged urls are not defined in this project.
+   *
+   * @param td the td
+   * @param projectDirPath the project dir path
+   * @return true, if is out of scope
    */
   private boolean isOutOfScope(TypeDescription td, String projectDirPath) {
     URI typeDefinitionUri;
@@ -776,15 +944,13 @@ public class Jg {
   }
   
   /**
-   *  Generate type classes from the specified templates
+   *  Generate type classes from the specified templates.
+   *
    * @param td                        TypeDescription object
    * @param outputDirectory           output directory
    * @param jcasTypeInstance          Template instance used to generate class
-   * @param jcas_TypeInstance         Template instance used to generate class
-   * @throws IOException -
-   * @throws InstantiationException -
-   * @throws IllegalAccessException -
    * @return void
+   * @throws IOException -
    */
   private void generateClassesFromTemplate(TypeDescription td, String outputDirectory,
           IJCasTypeTemplate jcasTypeInstance)
@@ -797,10 +963,22 @@ public class Jg {
 //        this, td }), getJavaName_Type(td), merger);
   }
 
+  /**
+   * Gets the pkg.
+   *
+   * @param td the td
+   * @return the pkg
+   */
   String getPkg(TypeDescription td) {
     return getPkg(td.getName());
   }
 
+  /**
+   * Gets the pkg.
+   *
+   * @param nameWithPkg the name with pkg
+   * @return the pkg
+   */
   String getPkg(String nameWithPkg) {
     int lastDot = nameWithPkg.lastIndexOf('.');
     if (lastDot >= 0)
@@ -808,6 +986,17 @@ public class Jg {
     return "";
   }
 
+  /**
+   * Generate class.
+   *
+   * @param progressMonitorGenerateClass the progress monitor generate class
+   * @param outputDirectory the output directory
+   * @param td the td
+   * @param sourceContents the source contents
+   * @param className the class name
+   * @param mergerGenerateClass the merger generate class
+   * @throws IOException Signals that an I/O exception has occurred.
+   */
   private void generateClass(IProgressMonitor progressMonitorGenerateClass, String outputDirectory,
           TypeDescription td, String sourceContents, String className, IMerge mergerGenerateClass)
           throws IOException {
@@ -838,6 +1027,12 @@ public class Jg {
     }
   }
 
+  /**
+   * Removes the pkg.
+   *
+   * @param name the name
+   * @return the string
+   */
   public static String removePkg(String name) {
     int lastDot = name.lastIndexOf('.');
     String simpleName = name;
@@ -851,6 +1046,12 @@ public class Jg {
   // * goes into generated Cas get/set *
   // **************************************************
 
+  /**
+   * Sc.
+   *
+   * @param v the v
+   * @return the string
+   */
   String sc(String v) {
     // return part of word that goes in calls like get<insert>Value
     // input is Java type spec
@@ -876,30 +1077,66 @@ public class Jg {
   // * Functions that convert between CAS fully-qualified names and Java names.
   // * Handles both import issues and switching packages for some built-ins.
 
+  /**
+   * Gets the java pkg.
+   *
+   * @param td the td
+   * @return the java pkg
+   */
   String getJavaPkg(TypeDescription td) {
-    TypeInfo bi = (TypeInfo) Jg.builtInTypes.get(td.getName());
+    TypeInfo bi = Jg.builtInTypes.get(td.getName());
     if (null == bi)
       return getPkg(td);
     return getPkg(bi.javaNameWithPkg);
   }
 
+  /**
+   * Gets the java name with pkg.
+   *
+   * @param casTypeName the cas type name
+   * @return the java name with pkg
+   */
   String getJavaNameWithPkg(String casTypeName) {
-    TypeInfo bi = (TypeInfo) Jg.builtInTypes.get(casTypeName);
+    TypeInfo bi = Jg.builtInTypes.get(casTypeName);
     return (null == bi) ? casTypeName : bi.javaNameWithPkg;
   }
 
+  /**
+   * Checks for pkg prefix.
+   *
+   * @param name the name
+   * @return true, if successful
+   */
   boolean hasPkgPrefix(String name) {
     return name.lastIndexOf('.') >= 0;
   }
 
+  /**
+   * Gets the java name.
+   *
+   * @param td the td
+   * @return the java name
+   */
   String getJavaName(TypeDescription td) {
     return getJavaName(td.getName());
   }
 
+  /**
+   * Gets the java name type.
+   *
+   * @param td the td
+   * @return the java name type
+   */
   String getJavaName_Type(TypeDescription td) {
     return getJavaName(td) + "_Type";
   }
 
+  /**
+   * Gets the java name.
+   *
+   * @param name the name
+   * @return the java name
+   */
   String getJavaName(String name) {
 
     if (!hasPkgPrefix(name))
@@ -913,6 +1150,7 @@ public class Jg {
     return javaNameWithPkg;
   }
 
+  /** The non importable java names. */
   private static ArrayList nonImportableJavaNames = new ArrayList(8);
   static {
     nonImportableJavaNames.add("String");
@@ -925,6 +1163,12 @@ public class Jg {
     nonImportableJavaNames.add("double");
   }
 
+  /**
+   * Collect import.
+   *
+   * @param casName the cas name
+   * @param _Type the type
+   */
   void collectImport(String casName, boolean _Type) {
     if (!hasPkgPrefix(casName))
       return;
@@ -947,6 +1191,13 @@ public class Jg {
     }
   }
 
+  /**
+   * Collect imports.
+   *
+   * @param td the td
+   * @param _Type the type
+   * @return the collection
+   */
   Collection collectImports(TypeDescription td, boolean _Type) {
     if (_Type)
       _imports.clear();
@@ -975,6 +1226,12 @@ public class Jg {
     return (_Type) ? _imports.values() : imports.values();
   }
 
+  /**
+   * Gets the java range type.
+   *
+   * @param fd the fd
+   * @return the java range type
+   */
   String getJavaRangeType(FeatureDescription fd) {
     String rangeTypeNameCAS = fd.getRangeTypeName();
     if (null != typeSystem) {
@@ -987,6 +1244,12 @@ public class Jg {
     return getJavaName(rangeTypeNameCAS);
   }
 
+  /**
+   * Checks if is sub type of annotation.
+   *
+   * @param td the td
+   * @return true, if is sub type of annotation
+   */
   boolean isSubTypeOfAnnotation(TypeDescription td) {
     if (null == cas)
       return false;
@@ -996,13 +1259,25 @@ public class Jg {
     return typeSystem.subsumes(tcasAnnotationType, type);
   }
 
+  /**
+   * Checks for array range.
+   *
+   * @param fd the fd
+   * @return true, if successful
+   */
   boolean hasArrayRange(FeatureDescription fd) {
-    TypeInfo bi = (TypeInfo) Jg.builtInTypes.get(fd.getRangeTypeName());
+    TypeInfo bi = Jg.builtInTypes.get(fd.getRangeTypeName());
     if (null == bi)
       return false;
     return bi.isArray;
   }
   
+  /**
+   * Checks if is possible index key.
+   *
+   * @param fd the fd
+   * @return true, if is possible index key
+   */
   boolean isPossibleIndexKey(FeatureDescription fd) {
     String rangeTypeName = fd.getRangeTypeName();
     // keys are primitives + string + string subtypes
@@ -1012,6 +1287,12 @@ public class Jg {
            BuiltinTypeKinds.primitiveTypeNames_contains(rangeTypeName);  // includes String
   }
   
+  /**
+   * Checks if is string subtype.
+   *
+   * @param fd the fd
+   * @return true, if is string subtype
+   */
   boolean isStringSubtype(FeatureDescription fd) {
     if (null != typeSystem) {
       String rangeTypeName = fd.getRangeTypeName();
@@ -1021,9 +1302,15 @@ public class Jg {
     return false;
   }
 
+  /**
+   * Gets the java range array element type.
+   *
+   * @param fd the fd
+   * @return the java range array element type
+   */
   String getJavaRangeArrayElementType(FeatureDescription fd) {
     String arrayElementCasNameWithNameSpace = fd.getElementType();
-    TypeInfo bi = (TypeInfo) Jg.builtInTypes.get(fd.getRangeTypeName());
+    TypeInfo bi = Jg.builtInTypes.get(fd.getRangeTypeName());
     if (null == bi) {
       if (null == arrayElementCasNameWithNameSpace)
         return "";
@@ -1037,17 +1324,35 @@ public class Jg {
 
   // **************************************************
   // * uc1(featurename) make uppercase feature name for use by getters/setters
+  /**
+   * Uc 1.
+   *
+   * @param name the name
+   * @return the string
+   */
   // **************************************************
   String uc1(String name) { // upper case first letter
     return name.substring(0, 1).toUpperCase() + name.substring(1);
   }
 
+  /**
+   * Gets the date.
+   *
+   * @return the date
+   */
   String getDate() {
     return (new Date()).toString();
   }
 
   // *******************************
   // * castResult *
+  /**
+   * Cast result.
+   *
+   * @param resultType the result type
+   * @param core the core
+   * @return the string
+   */
   // *******************************
   String castResult(String resultType, String core) {
     if ("Feature".equals(sc(resultType)) && resultType != null
@@ -1063,7 +1368,8 @@ public class Jg {
   // range = Feature, String, Float, Int
 
   /**
-   * 
+   * Wrap to get FS.
+   *
    * @param core string representing the get or set code
    * @param range Boolean, Byte, Short, Int, Long, Float, Double, String, or Feature
    * @return -
@@ -1075,12 +1381,12 @@ public class Jg {
   }
 
   /**
-   * 
+   * Simple core.
+   *
    * @param get_set get or set
    * @param range Boolean, Byte, Short, Int, Long, Float, Double, String, or Feature
    * @param fname feature name (e.g. "begin"
-   * @param tname_Type _type name 
-   * @return
+   * @return the string
    */
   String simpleCore(String get_set, String range, String fname) {
     String v = ", v";
@@ -1093,6 +1399,14 @@ public class Jg {
         ((get_set.equals("set")) ? v : "") + ")";
   }
 
+  /**
+   * Simple LL core.
+   *
+   * @param get_set the get set
+   * @param range the range
+   * @param fname the fname
+   * @return the string
+   */
   String simpleLLCore(String get_set, String range, String fname) {
     String v = ", v";
     // if (get_set.equals("set") && range.equals("Feature"))
@@ -1104,13 +1418,13 @@ public class Jg {
   // return string that starts with FS whose value is not an array object, but
   // a normal CAS type, one of whose features is the array object
   /**
-   * 
+   * Array core.
+   *
    * @param get_set  get or set
    * @param range the component range: Boolean, Byte, Short, Int, Long, Float, Double, String, Feature
-   * @param arrayRange: BooleanArray, ByteArray, ShortArray, IntegerArray, LongArray, FloatArray, DoubleArray, StringArray, JavaObjectArray, FSArray  
-   * @param fname
-   * @param tname_Type
-   * @return
+   * @param arrayRange the array range
+   * @param fname the fname
+   * @return the string
    */
   String arrayCore(String get_set, String range, String arrayRange, String fname) {
     String v = ", v";
@@ -1121,52 +1435,119 @@ public class Jg {
         "(i" + ((get_set.equals("set")) ? v : "") + ")"; 
   }
 
+  /**
+   * Array LL core.
+   *
+   * @param get_set the get set
+   * @param range the range
+   * @param fname the fname
+   * @return the string
+   */
   String arrayLLCore(String get_set, String range, String fname) {
     String v = ", v";
     return "ll_cas.ll_" + get_set + range + "ArrayValue(" + simpleLLCore("get", "Feature", fname)
             + ", i" + ((get_set.equals("set")) ? v : "") + ")";
   }
 
+  /**
+   * Array LL core chk.
+   *
+   * @param get_set the get set
+   * @param range the range
+   * @param fname the fname
+   * @return the string
+   */
   String arrayLLCoreChk(String get_set, String range, String fname) {
     String v = ", v";
     return "ll_cas.ll_" + get_set + range + "ArrayValue(" + simpleLLCore("get", "Feature", fname)
             + ", i" + ((get_set.equals("set")) ? v : "") + ", true)";
   }
 
+  /**
+   * Gets the feature value.
+   *
+   * @param fd the fd
+   * @param td the td
+   * @return the feature value
+   */
   String getFeatureValue(FeatureDescription fd, TypeDescription td) {
     String getSetNamePart = getGetSetNamePart(fd);
     String core = simpleCore("get", getSetNamePart, fd.getName());
     return castResult(getJavaRangeType(fd), core);
   }
 
+  /**
+   * Sets the feature value.
+   *
+   * @param fd the fd
+   * @param td the td
+   * @return the string
+   */
   String setFeatureValue(FeatureDescription fd, TypeDescription td) {
     return simpleCore("set", getGetSetNamePart(fd), fd.getName());
   }
 
+  /**
+   * Gets the array feature value.
+   *
+   * @param fd the fd
+   * @param td the td
+   * @return the array feature value
+   */
   String getArrayFeatureValue(FeatureDescription fd, TypeDescription td) {
     String getSetArrayNamePart = getGetSetArrayNamePart(fd);
     String core = arrayCore("get", getSetArrayNamePart, getJavaRangeType(fd), fd.getName());
     return castResult(getJavaRangeArrayElementType(fd), core);
   }
 
+  /**
+   * Sets the array feature value.
+   *
+   * @param fd the fd
+   * @param td the td
+   * @return the string
+   */
   String setArrayFeatureValue(FeatureDescription fd, TypeDescription td) {
     return arrayCore("set", getGetSetArrayNamePart(fd), getJavaRangeType(fd), fd.getName());
   }
 
+  /**
+   * Gets the gets the set name part.
+   *
+   * @param fd the fd
+   * @return the gets the set name part
+   */
   String getGetSetNamePart(FeatureDescription fd) {
     return sc(getJavaRangeType(fd));
   }
 
+  /**
+   * Gets the gets the set array name part.
+   *
+   * @param fd the fd
+   * @return the gets the set array name part
+   */
   String getGetSetArrayNamePart(FeatureDescription fd) {
     return sc(getJavaRangeArrayElementType(fd));
   }
 
+  /**
+   * Null blank.
+   *
+   * @param s the s
+   * @return the string
+   */
   String nullBlank(String s) {
     if (null == s)
       return "";
     return s;
   }
 
+  /**
+   * Creates the resource manager.
+   *
+   * @return the resource manager
+   */
   public ResourceManager createResourceManager() {
     ResourceManager resourceManager = UIMAFramework.newDefaultResourceManager();
 
@@ -1178,6 +1559,13 @@ public class Jg {
     return resourceManager;
   }
 
+  /**
+   * Merge type system imports.
+   *
+   * @param tsd the tsd
+   * @return the type system description
+   * @throws ResourceInitializationException the resource initialization exception
+   */
   private TypeSystemDescription mergeTypeSystemImports(TypeSystemDescription tsd)
           throws ResourceInitializationException {
     Collection tsdc = new ArrayList(1);
@@ -1188,6 +1576,13 @@ public class Jg {
     return mergedTsd;
   }
 
+  /**
+   * Sets the difference.
+   *
+   * @param newFeatures the new features
+   * @param alreadyDefinedFeatures the already defined features
+   * @return the list
+   */
   List setDifference(FeatureDescription[] newFeatures, FeatureDescription[] alreadyDefinedFeatures) {
     List result = new ArrayList();
     outerLoop: for (int i = 0; i < newFeatures.length; i++) {
@@ -1200,6 +1595,13 @@ public class Jg {
     return result;
   }
 
+  /**
+   * Checks if is same feature description.
+   *
+   * @param f1 the f 1
+   * @param f2 the f 2
+   * @return true, if is same feature description
+   */
   private boolean isSameFeatureDescription(FeatureDescription f1, FeatureDescription f2) {
     if (!f2.getName().equals(f1.getName()))
       return false;
@@ -1208,6 +1610,13 @@ public class Jg {
     return true;
   }
   
+  /**
+   * Gets the check suffix.
+   *
+   * @param get_set the get set
+   * @param range the range
+   * @return the check suffix
+   */
   private String getCheckSuffix(String get_set, String range) {
     if (get_set.equals("get")) return "Nc";
     

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/LogThrowErrorImpl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/LogThrowErrorImpl.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/LogThrowErrorImpl.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/LogThrowErrorImpl.java Sun Nov 13 16:08:24 2016
@@ -24,7 +24,13 @@ import org.apache.uima.tools.jcasgen.Jg.
 import org.apache.uima.util.Level;
 import org.apache.uima.util.Logger;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class LogThrowErrorImpl.
+ */
 public class LogThrowErrorImpl implements IError {
+  
+  /** The log levels. */
   private static Level logLevels[] = { Level.INFO, Level.WARNING, Level.SEVERE };
 
   /*
@@ -32,6 +38,7 @@ public class LogThrowErrorImpl implement
    * 
    * @see org.apache.uima.jcas.jcasgen_gen.IError#newError(int, java.lang.String)
    */
+  @Override
   public void newError(int severity, String message, Exception exception) {
     Logger log = UIMAFramework.getLogger();
     log.log(logLevels[severity], "JCasGen: " + message, exception);

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Prefs.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Prefs.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Prefs.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Prefs.java Sun Nov 13 16:08:24 2016
@@ -21,9 +21,20 @@ package org.apache.uima.tools.jcasgen;
 
 import java.util.prefs.Preferences;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class Prefs.
+ */
 public class Prefs {
+  
+  /** The Constant prefs. */
   static final Preferences prefs = Preferences.userRoot().node("org/apache/uima/tools/JCasGen");
 
+  /**
+   * Sets the.
+   *
+   * @param gui the gui
+   */
   static void set(GUI gui) {
     prefs.putInt("WindowPos X", gui.getLocation().x);
     prefs.putInt("WindowPos Y", gui.getLocation().y);
@@ -33,6 +44,11 @@ public class Prefs {
     prefs.put("inFile", gui.pnG.tfInputFileName.getText());
   }
 
+  /**
+   * Gets the.
+   *
+   * @param gui the gui
+   */
   static void get(GUI gui) {
     gui.setBounds(prefs.getInt("WindowPos X", 200), prefs.getInt("WindowPos Y", 200), prefs.getInt(
             "WindowW", 520), prefs.getInt("WindowH", 400));

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/TypeInfo.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/TypeInfo.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/TypeInfo.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/TypeInfo.java Sun Nov 13 16:08:24 2016
@@ -19,20 +19,36 @@
 
 package org.apache.uima.tools.jcasgen;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class TypeInfo.
+ */
 public class TypeInfo {
 
+  /** The xml name. */
   String xmlName;
 
+  /** The java name with pkg. */
   String javaNameWithPkg;
 
+  /** The java name. */
   String javaName; // name without package prefix if in this package
 
+  /** The is array. */
   boolean isArray = false;
 
+  /** The array el name with pkg. */
   String arrayElNameWithPkg;
 
+  /** The used. */
   boolean used = false;
 
+  /**
+   * Instantiates a new type info.
+   *
+   * @param xmlName the xml name
+   * @param javaName the java name
+   */
   TypeInfo(String xmlName, String javaName) {
     this.xmlName = xmlName;
     this.javaNameWithPkg = javaName;
@@ -41,6 +57,13 @@ public class TypeInfo {
     this.arrayElNameWithPkg = "";
   }
 
+  /**
+   * Instantiates a new type info.
+   *
+   * @param xmlName the xml name
+   * @param javaName the java name
+   * @param arrayElNameWithPkg the array el name with pkg
+   */
   TypeInfo(String xmlName, String javaName, String arrayElNameWithPkg) {
     this(xmlName, javaName);
     if (null != arrayElNameWithPkg) {

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/UimaLoggerProgressMonitor.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/UimaLoggerProgressMonitor.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/UimaLoggerProgressMonitor.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/UimaLoggerProgressMonitor.java Sun Nov 13 16:08:24 2016
@@ -22,22 +22,47 @@ package org.apache.uima.tools.jcasgen;
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.util.Level;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class UimaLoggerProgressMonitor.
+ */
 public class UimaLoggerProgressMonitor implements IProgressMonitor {
 
+  /* (non-Javadoc)
+   * @see org.apache.uima.tools.jcasgen.IProgressMonitor#beginTask(java.lang.String, int)
+   */
+  @Override
   public void beginTask(String name, int totalWork) { // do nothing
   }
 
+  /* (non-Javadoc)
+   * @see org.apache.uima.tools.jcasgen.IProgressMonitor#done()
+   */
+  @Override
   public void done() {
     UIMAFramework.getLogger().log(Level.INFO, " ** JCasGen Done.");
   }
 
+  /* (non-Javadoc)
+   * @see org.apache.uima.tools.jcasgen.IProgressMonitor#subTask(java.lang.String)
+   */
+  @Override
   public void subTask(String message) {
     UIMAFramework.getLogger().log(Level.INFO, " >>JCasGen " + message);
   }
 
+  /* (non-Javadoc)
+   * @see org.apache.uima.tools.jcasgen.IProgressMonitor#worked(int)
+   */
+  @Override
   public void worked(int work) { // do nothing
   }
 
+  /**
+   * Internal worked.
+   *
+   * @param work the work
+   */
   /*
    * (non-Javadoc)
    * 
@@ -46,6 +71,11 @@ public class UimaLoggerProgressMonitor i
   public void internalWorked(double work) { // do nothing
   }
 
+  /**
+   * Checks if is canceled.
+   *
+   * @return true, if is canceled
+   */
   /*
    * (non-Javadoc)
    * 
@@ -55,6 +85,11 @@ public class UimaLoggerProgressMonitor i
     return false;
   }
 
+  /**
+   * Sets the canceled.
+   *
+   * @param value the new canceled
+   */
   /*
    * (non-Javadoc)
    * 
@@ -63,6 +98,11 @@ public class UimaLoggerProgressMonitor i
   public void setCanceled(boolean value) { // do nothing
   }
 
+  /**
+   * Sets the task name.
+   *
+   * @param name the new task name
+   */
   /*
    * (non-Javadoc)
    * 

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Waiter.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Waiter.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Waiter.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/jcasgen/Waiter.java Sun Nov 13 16:08:24 2016
@@ -19,11 +19,21 @@
 
 package org.apache.uima.tools.jcasgen;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class Waiter.
+ */
 public class Waiter {
+  
+  /** The woke up intentionally. */
   private boolean wokeUpIntentionally = false;
 
+  /** The wait object. */
   private final Object waitObject = new Object();
 
+  /**
+   * Waitfor GUI.
+   */
   void waitforGUI() {
     synchronized (waitObject) {
       wokeUpIntentionally = false;
@@ -38,6 +48,9 @@ public class Waiter {
     }
   }
 
+  /**
+   * Finished.
+   */
   void finished() {
     synchronized (waitObject) {
       wokeUpIntentionally = true;

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPear.java Sun Nov 13 16:08:24 2016
@@ -32,7 +32,6 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.jar.JarFile;
 import java.util.prefs.Preferences;
@@ -69,6 +68,7 @@ import org.apache.uima.tools.cvd.MainFra
 import org.apache.uima.tools.images.Images;
 import org.apache.uima.tools.util.gui.AboutDialog;
 
+// TODO: Auto-generated Javadoc
 /**
  * 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>
@@ -78,6 +78,8 @@ import org.apache.uima.tools.util.gui.Ab
  * 
  */
 public class InstallPear extends JFrame {
+  
+  /** The Constant serialVersionUID. */
   private static final long serialVersionUID = -450696952085640703L;
 
   /**
@@ -85,8 +87,11 @@ public class InstallPear extends JFrame
    * installation.
    */
   protected static class RunInstallation implements Runnable {
+    
+    /** The pear file. */
     private File pearFile;
 
+    /** The installation dir. */
     private File installationDir = null;
 
     /**
@@ -105,6 +110,7 @@ public class InstallPear extends JFrame
     /**
      * Runs the PEAR installation process. Notifies waiting threads upon completion.
      */
+    @Override
     public void run() {
       installPear(pearFile, installationDir);
       synchronized (this) {
@@ -119,17 +125,22 @@ public class InstallPear extends JFrame
    * '.pear' files.
    */
   protected static class PEARFilter extends FileFilter {
+    
+    /** The Constant TEAR_EXT. */
     static final String TEAR_EXT = "tear";
 
+    /** The Constant PEAR_EXT. */
     static final String PEAR_EXT = "pear";
 
     /**
      * Returns <code>true</code>, if the given input file is directory or has 'tear' or 'pear'
      * extension, <code>false</code> otherwise.
-     * 
+     *
+     * @param file the file
      * @return <code>true</code>, if the given input file is directory or has 'tear' or 'pear'
      *         extension, <code>false</code> otherwise.
      */
+    @Override
     public boolean accept(File file) {
       if (file.isDirectory())
         return true;
@@ -159,6 +170,7 @@ public class InstallPear extends JFrame
      * 
      * @return The filter description.
      */
+    @Override
     public String getDescription() {
       return "PEAR files";
     }
@@ -166,60 +178,87 @@ public class InstallPear extends JFrame
 
   // private JPanel aboutMenuItemPanel = null;
 
+  /** The pear file text field. */
   private JTextField pearFileTextField = null;
 
+  /** The browse button. */
   private JButton browseButton = null;
 
+  /** The install dir text field. */
   private static JTextField installDirTextField = null;
 
+  /** The browse dir button. */
   private JButton browseDirButton = null;
 
+  /** The install button. */
   private JButton installButton = null;
 
+  /** The menu bar. */
   private JMenuBar menuBar = null;
 
+  /** The file menu item. */
   private JMenuItem fileMenuItem = null;
 
+  /** The help menu item. */
   private JMenuItem helpMenuItem = null;
 
+  /** The about menu item. */
   private JMenuItem aboutMenuItem = null;
 
+  /** The file menu. */
   private JMenu fileMenu = null;
 
+  /** The help menu. */
   private JMenu helpMenu = null;
 
   // private JLabel bannerLabel = null;
 
+  /** The run button. */
   private static JButton runButton = null;
 
+  /** The help button. */
   private JButton helpButton = null;
 
+  /** The pear console. */
   private static JTextArea pearConsole = null;
 
+  /** The j scroll pane. */
   private static JScrollPane jScrollPane = null;
 
+  /** The local tear file. */
   private static File localTearFile = null;
 
+  /** The installation dir. */
   private static File installationDir = null;
 
+  /** The main component id. */
   private static String mainComponentId;
 
+  /** The insd object. */
   private static InstallationDescriptor insdObject;
 
+  /** The main component root path. */
   private static String mainComponentRootPath;
 
+  /** The help exists. */
   private static boolean helpExists = true;
 
+  /** The message. */
   private static String message = null;
 
+  /** The error flag. */
   private static boolean errorFlag = false;
 
+  /** The user prefs. */
   private static Preferences userPrefs;
 
+  /** The Constant LAST_FILE_NAME_CHOOSEN_KEY. */
   private static final String LAST_FILE_NAME_CHOOSEN_KEY = "LAST_FILE_NAME_CHOOSEN";
 
+  /** The Constant LAST_DIRECTORY_CHOOSEN_KEY. */
   private static final String LAST_DIRECTORY_CHOOSEN_KEY = "LAST_DIRECTORY_CHOOSEN";
 
+  /** The Constant SET_ENV_FILE. */
   private static final String SET_ENV_FILE = "metadata/setenv.txt";
 
   // protected static final String UIMA_HOME_ENV = "UIMA_HOME";
@@ -356,10 +395,12 @@ public class InstallPear extends JFrame
             localPearFile, installationDir);
     // adding installation controller message listener
     installationController.addMsgListener(new MessageRouter.StdChannelListener() {
+      @Override
       public void errMsgPosted(String errMsg) {
         printInConsole(true, errMsg);
       }
 
+      @Override
       public void outMsgPosted(String outMsg) {
         printInConsole(false, outMsg);
       }
@@ -418,15 +459,13 @@ public class InstallPear extends JFrame
 
   /**
    * This method runs the installed AE in CVD (Gladis).
-   * 
-   * @throws IOException
-   *           If any I/O exception occurred.
    */
   private void runCVD() {
 
     
     Runnable runCVD = new Runnable() {
 
+      @Override
       public void run() {
         try {
           // create PackageBrowser object
@@ -476,6 +515,7 @@ public class InstallPear extends JFrame
       // hazel's change
       pearFileTextField.setLayout(new BorderLayout());
       pearFileTextField.addActionListener(new java.awt.event.ActionListener() {
+        @Override
         public void actionPerformed(java.awt.event.ActionEvent e) {
           if (e.getSource() instanceof JTextField) {
             pearFileTextField = (JTextField) e.getSource();
@@ -492,10 +532,12 @@ public class InstallPear extends JFrame
       });
 
       this.pearFileTextField.getDocument().addDocumentListener(new DocumentListener() {
+        @Override
         public void changedUpdate(DocumentEvent e) {
           // do nothing
         }
 
+        @Override
         public void insertUpdate(DocumentEvent e) {
           InstallPear.runButton.setEnabled(false);
           String inputPear = InstallPear.this.pearFileTextField.getText();
@@ -504,6 +546,7 @@ public class InstallPear extends JFrame
           }
         }
 
+        @Override
         public void removeUpdate(DocumentEvent e) {
           InstallPear.runButton.setEnabled(false);
           String inputPear = InstallPear.this.pearFileTextField.getText();
@@ -529,6 +572,7 @@ public class InstallPear extends JFrame
       browseButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
       browseButton.setMnemonic('b');
       browseButton.addActionListener(new java.awt.event.ActionListener() {
+        @Override
         public void actionPerformed(java.awt.event.ActionEvent e) {
           String pear = null;
           if ((e.getActionCommand().equals("Browse..."))) {
@@ -555,6 +599,7 @@ public class InstallPear extends JFrame
       installDirTextField.isEditable();
       // handling text input
       installDirTextField.addActionListener(new java.awt.event.ActionListener() {
+        @Override
         public void actionPerformed(java.awt.event.ActionEvent e) {
           if (e.getSource() instanceof JTextField) {
             runButton.setEnabled(false);
@@ -567,14 +612,17 @@ public class InstallPear extends JFrame
       });
 
       installDirTextField.getDocument().addDocumentListener(new DocumentListener() {
+        @Override
         public void changedUpdate(DocumentEvent e) {
           // do nothing
         }
 
+        @Override
         public void insertUpdate(DocumentEvent e) {
           runButton.setEnabled(false);
         }
 
+        @Override
         public void removeUpdate(DocumentEvent e) {
           runButton.setEnabled(false);
         }
@@ -599,6 +647,7 @@ public class InstallPear extends JFrame
       browseDirButton.setMnemonic('d');
       browseDirButton.setEnabled(true);
       browseDirButton.addActionListener(new java.awt.event.ActionListener() {
+        @Override
         public void actionPerformed(java.awt.event.ActionEvent e) {
           String dir = null;
           File installationDir = null;
@@ -634,6 +683,7 @@ public class InstallPear extends JFrame
       installButton.setRolloverEnabled(true);
       // Handling mouse click event
       installButton.addActionListener(new java.awt.event.ActionListener() {
+        @Override
         public void actionPerformed(java.awt.event.ActionEvent e) {
           if (e.getActionCommand().equals("Install")) {
             localTearFile = new File(pearFileTextField.getText());
@@ -675,6 +725,7 @@ public class InstallPear extends JFrame
       runButton.setMnemonic('r');
       runButton.setRolloverEnabled(true);
       runButton.addActionListener(new java.awt.event.ActionListener() {
+        @Override
         public void actionPerformed(java.awt.event.ActionEvent e) {
           if (e.getActionCommand().equals("Run your AE in the CAS Visual Debugger")) {
             installButton.setEnabled(false);
@@ -752,6 +803,7 @@ public class InstallPear extends JFrame
       helpButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
       helpButton.setMnemonic('h');
       helpButton.addActionListener(new java.awt.event.ActionListener() {
+        @Override
         public void actionPerformed(java.awt.event.ActionEvent e) {
           if (e.getActionCommand() == "Help") {
             try {
@@ -811,6 +863,7 @@ public class InstallPear extends JFrame
     // System.exit(0);
     // }
     SwingUtilities.invokeLater(new Runnable() {
+      @Override
       public void run() {
         createAndShowGUI();
       }
@@ -841,6 +894,7 @@ public class InstallPear extends JFrame
     fileMenuItem.setMnemonic('e');
     menuBar.add(fileMenu);
     fileMenuItem.addActionListener(new ActionListener() {
+      @Override
       public void actionPerformed(ActionEvent e) {
         System.exit(0);
       }
@@ -856,6 +910,7 @@ public class InstallPear extends JFrame
     helpMenuItem.setMnemonic('h');
     menuBar.add(helpMenu);
     helpMenuItem.addActionListener(new ActionListener() {
+      @Override
       public void actionPerformed(ActionEvent e) {
         if (e.getActionCommand() == "Help") {
           try {
@@ -884,6 +939,7 @@ public class InstallPear extends JFrame
     });
 
     aboutMenuItem.addActionListener(new ActionListener() {
+      @Override
       public void actionPerformed(ActionEvent e) {
         if (e.getActionCommand() == "About") {
           AboutDialog dialog = new AboutDialog(InstallPear.this, "About PEAR Installer");

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPearCli.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPearCli.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPearCli.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/pear/install/InstallPearCli.java Sun Nov 13 16:08:24 2016
@@ -26,10 +26,16 @@ import org.apache.uima.pear.tools.Packag
 import org.apache.uima.pear.tools.PackageInstaller;
 import org.apache.uima.pear.tools.PackageInstallerException;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class InstallPearCli.
+ */
 public class InstallPearCli {
 
   /**
-   * @param args
+   * The main method.
+   *
+   * @param args the arguments
    */
   
   public static void main(String[] args) {
@@ -70,6 +76,13 @@ public class InstallPearCli {
     installPear(installDir, pathToPear, doVerification);
   }
 
+  /**
+   * Install pear.
+   *
+   * @param installDir the install dir
+   * @param pearFile the pear file
+   * @param doVerification the do verification
+   */
   private static void installPear(File installDir, File pearFile, boolean doVerification) {
 
     try {
@@ -109,6 +122,10 @@ public class InstallPearCli {
       System.out.println("Error retrieving installed PEAR settings");
     }
   }
+  
+  /**
+   * Prints the usage and exit.
+   */
   private static void printUsageAndExit() {
     System.out
             .println("Usage: installPearCli pathToPearFile [directoryToInstallInto] [options]\n\n"

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnTreeListener.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnTreeListener.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnTreeListener.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnTreeListener.java Sun Nov 13 16:08:24 2016
@@ -22,21 +22,34 @@ package org.apache.uima.tools.stylemap;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 
+// TODO: Auto-generated Javadoc
 /**
- * Listens for tree selections and tells the mediator it is OK to enable the class selction button
- * 
+ * Listens for tree selections and tells the mediator it is OK to enable the class selction button.
+ *
+// * @see AnTreeEvent
  */
 public class AnTreeListener implements TreeSelectionListener {
+  
+  /** The med. */
   private TableGUIMediator med;
 
+  /**
+   * Instantiates a new an tree listener.
+   *
+   * @param med the med
+   */
   public AnTreeListener(TableGUIMediator med) {
     this.med = med;
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent)
+   */
   /*
    * This tells the mediator to turn on the button
    * 
    */
+  @Override
   public void valueChanged(TreeSelectionEvent ev) {
     med.treeClicked();
   }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnnotationFeaturesViewer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnnotationFeaturesViewer.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnnotationFeaturesViewer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/AnnotationFeaturesViewer.java Sun Nov 13 16:08:24 2016
@@ -46,24 +46,34 @@ import org.apache.uima.cas.Type;
 import org.apache.uima.cas.TypeSystem;
 import org.apache.uima.resource.metadata.Capability;
 
+// TODO: Auto-generated Javadoc
 /**
  * A tree view of Annotations and associated features.
  * 
  */
 public class AnnotationFeaturesViewer extends JPanel implements ActionListener {
 
+  /** The Constant serialVersionUID. */
   private static final long serialVersionUID = -2455669190592868013L;
 
+  /** The Constant ROOT. */
   public static final String ROOT = "Root";
 
+  /** The scroll pane. */
   private JScrollPane scrollPane;
 
+  /** The tree. */
   private JTree tree;
 
+  /** The expand all button. */
   private JButton expandAllButton;
 
+  /** The collapse all button. */
   private JButton collapseAllButton;
 
+  /**
+   * Instantiates a new annotation features viewer.
+   */
   public AnnotationFeaturesViewer() {
     super();
 
@@ -89,6 +99,13 @@ public class AnnotationFeaturesViewer ex
     add(buttonsPanel, BorderLayout.NORTH);
   }
 
+  /**
+   * Populate.
+   *
+   * @param analysisEngine the analysis engine
+   * @param aeMetaData the ae meta data
+   * @param cas the cas
+   */
   public void populate(AnalysisEngineDescription analysisEngine, AnalysisEngineMetaData aeMetaData,
           CAS cas) {
     tree = generateTreeView(analysisEngine, aeMetaData, cas);
@@ -109,6 +126,14 @@ public class AnnotationFeaturesViewer ex
     scrollPane.getViewport().add(tree, null);
   }
 
+  /**
+   * Generate tree view.
+   *
+   * @param analysisEngine the analysis engine
+   * @param aeMetaData the ae meta data
+   * @param cas the cas
+   * @return the j tree
+   */
   private JTree generateTreeView(AnalysisEngineDescription analysisEngine,
           AnalysisEngineMetaData aeMetaData, CAS cas) {
 
@@ -162,6 +187,13 @@ public class AnnotationFeaturesViewer ex
     return new JTree(root);
   }
 
+  /**
+   * Gets the feature names for type.
+   *
+   * @param aTypeName the a type name
+   * @param cas the cas
+   * @return the feature names for type
+   */
   // untimely ripped from UIMA since it does not work with a taeDescription
   private String[] getFeatureNamesForType(String aTypeName, CAS cas) {
     TypeSystem ts = cas.getTypeSystem();
@@ -179,6 +211,11 @@ public class AnnotationFeaturesViewer ex
     }
   }
 
+  /**
+   * Gets the selection.
+   *
+   * @return the selection
+   */
   public String getSelection() {
     TreePath treePath = tree.getSelectionPath();
     if (treePath != null) {
@@ -192,11 +229,20 @@ public class AnnotationFeaturesViewer ex
       return null;
   }
 
+  /**
+   * Adds the tree selection listener.
+   *
+   * @param sel the sel
+   */
   // add a tree selection listener to the JTree
   public void addTreeSelectionListener(TreeSelectionListener sel) {
     tree.addTreeSelectionListener(sel);
   }
 
+  /* (non-Javadoc)
+   * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+   */
+  @Override
   public void actionPerformed(ActionEvent e) {
     Object source = e.getSource();
     if (source == expandAllButton) {

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorEditor.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorEditor.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorEditor.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorEditor.java Sun Nov 13 16:08:24 2016
@@ -29,11 +29,23 @@ import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JTable;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class ColorEditor.
+ */
 class ColorEditor extends DefaultCellEditor {
+  
+  /** The Constant serialVersionUID. */
   private static final long serialVersionUID = 4766162815461077066L;
 
+  /** The current color. */
   Color currentColor = null;
 
+  /**
+   * Instantiates a new color editor.
+   *
+   * @param button the button
+   */
   public ColorEditor(JButton button) {
     super(new JCheckBox());
     // Unfortunately, the constructor expects a check box,
@@ -42,20 +54,33 @@ class ColorEditor extends DefaultCellEdi
 
     // Must do the following to ensure editing stops:
     button.addActionListener(new ActionListener() {
+      @Override
       public void actionPerformed(ActionEvent e) {
         fireEditingStopped();
       }
     });
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.AbstractCellEditor#fireEditingStopped()
+   */
+  @Override
   public void fireEditingStopped() {
     super.fireEditingStopped();
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.DefaultCellEditor#getCellEditorValue()
+   */
+  @Override
   public Object getCellEditorValue() {
     return currentColor;
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.DefaultCellEditor#getTableCellEditorComponent(javax.swing.JTable, java.lang.Object, boolean, int, int)
+   */
+  @Override
   public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected,
           int row, int column) {
     // ((JButton) editorComponent).setText(value.toString());

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorParser.java Sun Nov 13 16:08:24 2016
@@ -23,13 +23,25 @@ import java.awt.Color;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class ColorParser.
+ */
 public class ColorParser {
+  
+  /** The color name map. */
   private HashMap colorNameMap;
 
+  /**
+   * Instantiates a new color parser.
+   */
   public ColorParser() {
     initializeColorNameMap();
   }
 
+  /**
+   * Initialize color name map.
+   */
   private void initializeColorNameMap() {
     colorNameMap = new HashMap();
     colorNameMap.put("#000000", "black");
@@ -89,11 +101,25 @@ public class ColorParser {
     colorNameMap.put("mediumpurple", "#9370db");
   }
 
+  /**
+   * Gets the color name map.
+   *
+   * @return the color name map
+   */
   // --------------------
   public HashMap getColorNameMap() {
     return colorNameMap;
   }
 
+  /**
+   * Parses the and assign colors.
+   *
+   * @param typeName the type name
+   * @param featureValue the feature value
+   * @param labelString the label string
+   * @param styleColor the style color
+   * @return the style map entry
+   */
   // --------------------
   public StyleMapEntry parseAndAssignColors(String typeName, String featureValue,
           String labelString, String styleColor) {
@@ -137,6 +163,12 @@ public class ColorParser {
     return sme;
   }
 
+  /**
+   * Parses the checked.
+   *
+   * @param token the token
+   * @param sme the sme
+   */
   // test for "checked:true" or false
   private void parseChecked(StringTokenizer token, StyleMapEntry sme) {
     if (token.hasMoreTokens()) {
@@ -155,6 +187,12 @@ public class ColorParser {
 
   }
 
+  /**
+   * Parses the hidden.
+   *
+   * @param token the token
+   * @param sme the sme
+   */
   // test for "hidden:true" or false
   private void parseHidden(StringTokenizer token, StyleMapEntry sme) {
     if (token.hasMoreTokens()) {

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorRenderer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorRenderer.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorRenderer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/ColorRenderer.java Sun Nov 13 16:08:24 2016
@@ -28,14 +28,26 @@ import javax.swing.JTable;
 import javax.swing.border.Border;
 import javax.swing.table.TableCellRenderer;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class ColorRenderer.
+ */
 class ColorRenderer extends JLabel implements TableCellRenderer {
 
+  /** The Constant serialVersionUID. */
   private static final long serialVersionUID = 4260743930100354668L;
 
+  /** The unselected border. */
   private Border unselectedBorder = null;
 
+  /** The selected border. */
   private Border selectedBorder = null;
 
+  /**
+   * Instantiates a new color renderer.
+   *
+   * @param sTable the s table
+   */
   public ColorRenderer(StyleMapTable sTable) {
     super();
 
@@ -49,6 +61,10 @@ class ColorRenderer extends JLabel imple
       unselectedBorder = BorderFactory.createMatteBorder(2, 2, 2, 2, sTable.getBackground());
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int)
+   */
+  @Override
   public Component getTableCellRendererComponent(JTable table, Object color, boolean isSelected,
           boolean hasFocus, int row, int column) {
     setBackground((Color) color);

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/LabelCellEditor.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/LabelCellEditor.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/LabelCellEditor.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/LabelCellEditor.java Sun Nov 13 16:08:24 2016
@@ -25,13 +25,26 @@ import javax.swing.DefaultCellEditor;
 import javax.swing.JTable;
 import javax.swing.JTextField;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class LabelCellEditor.
+ */
 public class LabelCellEditor extends DefaultCellEditor {
+  
+  /** The Constant serialVersionUID. */
   private static final long serialVersionUID = 7810191917704574202L;
 
+  /**
+   * Instantiates a new label cell editor.
+   */
   public LabelCellEditor() {
     super(new JTextField());
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.DefaultCellEditor#getTableCellEditorComponent(javax.swing.JTable, java.lang.Object, boolean, int, int)
+   */
+  @Override
   public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected,
           int row, int column) {
     JTextField textField = (JTextField) getComponent();

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/MyCellRenderer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/MyCellRenderer.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/MyCellRenderer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/MyCellRenderer.java Sun Nov 13 16:08:24 2016
@@ -29,12 +29,31 @@ import javax.swing.table.DefaultTableCel
 
 import org.apache.uima.tools.images.Images;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class MyCellRenderer.
+ */
 // cell renderer for the JTable
 class MyCellRenderer extends DefaultTableCellRenderer {
+  
+  /** The Constant serialVersionUID. */
   private static final long serialVersionUID = 8130948041146818381L;
 
+  /** The small arrow icon. */
   private ImageIcon smallArrowIcon = Images.getImageIcon(Images.SMALL_ARROW);
 
+  /**
+   * Gets the table cell renderer component.
+   *
+   * @param table the table
+   * @param value the value
+   * @param isSelected the is selected
+   * @param hasFocus the has focus
+   * @param row the row
+   * @param column the column
+   * @param styleList the style list
+   * @return the table cell renderer component
+   */
   public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
           boolean hasFocus, int row, int column, ArrayList styleList) {
     Component cell = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row,

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleConstants.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleConstants.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleConstants.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleConstants.java Sun Nov 13 16:08:24 2016
@@ -19,23 +19,36 @@
 
 package org.apache.uima.tools.stylemap;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class StyleConstants.
+ */
 public class StyleConstants {
+  
+  /** The Constant NR_TABLE_COLUMNS. */
   public static final int NR_TABLE_COLUMNS = 7;
 
+  /** The Constant LABEL_COLUMN. */
   // Column zero is for visual indication of selection
   public static final int LABEL_COLUMN = 1;
 
+  /** The Constant TYPE_NAME_COLUMN. */
   public static final int TYPE_NAME_COLUMN = 2;
 
+  /** The Constant BG_COLUMN. */
   // public static final int FEATURE_VALUE_COLUMN = 3;
   public static final int BG_COLUMN = 3;
 
+  /** The Constant FG_COLUMN. */
   public static final int FG_COLUMN = 4;
 
+  /** The Constant CHECK_COLUMN. */
   public static final int CHECK_COLUMN = 5; // check box column
 
+  /** The Constant HIDDEN_COLUMN. */
   public static final int HIDDEN_COLUMN = 6; // hide these
 
+  /** The Constant columnNames. */
   static final String[] columnNames = { "|", "Annotation Label", "Annotation Type / Feature",
       "Background", "Foreground", "Checked", "Hidden" };
 

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEditor.java Sun Nov 13 16:08:24 2016
@@ -52,6 +52,7 @@ import org.apache.uima.tools.images.Imag
 import org.apache.uima.tools.util.gui.ImageButton;
 import org.apache.uima.tools.util.htmlview.AnnotationViewGenerator;
 
+// TODO: Auto-generated Javadoc
 /**
  * A GUI for editing style maps for the annotation viewer.
  * <p>
@@ -70,50 +71,73 @@ import org.apache.uima.tools.util.htmlvi
  * 
  */
 public class StyleMapEditor extends JDialog implements ActionListener {
+  
+  /** The Constant serialVersionUID. */
   private static final long serialVersionUID = -7774771368169207250L;
 
+  /** The button press. */
   private boolean buttonPress = false;
 
+  /** The populated. */
   private boolean populated;
 
+  /** The annotation features viewer. */
   private AnnotationFeaturesViewer annotationFeaturesViewer;
 
+  /** The add table entry button. */
   private ImageButton addTableEntryButton;
 
+  /** The table model. */
   private StyleMapTableModel tableModel;
 
+  /** The annotations table. */
   private StyleMapTable annotationsTable;
 
+  /** The style list. */
   private ArrayList styleList;
 
+  /** The remove table row button. */
   private ImageButton removeTableRowButton;
 
+  /** The move row up button. */
   private ImageButton moveRowUpButton;
 
+  /** The move row down button. */
   private ImageButton moveRowDownButton;
 
+  /** The ok button. */
   private JButton okButton = new JButton("Save");
 
+  /** The cancel button. */
   private JButton cancelButton = new JButton("Cancel");
 
+  /** The reset button. */
   private JButton resetButton = new JButton("Reset");
 
+  /** The style map editor dialog. */
   private JDialog styleMapEditorDialog;
 
+  /** The color name map. */
   private HashMap colorNameMap;
 
+  /** The analysis engine meta data. */
   private AnalysisEngineMetaData analysisEngineMetaData;
 
+  /** The ae. */
   private AnalysisEngineDescription ae;
 
+  /** The med. */
   private TableGUIMediator med;
 
+  /** The data. */
   // data for data model
   Object[][] data;
 
   /**
-   * 
    * Creates a new `Editor.
+   *
+   * @param aOwner the a owner
+   * @param cas the cas
    */
   public StyleMapEditor(final JFrame aOwner, CAS cas) {
     super(aOwner, "Style Map Editor", true);
@@ -214,6 +238,7 @@ public class StyleMapEditor extends JDia
 
     // Style Edit OK Button event handle
     okButton.addActionListener(new ActionListener() {
+      @Override
       public void actionPerformed(ActionEvent evt) {
         Vector vn = new Vector();
         for (int row = 0; row < styleList.size(); row++) {
@@ -250,6 +275,7 @@ public class StyleMapEditor extends JDia
 
     // Style Edit Exit Button Event Handling
     cancelButton.addActionListener(new ActionListener() {
+      @Override
       public void actionPerformed(ActionEvent evt) {
         buttonPress = false;
         styleMapEditorDialog.setVisible(false);
@@ -261,6 +287,10 @@ public class StyleMapEditor extends JDia
     pack();
   }
 
+  /* (non-Javadoc)
+   * @see java.awt.Container#getPreferredSize()
+   */
+  @Override
   public Dimension getPreferredSize() {
     Dimension screenSize = getToolkit().getScreenSize();
     Dimension d = super.getPreferredSize();
@@ -270,6 +300,9 @@ public class StyleMapEditor extends JDia
   }
 
   /**
+   * Sets the text analysis engine.
+   *
+   * @param tae the new text analysis engine
    * @deprecated use {@link #setAnalysisEngine(AnalysisEngineDescription)} instead.
    */
   @Deprecated
@@ -277,6 +310,11 @@ public class StyleMapEditor extends JDia
     this.ae = tae;
   }
 
+  /**
+   * Sets the analysis engine.
+   *
+   * @param ae the new analysis engine
+   */
   public void setAnalysisEngine(AnalysisEngineDescription ae) {
     this.ae = ae;
   }
@@ -284,15 +322,13 @@ public class StyleMapEditor extends JDia
   /**
    * Displays the StyleMapEditor GUI and allows the user to edit a style map. When the user has
    * finished, the new style map is returned.
-   * 
-   * @param aAnalysisEngineMetaData
-   *          Metadata for the AnalysisEngine whose style map is to be edited. This contains the
+   *
+   * @param aAnalysisEngineMetaData          Metadata for the AnalysisEngine whose style map is to be edited. This contains the
    *          AE's capabilities and type system definition, which are needed by the editor.
-   * @param aStyleMapXml
-   *          An existing style map XML document that will be loaded into the editor. This is
+   * @param aStyleMapXml          An existing style map XML document that will be loaded into the editor. This is
    *          optional, if null is passed in, a default style map will be automatically generated
    *          from the AE metadata.
-   * 
+   * @param cas the cas
    * @return a new style map XML document. If the user cancels, null is returned.
    */
   public String launchEditor(AnalysisEngineMetaData aAnalysisEngineMetaData, String aStyleMapXml,
@@ -339,6 +375,12 @@ public class StyleMapEditor extends JDia
     return parseStyleList(aStyleMapXml);
   }
 
+  /**
+   * Parses the style list.
+   *
+   * @param aStyleMapXml the a style map xml
+   * @return the array list
+   */
   public ArrayList parseStyleList(String aStyleMapXml) {
     StyleMapXmlParser smxp = new StyleMapXmlParser(aStyleMapXml);
     // System.out.println(aStyleMapXml );
@@ -363,6 +405,10 @@ public class StyleMapEditor extends JDia
     return styleList;
   }
 
+  /* (non-Javadoc)
+   * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
+   */
+  @Override
   public void actionPerformed(ActionEvent evt) {
     JComponent source = (JComponent) evt.getSource();
 
@@ -453,17 +499,21 @@ public class StyleMapEditor extends JDia
     }
   }
 
+  /**
+   * Gets the annotations table.
+   *
+   * @return the annotations table
+   */
   protected StyleMapTable getAnnotationsTable() {
     return this.annotationsTable;
   }
 
   /**
    * Displays the Style Map Editor GUI and allows the user to interact with it.
-   * 
-   * @param aStyleList
-   *          an ArrayList containing the style map entries to be edited. When the user modifies a
+   *
+   * @param aStyleList          an ArrayList containing the style map entries to be edited. When the user modifies a
    *          setting in the GUI, the elements of this List will be updated.
-   * 
+   * @param cas the cas
    * @return true if the user exits the dialog by clicking the OK button, false if the user has
    *         clicked the Cancel button.
    */
@@ -528,12 +578,18 @@ public class StyleMapEditor extends JDia
     return buttonPress;
   }
 
+  /**
+   * Sets the up color editor.
+   *
+   * @param table the new up color editor
+   */
   private void setUpColorEditor(JTable table) {
     final JTable tbl = table;
     // First, set up the button that brings up the dialog.
     final JButton button = new JButton("") {
       private static final long serialVersionUID = 3955120051470642157L;
 
+      @Override
       public void setText(String s) {
         // Button never shows text -- only color.
       }
@@ -560,6 +616,7 @@ public class StyleMapEditor extends JDia
     // colorChooser.setChooserPanels(preferredPanels);
 
     ActionListener okListener = new ActionListener() {
+      @Override
       public void actionPerformed(ActionEvent e) {
         colorEditor.currentColor = colorChooser.getColor();
         Color newColor = colorEditor.currentColor;
@@ -578,6 +635,7 @@ public class StyleMapEditor extends JDia
 
     // Here's the code that brings up the dialog.
     button.addActionListener(new ActionListener() {
+      @Override
       public void actionPerformed(ActionEvent e) {
         button.setBackground(colorEditor.currentColor);
         colorChooser.setColor(colorEditor.currentColor);
@@ -675,6 +733,11 @@ public class StyleMapEditor extends JDia
     return newStyleMap;
   }
 
+  /**
+   * Adds the row.
+   *
+   * @param typeName the type name
+   */
   public void addRow(String typeName) {
 
     // Check for duplicate annotation types that are not feature values:

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapEntry.java Sun Nov 13 16:08:24 2016
@@ -21,6 +21,10 @@ package org.apache.uima.tools.stylemap;
 
 import java.awt.Color;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class StyleMapEntry.
+ */
 public class StyleMapEntry {
   /**
    * The name of the annotation type to which this style map entry applies.
@@ -49,10 +53,16 @@ public class StyleMapEntry {
    */
   private Color background;
 
+  /** The is checked. */
   private boolean isChecked; // true if element is to be checked
 
+  /** The is hidden. */
   private boolean isHidden;
 
+  /* (non-Javadoc)
+   * @see java.lang.Object#toString()
+   */
+  @Override
   public String toString() {
     return "(" + annotationTypeName + ";" + label + ";" + featureValue + ";"
             + Integer.toHexString(foreground.getRGB()) + ";"
@@ -61,18 +71,38 @@ public class StyleMapEntry {
             + ")";
   }
 
+  /**
+   * Gets the hidden.
+   *
+   * @return the hidden
+   */
   public boolean getHidden() {
     return isHidden;
   }
 
+  /**
+   * Sets the hidden.
+   *
+   * @param hid the new hidden
+   */
   public void setHidden(Boolean hid) {
     isHidden = hid.booleanValue();
   }
 
+  /**
+   * Gets the checked.
+   *
+   * @return the checked
+   */
   public boolean getChecked() {
     return isChecked;
   }
 
+  /**
+   * Sets the checked.
+   *
+   * @param chk the new checked
+   */
   public void setChecked(Boolean chk) {
     isChecked = chk.booleanValue();
   }
@@ -81,6 +111,8 @@ public class StyleMapEntry {
    * This method returns a pattern representing either simply an annotation type or else an
    * annotation type/feature value. In the case of the latter: e.g.
    * SYNTAX_ANNOT_TYPE[@SYNTAXLABEL_STRING='NP']
+   *
+   * @return the pattern
    */
 
   public String getPattern() {
@@ -95,6 +127,8 @@ public class StyleMapEntry {
   }
 
   /**
+   * Gets the background.
+   *
    * @return Returns the background.
    */
   public Color getBackground() {
@@ -102,14 +136,17 @@ public class StyleMapEntry {
   }
 
   /**
-   * @param background
-   *          The background to set.
+   * Sets the background.
+   *
+   * @param background          The background to set.
    */
   public void setBackground(Color background) {
     this.background = background;
   }
 
   /**
+   * Gets the feature value.
+   *
    * @return Returns the featureValue.
    */
   public String getFeatureValue() {
@@ -117,14 +154,17 @@ public class StyleMapEntry {
   }
 
   /**
-   * @param featureValue
-   *          The featureValue to set.
+   * Sets the feature value.
+   *
+   * @param featureValue          The featureValue to set.
    */
   public void setFeatureValue(String featureValue) {
     this.featureValue = featureValue;
   }
 
   /**
+   * Gets the foreground.
+   *
    * @return Returns the foreground.
    */
   public Color getForeground() {
@@ -132,14 +172,17 @@ public class StyleMapEntry {
   }
 
   /**
-   * @param foreground
-   *          The foreground to set.
+   * Sets the foreground.
+   *
+   * @param foreground          The foreground to set.
    */
   public void setForeground(Color foreground) {
     this.foreground = foreground;
   }
 
   /**
+   * Gets the label.
+   *
    * @return Returns the label.
    */
   public String getLabel() {
@@ -147,14 +190,17 @@ public class StyleMapEntry {
   }
 
   /**
-   * @param label
-   *          The label to set.
+   * Sets the label.
+   *
+   * @param label          The label to set.
    */
   public void setLabel(String label) {
     this.label = label;
   }
 
   /**
+   * Gets the annotation type name.
+   *
    * @return Returns the annotationTypeName.
    */
   public String getAnnotationTypeName() {
@@ -162,8 +208,9 @@ public class StyleMapEntry {
   }
 
   /**
-   * @param annotationTypeName
-   *          The annotationTypeName to set.
+   * Sets the annotation type name.
+   *
+   * @param annotationTypeName          The annotationTypeName to set.
    */
   public void setAnnotationTypeName(String annotationTypeName) {
     this.annotationTypeName = annotationTypeName;

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTable.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTable.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTable.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTable.java Sun Nov 13 16:08:24 2016
@@ -26,14 +26,26 @@ import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 import javax.swing.table.TableModel;
 
+// TODO: Auto-generated Javadoc
 /**
  * Data structure used by the editor, which represents an entry in the style map.
  */
 public class StyleMapTable extends JTable {
+  
+  /** The Constant serialVersionUID. */
   private static final long serialVersionUID = 3556134276343308170L;
 
+  /** The med. */
   private TableGUIMediator med;
 
+  /**
+   * Instantiates a new style map table.
+   *
+   * @param model the model
+   * @param av the av
+   * @param edit the edit
+   * @param tmed the tmed
+   */
   public StyleMapTable(TableModel model, AnnotationFeaturesViewer av, StyleMapEditor edit,
           TableGUIMediator tmed) {
     super(model);
@@ -47,6 +59,10 @@ public class StyleMapTable extends JTabl
     lsm.addListSelectionListener(new TableSelectionListener(med));
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.JTable#getPreferredScrollableViewportSize()
+   */
+  @Override
   public Dimension getPreferredScrollableViewportSize() {
     return this.getPreferredSize();
   }

Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTableModel.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTableModel.java?rev=1769510&r1=1769509&r2=1769510&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTableModel.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/main/java/org/apache/uima/tools/stylemap/StyleMapTableModel.java Sun Nov 13 16:08:24 2016
@@ -23,24 +23,46 @@ import java.util.Vector;
 
 import javax.swing.table.AbstractTableModel;
 
+// TODO: Auto-generated Javadoc
+/**
+ * The Class StyleMapTableModel.
+ */
 public class StyleMapTableModel extends AbstractTableModel {
+  
+  /** The Constant serialVersionUID. */
   private static final long serialVersionUID = 7573410680191060690L;
 
+  /** The v. */
   Vector v;
 
+  /** The column names. */
   // Data is held as a Vector of Vectors.
   String[] columnNames = new String[StyleConstants.NR_TABLE_COLUMNS];
 
+  /** The debug. */
   boolean DEBUG = false;
 
+  /**
+   * Instantiates a new style map table model.
+   *
+   * @param columnNames the column names
+   */
   StyleMapTableModel(String[] columnNames) {
     this.columnNames = columnNames;
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.table.TableModel#getColumnCount()
+   */
+  @Override
   public int getColumnCount() {
     return columnNames.length;
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.table.TableModel#getRowCount()
+   */
+  @Override
   public int getRowCount() {
     if (v != null)
       return v.size();
@@ -49,19 +71,35 @@ public class StyleMapTableModel extends
 
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.table.AbstractTableModel#getColumnName(int)
+   */
+  @Override
   public String getColumnName(int col) {
     return columnNames[col];
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.table.TableModel#getValueAt(int, int)
+   */
+  @Override
   public Object getValueAt(int row, int col) {
 
     return ((Vector) v.elementAt(row)).elementAt(col);
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.table.AbstractTableModel#getColumnClass(int)
+   */
+  @Override
   public Class getColumnClass(int c) {
     return getValueAt(0, c).getClass();
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.table.AbstractTableModel#isCellEditable(int, int)
+   */
+  @Override
   public boolean isCellEditable(int row, int col) {
     if (col == StyleConstants.TYPE_NAME_COLUMN)
       return false;
@@ -69,6 +107,10 @@ public class StyleMapTableModel extends
       return true;
   }
 
+  /* (non-Javadoc)
+   * @see javax.swing.table.AbstractTableModel#setValueAt(java.lang.Object, int, int)
+   */
+  @Override
   public void setValueAt(Object value, int row, int col) {
 
     Vector rowVector = (Vector) v.elementAt(row);
@@ -79,6 +121,9 @@ public class StyleMapTableModel extends
       printDebugData();
   }
 
+  /**
+   * Prints the debug data.
+   */
   private void printDebugData() {
     int numRows = getRowCount();
     int numCols = getColumnCount();
@@ -95,6 +140,11 @@ public class StyleMapTableModel extends
     System.out.println("--------------------------");
   }
 
+  /**
+   * Sets the.
+   *
+   * @param data the data
+   */
   public void set(Object[][] data) {
     if (data.length <= 0)
       return;
@@ -109,16 +159,31 @@ public class StyleMapTableModel extends
     }
   }
 
+  /**
+   * Removes the row.
+   *
+   * @param row the row
+   */
   public void removeRow(int row) {
     v.removeElementAt(row);
     fireTableRowsDeleted(row, row);
   }
 
+  /**
+   * Adds the row.
+   *
+   * @param rowVector the row vector
+   */
   public void addRow(Vector rowVector) {
     v.addElement(rowVector);
     fireTableRowsInserted(v.size(), v.size());
   }
 
+  /**
+   * Move row up.
+   *
+   * @param row the row
+   */
   public void moveRowUp(int row) {
     Vector rowVector = (Vector) v.elementAt(row);
     v.removeElementAt(row);
@@ -127,6 +192,11 @@ public class StyleMapTableModel extends
     fireTableDataChanged();
   }
 
+  /**
+   * Move row down.
+   *
+   * @param row the row
+   */
   public void moveRowDown(int row) {
     Vector rowVector = (Vector) v.elementAt(row);
     v.removeElementAt(row);