You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by se...@apache.org on 2017/04/05 01:26:58 UTC

svn commit: r1790171 [1/2] - in /ctakes/trunk: ./ ctakes-core-res/src/main/resources/org/apache/ctakes/core/sections/ ctakes-core/ ctakes-core/src/main/java/org/apache/ctakes/core/ae/ ctakes-core/src/main/java/org/apache/ctakes/core/cc/ ctakes-core/src...

Author: seanfinan
Date: Wed Apr  5 01:26:57 2017
New Revision: 1790171

URL: http://svn.apache.org/viewvc?rev=1790171&view=rev
Log:
ctakes-424 : upgraded to hsqldb 2.3.4
poms upgraded
ctakes-424 : gui upgraded

Added:
    ctakes/trunk/ctakes-core-res/src/main/resources/org/apache/ctakes/core/sections/DefaultSectionRegex.bsv
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/StandardCliOptions.java
      - copied, changed from r1790164, ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/StandardOptions.java
    ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/CheckRun.png   (with props)
    ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/Package.png   (with props)
    ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/Parameters.png   (with props)
    ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/PlusMark.png   (with props)
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/FileTableCellEditor.java
Removed:
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/StandardOptions.java
    ctakes/trunk/ctakes-dictionary-lookup-fast-res/src/main/resources/org/apache/ctakes/dictionary/lookup/fast/cTakesHsql.xml
    ctakes/trunk/ctakes-dictionary-lookup-fast-res/src/main/resources/org/apache/ctakes/dictionary/lookup/fast/ctakessnorx/
Modified:
    ctakes/trunk/ctakes-core/pom.xml
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/FilterAnnotator.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/ListSentenceFixer.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/NullAnnotator.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/OverlapAnnotator.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SectionSegmentAnnotator.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SimpleSegmentWithTagsAnnotator.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenizerAnnotator.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/CasConsumer.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/FilesInDirectoryCasConsumer.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/HtmlTableCasConsumer.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NonTerminalConsumer.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NormalizedFilesInDirectoryCasConsumer.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenFreqCasConsumer.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenOffsetsCasConsumer.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/XMISerializer.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/SemanticGroup.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/UmlsItemCell.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionCyclicalReads.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionReader.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XmiCollectionReaderCtakes.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/CliOptionals.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PipeBitInfo.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PipelineBuilder.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileReader.java
    ctakes/trunk/ctakes-dictionary-lookup-fast-res/pom.xml
    ctakes/trunk/ctakes-dictionary-lookup-fast/pom.xml
    ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/JCasTermAnnotator.java
    ctakes/trunk/ctakes-gui/ctakes-gui.iml
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/SystemOutPanel.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/DictionaryBuilder.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/Concept.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrconsoIndex.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrconsoParser.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrstyIndex.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrstyParser.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/SourceTableModel.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/Tui.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/TuiCellRenderer.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/UmlsTermUtil.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/util/HsqlUtil.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/util/RareWordDbWriter.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/util/RareWordUtil.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/MainPanel2.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/bit/BitInfoPanel.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/bit/info/PipeBitInfoPanel.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/bit/parameter/ParameterCellRenderer.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/bit/parameter/ParameterTableModel.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/bit/user/UserBitInfoPanel.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/bit/user/UserBitListModel.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/bit/user/UserParameterInfoPanel.java
    ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/piper/PiperTextFilter.java
    ctakes/trunk/ctakes-preprocessor/pom.xml
    ctakes/trunk/ctakes-ytex-uima/pom.xml
    ctakes/trunk/pom.xml

Added: ctakes/trunk/ctakes-core-res/src/main/resources/org/apache/ctakes/core/sections/DefaultSectionRegex.bsv
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core-res/src/main/resources/org/apache/ctakes/core/sections/DefaultSectionRegex.bsv?rev=1790171&view=auto
==============================================================================
--- ctakes/trunk/ctakes-core-res/src/main/resources/org/apache/ctakes/core/sections/DefaultSectionRegex.bsv (added)
+++ ctakes/trunk/ctakes-core-res/src/main/resources/org/apache/ctakes/core/sections/DefaultSectionRegex.bsv Wed Apr  5 01:26:57 2017
@@ -0,0 +1,4 @@
+Clinical History||(?:^[\t ]*CLINICAL HISTORY):?\r?\n
+Family History||(?:^[\t ]*FAMILY HISTORY):?\r?\n
+History of Present Illness||(?:^[\t ]*(?:(?:HISTORY OF PAST ILLNESS)|(?:PAST MEDICAL HISTORY))):?\r?\n
+History of Present Illness||(?:^[\t ]*(?:HISTORY OF PRESENT ILLNESS| history of physical illness,history of present illness,history of the present illness)):?\r?\n

Modified: ctakes/trunk/ctakes-core/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/pom.xml?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/pom.xml (original)
+++ ctakes/trunk/ctakes-core/pom.xml Wed Apr  5 01:26:57 2017
@@ -32,7 +32,11 @@
 	     <dependency>
 			<groupId>org.apache.ctakes</groupId>
 			<artifactId>ctakes-core-res</artifactId>
-		</dependency>		    
+		  </dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+		</dependency>
   		<dependency>
 			<groupId>org.apache.ctakes</groupId>
 			<artifactId>ctakes-type-system</artifactId>

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/FilterAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/FilterAnnotator.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/FilterAnnotator.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/FilterAnnotator.java Wed Apr  5 01:26:57 2017
@@ -53,9 +53,10 @@ public class FilterAnnotator extends JCa
 		retainAttrTypeId = DISORDER_ANNOTATIONS;
 	}
 
-	public void initialize(UimaContext annotCtx)
-			throws ResourceInitializationException {
-		super.initialize(annotCtx);
+   @Override
+   public void initialize( UimaContext annotCtx )
+         throws ResourceInitializationException {
+      super.initialize(annotCtx);
 
 		removeList = new java.util.ArrayList<Annotation>();
 	}
@@ -64,8 +65,9 @@ public class FilterAnnotator extends JCa
 	 * Checks if the annotation is of the type to be retained. If not, removes
 	 * it from the index. Uses helper method isValid(Annotation).
 	 */
-	public void process(JCas jcas) throws AnalysisEngineProcessException {
-		removeList.clear();
+   @Override
+   public void process( JCas jcas ) throws AnalysisEngineProcessException {
+      removeList.clear();
 
 		// iterate over source objects in JCas
 		JFSIndexRepository indexes = jcas.getJFSIndexRepository();
@@ -73,9 +75,9 @@ public class FilterAnnotator extends JCa
 				retainAnnType).iterator();
 
 		while (srcObjItr.hasNext()) {
-			Annotation ann = (Annotation) srcObjItr.next();
-			if (!isValid(ann))
-				removeList.add(ann);
+         Annotation ann = srcObjItr.next();
+         if ( !isValid( ann ) )
+            removeList.add(ann);
 		}
 
 		for (int i = 0; i < removeList.size(); i++)
@@ -84,11 +86,9 @@ public class FilterAnnotator extends JCa
 	}
 
 	private boolean isValid(Annotation ann) {
-		if (((IdentifiedAnnotation) ann).getTypeID() != retainAttrTypeId)
-			return false;
+      return ((IdentifiedAnnotation)ann).getTypeID() == retainAttrTypeId;
 
-		return true;
-	}
+   }
 
 	// -- private datamembers ----
 	private int retainAnnType; // annotation type you want to retain

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/ListSentenceFixer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/ListSentenceFixer.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/ListSentenceFixer.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/ListSentenceFixer.java Wed Apr  5 01:26:57 2017
@@ -22,8 +22,7 @@ import java.util.regex.Pattern;
 @PipeBitInfo(
       name = "List Sentence Fixer",
       description = "Re-annotates Sentences based upon existing List Entries, preventing a Sentence from spanning more than one List Entry.",
-      dependencies = { PipeBitInfo.TypeProduct.LIST, PipeBitInfo.TypeProduct.LIST_ENTRY,
-                       PipeBitInfo.TypeProduct.SENTENCE }
+      dependencies = { PipeBitInfo.TypeProduct.LIST, PipeBitInfo.TypeProduct.SENTENCE }
 )
 final public class ListSentenceFixer extends JCasAnnotator_ImplBase {
 

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/NullAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/NullAnnotator.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/NullAnnotator.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/NullAnnotator.java Wed Apr  5 01:26:57 2017
@@ -39,7 +39,8 @@ import org.apache.uima.jcas.JCas;
 public class NullAnnotator extends JCasAnnotator_ImplBase
 {
 
-	   public void process(JCas jcas)
+   @Override
+   public void process( JCas jcas )
        throws AnalysisEngineProcessException
        {}
 }
\ No newline at end of file

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/OverlapAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/OverlapAnnotator.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/OverlapAnnotator.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/OverlapAnnotator.java Wed Apr  5 01:26:57 2017
@@ -90,9 +90,10 @@ public class OverlapAnnotator extends JC
 	private int iv_bAnnotType;
 	private Action iv_action;
 
-	public void initialize(UimaContext annotCtx)
-			throws ResourceInitializationException {
-		super.initialize(annotCtx);
+   @Override
+   public void initialize( UimaContext annotCtx )
+         throws ResourceInitializationException {
+      super.initialize(annotCtx);
 
 		try {
 			String classname;
@@ -279,8 +280,9 @@ public class OverlapAnnotator extends JC
 		}
 	}
 
-	public void process(JCas jcas) throws AnalysisEngineProcessException {
-		iv_logger.info("process(JCas)");
+   @Override
+   public void process( JCas jcas ) throws AnalysisEngineProcessException {
+      iv_logger.info( "process(JCas)" );
 
 		JFSIndexRepository indexes = jcas.getJFSIndexRepository();
 
@@ -327,9 +329,9 @@ public class OverlapAnnotator extends JC
 		FSIterator<Annotation> annotItr = indexes.getAnnotationIndex(annotType)
 				.iterator();
 		while (annotItr.hasNext()) {
-			Annotation annot = (Annotation) annotItr.next();
-			l.add(annot);
-		}
+         Annotation annot = annotItr.next();
+         l.add( annot );
+      }
 		return l;
 	}
 
@@ -374,8 +376,8 @@ public class OverlapAnnotator extends JC
 	 * 
 	 */
 	interface Action {
-		public void performAction(Annotation aAnnot, Annotation bAnnot);
-	}
+      void performAction( Annotation aAnnot, Annotation bAnnot );
+   }
 
 	/**
 	 * Implementation that modifies feature values of either annotation A or B.
@@ -404,9 +406,10 @@ public class OverlapAnnotator extends JC
 			iv_endSrc = endSrc;
 		}
 
-		public void performAction(Annotation aAnnot, Annotation bAnnot) {
-			Annotation ann = null;
-			if (iv_selector == SELECT_A) {
+      @Override
+      public void performAction( Annotation aAnnot, Annotation bAnnot ) {
+         Annotation ann = null;
+         if (iv_selector == SELECT_A) {
 				ann = aAnnot;
 			} else {
 				ann = bAnnot;
@@ -471,9 +474,10 @@ public class OverlapAnnotator extends JC
 			iv_selector = selector;
 		}
 
-		public void performAction(Annotation aAnnot, Annotation bAnnot) {
-			if (iv_selector == SELECT_A) {
-				aAnnot.removeFromIndexes();
+      @Override
+      public void performAction( Annotation aAnnot, Annotation bAnnot ) {
+         if ( iv_selector == SELECT_A ) {
+            aAnnot.removeFromIndexes();
 			} else if (iv_selector == SELECT_B) {
 				bAnnot.removeFromIndexes();
 			} else {

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SectionSegmentAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SectionSegmentAnnotator.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SectionSegmentAnnotator.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SectionSegmentAnnotator.java Wed Apr  5 01:26:57 2017
@@ -58,8 +58,9 @@ public class SectionSegmentAnnotator ext
 
 	public HashMap<Integer, DocumentSection> sections;
 
-	public void initialize(UimaContext aContext) throws ResourceInitializationException {
-		super.initialize(aContext);
+   @Override
+   public void initialize( UimaContext aContext ) throws ResourceInitializationException {
+      super.initialize( aContext );
 
 		try {
 			templateFile = ((FileResource)aContext.getResourceObject("template")).getFile().getAbsolutePath();
@@ -78,7 +79,8 @@ public class SectionSegmentAnnotator ext
 	 * Entry point for processing.
 	 * Identify all the sections of the medical record
 	 */
-	public void process(JCas jCas) throws AnalysisEngineProcessException {
+   @Override
+   public void process( JCas jCas ) throws AnalysisEngineProcessException {
 
 		String text = jCas.getDocumentText();
 

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SimpleSegmentWithTagsAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SimpleSegmentWithTagsAnnotator.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SimpleSegmentWithTagsAnnotator.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SimpleSegmentWithTagsAnnotator.java Wed Apr  5 01:26:57 2017
@@ -47,10 +47,11 @@ public class SimpleSegmentWithTagsAnnota
 	private String segmentId;
 
 	private Logger logger = Logger.getLogger(getClass().getName());
-	
-	public void initialize(UimaContext aContext)
-			throws ResourceInitializationException {
-		super.initialize(aContext);
+
+   @Override
+   public void initialize( UimaContext aContext )
+         throws ResourceInitializationException {
+      super.initialize(aContext);
 
 		segmentId = (String) aContext.getConfigParameterValue("SegmentID");
 		if (segmentId == null) {
@@ -61,9 +62,10 @@ public class SimpleSegmentWithTagsAnnota
 	/**
 	 * Entry point for processing.
 	 */
-	public void process(JCas jcas) throws AnalysisEngineProcessException {
-		logger.info("process(JCas)");
-		// sa.setBegin(0);
+   @Override
+   public void process( JCas jcas ) throws AnalysisEngineProcessException {
+      logger.info( "process(JCas)" );
+      // sa.setBegin(0);
 		String text = jcas.getDocumentText();
 		if (text == null) {
 			System.out.println("text == null in Segmentannotator");

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenizerAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenizerAnnotator.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenizerAnnotator.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenizerAnnotator.java Wed Apr  5 01:26:57 2017
@@ -86,9 +86,10 @@ public class TokenizerAnnotator extends
 
 	private int tokenCount = 0;
 
-	public void initialize(UimaContext aContext)
-			throws ResourceInitializationException {
-		super.initialize(aContext);
+   @Override
+   public void initialize( UimaContext aContext )
+         throws ResourceInitializationException {
+      super.initialize(aContext);
 
 		context = aContext;
 		try {
@@ -126,7 +127,8 @@ public class TokenizerAnnotator extends
 	/**
 	 * Entry point for processing.
 	 */
-	public void process(JCas jcas) throws AnalysisEngineProcessException {
+   @Override
+   public void process( JCas jcas ) throws AnalysisEngineProcessException {
 
 		logger.info("process(JCas)");
 
@@ -160,7 +162,7 @@ public class TokenizerAnnotator extends
 
 		Iterator<Token> tokenItr = tokens.iterator();
 		while (tokenItr.hasNext()) {
-			Token token = (Token) tokenItr.next();
+         Token token = tokenItr.next();
 
 			// convert token into JCas object
 			BaseToken bta = TokenConverter.convert(token, jcas, beginPos);

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/CasConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/CasConsumer.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/CasConsumer.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/CasConsumer.java Wed Apr  5 01:26:57 2017
@@ -58,6 +58,7 @@ public class CasConsumer extends CasCons
    /**
     * Read in configuration parameters
     */
+   @Override
    public void initialize() throws ResourceInitializationException {
       iv_outputDir = (String)getConfigParameterValue( "outputDir" );
    }
@@ -104,6 +105,7 @@ public class CasConsumer extends CasCons
    /**
     * Create an xml file from the data in the cas.
     */
+   @Override
    public void processCas( CAS cas ) throws ResourceProcessException {
 
       iv_logger.info( "Started" );

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/FilesInDirectoryCasConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/FilesInDirectoryCasConsumer.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/FilesInDirectoryCasConsumer.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/FilesInDirectoryCasConsumer.java Wed Apr  5 01:26:57 2017
@@ -56,6 +56,7 @@ public class FilesInDirectoryCasConsumer
 
    File iv_outputDirectory;
 
+   @Override
    public void initialize() throws ResourceInitializationException {
       String outputDirectoryName = (String)getConfigParameterValue( PARAM_OUTPUTDIR );
       iv_outputDirectory = new File( outputDirectoryName );
@@ -65,6 +66,7 @@ public class FilesInDirectoryCasConsumer
       }
    }
 
+   @Override
    public void processCas( CAS cas ) throws ResourceProcessException {
       try {
          JCas jcas;

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/HtmlTableCasConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/HtmlTableCasConsumer.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/HtmlTableCasConsumer.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/HtmlTableCasConsumer.java Wed Apr  5 01:26:57 2017
@@ -64,6 +64,7 @@ public class HtmlTableCasConsumer extend
 
     private String[] iv_tdStyleArr = { "I", "B" };
 
+   @Override
     public void initialize() throws ResourceInitializationException
     {
         try
@@ -100,7 +101,8 @@ public class HtmlTableCasConsumer extend
         }
     }
 
-    public void processCas(CAS cas) throws ResourceProcessException
+   @Override
+   public void processCas( CAS cas ) throws ResourceProcessException
     {
         try
         {
@@ -155,7 +157,7 @@ public class HtmlTableCasConsumer extend
                         Iterator<Annotation> annItr = annList.iterator();
                         while (annItr.hasNext())
                         {
-                            Annotation ann = (Annotation) annItr.next();
+                           Annotation ann = annItr.next();
                             // account for preceeding whitespace
                             int delta = ann.getBegin() - cursor;
                             if (delta > 0)
@@ -232,7 +234,7 @@ public class HtmlTableCasConsumer extend
         Integer key = new Integer(annType);
         if (iv_getterMethMap.containsKey(key))
         {
-            Method meth = (Method) iv_getterMethMap.get(key);
+           Method meth = iv_getterMethMap.get( key );
             Object val = meth.invoke(ann, (Object[]) null);
             if (val != null)
             {
@@ -270,7 +272,7 @@ public class HtmlTableCasConsumer extend
         while (nestedAnnList.size() != 0)
         {
             // pop annotation off
-            Annotation ann = (Annotation) nestedAnnList.remove(0);
+           Annotation ann = nestedAnnList.remove( 0 );
 
             BitSet annBitSet = new BitSet(tSpanSize);
             annBitSet.set(ann.getBegin() - tSpanAnn.getBegin(), ann.getEnd()
@@ -281,7 +283,7 @@ public class HtmlTableCasConsumer extend
             boolean rowFound = false;
             while (!rowFound)
             {
-                BitSet trBitSet = (BitSet) maskAtRowList.get(idx);
+               BitSet trBitSet = maskAtRowList.get( idx );
 
                 // interset BitSets to determine if annotation will fit
                 // in this row
@@ -294,7 +296,7 @@ public class HtmlTableCasConsumer extend
                         maskAtRowList.add(trBitSet);
                     } else
                     {
-                        trBitSet = (BitSet) maskAtRowList.get(idx);
+                       trBitSet = maskAtRowList.get( idx );
                     }
                 }
                 trBitSet.or(annBitSet);
@@ -329,7 +331,8 @@ public class HtmlTableCasConsumer extend
          * 
          * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
          */
-        public int compare(Annotation a1, Annotation a2)
+        @Override
+        public int compare( Annotation a1, Annotation a2 )
         {
             Integer len1 = new Integer(a1.getCoveredText().length());
             Integer len2 = new Integer(a2.getCoveredText().length());
@@ -369,7 +372,8 @@ public class HtmlTableCasConsumer extend
          * 
          * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
          */
-        public int compare(Annotation a1, Annotation a2)
+        @Override
+        public int compare( Annotation a1, Annotation a2 )
         {
             if (a1.getBegin() < a2.getBegin())
                 return -1;
@@ -394,7 +398,7 @@ public class HtmlTableCasConsumer extend
                 .iterator();
         while (itr.hasNext())
         {
-            Annotation ann = (Annotation) itr.next();
+           Annotation ann = itr.next();
             if ((ann.getBegin() >= begin) && (ann.getEnd() <= end))
             {
                 list.add(ann);

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NonTerminalConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NonTerminalConsumer.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NonTerminalConsumer.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NonTerminalConsumer.java Wed Apr  5 01:26:57 2017
@@ -35,5 +35,5 @@ public interface NonTerminalConsumer ext
      * Gets the generated output from a CasConsumer in XML form.
      * @return Output xml in String form.
      */
-    public String getOutputXml();
+    String getOutputXml();
 }
\ No newline at end of file

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NormalizedFilesInDirectoryCasConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NormalizedFilesInDirectoryCasConsumer.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NormalizedFilesInDirectoryCasConsumer.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NormalizedFilesInDirectoryCasConsumer.java Wed Apr  5 01:26:57 2017
@@ -57,6 +57,7 @@ public class NormalizedFilesInDirectoryC
 
    File iv_outputDirectory;
 
+   @Override
    public void initialize() throws ResourceInitializationException {
       String outputDirectoryName = (String)getConfigParameterValue( PARAM_OUTPUTDIR );
       iv_outputDirectory = new File( outputDirectoryName );

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenFreqCasConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenFreqCasConsumer.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenFreqCasConsumer.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenFreqCasConsumer.java Wed Apr  5 01:26:57 2017
@@ -62,10 +62,10 @@ public class TokenFreqCasConsumer extend
  * This method opens/creates the file specified by "TokenFreqFile" and initializes the 
  * data structure that will keep track of frequency counts.
  * @see org.apache.uima.collection.CasConsumer_ImplBase#initialize()
- */	
-	public void initialize() throws ResourceInitializationException 
-	{
-		try
+ */
+@Override
+public void initialize() throws ResourceInitializationException {
+   try
 		{
 			String wordFreqFileName = (String) getConfigParameterValue(PARAM_WORD_FREQ_FILE);
 			wordFreqFile = new File(wordFreqFileName);
@@ -87,9 +87,9 @@ public class TokenFreqCasConsumer extend
 	 * 
 	 * @see org.apache.uima.collection.base_cpm.CasObjectProcessor#processCas(org.apache.uima.cas.CAS)
 	 */
-	public void processCas(CAS cas) throws ResourceProcessException 
-	{
-		try 
+   @Override
+   public void processCas( CAS cas ) throws ResourceProcessException {
+      try
 		{
 			JCas jcas;
 			jcas = cas.getJCas();
@@ -103,9 +103,9 @@ public class TokenFreqCasConsumer extend
 	        	{
 	        		wordFreqs.put(text, new int[1]);
 	        	}
-	        	((int[])wordFreqs.get(text))[0]++;
-	        }	        	
-		}
+              wordFreqs.get( text )[ 0 ]++;
+           }
+      }
 		catch(Exception exception)
 		{
 			throw new ResourceProcessException(exception);
@@ -116,9 +116,9 @@ public class TokenFreqCasConsumer extend
 	 * This method sorts the frequency counts and prints out the resulting frequencies in descending
 	 * order to the frequency file in 'word|count' format.
 	 */
-	public void collectionProcessComplete(ProcessTrace arg0) throws ResourceProcessException, IOException 
-	{
-		//sortedFreqs will contain objects of type Object[] of length 2.  The first object in the array
+   @Override
+   public void collectionProcessComplete( ProcessTrace arg0 ) throws ResourceProcessException, IOException {
+      //sortedFreqs will contain objects of type Object[] of length 2.  The first object in the array
 		//will hold the token and the second the frequency.  We want to sort on the frequency first in 
 		//descending order and token in ascending order for those tokens with the same frequency. 
 		TreeSet<Object[]> sortedFreqs = new TreeSet<Object[]>(
@@ -139,17 +139,17 @@ public class TokenFreqCasConsumer extend
 		while(words.hasNext())
 		{
 			String word = words.next();
-			int freq = ((int[])(wordFreqs.get(word)))[0];
-			sortedFreqs.add(new Object[] {word,new Integer(freq)});
-		}
+         int freq = wordFreqs.get( word )[ 0 ];
+         sortedFreqs.add( new Object[] { word, new Integer( freq ) } );
+      }
 		
 		PrintStream out = new PrintStream(new FileOutputStream(wordFreqFile));
 		Iterator<Object[]> freqs = sortedFreqs.iterator(); 
 		while(freqs.hasNext())
 		{
-			Object[] tokenFreq = (Object[]) freqs.next();
-			String word = (String) tokenFreq[0];
-			int freq = ((Integer)tokenFreq[1]).intValue();
+         Object[] tokenFreq = freqs.next();
+         String word = (String)tokenFreq[ 0 ];
+         int freq = ((Integer)tokenFreq[1]).intValue();
 			out.println(word+"|"+freq);
 		}
 		out.flush();

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenOffsetsCasConsumer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenOffsetsCasConsumer.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenOffsetsCasConsumer.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenOffsetsCasConsumer.java Wed Apr  5 01:26:57 2017
@@ -62,19 +62,19 @@ public class TokenOffsetsCasConsumer ext
 	public static final String PARAM_OUTPUTDIR = "OutputDirectory";
 
 	File iv_outputDirectory;
-	
-	public void initialize() throws ResourceInitializationException 
-	{
-	    String outputDirectoryName = (String)getConfigParameterValue(PARAM_OUTPUTDIR);
+
+   @Override
+   public void initialize() throws ResourceInitializationException {
+      String outputDirectoryName = (String)getConfigParameterValue(PARAM_OUTPUTDIR);
 	    iv_outputDirectory = new File(outputDirectoryName);
 	    if(!iv_outputDirectory.exists() || !iv_outputDirectory.isDirectory())
 	    	throw new ResourceInitializationException(
 	    			new Exception("Parameter setting 'OutputDirectory' does not point to an existing directory."));
 	}
-	
-	public void processCas(CAS cas) throws ResourceProcessException 
-	{
-		try 
+
+   @Override
+   public void processCas( CAS cas ) throws ResourceProcessException {
+      try
 		{
 			JCas jcas;
 			jcas = cas.getJCas();
@@ -106,9 +106,9 @@ public class TokenOffsetsCasConsumer ext
 		OutputStream out = new BufferedOutputStream(new FileOutputStream(outputFile));
 		for(int i=0; i<offsets.size(); i++)
 		{
-			String offset = (String) offsets.get(i)+"\n";
-			out.write(offset.getBytes());
-		}
+         String offset = offsets.get( i ) + "\n";
+         out.write( offset.getBytes() );
+      }
 		out.flush();
 		out.close();
 	}

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/XMISerializer.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/XMISerializer.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/XMISerializer.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/XMISerializer.java Wed Apr  5 01:26:57 2017
@@ -96,6 +96,7 @@ final public class XMISerializer {
        * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
        * java.lang.String, java.lang.String, org.xml.sax.Attributes)
        */
+      @Override
       public void startElement( String uri, String localName, String qName,
                                 Attributes atts ) throws SAXException {
          for ( int i = 0; i < atts.getLength(); i++ ) {
@@ -111,6 +112,7 @@ final public class XMISerializer {
        *
        * @see org.xml.sax.ContentHandler#characters(char[], int, int)
        */
+      @Override
       public void characters( char[] ch, int start, int length )
             throws SAXException {
          checkForInvalidXmlChars( ch, start, length, mXml11 );
@@ -122,6 +124,7 @@ final public class XMISerializer {
        *
        * @see org.xml.sax.ContentHandler#endDocument()
        */
+      @Override
       public void endDocument() throws SAXException {
          mHandler.endDocument();
       }
@@ -132,6 +135,7 @@ final public class XMISerializer {
        * @see org.xml.sax.ContentHandler#endElement(java.lang.String,
        * java.lang.String, java.lang.String)
        */
+      @Override
       public void endElement( String uri, String localName, String qName )
             throws SAXException {
          mHandler.endElement( uri, localName, qName );
@@ -142,6 +146,7 @@ final public class XMISerializer {
        *
        * @see org.xml.sax.ContentHandler#endPrefixMapping(java.lang.String)
        */
+      @Override
       public void endPrefixMapping( String prefix ) throws SAXException {
          mHandler.endPrefixMapping( prefix );
       }
@@ -151,6 +156,7 @@ final public class XMISerializer {
        *
        * @see org.xml.sax.ContentHandler#ignorableWhitespace(char[], int, int)
        */
+      @Override
       public void ignorableWhitespace( char[] ch, int start, int length )
             throws SAXException {
          mHandler.ignorableWhitespace( ch, start, length );
@@ -163,6 +169,7 @@ final public class XMISerializer {
        * org.xml.sax.ContentHandler#processingInstruction(java.lang.String,
        * java.lang.String)
        */
+      @Override
       public void processingInstruction( String target, String data )
             throws SAXException {
          mHandler.processingInstruction( target, data );
@@ -174,6 +181,7 @@ final public class XMISerializer {
        * @see
        * org.xml.sax.ContentHandler#setDocumentLocator(org.xml.sax.Locator)
        */
+      @Override
       public void setDocumentLocator( Locator locator ) {
          mHandler.setDocumentLocator( locator );
       }
@@ -183,6 +191,7 @@ final public class XMISerializer {
        *
        * @see org.xml.sax.ContentHandler#skippedEntity(java.lang.String)
        */
+      @Override
       public void skippedEntity( String name ) throws SAXException {
          mHandler.skippedEntity( name );
       }
@@ -192,6 +201,7 @@ final public class XMISerializer {
        *
        * @see org.xml.sax.ContentHandler#startDocument()
        */
+      @Override
       public void startDocument() throws SAXException {
          mHandler.startDocument();
       }
@@ -202,6 +212,7 @@ final public class XMISerializer {
        * @see org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String,
        * java.lang.String)
        */
+      @Override
       public void startPrefixMapping( String prefix, String uri )
             throws SAXException {
          mHandler.startPrefixMapping( prefix, uri );

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/SemanticGroup.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/SemanticGroup.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/SemanticGroup.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/SemanticGroup.java Wed Apr  5 01:26:57 2017
@@ -29,7 +29,7 @@ public enum SemanticGroup {
     * @param name short name of the type: anatomy, disorder, finding, procedure, drug
     * @param tuis tuis that define the semantic type
     */
-   private SemanticGroup( final String name, final String... tuis ) {
+   SemanticGroup( final String name, final String... tuis ) {
       _name = name;
       _tuis = Arrays.asList( tuis );
    }

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/UmlsItemCell.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/UmlsItemCell.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/UmlsItemCell.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/UmlsItemCell.java Wed Apr  5 01:26:57 2017
@@ -7,7 +7,7 @@ package org.apache.ctakes.core.cc.pretty
 public interface UmlsItemCell extends ItemCell {
 
    // Return Code used to indicate that a full entity span should be filled with an indicator character, e.g. '='
-   static public final String ENTITY_FILL = "ENTITY_FILL";
+   String ENTITY_FILL = "ENTITY_FILL";
 
    /**
     * @return true if the umls entity represented by this item cell is negated

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionCyclicalReads.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionCyclicalReads.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionCyclicalReads.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionCyclicalReads.java Wed Apr  5 01:26:57 2017
@@ -101,7 +101,8 @@ public class FilesInDirectoryCollectionC
 	  /**
 	   * @see org.apache.uima.collection.CollectionReader_ImplBase#initialize()
 	   */
-	public void initialize() throws ResourceInitializationException {
+     @Override
+     public void initialize() throws ResourceInitializationException {
 
 		super.initialize();
 		totalNumFiles = iv_files.size();
@@ -122,10 +123,10 @@ public class FilesInDirectoryCollectionC
      * the iteration amount will be processed.  Multiples of the total available documents
      * will be provided to supplement the list required to meet the total iteration value.
      */
-	public boolean hasNext()
-	{
-		
-		// If hasNext false then start over only if count that has been passed to the contructor hasn't been reached. 
+    @Override
+    public boolean hasNext() {
+
+       // If hasNext false then start over only if count that has been passed to the contructor hasn't been reached.
 		boolean doNext = iv_currentIndex < totalNumFiles;
 	
 		if ((!doNext) && (scaleTime > 0)) {
@@ -143,10 +144,7 @@ public class FilesInDirectoryCollectionC
 
 		}
 		if (scaleTime == -1) {
-			if (iv_currentIndex < iv_iteration)
-				doNext = true;
-			else
-				doNext = false;
+         doNext = iv_currentIndex < iv_iteration;
 
 		}
 		
@@ -156,8 +154,8 @@ public class FilesInDirectoryCollectionC
 	  /**
 	   * @see org.apache.uima.collection.CollectionReader#getNext(org.apache.uima.cas.CAS)
 	   */
-	  public void getNext(CAS aCAS) throws IOException, CollectionException
-	  {
+     @Override
+     public void getNext( CAS aCAS ) throws IOException, CollectionException {
 
 		super.getNext(aCAS);
 		
@@ -168,17 +166,18 @@ public class FilesInDirectoryCollectionC
 	  /**
 	   * @see org.apache.uima.collection.base_cpm.BaseCollectionReader#close()
 	   */
-	  public void close() throws IOException
-	  {
-		  super.close();
+     @Override
+     public void close() throws IOException {
+        super.close();
 	  }
 
 	  /**
 	   * @see org.apache.uima.collection.base_cpm.BaseCollectionReader#getProgress()
 	   */
-	  public Progress[] getProgress() {
-		  int offSet = iv_currentIndex;
-		  if ((scaleTime > 0) && (iv_currentIndex > 0)) 
+     @Override
+     public Progress[] getProgress() {
+        int offSet = iv_currentIndex;
+        if ((scaleTime > 0) && (iv_currentIndex > 0))
 			  offSet = iv_currentIndex*(1/scaleTime);
 		  if (scaleTime == 0){
 			  offSet = iv_iteration + remainTimes;
@@ -195,9 +194,9 @@ public class FilesInDirectoryCollectionC
 		 * 
 		 * @return the number of documents in the collection
 		 */
-	  public int getNumberOfDocuments()
-	  {
-	    return iv_files.size();
+     @Override
+     public int getNumberOfDocuments() {
+        return iv_files.size();
 	  }
 
 

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionReader.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionReader.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionReader.java Wed Apr  5 01:26:57 2017
@@ -199,17 +199,17 @@ public class FilesInDirectoryCollectionR
     /**
      * @see org.apache.uima.collection.CollectionReader#hasNext()
      */
-	public boolean hasNext()
-	{
-		return iv_currentIndex < iv_files.size();
+    @Override
+    public boolean hasNext() {
+       return iv_currentIndex < iv_files.size();
 	}
 
 	  /**
 	   * @see org.apache.uima.collection.CollectionReader#getNext(org.apache.uima.cas.CAS)
 	   */
-	  public void getNext(CAS aCAS) throws IOException, CollectionException
-	  {
-	  	JCas jcas;
+     @Override
+     public void getNext( CAS aCAS ) throws IOException, CollectionException {
+        JCas jcas;
 	  	InputStream fileInputStream = null;
 	  	Reader fileReader = null;
 	  	
@@ -218,9 +218,9 @@ public class FilesInDirectoryCollectionR
 	        jcas = aCAS.getJCas();
 	   	
 	  		//open input stream to file
-	      	File file = (File)iv_files.get(iv_currentIndex);
-	      	fileInputStream = new FileInputStream(file);
-	      	fileReader = new BufferedReader(new InputStreamReader(fileInputStream));
+          File file = iv_files.get( iv_currentIndex );
+          fileInputStream = new FileInputStream( file );
+          fileReader = new BufferedReader(new InputStreamReader(fileInputStream));
 
 	      	DocumentID documentIDAnnotation = new DocumentID(jcas);
 		    String docID = createDocID(file);
@@ -283,16 +283,16 @@ public class FilesInDirectoryCollectionR
 	  /**
 	   * @see org.apache.uima.collection.base_cpm.BaseCollectionReader#close()
 	   */
-	  public void close() throws IOException
-	  {
-	  }
+     @Override
+     public void close() throws IOException {
+     }
 
 	  /**
 	   * @see org.apache.uima.collection.base_cpm.BaseCollectionReader#getProgress()
 	   */
-	  public Progress[] getProgress()
-	  {
-	    return new Progress[]{
+     @Override
+     public Progress[] getProgress() {
+        return new Progress[]{
 	       new ProgressImpl(iv_currentIndex, iv_files.size(),Progress.ENTITIES)};
 	  }
 

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java Wed Apr  5 01:26:57 2017
@@ -112,6 +112,7 @@ public class JdbcCollectionReader extend
     private int prepStmtValArrIdx = 0;
     private boolean usePrepStmtVals = false;
 
+   @Override
     public void initialize() throws ResourceInitializationException
     {
         try
@@ -173,7 +174,7 @@ public class JdbcCollectionReader extend
         prepStmtValArr = new List[lineList.size()];
         for (int i = 0; i < lineList.size(); i++)
         {
-            String currLine = (String) lineList.get(i);
+           String currLine = lineList.get( i );
             List<String> valList = new ArrayList<String>();
             StringTokenizer st = new StringTokenizer(currLine, "\t");
             while (st.hasMoreTokens())
@@ -244,7 +245,8 @@ public class JdbcCollectionReader extend
      * 
      * @see org.apache.uima.collection.CollectionReader#getNext(org.apache.uima.cas.CAS)
      */
-    public void getNext(CAS cas) throws IOException, CollectionException
+    @Override
+    public void getNext( CAS cas ) throws IOException, CollectionException
     {
         currRowCount++;
         try
@@ -354,6 +356,7 @@ public class JdbcCollectionReader extend
      * 
      * @see org.apache.uima.collection.base_cpm.BaseCollectionReader#hasNext()
      */
+    @Override
     public boolean hasNext() throws IOException, CollectionException
     {
         try
@@ -415,6 +418,7 @@ public class JdbcCollectionReader extend
      * 
      * @see org.apache.uima.collection.base_cpm.BaseCollectionReader#getProgress()
      */
+    @Override
     public Progress[] getProgress()
     {
         Progress p = new ProgressImpl(currRowCount, totalRowCount,
@@ -427,6 +431,7 @@ public class JdbcCollectionReader extend
      * 
      * @see org.apache.uima.collection.base_cpm.BaseCollectionReader#close()
      */
+    @Override
     public void close() throws IOException
     {
         try

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java Wed Apr  5 01:26:57 2017
@@ -102,9 +102,9 @@ public class LinesFromFileCollectionRead
 	
 	private Logger iv_logger = Logger.getLogger(getClass().getName());
 
-	public void initialize() throws ResourceInitializationException
-	{
-		BufferedReader fileReader = null;
+   @Override
+   public void initialize() throws ResourceInitializationException {
+      BufferedReader fileReader = null;
 		try
 		{
 			String fileLocation = (String) getConfigParameterValue(PARAM_INPUT_FILE_NAME);
@@ -141,17 +141,17 @@ public class LinesFromFileCollectionRead
 			try { fileReader.close(); } catch(IOException ioe) {}
 		}
 	}
-	
-	public void getNext(CAS cas) throws IOException, CollectionException 
-	{
-	  	JCas jcas;
+
+   @Override
+   public void getNext( CAS cas ) throws IOException, CollectionException {
+      JCas jcas;
 	  	try
 	    {
 	  		jcas = cas.getJCas();
-	  	
-		  	String line = (String) iv_linesFromFile.get(iv_currentIndex);
-		  	int lineNumber = iv_currentIndex + 1;
-		  	String id;
+
+          String line = iv_linesFromFile.get( iv_currentIndex );
+          int lineNumber = iv_currentIndex + 1;
+          String id;
 		  	String text;
 		  	if(iv_delimeter != null)
 			{
@@ -208,14 +208,15 @@ public class LinesFromFileCollectionRead
 	    
 	}
 
-	public boolean hasNext() throws IOException, CollectionException 
-	{
-		return iv_currentIndex < iv_linesFromFile.size();
+   @Override
+   public boolean hasNext() throws IOException, CollectionException {
+      return iv_currentIndex < iv_linesFromFile.size();
 	}
 
-	public Progress[] getProgress() {
-	    return new Progress[]{
-	    	       new ProgressImpl(iv_currentIndex, iv_linesFromFile.size(),Progress.ENTITIES)};
+   @Override
+   public Progress[] getProgress() {
+      return new Progress[] {
+            new ProgressImpl(iv_currentIndex, iv_linesFromFile.size(),Progress.ENTITIES)};
 	}
 
 	 /**
@@ -227,6 +228,8 @@ public class LinesFromFileCollectionRead
 	  {
 	    return iv_linesFromFile.size();
 	  }
-	  
-	public void close() throws IOException {}
+
+   @Override
+   public void close() throws IOException {
+   }
 }

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XmiCollectionReaderCtakes.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XmiCollectionReaderCtakes.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XmiCollectionReaderCtakes.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/XmiCollectionReaderCtakes.java Wed Apr  5 01:26:57 2017
@@ -66,6 +66,7 @@ public class XmiCollectionReaderCtakes e
   /**
    * @see org.apache.uima.collection.CollectionReader_ImplBase#initialize()
    */
+  @Override
   public void initialize() throws ResourceInitializationException {
 	mFailOnUnknownType = (Boolean) getConfigParameterValue(PARAM_FAILUNKNOWN);
 	if (null == mFailOnUnknownType) {
@@ -93,6 +94,7 @@ public class XmiCollectionReaderCtakes e
   /**
    * @see org.apache.uima.collection.CollectionReader#hasNext()
    */
+  @Override
   public boolean hasNext() {
     return mCurrentIndex < mFiles.size();
   }
@@ -100,7 +102,8 @@ public class XmiCollectionReaderCtakes e
   /**
    * @see org.apache.uima.collection.CollectionReader#getNext(org.apache.uima.cas.CAS)
    */
-  public void getNext(CAS aCAS) throws IOException, CollectionException {
+  @Override
+  public void getNext( CAS aCAS ) throws IOException, CollectionException {
     File currentFile = (File) mFiles.get(mCurrentIndex++);
     FileInputStream inputStream = new FileInputStream(currentFile);
     try {
@@ -115,12 +118,14 @@ public class XmiCollectionReaderCtakes e
   /**
    * @see org.apache.uima.collection.base_cpm.BaseCollectionReader#close()
    */
+  @Override
   public void close() throws IOException {
   }
 
   /**
    * @see org.apache.uima.collection.base_cpm.BaseCollectionReader#getProgress()
    */
+  @Override
   public Progress[] getProgress() {
     return new Progress[] { new ProgressImpl(mCurrentIndex, mFiles.size(), Progress.ENTITIES) };
   }

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/CliOptionals.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/CliOptionals.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/CliOptionals.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/CliOptionals.java Wed Apr  5 01:26:57 2017
@@ -11,7 +11,7 @@ import com.lexicalscope.jewel.cli.Option
  * @version %I%
  * @since 1/7/2017
  */
-public interface CliOptionals extends StandardOptions {
+public interface CliOptionals extends StandardCliOptions {
 
    @Option(
          shortName = "a",

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PipeBitInfo.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PipeBitInfo.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PipeBitInfo.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PipeBitInfo.java Wed Apr  5 01:26:57 2017
@@ -10,7 +10,6 @@ import org.apache.ctakes.typesystem.type
 import org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation;
 import org.apache.ctakes.typesystem.type.textsem.Markable;
 import org.apache.ctakes.typesystem.type.textsem.TimeMention;
-import org.apache.ctakes.typesystem.type.textspan.ListEntry;
 import org.apache.ctakes.typesystem.type.textspan.Paragraph;
 import org.apache.ctakes.typesystem.type.textspan.Segment;
 import org.apache.ctakes.typesystem.type.textspan.Sentence;
@@ -50,7 +49,6 @@ public @interface PipeBitInfo {
       SENTENCE( Sentence.class ),
       PARAGRAPH( Paragraph.class ),
       LIST( org.apache.ctakes.typesystem.type.textspan.List.class ),
-      LIST_ENTRY( ListEntry.class ),
       BASE_TOKEN( BaseToken.class ),
       CHUNK( Chunk.class ),
       IDENTIFIED_ANNOTATION( IdentifiedAnnotation.class ),

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PipelineBuilder.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PipelineBuilder.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PipelineBuilder.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PipelineBuilder.java Wed Apr  5 01:26:57 2017
@@ -53,6 +53,13 @@ final public class PipelineBuilder {
       _descEndList = new ArrayList<>();
    }
 
+   public void clear() {
+      _aeNameList.clear();
+      _descList.clear();
+      _aeEndNameList.clear();
+      _descEndList.clear();
+   }
+
    /**
     * Use of this method is order-specific
     *

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileReader.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileReader.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileReader.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileReader.java Wed Apr  5 01:26:57 2017
@@ -143,17 +143,7 @@ final public class PiperFileReader {
             FileLocator.getAsStream( getPiperPath( filePath ) ) ) ) ) {
          String line = reader.readLine();
          while ( line != null ) {
-            line = line.trim();
-            if ( line.isEmpty() || line.startsWith( "//" ) || line.startsWith( "#" ) || line.startsWith( "!" ) ) {
-               line = reader.readLine();
-               continue;
-            }
-            final int spaceIndex = line.indexOf( ' ' );
-            if ( spaceIndex < 0 ) {
-               addToPipeline( line, "" );
-            } else {
-               addToPipeline( line.substring( 0, spaceIndex ), line.substring( spaceIndex + 1 ).trim() );
-            }
+            parsePipelineLine( line.trim() );
             line = reader.readLine();
          }
       } catch ( IOException ioE ) {
@@ -161,6 +151,18 @@ final public class PiperFileReader {
       }
    }
 
+   public void parsePipelineLine( final String line ) throws UIMAException {
+      if ( line.isEmpty() || line.startsWith( "//" ) || line.startsWith( "#" ) || line.startsWith( "!" ) ) {
+         return;
+      }
+      final int spaceIndex = line.indexOf( ' ' );
+      if ( spaceIndex < 0 ) {
+         addToPipeline( line, "" );
+      } else {
+         addToPipeline( line.substring( 0, spaceIndex ), line.substring( spaceIndex + 1 ).trim() );
+      }
+   }
+
    /**
     * @return the PipelineBuilder with its current state set by this PipelineReader
     */
@@ -563,7 +565,7 @@ final public class PiperFileReader {
     */
    private Object[] getCliParameters( final String text ) {
       if ( _cliOptionals == null ) {
-         LOGGER.error( "Attempting to set Parameter by Command-line options.  Command-line options are not specified." );
+         LOGGER.warn( "Attempted to set Parameter by Command-line options.  Command-line options are not specified." );
          return EMPTY_OBJECT_ARRAY;
       }
       if ( text == null || text.trim().isEmpty() ) {

Copied: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/StandardCliOptions.java (from r1790164, ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/StandardOptions.java)
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/StandardCliOptions.java?p2=ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/StandardCliOptions.java&p1=ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/StandardOptions.java&r1=1790164&r2=1790171&rev=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/StandardOptions.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/StandardCliOptions.java Wed Apr  5 01:26:57 2017
@@ -9,7 +9,7 @@ import com.lexicalscope.jewel.cli.Option
  * @version %I%
  * @since 1/7/2017
  */
-interface StandardOptions {
+interface StandardCliOptions {
    @Option(
          shortName = "p",
          longName = "piper",

Modified: ctakes/trunk/ctakes-dictionary-lookup-fast-res/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast-res/pom.xml?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast-res/pom.xml (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast-res/pom.xml Wed Apr  5 01:26:57 2017
@@ -31,6 +31,7 @@
    <description>Resources Project for ctakes-dictionary-lookup-fast</description>
    <dependencies>
       <dependency>
+         <!--  TODO  -->
          <groupId>net.sourceforge.ctakesresources</groupId>
          <artifactId>ctakes-resources-snomed-rword-hsqldb-2011ab</artifactId>
          <version>3.2.1.1</version>

Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/pom.xml?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/pom.xml (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/pom.xml Wed Apr  5 01:26:57 2017
@@ -40,24 +40,8 @@
 		</dependency>	
 		<dependency>
 			<groupId>org.apache.ctakes</groupId>
-			<artifactId>ctakes-type-system</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ctakes</groupId>
 			<artifactId>ctakes-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jdom</groupId>
-			<artifactId>jdom</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
 	</dependencies>
 	<build>
 	</build>

Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/JCasTermAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/JCasTermAnnotator.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/JCasTermAnnotator.java (original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/JCasTermAnnotator.java Wed Apr  5 01:26:57 2017
@@ -42,26 +42,26 @@ public interface JCasTermAnnotator exten
     * @deprecated replaced by {@link ConfigParameterConstants#PARAM_LOOKUP_XML }
     */
    @Deprecated
-   static final String DICTIONARY_DESCRIPTOR_KEY = "DictionaryDescriptor";
+   String DICTIONARY_DESCRIPTOR_KEY = "DictionaryDescriptor";
    /**
     * specifies the type of window to use for lookup
     */
-   static final String PARAM_WINDOW_ANNOT_KEY = "windowAnnotations";
+   String PARAM_WINDOW_ANNOT_KEY = "windowAnnotations";
    /**
     * optional part of speech tags for tokens that should not be used for lookup
     */
-   static final String PARAM_EXC_TAGS_KEY = "exclusionTags";
+   String PARAM_EXC_TAGS_KEY = "exclusionTags";
    /**
     * optional minimum span for tokens that should not be used for lookup
     */
-   static final String PARAM_MIN_SPAN_KEY = "minimumSpan";
+   String PARAM_MIN_SPAN_KEY = "minimumSpan";
 
 
-   static final String DEFAULT_LOOKUP_WINDOW = "org.apache.ctakes.typesystem.type.textspan.Sentence";
-   static final String DEFAULT_EXCLUSION_TAGS
+   String DEFAULT_LOOKUP_WINDOW = "org.apache.ctakes.typesystem.type.textspan.Sentence";
+   String DEFAULT_EXCLUSION_TAGS
          = "VB,VBD,VBG,VBN,VBP,VBZ,CC,CD,DT,EX,IN,LS,MD,PDT,POS,PP,PP$,PRP,PRP$,RP,TO,WDT,WP,WPS,WRB";
-   static final int DEFAULT_MINIMUM_SPAN = 3;
-   static final String DEFAULT_DICT_DESC_PATH = "org/apache/ctakes/dictionary/lookup/fast/cTakesHsql.xml";
+   int DEFAULT_MINIMUM_SPAN = 3;
+   String DEFAULT_DICT_DESC_PATH = "org/apache/ctakes/dictionary/lookup/fast/sno_rx_16ab.xml";
 
    /**
     * @return Dictionaries that are used by this WindowProcessor

Added: ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/CheckRun.png
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/CheckRun.png?rev=1790171&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/CheckRun.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/Package.png
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/Package.png?rev=1790171&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/Package.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/Parameters.png
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/Parameters.png?rev=1790171&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/Parameters.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/PlusMark.png
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/PlusMark.png?rev=1790171&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ctakes/trunk/ctakes-gui-res/src/main/resources/org/apache/ctakes/gui/pipeline/icon/PlusMark.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ctakes/trunk/ctakes-gui/ctakes-gui.iml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/ctakes-gui.iml?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/ctakes-gui.iml (original)
+++ ctakes/trunk/ctakes-gui/ctakes-gui.iml Wed Apr  5 01:26:57 2017
@@ -14,6 +14,8 @@
     <orderEntry type="module" module-name="ctakes-gui-res" />
     <orderEntry type="module" module-name="ctakes-core" />
     <orderEntry type="module" module-name="ctakes-core-res" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="module" module-name="ctakes-type-system" />
     <orderEntry type="library" name="Maven: org.apache.uima:uimaj-core:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: tw.edu.ntu.csie:libsvm:3.1" level="project" />
@@ -31,9 +33,9 @@
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.1.2.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.1.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
     <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.jdom:jdom2:2.0.6" level="project" />
     <orderEntry type="library" name="Maven: org.cleartk:cleartk-util:2.0.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:10.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
@@ -43,21 +45,15 @@
     <orderEntry type="library" name="Maven: edu.mit.findstruct:findstructapi:0.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.armbrust-file-utils:sqlwrapper:0.0.1" level="project" />
     <orderEntry type="library" name="Maven: net.sourceforge.openai:openaifsm:0.0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.uima:uimaj-examples:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.uima:uimaj-cpe:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.uima:uimaj-adapter-vinci:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.uima:jVinci:2.9.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.uima:uimaj-document-annotation:2.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.uima:uimaj-tools:2.9.0" level="project" />
     <orderEntry type="library" name="Maven: com.lexicalscope.jewelcli:jewelcli:0.8.3" level="project" />
     <orderEntry type="library" name="Maven: org.apache.uima:uimafit-core:2.2.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
     <orderEntry type="library" name="Maven: org.cleartk:cleartk-ml:2.0.0" level="project" />
-    <orderEntry type="library" name="Maven: hsqldb:hsqldb:1.8.0.10" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.hsqldb:hsqldb:2.3.4" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: io.github.lukehutch:fast-classpath-scanner:2.0.18" level="project" />
   </component>
 </module>
\ No newline at end of file

Added: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/FileTableCellEditor.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/FileTableCellEditor.java?rev=1790171&view=auto
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/FileTableCellEditor.java (added)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/FileTableCellEditor.java Wed Apr  5 01:26:57 2017
@@ -0,0 +1,86 @@
+package org.apache.ctakes.gui.component;
+
+
+import org.apache.log4j.Logger;
+
+import javax.swing.*;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableCellRenderer;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.File;
+
+/**
+ * @author SPF , chip-nlp
+ * @version %I%
+ * @since 3/28/2017
+ */
+final public class FileTableCellEditor extends AbstractCellEditor
+      implements TableCellRenderer, TableCellEditor, ActionListener {
+
+   static private final Logger LOGGER = Logger.getLogger( "FileTableCellEditor" );
+
+   final private JButton _button;
+   final private JFileChooser _chooser;
+   private File _selectedFile;
+
+   public FileTableCellEditor() {
+      final Icon icon = UIManager.getIcon( "FileView.directoryIcon" );
+      _button = new JButton( icon );
+      _button.setFocusPainted( false );
+      _button.setFocusable( false );
+      _button.setToolTipText( "Select File" );
+      _button.addActionListener( this );
+      _chooser = new JFileChooser();
+   }
+
+   public JFileChooser getFileChooser() {
+      return _chooser;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public Component getTableCellRendererComponent( final JTable table, final Object value,
+                                                   final boolean isSelected, final boolean hasFocus,
+                                                   final int row, final int column ) {
+      return _button;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public Object getCellEditorValue() {
+      return _selectedFile;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public Component getTableCellEditorComponent( final JTable table, final Object value,
+                                                 final boolean isSelected,
+                                                 final int row, final int column ) {
+      if ( File.class.isInstance( value ) ) {
+         _selectedFile = (File)value;
+      }
+      return _button;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public void actionPerformed( final ActionEvent event ) {
+      final int option = _chooser.showOpenDialog( null );
+      if ( option != JFileChooser.APPROVE_OPTION ) {
+         return;
+      }
+      _selectedFile = _chooser.getSelectedFile();
+      fireEditingStopped();
+   }
+
+}

Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/SystemOutPanel.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/SystemOutPanel.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/SystemOutPanel.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/SystemOutPanel.java Wed Apr  5 01:26:57 2017
@@ -114,6 +114,7 @@ final public class SystemOutPanel extend
    private class UiOutputStream extends OutputStream {
       private final StringBuilder __sb = new StringBuilder();
 
+      @Override
       public void write( final int b ) throws IOException {
          __sb.append( (char)b );
          if ( (char)b == '\n' ) {
@@ -122,12 +123,14 @@ final public class SystemOutPanel extend
          }
       }
 
+      @Override
       public void flush() throws IOException {
          appendText( __sb.toString() );
          __sb.setLength( 0 );
          super.flush();
       }
 
+      @Override
       public void close() throws IOException {
          appendText( __sb.toString() );
          __sb.setLength( 0 );

Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/DictionaryBuilder.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/DictionaryBuilder.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/DictionaryBuilder.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/DictionaryBuilder.java Wed Apr  5 01:26:57 2017
@@ -5,10 +5,12 @@ import org.apache.ctakes.core.util.colle
 import org.apache.ctakes.core.util.collection.HashSetMap;
 import org.apache.ctakes.gui.dictionary.umls.*;
 import org.apache.ctakes.gui.dictionary.util.HsqlUtil;
+import org.apache.ctakes.gui.dictionary.util.JdbcUtil;
 import org.apache.ctakes.gui.dictionary.util.RareWordDbWriter;
 import org.apache.log4j.Logger;
 
 import java.io.File;
+import java.sql.Connection;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -26,7 +28,7 @@ final class DictionaryBuilder {
    static private final String CTAKES_RES_MODULE = "ctakes-dictionary-lookup-fast-res";
    static private final String CTAKES_RES_DB_PATH = CTAKES_RES_MODULE + "/src/main/" + CTAKES_APP_DB_PATH;
    static private final int MIN_CHAR_LENGTH = 2;
-   static private final int MAX_CHAR_LENGTH = 50;
+   static private final int MAX_CHAR_LENGTH = 48;
    static private final int MAX_WORD_COUNT = 12;
    static private final int MAX_SYM_COUNT = 7;
    static private final int WSD_DIVISOR = 2;
@@ -48,8 +50,7 @@ final class DictionaryBuilder {
       final UmlsTermUtil umlsTermUtil = new UmlsTermUtil( DEFAULT_DATA_DIR );
       final Map<Long, Concept> conceptMap
             = parseAll( umlsTermUtil, umlsDirPath, wantedLanguages, wantedSources, wantedTargets, wantedTuis );
-      writeDatabase( ctakesDirPath, dictionaryName, conceptMap );
-      return true;
+      return writeDatabase( ctakesDirPath, dictionaryName, conceptMap );
    }
 
 
@@ -200,15 +201,16 @@ final class DictionaryBuilder {
       if ( Arrays.asList( ctakesRoot.list() ).contains( CTAKES_RES_MODULE ) ) {
          databaseDirPath = ctakesDirPath + "/" + CTAKES_RES_DB_PATH;
       }
-      if ( !HsqlUtil.createDatabase( databaseDirPath, dictionaryName ) ) {
+      final String url = HsqlUtil.URL_PREFIX + databaseDirPath.replace( '\\', '/' ) + "/" + dictionaryName + "/" +
+                         dictionaryName;
+      final Connection connection = JdbcUtil.createDatabaseConnection( url, "SA", "" );
+      if ( !HsqlUtil.createDatabase( connection ) ) {
          return false;
       }
       if ( !DictionaryXmlWriter.writeXmlFile( databaseDirPath, dictionaryName ) ) {
          return false;
       }
-      final String url = HsqlUtil.URL_PREFIX + databaseDirPath.replace( '\\', '/' ) + "/" + dictionaryName + "/" +
-                         dictionaryName;
-      return RareWordDbWriter.writeConcepts( conceptMap, url, "sa", "" );
+      return RareWordDbWriter.writeConcepts( connection, conceptMap );
    }
 
 

Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/Concept.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/Concept.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/Concept.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/Concept.java Wed Apr  5 01:26:57 2017
@@ -2,6 +2,7 @@ package org.apache.ctakes.gui.dictionary
 
 
 import org.apache.ctakes.core.util.collection.HashSetMap;
+import org.apache.ctakes.gui.dictionary.util.TextTokenizer;
 
 import java.util.*;
 
@@ -54,9 +55,16 @@ final public class Concept {
    }
 
    public void cullExtensions() {
-      if ( _preferredText != null && !_preferredText.isEmpty() && !_preferredText.equals( PREFERRED_TERM_UNKNOWN )
-           && !_textCounts.containsKey( _preferredText.toLowerCase() ) ) {
-         _textCounts.put( _preferredText.toLowerCase(), 1 );
+      if ( _preferredText != null && !_preferredText.isEmpty() && !_preferredText.equals( PREFERRED_TERM_UNKNOWN ) ) {
+         final String tokenizedPrefText = TextTokenizer.getTokenizedText( _preferredText.toLowerCase() );
+         if ( !_textCounts.containsKey( tokenizedPrefText ) && tokenizedPrefText.length() < 255 ) {
+            final boolean nonAlpha = tokenizedPrefText.chars()
+                  .filter( c -> !Character.isAlphabetic( c ) )
+                  .findFirst().isPresent();
+            if ( !nonAlpha ) {
+               _textCounts.put( tokenizedPrefText, 1 );
+            }
+         }
       }
       if ( _textCounts.size() < 2 ) {
          return;

Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrconsoIndex.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrconsoIndex.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrconsoIndex.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrconsoIndex.java Wed Apr  5 01:26:57 2017
@@ -9,7 +9,7 @@ public enum MrconsoIndex {
    CUI( 0 ), LANGUAGE( 1 ), STATUS( 2 ), FORM( 4 ), SOURCE( 11 ), TERM_TYPE( 12 ), SOURCE_CODE( 13 ), TEXT( 14 );
    final public int _index;
 
-   private MrconsoIndex( final int index ) {
+   MrconsoIndex( final int index ) {
       _index = index;
    }
 

Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrconsoParser.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrconsoParser.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrconsoParser.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrconsoParser.java Wed Apr  5 01:26:57 2017
@@ -147,10 +147,6 @@ final public class MrconsoParser {
             if ( isPreferredTerm( tokens ) ) {
                concept.setPreferredText( text );
             }
-//            if ( !isSourceOk( tokens, wantedSources ) ) {
-//               tokens = FileUtil.readBsvTokens( reader, mrconsoPath );
-//               continue;
-//            }
             // Get tokenized text
             final String tokenizedText = TextTokenizer.getTokenizedText( text );
             if ( tokenizedText == null || tokenizedText.isEmpty()
@@ -231,7 +227,6 @@ final public class MrconsoParser {
     */
    static public Collection<Long> getValidVocabularyCuis( final String umlsDirPath,
                                                           final Collection<String> sourceVocabularies ) {
-//      return getValidVocabularyCuis( umlsDirPath, sourceVocabularies, getDefaultExclusions() );
       return getValidVocabularyCuis( umlsDirPath, sourceVocabularies, getNonRxnormExclusions() );
    }
 
@@ -258,6 +253,10 @@ final public class MrconsoParser {
                                                            final String... invalidTypes ) {
       final String mrconsoPath = umlsDirPath + MR_CONSO_SUB_PATH;
       LOGGER.info( "Compiling list of Cuis with wanted Vocabularies using " + mrconsoPath );
+      final Map<String, Long> sourceCuis = new HashMap<>( sourceVocabularies.size() );
+      for ( String target : sourceVocabularies ) {
+         sourceCuis.put( target, 0L );
+      }
       final Collection<Long> validCuis = new HashSet<>();
       long lineCount = 0;
       try ( final BufferedReader reader = FileUtil.createReader( mrconsoPath ) ) {
@@ -265,20 +264,30 @@ final public class MrconsoParser {
          while ( tokens != null ) {
             lineCount++;
             if ( lineCount % 100000 == 0 ) {
-               LOGGER.info( "File Line " + lineCount + "\t Valid Cuis " + validCuis.size() );
+               final String cuis = sourceCuis.entrySet().stream().map( e -> e.getKey() + " " + e.getValue() )
+                     .collect( Collectors.joining( ", " ) );
+               LOGGER.info( "File Lines " + lineCount + "\t Cuis: " + cuis );
             }
             if ( tokens.size() > SOURCE._index
                  && sourceVocabularies.stream().anyMatch( getToken( tokens, SOURCE )::equals )
                  && Arrays.stream( invalidTypes ).noneMatch( getToken( tokens, TERM_TYPE )::equals ) ) {
                final Long cuiCode = CuiCodeUtil.getInstance().getCuiCode( getToken( tokens, CUI ) );
-               validCuis.add( cuiCode );
+               if ( validCuis.add( cuiCode ) ) {
+                  final String source = getToken( tokens, SOURCE );
+                  final long cuis = sourceCuis.get( source );
+                  sourceCuis.put( source, (cuis + 1) );
+               }
             }
             tokens = FileUtil.readBsvTokens( reader, mrconsoPath );
          }
       } catch ( IOException ioE ) {
          LOGGER.error( ioE.getMessage() );
       }
+      final String cuis = sourceCuis.entrySet().stream().map( e -> e.getKey() + " " + e.getValue() )
+            .collect( Collectors.joining( ", " ) );
+      LOGGER.info( "File Lines " + lineCount + "\t Cuis: " + cuis );
       LOGGER.info( "File Lines " + lineCount + "\t Valid Cuis " + validCuis.size() + "\t for wanted Vocabularies" );
+      LOGGER.info( "   Any Difference is caused by overlap of sources." );
       return validCuis;
    }
 

Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrstyIndex.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrstyIndex.java?rev=1790171&r1=1790170&r2=1790171&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrstyIndex.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/dictionary/umls/MrstyIndex.java Wed Apr  5 01:26:57 2017
@@ -9,7 +9,7 @@ public enum MrstyIndex {
    CUI( 0 ), TUI( 1 );
    final public int _index;
 
-   private MrstyIndex( final int index ) {
+   MrstyIndex( final int index ) {
       _index = index;
    }