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 2019/11/30 18:42:23 UTC
svn commit: r1870637 - in /ctakes/trunk/ctakes-gui: ./
src/main/java/org/apache/ctakes/gui/component/
src/main/java/org/apache/ctakes/gui/pipeline/
src/main/java/org/apache/ctakes/gui/pipeline/piper/
Author: seanfinan
Date: Sat Nov 30 18:42:23 2019
New Revision: 1870637
URL: http://svn.apache.org/viewvc?rev=1870637&view=rev
Log:
remove ctakes-coreference dependency, adding message regarding pipe bit search and classpath
Modified:
ctakes/trunk/ctakes-gui/pom.xml
ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/CellRendererLabel.java
ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/CellRendererPanel.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/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/pom.xml?rev=1870637&r1=1870636&r2=1870637&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/pom.xml (original)
+++ ctakes/trunk/ctakes-gui/pom.xml Sat Nov 30 18:42:23 2019
@@ -18,10 +18,10 @@
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-gui-res</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.ctakes</groupId>
- <artifactId>ctakes-coreference</artifactId>
- </dependency>
+ <!-- <dependency>-->
+ <!-- <groupId>org.apache.ctakes</groupId>-->
+ <!-- <artifactId>ctakes-coreference</artifactId>-->
+ <!-- </dependency>-->
<dependency>
<groupId>org.apache.ctakes</groupId>
<artifactId>ctakes-core</artifactId>
Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/CellRendererLabel.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/CellRendererLabel.java?rev=1870637&r1=1870636&r2=1870637&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/CellRendererLabel.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/CellRendererLabel.java Sat Nov 30 18:42:23 2019
@@ -54,8 +54,8 @@ public class CellRendererLabel extends J
@Override
protected void firePropertyChange( String propertyName, Object oldValue, Object newValue ) {
// Strings get interned...
- if ( propertyName == "text"
- || ((propertyName == "font" || propertyName == "foreground")
+ if ( propertyName.equals( "text" )
+ || ((propertyName.equals( "font" ) || propertyName.equals( "foreground" ))
&& oldValue != newValue
&& getClientProperty( javax.swing.plaf.basic.BasicHTML.propertyKey ) != null) ) {
Modified: ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/CellRendererPanel.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/CellRendererPanel.java?rev=1870637&r1=1870636&r2=1870637&view=diff
==============================================================================
--- ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/CellRendererPanel.java (original)
+++ ctakes/trunk/ctakes-gui/src/main/java/org/apache/ctakes/gui/component/CellRendererPanel.java Sat Nov 30 18:42:23 2019
@@ -92,8 +92,8 @@ final public class CellRendererPanel ext
@Override
protected void firePropertyChange( String propertyName, Object oldValue, Object newValue ) {
// Strings get interned...
- if ( propertyName == "text"
- || ((propertyName == "font" || propertyName == "foreground")
+ if ( propertyName.equals( "text" )
+ || ((propertyName.equals( "font" ) || propertyName.equals( "foreground" ))
&& oldValue != newValue
&& getClientProperty( javax.swing.plaf.basic.BasicHTML.propertyKey ) != null) ) {
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=1870637&r1=1870636&r2=1870637&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 Sat Nov 30 18:42:23 2019
@@ -73,7 +73,9 @@ final public class PiperCreator {
final Object[] options = { "Scan" };
final Icon scanIcon = IconLoader.loadIcon( "org/apache/ctakes/gui/pipeline/icon/" + "FindOnPc_48.png" );
JOptionPane.showOptionDialog( frame, "A Scan must be performed to find available Pipe Bits.\n" +
- "Pipe Bits are used to assemble a cTAKES Pipeline.",
+ "Pipe Bits are used to assemble a cTAKES Pipeline.\n" +
+ "*** If you are running in a developer environment and few Pipe Bits are found, " +
+ "please run PiperCreatorGui in ctakes-examples.",
"Find Pipe Bits", JOptionPane.YES_OPTION, JOptionPane.PLAIN_MESSAGE, scanIcon, options, options[ 0 ] );
mainPanel.findPipeBits();
} );
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=1870637&r1=1870636&r2=1870637&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 Sat Nov 30 18:42:23 2019
@@ -189,7 +189,7 @@ final public class PiperTextFilter exten
_document.setCharacterAttributes( begin, commandEnd, commandStyle, true );
if ( length > commandEnd ) {
int styleEnd = commandEnd + 1;
- if ( command.equals( "reader" ) || command.startsWith( "add" ) ) {
+ if ( command.equals( "reader" ) || command.startsWith( "add" ) || command.equals( "load" ) ) {
final int bitStart = commandEnd + 1;
int bitEnd = text.indexOf( ' ', bitStart );
if ( bitEnd < 0 ) {