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 2022/01/10 15:44:45 UTC
svn commit: r1896888 - in /ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui: component/LoggerPanel.java pipeline/PiperRunnerGui.java pipeline/PiperRunnerPanel.java
Author: seanfinan
Date: Mon Jan 10 15:44:45 2022
New Revision: 1896888
URL: http://svn.apache.org/viewvc?rev=1896888&view=rev
Log:
LoggerPanel - Set text color to dark gray for easier reading
PiperRunnerGui - set Table cell borders to gray to attempt visibility on Mac
PiperRunnerPanel - Add left padding to cli table label cells
Modified:
ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/LoggerPanel.java
ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerGui.java
ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerPanel.java
Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/LoggerPanel.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/LoggerPanel.java?rev=1896888&r1=1896887&r2=1896888&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/LoggerPanel.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/LoggerPanel.java Mon Jan 10 15:44:45 2022
@@ -10,6 +10,7 @@ import javax.swing.*;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.PlainDocument;
+import java.awt.*;
import java.util.Arrays;
import java.util.Collection;
@@ -42,6 +43,7 @@ final public class LoggerPanel extends J
final JTextArea textArea = new JTextArea( _textAreaDoc );
textArea.setEditable( false );
textArea.setEnabled( false );
+ textArea.setDisabledTextColor( Color.DARK_GRAY );
super.setViewportView( textArea );
_appender = new LogHandler( levels );
}
Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerGui.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerGui.java?rev=1896888&r1=1896887&r2=1896888&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerGui.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerGui.java Mon Jan 10 15:44:45 2022
@@ -44,7 +44,11 @@ final public class PiperRunnerGui {
public static void main( final String... args ) {
try {
UIManager.setLookAndFeel( UIManager.getSystemLookAndFeelClassName() );
- UIManager.getDefaults().put( "SplitPane.border", BorderFactory.createEmptyBorder() );
+ UIManager.getDefaults()
+ .put( "SplitPane.border", BorderFactory.createEmptyBorder() );
+ // Needed for MacOS, which sets gridlines to white by default
+ UIManager.getDefaults()
+ .put( "Table.gridColor", Color.GRAY );
} catch ( ClassNotFoundException | InstantiationException
| IllegalAccessException | UnsupportedLookAndFeelException multE ) {
LOGGER.error( multE.getLocalizedMessage() );
Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerPanel.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerPanel.java?rev=1896888&r1=1896887&r2=1896888&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerPanel.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/pipeline/PiperRunnerPanel.java Mon Jan 10 15:44:45 2022
@@ -238,19 +238,19 @@ final public class PiperRunnerPanel exte
public Object getValueAt( final int row, final int column ) {
if ( column == 0 ) {
if ( row < STANDARD_CHARS.length ) {
- return _charToName.get( STANDARD_CHARS[ row ] );
+ return " " + _charToName.get( STANDARD_CHARS[ row ] );
}
final String c = _cliChars.get( row - STANDARD_CHARS.length );
- return _cliCharToName.getOrDefault( c, "Unknown Name" );
+ return " " + _cliCharToName.getOrDefault( c, "Unknown Name" );
} else if ( column == 1 ) {
if ( row < STANDARD_CHARS.length ) {
- return "-" + STANDARD_CHARS[ row ];
+ return " -" + STANDARD_CHARS[ row ];
}
final String cliChar = _cliChars.get( row - STANDARD_CHARS.length );
if ( cliChar.length() == 1 ) {
- return "-" + cliChar;
+ return " -" + cliChar;
}
- return "--" + cliChar;
+ return " --" + cliChar;
} else if ( column == 2 ) {
if ( row < STANDARD_CHARS.length ) {
return _charToValue.getOrDefault( STANDARD_CHARS[ row ], "" );
@@ -264,7 +264,8 @@ final public class PiperRunnerPanel exte
}
@Override
public boolean isCellEditable( final int row, final int column ) {
- return column != 0;
+// return column != 0;
+ return column > 1;
}
@Override
public void setValueAt( final Object aValue, final int row, final int column ) {