ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seanfi...@apache.org
Subject svn commit: r1815276 - in /ctakes/trunk: ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/ ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/html/ ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/plaintext/ ctakes-core...
Date Tue, 14 Nov 2017 23:59:32 GMT
Author: seanfinan
Date: Tue Nov 14 23:59:31 2017
New Revision: 1815276

URL: http://svn.apache.org/viewvc?rev=1815276&view=rev
Log:
TextSpan refactor (package move).  Prep for LabValueFinder

Added:
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/
      - copied from r1815224, ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/textspan/
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultAspanComparator.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultSpanComparator.java
    ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/util/textspan/
      - copied from r1815224, ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/textspan/
    ctakes/trunk/ctakes-regression-test/src/test/java/org/apache/ctakes/core/
    ctakes/trunk/ctakes-regression-test/src/test/java/org/apache/ctakes/core/ae/
Removed:
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/textspan/
    ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/textspan/
Modified:
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/AbstractItemCell.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/DefaultBaseItemCell.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/DefaultUmlsItemCell.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/EventCell.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/ItemCell.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/TimexCell.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/html/HtmlTextWriter.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/plaintext/PrettyTextWriter.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/row/DefaultItemRow.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultTextSpan.java
    ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/TextSpan.java
    ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/cell/DefaultBaseItemCellTester.java
    ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/cell/DefaultUmlsItemCellTester.java
    ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/util/textspan/DefaultTextSpanTester.java
    ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DefaultJCasTermAnnotator.java

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/AbstractItemCell.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/AbstractItemCell.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/AbstractItemCell.java
(original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/AbstractItemCell.java
Tue Nov 14 23:59:31 2017
@@ -1,6 +1,6 @@
 package org.apache.ctakes.core.cc.pretty.cell;
 
-import org.apache.ctakes.core.cc.pretty.textspan.TextSpan;
+import org.apache.ctakes.core.util.textspan.TextSpan;
 
 /**
  * Contains the text span

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/DefaultBaseItemCell.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/DefaultBaseItemCell.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/DefaultBaseItemCell.java
(original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/DefaultBaseItemCell.java
Tue Nov 14 23:59:31 2017
@@ -1,6 +1,6 @@
 package org.apache.ctakes.core.cc.pretty.cell;
 
-import org.apache.ctakes.core.cc.pretty.textspan.TextSpan;
+import org.apache.ctakes.core.util.textspan.TextSpan;
 
 /**
  * @author SPF , chip-nlp

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/DefaultUmlsItemCell.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/DefaultUmlsItemCell.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/DefaultUmlsItemCell.java
(original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/DefaultUmlsItemCell.java
Tue Nov 14 23:59:31 2017
@@ -1,7 +1,7 @@
 package org.apache.ctakes.core.cc.pretty.cell;
 
 import org.apache.ctakes.core.cc.pretty.SemanticGroup;
-import org.apache.ctakes.core.cc.pretty.textspan.TextSpan;
+import org.apache.ctakes.core.util.textspan.TextSpan;
 
 import java.util.*;
 

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/EventCell.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/EventCell.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/EventCell.java
(original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/EventCell.java
Tue Nov 14 23:59:31 2017
@@ -1,6 +1,6 @@
 package org.apache.ctakes.core.cc.pretty.cell;
 
-import org.apache.ctakes.core.cc.pretty.textspan.TextSpan;
+import org.apache.ctakes.core.util.textspan.TextSpan;
 
 import static org.apache.ctakes.core.cc.pretty.cell.DefaultUmlsItemCell.ENTITY_FILL;
 

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/ItemCell.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/ItemCell.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/ItemCell.java
(original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/ItemCell.java
Tue Nov 14 23:59:31 2017
@@ -1,6 +1,6 @@
 package org.apache.ctakes.core.cc.pretty.cell;
 
-import org.apache.ctakes.core.cc.pretty.textspan.TextSpan;
+import org.apache.ctakes.core.util.textspan.TextSpan;
 
 
 /**

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/TimexCell.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/TimexCell.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/TimexCell.java
(original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/cell/TimexCell.java
Tue Nov 14 23:59:31 2017
@@ -1,6 +1,6 @@
 package org.apache.ctakes.core.cc.pretty.cell;
 
-import org.apache.ctakes.core.cc.pretty.textspan.TextSpan;
+import org.apache.ctakes.core.util.textspan.TextSpan;
 
 import static org.apache.ctakes.core.cc.pretty.cell.DefaultUmlsItemCell.ENTITY_FILL;
 

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/html/HtmlTextWriter.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/html/HtmlTextWriter.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/html/HtmlTextWriter.java
(original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/html/HtmlTextWriter.java
Tue Nov 14 23:59:31 2017
@@ -3,11 +3,11 @@ package org.apache.ctakes.core.cc.pretty
 
 import org.apache.ctakes.core.cc.AbstractOutputFileWriter;
 import org.apache.ctakes.core.cc.pretty.SemanticGroup;
-import org.apache.ctakes.core.cc.pretty.textspan.DefaultTextSpan;
-import org.apache.ctakes.core.cc.pretty.textspan.TextSpan;
 import org.apache.ctakes.core.pipeline.PipeBitInfo;
 import org.apache.ctakes.core.util.DocumentIDAnnotationUtil;
 import org.apache.ctakes.core.util.OntologyConceptUtil;
+import org.apache.ctakes.core.util.textspan.DefaultTextSpan;
+import org.apache.ctakes.core.util.textspan.TextSpan;
 import org.apache.ctakes.typesystem.type.refsem.Event;
 import org.apache.ctakes.typesystem.type.refsem.EventProperties;
 import org.apache.ctakes.typesystem.type.refsem.UmlsConcept;

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/plaintext/PrettyTextWriter.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/plaintext/PrettyTextWriter.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/plaintext/PrettyTextWriter.java
(original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/plaintext/PrettyTextWriter.java
Tue Nov 14 23:59:31 2017
@@ -4,10 +4,10 @@ import org.apache.ctakes.core.cc.pretty.
 import org.apache.ctakes.core.cc.pretty.cell.*;
 import org.apache.ctakes.core.cc.pretty.row.DefaultItemRow;
 import org.apache.ctakes.core.cc.pretty.row.ItemRow;
-import org.apache.ctakes.core.cc.pretty.textspan.DefaultTextSpan;
-import org.apache.ctakes.core.cc.pretty.textspan.TextSpan;
 import org.apache.ctakes.core.util.DocumentIDAnnotationUtil;
 import org.apache.ctakes.core.util.OntologyConceptUtil;
+import org.apache.ctakes.core.util.textspan.DefaultTextSpan;
+import org.apache.ctakes.core.util.textspan.TextSpan;
 import org.apache.ctakes.typesystem.type.refsem.UmlsConcept;
 import org.apache.ctakes.typesystem.type.relation.TemporalTextRelation;
 import org.apache.ctakes.typesystem.type.syntax.BaseToken;

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/row/DefaultItemRow.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/row/DefaultItemRow.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/row/DefaultItemRow.java
(original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/pretty/row/DefaultItemRow.java
Tue Nov 14 23:59:31 2017
@@ -2,7 +2,7 @@ package org.apache.ctakes.core.cc.pretty
 
 import org.apache.ctakes.core.cc.pretty.cell.ItemCell;
 import org.apache.ctakes.core.cc.pretty.cell.UmlsItemCell;
-import org.apache.ctakes.core.cc.pretty.textspan.TextSpan;
+import org.apache.ctakes.core.util.textspan.TextSpan;
 
 import java.util.Arrays;
 import java.util.Collection;

Added: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultAspanComparator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultAspanComparator.java?rev=1815276&view=auto
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultAspanComparator.java
(added)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultAspanComparator.java
Tue Nov 14 23:59:31 2017
@@ -0,0 +1,31 @@
+package org.apache.ctakes.core.util.textspan;
+
+import org.apache.uima.jcas.tcas.Annotation;
+
+import java.util.Comparator;
+
+/**
+ * Compares first by begin, then by end if the begins are equal.
+ *
+ * @author SPF , chip-nlp
+ * @version %I%
+ * @since 11/14/2017
+ */
+public enum DefaultAspanComparator implements Comparator<Annotation> {
+   INSTANCE;
+
+   public static DefaultAspanComparator getInstance() {
+      return INSTANCE;
+   }
+
+   /**
+    * Compares first by begin, then by end if the begins are equal.
+    * {@inheritDoc}
+    */
+   @Override
+   public int compare( final Annotation annotation1, final Annotation annotation2 ) {
+      return DefaultSpanComparator.compareIndices( annotation1.getBegin(), annotation2.getBegin(),
+            annotation1.getEnd(), annotation2.getEnd() );
+   }
+
+}

Added: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultSpanComparator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultSpanComparator.java?rev=1815276&view=auto
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultSpanComparator.java
(added)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultSpanComparator.java
Tue Nov 14 23:59:31 2017
@@ -0,0 +1,39 @@
+package org.apache.ctakes.core.util.textspan;
+
+import java.util.Comparator;
+
+/**
+ * Compares first by begin, then by end if the begins are equal.
+ *
+ * @author SPF , chip-nlp
+ * @version %I%
+ * @since 11/14/2017
+ */
+public enum DefaultSpanComparator implements Comparator<TextSpan> {
+   INSTANCE;
+
+   public static DefaultSpanComparator getInstance() {
+      return INSTANCE;
+   }
+
+   /**
+    * Compares first by begin, then by end if the begins are equal.
+    * {@inheritDoc}
+    */
+   @Override
+   public int compare( final TextSpan span1, final TextSpan span2 ) {
+      return compareIndices( span1.getBegin(), span2.getBegin(), span1.getEnd(), span2.getEnd()
);
+   }
+
+   /**
+    * Compares first by begin, then by end if the begins are equal.
+    */
+   static public int compareIndices( final int begin1, final int begin2, final int end1,
final int end2 ) {
+      final int byBegin = begin1 - begin2;
+      if ( byBegin != 0 ) {
+         return byBegin;
+      }
+      return end1 - end2;
+   }
+
+}

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultTextSpan.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultTextSpan.java?rev=1815276&r1=1815224&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultTextSpan.java
(original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/DefaultTextSpan.java
Tue Nov 14 23:59:31 2017
@@ -1,4 +1,4 @@
-package org.apache.ctakes.core.cc.pretty.textspan;
+package org.apache.ctakes.core.util.textspan;
 
 import org.apache.uima.cas.text.AnnotationFS;
 

Modified: ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/TextSpan.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/TextSpan.java?rev=1815276&r1=1815224&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/TextSpan.java
(original)
+++ ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/textspan/TextSpan.java
Tue Nov 14 23:59:31 2017
@@ -1,4 +1,4 @@
-package org.apache.ctakes.core.cc.pretty.textspan;
+package org.apache.ctakes.core.util.textspan;
 
 /**
  * @author SPF , chip-nlp

Modified: ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/cell/DefaultBaseItemCellTester.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/cell/DefaultBaseItemCellTester.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/cell/DefaultBaseItemCellTester.java
(original)
+++ ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/cell/DefaultBaseItemCellTester.java
Tue Nov 14 23:59:31 2017
@@ -1,8 +1,8 @@
 package org.apache.ctakes.core.cc.pretty.cell;
 
 
-import org.apache.ctakes.core.cc.pretty.textspan.DefaultTextSpan;
-import org.apache.ctakes.core.cc.pretty.textspan.TextSpan;
+import org.apache.ctakes.core.util.textspan.DefaultTextSpan;
+import org.apache.ctakes.core.util.textspan.TextSpan;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

Modified: ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/cell/DefaultUmlsItemCellTester.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/cell/DefaultUmlsItemCellTester.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/cell/DefaultUmlsItemCellTester.java
(original)
+++ ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/cc/pretty/cell/DefaultUmlsItemCellTester.java
Tue Nov 14 23:59:31 2017
@@ -2,8 +2,8 @@ package org.apache.ctakes.core.cc.pretty
 
 
 import org.apache.ctakes.core.cc.pretty.SemanticGroup;
-import org.apache.ctakes.core.cc.pretty.textspan.DefaultTextSpan;
-import org.apache.ctakes.core.cc.pretty.textspan.TextSpan;
+import org.apache.ctakes.core.util.textspan.DefaultTextSpan;
+import org.apache.ctakes.core.util.textspan.TextSpan;
 import org.junit.Test;
 
 import java.util.*;

Modified: ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/util/textspan/DefaultTextSpanTester.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/util/textspan/DefaultTextSpanTester.java?rev=1815276&r1=1815224&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/util/textspan/DefaultTextSpanTester.java
(original)
+++ ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/util/textspan/DefaultTextSpanTester.java
Tue Nov 14 23:59:31 2017
@@ -1,4 +1,4 @@
-package org.apache.ctakes.core.cc.pretty.textspan;
+package org.apache.ctakes.core.util.textspan;
 
 import org.junit.Test;
 

Modified: ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DefaultJCasTermAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DefaultJCasTermAnnotator.java?rev=1815276&r1=1815275&r2=1815276&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DefaultJCasTermAnnotator.java
(original)
+++ ctakes/trunk/ctakes-dictionary-lookup-fast/src/main/java/org/apache/ctakes/dictionary/lookup2/ae/DefaultJCasTermAnnotator.java
Tue Nov 14 23:59:31 2017
@@ -18,6 +18,7 @@
  */
 package org.apache.ctakes.dictionary.lookup2.ae;
 
+import org.apache.ctakes.core.config.ConfigParameterConstants;
 import org.apache.ctakes.core.pipeline.PipeBitInfo;
 import org.apache.ctakes.core.util.collection.CollectionMap;
 import org.apache.ctakes.dictionary.lookup2.dictionary.RareWordDictionary;
@@ -120,7 +121,7 @@ final public class DefaultJCasTermAnnota
    static public AnalysisEngineDescription createAnnotatorDescription( final String descriptorPath
)
          throws ResourceInitializationException {
       return AnalysisEngineFactory.createEngineDescription( DefaultJCasTermAnnotator.class,
-            DICTIONARY_DESCRIPTOR_KEY, descriptorPath );
+            ConfigParameterConstants.PARAM_LOOKUP_XML, descriptorPath );
    }
 
 }



Mime
View raw message