svn commit: r1790339 - in /ctakes/trunk: ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/ ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/ ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/piper/

[se...@apache.org]

Author: seanfinan
Date: Thu Apr  6 04:00:42 2017
New Revision: 1790339

URL: http://svn.apache.org/viewvc?rev=1790339&view=rev
Log:
ctakes-424 : improved validation

Modified:
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/pipeline/PiperFileReader.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/piper/PiperTextFilter.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=1790339&r1=1790338&r2=1790339&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 Thu Apr  6 04:00:42 2017
@@ -137,7 +137,7 @@ final public class PiperFileReader {
     *
     * @param filePath path to the pipeline command file
     */
-   public void loadPipelineFile( final String filePath ) throws UIMAException {
+   public boolean loadPipelineFile( final String filePath ) throws UIMAException {
       try ( final BufferedReader reader
                   = new BufferedReader( new InputStreamReader(
             FileLocator.getAsStream( getPiperPath( filePath ) ) ) ) ) {
@@ -148,7 +148,9 @@ final public class PiperFileReader {
          }
       } catch ( IOException ioE ) {
          LOGGER.error( "Piper File not found: " + filePath );
+         return false;
       }
+      return true;
    }
 
    public boolean parsePipelineLine( final String line ) throws UIMAException {
@@ -178,8 +180,7 @@ final public class PiperFileReader {
    private boolean addToPipeline( final String command, final String parameter ) throws UIMAException {
       switch ( command ) {
          case "load":
-            loadPipelineFile( parameter );
-            return true;
+            return loadPipelineFile( parameter );
          case "package":
             _userPackages.add( parameter );
             return true;

Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/MainPanel2.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/MainPanel2.java?rev=1790339&r1=1790338&r2=1790339&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/MainPanel2.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/MainPanel2.java Thu Apr  6 04:00:42 2017
@@ -127,6 +127,7 @@ final class MainPanel2 extends JPanel {
       _piperTextFilter = new PiperTextFilter( _piperDocument );
       _textPane = new JTextPane( _piperDocument );
       _textPane.putClientProperty( "caretWidth", 2 );
+      _textPane.setCaretColor( Color.MAGENTA );
       final JScrollPane scroll = new JScrollPane( _textPane );
       final TextLineNumber lineNumber = new TextLineNumber( _textPane, 2 );
       scroll.setRowHeaderView( lineNumber );
@@ -400,6 +401,7 @@ final class MainPanel2 extends JPanel {
          LOGGER.info( "Validating Piper File ..." );
          final boolean valid = _piperTextFilter.validateText();
          _runButton.setEnabled( valid );
+         LOGGER.info( "Validation Complete." );
       }
    }
 

Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/piper/PiperTextFilter.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/piper/PiperTextFilter.java?rev=1790339&r1=1790338&r2=1790339&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/piper/PiperTextFilter.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/piper/PiperTextFilter.java Thu Apr  6 04:00:42 2017
@@ -267,7 +267,7 @@ final public class PiperTextFilter exten
             LOGGER.error( blE.getMessage() );
             valid = false;
          }
-         _document.setCharacterAttributes( _document.getLength(), _document.getLength(), _styles.get( "PLAIN" ), true );
+         _document.setCharacterAttributes( _document.getLength(), 1, _styles.get( "PLAIN" ), true );
          _reader.getBuilder().clear();
          if ( !_haveReader ) {
             LOGGER.warn( "No Reader specified" );