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/06 15:02:22 UTC
svn commit: r1790416 - in
/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline:
MainPanel2.java PiperCreator.java piper/PiperTextFilter.java
Author: seanfinan
Date: Thu Apr 6 15:02:22 2017
New Revision: 1790416
URL: http://svn.apache.org/viewvc?rev=1790416&view=rev
Log:
ctakes-424 : improved run logging
ctakes-424 : shutdown validator thread
Modified:
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/PiperCreator.java
ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/piper/PiperTextFilter.java
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=1790416&r1=1790415&r2=1790416&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 15:02:22 2017
@@ -30,7 +30,8 @@ import java.nio.file.Paths;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -206,6 +207,7 @@ final class MainPanel2 extends JPanel {
void findPipeBits() {
final ExecutorService executor = Executors.newSingleThreadExecutor();
executor.execute( new PiperBitParser() );
+ executor.shutdown();
}
@@ -414,27 +416,17 @@ final class MainPanel2 extends JPanel {
}
LOGGER.info( "Running Piper File ..." );
final ExecutorService executor = Executors.newSingleThreadExecutor();
- final Future<Boolean> success = executor.submit( new PiperFileRunner() );
- try {
- if ( success.get() ) {
- LOGGER.info( "Run complete." );
- } else {
- LOGGER.warn( "Run may have encountered problems." );
- }
- } catch ( InterruptedException | ExecutionException multE ) {
- LOGGER.warn( multE );
- LOGGER.warn( "Run may have encountered problems." );
- }
+ executor.execute( new PiperFileRunner() );
+ executor.shutdown();
}
}
- private class PiperFileRunner implements Callable<Boolean> {
+ private class PiperFileRunner implements Runnable {
@Override
- public Boolean call() {
+ public void run() {
final JFrame frame = (JFrame)SwingUtilities.getRoot( MainPanel2.this );
frame.setCursor( Cursor.getPredefinedCursor( Cursor.WAIT_CURSOR ) );
DisablerPane.getInstance().setVisible( true );
- boolean success = false;
try {
final PiperFileReader reader = new PiperFileReader();
final String text = _piperDocument.getText( 0, _piperDocument.getLength() );
@@ -443,13 +435,11 @@ final class MainPanel2 extends JPanel {
reader.parsePipelineLine( line );
}
reader.getBuilder().run();
- success = true;
} catch ( Throwable t ) {
LOGGER.error( "Pipeline Run caused Exception:", t );
}
DisablerPane.getInstance().setVisible( false );
frame.setCursor( Cursor.getDefaultCursor() );
- return success;
}
}
Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperCreator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperCreator.java?rev=1790416&r1=1790415&r2=1790416&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperCreator.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperCreator.java Thu Apr 6 15:02:22 2017
@@ -32,12 +32,7 @@ final public class PiperCreator {
final Dimension size = new Dimension( 800, 600 );
frame.setSize( size );
frame.setMinimumSize( size );
- final JMenuBar menuBar = new JMenuBar();
-// final JMenu fileMenu = new JMenu( "File" );
-// menuBar.add( fileMenu );
-
- frame.setJMenuBar( menuBar );
- System.setProperty( "apple.laf.useScreenMenuBar", "true" );
+// System.setProperty( "apple.laf.useScreenMenuBar", "true" );
return frame;
}
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=1790416&r1=1790415&r2=1790416&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 15:02:22 2017
@@ -95,11 +95,14 @@ final public class PiperTextFilter exten
public boolean validateText() {
final ExecutorService executor = Executors.newSingleThreadExecutor();
- Future<Boolean> valid = executor.submit( (Callable<Boolean>)_textValidator );
+ Future<Boolean> validator = executor.submit( (Callable<Boolean>)_textValidator );
try {
- return valid.get( 1000, TimeUnit.MILLISECONDS );
+ boolean valid = validator.get( 1000, TimeUnit.MILLISECONDS );
+ executor.shutdown();
+ return valid;
} catch ( InterruptedException | ExecutionException | TimeoutException multE ) {
LOGGER.warn( "Piper validation timed out." );
+ executor.shutdown();
return false;
}
}