You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2022/02/10 14:37:15 UTC

[uima-uimaj] 08/15: [UIMA-6373] Format UIMA Core Java SDK codebase

This is an automated email from the ASF dual-hosted git repository.

rec pushed a commit to branch refactoring/UIMA-6373-Format-UIMA-Core-Java-SDK-codebase
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit fe58341000fc02b90de3782c17a63e25b6ac3006
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Thu Feb 10 15:13:46 2022 +0100

    [UIMA-6373] Format UIMA Core Java SDK codebase
    
    - Auto-format
---
 .../src/main/java/example/PersonTitle.java         | 202 ++++++-----
 .../apache/uima/examples/ExampleApplication.java   |   4 +-
 .../org/apache/uima/examples/PrintAnnotations.java |  37 +-
 .../main/java/org/apache/uima/examples/RunAE.java  |  64 ++--
 .../uima/examples/SofaExampleApplication.java      |  81 +++--
 .../uima/examples/SourceDocumentInformation.java   | 270 ++++++++------
 .../java/org/apache/uima/examples/XmlDetagger.java |  28 +-
 .../uima/examples/cas/PersonTitleAnnotator.java    |  68 ++--
 .../apache/uima/examples/cas/RegExAnnotator.java   |  51 +--
 .../CasMultiplierExampleApplication.java           |   2 +-
 .../examples/casMultiplier/SimpleTextMerger.java   |  11 +-
 .../casMultiplier/SimpleTextSegmenter.java         |   3 +-
 .../uima/examples/cpe/AnnotationPrinter.java       |  21 +-
 .../examples/cpe/FileSystemCollectionReader.java   |  40 +-
 .../uima/examples/cpe/InlineXmlCasConsumer.java    |   5 +-
 .../cpe/PersonTitleDBWriterCasConsumer.java        |  52 +--
 .../org/apache/uima/examples/cpe/SimpleRunCPE.java |  28 +-
 .../org/apache/uima/examples/cpe/SimpleRunCPM.java |  42 ++-
 .../uima/examples/cpe/XCasWriterCasConsumer.java   |  17 +-
 .../examples/flow/AdvancedFixedFlowController.java | 100 ++---
 .../examples/flow/WhiteboardFlowController.java    |  15 +-
 .../examples/flow/WhiteboardFlowController2.java   |  18 +-
 .../apache/uima/examples/tokenizer/Sentence.java   | 120 +++---
 .../tokenizer/SimpleTokenAndSentenceAnnotator.java |  29 +-
 .../org/apache/uima/examples/tokenizer/Token.java  | 120 +++---
 .../uima/examples/xmi/Ecore2UimaTypeSystem.java    | 113 +++---
 .../uima/examples/xmi/UimaTypeSystem2Ecore.java    |  93 +++--
 .../uima/examples/xmi/XmiCollectionReader.java     |  16 +-
 .../uima/examples/xmi/XmiEcoreCasConsumer.java     |  28 +-
 .../uima/examples/xmi/XmiWriterCasConsumer.java    |  14 +-
 .../java/org/apache/uima/tutorial/DateAnnot.java   | 154 ++++----
 .../org/apache/uima/tutorial/DateTimeAnnot.java    | 216 +++++------
 .../java/org/apache/uima/tutorial/Meeting.java     | 402 +++++++++++----------
 .../java/org/apache/uima/tutorial/RoomNumber.java  | 217 +++++------
 .../org/apache/uima/tutorial/SentenceAnnot.java    | 143 ++++----
 .../java/org/apache/uima/tutorial/TimeAnnot.java   | 154 ++++----
 .../java/org/apache/uima/tutorial/UimaAcronym.java | 244 +++++++------
 .../java/org/apache/uima/tutorial/UimaMeeting.java | 190 +++++-----
 .../java/org/apache/uima/tutorial/WordAnnot.java   | 143 ++++----
 .../uima/tutorial/ex2/RoomNumberAnnotator.java     |   2 +-
 .../apache/uima/tutorial/ex3/TutorialDateTime.java |  30 +-
 .../apache/uima/tutorial/ex4/MeetingAnnotator.java |  18 +-
 .../uima/tutorial/ex6/UimaMeetingAnnotator.java    |   5 +-
 43 files changed, 1955 insertions(+), 1655 deletions(-)

diff --git a/uimaj-examples/src/main/java/example/PersonTitle.java b/uimaj-examples/src/main/java/example/PersonTitle.java
index 881cc38..e99aa15 100644
--- a/uimaj-examples/src/main/java/example/PersonTitle.java
+++ b/uimaj-examples/src/main/java/example/PersonTitle.java
@@ -28,7 +28,6 @@ import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 import org.apache.uima.jcas.tcas.Annotation;
 
-
 /**
  * A Personal Title. Updated by JCasGen Mon May 23 17:48:43 EDT 2005 XML source:
  * c:\a\eclipse\301jxe\jedii_examples\descriptors\analysis_engine\NamesAndPersonTitles_TAE.xml
@@ -37,44 +36,45 @@ import org.apache.uima.jcas.tcas.Annotation;
  */
 public class PersonTitle extends Annotation {
 
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static String _TypeName = "example.PersonTitle";
-  
-    /**
-     * The Constant typeIndexID.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int typeIndexID = JCasRegistry.register(PersonTitle.class);
-
-    /**
-     * The Constant type.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int type = typeIndexID;
-
-    /**
-     * Gets the type index ID.
-     *
-     * @return the type index ID
-     * @generated 
-     */
-    @Override
-    public int getTypeIndexID() {return typeIndexID;}
- 
- 
-  /* *******************
-   *   Feature Offsets *
-   * *******************/ 
-   
-  public final static String _FeatName_Kind = "Kind";
 
+  /**
+   * The Constant typeIndexID.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int typeIndexID = JCasRegistry.register(PersonTitle.class);
+
+  /**
+   * The Constant type.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int type = typeIndexID;
+
+  /**
+   * Gets the type index ID.
+   *
+   * @return the type index ID
+   * @generated
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
+
+  /*
+   * ******************* Feature Offsets *
+   *******************/
+
+  public final static String _FeatName_Kind = "Kind";
 
   /* Feature Adjusted Offsets */
   private final static CallSite _FC_Kind = TypeSystemImpl.createCallSite(PersonTitle.class, "Kind");
@@ -85,71 +85,81 @@ public class PersonTitle extends Annotation {
    *
    * @generated
    */
-    protected  PersonTitle() {/* intentionally empty block */}
-    
-    /**
-     * Internal - constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     * @generated 
-     */
-    public  PersonTitle(TypeImpl type, CASImpl casImpl) {
+  protected PersonTitle() {
+    /* intentionally empty block */}
+
+  /**
+   * Internal - constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   * @generated
+   */
+  public PersonTitle(TypeImpl type, CASImpl casImpl) {
     super(type, casImpl);
     readObject();
   }
-  
-    /**
-     * Instantiates a new person title.
-     *
-     * @param jcas the jcas
-     * @generated 
-     */
-    public  PersonTitle(JCas jcas) {
+
+  /**
+   * Instantiates a new person title.
+   *
+   * @param jcas
+   *          the jcas
+   * @generated
+   */
+  public PersonTitle(JCas jcas) {
+    super(jcas);
+    readObject();
+  }
+
+  /**
+   * Instantiates a new person title.
+   *
+   * @param jcas
+   *          the jcas
+   * @param begin
+   *          the begin
+   * @param end
+   *          the end
+   */
+  public PersonTitle(JCas jcas, int begin, int end) {
     super(jcas);
-    readObject();   
-  } 
-
-
-    /**
-     * Instantiates a new person title.
-     *
-     * @param jcas the jcas
-     * @param begin the begin
-     * @param end the end
-     */
-    public  PersonTitle(JCas jcas, int begin, int end) {
-        super(jcas);
-        setBegin(begin);
-        setEnd(end);
-        readObject();
-    }
-
-  /** 
+    setBegin(begin);
+    setEnd(end);
+    readObject();
+  }
+
+  /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->*
-   * @generated modifiable 
+   * 
+   * @generated modifiable
+   */
+  private void readObject() {
+  }
+
+  // *--------------*
+  // * Feature: Kind
+  /**
+   * getter for Kind - gets The kind of title - Civilian, Military, or Government.
+   *
+   * @return the kind
+   * @generated
    */
-    private void readObject() {
-    }
-
-    // *--------------*
-    // * Feature: Kind
-    /**
-     * getter for Kind - gets The kind of title - Civilian, Military, or Government.
-     *
-     * @return the kind
-     * @generated 
-     */
-    public String getKind() { return _getStringValueNc(wrapGetIntCatchException(_FH_Kind));}
-    
-    /**
-     * setter for Kind - sets The kind of title - Civilian, Military, or Government.
-     *
-     * @param v the new kind
-     * @generated 
-     */
-    public void setKind(String v) {
+  public String getKind() {
+    return _getStringValueNc(wrapGetIntCatchException(_FH_Kind));
+  }
+
+  /**
+   * setter for Kind - sets The kind of title - Civilian, Military, or Government.
+   *
+   * @param v
+   *          the new kind
+   * @generated
+   */
+  public void setKind(String v) {
     _setStringValueNfc(wrapGetIntCatchException(_FH_Kind), v);
-  }    
-    
   }
+
+}
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java b/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java
index f003a7d..64b4806 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/ExampleApplication.java
@@ -113,8 +113,8 @@ public class ExampleApplication {
    * @param aCAS
    *          CAS that will be used to hold analysis results
    */
-  private static void processFile(File aFile, AnalysisEngine aAE, CAS aCAS) throws IOException,
-          AnalysisEngineProcessException {
+  private static void processFile(File aFile, AnalysisEngine aAE, CAS aCAS)
+          throws IOException, AnalysisEngineProcessException {
     System.out.println("Processing file " + aFile.getName());
 
     String document = FileUtils.file2String(aFile);
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java b/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java
index 48e3f54..5aae277 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/PrintAnnotations.java
@@ -41,7 +41,6 @@ import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.util.FileUtils;
 import org.apache.uima.util.XMLInputSource;
 
-
 /**
  * A simple example of how to extract information from the CAS. This example retrieves all
  * annotations of a specified type from a CAS and prints them (along with all of their features) to
@@ -60,26 +59,25 @@ public class PrintAnnotations {
    *          the PrintStream to which output will be written
    */
   public static void printAnnotations(CAS aCAS, PrintStream aOut) {
-    
+
     // Version 3 using select with Stream support
     aCAS.select(Annotation.class).forEach(fs -> printFS(fs, aCAS, 0, aOut));
 
-//    // Version 3 using select with extended for
-//    for (Annotation fs : aCAS.getAnnotationIndex().select(Annotation.class)) {
-//      printFS(fs, aCAS, 0, aOut);
-//    }
-//    
-//    // version 2 style using iterators
-//    FSIterator<AnnotationFS> iter = aCAS.getAnnotationIndex().iterator();
-//
-//    // iterate
-//    while (iter.isValid()) {
-//      FeatureStructure fs = iter.get();
-//      printFS(fs, aCAS, 0, aOut);
-//      iter.moveToNext();
-//    }
-    
-    
+    // // Version 3 using select with extended for
+    // for (Annotation fs : aCAS.getAnnotationIndex().select(Annotation.class)) {
+    // printFS(fs, aCAS, 0, aOut);
+    // }
+    //
+    // // version 2 style using iterators
+    // FSIterator<AnnotationFS> iter = aCAS.getAnnotationIndex().iterator();
+    //
+    // // iterate
+    // while (iter.isValid()) {
+    // FeatureStructure fs = iter.get();
+    // printFS(fs, aCAS, 0, aOut);
+    // iter.moveToNext();
+    // }
+
   }
 
   /**
@@ -244,7 +242,8 @@ public class PrintAnnotations {
    * descriptor for the TAE to run and an input file. Additional arguments are Type or Feature names
    * to be included in the ResultSpecification passed to the TAE.
    *
-   * @param args - see above
+   * @param args
+   *          - see above
    */
   public static void main(String[] args) {
     try {
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/RunAE.java b/uimaj-examples/src/main/java/org/apache/uima/examples/RunAE.java
index ed31b44..a592c48 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/RunAE.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/RunAE.java
@@ -46,7 +46,6 @@ import org.apache.uima.tools.components.InlineXmlCasConsumer;
 import org.apache.uima.tools.components.XmlDetagger;
 import org.apache.uima.util.AnalysisEnginePerformanceReports;
 
-
 /**
  * An example application that reads documents from the file system, sends them though an Analysis
  * Engine(AE), and produces XML files with inline annotations. This application uses a
@@ -57,8 +56,8 @@ import org.apache.uima.util.AnalysisEnginePerformanceReports;
  * &lt;AE descriptor or JAR file name&gt; &lt;input dir&gt; 
  * [&lt;output dir&gt;]</code>
  * <p>
- * If <code>output dir</code> is not specified, the analysis results will not be output. This can
- * be useful when only interested in performance statistics.
+ * If <code>output dir</code> is not specified, the analysis results will not be output. This can be
+ * useful when only interested in performance statistics.
  * <p>
  * <u>OPTIONS</u>
  * <p>
@@ -107,7 +106,7 @@ public class RunAE implements StatusCallbackListener {
 
   /** The xmi input. */
   private boolean xmiInput = false;
-  
+
   /** The x lenient. */
   private boolean xLenient = false;
 
@@ -120,7 +119,8 @@ public class RunAE implements StatusCallbackListener {
   /**
    * Constructor. Sets up and runs an Analysis Engine.
    *
-   * @param args the args
+   * @param args
+   *          the args
    */
   public RunAE(String[] args) {
     try {
@@ -143,8 +143,8 @@ public class RunAE implements StatusCallbackListener {
               .produceCasProcessorConfigurationParameterSettings();
       CpeCollectionReader cpeCollRdr = cpeDesc.getAllCollectionCollectionReaders()[0];
       cpeCollRdr.setConfigurationParameterSettings(crSettings);
-      crSettings.setParameterValue(FileSystemCollectionReader.PARAM_INPUTDIR, inputDir
-              .getAbsolutePath());
+      crSettings.setParameterValue(FileSystemCollectionReader.PARAM_INPUTDIR,
+              inputDir.getAbsolutePath());
       crSettings.setParameterValue(FileSystemCollectionReader.PARAM_ENCODING, encoding);
       crSettings.setParameterValue(FileSystemCollectionReader.PARAM_LANGUAGE, language);
       if (xcasInput) {
@@ -160,8 +160,8 @@ public class RunAE implements StatusCallbackListener {
       CpeCasProcessor xmlDetaggerCasProc = null;
       if (xmlTagName != null && xmlTagName.length() > 0) {
         xmlDetaggerCasProc = CpeDescriptorFactory.produceCasProcessor("XmlDetagger");
-        CpeComponentDescriptor cpeComponentDescriptor = 
-          CpeDescriptorFactory.produceComponentDescriptor(XmlDetagger.getDescriptorURL().toString());
+        CpeComponentDescriptor cpeComponentDescriptor = CpeDescriptorFactory
+                .produceComponentDescriptor(XmlDetagger.getDescriptorURL().toString());
         xmlDetaggerCasProc.setCpeComponentDescriptor(cpeComponentDescriptor);
         CasProcessorConfigurationParameterSettings detaggerSettings = CpeDescriptorFactory
                 .produceCasProcessorConfigurationParameterSettings();
@@ -173,8 +173,8 @@ public class RunAE implements StatusCallbackListener {
 
       // add user's AE to CPE
       CpeCasProcessor casProc = CpeDescriptorFactory.produceCasProcessor("UserAE");
-      CpeComponentDescriptor cpeComponentDescriptor = 
-        CpeDescriptorFactory.produceComponentDescriptor(aeSpecifierFile.getAbsolutePath());
+      CpeComponentDescriptor cpeComponentDescriptor = CpeDescriptorFactory
+              .produceComponentDescriptor(aeSpecifierFile.getAbsolutePath());
       casProc.setCpeComponentDescriptor(cpeComponentDescriptor);
       casProc.setMaxErrorCount(0);
       cpeDesc.addCasProcessor(casProc);
@@ -184,14 +184,14 @@ public class RunAE implements StatusCallbackListener {
       CpeCasProcessor casCon = null;
       if (outputDir != null) {
         casCon = CpeDescriptorFactory.produceCasProcessor("CasConsumer");
-        cpeComponentDescriptor = 
-          CpeDescriptorFactory.produceComponentDescriptor(InlineXmlCasConsumer.getDescriptorURL().toString());
-        casCon.setCpeComponentDescriptor(cpeComponentDescriptor);        
+        cpeComponentDescriptor = CpeDescriptorFactory
+                .produceComponentDescriptor(InlineXmlCasConsumer.getDescriptorURL().toString());
+        casCon.setCpeComponentDescriptor(cpeComponentDescriptor);
         CasProcessorConfigurationParameterSettings consumerSettings = CpeDescriptorFactory
                 .produceCasProcessorConfigurationParameterSettings();
         casCon.setConfigurationParameterSettings(consumerSettings);
-        consumerSettings.setParameterValue(InlineXmlCasConsumer.PARAM_OUTPUTDIR, outputDir
-                .getAbsolutePath());
+        consumerSettings.setParameterValue(InlineXmlCasConsumer.PARAM_OUTPUTDIR,
+                outputDir.getAbsolutePath());
         if (xcasInput) {
           consumerSettings.setParameterValue(InlineXmlCasConsumer.PARAM_XCAS, "XCAS");
         } else if (xmiInput) {
@@ -237,18 +237,18 @@ public class RunAE implements StatusCallbackListener {
       docsProcessed = 0;
       mCPE.process();
     } catch (Exception e) {
-      //special check for using XML detagger with remotes, which will generate an error
-      //since sofa mappings aren't supported for remotes
-      if (xmlTagName != null && xmlTagName.length() > 0 && e instanceof UIMAException &&
-              ((UIMAException)e).hasMessageKey(ResourceInitializationException.SOFA_MAPPING_NOT_SUPPORTED_FOR_REMOTE)) {
-        System.err.println("The XML detagging feature (-t) is not supported for remote Analysis Engines or for Aggregates containing remotes.");
-      }
-      else {
+      // special check for using XML detagger with remotes, which will generate an error
+      // since sofa mappings aren't supported for remotes
+      if (xmlTagName != null && xmlTagName.length() > 0 && e instanceof UIMAException
+              && ((UIMAException) e).hasMessageKey(
+                      ResourceInitializationException.SOFA_MAPPING_NOT_SUPPORTED_FOR_REMOTE)) {
+        System.err.println(
+                "The XML detagging feature (-t) is not supported for remote Analysis Engines or for Aggregates containing remotes.");
+      } else {
         e.printStackTrace();
       }
     }
   }
-  
 
   /**
    * Initialization complete.
@@ -262,8 +262,10 @@ public class RunAE implements StatusCallbackListener {
   /**
    * Entity process complete.
    *
-   * @param aCas the a cas
-   * @param aStatus the a status
+   * @param aCas
+   *          the a cas
+   * @param aStatus
+   *          the a status
    * @see org.apache.uima.collection.StatusCallbackListener#entityProcessComplete(org.apache.uima.cas.CAS,
    *      org.apache.uima.collection.EntityProcessStatus)
    */
@@ -278,8 +280,8 @@ public class RunAE implements StatusCallbackListener {
       // retrieve the filename of the input file from the CAS
       // (it was put there by the FileSystemCollectionReader)
       if (!(xcasInput || xmiInput)) {
-        Type fileLocType = aCas.getTypeSystem().getType(
-                "org.apache.uima.examples.SourceDocumentInformation");
+        Type fileLocType = aCas.getTypeSystem()
+                .getType("org.apache.uima.examples.SourceDocumentInformation");
         Feature fileNameFeat = fileLocType.getFeatureByBaseName("uri");
         FSIterator it = aCas.getAnnotationIndex(fileLocType).iterator();
         FeatureStructure fileLoc = it.get();
@@ -378,7 +380,8 @@ public class RunAE implements StatusCallbackListener {
   /**
    * Reads command line arguments and sets static class variables appropriately.
    *
-   * @param args the args
+   * @param args
+   *          the args
    * @return true if command line args were valid, false if not
    */
   private boolean processCmdLineArgs(String[] args) {
@@ -459,7 +462,8 @@ public class RunAE implements StatusCallbackListener {
   /**
    * The main method.
    *
-   * @param args the arguments
+   * @param args
+   *          the arguments
    */
   public static void main(String[] args) {
     new RunAE(args);
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleApplication.java b/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleApplication.java
index 0a57c4f..49ebc7a 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleApplication.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/SofaExampleApplication.java
@@ -31,7 +31,6 @@ import org.apache.uima.cas.Type;
 import org.apache.uima.jcas.tcas.Annotation;
 import org.apache.uima.util.XMLInputSource;
 
-
 /**
  * A simple Multiple Subject of Analysis (multi-Sofa) test application. Creates a text Sofa with
  * English text, calls an annotator that creates a text Sofa with German text, then dumps all
@@ -40,20 +39,23 @@ import org.apache.uima.util.XMLInputSource;
  * The application takes no arguments.
  */
 public class SofaExampleApplication {
-  
+
   /**
    * Main program.
    *
-   * @param args the arguments
-   * @throws UIMAException the UIMA exception
-   * @throws IOException Signals that an I/O exception has occurred.
+   * @param args
+   *          the arguments
+   * @throws UIMAException
+   *           the UIMA exception
+   * @throws IOException
+   *           Signals that an I/O exception has occurred.
    */
   public static void main(String[] args) throws UIMAException, IOException {
     // parse AnalysisEngine descriptor
     XMLInputSource input = new XMLInputSource(
             "descriptors/analysis_engine/SofaExampleAnnotator.xml");
-    AnalysisEngineDescription desc = UIMAFramework.getXMLParser().parseAnalysisEngineDescription(
-            input);
+    AnalysisEngineDescription desc = UIMAFramework.getXMLParser()
+            .parseAnalysisEngineDescription(input);
 
     // create AnalysisEngine
     AnalysisEngine seAnnotator = UIMAFramework.produceAnalysisEngine(desc);
@@ -70,19 +72,19 @@ public class SofaExampleApplication {
     seAnnotator.process(cas);
 
     System.out.println("---Printing all annotations for English Sofa---");
-    englishView.select(Annotation.class).forEach(annot -> 
-          System.out.println(" " + annot.getType().getName() + ": " + annot.getCoveredText()));
-    
-//    // get annotation iterator for the English CAS view
-//    FSIndex anIndex = englishView.getAnnotationIndex();
-//    FSIterator anIter = anIndex.iterator();
-//
-//    // and print out all annotations found
-//    while (anIter.isValid()) {
-//      AnnotationFS annot = (AnnotationFS) anIter.get();
-//      System.out.println(" " + annot.getType().getName() + ": " + annot.getCoveredText());
-//      anIter.moveToNext();
-//    }
+    englishView.select(Annotation.class).forEach(annot -> System.out
+            .println(" " + annot.getType().getName() + ": " + annot.getCoveredText()));
+
+    // // get annotation iterator for the English CAS view
+    // FSIndex anIndex = englishView.getAnnotationIndex();
+    // FSIterator anIter = anIndex.iterator();
+    //
+    // // and print out all annotations found
+    // while (anIter.isValid()) {
+    // AnnotationFS annot = (AnnotationFS) anIter.get();
+    // System.out.println(" " + annot.getType().getName() + ": " + annot.getCoveredText());
+    // anIter.moveToNext();
+    // }
 
     // now try to get the CAS view for the German Sofa
     System.out.println();
@@ -91,7 +93,7 @@ public class SofaExampleApplication {
     Feature other = cross.getFeatureByBaseName("otherAnnotation");
 
     System.out.println("---Printing all annotations for German Sofa---");
-    
+
     for (Annotation annot : germanView.select(Annotation.class)) {
       System.out.println(" " + annot.getType().getName() + ": " + annot.getCoveredText());
       if (annot.getType() == cross) {
@@ -99,25 +101,24 @@ public class SofaExampleApplication {
         System.out.println("   other annotation feature: " + crossAnnot.getCoveredText());
       }
     }
-    
-    
-//    // and annotator iterator for the German CAS View
-//    anIndex = germanView.getAnnotationIndex();
-//    anIter = anIndex.iterator();
-//    Type cross = germanView.getTypeSystem().getType("sofa.test.CrossAnnotation");
-//    Feature other = cross.getFeatureByBaseName("otherAnnotation");
-//
-//    // print out all annotations for the German Sofa
-//    System.out.println("---Printing all annotations for German Sofa---");
-//    while (anIter.isValid()) {
-//      AnnotationFS annot = (AnnotationFS) anIter.get();
-//      System.out.println(" " + annot.getType().getName() + ": " + annot.getCoveredText());
-//      if (annot.getType() == cross) {
-//        AnnotationFS crossAnnot = (AnnotationFS) annot.getFeatureValue(other);
-//        System.out.println("   other annotation feature: " + crossAnnot.getCoveredText());
-//      }
-//      anIter.moveToNext();
-//    }
+
+    // // and annotator iterator for the German CAS View
+    // anIndex = germanView.getAnnotationIndex();
+    // anIter = anIndex.iterator();
+    // Type cross = germanView.getTypeSystem().getType("sofa.test.CrossAnnotation");
+    // Feature other = cross.getFeatureByBaseName("otherAnnotation");
+    //
+    // // print out all annotations for the German Sofa
+    // System.out.println("---Printing all annotations for German Sofa---");
+    // while (anIter.isValid()) {
+    // AnnotationFS annot = (AnnotationFS) anIter.get();
+    // System.out.println(" " + annot.getType().getName() + ": " + annot.getCoveredText());
+    // if (annot.getType() == cross) {
+    // AnnotationFS crossAnnot = (AnnotationFS) annot.getFeatureValue(other);
+    // System.out.println(" other annotation feature: " + crossAnnot.getCoveredText());
+    // }
+    // anIter.moveToNext();
+    // }
 
     // Clean up
     seAnnotator.destroy();
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java b/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java
index b928816..d2d3662 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/SourceDocumentInformation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-   
+
 /* Apache UIMA v3 - First created by JCasGen Wed Mar 02 13:42:57 EST 2016 */
 
 package org.apache.uima.examples;
@@ -31,175 +31,233 @@ import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 import org.apache.uima.jcas.tcas.Annotation;
 
-
-/** Stores detailed information about the original source document from which the current CAS was initialized. All information (like size) refers to the source document and not to the document in the CAS which may be converted and filtered by a CAS Initializer. For example this information will be written to the Semantic Search index so that the original document contents can be retrieved by queries.
- * Updated by JCasGen Sun Oct 08 19:24:05 EDT 2017
- * XML source: C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/resources/org/apache/uima/examples/SourceDocumentInformation.xml
- * @generated */
+/**
+ * Stores detailed information about the original source document from which the current CAS was
+ * initialized. All information (like size) refers to the source document and not to the document in
+ * the CAS which may be converted and filtered by a CAS Initializer. For example this information
+ * will be written to the Semantic Search index so that the original document contents can be
+ * retrieved by queries. Updated by JCasGen Sun Oct 08 19:24:05 EDT 2017 XML source:
+ * C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/resources/org/apache/uima/examples/SourceDocumentInformation.xml
+ * 
+ * @generated
+ */
 public class SourceDocumentInformation extends Annotation {
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static String _TypeName = "org.apache.uima.examples.SourceDocumentInformation";
-  
-  /** @generated
-   * @ordered 
+
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static int typeIndexID = JCasRegistry.register(SourceDocumentInformation.class);
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static int type = typeIndexID;
-  /** @generated
-   * @return index of the type  
+
+  /**
+   * @generated
+   * @return index of the type
    */
   @Override
-  public              int getTypeIndexID() {return typeIndexID;}
- 
- 
-  /* *******************
-   *   Feature Names   *
-   * *******************/ 
-   
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
+
+  /*
+   * ******************* Feature Names *
+   *******************/
+
   public final static String _FeatName_uri = "uri";
   public final static String _FeatName_offsetInSource = "offsetInSource";
   public final static String _FeatName_documentSize = "documentSize";
   public final static String _FeatName_lastSegment = "lastSegment";
 
-
   /* Feature Adjusted Offsets */
-  private final static CallSite _FC_uri = TypeSystemImpl.createCallSite(SourceDocumentInformation.class, "uri");
+  private final static CallSite _FC_uri = TypeSystemImpl
+          .createCallSite(SourceDocumentInformation.class, "uri");
   private final static MethodHandle _FH_uri = _FC_uri.dynamicInvoker();
-  private final static CallSite _FC_offsetInSource = TypeSystemImpl.createCallSite(SourceDocumentInformation.class, "offsetInSource");
+  private final static CallSite _FC_offsetInSource = TypeSystemImpl
+          .createCallSite(SourceDocumentInformation.class, "offsetInSource");
   private final static MethodHandle _FH_offsetInSource = _FC_offsetInSource.dynamicInvoker();
-  private final static CallSite _FC_documentSize = TypeSystemImpl.createCallSite(SourceDocumentInformation.class, "documentSize");
+  private final static CallSite _FC_documentSize = TypeSystemImpl
+          .createCallSite(SourceDocumentInformation.class, "documentSize");
   private final static MethodHandle _FH_documentSize = _FC_documentSize.dynamicInvoker();
-  private final static CallSite _FC_lastSegment = TypeSystemImpl.createCallSite(SourceDocumentInformation.class, "lastSegment");
+  private final static CallSite _FC_lastSegment = TypeSystemImpl
+          .createCallSite(SourceDocumentInformation.class, "lastSegment");
   private final static MethodHandle _FH_lastSegment = _FC_lastSegment.dynamicInvoker();
-   
-  /** Never called.  Disable default constructor
-   * @generated */
-  protected SourceDocumentInformation() {/* intentionally empty block */}
-    
-  /** Internal - constructor used by generator 
+
+  /**
+   * Never called. Disable default constructor
+   * 
+   * @generated
+   */
+  protected SourceDocumentInformation() {
+    /* intentionally empty block */}
+
+  /**
+   * Internal - constructor used by generator
+   * 
    * @generated
-   * @param casImpl the CAS this Feature Structure belongs to
-   * @param type the type of this Feature Structure 
+   * @param casImpl
+   *          the CAS this Feature Structure belongs to
+   * @param type
+   *          the type of this Feature Structure
    */
   public SourceDocumentInformation(TypeImpl type, CASImpl casImpl) {
     super(type, casImpl);
     readObject();
   }
-  
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs 
+
+  /**
+   * @generated
+   * @param jcas
+   *          JCas to which this Feature Structure belongs
    */
   public SourceDocumentInformation(JCas jcas) {
     super(jcas);
-    readObject();   
-  } 
-
+    readObject();
+  }
 
-  /** @generated
-   * @param jcas JCas to which this Feature Structure belongs
-   * @param begin offset to the begin spot in the SofA
-   * @param end offset to the end spot in the SofA 
-  */  
+  /**
+   * @generated
+   * @param jcas
+   *          JCas to which this Feature Structure belongs
+   * @param begin
+   *          offset to the begin spot in the SofA
+   * @param end
+   *          offset to the end spot in the SofA
+   */
   public SourceDocumentInformation(JCas jcas, int begin, int end) {
     super(jcas);
     setBegin(begin);
     setEnd(end);
     readObject();
-  }   
+  }
 
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
+  /**
+   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
    *
-   * @generated modifiable 
+   * @generated modifiable
    */
-  private void readObject() {/*default - does nothing empty block */}
-     
- 
-    
-  //*--------------*
-  //* Feature: uri
+  private void readObject() {
+    /* default - does nothing empty block */}
 
-  /** getter for uri - gets URI of document. (For example, file:///MyDirectory/myFile.txt for a simple file or http://incubator.apache.org/uima/index.html for content from a web source.)
+  // *--------------*
+  // * Feature: uri
+
+  /**
+   * getter for uri - gets URI of document. (For example, file:///MyDirectory/myFile.txt for a
+   * simple file or http://incubator.apache.org/uima/index.html for content from a web source.)
+   * 
    * @generated
-   * @return value of the feature 
+   * @return value of the feature
    */
-  public String getUri() { return _getStringValueNc(wrapGetIntCatchException(_FH_uri));}
-    
-  /** setter for uri - sets URI of document. (For example, file:///MyDirectory/myFile.txt for a simple file or http://incubator.apache.org/uima/index.html for content from a web source.) 
+  public String getUri() {
+    return _getStringValueNc(wrapGetIntCatchException(_FH_uri));
+  }
+
+  /**
+   * setter for uri - sets URI of document. (For example, file:///MyDirectory/myFile.txt for a
+   * simple file or http://incubator.apache.org/uima/index.html for content from a web source.)
+   * 
    * @generated
-   * @param v value to set into the feature 
+   * @param v
+   *          value to set into the feature
    */
   public void setUri(String v) {
     _setStringValueNfc(wrapGetIntCatchException(_FH_uri), v);
-  }    
-    
-   
-    
-  //*--------------*
-  //* Feature: offsetInSource
+  }
+
+  // *--------------*
+  // * Feature: offsetInSource
 
-  /** getter for offsetInSource - gets Byte offset of the start of document content within original source file or other input source. Only used if the CAS document was retrieved from an source where one physical source file contained several conceptual documents. Zero otherwise.
+  /**
+   * getter for offsetInSource - gets Byte offset of the start of document content within original
+   * source file or other input source. Only used if the CAS document was retrieved from an source
+   * where one physical source file contained several conceptual documents. Zero otherwise.
+   * 
    * @generated
-   * @return value of the feature 
+   * @return value of the feature
    */
-  public int getOffsetInSource() { return _getIntValueNc(wrapGetIntCatchException(_FH_offsetInSource));}
-    
-  /** setter for offsetInSource - sets Byte offset of the start of document content within original source file or other input source. Only used if the CAS document was retrieved from an source where one physical source file contained several conceptual documents. Zero otherwise. 
+  public int getOffsetInSource() {
+    return _getIntValueNc(wrapGetIntCatchException(_FH_offsetInSource));
+  }
+
+  /**
+   * setter for offsetInSource - sets Byte offset of the start of document content within original
+   * source file or other input source. Only used if the CAS document was retrieved from an source
+   * where one physical source file contained several conceptual documents. Zero otherwise.
+   * 
    * @generated
-   * @param v value to set into the feature 
+   * @param v
+   *          value to set into the feature
    */
   public void setOffsetInSource(int v) {
     _setIntValueNfc(wrapGetIntCatchException(_FH_offsetInSource), v);
-  }    
-    
-   
-    
-  //*--------------*
-  //* Feature: documentSize
+  }
 
-  /** getter for documentSize - gets Size of original document in bytes before processing by CAS Initializer. Either absolute file size of size within file or other source.
+  // *--------------*
+  // * Feature: documentSize
+
+  /**
+   * getter for documentSize - gets Size of original document in bytes before processing by CAS
+   * Initializer. Either absolute file size of size within file or other source.
+   * 
    * @generated
-   * @return value of the feature 
+   * @return value of the feature
    */
-  public int getDocumentSize() { return _getIntValueNc(wrapGetIntCatchException(_FH_documentSize));}
-    
-  /** setter for documentSize - sets Size of original document in bytes before processing by CAS Initializer. Either absolute file size of size within file or other source. 
+  public int getDocumentSize() {
+    return _getIntValueNc(wrapGetIntCatchException(_FH_documentSize));
+  }
+
+  /**
+   * setter for documentSize - sets Size of original document in bytes before processing by CAS
+   * Initializer. Either absolute file size of size within file or other source.
+   * 
    * @generated
-   * @param v value to set into the feature 
+   * @param v
+   *          value to set into the feature
    */
   public void setDocumentSize(int v) {
     _setIntValueNfc(wrapGetIntCatchException(_FH_documentSize), v);
-  }    
-    
-   
-    
-  //*--------------*
-  //* Feature: lastSegment
+  }
+
+  // *--------------*
+  // * Feature: lastSegment
 
-  /** getter for lastSegment - gets For a CAS that represents a segment of a larger source document, this flag indicates whether this CAS is the final segment of the source document.  This is useful for downstream components that want to take some action after having seen all of the segments of a particular source document.
+  /**
+   * getter for lastSegment - gets For a CAS that represents a segment of a larger source document,
+   * this flag indicates whether this CAS is the final segment of the source document. This is
+   * useful for downstream components that want to take some action after having seen all of the
+   * segments of a particular source document.
+   * 
    * @generated
-   * @return value of the feature 
+   * @return value of the feature
    */
-  public boolean getLastSegment() { return _getBooleanValueNc(wrapGetIntCatchException(_FH_lastSegment));}
-    
-  /** setter for lastSegment - sets For a CAS that represents a segment of a larger source document, this flag indicates whether this CAS is the final segment of the source document.  This is useful for downstream components that want to take some action after having seen all of the segments of a particular source document. 
+  public boolean getLastSegment() {
+    return _getBooleanValueNc(wrapGetIntCatchException(_FH_lastSegment));
+  }
+
+  /**
+   * setter for lastSegment - sets For a CAS that represents a segment of a larger source document,
+   * this flag indicates whether this CAS is the final segment of the source document. This is
+   * useful for downstream components that want to take some action after having seen all of the
+   * segments of a particular source document.
+   * 
    * @generated
-   * @param v value to set into the feature 
+   * @param v
+   *          value to set into the feature
    */
   public void setLastSegment(boolean v) {
     _setBooleanValueNfc(wrapGetIntCatchException(_FH_lastSegment), v);
-  }    
-    
   }
 
-    
\ No newline at end of file
+}
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java b/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java
index b3f937b..457210a 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/XmlDetagger.java
@@ -51,19 +51,18 @@ public class XmlDetagger extends CasAnnotator_ImplBase {
    * file will be considered the document.
    */
   public static final String PARAM_XMLTAG = "XmlTagContainingText";
-  
+
   private SAXParserFactory parserFactory = XMLUtils.createSAXParserFactory();
- 
+
   private Type sourceDocInfoType;
 
   private String mXmlTagContainingText = null;
 
-    
   @Override
   public void initialize(UimaContext aContext) throws ResourceInitializationException {
     super.initialize(aContext);
     // Get config param setting
-    mXmlTagContainingText  = (String) getContext().getConfigParameterValue(PARAM_XMLTAG);
+    mXmlTagContainingText = (String) getContext().getConfigParameterValue(PARAM_XMLTAG);
   }
 
   @Override
@@ -97,11 +96,11 @@ public class XmlDetagger extends CasAnnotator_ImplBase {
     if (null != sourceDocInfoFs) {
       plainTextView.addFsToIndexes(sourceDocInfoFs);
     }
-//    Iterator iter = xmlCas.getAnnotationIndex(sourceDocInfoType).iterator();
-//    if (iter.hasNext()) {
-//      FeatureStructure sourceDocInfoFs = (FeatureStructure) iter.next();
-//      plainTextView.getIndexRepository().addFS(sourceDocInfoFs);
-//    }
+    // Iterator iter = xmlCas.getAnnotationIndex(sourceDocInfoType).iterator();
+    // if (iter.hasNext()) {
+    // FeatureStructure sourceDocInfoFs = (FeatureStructure) iter.next();
+    // plainTextView.getIndexRepository().addFS(sourceDocInfoFs);
+    // }
 
   }
 
@@ -112,9 +111,10 @@ public class XmlDetagger extends CasAnnotator_ImplBase {
     public DetagHandler() {
       insideTextTag = (mXmlTagContainingText == null);
     }
-        
+
     @Override
-    public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
+    public void startElement(String uri, String localName, String qName, Attributes attributes)
+            throws SAXException {
       if (qName.equalsIgnoreCase(mXmlTagContainingText)) {
         insideTextTag = true;
       }
@@ -130,14 +130,14 @@ public class XmlDetagger extends CasAnnotator_ImplBase {
     @Override
     public void characters(char[] ch, int start, int length) throws SAXException {
       if (insideTextTag) {
-        detaggedText.append(ch, start, length);        
+        detaggedText.append(ch, start, length);
       }
     }
-    
+
     @Override
     public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
       if (insideTextTag) {
-        detaggedText.append(ch, start, length);        
+        detaggedText.append(ch, start, length);
       }
     }
 
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/cas/PersonTitleAnnotator.java b/uimaj-examples/src/main/java/org/apache/uima/examples/cas/PersonTitleAnnotator.java
index 768eee1..6eca24f 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/cas/PersonTitleAnnotator.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/cas/PersonTitleAnnotator.java
@@ -79,7 +79,7 @@ public class PersonTitleAnnotator extends CasAnnotator_ImplBase {
    * The list of government titles, read from the GovernmentTitles configuration parameter.
    */
   private String[] mGovernmentTitles;
-  
+
   /**
    * Show warning message just once
    */
@@ -132,8 +132,8 @@ public class PersonTitleAnnotator extends CasAnnotator_ImplBase {
     }
 
     // Get the value for the "ContainingType" parameter if there is one
-    String containingTypeName = (String) getContext().getConfigParameterValue(
-            "ContainingAnnotationType");
+    String containingTypeName = (String) getContext()
+            .getConfigParameterValue("ContainingAnnotationType");
     if (containingTypeName != null) {
       mContainingType = aTypeSystem.getType(containingTypeName);
       if (mContainingType == null) {
@@ -157,13 +157,14 @@ public class PersonTitleAnnotator extends CasAnnotator_ImplBase {
     try {
       // If the ResultSpec doesn't include the PersonTitle type, we have
       // nothing to do.
-      if (!getResultSpecification().containsType("example.PersonTitle",aCAS.getDocumentLanguage())) {
+      if (!getResultSpecification().containsType("example.PersonTitle",
+              aCAS.getDocumentLanguage())) {
         if (!warningMsgShown) {
           String m = String.format(
-              "No output is being produced by the PersonTitleAnnotator because the Result Specification did not contain" +
-              " a request for the type example.PersonTitle with the language '%s'%n" +
-              "  (Note: this message will only be shown once.)%n", 
-              aCAS.getDocumentLanguage());               
+                  "No output is being produced by the PersonTitleAnnotator because the Result Specification did not contain"
+                          + " a request for the type example.PersonTitle with the language '%s'%n"
+                          + "  (Note: this message will only be shown once.)%n",
+                  aCAS.getDocumentLanguage());
           System.err.println(m);
           logger.log(Level.WARNING, m);
           warningMsgShown = true;
@@ -178,32 +179,32 @@ public class PersonTitleAnnotator extends CasAnnotator_ImplBase {
       } else {
         // Search only within annotations of type mContainingType
 
-        //v3
-        
-        for (Annotation annot : aCAS.<Annotation>select(mContainingType)) {
-          
-          String coveredText = annot.getCoveredText();  // Get text covered by this annotation
-          int annotBegin = annot.getBegin();            // Get begin position of this annotation
+        // v3
+
+        for (Annotation annot : aCAS.<Annotation> select(mContainingType)) {
+
+          String coveredText = annot.getCoveredText(); // Get text covered by this annotation
+          int annotBegin = annot.getBegin(); // Get begin position of this annotation
           annotateRange(aCAS, coveredText, annotBegin); // search for matches within this
-        
+
         }
-        
+
         // v2
-//        // Get an iterator over the annotations of type mContainingType.
-//        FSIterator it = aCAS.getAnnotationIndex(mContainingType).iterator();
-//        // Loop over the iterator.
-//        while (it.isValid()) {
-//          // Get the next annotation from the iterator
-//          AnnotationFS annot = (AnnotationFS) it.get();
-//          // Get text covered by this annotation
-//          String coveredText = annot.getCoveredText();
-//          // Get begin position of this annotation
-//          int annotBegin = annot.getBegin();
-//          // search for matches within this
-//          annotateRange(aCAS, coveredText, annotBegin);
-//          // Advance the iterator.
-//          it.moveToNext();
-//        }
+        // // Get an iterator over the annotations of type mContainingType.
+        // FSIterator it = aCAS.getAnnotationIndex(mContainingType).iterator();
+        // // Loop over the iterator.
+        // while (it.isValid()) {
+        // // Get the next annotation from the iterator
+        // AnnotationFS annot = (AnnotationFS) it.get();
+        // // Get text covered by this annotation
+        // String coveredText = annot.getCoveredText();
+        // // Get begin position of this annotation
+        // int annotBegin = annot.getBegin();
+        // // search for matches within this
+        // annotateRange(aCAS, coveredText, annotBegin);
+        // // Advance the iterator.
+        // it.moveToNext();
+        // }
       }
     } catch (Exception e) {
       throw new AnalysisEngineProcessException(e);
@@ -246,7 +247,7 @@ public class PersonTitleAnnotator extends CasAnnotator_ImplBase {
   protected void annotateRange(CAS aCAS, String aText, int aBeginPos, String aTitleType,
           String[] aTitles) {
     // Loop over the matchStrings.
-    
+
     for (int i = 0; i < aTitles.length; i++) {
       // logger.log("Looking for string: " + matchStrings[i]);
       // Find a first match, if it exists.
@@ -286,7 +287,8 @@ public class PersonTitleAnnotator extends CasAnnotator_ImplBase {
   protected void createAnnotation(CAS aCAS, int aBeginPos, int aEndPos, String aTitleType) {
     AnnotationFS title = aCAS.createAnnotation(mPersonTitleType, aBeginPos, aEndPos);
     // Set the "kind" feature if it's part of the ResultSpec
-    if (getResultSpecification().containsFeature("example.PersonTitle:Kind",aCAS.getDocumentLanguage())) {
+    if (getResultSpecification().containsFeature("example.PersonTitle:Kind",
+            aCAS.getDocumentLanguage())) {
       title.setStringValue(mPersonTitleKindFeature, aTitleType);
     }
     // Add the annotation to the index.
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java b/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java
index ab10cf0..69d4432 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/cas/RegExAnnotator.java
@@ -54,24 +54,24 @@ import org.apache.uima.util.Level;
  * <p>
  * This annotator takes the following optional configuration parameters:
  * <ul>
- * <li><code>Patterns</code> - array of Strings indicating regular expressions to match. The
- * pattern language is described at <a
- * href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html">
- * http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html</a>) </li>
+ * <li><code>Patterns</code> - array of Strings indicating regular expressions to match. The pattern
+ * language is described at
+ * <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html">
+ * http://java.sun.com/j2se/1.4.2/docs/api/java/util/regex/Pattern.html</a>)</li>
  * <li><code>TypeNames</code> - array of Strings indicating names of Types to be created from the
- * patterns. </li>
- * <li><code>ContainingAnnotationTypes</code> - an array of input annotation types. This
- * annotator will only produce new annotations that are contained within existing annotaions of
- * these types. (This is optional.) </li>
- * <li><code>AnnotateEntireContainedAnnotation</code> - When the ContainingAnnoationTypes
- * parameter is specified, a value of true for this parameter will cause the entire containing
- * annotation to be used as the span of the new annotation, rather than just the span of the regular
- * expression match. This can be used to "classify" previously created annotations according to
- * whether or not they contain text matching a regular expression. </li>
+ * patterns.</li>
+ * <li><code>ContainingAnnotationTypes</code> - an array of input annotation types. This annotator
+ * will only produce new annotations that are contained within existing annotaions of these types.
+ * (This is optional.)</li>
+ * <li><code>AnnotateEntireContainedAnnotation</code> - When the ContainingAnnoationTypes parameter
+ * is specified, a value of true for this parameter will cause the entire containing annotation to
+ * be used as the span of the new annotation, rather than just the span of the regular expression
+ * match. This can be used to "classify" previously created annotations according to whether or not
+ * they contain text matching a regular expression.</li>
  * </ul>
  * <p>
- * The indices of the <code>Patterns</code> and <code>TypeNames</code> arrays correspond, so
- * that a substring that matches <code>Patterns[i]</code> will result in an annotation of type
+ * The indices of the <code>Patterns</code> and <code>TypeNames</code> arrays correspond, so that a
+ * substring that matches <code>Patterns[i]</code> will result in an annotation of type
  * <code>TypeNames[i]</code>.
  * <p>
  * It is also possible to provide an external resource file that declares the annotation type names
@@ -104,11 +104,11 @@ public class RegExAnnotator extends CasAnnotator_ImplBase {
       // Retrieve configuration parameters
       String[] patternStrings = (String[]) getContext().getConfigParameterValue("Patterns");
       String[] typeNames = (String[]) getContext().getConfigParameterValue("TypeNames");
-      mContainingAnnotationTypeNames = (String[]) getContext().getConfigParameterValue(
-              "ContainingAnnotationTypes");
+      mContainingAnnotationTypeNames = (String[]) getContext()
+              .getConfigParameterValue("ContainingAnnotationTypes");
       if (mContainingAnnotationTypeNames != null && mContainingAnnotationTypeNames.length > 0) {
-        mAnnotateEntireContainingAnnotation = (Boolean) getContext().getConfigParameterValue(
-                "AnnotateEntireContainingAnnotation");
+        mAnnotateEntireContainingAnnotation = (Boolean) getContext()
+                .getConfigParameterValue("AnnotateEntireContainingAnnotation");
       } else {
         mAnnotateEntireContainingAnnotation = Boolean.FALSE;
       }
@@ -251,7 +251,7 @@ public class RegExAnnotator extends CasAnnotator_ImplBase {
    * parameters.
    * 
    * @param aCAS
-   *          the CAS to process 
+   *          the CAS to process
    * @throws AnalysisEngineProcessException
    *           if a failure occurs during processing.
    * 
@@ -275,7 +275,9 @@ public class RegExAnnotator extends CasAnnotator_ImplBase {
         // iterate over all annotation types for which we have patterns
         for (int j = 0; j < mCASTypes.length; j++) {
           // see if the ResultSpec contains this type
-          if (getResultSpecification().containsType(mCASTypes[j].getName(),aCAS.getDocumentLanguage()) || getResultSpecification().containsType(mCASTypes[j].getName())) {
+          if (getResultSpecification().containsType(mCASTypes[j].getName(),
+                  aCAS.getDocumentLanguage())
+                  || getResultSpecification().containsType(mCASTypes[j].getName())) {
             // try to match each pattern that we have for this annotation type
             for (int k = 0; k < mPatterns[j].length; k++) {
               int pos = 0;
@@ -311,8 +313,8 @@ public class RegExAnnotator extends CasAnnotator_ImplBase {
    * Utility method that determines which subranges of the document text should be annotated by this
    * annotator. This is done as follows:
    * <ul>
-   * <li>If <code>mContainingAnnotationTypes</code> is <code>null</code>, the entire document
-   * is eligible for annotation.</li>
+   * <li>If <code>mContainingAnnotationTypes</code> is <code>null</code>, the entire document is
+   * eligible for annotation.</li>
    * <li>If <code>mContainingAnnotationTypes</code> is not <code>null</code>, then each of its
    * elements is expected to be an Annotation Type name. The CAS is queried for existing annotations
    * of any of these Types, and the only subranges of the document eligible for annotation are those
@@ -369,7 +371,8 @@ public class RegExAnnotator extends CasAnnotator_ImplBase {
   private Pattern[][] mPatterns;
 
   /**
-   * The names of the CAS types that this annotator produces from the patterns in {@link #mPatterns}.
+   * The names of the CAS types that this annotator produces from the patterns in
+   * {@link #mPatterns}.
    */
   private ArrayList<String> mTypeNames;
 
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java b/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java
index 7f66ac7..f7d59b6 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/CasMultiplierExampleApplication.java
@@ -74,7 +74,7 @@ public class CasMultiplierExampleApplication {
 
       // pass the CAS to the AnalysisEngine and get back
       // a CasIterator for stepping over the output CASes that are produced.
-      
+
       CasIterator casIterator = ae.processAndOutputNewCASes(initialCas);
       while (casIterator.hasNext()) {
         CAS outCas = casIterator.next();
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextMerger.java b/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextMerger.java
index 27487fc..a1931af 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextMerger.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextMerger.java
@@ -49,13 +49,13 @@ import org.apache.uima.util.CasCopier;
  * that would also make this example more complicated.
  */
 public class SimpleTextMerger extends JCasMultiplier_ImplBase {
-  
+
   public static final String MESSAGE_DIGEST = "org.apache.uima.examples.casMultiplier.ExampleCasMultiplierMessages";
-  
+
   public static final String MISSING_SOURCE_DOCUMENT_INFO = "missing_source_document_info";
-  
+
   public static final String NO_NEXT_CAS = "no_next_cas";
-  
+
   private StringBuffer mDocBuf = new StringBuffer();
 
   private JCas mMergedCas;
@@ -67,7 +67,8 @@ public class SimpleTextMerger extends JCasMultiplier_ImplBase {
   /*
    * (non-Javadoc)
    * 
-   * @see org.apache.uima.analysis_component.AnalysisComponent_ImplBase#initialize(org.apache.uima.UimaContext)
+   * @see org.apache.uima.analysis_component.AnalysisComponent_ImplBase#initialize(org.apache.uima.
+   * UimaContext)
    */
   @Override
   public void initialize(UimaContext aContext) throws ResourceInitializationException {
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java b/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java
index 6912b81..8364413 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/casMultiplier/SimpleTextSegmenter.java
@@ -46,7 +46,8 @@ public class SimpleTextSegmenter extends JCasMultiplier_ImplBase {
   /*
    * (non-Javadoc)
    * 
-   * @see org.apache.uima.analysis_component.AnalysisComponent_ImplBase#initialize(org.apache.uima.UimaContext)
+   * @see org.apache.uima.analysis_component.AnalysisComponent_ImplBase#initialize(org.apache.uima.
+   * UimaContext)
    */
   @Override
   public void initialize(UimaContext aContext) throws ResourceInitializationException {
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/AnnotationPrinter.java b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/AnnotationPrinter.java
index ea13fac..f55f932 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/AnnotationPrinter.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/AnnotationPrinter.java
@@ -36,13 +36,12 @@ import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceProcessException;
 import org.apache.uima.util.ProcessTrace;
 
-
 /**
  * An example of CAS Consumer. <br>
  * AnnotationPrinter prints to an output file all annotations in the CAS. <br>
  * Parameters needed by the AnnotationPrinter are
  * <ol>
- * <li> "outputFile" : file to which the output files should be written.</li>
+ * <li>"outputFile" : file to which the output files should be written.</li>
  * </ol>
  * <br>
  * These parameters are set in the initialize method to the values specified in the descriptor file.
@@ -53,7 +52,7 @@ import org.apache.uima.util.ProcessTrace;
  */
 
 public class AnnotationPrinter extends CasConsumer_ImplBase implements CasObjectProcessor {
-  
+
   /** The out file. */
   File outFile;
 
@@ -88,8 +87,8 @@ public class AnnotationPrinter extends CasConsumer_ImplBase implements CasObject
     if (outFile.getParentFile() != null && !outFile.getParentFile().exists()) {
       if (!outFile.getParentFile().mkdirs())
         throw new ResourceInitializationException(
-                ResourceInitializationException.RESOURCE_DATA_NOT_VALID, new Object[] { oPath,
-                    "outputFile" });
+                ResourceInitializationException.RESOURCE_DATA_NOT_VALID,
+                new Object[] { oPath, "outputFile" });
     }
     try {
       fileWriter = new FileWriter(outFile);
@@ -170,8 +169,8 @@ public class AnnotationPrinter extends CasConsumer_ImplBase implements CasObject
    * @see org.apache.uima.collection.CasConsumer#batchProcessComplete(ProcessTrace)
    */
   @Override
-  public void batchProcessComplete(ProcessTrace aTrace) throws ResourceProcessException,
-          IOException {
+  public void batchProcessComplete(ProcessTrace aTrace)
+          throws ResourceProcessException, IOException {
     // nothing to do in this case as AnnotationPrinter doesnot do
     // anything cumulatively
   }
@@ -188,8 +187,8 @@ public class AnnotationPrinter extends CasConsumer_ImplBase implements CasObject
    * @see org.apache.uima.collection.CasConsumer#collectionProcessComplete(ProcessTrace)
    */
   @Override
-  public void collectionProcessComplete(ProcessTrace aTrace) throws ResourceProcessException,
-          IOException {
+  public void collectionProcessComplete(ProcessTrace aTrace)
+          throws ResourceProcessException, IOException {
     if (fileWriter != null) {
       fileWriter.close();
     }
@@ -221,8 +220,8 @@ public class AnnotationPrinter extends CasConsumer_ImplBase implements CasObject
         if (oFile.getParentFile() != null && !oFile.getParentFile().exists()) {
           if (!oFile.getParentFile().mkdirs())
             throw new ResourceConfigurationException(
-                    ResourceInitializationException.RESOURCE_DATA_NOT_VALID, new Object[] { oPath,
-                        "outputFile" });
+                    ResourceInitializationException.RESOURCE_DATA_NOT_VALID,
+                    new Object[] { oPath, "outputFile" });
         }
         fileWriter = new FileWriter(oFile);
       } catch (IOException e) {
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java
index 5f7c08c..5ace9a9 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/FileSystemCollectionReader.java
@@ -35,7 +35,6 @@ import org.apache.uima.util.FileUtils;
 import org.apache.uima.util.Progress;
 import org.apache.uima.util.ProgressImpl;
 
-
 /**
  * A simple collection reader that reads documents from a directory in the filesystem. It can be
  * configured with the following parameters:
@@ -67,11 +66,11 @@ public class FileSystemCollectionReader extends CollectionReader_ImplBase {
   public static final String PARAM_LANGUAGE = "Language";
 
   /**
-   * Name of optional configuration parameter that indicates including
-   * the subdirectories (recursively) of the current input directory.
+   * Name of optional configuration parameter that indicates including the subdirectories
+   * (recursively) of the current input directory.
    */
   public static final String PARAM_SUBDIR = "BrowseSubdirectories";
-  
+
   /** The m files. */
   private ArrayList<File> mFiles;
 
@@ -80,7 +79,7 @@ public class FileSystemCollectionReader extends CollectionReader_ImplBase {
 
   /** The m language. */
   private String mLanguage;
-  
+
   /** The m recursive. */
   private Boolean mRecursive;
 
@@ -90,14 +89,15 @@ public class FileSystemCollectionReader extends CollectionReader_ImplBase {
   /**
    * Initialize.
    *
-   * @throws ResourceInitializationException the resource initialization exception
+   * @throws ResourceInitializationException
+   *           the resource initialization exception
    * @see org.apache.uima.collection.CollectionReader_ImplBase#initialize()
    */
   @Override
   public void initialize() throws ResourceInitializationException {
     File directory = new File(((String) getConfigParameterValue(PARAM_INPUTDIR)).trim());
-    mEncoding  = (String) getConfigParameterValue(PARAM_ENCODING);
-    mLanguage  = (String) getConfigParameterValue(PARAM_LANGUAGE);
+    mEncoding = (String) getConfigParameterValue(PARAM_ENCODING);
+    mLanguage = (String) getConfigParameterValue(PARAM_LANGUAGE);
     mRecursive = (Boolean) getConfigParameterValue(PARAM_SUBDIR);
     if (null == mRecursive) { // could be null if not set, it is optional
       mRecursive = Boolean.FALSE;
@@ -115,13 +115,13 @@ public class FileSystemCollectionReader extends CollectionReader_ImplBase {
     mFiles = new ArrayList<>();
     addFilesFromDir(directory);
   }
-  
+
   /**
-   * This method adds files in the directory passed in as a parameter to mFiles.
-   * If mRecursive is true, it will include all files in all
-   * subdirectories (recursively), as well. 
+   * This method adds files in the directory passed in as a parameter to mFiles. If mRecursive is
+   * true, it will include all files in all subdirectories (recursively), as well.
    *
-   * @param dir the dir
+   * @param dir
+   *          the dir
    */
   private void addFilesFromDir(File dir) {
     File[] files = dir.listFiles();
@@ -148,9 +148,12 @@ public class FileSystemCollectionReader extends CollectionReader_ImplBase {
   /**
    * Gets the next.
    *
-   * @param aCAS the a CAS
-   * @throws IOException Signals that an I/O exception has occurred.
-   * @throws CollectionException the collection exception
+   * @param aCAS
+   *          the a CAS
+   * @throws IOException
+   *           Signals that an I/O exception has occurred.
+   * @throws CollectionException
+   *           the collection exception
    * @see org.apache.uima.collection.CollectionReader#getNext(org.apache.uima.cas.CAS)
    */
   @Override
@@ -165,7 +168,7 @@ public class FileSystemCollectionReader extends CollectionReader_ImplBase {
     // open input stream to file
     File file = (File) mFiles.get(mCurrentIndex++);
     String text = FileUtils.file2String(file, mEncoding);
-      // put document in CAS
+    // put document in CAS
     jcas.setDocumentText(text);
 
     // set language if it was explicitly specified as a configuration parameter
@@ -189,7 +192,8 @@ public class FileSystemCollectionReader extends CollectionReader_ImplBase {
   /**
    * Close.
    *
-   * @throws IOException Signals that an I/O exception has occurred.
+   * @throws IOException
+   *           Signals that an I/O exception has occurred.
    * @see org.apache.uima.collection.base_cpm.BaseCollectionReader#close()
    */
   @Override
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java
index fd6eeb5..cb4768f 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/InlineXmlCasConsumer.java
@@ -36,7 +36,6 @@ import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceProcessException;
 import org.apache.uima.util.CasToInlineXml;
 
-
 /**
  * A simple CAS consumer that generates inline XML and writes it to a file. UTF-8 encoding is used.
  * <p>
@@ -63,7 +62,9 @@ public class InlineXmlCasConsumer extends CasConsumer_ImplBase {
   /** The m doc num. */
   private int mDocNum;
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see org.apache.uima.collection.CasConsumer_ImplBase#initialize()
    */
   @Override
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/PersonTitleDBWriterCasConsumer.java b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/PersonTitleDBWriterCasConsumer.java
index c246b18..07c0f4f 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/PersonTitleDBWriterCasConsumer.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/PersonTitleDBWriterCasConsumer.java
@@ -39,7 +39,6 @@ import org.apache.uima.util.ProcessTrace;
 
 import example.PersonTitle;
 
-
 /**
  * A simple CAS consumer that creates a Derby (Cloudscape) database in the file system. You can
  * obtain this database from http://incubator.apache.org/derby/ *
@@ -47,7 +46,7 @@ import example.PersonTitle;
  * This CAS Consumer takes one parameters:
  * <ul>
  * <li><code>OutputDirectory</code> - path to directory which is the "System" directory for the
- * derby DB. </li>
+ * derby DB.</li>
  * </ul>
  * 
  * It deletes all the databases at the system location (!!!), Creates a new database (takes the most
@@ -106,7 +105,9 @@ public class PersonTitleDBWriterCasConsumer extends CasConsumer_ImplBase {
   /** The start time. */
   private long startTime;
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see org.apache.uima.collection.CasConsumer_ImplBase#initialize()
    */
   @Override
@@ -140,8 +141,8 @@ public class PersonTitleDBWriterCasConsumer extends CasConsumer_ImplBase {
    */
   @Override
   public void processCas(CAS aCAS) throws ResourceProcessException {
-    System.out.println("Time: " + (System.currentTimeMillis() - startTime)
-            + " DB Writer: ProcessCas called");
+    System.out.println(
+            "Time: " + (System.currentTimeMillis() - startTime) + " DB Writer: ProcessCas called");
     JCas jcas;
     try {
       jcas = aCAS.getJCas();
@@ -166,10 +167,8 @@ public class PersonTitleDBWriterCasConsumer extends CasConsumer_ImplBase {
         // (derby also has a network accessed database driver)
         if (firstEverCall) {
           firstEverCall = false;
-          System.out
-                  .println("Time: "
-                          + (System.currentTimeMillis() - startTime)
-                          + " DB Writer: Doing first process call ever (even during re-runs) initialization");
+          System.out.println("Time: " + (System.currentTimeMillis() - startTime)
+                  + " DB Writer: Doing first process call ever (even during re-runs) initialization");
           try {
             // note: newInstance() call is needed to reinitialize properly after
             // derby has been shutdown
@@ -212,10 +211,8 @@ public class PersonTitleDBWriterCasConsumer extends CasConsumer_ImplBase {
         }
 
         con = DriverManager.getConnection("jdbc:derby:ExamplePersonTitleDB;create=true");
-        System.out
-                .println("Time: "
-                        + (System.currentTimeMillis() - startTime)
-                        + " DB Writer: First Time Initiailization: Created the ExamplePersonTitleDB and connected to it.");
+        System.out.println("Time: " + (System.currentTimeMillis() - startTime)
+                + " DB Writer: First Time Initiailization: Created the ExamplePersonTitleDB and connected to it.");
 
         // Databases typically use user-names and passwords; these can
         // be passed as //properties to the getConnection method.
@@ -245,15 +242,15 @@ public class PersonTitleDBWriterCasConsumer extends CasConsumer_ImplBase {
       }
 
       // get the singleton instance of the SourceDocumentInformation
-      SourceDocumentInformation sdi = (SourceDocumentInformation) 
-              jcas.getAnnotationIndex(SourceDocumentInformation.type).iterator().next();
+      SourceDocumentInformation sdi = (SourceDocumentInformation) jcas
+              .getAnnotationIndex(SourceDocumentInformation.type).iterator().next();
 
       System.out.println("Time: " + (System.currentTimeMillis() - startTime)
               + " DB Writer: Processing doc: '" + sdi.getUri() + "'");
 
       stmt.setString(1, truncate(sdi.getUri(), MAX_URI_LENGTH));
-      for (FSIterator iter = jcas.getAnnotationIndex(PersonTitle.type).iterator(); 
-           iter.hasNext();) {
+      for (FSIterator iter = jcas.getAnnotationIndex(PersonTitle.type).iterator(); iter
+              .hasNext();) {
         PersonTitle pt = (PersonTitle) iter.next();
         stmt.setString(2, truncate(pt.getCoveredText(), MAX_TITLE_LENGTH));
         stmt.setInt(3, pt.getBegin());
@@ -293,12 +290,16 @@ public class PersonTitleDBWriterCasConsumer extends CasConsumer_ImplBase {
     }
   }
 
-  /* (non-Javadoc)
-   * @see org.apache.uima.collection.CasConsumer_ImplBase#collectionProcessComplete(org.apache.uima.util.ProcessTrace)
+  /*
+   * (non-Javadoc)
+   * 
+   * @see
+   * org.apache.uima.collection.CasConsumer_ImplBase#collectionProcessComplete(org.apache.uima.util.
+   * ProcessTrace)
    */
   @Override
-  public void collectionProcessComplete(ProcessTrace arg0) throws ResourceProcessException,
-          IOException {
+  public void collectionProcessComplete(ProcessTrace arg0)
+          throws ResourceProcessException, IOException {
     firstCall = true;
 
     try {
@@ -335,7 +336,8 @@ public class PersonTitleDBWriterCasConsumer extends CasConsumer_ImplBase {
   /**
    * Delete dir.
    *
-   * @param f the f
+   * @param f
+   *          the f
    */
   private void deleteDir(File f) {
     if (f.isDirectory()) {
@@ -350,8 +352,10 @@ public class PersonTitleDBWriterCasConsumer extends CasConsumer_ImplBase {
   /**
    * Truncate.
    *
-   * @param s the s
-   * @param length the length
+   * @param s
+   *          the s
+   * @param length
+   *          the length
    * @return the string
    */
   private String truncate(String s, int length) {
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPE.java b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPE.java
index a190eae..2b30378 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPE.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPE.java
@@ -31,7 +31,6 @@ import org.apache.uima.collection.StatusCallbackListener;
 import org.apache.uima.collection.metadata.CpeDescription;
 import org.apache.uima.util.XMLInputSource;
 
-
 /**
  * Main Class that runs a Collection Processing Engine (CPE). This class reads a CPE Descriptor as a
  * command-line argument and instantiates the CPE. It also registers a callback listener with the
@@ -47,15 +46,17 @@ public class SimpleRunCPE extends Thread {
 
   /** Start time of CPE initialization. */
   private long mStartTime;
-  
+
   /** Start time of the processing. */
   private long mInitCompleteTime;
 
   /**
    * Constructor for the class.
    *
-   * @param args          command line arguments into the program - see class description
-   * @throws Exception the exception
+   * @param args
+   *          command line arguments into the program - see class description
+   * @throws Exception
+   *           the exception
    */
   public SimpleRunCPE(String args[]) throws Exception {
     mStartTime = System.currentTimeMillis();
@@ -68,8 +69,8 @@ public class SimpleRunCPE extends Thread {
 
     // parse CPE descriptor
     System.out.println("Parsing CPE Descriptor");
-    CpeDescription cpeDesc = UIMAFramework.getXMLParser().parseCpeDescription(
-            new XMLInputSource(args[0]));
+    CpeDescription cpeDesc = UIMAFramework.getXMLParser()
+            .parseCpeDescription(new XMLInputSource(args[0]));
     // instantiate CPE
     System.out.println("Instantiating CPE");
     mCPE = UIMAFramework.produceCollectionProcessingEngine(cpeDesc);
@@ -93,7 +94,6 @@ public class SimpleRunCPE extends Thread {
     }
   }
 
-  
   /**
    * Prints the usage message.
    */
@@ -105,8 +105,10 @@ public class SimpleRunCPE extends Thread {
   /**
    * main class.
    *
-   * @param args          Command line arguments - see class description
-   * @throws Exception the exception
+   * @param args
+   *          Command line arguments - see class description
+   * @throws Exception
+   *           the exception
    */
   public static void main(String[] args) throws Exception {
     new SimpleRunCPE(args);
@@ -118,7 +120,7 @@ public class SimpleRunCPE extends Thread {
    * 
    */
   class StatusCallbackListenerImpl implements StatusCallbackListener {
-    
+
     /** The entity count. */
     int entityCount = 0;
 
@@ -131,7 +133,7 @@ public class SimpleRunCPE extends Thread {
      * @see StatusCallbackListener#initializationComplete()
      */
     @Override
-    public void initializationComplete() {      
+    public void initializationComplete() {
       System.out.println("CPM Initialization Complete");
       mInitCompleteTime = System.currentTimeMillis();
     }
@@ -166,13 +168,13 @@ public class SimpleRunCPE extends Thread {
         System.out.print("; " + size + " characters");
       }
       System.out.println();
-      long initTime = mInitCompleteTime - mStartTime; 
+      long initTime = mInitCompleteTime - mStartTime;
       long processingTime = time - mInitCompleteTime;
       long elapsedTime = initTime + processingTime;
       System.out.println("Total Time Elapsed: " + elapsedTime + " ms ");
       System.out.println("Initialization Time: " + initTime + " ms");
       System.out.println("Processing Time: " + processingTime + " ms");
-      
+
       System.out.println("\n\n ------------------ PERFORMANCE REPORT ------------------\n");
       System.out.println(mCPE.getPerformanceReport().toString());
       // stop the JVM. Otherwise main thread will still be blocked waiting for
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPM.java b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPM.java
index bfb8886..31ced1b 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPM.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/SimpleRunCPM.java
@@ -34,23 +34,22 @@ import org.apache.uima.collection.StatusCallbackListener;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.util.XMLInputSource;
 
-
 /**
  * Main Class that runs the Collection Processing Manager (CPM). This class reads descriptor files
  * and initiailizes the following components:
  * <ol>
- * <li> CollectionReader </li>
- * <li> Analysis Engine </li>
- * <li> CAS Consumer </li>
+ * <li>CollectionReader</li>
+ * <li>Analysis Engine</li>
+ * <li>CAS Consumer</li>
  * </ol>
  * <br>
  * It also registers a callback listener with the CPM, which will print progress and statistics to
  * System.out. <br>
  * Command lines arguments for the run are :
  * <ol>
- * <li> args[0] : CollectionReader descriptor file </li>
- * <li> args[1] : CAS Consumer descriptor file. </li>
- * <li> args[2] : AnnotationPrinter descriptor file </li>
+ * <li>args[0] : CollectionReader descriptor file</li>
+ * <li>args[1] : CAS Consumer descriptor file.</li>
+ * <li>args[2] : AnnotationPrinter descriptor file</li>
  * </ol>
  * <br>
  * Example : <br>
@@ -74,9 +73,12 @@ public class SimpleRunCPM extends Thread {
   /**
    * Constructor for the class.
    *
-   * @param args          command line arguments into the program - see class description
-   * @throws UIMAException the UIMA exception
-   * @throws IOException Signals that an I/O exception has occurred.
+   * @param args
+   *          command line arguments into the program - see class description
+   * @throws UIMAException
+   *           the UIMA exception
+   * @throws IOException
+   *           Signals that an I/O exception has occurred.
    */
   public SimpleRunCPM(String args[]) throws UIMAException, IOException {
     mStartTime = System.currentTimeMillis();
@@ -97,14 +99,14 @@ public class SimpleRunCPM extends Thread {
 
     // AnalysisEngine
     System.out.println("Initializing AnalysisEngine");
-    ResourceSpecifier aeSpecifier = UIMAFramework.getXMLParser().parseResourceSpecifier(
-            new XMLInputSource(args[1]));
+    ResourceSpecifier aeSpecifier = UIMAFramework.getXMLParser()
+            .parseResourceSpecifier(new XMLInputSource(args[1]));
     AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(aeSpecifier);
 
     // CAS Consumer
     System.out.println("Initializing CAS Consumer");
-    ResourceSpecifier consumerSpecifier = UIMAFramework.getXMLParser().parseCasConsumerDescription(
-            new XMLInputSource(args[2]));
+    ResourceSpecifier consumerSpecifier = UIMAFramework.getXMLParser()
+            .parseCasConsumerDescription(new XMLInputSource(args[2]));
     CasConsumer casConsumer = UIMAFramework.produceCasConsumer(consumerSpecifier);
 
     // create a new Collection Processing Manager
@@ -124,7 +126,6 @@ public class SimpleRunCPM extends Thread {
     mCPM.process(collectionReader, 10);
   }
 
-  
   /**
    * Prints the usage message.
    */
@@ -138,9 +139,12 @@ public class SimpleRunCPM extends Thread {
   /**
    * main class.
    *
-   * @param args          Command line arguments - see class description
-   * @throws UIMAException the UIMA exception
-   * @throws IOException Signals that an I/O exception has occurred.
+   * @param args
+   *          Command line arguments - see class description
+   * @throws UIMAException
+   *           the UIMA exception
+   * @throws IOException
+   *           Signals that an I/O exception has occurred.
    */
   public static void main(String[] args) throws UIMAException, IOException {
     new SimpleRunCPM(args);
@@ -152,7 +156,7 @@ public class SimpleRunCPM extends Thread {
    * 
    */
   class StatusCallbackListenerImpl implements StatusCallbackListener {
-    
+
     /** The entity count. */
     int entityCount = 0;
 
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java
index 3916b77..889cd61 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/cpe/XCasWriterCasConsumer.java
@@ -51,7 +51,6 @@ import org.apache.uima.resource.ResourceProcessException;
 import org.apache.uima.util.XMLSerializer;
 import org.xml.sax.SAXException;
 
-
 /**
  * A simple CAS consumer that generates XCAS (XML representation of the CAS) files in the
  * filesystem.
@@ -76,7 +75,9 @@ public class XCasWriterCasConsumer extends CasConsumer_ImplBase {
   /** The m doc num. */
   private int mDocNum;
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see org.apache.uima.collection.CasConsumer_ImplBase#initialize()
    */
   @Override
@@ -142,10 +143,14 @@ public class XCasWriterCasConsumer extends CasConsumer_ImplBase {
   /**
    * Serialize a CAS to a file in XCAS format.
    *
-   * @param aCas          CAS to serialize
-   * @param name          output file
-   * @throws IOException           if an I/O failure occurs
-   * @throws SAXException           if an error occurs generating the XML text
+   * @param aCas
+   *          CAS to serialize
+   * @param name
+   *          output file
+   * @throws IOException
+   *           if an I/O failure occurs
+   * @throws SAXException
+   *           if an error occurs generating the XML text
    */
   private void writeXCas(CAS aCas, File name) throws IOException, SAXException {
 
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java b/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java
index 5f5b39d..ea75009 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/flow/AdvancedFixedFlowController.java
@@ -46,7 +46,7 @@ public class AdvancedFixedFlowController extends CasFlowController_ImplBase {
   public static final String PARAM_ACTION_AFTER_CAS_MULTIPLIER = "ActionAfterCasMultiplier";
 
   public static final String PARAM_ALLOW_CONTINUE_ON_FAILURE = "AllowContinueOnFailure";
-  
+
   public static final String PARAM_FLOW = "Flow";
 
   private static final int ACTION_CONTINUE = 0;
@@ -60,14 +60,14 @@ public class AdvancedFixedFlowController extends CasFlowController_ImplBase {
   private ArrayList<Step> mSequence;
 
   private int mActionAfterCasMultiplier;
-  
+
   private Set<String> mAEsAllowingContinueOnFailure = new HashSet<>();
 
   @Override
-public void initialize(FlowControllerContext aContext) throws ResourceInitializationException {
+  public void initialize(FlowControllerContext aContext) throws ResourceInitializationException {
     super.initialize(aContext);
 
-    String[] flow = (String[])aContext.getConfigParameterValue(PARAM_FLOW);
+    String[] flow = (String[]) aContext.getConfigParameterValue(PARAM_FLOW);
     mSequence = new ArrayList<>();
     for (int i = 0; i < flow.length; i++) {
       String[] aes = flow[i].split(",");
@@ -77,7 +77,7 @@ public void initialize(FlowControllerContext aContext) throws ResourceInitializa
         Collection<String> keys = new ArrayList<>();
         keys.addAll(Arrays.asList(aes));
         mSequence.add(new ParallelStep(keys));
-      }            
+      }
     }
 
     String actionAfterCasMultiplier = (String) aContext
@@ -95,15 +95,13 @@ public void initialize(FlowControllerContext aContext) throws ResourceInitializa
     } else {
       throw new ResourceInitializationException(); // TODO
     }
-    
-    String[] aeKeysAllowingContinue = (String[])aContext
+
+    String[] aeKeysAllowingContinue = (String[]) aContext
             .getConfigParameterValue(PARAM_ALLOW_CONTINUE_ON_FAILURE);
     if (aeKeysAllowingContinue != null) {
       mAEsAllowingContinueOnFailure.addAll(Arrays.asList(aeKeysAllowingContinue));
     }
-    
-    
-      
+
   }
 
   /*
@@ -112,11 +110,13 @@ public void initialize(FlowControllerContext aContext) throws ResourceInitializa
    * @see org.apache.uima.flow.CasFlowController_ImplBase#computeFlow(org.apache.uima.cas.CAS)
    */
   @Override
-public Flow computeFlow(CAS aCAS) throws AnalysisEngineProcessException {
+  public Flow computeFlow(CAS aCAS) throws AnalysisEngineProcessException {
     return new FixedFlowObject(0);
   }
-  
-  /* (non-Javadoc)
+
+  /*
+   * (non-Javadoc)
+   * 
    * @see org.apache.uima.flow.FlowController_ImplBase#addAnalysisEngines(java.util.Collection)
    */
   @Override
@@ -127,24 +127,26 @@ public Flow computeFlow(CAS aCAS) throws AnalysisEngineProcessException {
     mSequence.add(new ParallelStep(new ArrayList<>(aKeys)));
   }
 
-  /* (non-Javadoc)
+  /*
+   * (non-Javadoc)
+   * 
    * @see org.apache.uima.flow.FlowController_ImplBase#removeAnalysisEngines(java.util.Collection)
    */
   @Override
-  public synchronized void removeAnalysisEngines(Collection<String> aKeys) throws AnalysisEngineProcessException {
+  public synchronized void removeAnalysisEngines(Collection<String> aKeys)
+          throws AnalysisEngineProcessException {
     // Remove keys from Sequence ... replace with null so step indices are still valid
     for (int i = 0; i < mSequence.size(); ++i) {
-      Step step = (Step)mSequence.get(i);
-      if (step instanceof SimpleStep && aKeys.contains(((SimpleStep)step).getAnalysisEngineKey())) {
+      Step step = (Step) mSequence.get(i);
+      if (step instanceof SimpleStep
+              && aKeys.contains(((SimpleStep) step).getAnalysisEngineKey())) {
         mSequence.set(i, null);
-      }
-      else if (step instanceof ParallelStep) {
+      } else if (step instanceof ParallelStep) {
         Collection<String> keys = new ArrayList<>(((ParallelStep) step).getAnalysisEngineKeys());
         keys.removeAll(aKeys);
         if (keys.isEmpty()) {
           mSequence.set(i, null);
-        }
-        else {
+        } else {
           mSequence.set(i, new ParallelStep(keys));
         }
       }
@@ -227,7 +229,7 @@ public Flow computeFlow(CAS aCAS) throws AnalysisEngineProcessException {
       // if next step is a CasMultiplier, set wasPassedToCasMultiplier to true for next time
       if (stepContainsCasMultiplier(nextStep)) {
         wasPassedToCasMultiplier = true;
-    }
+      }
 
       // now send the CAS to the next AE(s) in sequence.
       return nextStep;
@@ -236,26 +238,24 @@ public Flow computeFlow(CAS aCAS) throws AnalysisEngineProcessException {
     private boolean stepContainsCasMultiplier(Step nextStep) {
       if (nextStep instanceof SimpleStep) {
         AnalysisEngineMetaData md = (AnalysisEngineMetaData) getContext()
-          .getAnalysisEngineMetaDataMap().get(((SimpleStep)nextStep).getAnalysisEngineKey());
-        return md != null && md.getOperationalProperties() != null &&
-                md.getOperationalProperties().getOutputsNewCASes();
-      }
-      else if (nextStep instanceof ParallelStep) {
-        Iterator<String> iter = ((ParallelStep)nextStep).getAnalysisEngineKeys().iterator();
+                .getAnalysisEngineMetaDataMap().get(((SimpleStep) nextStep).getAnalysisEngineKey());
+        return md != null && md.getOperationalProperties() != null
+                && md.getOperationalProperties().getOutputsNewCASes();
+      } else if (nextStep instanceof ParallelStep) {
+        Iterator<String> iter = ((ParallelStep) nextStep).getAnalysisEngineKeys().iterator();
         while (iter.hasNext()) {
-          String key = (String)iter.next();
+          String key = (String) iter.next();
           AnalysisEngineMetaData md = (AnalysisEngineMetaData) getContext()
-            .getAnalysisEngineMetaDataMap().get(key);
-          if (md != null && md.getOperationalProperties() != null &&
-                  md.getOperationalProperties().getOutputsNewCASes()) {
+                  .getAnalysisEngineMetaDataMap().get(key);
+          if (md != null && md.getOperationalProperties() != null
+                  && md.getOperationalProperties().getOutputsNewCASes()) {
             return true;
-        }
+          }
         }
         return false;
-      }
-    else {
+      } else {
         return false;
-    }
+      }
     }
 
     /*
@@ -264,38 +264,40 @@ public Flow computeFlow(CAS aCAS) throws AnalysisEngineProcessException {
      * @see org.apache.uima.flow.CasFlow_ImplBase#newCasProduced(CAS, String)
      */
     @Override
-    public synchronized Flow newCasProduced(CAS newCas, String producedBy) throws AnalysisEngineProcessException {
+    public synchronized Flow newCasProduced(CAS newCas, String producedBy)
+            throws AnalysisEngineProcessException {
       // record that the input CAS has been segmented (affects its subsequent flow)
       casMultiplierProducedNewCas = true;
       // start the new output CAS from the next node after the CasMultiplier that produced it
       int i = 0;
-      while (!stepContains((Step)mSequence.get(i), producedBy)) {
+      while (!stepContains((Step) mSequence.get(i), producedBy)) {
         i++;
-    }
+      }
       return new FixedFlowObject(i + 1, true);
     }
 
     private boolean stepContains(Step step, String producedBy) {
       if (step instanceof SimpleStep) {
-        return ((SimpleStep)step).getAnalysisEngineKey().equals(producedBy);
-      }
-      else if (step instanceof ParallelStep) {
-        Iterator<String> iter = ((ParallelStep)step).getAnalysisEngineKeys().iterator();
+        return ((SimpleStep) step).getAnalysisEngineKey().equals(producedBy);
+      } else if (step instanceof ParallelStep) {
+        Iterator<String> iter = ((ParallelStep) step).getAnalysisEngineKeys().iterator();
         while (iter.hasNext()) {
-          String key = (String)iter.next();
+          String key = (String) iter.next();
           if (key.equals(producedBy)) {
             return true;
           }
         }
         return false;
-      }
-      else {
+      } else {
         return false;
       }
     }
-    
-    /* (non-Javadoc)
-     * @see org.apache.uima.flow.CasFlow_ImplBase#continueOnFailure(java.lang.String, java.lang.Exception)
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.uima.flow.CasFlow_ImplBase#continueOnFailure(java.lang.String,
+     * java.lang.Exception)
      */
     @Override
     public boolean continueOnFailure(String failedAeKey, Exception failure) {
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController.java b/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController.java
index c79e3ae..5a130fe 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController.java
@@ -55,11 +55,12 @@ public class WhiteboardFlowController extends CasFlowController_ImplBase {
    * UIMA logger instance we will use to log messages when flow decisions are made.
    */
   private Logger mLogger;
-  
-  
-  
-  /* (non-Javadoc)
-   * @see org.apache.uima.flow.FlowController_ImplBase#initialize(org.apache.uima.flow.FlowControllerContext)
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.uima.flow.FlowController_ImplBase#initialize(org.apache.uima.flow.
+   * FlowControllerContext)
    */
   @Override
   public void initialize(FlowControllerContext aContext) throws ResourceInitializationException {
@@ -76,8 +77,8 @@ public class WhiteboardFlowController extends CasFlowController_ImplBase {
   public Flow computeFlow(CAS aCAS) throws AnalysisEngineProcessException {
     WhiteboardFlow flow = new WhiteboardFlow();
     // No need to do the following as of release 2.3.0
-    //  because the framework automatically does this
-//    flow.setCas(aCAS);
+    // because the framework automatically does this
+    // flow.setCas(aCAS);
     return flow;
   }
 
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController2.java b/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController2.java
index a11639b..f82699d 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController2.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/flow/WhiteboardFlowController2.java
@@ -69,20 +69,24 @@ public class WhiteboardFlowController2 extends CasFlowController_ImplBase {
    * UIMA logger instance we will use to log messages when flow decisions are made.
    */
   private Logger mLogger;
-  
-  /* (non-Javadoc)
-   * @see org.apache.uima.flow.FlowController_ImplBase#initialize(org.apache.uima.flow.FlowControllerContext)
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.uima.flow.FlowController_ImplBase#initialize(org.apache.uima.flow.
+   * FlowControllerContext)
    */
   @Override
   public void initialize(FlowControllerContext aContext) throws ResourceInitializationException {
     super.initialize(aContext);
     mLogger = aContext.getLogger();
   }
-  
+
   /*
    * (non-Javadoc)
    * 
-   * @see org.apache.uima.flow.CasFlowController_ImplBase#typeSystemInit(org.apache.uima.cas.TypeSystem)
+   * @see
+   * org.apache.uima.flow.CasFlowController_ImplBase#typeSystemInit(org.apache.uima.cas.TypeSystem)
    */
   @Override
   public void typeSystemInit(TypeSystem aTypeSystem) throws AnalysisEngineProcessException {
@@ -128,8 +132,8 @@ public class WhiteboardFlowController2 extends CasFlowController_ImplBase {
   public Flow computeFlow(CAS aCAS) throws AnalysisEngineProcessException {
     WhiteboardFlow flow = new WhiteboardFlow();
     // No need to do the following as of release 2.3.0
-    //  because the framework automatically does this
-//    flow.setCas(aCAS);
+    // because the framework automatically does this
+    // flow.setCas(aCAS);
     return flow;
   }
 
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java b/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java
index fee58a6..c10a447 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Sentence.java
@@ -24,75 +24,83 @@ import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 import org.apache.uima.jcas.tcas.Annotation;
 
-
 /**
  * The Class Sentence.
  */
 public class Sentence extends Annotation {
 
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static String _TypeName = "org.apache.uima.examples.tokenizer.Sentence";
-  
-    /** The Constant typeIndexID. */
-    public static final int typeIndexID = JCasRegistry.register(Sentence.class);
 
-    /** The Constant type. */
-    public static final int type = typeIndexID;
+  /** The Constant typeIndexID. */
+  public static final int typeIndexID = JCasRegistry.register(Sentence.class);
+
+  /** The Constant type. */
+  public static final int type = typeIndexID;
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.uima.jcas.tcas.Annotation#getTypeIndexID()
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
 
-    /* (non-Javadoc)
-     * @see org.apache.uima.jcas.tcas.Annotation#getTypeIndexID()
-     */
-    @Override
-    public int getTypeIndexID() {
-        return typeIndexID;
-    }
+  /**
+   * Instantiates a new sentence.
+   */
+  // Never called. Disable default constructor
+  protected Sentence() {
+  }
 
-    /**
-     * Instantiates a new sentence.
-     */
-    // Never called. Disable default constructor
-    protected  Sentence() {
-    }
+  /**
+   * Internal - Constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   */
+  public Sentence(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
+  }
 
-    /**
-     *  Internal - Constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     */
-    public  Sentence(TypeImpl type, CASImpl casImpl) {
-        super(type, casImpl);
-    }
+  /**
+   * Instantiates a new sentence.
+   *
+   * @param jcas
+   *          the jcas
+   */
+  public Sentence(JCas jcas) {
+    super(jcas);
+  }
 
-    /**
-     * Instantiates a new sentence.
-     *
-     * @param jcas the jcas
-     */
-    public  Sentence(JCas jcas) {
-        super(jcas);
-    }
+  /**
+   * Instantiates a new sentence.
+   *
+   * @param jcas
+   *          the jcas
+   * @param start
+   *          the start
+   * @param end
+   *          the end
+   */
+  public Sentence(JCas jcas, int start, int end) {
+    super(jcas, start, end);
+  }
 
-    /**
-     * Instantiates a new sentence.
-     *
-     * @param jcas the jcas
-     * @param start the start
-     * @param end the end
-     */
-    public  Sentence(JCas jcas, int start, int end) {
-        super(jcas, start, end);
-    }
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
+  /**
+   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
    *
-   * @generated modifiable 
+   * @generated modifiable
    */
-  private void readObject() {/*default - does nothing empty block */}
-     
+  private void readObject() {
+    /* default - does nothing empty block */}
+
 }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/SimpleTokenAndSentenceAnnotator.java b/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/SimpleTokenAndSentenceAnnotator.java
index 0a6ad53..809130f 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/SimpleTokenAndSentenceAnnotator.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/SimpleTokenAndSentenceAnnotator.java
@@ -28,7 +28,6 @@ import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.tcas.Annotation;
 
-
 /**
  * An example annotator that annotates Tokens and Sentences.
  */
@@ -38,13 +37,16 @@ public class SimpleTokenAndSentenceAnnotator extends JCasAnnotator_ImplBase {
    * The Class Maker.
    */
   static abstract class Maker {
-    
+
     /**
      * New annotation.
      *
-     * @param jcas the jcas
-     * @param start the start
-     * @param end the end
+     * @param jcas
+     *          the jcas
+     * @param start
+     *          the start
+     * @param end
+     *          the end
      * @return the annotation
      */
     abstract Annotation newAnnotation(JCas jcas, int start, int end);
@@ -89,8 +91,11 @@ public class SimpleTokenAndSentenceAnnotator extends JCasAnnotator_ImplBase {
 
   // *************************************************************
   // * process *
-  /* (non-Javadoc)
-   * @see org.apache.uima.analysis_component.JCasAnnotator_ImplBase#process(org.apache.uima.jcas.JCas)
+  /*
+   * (non-Javadoc)
+   * 
+   * @see
+   * org.apache.uima.analysis_component.JCasAnnotator_ImplBase#process(org.apache.uima.jcas.JCas)
    */
   // *************************************************************
   @Override
@@ -108,14 +113,16 @@ public class SimpleTokenAndSentenceAnnotator extends JCasAnnotator_ImplBase {
   /**
    * Make annotations.
    *
-   * @param m the m
-   * @param b the b
+   * @param m
+   *          the m
+   * @param b
+   *          the b
    */
   // *************************************************************
   void makeAnnotations(Maker m, BreakIterator b) {
     b.setText(input);
-    for (int end = b.next(), start = b.first(); end != BreakIterator.DONE; start = end, end = b
-            .next()) {
+    for (int end = b.next(),
+            start = b.first(); end != BreakIterator.DONE; start = end, end = b.next()) {
       // eliminate all-whitespace tokens
       boolean isWhitespace = true;
       for (int i = start; i < end; i++) {
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java b/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java
index 7ec6b10..0e95e9d 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/tokenizer/Token.java
@@ -24,75 +24,83 @@ import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 import org.apache.uima.jcas.tcas.Annotation;
 
-
 /**
  * The Class Token.
  */
 public class Token extends Annotation {
 
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static String _TypeName = "org.apache.uima.examples.tokenizer.Token";
-  
-    /** The Constant typeIndexID. */
-    public static final int typeIndexID = JCasRegistry.register(Token.class);
 
-    /** The Constant type. */
-    public static final int type = typeIndexID;
+  /** The Constant typeIndexID. */
+  public static final int typeIndexID = JCasRegistry.register(Token.class);
+
+  /** The Constant type. */
+  public static final int type = typeIndexID;
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.uima.jcas.tcas.Annotation#getTypeIndexID()
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
 
-    /* (non-Javadoc)
-     * @see org.apache.uima.jcas.tcas.Annotation#getTypeIndexID()
-     */
-    @Override
-    public int getTypeIndexID() {
-        return typeIndexID;
-    }
+  /**
+   * Instantiates a new token.
+   */
+  // Never called. Disable default constructor
+  protected Token() {
+  }
 
-    /**
-     * Instantiates a new token.
-     */
-    // Never called. Disable default constructor
-    protected  Token() {
-    }
+  /**
+   * Internal - Constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   */
+  public Token(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
+  }
 
-    /**
-     *  Internal - Constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     */
-    public  Token(TypeImpl type, CASImpl casImpl) {
-        super(type, casImpl);
-    }
+  /**
+   * Instantiates a new token.
+   *
+   * @param jcas
+   *          the jcas
+   */
+  public Token(JCas jcas) {
+    super(jcas);
+  }
 
-    /**
-     * Instantiates a new token.
-     *
-     * @param jcas the jcas
-     */
-    public  Token(JCas jcas) {
-        super(jcas);
-    }
+  /**
+   * Instantiates a new token.
+   *
+   * @param jcas
+   *          the jcas
+   * @param start
+   *          the start
+   * @param end
+   *          the end
+   */
+  public Token(JCas jcas, int start, int end) {
+    super(jcas, start, end);
+  }
 
-    /**
-     * Instantiates a new token.
-     *
-     * @param jcas the jcas
-     * @param start the start
-     * @param end the end
-     */
-    public  Token(JCas jcas, int start, int end) {
-        super(jcas, start, end);
-    }
-  /** 
-   * <!-- begin-user-doc -->
-   * Write your own initialization here
-   * <!-- end-user-doc -->
+  /**
+   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->
    *
-   * @generated modifiable 
+   * @generated modifiable
    */
-  private void readObject() {/*default - does nothing empty block */}
-     
+  private void readObject() {
+    /* default - does nothing empty block */}
+
 }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java b/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java
index 9ce04fa..9d01def 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/Ecore2UimaTypeSystem.java
@@ -57,7 +57,6 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 
-
 /**
  * Converts an Ecore model to a UIMA TypeSystemDescription.
  */
@@ -161,10 +160,14 @@ public class Ecore2UimaTypeSystem {
   /**
    * E package 2 uima types.
    *
-   * @param aEPackage the a E package
-   * @param aResultTypes the a result types
-   * @param aOptions the a options
-   * @throws URISyntaxException the URI syntax exception
+   * @param aEPackage
+   *          the a E package
+   * @param aResultTypes
+   *          the a result types
+   * @param aOptions
+   *          the a options
+   * @throws URISyntaxException
+   *           the URI syntax exception
    */
   private static void ePackage2UimaTypes(EPackage aEPackage, List aResultTypes, Map aOptions)
           throws URISyntaxException {
@@ -201,14 +204,18 @@ public class Ecore2UimaTypeSystem {
   /**
    * Eclass 2 uima type.
    *
-   * @param aEClass the a E class
-   * @param aUimaNamespace the a uima namespace
-   * @param aOptions the a options
+   * @param aEClass
+   *          the a E class
+   * @param aUimaNamespace
+   *          the a uima namespace
+   * @param aOptions
+   *          the a options
    * @return the type description
-   * @throws URISyntaxException the URI syntax exception
+   * @throws URISyntaxException
+   *           the URI syntax exception
    */
-  private static TypeDescription eclass2UimaType(EClass aEClass, String aUimaNamespace, Map aOptions)
-          throws URISyntaxException {
+  private static TypeDescription eclass2UimaType(EClass aEClass, String aUimaNamespace,
+          Map aOptions) throws URISyntaxException {
     TypeDescription type = uimaFactory.createTypeDescription();
     // set name
     if (aUimaNamespace != null) {
@@ -252,9 +259,8 @@ public class Ecore2UimaTypeSystem {
       // if there are multiple supertypes, the first one is arbitrarily chosen
       // as the single supertype for the UIMA type. Other features are copied-down.
       if (supertypes.size() > 1) {
-        System.err.println("Warning: EClass " + aEClass.getName()
-                + " defines multiple supertypes. " + "The UIMA supertype will be "
-                + type.getSupertypeName()
+        System.err.println("Warning: EClass " + aEClass.getName() + " defines multiple supertypes. "
+                + "The UIMA supertype will be " + type.getSupertypeName()
                 + "; features inherited from other supertypes will be copied down.");
       }
     }
@@ -295,8 +301,10 @@ public class Ecore2UimaTypeSystem {
   /**
    * Contains named element.
    *
-   * @param locallyDefinedFeatures the locally defined features
-   * @param name the name
+   * @param locallyDefinedFeatures
+   *          the locally defined features
+   * @param name
+   *          the name
    * @return true, if successful
    */
   private static boolean containsNamedElement(EList locallyDefinedFeatures, String name) {
@@ -315,11 +323,15 @@ public class Ecore2UimaTypeSystem {
   /**
    * Eenum 2 uima type.
    *
-   * @param aEEnum the a E enum
-   * @param aUimaNamespace the a uima namespace
-   * @param aOptions the a options
+   * @param aEEnum
+   *          the a E enum
+   * @param aUimaNamespace
+   *          the a uima namespace
+   * @param aOptions
+   *          the a options
    * @return the type description
-   * @throws URISyntaxException the URI syntax exception
+   * @throws URISyntaxException
+   *           the URI syntax exception
    */
   private static TypeDescription eenum2UimaType(EEnum aEEnum, String aUimaNamespace, Map aOptions)
           throws URISyntaxException {
@@ -356,10 +368,13 @@ public class Ecore2UimaTypeSystem {
   /**
    * E structural feature 2 uima feature.
    *
-   * @param aStructuralFeature the a structural feature
-   * @param aOptions the a options
+   * @param aStructuralFeature
+   *          the a structural feature
+   * @param aOptions
+   *          the a options
    * @return -
-   * @throws URISyntaxException the URI syntax exception
+   * @throws URISyntaxException
+   *           the URI syntax exception
    */
   private static FeatureDescription eStructuralFeature2UimaFeature(
           EStructuralFeature aStructuralFeature, Map aOptions) throws URISyntaxException {
@@ -419,7 +434,8 @@ public class Ecore2UimaTypeSystem {
   /**
    * Checks if is array or list.
    *
-   * @param rangeTypeName the range type name
+   * @param rangeTypeName
+   *          the range type name
    * @return true, if is array or list
    */
   private static boolean isArrayOrList(String rangeTypeName) {
@@ -442,11 +458,15 @@ public class Ecore2UimaTypeSystem {
   /**
    * Gets the uima type name.
    *
-   * @param aEcoreType the a ecore type
-   * @param aMultiValued the a multi valued
-   * @param aOptions the a options
+   * @param aEcoreType
+   *          the a ecore type
+   * @param aMultiValued
+   *          the a multi valued
+   * @param aOptions
+   *          the a options
    * @return the uima type name
-   * @throws URISyntaxException the URI syntax exception
+   * @throws URISyntaxException
+   *           the URI syntax exception
    */
   private static String getUimaTypeName(EClassifier aEcoreType, boolean aMultiValued, Map aOptions)
           throws URISyntaxException {
@@ -473,10 +493,9 @@ public class Ecore2UimaTypeSystem {
       if (epackage != null) {
         String uimaNamespace = namespaceUri2UimaNamespace(epackage.getNsURI());
         if (uimaNamespace != null) {
-            return uimaNamespace + '.' + aEcoreType.getName();
-        }
-        else {
-            return aEcoreType.getName();
+          return uimaNamespace + '.' + aEcoreType.getName();
+        } else {
+          return aEcoreType.getName();
         }
       } else {
         return aEcoreType.getName();
@@ -484,8 +503,9 @@ public class Ecore2UimaTypeSystem {
     } else // primitive type
     {
       if (aEcoreType.equals(EcorePackage.eINSTANCE.getEInt())) {
-        return aMultiValued ? (useUimaLists ? CAS.TYPE_NAME_INTEGER_LIST
-                : CAS.TYPE_NAME_INTEGER_ARRAY) : CAS.TYPE_NAME_INTEGER;
+        return aMultiValued
+                ? (useUimaLists ? CAS.TYPE_NAME_INTEGER_LIST : CAS.TYPE_NAME_INTEGER_ARRAY)
+                : CAS.TYPE_NAME_INTEGER;
       } else if (aEcoreType.equals(EcorePackage.eINSTANCE.getEShort())) {
         return aMultiValued ? CAS.TYPE_NAME_SHORT_ARRAY : CAS.TYPE_NAME_SHORT;
       } else if (aEcoreType.equals(EcorePackage.eINSTANCE.getELong())) {
@@ -511,8 +531,9 @@ public class Ecore2UimaTypeSystem {
           System.err.println("Warning: unknown EDataType " + aEcoreType.getName()
                   + " being mapped to uima.cas.String.");
         }
-        return aMultiValued ? (useUimaLists ? CAS.TYPE_NAME_STRING_LIST
-                : CAS.TYPE_NAME_STRING_ARRAY) : CAS.TYPE_NAME_STRING;
+        return aMultiValued
+                ? (useUimaLists ? CAS.TYPE_NAME_STRING_LIST : CAS.TYPE_NAME_STRING_ARRAY)
+                : CAS.TYPE_NAME_STRING;
       }
     }
   }
@@ -520,9 +541,11 @@ public class Ecore2UimaTypeSystem {
   /**
    * Namespace uri 2 uima namespace.
    *
-   * @param nsUri the ns uri
+   * @param nsUri
+   *          the ns uri
    * @return the string
-   * @throws URISyntaxException the URI syntax exception
+   * @throws URISyntaxException
+   *           the URI syntax exception
    */
   private static String namespaceUri2UimaNamespace(String nsUri) throws URISyntaxException {
     // Check for the special "no namespace URI", which maps to the null UIMA namespace
@@ -540,10 +563,10 @@ public class Ecore2UimaTypeSystem {
     } else {
       // The URI is a URL
       while (uimaNs.startsWith("/")) {
-	uimaNs = uimaNs.substring(1);
+        uimaNs = uimaNs.substring(1);
       }
       if (uimaNs.endsWith(".ecore")) {
-	uimaNs = uimaNs.substring(0, uimaNs.length() - 6);
+        uimaNs = uimaNs.substring(0, uimaNs.length() - 6);
       }
       uimaNs = uimaNs.replace('/', '.');
     }
@@ -555,8 +578,10 @@ public class Ecore2UimaTypeSystem {
    * Main program. Takes two arguments: the filename of an input .ecore file and the filename of the
    * UIMA TypeSystem file to generate.
    *
-   * @param args the arguments
-   * @throws Exception the exception
+   * @param args
+   *          the arguments
+   * @throws Exception
+   *           the exception
    */
   public static void main(String[] args) throws Exception {
     if (args.length != 2) {
@@ -581,8 +606,8 @@ public class Ecore2UimaTypeSystem {
     try {
       CasCreationUtils.createCas(tsDesc, null, new FsIndexDescription[0]);
     } catch (Exception e) {
-      System.err
-              .println("Warning: CAS could not be created from the output type system.  The following problem occurred:");
+      System.err.println(
+              "Warning: CAS could not be created from the output type system.  The following problem occurred:");
       System.err.println(e.getMessage());
     }
   }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java b/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java
index cb6c8f3..3ee6b01 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/UimaTypeSystem2Ecore.java
@@ -54,38 +54,46 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 
-
 /**
  * Converts a UIMA TypeSystemDescription to an Ecore model.
  */
 public class UimaTypeSystem2Ecore {
-  
+
   /**
    * Converts a UIMA TypeSystem descriptor to an Ecore model.
    *
-   * @param aUimaTypeSystemFilePath          file path to UIMA TypeSystem descritpor
-   * @param aOutputResource          An EMF Resource to be populated with the Ecore model
-   * @param aOptions          a Map defining options for the conversion. Valid keys for this map are defined as
+   * @param aUimaTypeSystemFilePath
+   *          file path to UIMA TypeSystem descritpor
+   * @param aOutputResource
+   *          An EMF Resource to be populated with the Ecore model
+   * @param aOptions
+   *          a Map defining options for the conversion. Valid keys for this map are defined as
    *          constants on this class.
-   * @throws InvalidXMLException           if the TypeSystem descriptor, or one of its imports, is not valid or if there are
+   * @throws InvalidXMLException
+   *           if the TypeSystem descriptor, or one of its imports, is not valid or if there are
    *           duplicate, inconsistent definitions of the same type.
-   * @throws IOException           if an failure occur while reading the descriptor file
+   * @throws IOException
+   *           if an failure occur while reading the descriptor file
    */
   public static void uimaTypeSystem2Ecore(String aUimaTypeSystemFilePath, Resource aOutputResource,
           Map aOptions) throws InvalidXMLException, IOException {
-    TypeSystemDescription tsDesc = UIMAFramework.getXMLParser().parseTypeSystemDescription(
-            new XMLInputSource(aUimaTypeSystemFilePath));
+    TypeSystemDescription tsDesc = UIMAFramework.getXMLParser()
+            .parseTypeSystemDescription(new XMLInputSource(aUimaTypeSystemFilePath));
     uimaTypeSystem2Ecore(tsDesc, aOutputResource, aOptions);
   }
 
   /**
    * Converts a UIMA TypeSystemDescription to an Ecore model.
    *
-   * @param aTypeSystem          UIMA TypeSystemDescription object to convert
-   * @param aOutputResource          An EMF Resource to be populated with the Ecore model
-   * @param aOptions          a Map defining options for the conversion. Valid keys for this map are defined as
+   * @param aTypeSystem
+   *          UIMA TypeSystemDescription object to convert
+   * @param aOutputResource
+   *          An EMF Resource to be populated with the Ecore model
+   * @param aOptions
+   *          a Map defining options for the conversion. Valid keys for this map are defined as
    *          constants on this class.
-   * @throws InvalidXMLException           if the TypeSystem descriptor imports another descriptor that could not be
+   * @throws InvalidXMLException
+   *           if the TypeSystem descriptor imports another descriptor that could not be
    *           successfully parsed, or if there are duplicate, inconsistent definitions of the same
    *           type.
    */
@@ -97,14 +105,19 @@ public class UimaTypeSystem2Ecore {
   /**
    * Converts a UIMA TypeSystemDescription to an Ecore model.
    *
-   * @param aTypeSystem          UIMA TypeSystemDescription object to convert
-   * @param aOutputResource          An EMF Resource to be populated with the Ecore model
-   * @param aOptions          a Map defining options for the conversion. Valid keys for this map are defined as
+   * @param aTypeSystem
+   *          UIMA TypeSystemDescription object to convert
+   * @param aOutputResource
+   *          An EMF Resource to be populated with the Ecore model
+   * @param aOptions
+   *          a Map defining options for the conversion. Valid keys for this map are defined as
    *          constants on this class.
-   * @param aSchemaLocationMap          optional parameter - if non-null, this map will be populated with (Namespace URI,
+   * @param aSchemaLocationMap
+   *          optional parameter - if non-null, this map will be populated with (Namespace URI,
    *          Schema Location) pairs, suitable for inclusion in the "schemaLocation" attribute of
    *          XMI instance documents.
-   * @throws InvalidXMLException the invalid XML exception
+   * @throws InvalidXMLException
+   *           the invalid XML exception
    */
   public static void uimaTypeSystem2Ecore(TypeSystemDescription aTypeSystem,
           Resource aOutputResource, Map aOptions, Map aSchemaLocationMap)
@@ -123,7 +136,8 @@ public class UimaTypeSystem2Ecore {
 
     // merge, to eliminate duplicate type definitions
     try {
-      aTypeSystem = CasCreationUtils.mergeTypeSystems(Arrays.asList(new TypeSystemDescription[] { aTypeSystem }));
+      aTypeSystem = CasCreationUtils
+              .mergeTypeSystems(Arrays.asList(new TypeSystemDescription[] { aTypeSystem }));
     } catch (ResourceInitializationException e) {
       throw new InvalidXMLException(e);
     }
@@ -173,7 +187,7 @@ public class UimaTypeSystem2Ecore {
         String supertypeName = type.getSupertypeName();
         EClassifier superclass = lookupEClassifierForType(supertypeName); // creates EClass if not
         // already existing
-        eclass.getESuperTypes().add((EClass)superclass);
+        eclass.getESuperTypes().add((EClass) superclass);
 
         // set features
         FeatureDescription[] features = type.getFeatures();
@@ -201,8 +215,10 @@ public class UimaTypeSystem2Ecore {
   /**
    * Load uima builtins ecore.
    *
-   * @param resourceSet the resource set
-   * @param aSchemaLocationMap the a schema location map
+   * @param resourceSet
+   *          the resource set
+   * @param aSchemaLocationMap
+   *          the a schema location map
    * @return the resource
    */
   private static Resource loadUimaBuiltinsEcore(ResourceSet resourceSet, Map aSchemaLocationMap) {
@@ -233,8 +249,10 @@ public class UimaTypeSystem2Ecore {
   /**
    * Uima type 2 E classifier.
    *
-   * @param aType the a type
-   * @param aOptions the a options
+   * @param aType
+   *          the a type
+   * @param aOptions
+   *          the a options
    * @return the e classifier
    */
   private static EClassifier uimaType2EClassifier(TypeDescription aType, Map aOptions) {
@@ -292,15 +310,17 @@ public class UimaTypeSystem2Ecore {
   /**
    * Uima feature 2 E structural feature.
    *
-   * @param aFeature the a feature
-   * @param aOptions the a options
+   * @param aFeature
+   *          the a feature
+   * @param aOptions
+   *          the a options
    * @return the e structural feature
    */
   private static EStructuralFeature uimaFeature2EStructuralFeature(FeatureDescription aFeature,
           Map aOptions) {
     String range = aFeature.getRangeTypeName();
-    boolean multiRefAllowed = aFeature.getMultipleReferencesAllowed() == null ? false : aFeature
-        .getMultipleReferencesAllowed();
+    boolean multiRefAllowed = aFeature.getMultipleReferencesAllowed() == null ? false
+            : aFeature.getMultipleReferencesAllowed();
     EStructuralFeature efeat;
     // map primitive types to EAttributes
     if (CAS.TYPE_NAME_STRING.equals(range)) {
@@ -334,9 +354,8 @@ public class UimaTypeSystem2Ecore {
       efeat = EcoreFactory.eINSTANCE.createEAttribute();
       efeat.setEType(EcorePackage.eINSTANCE.getEString());
       efeat.setUpperBound(-1);
-    } else if ((CAS.TYPE_NAME_INTEGER_ARRAY.equals(range) || CAS.TYPE_NAME_INTEGER_LIST
-            .equals(range))
-            && !multiRefAllowed) {
+    } else if ((CAS.TYPE_NAME_INTEGER_ARRAY.equals(range)
+            || CAS.TYPE_NAME_INTEGER_LIST.equals(range)) && !multiRefAllowed) {
       efeat = EcoreFactory.eINSTANCE.createEAttribute();
       efeat.setEType(EcorePackage.eINSTANCE.getEInt());
       efeat.setUpperBound(-1);
@@ -420,7 +439,8 @@ public class UimaTypeSystem2Ecore {
   /**
    * Lookup E classifier for type.
    *
-   * @param aFullTypeName the a full type name
+   * @param aFullTypeName
+   *          the a full type name
    * @return the e classifier
    */
   private static EClassifier lookupEClassifierForType(String aFullTypeName) {
@@ -491,7 +511,8 @@ public class UimaTypeSystem2Ecore {
   /**
    * Uima namespace 2 namespace uri.
    *
-   * @param uimaNamespace the uima namespace
+   * @param uimaNamespace
+   *          the uima namespace
    * @return the string
    */
   private static String uimaNamespace2NamespaceUri(String uimaNamespace) {
@@ -508,8 +529,10 @@ public class UimaTypeSystem2Ecore {
    * Main program. Takes two arguments: the filename of an input TypeSystem descriptor file and the
    * filename of the Ecore/XMI file to generate.
    *
-   * @param args the arguments
-   * @throws Exception the exception
+   * @param args
+   *          the arguments
+   * @throws Exception
+   *           the exception
    */
   public static void main(String[] args) throws Exception {
     // register default resource factory
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiCollectionReader.java b/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiCollectionReader.java
index 87ad67f..b4ce927 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiCollectionReader.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiCollectionReader.java
@@ -44,15 +44,15 @@ public class XmiCollectionReader extends CollectionReader_ImplBase {
    * files.
    */
   public static final String PARAM_INPUTDIR = "InputDirectory";
-  
+
   /**
-   * Name of the configuration parameter that must be set to indicate if the
-   * execution fails if an encountered type is unknown
+   * Name of the configuration parameter that must be set to indicate if the execution fails if an
+   * encountered type is unknown
    */
   public static final String PARAM_FAILUNKNOWN = "FailOnUnknownType";
 
   private Boolean mFailOnUnknownType;
-  
+
   private ArrayList mFiles;
 
   private int mCurrentIndex;
@@ -62,10 +62,10 @@ public class XmiCollectionReader extends CollectionReader_ImplBase {
    */
   @Override
   public void initialize() throws ResourceInitializationException {
-	mFailOnUnknownType = (Boolean) getConfigParameterValue(PARAM_FAILUNKNOWN);
-	if (null == mFailOnUnknownType) {
-	  mFailOnUnknownType = true;  // default to true if not specified
-	}
+    mFailOnUnknownType = (Boolean) getConfigParameterValue(PARAM_FAILUNKNOWN);
+    if (null == mFailOnUnknownType) {
+      mFailOnUnknownType = true; // default to true if not specified
+    }
     File directory = new File(((String) getConfigParameterValue(PARAM_INPUTDIR)).trim());
     mCurrentIndex = 0;
 
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java b/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java
index 94cc960..f19eed3 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiEcoreCasConsumer.java
@@ -88,8 +88,8 @@ public class XmiEcoreCasConsumer extends CasConsumer_ImplBase {
     if (!mOutputDir.exists()) {
       mOutputDir.mkdirs();
     }
-    writeEcoreTypeSystem = Boolean.TRUE.equals(getUimaContext().getConfigParameterValue(
-            PARAM_WRITE_ECORE_TYPESYSTEM));
+    writeEcoreTypeSystem = Boolean.TRUE
+            .equals(getUimaContext().getConfigParameterValue(PARAM_WRITE_ECORE_TYPESYSTEM));
   }
 
   /**
@@ -153,30 +153,34 @@ public class XmiEcoreCasConsumer extends CasConsumer_ImplBase {
    *          CAS to serialize
    * @param name
    *          output file
-   * @throws SAXException -
-   * @throws Exception -
+   * @throws SAXException
+   *           -
+   * @throws Exception
+   *           -
    * 
-   * @throws ResourceProcessException -
+   * @throws ResourceProcessException
+   *           -
    */
-  private void writeXmi(CAS aCas, File name, String modelFileName) throws IOException, SAXException {
+  private void writeXmi(CAS aCas, File name, String modelFileName)
+          throws IOException, SAXException {
     FileOutputStream out = null;
 
     try {
       // Generate E-core for type system, but only once
       if (writeEcoreTypeSystem && !isModelGenerated) {
-        TypeSystemDescription tsDesc = TypeSystemUtil.typeSystem2TypeSystemDescription(aCas
-                .getTypeSystem());
+        TypeSystemDescription tsDesc = TypeSystemUtil
+                .typeSystem2TypeSystemDescription(aCas.getTypeSystem());
         // register default resource factory
         Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*",
                 new XMIResourceFactoryImpl());
         ResourceSet resourceSet = new ResourceSetImpl();
-        URI outputURI = URI.createFileURI(new File(mOutputDir, "typesystem.ecore")
-                .getAbsolutePath());
+        URI outputURI = URI
+                .createFileURI(new File(mOutputDir, "typesystem.ecore").getAbsolutePath());
         Resource outputResource = resourceSet.createResource(outputURI);
         schemaLocationMap = new HashMap();
         try {
-          UimaTypeSystem2Ecore
-                  .uimaTypeSystem2Ecore(tsDesc, outputResource, null, schemaLocationMap);
+          UimaTypeSystem2Ecore.uimaTypeSystem2Ecore(tsDesc, outputResource, null,
+                  schemaLocationMap);
         } catch (InvalidXMLException e) {
           // this should not happen. TypeSystemUtil.typeSystem2TypeSystemDescription
           // should never produce an invalid TypeSystemDescription!
diff --git a/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java b/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java
index 0e19e0f..1913d90 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/examples/xmi/XmiWriterCasConsumer.java
@@ -109,7 +109,7 @@ public class XmiWriterCasConsumer extends CasConsumer_ImplBase {
       }
     }
     if (outFile == null) {
-      outFile = new File(mOutputDir, "doc" + mDocNum++ + ".xmi");     
+      outFile = new File(mOutputDir, "doc" + mDocNum++ + ".xmi");
     }
     // serialize XCAS and write to output file
     try {
@@ -128,12 +128,16 @@ public class XmiWriterCasConsumer extends CasConsumer_ImplBase {
    *          CAS to serialize
    * @param name
    *          output file
-   * @throws SAXException -
-   * @throws Exception -
+   * @throws SAXException
+   *           -
+   * @throws Exception
+   *           -
    * 
-   * @throws ResourceProcessException -
+   * @throws ResourceProcessException
+   *           -
    */
-  private void writeXmi(CAS aCas, File name, String modelFileName) throws IOException, SAXException {
+  private void writeXmi(CAS aCas, File name, String modelFileName)
+          throws IOException, SAXException {
 
     try (OutputStream out = new FileOutputStream(name)) {
       // write XMI
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java
index 948c071..8a51d21 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateAnnot.java
@@ -23,94 +23,104 @@ import org.apache.uima.cas.impl.TypeImpl;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 
-
-/** 
- * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017
- * XML source: C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * @generated */
+/**
+ * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017 XML source:
+ * C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
+ * 
+ * @generated
+ */
 public class DateAnnot extends DateTimeAnnot {
 
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static String _TypeName = "org.apache.uima.tutorial.DateAnnot";
-  
-    /**
-     * The Constant typeIndexID.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int typeIndexID = JCasRegistry.register(DateAnnot.class);
 
-    /**
-     * The Constant type.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int type = typeIndexID;
+  /**
+   * The Constant typeIndexID.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int typeIndexID = JCasRegistry.register(DateAnnot.class);
+
+  /**
+   * The Constant type.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int type = typeIndexID;
+
+  /**
+   * Gets the type index ID.
+   *
+   * @return the type index ID
+   * @generated
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
 
-    /**
-     * Gets the type index ID.
-     *
-     * @return the type index ID
-     * @generated 
-     */
-    @Override
-    public int getTypeIndexID() {return typeIndexID;}
- 
- 
-    /**
+  /**
    * Never called. Disable default constructor
    *
    * @generated
    */
-    protected  DateAnnot() {/* intentionally empty block */}
-    
-    /**
-     * Internal - constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     * @generated 
-     */
-    public  DateAnnot(TypeImpl type, CASImpl casImpl) {
+  protected DateAnnot() {
+    /* intentionally empty block */}
+
+  /**
+   * Internal - constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   * @generated
+   */
+  public DateAnnot(TypeImpl type, CASImpl casImpl) {
     super(type, casImpl);
     readObject();
   }
-  
-    /**
-     * Instantiates a new date annot.
-     *
-     * @param jcas the jcas
-     * @generated 
-     */
-    public  DateAnnot(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
 
+  /**
+   * Instantiates a new date annot.
+   *
+   * @param jcas
+   *          the jcas
+   * @generated
+   */
+  public DateAnnot(JCas jcas) {
+    super(jcas);
+    readObject();
+  }
 
-    /**
-     * Instantiates a new date annot.
-     *
-     * @param jcas the jcas
-     * @param begin the begin
-     * @param end the end
-     */
-    public  DateAnnot(JCas jcas, int begin, int end) {
-        super(jcas);
-        setBegin(begin);
-        setEnd(end);
-        readObject();
-    }
+  /**
+   * Instantiates a new date annot.
+   *
+   * @param jcas
+   *          the jcas
+   * @param begin
+   *          the begin
+   * @param end
+   *          the end
+   */
+  public DateAnnot(JCas jcas, int begin, int end) {
+    super(jcas);
+    setBegin(begin);
+    setEnd(end);
+    readObject();
+  }
 
-  /** 
+  /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->*
-   * @generated modifiable 
+   * 
+   * @generated modifiable
    */
-    private void readObject() {
-    }
+  private void readObject() {
+  }
 }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java
index 0181bc4..89338e7 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/DateTimeAnnot.java
@@ -28,127 +28,139 @@ import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 import org.apache.uima.jcas.tcas.Annotation;
 
-
-/** 
- * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017
- * XML source: C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * @generated */
+/**
+ * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017 XML source:
+ * C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
+ * 
+ * @generated
+ */
 public class DateTimeAnnot extends Annotation {
 
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static String _TypeName = "org.apache.uima.tutorial.DateTimeAnnot";
-  
-    /**
-     * The Constant typeIndexID.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int typeIndexID = JCasRegistry.register(DateTimeAnnot.class);
-
-    /**
-     * The Constant type.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int type = typeIndexID;
-
-    /**
-     * Gets the type index ID.
-     *
-     * @return the type index ID
-     * @generated 
-     */
-    @Override
-    public int getTypeIndexID() {return typeIndexID;}
- 
- 
-  /* *******************
-   *   Feature Offsets *
-   * *******************/ 
-   
-  public final static String _FeatName_shortDateString = "shortDateString";
 
+  /**
+   * The Constant typeIndexID.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int typeIndexID = JCasRegistry.register(DateTimeAnnot.class);
+
+  /**
+   * The Constant type.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int type = typeIndexID;
+
+  /**
+   * Gets the type index ID.
+   *
+   * @return the type index ID
+   * @generated
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
+
+  /*
+   * ******************* Feature Offsets *
+   *******************/
+
+  public final static String _FeatName_shortDateString = "shortDateString";
 
   /* Feature Adjusted Offsets */
-  private final static CallSite _FC_shortDateString = TypeSystemImpl.createCallSite(DateTimeAnnot.class, "shortDateString");
+  private final static CallSite _FC_shortDateString = TypeSystemImpl
+          .createCallSite(DateTimeAnnot.class, "shortDateString");
   private final static MethodHandle _FH_shortDateString = _FC_shortDateString.dynamicInvoker();
 
-   
   /**
    * Never called. Disable default constructor
    *
    * @generated
    */
-    protected  DateTimeAnnot() {/* intentionally empty block */}
-    
-    /**
-     * Internal - constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     * @generated 
-     */
-    public  DateTimeAnnot(TypeImpl type, CASImpl casImpl) {
+  protected DateTimeAnnot() {
+    /* intentionally empty block */}
+
+  /**
+   * Internal - constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   * @generated
+   */
+  public DateTimeAnnot(TypeImpl type, CASImpl casImpl) {
     super(type, casImpl);
     readObject();
   }
-  
-    /**
-     * Instantiates a new date time annot.
-     *
-     * @param jcas the jcas
-     * @generated 
-     */
-    public  DateTimeAnnot(JCas jcas) {
+
+  /**
+   * Instantiates a new date time annot.
+   *
+   * @param jcas
+   *          the jcas
+   * @generated
+   */
+  public DateTimeAnnot(JCas jcas) {
+    super(jcas);
+    readObject();
+  }
+
+  /**
+   * Instantiates a new date time annot.
+   *
+   * @param jcas
+   *          the jcas
+   * @param begin
+   *          the begin
+   * @param end
+   *          the end
+   */
+  public DateTimeAnnot(JCas jcas, int begin, int end) {
     super(jcas);
-    readObject();   
-  } 
-
-
-    /**
-     * Instantiates a new date time annot.
-     *
-     * @param jcas the jcas
-     * @param begin the begin
-     * @param end the end
-     */
-    public  DateTimeAnnot(JCas jcas, int begin, int end) {
-        super(jcas);
-        setBegin(begin);
-        setEnd(end);
-        readObject();
-    }
-
-  /** 
+    setBegin(begin);
+    setEnd(end);
+    readObject();
+  }
+
+  /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->*
-   * @generated modifiable 
+   * 
+   * @generated modifiable
+   */
+  private void readObject() {
+  }
+
+  // *--------------*
+  // * Feature: shortDateString
+  /**
+   * getter for shortDateString - gets.
+   *
+   * @return the short date string
+   * @generated
    */
-    private void readObject() {
-    }
-
-    // *--------------*
-    // * Feature: shortDateString
-    /**
-     * getter for shortDateString - gets.
-     *
-     * @return the short date string
-     * @generated 
-     */
-    public String getShortDateString() { return _getStringValueNc(wrapGetIntCatchException(_FH_shortDateString));}
-    
-    /**
-     * setter for shortDateString - sets.
-     *
-     * @param v the new short date string
-     * @generated 
-     */
-    public void setShortDateString(String v) {
+  public String getShortDateString() {
+    return _getStringValueNc(wrapGetIntCatchException(_FH_shortDateString));
+  }
+
+  /**
+   * setter for shortDateString - sets.
+   *
+   * @param v
+   *          the new short date string
+   * @generated
+   */
+  public void setShortDateString(String v) {
     _setStringValueNfc(wrapGetIntCatchException(_FH_shortDateString), v);
-  }    
-    
   }
+
+}
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java
index 28f4197..7089e0f 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/Meeting.java
@@ -28,229 +28,255 @@ import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 import org.apache.uima.jcas.tcas.Annotation;
 
-
-/** 
- * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017
- * XML source: C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * @generated */
+/**
+ * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017 XML source:
+ * C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
+ * 
+ * @generated
+ */
 public class Meeting extends Annotation {
 
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static String _TypeName = "org.apache.uima.tutorial.Meeting";
-  
-    /**
-     * The Constant typeIndexID.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int typeIndexID = JCasRegistry.register(Meeting.class);
 
-    /**
-     * The Constant type.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int type = typeIndexID;
+  /**
+   * The Constant typeIndexID.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int typeIndexID = JCasRegistry.register(Meeting.class);
+
+  /**
+   * The Constant type.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int type = typeIndexID;
+
+  /**
+   * Gets the type index ID.
+   *
+   * @return the type index ID
+   * @generated
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
+
+  /*
+   * ******************* Feature Offsets *
+   *******************/
 
-    /**
-     * Gets the type index ID.
-     *
-     * @return the type index ID
-     * @generated 
-     */
-    @Override
-    public int getTypeIndexID() {return typeIndexID;}
- 
- 
-  /* *******************
-   *   Feature Offsets *
-   * *******************/ 
-   
   public final static String _FeatName_room = "room";
   public final static String _FeatName_date = "date";
   public final static String _FeatName_startTime = "startTime";
   public final static String _FeatName_endTime = "endTime";
 
-
   /* Feature Adjusted Offsets */
   private final static CallSite _FC_room = TypeSystemImpl.createCallSite(Meeting.class, "room");
   private final static MethodHandle _FH_room = _FC_room.dynamicInvoker();
   private final static CallSite _FC_date = TypeSystemImpl.createCallSite(Meeting.class, "date");
   private final static MethodHandle _FH_date = _FC_date.dynamicInvoker();
-  private final static CallSite _FC_startTime = TypeSystemImpl.createCallSite(Meeting.class, "startTime");
+  private final static CallSite _FC_startTime = TypeSystemImpl.createCallSite(Meeting.class,
+          "startTime");
   private final static MethodHandle _FH_startTime = _FC_startTime.dynamicInvoker();
-  private final static CallSite _FC_endTime = TypeSystemImpl.createCallSite(Meeting.class, "endTime");
+  private final static CallSite _FC_endTime = TypeSystemImpl.createCallSite(Meeting.class,
+          "endTime");
   private final static MethodHandle _FH_endTime = _FC_endTime.dynamicInvoker();
 
-   
-
-    /**
+  /**
    * Never called. Disable default constructor
    *
    * @generated
    */
-    protected  Meeting() {/* intentionally empty block */}
-    
-    /**
-     * Internal - constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     * @generated 
-     */
-    public  Meeting(TypeImpl type, CASImpl casImpl) {
+  protected Meeting() {
+    /* intentionally empty block */}
+
+  /**
+   * Internal - constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   * @generated
+   */
+  public Meeting(TypeImpl type, CASImpl casImpl) {
     super(type, casImpl);
     readObject();
   }
-  
-    /**
-     * Instantiates a new meeting.
-     *
-     * @param jcas the jcas
-     * @generated 
-     */
-    public  Meeting(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
 
+  /**
+   * Instantiates a new meeting.
+   *
+   * @param jcas
+   *          the jcas
+   * @generated
+   */
+  public Meeting(JCas jcas) {
+    super(jcas);
+    readObject();
+  }
 
-    /**
-     * Instantiates a new meeting.
-     *
-     * @param jcas the jcas
-     * @param begin the begin
-     * @param end the end
-     */
-    public  Meeting(JCas jcas, int begin, int end) {
-        super(jcas);
-        setBegin(begin);
-        setEnd(end);
-        readObject();
-    }
+  /**
+   * Instantiates a new meeting.
+   *
+   * @param jcas
+   *          the jcas
+   * @param begin
+   *          the begin
+   * @param end
+   *          the end
+   */
+  public Meeting(JCas jcas, int begin, int end) {
+    super(jcas);
+    setBegin(begin);
+    setEnd(end);
+    readObject();
+  }
 
-  /** 
+  /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->*
-   * @generated modifiable 
+   * 
+   * @generated modifiable
+   */
+  private void readObject() {
+  }
+
+  // *--------------*
+  // * Feature: room
+  /**
+   * getter for room - gets.
+   *
+   * @return the room
+   * @generated
    */
-    private void readObject() {
-    }
+  public RoomNumber getRoom() {
+    return (RoomNumber) (_getFeatureValueNc(wrapGetIntCatchException(_FH_room)));
+  }
 
-    // *--------------*
-    // * Feature: room
-    /**
-     * getter for room - gets.
-     *
-     * @return the room
-     * @generated 
-     */
-    public RoomNumber getRoom() { return (RoomNumber)(_getFeatureValueNc(wrapGetIntCatchException(_FH_room)));}
-    
-    /**
-     * setter for room - sets.
-     *
-     * @param v the new room
-     * @generated 
-     */
-    public void setRoom(RoomNumber v) {
+  /**
+   * setter for room - sets.
+   *
+   * @param v
+   *          the new room
+   * @generated
+   */
+  public void setRoom(RoomNumber v) {
     _setFeatureValueNcWj(wrapGetIntCatchException(_FH_room), v);
-  }    
-    
-   
-    
-    // *--------------*
-    // * Feature: date
-    /**
-     * getter for date - gets.
-     *
-     * @return the date
-     * @generated 
-     */
-    public DateAnnot getDate() { return (DateAnnot)(_getFeatureValueNc(wrapGetIntCatchException(_FH_date)));}
-    
-    /**
-     * setter for date - sets.
-     *
-     * @param v the new date
-     * @generated 
-     */
-    public void setDate(DateAnnot v) {
+  }
+
+  // *--------------*
+  // * Feature: date
+  /**
+   * getter for date - gets.
+   *
+   * @return the date
+   * @generated
+   */
+  public DateAnnot getDate() {
+    return (DateAnnot) (_getFeatureValueNc(wrapGetIntCatchException(_FH_date)));
+  }
+
+  /**
+   * setter for date - sets.
+   *
+   * @param v
+   *          the new date
+   * @generated
+   */
+  public void setDate(DateAnnot v) {
     _setFeatureValueNcWj(wrapGetIntCatchException(_FH_date), v);
-  }    
-    
-   
-    
-    // *--------------*
-    // * Feature: startTime
-    /**
-     * getter for startTime - gets.
-     *
-     * @return the start time
-     * @generated 
-     */
-    public TimeAnnot getStartTime() { return (TimeAnnot)(_getFeatureValueNc(wrapGetIntCatchException(_FH_startTime)));}
-    
-    /**
-     * setter for startTime - sets.
-     *
-     * @param v the new start time
-     * @generated 
-     */
-    public void setStartTime(TimeAnnot v) {
+  }
+
+  // *--------------*
+  // * Feature: startTime
+  /**
+   * getter for startTime - gets.
+   *
+   * @return the start time
+   * @generated
+   */
+  public TimeAnnot getStartTime() {
+    return (TimeAnnot) (_getFeatureValueNc(wrapGetIntCatchException(_FH_startTime)));
+  }
+
+  /**
+   * setter for startTime - sets.
+   *
+   * @param v
+   *          the new start time
+   * @generated
+   */
+  public void setStartTime(TimeAnnot v) {
     _setFeatureValueNcWj(wrapGetIntCatchException(_FH_startTime), v);
-  }    
-    
-   
-    
-    // *--------------*
-    // * Feature: endTime
-    /**
-     * getter for endTime - gets.
-     *
-     * @return the end time
-     * @generated 
-     */
-    public TimeAnnot getEndTime() { return (TimeAnnot)(_getFeatureValueNc(wrapGetIntCatchException(_FH_endTime)));}
-    
-    /**
-     * setter for endTime - sets.
-     *
-     * @param v the new end time
-     * @generated 
-     */
-    public void setEndTime(TimeAnnot v) {
+  }
+
+  // *--------------*
+  // * Feature: endTime
+  /**
+   * getter for endTime - gets.
+   *
+   * @return the end time
+   * @generated
+   */
+  public TimeAnnot getEndTime() {
+    return (TimeAnnot) (_getFeatureValueNc(wrapGetIntCatchException(_FH_endTime)));
+  }
+
+  /**
+   * setter for endTime - sets.
+   *
+   * @param v
+   *          the new end time
+   * @generated
+   */
+  public void setEndTime(TimeAnnot v) {
     _setFeatureValueNcWj(wrapGetIntCatchException(_FH_endTime), v);
-  }    
-    
-        /**
-     *  Custom constructor taking all parameters.
-     *
-     * @param jcas the jcas
-     * @param start the start
-     * @param end the end
-     * @param room the room
-     * @param date the date
-     * @param startTime the start time
-     * @param endTime the end time
-     */
-    public  Meeting(JCas jcas, int start, int end, RoomNumber room, DateAnnot date, TimeAnnot startTime, TimeAnnot endTime) {
-        this(jcas, start, end);
-        setRoom(room);
-        setDate(date);
-        setStartTime(startTime);
-        setEndTime(endTime);
-    }
+  }
+
+  /**
+   * Custom constructor taking all parameters.
+   *
+   * @param jcas
+   *          the jcas
+   * @param start
+   *          the start
+   * @param end
+   *          the end
+   * @param room
+   *          the room
+   * @param date
+   *          the date
+   * @param startTime
+   *          the start time
+   * @param endTime
+   *          the end time
+   */
+  public Meeting(JCas jcas, int start, int end, RoomNumber room, DateAnnot date,
+          TimeAnnot startTime, TimeAnnot endTime) {
+    this(jcas, start, end);
+    setRoom(room);
+    setDate(date);
+    setStartTime(startTime);
+    setEndTime(endTime);
+  }
 
-    /* (non-Javadoc)
-     * @see org.apache.uima.cas.impl.FeatureStructureImplC#toString()
-     */
-    @Override
-    public String toString() {
-        return "Meeting in " + getRoom().getCoveredText() + " on " + getDate().getCoveredText() + ", " + getStartTime().getCoveredText() + " - " + getEndTime().getCoveredText();
-    }
+  /*
+   * (non-Javadoc)
+   * 
+   * @see org.apache.uima.cas.impl.FeatureStructureImplC#toString()
+   */
+  @Override
+  public String toString() {
+    return "Meeting in " + getRoom().getCoveredText() + " on " + getDate().getCoveredText() + ", "
+            + getStartTime().getCoveredText() + " - " + getEndTime().getCoveredText();
+  }
 }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java
index 82cf3c8..77df5ef 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/RoomNumber.java
@@ -28,126 +28,139 @@ import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 import org.apache.uima.jcas.tcas.Annotation;
 
-
-/** 
- * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017
- * XML source: C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * @generated */
+/**
+ * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017 XML source:
+ * C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
+ * 
+ * @generated
+ */
 public class RoomNumber extends Annotation {
 
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static String _TypeName = "org.apache.uima.tutorial.RoomNumber";
-  
-    /**
-     * The Constant typeIndexID.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int typeIndexID = JCasRegistry.register(RoomNumber.class);
-
-    /**
-     * The Constant type.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int type = typeIndexID;
-
-    /**
-     * Gets the type index ID.
-     *
-     * @return the type index ID
-     * @generated 
-     */
-    @Override
-    public int getTypeIndexID() {return typeIndexID;}
- 
- 
-  /* *******************
-   *   Feature Offsets *
-   * *******************/ 
-   
-  public final static String _FeatName_building = "building";
 
+  /**
+   * The Constant typeIndexID.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int typeIndexID = JCasRegistry.register(RoomNumber.class);
+
+  /**
+   * The Constant type.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int type = typeIndexID;
+
+  /**
+   * Gets the type index ID.
+   *
+   * @return the type index ID
+   * @generated
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
+
+  /*
+   * ******************* Feature Offsets *
+   *******************/
+
+  public final static String _FeatName_building = "building";
 
   /* Feature Adjusted Offsets */
-  private final static CallSite _FC_building = TypeSystemImpl.createCallSite(RoomNumber.class, "building");
+  private final static CallSite _FC_building = TypeSystemImpl.createCallSite(RoomNumber.class,
+          "building");
   private final static MethodHandle _FH_building = _FC_building.dynamicInvoker();
 
-    /**
+  /**
    * Never called. Disable default constructor
    *
    * @generated
    */
-    protected  RoomNumber() {/* intentionally empty block */}
-    
-    /**
-     * Internal - constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     * @generated 
-     */
-    public  RoomNumber(TypeImpl type, CASImpl casImpl) {
+  protected RoomNumber() {
+    /* intentionally empty block */}
+
+  /**
+   * Internal - constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   * @generated
+   */
+  public RoomNumber(TypeImpl type, CASImpl casImpl) {
     super(type, casImpl);
     readObject();
   }
-  
-    /**
-     * Instantiates a new room number.
-     *
-     * @param jcas the jcas
-     * @generated 
-     */
-    public  RoomNumber(JCas jcas) {
+
+  /**
+   * Instantiates a new room number.
+   *
+   * @param jcas
+   *          the jcas
+   * @generated
+   */
+  public RoomNumber(JCas jcas) {
+    super(jcas);
+    readObject();
+  }
+
+  /**
+   * Instantiates a new room number.
+   *
+   * @param jcas
+   *          the jcas
+   * @param begin
+   *          the begin
+   * @param end
+   *          the end
+   */
+  public RoomNumber(JCas jcas, int begin, int end) {
     super(jcas);
-    readObject();   
-  } 
-
-
-    /**
-     * Instantiates a new room number.
-     *
-     * @param jcas the jcas
-     * @param begin the begin
-     * @param end the end
-     */
-    public  RoomNumber(JCas jcas, int begin, int end) {
-        super(jcas);
-        setBegin(begin);
-        setEnd(end);
-        readObject();
-    }
-
-  /** 
+    setBegin(begin);
+    setEnd(end);
+    readObject();
+  }
+
+  /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->*
-   * @generated modifiable 
+   * 
+   * @generated modifiable
    */
-    private void readObject() {
-    }
-
-    // *--------------*
-    // * Feature: building
-    /**
-     * getter for building - gets Building containing this room.
-     *
-     * @return the building
-     * @generated 
-     */
-    public String getBuilding() { return _getStringValueNc(wrapGetIntCatchException(_FH_building));}
-    
-    /**
-     * setter for building - sets Building containing this room.
-     *
-     * @param v the new building
-     * @generated 
-     */
-    public void setBuilding(String v) {
+  private void readObject() {
+  }
+
+  // *--------------*
+  // * Feature: building
+  /**
+   * getter for building - gets Building containing this room.
+   *
+   * @return the building
+   * @generated
+   */
+  public String getBuilding() {
+    return _getStringValueNc(wrapGetIntCatchException(_FH_building));
+  }
+
+  /**
+   * setter for building - sets Building containing this room.
+   *
+   * @param v
+   *          the new building
+   * @generated
+   */
+  public void setBuilding(String v) {
     _setStringValueNfc(wrapGetIntCatchException(_FH_building), v);
-  }    
-    
   }
+
+}
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java
index 097c99d..19708be 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/SentenceAnnot.java
@@ -24,7 +24,6 @@ import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 import org.apache.uima.jcas.tcas.Annotation;
 
-
 /**
  * Updated by JCasGen Mon Nov 29 15:02:37 EST 2004 XML source: C:/Program
  * Files/apache/uima/examples/descriptors/tutorial/ex6/TutorialTypeSystem.xml
@@ -33,83 +32,89 @@ import org.apache.uima.jcas.tcas.Annotation;
  */
 public class SentenceAnnot extends Annotation {
 
-    /**
-     * The Constant typeIndexID.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int typeIndexID = JCasRegistry.register(SentenceAnnot.class);
+  /**
+   * The Constant typeIndexID.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int typeIndexID = JCasRegistry.register(SentenceAnnot.class);
 
-    /**
-     * The Constant type.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int type = typeIndexID;
+  /**
+   * The Constant type.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int type = typeIndexID;
 
-    /**
-     * Gets the type index ID.
-     *
-     * @return the type index ID
-     * @generated 
-     */
-    @Override
-    public int getTypeIndexID() {
-        return typeIndexID;
-    }
+  /**
+   * Gets the type index ID.
+   *
+   * @return the type index ID
+   * @generated
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
 
-    /**
+  /**
    * Never called. Disable default constructor
    *
    * @generated
    */
-    protected  SentenceAnnot() {
-    }
+  protected SentenceAnnot() {
+  }
 
-    /**
-     * Internal - constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     * @generated 
-     */
-    public  SentenceAnnot(TypeImpl type, CASImpl casImpl) {
-        super(type, casImpl);
-        readObject();
-    }
+  /**
+   * Internal - constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   * @generated
+   */
+  public SentenceAnnot(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
+    readObject();
+  }
 
-    /**
-     * Instantiates a new sentence annot.
-     *
-     * @param jcas the jcas
-     * @generated 
-     */
-    public  SentenceAnnot(JCas jcas) {
-        super(jcas);
-        readObject();
-    }
+  /**
+   * Instantiates a new sentence annot.
+   *
+   * @param jcas
+   *          the jcas
+   * @generated
+   */
+  public SentenceAnnot(JCas jcas) {
+    super(jcas);
+    readObject();
+  }
 
-    /**
-     * Instantiates a new sentence annot.
-     *
-     * @param jcas the jcas
-     * @param begin the begin
-     * @param end the end
-     */
-    public  SentenceAnnot(JCas jcas, int begin, int end) {
-        super(jcas);
-        setBegin(begin);
-        setEnd(end);
-        readObject();
-    }
+  /**
+   * Instantiates a new sentence annot.
+   *
+   * @param jcas
+   *          the jcas
+   * @param begin
+   *          the begin
+   * @param end
+   *          the end
+   */
+  public SentenceAnnot(JCas jcas, int begin, int end) {
+    super(jcas);
+    setBegin(begin);
+    setEnd(end);
+    readObject();
+  }
 
-    /**
-     * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->.
-     *
-     * @generated modifiable
-     */
-    private void readObject() {
-    }
+  /**
+   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->.
+   *
+   * @generated modifiable
+   */
+  private void readObject() {
+  }
 }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java
index b8f588d..706c152 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/TimeAnnot.java
@@ -23,94 +23,104 @@ import org.apache.uima.cas.impl.TypeImpl;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 
-
-/** 
- * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017
- * XML source: C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * @generated */
+/**
+ * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017 XML source:
+ * C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
+ * 
+ * @generated
+ */
 public class TimeAnnot extends DateTimeAnnot {
 
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static String _TypeName = "org.apache.uima.tutorial.TimeAnnot";
-  
-    /**
-     * The Constant typeIndexID.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int typeIndexID = JCasRegistry.register(TimeAnnot.class);
 
-    /**
-     * The Constant type.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int type = typeIndexID;
+  /**
+   * The Constant typeIndexID.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int typeIndexID = JCasRegistry.register(TimeAnnot.class);
+
+  /**
+   * The Constant type.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int type = typeIndexID;
+
+  /**
+   * Gets the type index ID.
+   *
+   * @return the type index ID
+   * @generated
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
 
-    /**
-     * Gets the type index ID.
-     *
-     * @return the type index ID
-     * @generated 
-     */
-    @Override
-    public int getTypeIndexID() {return typeIndexID;}
- 
- 
-    /**
+  /**
    * Never called. Disable default constructor
    *
    * @generated
    */
-    protected  TimeAnnot() {/* intentionally empty block */}
-    
-    /**
-     * Internal - constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     * @generated 
-     */
-    public  TimeAnnot(TypeImpl type, CASImpl casImpl) {
+  protected TimeAnnot() {
+    /* intentionally empty block */}
+
+  /**
+   * Internal - constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   * @generated
+   */
+  public TimeAnnot(TypeImpl type, CASImpl casImpl) {
     super(type, casImpl);
     readObject();
   }
-  
-    /**
-     * Instantiates a new time annot.
-     *
-     * @param jcas the jcas
-     * @generated 
-     */
-    public  TimeAnnot(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
 
+  /**
+   * Instantiates a new time annot.
+   *
+   * @param jcas
+   *          the jcas
+   * @generated
+   */
+  public TimeAnnot(JCas jcas) {
+    super(jcas);
+    readObject();
+  }
 
-    /**
-     * Instantiates a new time annot.
-     *
-     * @param jcas the jcas
-     * @param begin the begin
-     * @param end the end
-     */
-    public  TimeAnnot(JCas jcas, int begin, int end) {
-        super(jcas);
-        setBegin(begin);
-        setEnd(end);
-        readObject();
-    }
+  /**
+   * Instantiates a new time annot.
+   *
+   * @param jcas
+   *          the jcas
+   * @param begin
+   *          the begin
+   * @param end
+   *          the end
+   */
+  public TimeAnnot(JCas jcas, int begin, int end) {
+    super(jcas);
+    setBegin(begin);
+    setEnd(end);
+    readObject();
+  }
 
-  /** 
+  /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->*
-   * @generated modifiable 
+   * 
+   * @generated modifiable
    */
-    private void readObject() {
-    }
+  private void readObject() {
+  }
 }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java
index 217fe0b..3b70209 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaAcronym.java
@@ -28,139 +28,155 @@ import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 import org.apache.uima.jcas.tcas.Annotation;
 
-
-/** 
- * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017
- * XML source: C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * @generated */
+/**
+ * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017 XML source:
+ * C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
+ * 
+ * @generated
+ */
 public class UimaAcronym extends Annotation {
 
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static String _TypeName = "org.apache.uima.tutorial.UimaAcronym";
-  
-    /**
-     * The Constant typeIndexID.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int typeIndexID = JCasRegistry.register(UimaAcronym.class);
-
-    /**
-     * The Constant type.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int type = typeIndexID;
-
-    /**
-     * Gets the type index ID.
-     *
-     * @return the type index ID
-     * @generated 
-     */
-    @Override
-    public int getTypeIndexID() {return typeIndexID;}
- 
- 
-  /* *******************
-   *   Feature Offsets *
-   * *******************/ 
-   
-  public final static String _FeatName_expandedForm = "expandedForm";
 
+  /**
+   * The Constant typeIndexID.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int typeIndexID = JCasRegistry.register(UimaAcronym.class);
+
+  /**
+   * The Constant type.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int type = typeIndexID;
+
+  /**
+   * Gets the type index ID.
+   *
+   * @return the type index ID
+   * @generated
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
+
+  /*
+   * ******************* Feature Offsets *
+   *******************/
+
+  public final static String _FeatName_expandedForm = "expandedForm";
 
   /* Feature Adjusted Offsets */
-  private final static CallSite _FC_expandedForm = TypeSystemImpl.createCallSite(UimaAcronym.class, "expandedForm");
+  private final static CallSite _FC_expandedForm = TypeSystemImpl.createCallSite(UimaAcronym.class,
+          "expandedForm");
   private final static MethodHandle _FH_expandedForm = _FC_expandedForm.dynamicInvoker();
 
-   
   /**
    * Never called. Disable default constructor
    *
    * @generated
    */
-    protected  UimaAcronym() {/* intentionally empty block */}
-    
-    /**
-     * Internal - constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     * @generated 
-     */
-    public  UimaAcronym(TypeImpl type, CASImpl casImpl) {
+  protected UimaAcronym() {
+    /* intentionally empty block */}
+
+  /**
+   * Internal - constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   * @generated
+   */
+  public UimaAcronym(TypeImpl type, CASImpl casImpl) {
     super(type, casImpl);
     readObject();
   }
-  
-    /**
-     * Instantiates a new uima acronym.
-     *
-     * @param jcas the jcas
-     * @generated 
-     */
-    public  UimaAcronym(JCas jcas) {
+
+  /**
+   * Instantiates a new uima acronym.
+   *
+   * @param jcas
+   *          the jcas
+   * @generated
+   */
+  public UimaAcronym(JCas jcas) {
+    super(jcas);
+    readObject();
+  }
+
+  /**
+   * Instantiates a new uima acronym.
+   *
+   * @param jcas
+   *          the jcas
+   * @param begin
+   *          the begin
+   * @param end
+   *          the end
+   */
+  public UimaAcronym(JCas jcas, int begin, int end) {
     super(jcas);
-    readObject();   
-  } 
-
-
-    /**
-     * Instantiates a new uima acronym.
-     *
-     * @param jcas the jcas
-     * @param begin the begin
-     * @param end the end
-     */
-    public  UimaAcronym(JCas jcas, int begin, int end) {
-        super(jcas);
-        setBegin(begin);
-        setEnd(end);
-        readObject();
-    }
-
-  /** 
+    setBegin(begin);
+    setEnd(end);
+    readObject();
+  }
+
+  /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->*
-   * @generated modifiable 
+   * 
+   * @generated modifiable
    */
-    private void readObject() {
-    }
-
-    // *--------------*
-    // * Feature: expandedForm
-    /**
-     * getter for expandedForm - gets.
-     *
-     * @return the expanded form
-     * @generated 
-     */
-    public String getExpandedForm() { return _getStringValueNc(wrapGetIntCatchException(_FH_expandedForm));}
-    
-    /**
-     * setter for expandedForm - sets.
-     *
-     * @param v the new expanded form
-     * @generated 
-     */
-    public void setExpandedForm(String v) {
+  private void readObject() {
+  }
+
+  // *--------------*
+  // * Feature: expandedForm
+  /**
+   * getter for expandedForm - gets.
+   *
+   * @return the expanded form
+   * @generated
+   */
+  public String getExpandedForm() {
+    return _getStringValueNc(wrapGetIntCatchException(_FH_expandedForm));
+  }
+
+  /**
+   * setter for expandedForm - sets.
+   *
+   * @param v
+   *          the new expanded form
+   * @generated
+   */
+  public void setExpandedForm(String v) {
     _setStringValueNfc(wrapGetIntCatchException(_FH_expandedForm), v);
-  }    
-    
-        /**
-     *  Custom constructor taking all parameters.
-     *
-     * @param jcas the jcas
-     * @param start the start
-     * @param end the end
-     * @param expandedForm the expanded form
-     */
-    public  UimaAcronym(JCas jcas, int start, int end, String expandedForm) {
-        super(jcas, start, end);
-        setExpandedForm(expandedForm);
-    }
+  }
+
+  /**
+   * Custom constructor taking all parameters.
+   *
+   * @param jcas
+   *          the jcas
+   * @param start
+   *          the start
+   * @param end
+   *          the end
+   * @param expandedForm
+   *          the expanded form
+   */
+  public UimaAcronym(JCas jcas, int start, int end, String expandedForm) {
+    super(jcas, start, end);
+    setExpandedForm(expandedForm);
+  }
 }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java
index ea01670..a8256ed 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/UimaMeeting.java
@@ -23,109 +23,127 @@ import org.apache.uima.cas.impl.TypeImpl;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 
-
-/** 
- * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017
- * XML source: C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
- * @generated */
+/**
+ * Updated by JCasGen Sun Oct 08 19:34:17 EDT 2017 XML source:
+ * C:/au/svnCheckouts/uv3/trunk/uimaj-v3/uimaj-examples/src/main/descriptors/tutorial/ex6/TutorialTypeSystem.xml
+ * 
+ * @generated
+ */
 public class UimaMeeting extends Meeting {
 
-  /** @generated
-   * @ordered 
+  /**
+   * @generated
+   * @ordered
    */
-  @SuppressWarnings ("hiding")
+  @SuppressWarnings("hiding")
   public final static String _TypeName = "org.apache.uima.tutorial.UimaMeeting";
-  
-    /**
-     * The Constant typeIndexID.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int typeIndexID = JCasRegistry.register(UimaMeeting.class);
 
-    /**
-     * The Constant type.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int type = typeIndexID;
+  /**
+   * The Constant typeIndexID.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int typeIndexID = JCasRegistry.register(UimaMeeting.class);
+
+  /**
+   * The Constant type.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int type = typeIndexID;
+
+  /**
+   * Gets the type index ID.
+   *
+   * @return the type index ID
+   * @generated
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
 
-    /**
-     * Gets the type index ID.
-     *
-     * @return the type index ID
-     * @generated 
-     */
-    @Override
-    public int getTypeIndexID() {return typeIndexID;}
- 
- 
-    /**
+  /**
    * Never called. Disable default constructor
    *
    * @generated
    */
-    protected  UimaMeeting() {/* intentionally empty block */}
-    
-    /**
-     * Internal - constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     * @generated 
-     */
-    public  UimaMeeting(TypeImpl type, CASImpl casImpl) {
+  protected UimaMeeting() {
+    /* intentionally empty block */}
+
+  /**
+   * Internal - constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   * @generated
+   */
+  public UimaMeeting(TypeImpl type, CASImpl casImpl) {
     super(type, casImpl);
     readObject();
   }
-  
-    /**
-     * Instantiates a new uima meeting.
-     *
-     * @param jcas the jcas
-     * @generated 
-     */
-    public  UimaMeeting(JCas jcas) {
-    super(jcas);
-    readObject();   
-  } 
 
+  /**
+   * Instantiates a new uima meeting.
+   *
+   * @param jcas
+   *          the jcas
+   * @generated
+   */
+  public UimaMeeting(JCas jcas) {
+    super(jcas);
+    readObject();
+  }
 
-    /**
-     * Instantiates a new uima meeting.
-     *
-     * @param jcas the jcas
-     * @param begin the begin
-     * @param end the end
-     */
-    public  UimaMeeting(JCas jcas, int begin, int end) {
-        super(jcas);
-        setBegin(begin);
-        setEnd(end);
-        readObject();
-    }
+  /**
+   * Instantiates a new uima meeting.
+   *
+   * @param jcas
+   *          the jcas
+   * @param begin
+   *          the begin
+   * @param end
+   *          the end
+   */
+  public UimaMeeting(JCas jcas, int begin, int end) {
+    super(jcas);
+    setBegin(begin);
+    setEnd(end);
+    readObject();
+  }
 
-  /** 
+  /**
    * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->*
-   * @generated modifiable 
+   * 
+   * @generated modifiable
    */
-    private void readObject() {
-    }
+  private void readObject() {
+  }
 
-    /**
-     *  Custom constructor taking all parameters.
-     *
-     * @param jcas the jcas
-     * @param start the start
-     * @param end the end
-     * @param room the room
-     * @param date the date
-     * @param startTime the start time
-     * @param endTime the end time
-     */
-    public  UimaMeeting(JCas jcas, int start, int end, RoomNumber room, DateAnnot date, TimeAnnot startTime, TimeAnnot endTime) {
-        super(jcas, start, end, room, date, startTime, endTime);
-    }
+  /**
+   * Custom constructor taking all parameters.
+   *
+   * @param jcas
+   *          the jcas
+   * @param start
+   *          the start
+   * @param end
+   *          the end
+   * @param room
+   *          the room
+   * @param date
+   *          the date
+   * @param startTime
+   *          the start time
+   * @param endTime
+   *          the end time
+   */
+  public UimaMeeting(JCas jcas, int start, int end, RoomNumber room, DateAnnot date,
+          TimeAnnot startTime, TimeAnnot endTime) {
+    super(jcas, start, end, room, date, startTime, endTime);
+  }
 }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java
index d7af457..d38932d 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/WordAnnot.java
@@ -24,7 +24,6 @@ import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.JCasRegistry;
 import org.apache.uima.jcas.tcas.Annotation;
 
-
 /**
  * Updated by JCasGen Mon Nov 29 15:02:38 EST 2004 XML source: C:/Program
  * Files/apache/uima/examples/descriptors/tutorial/ex6/TutorialTypeSystem.xml
@@ -33,83 +32,89 @@ import org.apache.uima.jcas.tcas.Annotation;
  */
 public class WordAnnot extends Annotation {
 
-    /**
-     * The Constant typeIndexID.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int typeIndexID = JCasRegistry.register(WordAnnot.class);
+  /**
+   * The Constant typeIndexID.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int typeIndexID = JCasRegistry.register(WordAnnot.class);
 
-    /**
-     * The Constant type.
-     *
-     * @generated 
-     * @ordered 
-     */
-    public static final int type = typeIndexID;
+  /**
+   * The Constant type.
+   *
+   * @generated
+   * @ordered
+   */
+  public static final int type = typeIndexID;
 
-    /**
-     * Gets the type index ID.
-     *
-     * @return the type index ID
-     * @generated 
-     */
-    @Override
-    public int getTypeIndexID() {
-        return typeIndexID;
-    }
+  /**
+   * Gets the type index ID.
+   *
+   * @return the type index ID
+   * @generated
+   */
+  @Override
+  public int getTypeIndexID() {
+    return typeIndexID;
+  }
 
-    /**
+  /**
    * Never called. Disable default constructor
    *
    * @generated
    */
-    protected  WordAnnot() {
-    }
+  protected WordAnnot() {
+  }
 
-    /**
-     * Internal - constructor used by generator.
-     *
-     * @param type the type
-     * @param casImpl the cas impl
-     * @generated 
-     */
-    public  WordAnnot(TypeImpl type, CASImpl casImpl) {
-        super(type, casImpl);
-        readObject();
-    }
+  /**
+   * Internal - constructor used by generator.
+   *
+   * @param type
+   *          the type
+   * @param casImpl
+   *          the cas impl
+   * @generated
+   */
+  public WordAnnot(TypeImpl type, CASImpl casImpl) {
+    super(type, casImpl);
+    readObject();
+  }
 
-    /**
-     * Instantiates a new word annot.
-     *
-     * @param jcas the jcas
-     * @generated 
-     */
-    public  WordAnnot(JCas jcas) {
-        super(jcas);
-        readObject();
-    }
+  /**
+   * Instantiates a new word annot.
+   *
+   * @param jcas
+   *          the jcas
+   * @generated
+   */
+  public WordAnnot(JCas jcas) {
+    super(jcas);
+    readObject();
+  }
 
-    /**
-     * Instantiates a new word annot.
-     *
-     * @param jcas the jcas
-     * @param begin the begin
-     * @param end the end
-     */
-    public  WordAnnot(JCas jcas, int begin, int end) {
-        super(jcas);
-        setBegin(begin);
-        setEnd(end);
-        readObject();
-    }
+  /**
+   * Instantiates a new word annot.
+   *
+   * @param jcas
+   *          the jcas
+   * @param begin
+   *          the begin
+   * @param end
+   *          the end
+   */
+  public WordAnnot(JCas jcas, int begin, int end) {
+    super(jcas);
+    setBegin(begin);
+    setEnd(end);
+    readObject();
+  }
 
-    /**
-     * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->.
-     *
-     * @generated modifiable
-     */
-    private void readObject() {
-    }
+  /**
+   * <!-- begin-user-doc --> Write your own initialization here <!-- end-user-doc -->.
+   *
+   * @generated modifiable
+   */
+  private void readObject() {
+  }
 }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex2/RoomNumberAnnotator.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex2/RoomNumberAnnotator.java
index d1e3086..6cfa6e1 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex2/RoomNumberAnnotator.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex2/RoomNumberAnnotator.java
@@ -75,7 +75,7 @@ public class RoomNumberAnnotator extends JCasAnnotator_ImplBase {
         getLogger().log(Level.FINEST, "Found: " + annotation);
         // or, using slf4j
         // note: this call skips constructing the message if tracing is not enabled
-//        getSlf4jLogger().trace("Found: {}", annotation);
+        // getSlf4jLogger().trace("Found: {}", annotation);
       }
     }
   }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex3/TutorialDateTime.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex3/TutorialDateTime.java
index d14b85e..e5c544f 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex3/TutorialDateTime.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex3/TutorialDateTime.java
@@ -122,7 +122,7 @@ public class TutorialDateTime extends JCasAnnotator_ImplBase {
   };
 
   static final String defaultYear = "2003";
-  
+
   private static boolean warningMessageShown = false;
 
   // PROCESS
@@ -137,27 +137,27 @@ public class TutorialDateTime extends JCasAnnotator_ImplBase {
 
     // Create Annotations
     ResultSpecification resultSpec = getResultSpecification();
-    boolean timeWanted = resultSpec.containsType("org.apache.uima.tutorial.TimeAnnot", aJCas.getDocumentLanguage());
-    boolean dateWanted = resultSpec.containsType("org.apache.uima.tutorial.DateAnnot", aJCas.getDocumentLanguage());
+    boolean timeWanted = resultSpec.containsType("org.apache.uima.tutorial.TimeAnnot",
+            aJCas.getDocumentLanguage());
+    boolean dateWanted = resultSpec.containsType("org.apache.uima.tutorial.DateAnnot",
+            aJCas.getDocumentLanguage());
 
     if (timeWanted)
       makeAnnotations(timeAnnotationMaker, hoursMinutesPattern, dfTimeShort);
-    
-    if (dateWanted) {    
+
+    if (dateWanted) {
       makeAnnotations(dateAnnotationMaker, numericDatePattern, dfDateShort);
       makeAnnotations(dateAnnotationMaker, mediumDatePattern, dfDateMedium);
       makeAnnotations(dateAnnotationMaker, longDatePattern, dfDateLong);
     }
-    
+
     if (!timeWanted && !dateWanted && !warningMessageShown) {
       String m = String.format(
-        "No output is being produced by the TutorialDateTime annotator because the Result Specification did not contain" +
-        " a request for the type%n" +
-        "  org.apache.uima.tutorial.TimeAnnot nor%n" +
-        "  org.apache.uima.tutorial.DateAnnot" +
-        " with the language '%s'%n" +
-              "  (Note: this message will only be shown once.)%n", 
-              aJCas.getDocumentLanguage());              
+              "No output is being produced by the TutorialDateTime annotator because the Result Specification did not contain"
+                      + " a request for the type%n" + "  org.apache.uima.tutorial.TimeAnnot nor%n"
+                      + "  org.apache.uima.tutorial.DateAnnot" + " with the language '%s'%n"
+                      + "  (Note: this message will only be shown once.)%n",
+              aJCas.getDocumentLanguage());
       System.err.println(m);
       getContext().getLogger().log(Level.WARNING, m);
       warningMessageShown = true;
@@ -168,8 +168,8 @@ public class TutorialDateTime extends JCasAnnotator_ImplBase {
 
   void makeAnnotations(Maker m, BreakIterator b) {
     b.setText(input);
-    for (int end = b.next(), start = b.first(); end != BreakIterator.DONE; start = end, end = b
-            .next()) {
+    for (int end = b.next(),
+            start = b.first(); end != BreakIterator.DONE; start = end, end = b.next()) {
 
       // eliminate all-whitespace tokens
       boolean isWhitespace = true;
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java
index d488879..1d6161b 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex4/MeetingAnnotator.java
@@ -67,21 +67,21 @@ public class MeetingAnnotator extends JCasAnnotator_ImplBase {
 
     for (RoomNumber room : roomNumberIndex.select()) {
       for (DateAnnot date : dateIndex.select()) {
-        for(TimeAnnot time1 : timeIndex.select()) {
+        for (TimeAnnot time1 : timeIndex.select()) {
           for (TimeAnnot time2 : timeIndex.select()) {
 
             // times must be different annotations
             if (time1 != time2) {
               // compute the begin and end of the span
-              int minBegin = Math.min(Math.min(time1.getBegin(), time2.getBegin()), 
-                                      Math.min(date .getBegin(), room .getBegin()));
-              int maxEnd = Math.max(Math.max(time1.getEnd(), time2.getEnd()), 
-                                    Math.max(date .getEnd(), room .getEnd()));
+              int minBegin = Math.min(Math.min(time1.getBegin(), time2.getBegin()),
+                      Math.min(date.getBegin(), room.getBegin()));
+              int maxEnd = Math.max(Math.max(time1.getEnd(), time2.getEnd()),
+                      Math.max(date.getEnd(), room.getEnd()));
 
               // span must be smaller than the window size?
-              if (maxEnd - minBegin < mWindowSize && 
-                // span must not overlap the last annotation we made
-                  minBegin > lastMeetingEnd) {
+              if (maxEnd - minBegin < mWindowSize &&
+              // span must not overlap the last annotation we made
+                      minBegin > lastMeetingEnd) {
                 // annotate
                 Meeting mtg = new Meeting(aJCas, minBegin, maxEnd, room, date, time1, time2);
                 mtg.addToIndexes();
@@ -90,7 +90,7 @@ public class MeetingAnnotator extends JCasAnnotator_ImplBase {
             }
           }
         }
-      }   
+      }
     }
   }
 }
diff --git a/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaMeetingAnnotator.java b/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaMeetingAnnotator.java
index c84d972..5b4778e 100644
--- a/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaMeetingAnnotator.java
+++ b/uimaj-examples/src/main/java/org/apache/uima/tutorial/ex6/UimaMeetingAnnotator.java
@@ -101,8 +101,9 @@ public class UimaMeetingAnnotator extends JCasAnnotator_ImplBase {
         // look up token in map to see if it is an acronym
         if (mMap.get(token) != null) {
           // create annotation
-          UimaMeeting annot = new UimaMeeting(aJCas, meeting.getBegin(), meeting.getEnd(), meeting
-                  .getRoom(), meeting.getDate(), meeting.getStartTime(), meeting.getEndTime());
+          UimaMeeting annot = new UimaMeeting(aJCas, meeting.getBegin(), meeting.getEnd(),
+                  meeting.getRoom(), meeting.getDate(), meeting.getStartTime(),
+                  meeting.getEndTime());
           // Add annotation to a list, to be later added to the indexes.
           // We need to do this because it's not allowed to add to an
           // index that you're currently iterating over.