Revision: 17526
http://sourceforge.net/p/gate/code/17526
Author: markagreenwood
Date: 2014-03-04 13:43:17 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
turn on the static compile warnings and fix the things it highlighted -- it's
amazing how much tedious work gets done during a boring project telco
Modified Paths:
--------------
gate/trunk/build.xml
gate/trunk/src/main/gate/creole/annic/apache/lucene/index/DocumentWriter.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule0.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule1.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule10.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule11.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule12.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule13.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule14.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule15.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule16.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule2.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule3.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule4.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule5.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule6.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule8.java
gate/trunk/src/main/gate/creole/orthomatcher/MatchRule9.java
gate/trunk/src/main/gate/creole/orthomatcher/OrthoMatcherHelper.java
gate/trunk/src/main/gate/gui/OkCancelDialog.java
Modified: gate/trunk/build.xml
===================================================================
--- gate/trunk/build.xml 2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/build.xml 2014-03-04 13:43:17 UTC (rev 17526)
@@ -258,7 +258,7 @@
<compilerarg value="-Xlint:-unchecked" />
<compilerarg value="-Xlint:-serial" />
<compilerarg value="-Xlint:-cast" />
- <compilerarg value="-Xlint:-static" />
+ <!-- <compilerarg value="-Xlint:-static" /> -->
</javac>
</target>
Modified:
gate/trunk/src/main/gate/creole/annic/apache/lucene/index/DocumentWriter.java
===================================================================
---
gate/trunk/src/main/gate/creole/annic/apache/lucene/index/DocumentWriter.java
2014-03-04 11:26:16 UTC (rev 17525)
+++
gate/trunk/src/main/gate/creole/annic/apache/lucene/index/DocumentWriter.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -333,7 +333,7 @@
float norm = fieldBoosts[n] * similarity.lengthNorm(fi.name,
fieldLengths[n]);
OutputStream norms = directory.createFile(segment + ".f" + n);
try {
- norms.writeByte(similarity.encodeNorm(norm));
+ norms.writeByte(Similarity.encodeNorm(norm));
} finally {
norms.close();
}
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule0.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule0.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule0.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -1,7 +1,6 @@
package gate.creole.orthomatcher;
-import java.util.HashMap;
/** RULE #0: If the two names are listed in table of
* spurius matches then they do NOT match
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule1.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule1.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule1.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -1,7 +1,5 @@
package gate.creole.orthomatcher;
-import java.util.HashSet;
-import java.util.Map;
/** RULE #1: If the two names are identical then they are the same
* no longer used, because I do the check for same string via the
@@ -26,8 +24,8 @@
if (!retVal)
retVal = orthomatcher.getOrthography().fuzzyMatch(s1, s2);
- if (retVal && orthomatcher.log.isDebugEnabled()) {
- orthomatcher.log.debug("rule 1 matched " + s1 + "(id: " +
orthomatcher.longAnnot.getId() + ") to "
+ if (retVal && OrthoMatcher.log.isDebugEnabled()) {
+ OrthoMatcher.log.debug("rule 1 matched " + s1 + "(id: " +
orthomatcher.longAnnot.getId() + ") to "
+ s2+ "(id: " + orthomatcher.shortAnnot.getId() + ")");
}
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule10.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule10.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule10.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -1,7 +1,5 @@
package gate.creole.orthomatcher;
-import java.util.HashMap;
-
import gate.Annotation;
@@ -37,7 +35,7 @@
int i = 0;
for (; i< orthomatcher.tokensLongAnnot.size(); i++) {
token = (String)
- ((Annotation)
orthomatcher.tokensLongAnnot.get(i)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+ ((Annotation)
orthomatcher.tokensLongAnnot.get(i)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
if (orthomatcher.prepos.containsKey(token)) {
invoke_rule=true;
break;
@@ -51,12 +49,12 @@
if (i < orthomatcher.tokensLongAnnot.size()
&& previous_token != null) {
next_token= (String)
- ((Annotation)
orthomatcher.tokensLongAnnot.get(i++)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+ ((Annotation)
orthomatcher.tokensLongAnnot.get(i++)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
String s21 = (String)
- ((Annotation)
orthomatcher.tokensShortAnnot.get(0)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+ ((Annotation)
orthomatcher.tokensShortAnnot.get(0)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
String s22 = (String)
- ((Annotation)
orthomatcher.tokensShortAnnot.get(1)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+ ((Annotation)
orthomatcher.tokensShortAnnot.get(1)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
// then compare (in reverse) with the first two tokens of s2
if (OrthoMatcherHelper.straightCompare(next_token,(String)
s21,orthomatcher.caseSensitive)
&& OrthoMatcherHelper.straightCompare(previous_token,
s22,orthomatcher.caseSensitive))
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule11.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule11.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule11.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -32,17 +32,17 @@
else {
// 1st get the first two tokens of s1
token11 = (String)
- ((Annotation)
orthomatcher.tokensLongAnnot.get(0)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+ ((Annotation)
orthomatcher.tokensLongAnnot.get(0)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
token12 = (String)
- ((Annotation)
orthomatcher.tokensLongAnnot.get(1)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+ ((Annotation)
orthomatcher.tokensLongAnnot.get(1)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
// now check for the first case i.e. "Pan American" == "Pan Am"
if (orthomatcher.tokensShortAnnot.size() == 2) {
token21 = (String)
- ((Annotation)
orthomatcher.tokensShortAnnot.get(0)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+ ((Annotation)
orthomatcher.tokensShortAnnot.get(0)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
token22 = (String)
- ((Annotation)
orthomatcher.tokensShortAnnot.get(0)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+ ((Annotation)
orthomatcher.tokensShortAnnot.get(0)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
if (token11.startsWith(token21)
&& token12.startsWith(token22))
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule12.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule12.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule12.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -25,9 +25,9 @@
// get first and last tokens of s1 & s2
String s1_first = (String)
- ((Annotation)
orthomatcher.tokensLongAnnot.get(0)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+ ((Annotation)
orthomatcher.tokensLongAnnot.get(0)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
String s2_first = (String)
- ((Annotation)
orthomatcher.tokensShortAnnot.get(0)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+ ((Annotation)
orthomatcher.tokensShortAnnot.get(0)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
if
(!OrthoMatcherHelper.straightCompare(s1_first,s2_first,orthomatcher.caseSensitive))
result = false;
@@ -38,8 +38,8 @@
((Annotation)
orthomatcher.tokensShortAnnot.get(orthomatcher.tokensShortAnnot.size()-1)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
boolean retVal =
OrthoMatcherHelper.straightCompare(s1_last,s2_last,orthomatcher.caseSensitive);
- if (retVal && orthomatcher.log.isDebugEnabled()) {
- orthomatcher.log.debug("rule 12 matched " + s1 + "(id: " +
orthomatcher.longAnnot.getId() + ") to "
+ if (retVal && OrthoMatcher.log.isDebugEnabled()) {
+ OrthoMatcher.log.debug("rule 12 matched " + s1 + "(id: " +
orthomatcher.longAnnot.getId() + ") to "
+ s2+ "(id: " + orthomatcher.shortAnnot.getId() + ")");
}
result = retVal;
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule13.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule13.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule13.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -1,8 +1,5 @@
package gate.creole.orthomatcher;
-import java.util.HashSet;
-import java.util.Map;
-
import gate.Annotation;
/**
@@ -43,8 +40,8 @@
((Annotation)
orthomatcher.tokensShortAnnot.get(orthomatcher.tokensShortAnnot.size()-1)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
boolean retVal =
OrthoMatcherHelper.straightCompare(s1_last,s2_last,orthomatcher.caseSensitive);
- if (retVal && orthomatcher.log.isDebugEnabled()) {
- orthomatcher.log.debug("rule 13 matched " + s1 + "(id: " +
orthomatcher.longAnnot.getId() + ") to "
+ if (retVal && OrthoMatcher.log.isDebugEnabled()) {
+ OrthoMatcher.log.debug("rule 13 matched " + s1 + "(id: " +
orthomatcher.longAnnot.getId() + ") to "
+ s2+ "(id: " + orthomatcher.shortAnnot.getId() + ")");
}
result = retVal;
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule14.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule14.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule14.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -38,8 +38,8 @@
// Out.prln("i = " + i);
// Out.prln("j = " + j);
- if ( ((Annotation)
orthomatcher.tokensLongAnnot.get(j)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME).equals(
- ((Annotation)
orthomatcher.tokensShortAnnot.get(i)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME))
) {
+ if ( ((Annotation)
orthomatcher.tokensLongAnnot.get(j)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME).equals(
+ ((Annotation)
orthomatcher.tokensShortAnnot.get(i)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME))
) {
matched_tokens++;
j++;
} else
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule15.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule15.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule15.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -27,11 +27,11 @@
// Out.prln("Rule 14 " + s1 + " and " + s2);
String s1_short = (String)
((Annotation) orthomatcher.tokensLongAnnot.get(
-
orthomatcher.tokensLongAnnot.size()-1)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+
orthomatcher.tokensLongAnnot.size()-1)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
// Out.prln("Converted to " + s1_short);
if (orthomatcher.tokensLongAnnot.size()>1 &&
OrthoMatcherHelper.straightCompare(s1_short, s2,orthomatcher.caseSensitive)) {
- if (orthomatcher.log.isDebugEnabled()) {
- orthomatcher.log.debug("rule 15 matched " + s1 + "(id: " +
orthomatcher.longAnnot.getId() + ") to " + s2
+ if (OrthoMatcher.log.isDebugEnabled()) {
+ OrthoMatcher.log.debug("rule 15 matched " + s1 + "(id: " +
orthomatcher.longAnnot.getId() + ") to " + s2
+ "(id: " + orthomatcher.shortAnnot.getId() + ")");
}
result = true;
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule16.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule16.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule16.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -1,8 +1,5 @@
package gate.creole.orthomatcher;
-import java.util.HashSet;
-import java.util.Map;
-
import gate.Annotation;
/**
@@ -26,10 +23,10 @@
for (int i=0; i < orthmatcher.tokensShortAnnot.size(); i++) {
token1 = (Annotation) orthmatcher.tokensShortAnnot.get(i);
//first check if not punctuation, because we need to skip it
- if
(token1.getFeatures().get(orthmatcher.TOKEN_KIND_FEATURE_NAME).equals(orthmatcher.PUNCTUATION_VALUE))
+ if
(token1.getFeatures().get(OrthoMatcher.TOKEN_KIND_FEATURE_NAME).equals(OrthoMatcher.PUNCTUATION_VALUE))
continue;
- String ts1 =
(String)token1.getFeatures().get(orthmatcher.TOKEN_STRING_FEATURE_NAME);
+ String ts1 =
(String)token1.getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
boolean foundMatch = false;
for (int j=0; j<orthmatcher.tokensLongAnnot.size(); j++) {
// Out.prln("i = " + i);
@@ -65,8 +62,8 @@
//only get to here if all word tokens in the short annot were found
in
//the long annot, so there is a coref relation
- if (orthmatcher.log.isDebugEnabled())
- orthmatcher.log.debug("rule 16 matched " + s1 + " to " + s2);
+ if (OrthoMatcher.log.isDebugEnabled())
+ OrthoMatcher.log.debug("rule 16 matched " + s1 + " to " + s2);
if(result) OrthoMatcherHelper.usedRule(16);
return result;
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule2.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule2.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule2.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -1,6 +1,5 @@
package gate.creole.orthomatcher;
-import java.util.HashMap;
/**
* RULE #2: if the two names are listed as equivalent in the
@@ -22,8 +21,8 @@
if (orthomatcher.alias.containsKey(s1) &&
orthomatcher.alias.containsKey(s2)) {
if
(orthomatcher.alias.get(s1).toString().equals(orthomatcher.alias.get(s2).toString()))
{
- if (orthomatcher.log.isDebugEnabled()) {
- orthomatcher.log.debug("rule 2 matched " + s1 + " to " + s2);
+ if (OrthoMatcher.log.isDebugEnabled()) {
+ OrthoMatcher.log.debug("rule 2 matched " + s1 + " to " + s2);
}
result=true;
}
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule3.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule3.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule3.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -1,7 +1,5 @@
package gate.creole.orthomatcher;
-import java.util.ArrayList;
-
import gate.Annotation;
/**
@@ -33,22 +31,22 @@
else s2_poss = s2.concat("'");
if (s2_poss != null && OrthoMatcherHelper.straightCompare(s1,
s2_poss,orthomatcher.caseSensitive)) {
- if (orthomatcher.log.isDebugEnabled()) {
- orthomatcher.log.debug("rule 3 matched " + s1 + " to " + s2);
+ if (OrthoMatcher.log.isDebugEnabled()) {
+ OrthoMatcher.log.debug("rule 3 matched " + s1 + " to " + s2);
}
result = true;
}
// now check the second case i.e. "Standard and Poor" ==
"Standard's"
String token = (String)
- ((Annotation)
orthomatcher.tokensLongAnnot.get(0)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+ ((Annotation)
orthomatcher.tokensLongAnnot.get(0)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
if (!token.endsWith("'s")) s2_poss = token.concat("'s");
else s2_poss = token.concat("'");
if (s2_poss != null &&
OrthoMatcherHelper.straightCompare(s2_poss,s2,orthomatcher.caseSensitive)) {
- if (orthomatcher.log.isDebugEnabled()){
- orthomatcher.log.debug("rule 3 matched " + s1 + " to " + s2);
+ if (OrthoMatcher.log.isDebugEnabled()){
+ OrthoMatcher.log.debug("rule 3 matched " + s1 + " to " + s2);
}
result = true;
}
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule4.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule4.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule4.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -28,8 +28,8 @@
boolean allTokensMatch = true;
// Out.prln("MR4: Matching" + s1 + " with " + s2);
- Iterator tokensLongAnnotIter =
orthomatcher.tokensLongAnnot.iterator();
- Iterator tokensShortAnnotIter =
orthomatcher.tokensShortAnnot.iterator();
+ Iterator<Annotation> tokensLongAnnotIter =
orthomatcher.tokensLongAnnot.iterator();
+ Iterator<Annotation> tokensShortAnnotIter =
orthomatcher.tokensShortAnnot.iterator();
while (tokensLongAnnotIter.hasNext() &&
tokensShortAnnotIter.hasNext()) {
Annotation token = (Annotation) tokensLongAnnotIter.next();
if
(((String)token.getFeatures().get(TOKEN_KIND_FEATURE_NAME)).equals(PUNCTUATION_VALUE)
||
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule5.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule5.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule5.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -1,12 +1,12 @@
package gate.creole.orthomatcher;
+import static gate.creole.ANNIEConstants.TOKEN_KIND_FEATURE_NAME;
+import static gate.creole.ANNIEConstants.TOKEN_STRING_FEATURE_NAME;
+import static gate.creole.orthomatcher.OrthoMatcher.PUNCTUATION_VALUE;
+import static gate.creole.orthomatcher.OrthoMatcher.log;
import gate.Annotation;
-import java.util.HashSet;
import java.util.Iterator;
-import java.util.Map;
-
-import static gate.creole.orthomatcher.OrthoMatcher.*;
/**
* RULE #4Name: Does all the non-punctuation tokens from the long string match
the corresponding tokens
* in the short string?
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule6.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule6.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule6.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -50,7 +50,7 @@
{result = OrthoMatcherHelper.straightCompare((String)
((Annotation) orthomatcher.tokensLongAnnot.get(0)
-
).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME),
+
).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME),
s2,
orthomatcher.caseSensitive);
}
@@ -58,8 +58,8 @@
}
- if (result && orthomatcher.log.isDebugEnabled()) {
- orthomatcher.log.debug("rule 6 matched " + s1 + " to " + s2);
+ if (result && OrthoMatcher.log.isDebugEnabled()) {
+ OrthoMatcher.log.debug("rule 6 matched " + s1 + " to " +
s2);
}
if (result) OrthoMatcherHelper.usedRule(6);
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule8.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule8.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule8.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -1,9 +1,5 @@
package gate.creole.orthomatcher;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
import gate.Annotation;
/**
Modified: gate/trunk/src/main/gate/creole/orthomatcher/MatchRule9.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/MatchRule9.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/MatchRule9.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -1,8 +1,5 @@
package gate.creole.orthomatcher;
-import java.util.HashSet;
-import java.util.Map;
-
import gate.Annotation;
/**
@@ -30,7 +27,7 @@
// Out.prln("Rule 9 " + s1 + " and " + s2);
String s1_short = (String)
((Annotation) orthomatcher.tokensLongAnnot.get(
-
orthomatcher.tokensLongAnnot.size()-1)).getFeatures().get(orthomatcher.TOKEN_STRING_FEATURE_NAME);
+
orthomatcher.tokensLongAnnot.size()-1)).getFeatures().get(OrthoMatcher.TOKEN_STRING_FEATURE_NAME);
// Out.prln("Converted to " + s1_short);
if (orthomatcher.tokensLongAnnot.size()>1) {
boolean matched =
OrthoMatcherHelper.straightCompare(s1_short, s2, orthomatcher.caseSensitive);
Modified: gate/trunk/src/main/gate/creole/orthomatcher/OrthoMatcherHelper.java
===================================================================
--- gate/trunk/src/main/gate/creole/orthomatcher/OrthoMatcherHelper.java
2014-03-04 11:26:16 UTC (rev 17525)
+++ gate/trunk/src/main/gate/creole/orthomatcher/OrthoMatcherHelper.java
2014-03-04 13:43:17 UTC (rev 17526)
@@ -6,7 +6,6 @@
import gate.util.InvalidOffsetException;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
Modified: gate/trunk/src/main/gate/gui/OkCancelDialog.java
===================================================================
--- gate/trunk/src/main/gate/gui/OkCancelDialog.java 2014-03-04 11:26:16 UTC
(rev 17525)
+++ gate/trunk/src/main/gate/gui/OkCancelDialog.java 2014-03-04 13:43:17 UTC
(rev 17526)
@@ -15,11 +15,27 @@
package gate.gui;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Toolkit;
+import java.awt.Window;
import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.ActionMap;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
+import javax.swing.InputMap;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
/**
* A simple modal dialog that displays a component provided by the user along
@@ -158,5 +174,5 @@
protected JButton okButton;
protected JButton cancelButton;
protected boolean userHasPressedOK;
- protected static boolean userHasPressedCancel;
+ protected boolean userHasPressedCancel;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
