svn commit: r1775146 - in /ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core: pipeline/PiperFileReader.java pipeline/PiperFileRunner.java util/regex/ThreadString.java

[se...@apache.org]

Author: seanfinan
Date: Mon Dec 19 17:44:22 2016
New Revision: 1775146

URL: http://svn.apache.org/viewvc?rev=1775146&view=rev
Log:
ThreadString interrupts subsequence
Add unchecked to PiperFileReader

Modified:
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileReader.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileRunner.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/regex/ThreadString.java

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=1775146&r1=1775145&r2=1775146&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 Mon Dec 19 17:44:22 2016
@@ -52,6 +52,7 @@ import java.util.regex.Pattern;
  * @version %I%
  * @since 10/10/2016
  */
+@SuppressWarnings( "unchecked" )
 final public class PiperFileReader {
 
    static private final Logger LOGGER = Logger.getLogger( "PiperFileReader" );

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileRunner.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileRunner.java?rev=1775146&r1=1775145&r2=1775146&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileRunner.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileRunner.java Mon Dec 19 17:44:22 2016
@@ -76,26 +76,26 @@ public class PiperFileRunner {
          // set the input directory parameter if needed
          final String inputDir = options.getInputDirectory();
          if ( !inputDir.isEmpty() ) {
-            builder.addParameters( "InputDirectory", inputDir );
+            builder.set( "InputDirectory", inputDir );
          }
          // set the output directory parameter if needed
          final String outputDir = options.getOutputDirectory();
          final String xmiOutDir = options.getXmiOutDirectory();
          if ( !outputDir.isEmpty() ) {
-            builder.addParameters( "OutputDirectory", outputDir );
+            builder.set( "OutputDirectory", outputDir );
          } else if ( !xmiOutDir.isEmpty() ) {
-            builder.addParameters( "OutputDirectory", xmiOutDir );
+            builder.set( "OutputDirectory", xmiOutDir );
          }
          // set the umls user and password parameters if needed
          final String umlsUser = options.getUmlsUserName();
          if ( !umlsUser.isEmpty() ) {
-            builder.addParameters( "umlsUser", umlsUser );
-            builder.addParameters( "ctakes.umlsuser", umlsUser );
+            builder.set( "umlsUser", umlsUser );
+            builder.set( "ctakes.umlsuser", umlsUser );
          }
          final String umlsPass = options.getUmlsPassword();
          if ( !umlsPass.isEmpty() ) {
-            builder.addParameters( "umlsPass", umlsPass );
-            builder.addParameters( "ctakes.umlspw", umlsPass );
+            builder.set( "umlsPass", umlsPass );
+            builder.set( "ctakes.umlspw", umlsPass );
          }
          // load the piper file
          reader.loadPipelineFile( options.getPiperPath() );

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/regex/ThreadString.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/regex/ThreadString.java?rev=1775146&r1=1775145&r2=1775146&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/regex/ThreadString.java (original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/regex/ThreadString.java Mon Dec 19 17:44:22 2016
@@ -26,6 +26,9 @@ final class ThreadString implements Char
 
    @Override
    public CharSequence subSequence( final int start, final int end ) {
+      if ( Thread.currentThread().isInterrupted() ) {
+         throw new RuntimeException( new InterruptedException() );
+      }
       return new ThreadString( _delegate.subSequence( start, end ) );
    }