You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by st...@apache.org on 2012/10/23 23:40:21 UTC
svn commit: r1401497 - in
/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core:
ae/ cc/ ci/ cr/ fsm/condition/ fsm/machine/ nlp/tokenizer/ resource/
sentence/ util/
Author: stevenbethard
Date: Tue Oct 23 21:40:19 2012
New Revision: 1401497
URL: http://svn.apache.org/viewvc?rev=1401497&view=rev
Log:
Fixes various warnings in ctakes-core. Barely a dent in the number of warnings cTAKES produces. =(
Modified:
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SectionSegmentAnnotator.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SimpleSegmentWithTagsAnnotator.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenConverter.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenizerAnnotatorPTB.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/HtmlTableCasConsumer.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NormalizedFilesInDirectoryCasConsumer.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenFreqCasConsumer.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenOffsetsCasConsumer.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/HyphenTextModifierImpl.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/TextModification.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/TextModifier.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionReader.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/DecimalRangeCondition.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/DecimalValueCondition.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/IntegerRangeCondition.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/IntegerValueCondition.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/PunctuationValueCondition.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/SymbolValueCondition.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/TextSetCondition.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/TextValueCondition.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/WordSetCondition.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/WordValueCondition.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/DateFSM.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/FractionFSM.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/MeasurementFSM.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/NegationFSM.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/PersonTitleFSM.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/RangeFSM.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/RomanNumeralFSM.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/StatusIndicatorFSM.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/TimeFSM.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/ContractionsPTB.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/HyphenatedPTB.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/Token.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/Tokenizer.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/TokenizerPTB.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/JdbcConnectionResource.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/JdbcConnectionResourceImpl.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/LinesFromFileStringsResourceImpl.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/MaxentModelResource.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringIntegerMapResource.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringIntegerMapResourceImpl.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringMapResourceImpl.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/sentence/SentenceSpan.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/DateParser.java
incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/FSUtil.java
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SectionSegmentAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SectionSegmentAnnotator.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SectionSegmentAnnotator.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SectionSegmentAnnotator.java Tue Oct 23 21:40:19 2012
@@ -18,10 +18,8 @@
*/
package org.apache.ctakes.core.ae;
-import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
@@ -31,10 +29,6 @@ import org.apache.uima.analysis_componen
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Text;
-import org.jdom.input.SAXBuilder;
import org.apache.ctakes.core.resource.FileResource;
@@ -43,7 +37,6 @@ import org.apache.ctakes.core.util.Docum
import org.apache.ctakes.typesystem.type.textspan.Segment;
import findstruct.Section;
import findstruct.StructFinder;
-import findstruct.StructModel;
/**
* Creates a single segment annotation that spans the entire document. This is
@@ -80,8 +73,6 @@ public class SectionSegmentAnnotator ext
/**
* Entry point for processing.
* Identify all the sections of the medical record
- * @param jCas
- * @author andreea bodnari
*/
public void process(JCas jCas) throws AnalysisEngineProcessException {
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SimpleSegmentWithTagsAnnotator.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SimpleSegmentWithTagsAnnotator.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SimpleSegmentWithTagsAnnotator.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/SimpleSegmentWithTagsAnnotator.java Tue Oct 23 21:40:19 2012
@@ -88,8 +88,6 @@ public class SimpleSegmentWithTagsAnnota
try {
while ((charNum = fileReader.read()) != -1) {
- String segId = "";
-
if (charNum == '[') {
charPos++;
if (((charNum = fileReader.read()) == 's')
@@ -114,7 +112,7 @@ public class SimpleSegmentWithTagsAnnota
Segment sa = new Segment(jcas);
sa.setBegin(endStartSegment);
sa.setEnd(beginEndSegment);
- sa.setId(segId.copyValueOf(sectIdArr));
+ sa.setId(String.copyValueOf(sectIdArr));
for (int i = 0; i < sectIdArr.length; i++)
sectIdArr[i] = ' ';
sa.addToIndexes();
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenConverter.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenConverter.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenConverter.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenConverter.java Tue Oct 23 21:40:19 2012
@@ -39,11 +39,6 @@ public class TokenConverter
{
/**
* Converts from Java Tokenizer object into a JCas object.
- *
- * @param tokenArr
- * @param jcas
- * @param beginPos
- * @return
*/
public static BaseToken convert(Token t, JCas jcas, int beginPos)
{
@@ -142,9 +137,6 @@ public class TokenConverter
/**
* Convert from a JCas object into Java Tokenizer object.
- *
- * @param bta
- * @return
*/
public static Token convert(BaseToken bta)
{
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenizerAnnotatorPTB.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenizerAnnotatorPTB.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenizerAnnotatorPTB.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ae/TokenizerAnnotatorPTB.java Tue Oct 23 21:40:19 2012
@@ -18,8 +18,6 @@
*/
package org.apache.ctakes.core.ae;
-import java.util.Date;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -27,13 +25,7 @@ import org.apache.log4j.Logger;
import org.apache.uima.UimaContext;
import org.apache.uima.analysis_component.JCasAnnotator_ImplBase;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
-import org.apache.uima.analysis_engine.ResultSpecification;
-import org.apache.uima.analysis_engine.annotator.AnnotatorConfigurationException;
-import org.apache.uima.analysis_engine.annotator.AnnotatorContext;
-import org.apache.uima.analysis_engine.annotator.AnnotatorContextException;
-import org.apache.uima.analysis_engine.annotator.AnnotatorInitializationException;
import org.apache.uima.analysis_engine.annotator.AnnotatorProcessException;
-import org.apache.uima.analysis_engine.annotator.JTextAnnotator_ImplBase;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JFSIndexRepository;
@@ -163,7 +155,7 @@ public class TokenizerAnnotatorPTB exten
}
// Now process each sentence
- FSIterator sentencesIter = indexes.getAnnotationIndex(Sentence.type).iterator();
+ FSIterator<?> sentencesIter = indexes.getAnnotationIndex(Sentence.type).iterator();
// Tokenize each sentence, adding the tokens to the cas index
while (sentencesIter.hasNext()) {
Sentence sentence = (Sentence) sentencesIter.next();
@@ -186,7 +178,7 @@ public class TokenizerAnnotatorPTB exten
}
// Now add the tokenNumber in the order of offsets
- FSIterator baseTokenIter = indexes.getAnnotationIndex(BaseToken.type).iterator();
+ FSIterator<?> baseTokenIter = indexes.getAnnotationIndex(BaseToken.type).iterator();
while (baseTokenIter.hasNext()) {
BaseToken bta = (BaseToken) baseTokenIter.next();
if (bta.getBegin()>=rangeBegin && bta.getBegin()<rangeEnd) {
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/HtmlTableCasConsumer.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/HtmlTableCasConsumer.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/HtmlTableCasConsumer.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/HtmlTableCasConsumer.java Tue Oct 23 21:40:19 2012
@@ -59,7 +59,7 @@ public class HtmlTableCasConsumer extend
// key = annotation type (java.lang.Integer)
// val = getter method (java.lang.reflect.Method)
- private Map iv_getterMethMap = new HashMap();
+ private Map<Integer, Method> iv_getterMethMap = new HashMap<Integer, Method>();
private int iv_count;
@@ -88,7 +88,7 @@ public class HtmlTableCasConsumer extend
if (st.countTokens() == 1)
{
String methName = st.nextToken().trim();
- Class c = Class.forName(classname);
+ Class<?> c = Class.forName(classname);
Method meth = c.getMethod(methName, (Class[]) null);
iv_getterMethMap.put(new Integer(iv_nestedAnnTypeArr[i]),
meth);
@@ -111,11 +111,11 @@ public class HtmlTableCasConsumer extend
htmlSB.append("<TITLE>?</TITLE>");
htmlSB.append("<BODY>");
- Iterator tSpanItr = jcas.getJFSIndexRepository()
+ Iterator<Annotation> tSpanItr = jcas.getJFSIndexRepository()
.getAnnotationIndex(iv_tableSpanType).iterator();
while (tSpanItr.hasNext())
{
- Annotation tSpanAnn = (Annotation) tSpanItr.next();
+ Annotation tSpanAnn = tSpanItr.next();
String tSpanText = tSpanAnn.getCoveredText();
htmlSB.append("<TABLE border=1>");
@@ -131,7 +131,7 @@ public class HtmlTableCasConsumer extend
int tdStyleIdx = 0;
for (int nestIdx = 0; nestIdx < iv_nestedAnnTypeArr.length; nestIdx++)
{
- List nestedAnnList = getAnnotations(jcas,
+ List<Annotation> nestedAnnList = getAnnotations(jcas,
iv_nestedAnnTypeArr[nestIdx], tSpanAnn.getBegin(),
tSpanAnn.getEnd());
@@ -139,21 +139,21 @@ public class HtmlTableCasConsumer extend
Collections.sort(nestedAnnList,
new AnnotationLengthComparator());
- List annotsAtRowList = arrangeIntoRows(tSpanAnn,
+ List<List<Annotation>> annotsAtRowList = arrangeIntoRows(tSpanAnn,
nestedAnnList);
- Iterator trAnnItr = annotsAtRowList.iterator();
+ Iterator<List<Annotation>> trAnnItr = annotsAtRowList.iterator();
while (trAnnItr.hasNext())
{
htmlSB.append("<TR>");
int cursor = tSpanAnn.getBegin();
- List annList = (List) trAnnItr.next();
+ List<Annotation> annList = trAnnItr.next();
// sort annotations in this row by offset position
Collections.sort(annList,
new AnnotationPositionComparator());
- Iterator annItr = annList.iterator();
+ Iterator<Annotation> annItr = annList.iterator();
while (annItr.hasNext())
{
Annotation ann = (Annotation) annItr.next();
@@ -259,13 +259,13 @@ public class HtmlTableCasConsumer extend
* @param nestedAnnList
* @return
*/
- private List arrangeIntoRows(Annotation tSpanAnn, List nestedAnnList)
+ private List<List<Annotation>> arrangeIntoRows(Annotation tSpanAnn, List<Annotation> nestedAnnList)
{
int tSpanSize = tSpanAnn.getCoveredText().length();
- List maskAtRowList = new ArrayList();
+ List<BitSet> maskAtRowList = new ArrayList<BitSet>();
maskAtRowList.add(new BitSet(tSpanSize));
- List annotsAtRowList = new ArrayList();
+ List<List<Annotation>> annotsAtRowList = new ArrayList<List<Annotation>>();
// divide parse annotations into rows
while (nestedAnnList.size() != 0)
@@ -302,15 +302,15 @@ public class HtmlTableCasConsumer extend
rowFound = true;
}
- List annList = null;
+ List<Annotation> annList = null;
if ((idx + 1) > annotsAtRowList.size())
{
- annList = new ArrayList();
+ annList = new ArrayList<Annotation>();
annList.add(ann);
annotsAtRowList.add(annList);
} else
{
- annList = (List) annotsAtRowList.get(idx);
+ annList = annotsAtRowList.get(idx);
annList.add(ann);
}
}
@@ -323,18 +323,15 @@ public class HtmlTableCasConsumer extend
* @author Mayo Clinic
*
*/
- class AnnotationLengthComparator implements Comparator
+ class AnnotationLengthComparator implements Comparator<Annotation>
{
/*
* (non-Javadoc)
*
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
- public int compare(Object o1, Object o2)
+ public int compare(Annotation a1, Annotation a2)
{
- Annotation a1 = (Annotation) o1;
- Annotation a2 = (Annotation) o2;
-
Integer len1 = new Integer(a1.getCoveredText().length());
Integer len2 = new Integer(a2.getCoveredText().length());
@@ -366,18 +363,15 @@ public class HtmlTableCasConsumer extend
* @author Mayo Clinic
*
*/
- class AnnotationPositionComparator implements Comparator
+ class AnnotationPositionComparator implements Comparator<Annotation>
{
/*
* (non-Javadoc)
*
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
- public int compare(Object o1, Object o2)
+ public int compare(Annotation a1, Annotation a2)
{
- Annotation a1 = (Annotation) o1;
- Annotation a2 = (Annotation) o2;
-
if (a1.getBegin() < a2.getBegin())
return -1;
else if (a1.getBegin() > a2.getBegin())
@@ -394,10 +388,10 @@ public class HtmlTableCasConsumer extend
}
}
- private List getAnnotations(JCas jcas, int annType, int begin, int end)
+ private List<Annotation> getAnnotations(JCas jcas, int annType, int begin, int end)
{
- List list = new ArrayList();
- Iterator itr = jcas.getJFSIndexRepository().getAnnotationIndex(annType)
+ List<Annotation> list = new ArrayList<Annotation>();
+ Iterator<Annotation> itr = jcas.getJFSIndexRepository().getAnnotationIndex(annType)
.iterator();
while (itr.hasNext())
{
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NormalizedFilesInDirectoryCasConsumer.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NormalizedFilesInDirectoryCasConsumer.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NormalizedFilesInDirectoryCasConsumer.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/NormalizedFilesInDirectoryCasConsumer.java Tue Oct 23 21:40:19 2012
@@ -72,7 +72,7 @@ public class NormalizedFilesInDirectoryC
StringBuffer normalizedText = new StringBuffer();
JFSIndexRepository indexes = jcas.getJFSIndexRepository();
- Iterator tokenItr = indexes.getAnnotationIndex(WordToken.type).iterator();
+ Iterator<?> tokenItr = indexes.getAnnotationIndex(WordToken.type).iterator();
while (tokenItr.hasNext())
{
WordToken token = (WordToken) tokenItr.next();
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenFreqCasConsumer.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenFreqCasConsumer.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenFreqCasConsumer.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenFreqCasConsumer.java Tue Oct 23 21:40:19 2012
@@ -43,8 +43,6 @@ import org.apache.ctakes.typesystem.type
* This class creates a file that contains the frequencies of the word tokens found in a set
* in a text collection. This cas consumer could potentially be used to create a frequency
* file for any kind of annotation but only counts Token annotations at the moment.
- *
- * @see org.apache.ctakes.typesystem.type.syntax.WordToken.java
*/
public class TokenFreqCasConsumer extends CasConsumer_ImplBase
@@ -57,7 +55,7 @@ public class TokenFreqCasConsumer extend
public static final String PARAM_WORD_FREQ_FILE = "TokenFreqFile";
File wordFreqFile;
- Map wordFreqs;
+ Map<String, int[]> wordFreqs;
/**
* This method opens/creates the file specified by "TokenFreqFile" and initializes the
@@ -79,7 +77,7 @@ public class TokenFreqCasConsumer extend
{
throw new ResourceInitializationException(ioe);
}
- wordFreqs = new HashMap();
+ wordFreqs = new HashMap<String, int[]>();
}
/**
@@ -95,7 +93,7 @@ public class TokenFreqCasConsumer extend
JCas jcas;
jcas = cas.getJCas();
JFSIndexRepository indexes = jcas.getJFSIndexRepository();
- Iterator tokenItr = indexes.getAnnotationIndex(WordToken.type).iterator();
+ Iterator<?> tokenItr = indexes.getAnnotationIndex(WordToken.type).iterator();
while (tokenItr.hasNext())
{
WordToken token = (WordToken) tokenItr.next();
@@ -122,12 +120,10 @@ public class TokenFreqCasConsumer extend
//sortedFreqs will contain objects of type Object[] of length 2. The first object in the array
//will hold the token and the second the frequency. We want to sort on the frequency first in
//descending order and token in ascending order for those tokens with the same frequency.
- TreeSet sortedFreqs = new TreeSet(
- new Comparator() {
- public int compare(Object obj1, Object obj2)
+ TreeSet<Object[]> sortedFreqs = new TreeSet<Object[]>(
+ new Comparator<Object[]>() {
+ public int compare(Object[] tokenFreq1, Object[] tokenFreq2)
{
- Object[] tokenFreq1 = (Object[]) obj1;
- Object[] tokenFreq2 = (Object[]) obj2;
Integer freq1 = (Integer)tokenFreq1[1];
Integer freq2 = (Integer)tokenFreq2[1];
if(!freq2.equals(freq1))
@@ -138,16 +134,16 @@ public class TokenFreqCasConsumer extend
}
});
- Iterator words = wordFreqs.keySet().iterator();
+ Iterator<String> words = wordFreqs.keySet().iterator();
while(words.hasNext())
{
- String word = (String) words.next();
+ String word = words.next();
int freq = ((int[])(wordFreqs.get(word)))[0];
sortedFreqs.add(new Object[] {word,new Integer(freq)});
}
PrintStream out = new PrintStream(new FileOutputStream(wordFreqFile));
- Iterator freqs = sortedFreqs.iterator();
+ Iterator<Object[]> freqs = sortedFreqs.iterator();
while(freqs.hasNext())
{
Object[] tokenFreq = (Object[]) freqs.next();
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenOffsetsCasConsumer.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenOffsetsCasConsumer.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenOffsetsCasConsumer.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cc/TokenOffsetsCasConsumer.java Tue Oct 23 21:40:19 2012
@@ -77,9 +77,9 @@ public class TokenOffsetsCasConsumer ext
JCas jcas;
jcas = cas.getJCas();
- List offsets = new ArrayList();
+ List<String> offsets = new ArrayList<String>();
JFSIndexRepository indexes = jcas.getJFSIndexRepository();
- Iterator tokenItr = indexes.getAnnotationIndex(BaseToken.type).iterator();
+ Iterator<?> tokenItr = indexes.getAnnotationIndex(BaseToken.type).iterator();
while (tokenItr.hasNext())
{
BaseToken token = (BaseToken) tokenItr.next();
@@ -97,7 +97,7 @@ public class TokenOffsetsCasConsumer ext
}
}
- private void writeToFile(String documentID, List offsets) throws IOException
+ private void writeToFile(String documentID, List<String> offsets) throws IOException
{
File outputFile = new File(iv_outputDirectory, documentID);
outputFile.createNewFile();
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/HyphenTextModifierImpl.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/HyphenTextModifierImpl.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/HyphenTextModifierImpl.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/HyphenTextModifierImpl.java Tue Oct 23 21:40:19 2012
@@ -45,7 +45,7 @@ import org.apache.ctakes.core.nlp.tokeni
*/
public class HyphenTextModifierImpl implements TextModifier {
- private Map iv_shouldbeHyphenMap = null;
+ private Map<String, Integer> iv_shouldbeHyphenMap = null;
private int iv_windowSize = 3; // default lookahead window
private Tokenizer iv_tokenizer = null;
@@ -67,7 +67,7 @@ public class HyphenTextModifierImpl impl
String line = "";
- iv_shouldbeHyphenMap = new HashMap();
+ iv_shouldbeHyphenMap = new HashMap<String, Integer>();
while ((line = br.readLine()) != null) {
String[] toks = line.split("\\|");
String[] unh = toks[0].split("\\-");
@@ -93,13 +93,13 @@ public class HyphenTextModifierImpl impl
*
* @param tokenList
*/
- private void filterTokens(List tokenList) {
+ private void filterTokens(List<Token> tokenList) {
- List removalList = new ArrayList();
- Iterator tokenItr = tokenList.iterator();
+ List<Token> removalList = new ArrayList<Token>();
+ Iterator<Token> tokenItr = tokenList.iterator();
while (tokenItr.hasNext()) {
- Token token = (Token) tokenItr.next();
+ Token token = tokenItr.next();
if (token.getType() == Token.TYPE_EOL) {
removalList.add(token);
}
@@ -117,10 +117,10 @@ public class HyphenTextModifierImpl impl
// intermediate data structure to use for easy adding of new
// TextModification objects
- ArrayList textmods = new ArrayList();
+ ArrayList<TextModification> textmods = new ArrayList<TextModification>();
// Tokenize the input to get offset information
- List inputtoks = iv_tokenizer.tokenizeAndSort(in);
+ List<Token> inputtoks = iv_tokenizer.tokenizeAndSort(in);
filterTokens(inputtoks);
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/TextModification.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/TextModification.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/TextModification.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/TextModification.java Tue Oct 23 21:40:19 2012
@@ -31,15 +31,6 @@ public class TextModification
private int iv_newEndOffset;
private String iv_newText;
- /**
- * Constructor
- *
- * @param origStartOffset
- * @param origEndOffset
- * @param newStartOffset
- * @param newEndOffset
- * @param newText
- */
public TextModification(int origStartOffset, int origEndOffset,
int newStartOffset, int newEndOffset, String newText)
{
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/TextModifier.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/TextModifier.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/TextModifier.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/ci/TextModifier.java Tue Oct 23 21:40:19 2012
@@ -30,7 +30,6 @@ public interface TextModifier
* Original document text.
* @return Array of TextModification objects that describe the
* modifications. Offset values are relative to the String object.
- * @throws Exception
*/
public TextModification[] modify(String text) throws Exception;
}
\ No newline at end of file
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionReader.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionReader.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionReader.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/FilesInDirectoryCollectionReader.java Tue Oct 23 21:40:19 2012
@@ -93,7 +93,7 @@ public class FilesInDirectoryCollectionR
public static final String PARAM_RECURSE = "Recurse";
- protected ArrayList iv_files;
+ protected ArrayList<File> iv_files;
private String iv_encoding;
private String iv_language;
private static String[] iv_extensions;
@@ -132,7 +132,7 @@ public class FilesInDirectoryCollectionR
//get list of files (not subdirectories) in the specified directory
- iv_files = new ArrayList();
+ iv_files = new ArrayList<File>();
if(!iv_recurse)
{
File[] files = directory.listFiles();
@@ -158,7 +158,7 @@ public class FilesInDirectoryCollectionR
}
}
- private void collectFiles(File directory, List files) throws IOException
+ private void collectFiles(File directory, List<File> files) throws IOException
{
File[] dirFiles = directory.listFiles();
for(int i=0; i<dirFiles.length;i++)
@@ -238,11 +238,6 @@ public class FilesInDirectoryCollectionR
{
text = new String(contents);
}
- if(text == null)
- {
- System.out.println("text ==null!");
- System.out.println("docID = "+docID);
- }
//put document in CAS (assume CAS)
jcas.setDocumentText(text);
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/JdbcCollectionReader.java Tue Oct 23 21:40:19 2012
@@ -114,7 +114,7 @@ public class JdbcCollectionReader extend
// optional, will remain null if not set
// Array of List objects. Each List objects represents a list of prepared
// stmt values.
- private List[] prepStmtValArr = null;
+ private List<String>[] prepStmtValArr = null;
private int prepStmtValArrIdx = 0;
private boolean usePrepStmtVals = false;
@@ -166,7 +166,7 @@ public class JdbcCollectionReader extend
*/
private void loadValueFile(File valueFile) throws IOException
{
- List lineList = new ArrayList();
+ List<String> lineList = new ArrayList<String>();
BufferedReader br = new BufferedReader(new FileReader(valueFile));
String line = br.readLine();
while (line != null)
@@ -180,7 +180,7 @@ public class JdbcCollectionReader extend
for (int i = 0; i < lineList.size(); i++)
{
String currLine = (String) lineList.get(i);
- List valList = new ArrayList();
+ List<String> valList = new ArrayList<String>();
StringTokenizer st = new StringTokenizer(currLine, "\t");
while (st.hasMoreTokens())
{
@@ -213,7 +213,7 @@ public class JdbcCollectionReader extend
int totalCnt = 0;
for (int i = 0; i < prepStmtValArr.length; i++)
{
- List valList = prepStmtValArr[i];
+ List<String> valList = prepStmtValArr[i];
setPrepStmtValues(cntStmt, valList);
ResultSet rs = cntStmt.executeQuery();
rs.next();
@@ -234,7 +234,7 @@ public class JdbcCollectionReader extend
* @param prepStmt
* @param valList
*/
- private void setPrepStmtValues(PreparedStatement prepStmt, List valList)
+ private void setPrepStmtValues(PreparedStatement prepStmt, List<String> valList)
throws SQLException
{
prepStmt.clearParameters();
@@ -369,7 +369,7 @@ public class JdbcCollectionReader extend
{
if (usePrepStmtVals)
{
- List valList = prepStmtValArr[prepStmtValArrIdx];
+ List<String> valList = prepStmtValArr[prepStmtValArrIdx];
setPrepStmtValues(queryPrepStmt, valList);
prepStmtValArrIdx++;
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/cr/LinesFromFileCollectionReader.java Tue Oct 23 21:40:19 2012
@@ -93,7 +93,7 @@ public class LinesFromFileCollectionRead
public static final String PARAM_ID_DELIMETER = "IdDelimeter";
- List iv_linesFromFile;
+ List<String> iv_linesFromFile;
int iv_currentIndex = 0;
String iv_language;
String iv_delimeter;
@@ -116,7 +116,7 @@ public class LinesFromFileCollectionRead
}
iv_delimeter = (String)getConfigParameterValue(PARAM_ID_DELIMETER);
- iv_linesFromFile = new ArrayList();
+ iv_linesFromFile = new ArrayList<String>();
fileReader = new BufferedReader(new FileReader(fileLocation));
String line;
while((line = fileReader.readLine()) != null)
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/DecimalRangeCondition.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/DecimalRangeCondition.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/DecimalRangeCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/DecimalRangeCondition.java Tue Oct 23 21:40:19 2012
@@ -31,11 +31,6 @@ public class DecimalRangeCondition exten
private double iv_lowNum;
private double iv_highNum;
- /**
- * Constructor
- *
- * @param t
- */
public DecimalRangeCondition(double lowNumber, double highNumber) {
iv_lowNum = lowNumber;
iv_highNum = highNumber;
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/DecimalValueCondition.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/DecimalValueCondition.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/DecimalValueCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/DecimalValueCondition.java Tue Oct 23 21:40:19 2012
@@ -30,11 +30,6 @@ import net.openai.util.fsm.Condition;
public class DecimalValueCondition extends Condition {
private double iv_num;
- /**
- * Constructor
- *
- * @param t
- */
public DecimalValueCondition(double value) {
iv_num = value;
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/IntegerRangeCondition.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/IntegerRangeCondition.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/IntegerRangeCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/IntegerRangeCondition.java Tue Oct 23 21:40:19 2012
@@ -31,11 +31,6 @@ public class IntegerRangeCondition exten
private int iv_lowNum;
private int iv_highNum;
- /**
- * Constructor
- *
- * @param t
- */
public IntegerRangeCondition(int lowNumber, int highNumber) {
iv_lowNum = lowNumber;
iv_highNum = highNumber;
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/IntegerValueCondition.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/IntegerValueCondition.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/IntegerValueCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/IntegerValueCondition.java Tue Oct 23 21:40:19 2012
@@ -30,11 +30,6 @@ import net.openai.util.fsm.Condition;
public class IntegerValueCondition extends Condition {
private int iv_num;
- /**
- * Constructor
- *
- * @param t
- */
public IntegerValueCondition(int value) {
iv_num = value;
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/PunctuationValueCondition.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/PunctuationValueCondition.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/PunctuationValueCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/PunctuationValueCondition.java Tue Oct 23 21:40:19 2012
@@ -30,11 +30,6 @@ import net.openai.util.fsm.Condition;
public class PunctuationValueCondition extends Condition {
private char iv_punctChar;
- /**
- * Constructor
- *
- * @param t
- */
public PunctuationValueCondition(char c) {
iv_punctChar = c;
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/SymbolValueCondition.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/SymbolValueCondition.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/SymbolValueCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/SymbolValueCondition.java Tue Oct 23 21:40:19 2012
@@ -30,11 +30,6 @@ import net.openai.util.fsm.Condition;
public class SymbolValueCondition extends Condition {
private char iv_symbolChar;
- /**
- * Constructor
- *
- * @param t
- */
public SymbolValueCondition(char c) {
iv_symbolChar = c;
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/TextSetCondition.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/TextSetCondition.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/TextSetCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/TextSetCondition.java Tue Oct 23 21:40:19 2012
@@ -33,11 +33,6 @@ public class TextSetCondition extends Co
private Set<String> iv_textSet;
private boolean iv_isCaseSensitive;
- /**
- * Constructor
- *
- * @param t
- */
public TextSetCondition(Set<String> textSet, boolean isCaseSensitive) {
iv_textSet = textSet;
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/TextValueCondition.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/TextValueCondition.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/TextValueCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/TextValueCondition.java Tue Oct 23 21:40:19 2012
@@ -31,11 +31,6 @@ public class TextValueCondition extends
private String iv_word;
private boolean iv_isCaseSensitive;
- /**
- * Constructor
- *
- * @param t
- */
public TextValueCondition(String value, boolean isCaseSensitive) {
iv_word = value;
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/WordSetCondition.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/WordSetCondition.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/WordSetCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/WordSetCondition.java Tue Oct 23 21:40:19 2012
@@ -33,11 +33,6 @@ public class WordSetCondition extends Co
private Set<String> iv_wordSet;
private boolean iv_isCaseSensitive;
- /**
- * Constructor
- *
- * @param t
- */
public WordSetCondition(Set<String> wordSet, boolean isCaseSensitive) {
iv_wordSet = wordSet;
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/WordValueCondition.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/WordValueCondition.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/WordValueCondition.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/condition/WordValueCondition.java Tue Oct 23 21:40:19 2012
@@ -31,11 +31,6 @@ public class WordValueCondition extends
private String iv_word;
private boolean iv_isCaseSensitive;
- /**
- * Constructor
- *
- * @param t
- */
public WordValueCondition(String value, boolean isCaseSensitive) {
iv_word = value;
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/DateFSM.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/DateFSM.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/DateFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/DateFSM.java Tue Oct 23 21:40:19 2012
@@ -249,9 +249,7 @@ public class DateFSM {
/**
* Executes the finite state machines.
*
- * @param tokens
* @return Set of DateToken objects.
- * @throws Exception
*/
public Set<DateToken> execute(List<? extends BaseToken> tokens) throws Exception {
Set<DateToken> dateSet = new HashSet<DateToken>();
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/FractionFSM.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/FractionFSM.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/FractionFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/FractionFSM.java Tue Oct 23 21:40:19 2012
@@ -146,9 +146,7 @@ public class FractionFSM {
/**
* Executes the finite state machines.
*
- * @param tokens
* @return Set of FractionToken objects.
- * @throws Exception
*/
public Set<FractionToken> execute(List<? extends BaseToken> tokens)
throws Exception {
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/MeasurementFSM.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/MeasurementFSM.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/MeasurementFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/MeasurementFSM.java Tue Oct 23 21:40:19 2012
@@ -229,9 +229,7 @@ public class MeasurementFSM {
/**
* Executes the finite state machines.
*
- * @param tokens
* @return Set of RangeToken objects.
- * @throws Exception
*/
public Set<MeasurementToken> execute(List<? extends BaseToken> tokens,
Set<? extends BaseToken> overrideSet) throws Exception {
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/NegationFSM.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/NegationFSM.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/NegationFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/NegationFSM.java Tue Oct 23 21:40:19 2012
@@ -363,9 +363,7 @@ public class NegationFSM {
/**
* Executes the finite state machines.
*
- * @param tokens
* @return Set of DateToken objects.
- * @throws Exception
*/
public Set<NegationIndicator> execute(List<?> tokens) throws Exception {
Set<NegationIndicator> outSet = new HashSet<NegationIndicator>();
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/PersonTitleFSM.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/PersonTitleFSM.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/PersonTitleFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/PersonTitleFSM.java Tue Oct 23 21:40:19 2012
@@ -97,9 +97,7 @@ public class PersonTitleFSM {
/**
* Executes the finite state machines.
*
- * @param tokens
* @return Set of FractionToken objects.
- * @throws Exception
*/
public Set<PersonTitleToken> execute(List<? extends BaseToken> tokens)
throws Exception {
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/RangeFSM.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/RangeFSM.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/RangeFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/RangeFSM.java Tue Oct 23 21:40:19 2012
@@ -129,9 +129,7 @@ public class RangeFSM {
/**
* Executes the finite state machines.
*
- * @param tokens
* @return Set of RangeToken objects.
- * @throws Exception
*/
public Set<RangeToken> execute(List<? extends BaseToken> tokens,
Set<? extends BaseToken> overrideSet) throws Exception {
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/RomanNumeralFSM.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/RomanNumeralFSM.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/RomanNumeralFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/RomanNumeralFSM.java Tue Oct 23 21:40:19 2012
@@ -82,9 +82,7 @@ public class RomanNumeralFSM {
/**
* Executes the finite state machines.
*
- * @param tokens
* @return Set of RomanNumeralToken objects.
- * @throws Exception
*/
public Set<RomanNumeralToken> execute(List<? extends BaseToken> tokens)
throws Exception {
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/StatusIndicatorFSM.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/StatusIndicatorFSM.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/StatusIndicatorFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/StatusIndicatorFSM.java Tue Oct 23 21:40:19 2012
@@ -201,9 +201,7 @@ public class StatusIndicatorFSM
/**
* Executes the finite state machines.
*
- * @param tokens
* @return Set of DateToken objects.
- * @throws Exception
*/
public Set<StatusIndicator> execute(List<TextToken> tokens) throws Exception
{
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/TimeFSM.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/TimeFSM.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/TimeFSM.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/fsm/machine/TimeFSM.java Tue Oct 23 21:40:19 2012
@@ -126,9 +126,7 @@ public class TimeFSM {
/**
* Executes the finite state machines.
*
- * @param tokens
* @return Set of TimeToken objects.
- * @throws Exception
*/
public Set<TimeToken> execute(List<? extends BaseToken> tokens)
throws Exception {
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/ContractionsPTB.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/ContractionsPTB.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/ContractionsPTB.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/ContractionsPTB.java Tue Oct 23 21:40:19 2012
@@ -175,7 +175,6 @@ public class ContractionsPTB {
* Note that if the text starting at 'position' is something like "n't" which
* isn't a complete word, returns null.
* @param position first char of next token
- * @param nextNonLetterDigitApostrophe
* @param lowerCasedText text into which parameter position is an index into
* @return the length of the WordToken part of the contraction. Note this is not always the position of the
* apostrophe. For example, for can't, which is tokenized as ca n't the
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/HyphenatedPTB.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/HyphenatedPTB.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/HyphenatedPTB.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/HyphenatedPTB.java Tue Oct 23 21:40:19 2012
@@ -19,7 +19,6 @@
package org.apache.ctakes.core.nlp.tokenizer;
import static org.apache.ctakes.core.nlp.tokenizer.TokenizerHelper.APOSTROPHE;
-import static org.apache.ctakes.core.nlp.tokenizer.TokenizerHelper.COMMA;
import static org.apache.ctakes.core.nlp.tokenizer.TokenizerHelper.findNextNonAlphaNum;
import static org.apache.ctakes.core.nlp.tokenizer.TokenizerHelper.startsWithWithoutBeingFollowedByLetter;
@@ -389,9 +388,8 @@ public class HyphenatedPTB {
*
* @param lowerCasedString because of "-o-torium", input might contain more than 1 hyphen....
* @return len to keep together, as far as we know. see hyphen hyphen hyphen case below.
- * throws exception if there's no hyphen
- *
- * @return number of characters to keep.
+ * throws exception if there's no hyphen;
+ * number of characters to keep.
* Does not mean to split at n+1 hyphen... need to recheck that one
*
*/
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/Token.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/Token.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/Token.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/Token.java Tue Oct 23 21:40:19 2012
@@ -182,33 +182,21 @@ public class Token
iv_numPosition = b;
}
- /**
- * @return
- */
public String getText()
{
return iv_text;
}
- /**
- * @param i
- */
public void setText(String s)
{
iv_text = s;
}
- /**
- * @return
- */
public boolean isInteger()
{
return iv_isInteger;
}
- /**
- * @param b
- */
public void setIsInteger(boolean isInteger)
{
iv_isInteger = isInteger;
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/Tokenizer.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/Tokenizer.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/Tokenizer.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/Tokenizer.java Tue Oct 23 21:40:19 2012
@@ -62,8 +62,6 @@ public class Tokenizer {
/**
* Validate the structure of the hyphen map.
- *
- * @param hyphMap
*/
public static void validateHyphenMap(Map<String, Integer> hyphMap)
throws Exception {
@@ -108,7 +106,6 @@ public class Tokenizer {
*
* @param text The text to tokenize.
* @return A list of Token objects.
- * @throws Exception
*/
public List<Token> tokenize(String text) throws Exception {
try {
@@ -456,7 +453,6 @@ public class Tokenizer {
/**
* Applies number rules to the given token.
*
- * @param tokenText
* @return True if the token is a number, false otherwise.
*/
public static boolean isNumber(String tokenText) {
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/TokenizerPTB.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/TokenizerPTB.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/TokenizerPTB.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/nlp/tokenizer/TokenizerPTB.java Tue Oct 23 21:40:19 2012
@@ -70,7 +70,6 @@ public class TokenizerPTB {
/**
* Tokenize text that starts at offset offsetAdjustment within the complete text
- * @param jcas
* @param textSegment the text to tokenize
* @param offsetAdjustment what to add to all offsets within textSegment to make them be offsets from the start of the text for the jcas
* @param includeTextNotJustOffsets whether to copy the text covered by this token into the token object itself
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/JdbcConnectionResource.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/JdbcConnectionResource.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/JdbcConnectionResource.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/JdbcConnectionResource.java Tue Oct 23 21:40:19 2012
@@ -29,7 +29,6 @@ public interface JdbcConnectionResource
{
/**
* Gets the JDBC connection.
- * @return
*/
public Connection getConnection();
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/JdbcConnectionResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/JdbcConnectionResourceImpl.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/JdbcConnectionResourceImpl.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/JdbcConnectionResourceImpl.java Tue Oct 23 21:40:19 2012
@@ -117,7 +117,7 @@ public class JdbcConnectionResourceImpl
if (isolationStr != null)
{
// use java reflection to obtain the corresponding level integer
- Class connClass = Class.forName("java.sql.Connection");
+ Class<?> connClass = Class.forName("java.sql.Connection");
Field f = connClass.getField(isolationStr);
int level = f.getInt(null);
iv_logger.info("Connection transaction isolation level set: " +
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/LinesFromFileStringsResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/LinesFromFileStringsResourceImpl.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/LinesFromFileStringsResourceImpl.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/LinesFromFileStringsResourceImpl.java Tue Oct 23 21:40:19 2012
@@ -43,8 +43,9 @@ public class LinesFromFileStringsResourc
try
{
File file = new File(dr.getUri());
+ ArrayList<String> lines = new ArrayList<String>();
BufferedReader fileReader = new BufferedReader(new FileReader(file));
- ArrayList lines = new ArrayList();
+ try {
String line;
while((line = fileReader.readLine()) != null)
@@ -53,6 +54,9 @@ public class LinesFromFileStringsResourc
line.trim().length() > 0)
lines.add(line);
}
+ } finally {
+ fileReader.close();
+ }
this.lines = (String[])lines.toArray(new String[lines.size()]);
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/MaxentModelResource.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/MaxentModelResource.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/MaxentModelResource.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/MaxentModelResource.java Tue Oct 23 21:40:19 2012
@@ -29,7 +29,6 @@ public interface MaxentModelResource
{
/**
* Gets a Maxent Model.
- * @return
*/
public MaxentModel getModel();
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringIntegerMapResource.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringIntegerMapResource.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringIntegerMapResource.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringIntegerMapResource.java Tue Oct 23 21:40:19 2012
@@ -28,7 +28,6 @@ public interface StringIntegerMapResourc
{
/**
* Gets a map of the String/Integer values.
- * @return
*/
public Map<String, Integer> getMap();
}
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringIntegerMapResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringIntegerMapResourceImpl.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringIntegerMapResourceImpl.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringIntegerMapResourceImpl.java Tue Oct 23 21:40:19 2012
@@ -45,7 +45,7 @@ public class StringIntegerMapResourceImp
private final String DELIMITER = "|";
- Map iv_map = new HashMap();
+ Map<String, Integer> iv_map = new HashMap<String, Integer>();
/**
* Loads data from a file.
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringMapResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringMapResourceImpl.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringMapResourceImpl.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/resource/StringMapResourceImpl.java Tue Oct 23 21:40:19 2012
@@ -44,7 +44,7 @@ public class StringMapResourceImpl
private final String DELIMITER = "|";
- Map iv_map = new HashMap();
+ Map<String, String> iv_map = new HashMap<String, String>();
/**
* Loads data from a file.
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/sentence/SentenceSpan.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/sentence/SentenceSpan.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/sentence/SentenceSpan.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/sentence/SentenceSpan.java Tue Oct 23 21:40:19 2012
@@ -126,7 +126,6 @@ public class SentenceSpan {
* and trim each.
* If is entirely whitespace, return an empty list
* @param separatorPattern CR LF or CRLF
- * @return
*/
public List<SentenceSpan> splitAtLineBreaksAndTrim(String separatorPattern) {
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/DateParser.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/DateParser.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/DateParser.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/DateParser.java Tue Oct 23 21:40:19 2012
@@ -22,9 +22,7 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.apache.uima.jcas.JCas;
@@ -76,9 +74,6 @@ public class DateParser {
/**
* First try parsing full date (month, day and year) using java.util.Date
* If that fails, try extracting at least part of the date
- * @param jcas
- * @param dateString
- * @return
*/
public static Date parse(JCas jcas, String dateString) {
Date date = new Date(jcas);
@@ -134,7 +129,6 @@ public class DateParser {
/**
*
- * @param s
* @return if entire string is letters, returns length of s
*/
public static int getIndexFirstNonLetter(String s) {
@@ -148,7 +142,6 @@ public class DateParser {
/**
*
- * @param s
* @return if entire string is letters, returns 0
*/
public static int getIndexAfterLastNonDigit(String s) {
Modified: incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/FSUtil.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/FSUtil.java?rev=1401497&r1=1401496&r2=1401497&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/FSUtil.java (original)
+++ incubator/ctakes/trunk/ctakes-core/src/main/java/org/apache/ctakes/core/util/FSUtil.java Tue Oct 23 21:40:19 2012
@@ -62,25 +62,20 @@ public class FSUtil {
FSMatchConstraint spanConstraint = constraintFactory.and(beginSpanConstraint, endSpanConstraint);
JFSIndexRepository indexes = jcas.getJFSIndexRepository();
- FSIndex annotIndex = indexes.getAnnotationIndex(type);
- FSIterator annotsInSpanItr = jcas.createFilteredIterator(annotIndex.iterator(), spanConstraint);
+ FSIndex<?> annotIndex = indexes.getAnnotationIndex(type);
+ FSIterator<?> annotsInSpanItr = jcas.createFilteredIterator(annotIndex.iterator(), spanConstraint);
return annotsInSpanItr;
}
/**
* For correct behavior, requires types to be listed in TypePriorities so that the subiterator works as expected
- * @param jcas
- * @param type
- * @param beginSpan
- * @param endSpan
- * @return
*/
public static FSIterator getAnnotationsIteratorInSpan(JCas jcas, int type, int beginSpan, int endSpan)
{
Annotation ann = new Annotation(jcas, beginSpan, endSpan);
ann.addToIndexes();
- AnnotationIndex annIdx = (AnnotationIndex)jcas.getAnnotationIndex(type);
- FSIterator itr = annIdx.subiterator(ann);
+ AnnotationIndex<?> annIdx = jcas.getAnnotationIndex(type);
+ FSIterator<?> itr = annIdx.subiterator(ann);
ann.removeFromIndexes();
return itr;
}
@@ -88,17 +83,11 @@ public class FSUtil {
/**
* Does not use {@link #getAnnotationsInSpan(JCas, int, int, int, int[])} so we don't create a collection
* unnecessarily.
- * @param jcas
- * @param type
- * @param beginSpan
- * @param endSpan
- * @param validNeTypes
- * @return
*/
public static int countAnnotationsInSpan(JCas jcas, int type, int beginSpan, int endSpan, int[] validNeTypes)
{
int count=0;
- Iterator itr = getAnnotationsIteratorInSpan(jcas, type, beginSpan, endSpan);
+ Iterator<?> itr = getAnnotationsIteratorInSpan(jcas, type, beginSpan, endSpan);
while(itr.hasNext())
{
IdentifiedAnnotation ne = (IdentifiedAnnotation)itr.next();
@@ -119,8 +108,8 @@ public class FSUtil {
public static List getAnnotationsInSpan(JCas jcas, int type, int beginSpan, int endSpan, int[] validNeTypes)
{
- List list = new ArrayList();
- Iterator itr = getAnnotationsIteratorInSpan(jcas, type, beginSpan, endSpan);
+ List<IdentifiedAnnotation> list = new ArrayList<IdentifiedAnnotation>();
+ Iterator<?> itr = getAnnotationsIteratorInSpan(jcas, type, beginSpan, endSpan);
while(itr.hasNext())
{
IdentifiedAnnotation ne = (IdentifiedAnnotation)itr.next(); // might be an EventMention or an EntityMention
@@ -134,28 +123,18 @@ public class FSUtil {
/**
* returns the number of annotations of specified type in the
- * @param jcas
- * @param type
- * @param beginSpan
- * @param endSpan
- * @return
*/
public static int countAnnotationsInSpan(JCas jcas, int type, int beginSpan, int endSpan)
{
Annotation ann = new Annotation(jcas, beginSpan, endSpan);
ann.addToIndexes();
- AnnotationIndex annIdx = (AnnotationIndex)jcas.getAnnotationIndex(type);
+ AnnotationIndex<?> annIdx = jcas.getAnnotationIndex(type);
ann.removeFromIndexes();
return annIdx.size();
}
/**
* returns a true if the annotation type is present in the span
- * @param jcas
- * @param type
- * @param beginSpan
- * @param endSpan
- * @return
*/
public static boolean isAnnotationPresentInSpan(JCas jcas, int type, int beginSpan, int endSpan)
{