Revision: 17522
http://sourceforge.net/p/gate/code/17522
Author: markagreenwood
Date: 2014-03-04 08:00:35 +0000 (Tue, 04 Mar 2014)
Log Message:
-----------
whole bunch of generics stuff while I was looking at the files trying to figure
out the empty statement problem
Modified Paths:
--------------
gate/trunk/src/main/gate/creole/annic/Indexer.java
gate/trunk/src/main/gate/creole/annic/lucene/LuceneDocument.java
gate/trunk/src/main/gate/creole/annic/lucene/PatternValidator.java
gate/trunk/src/main/gate/creole/annic/lucene/QueryParser.java
gate/trunk/src/main/gate/creole/annic/lucene/StatsCalculator.java
gate/trunk/src/main/gate/creole/annic/lucene/SubQueryParser.java
Modified: gate/trunk/src/main/gate/creole/annic/Indexer.java
===================================================================
--- gate/trunk/src/main/gate/creole/annic/Indexer.java 2014-03-04 06:50:03 UTC
(rev 17521)
+++ gate/trunk/src/main/gate/creole/annic/Indexer.java 2014-03-04 08:00:35 UTC
(rev 17522)
@@ -11,7 +11,6 @@
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* Base interface that declares methods for the Indexer.
Modified: gate/trunk/src/main/gate/creole/annic/lucene/LuceneDocument.java
===================================================================
--- gate/trunk/src/main/gate/creole/annic/lucene/LuceneDocument.java
2014-03-04 06:50:03 UTC (rev 17521)
+++ gate/trunk/src/main/gate/creole/annic/lucene/LuceneDocument.java
2014-03-04 08:00:35 UTC (rev 17522)
@@ -312,7 +312,7 @@
// all the annotation sets to be indexed
// however it must not contain the baseTokens or
// indexUnitAnnotationType annotations
- AnnotationSet mergedSet = null;
+ //AnnotationSet mergedSet = null;
for(String annotSet : annotSetsToIndex) {
@@ -667,13 +667,14 @@
}
}
- ArrayList<Token> toReturn[] = new ArrayList[unitOffsetsSet.size()];
+ @SuppressWarnings("unchecked")
+ List<Token> toReturn[] = new ArrayList[unitOffsetsSet.size()];
Iterator<OffsetGroup> iter = unitOffsetsSet.iterator();
int counter = 0;
while(iter.hasNext()) {
OffsetGroup group = iter.next();
- ArrayList<Token> newTokens = new ArrayList<Token>();
- ArrayList<Annotation> tokens =
+ List<Token> newTokens = new ArrayList<Token>();
+ List<Annotation> tokens =
new ArrayList<Annotation>(toUseSet.getContained(group.startOffset,
group.endOffset));
@@ -737,9 +738,9 @@
// now find out the features and add them
FeatureMap features = annot.getFeatures();
- Iterator fIter = features.keySet().iterator();
+ Iterator<Object> fIter = features.keySet().iterator();
while(fIter.hasNext()) {
- String type1 = (String)fIter.next();
+ String type1 = fIter.next().toString();
// if the feature is specified in featuresToExclude -exclude
// it
if(excludeFeatures && featuresToExclude.contains(type + "." +
type1)) {
Modified: gate/trunk/src/main/gate/creole/annic/lucene/PatternValidator.java
===================================================================
--- gate/trunk/src/main/gate/creole/annic/lucene/PatternValidator.java
2014-03-04 06:50:03 UTC (rev 17521)
+++ gate/trunk/src/main/gate/creole/annic/lucene/PatternValidator.java
2014-03-04 08:00:35 UTC (rev 17522)
@@ -21,23 +21,6 @@
*/
public class PatternValidator {
- /**
- * AND operator
- */
- private final int AND = 0;
-
- /**
- * OR operator
- */
- private final int OR = 1;
-
- /**
- * Negation operator
- */
- private final int NOT = 2;
-
- private int index = 0;
-
private int patLen = 0;
/**
@@ -67,9 +50,14 @@
for(int i = 0; i < queryTokens.size(); i++) {
queryParser.position = 0;
- ArrayList[] termpositions = queryParser.createTerms(queryTokens.get(i));
- ArrayList terms = termpositions[0];
- ArrayList consider = termpositions[2];
+ List<?>[] termpositions = queryParser.createTerms(queryTokens.get(i));
+
+ @SuppressWarnings("unchecked")
+ List<Term> terms = (List<Term>)termpositions[0];
+
+ @SuppressWarnings("unchecked")
+ List<Boolean> consider = (List<Boolean>)termpositions[2];
+
// process each term individually
for(int k = 0; k < terms.size(); k++) {
// when consider is true, that means we should change the start
Modified: gate/trunk/src/main/gate/creole/annic/lucene/QueryParser.java
===================================================================
--- gate/trunk/src/main/gate/creole/annic/lucene/QueryParser.java
2014-03-04 06:50:03 UTC (rev 17521)
+++ gate/trunk/src/main/gate/creole/annic/lucene/QueryParser.java
2014-03-04 08:00:35 UTC (rev 17522)
@@ -26,7 +26,7 @@
/**
* Queries generated as a result of normalizing the submitted query.
*/
- private ArrayList queries = new ArrayList();
+ private List<String> queries = new ArrayList<String>();
/**
* Name of the field that contains the index data.
@@ -198,8 +198,11 @@
// and then convert each token into separate terms
if(tokens.size() == 1) {
- ArrayList[] termsPos = (createTerms(tokens.get(0)));
- ArrayList terms = termsPos[0];
+ List<?>[] termsPos = createTerms(tokens.get(0));
+
+ @SuppressWarnings("unchecked")
+ List<Term> terms = (List<Term>)termsPos[0];
+
if(terms.size() == 1) {
if(areAllTermsTokens)
needValidation = false;
@@ -218,10 +221,16 @@
// and now for each token we need to create Term(s)
outer: for(int i = 0; i < tokens.size(); i++) {
- ArrayList[] termpositions = createTerms((String)tokens.get(i));
- ArrayList terms = termpositions[0];
- ArrayList pos = termpositions[1];
- ArrayList consider = termpositions[2];
+ List<?>[] termpositions = createTerms(tokens.get(i));
+
+ @SuppressWarnings("unchecked")
+ List<Term> terms = (List<Term>)termpositions[0];
+
+ @SuppressWarnings("unchecked")
+ List<Integer> pos = (List<Integer>)termpositions[1];
+
+ @SuppressWarnings("unchecked")
+ List<Boolean> consider = (List<Boolean>)termpositions[2];
boolean allTermsTokens = true;
// lets first find out if there's any token in this terms
@@ -362,10 +371,10 @@
return false;
}
- private ArrayList splitString(String string, char with, boolean normalize) {
+ private ArrayList<String> splitString(String string, char with, boolean
normalize) {
// here we want to split the string
// but also make sure the with character is not escaped
- ArrayList strings = new ArrayList();
+ ArrayList<String> strings = new ArrayList<String>();
StringBuffer newString = new StringBuffer();
for(int i = 0; i < string.length(); i++) {
if(i == 0) {
@@ -431,12 +440,12 @@
return sb.toString();
}
- public ArrayList[] createTerms(String elem)
+ public List<?>[] createTerms(String elem)
throws gate.creole.ir.SearchException {
areAllTermsTokens = true;
- ArrayList terms = new ArrayList();
- ArrayList pos = new ArrayList();
- ArrayList consider = new ArrayList();
+ List<Term> terms = new ArrayList<Term>();
+ List<Integer> pos = new ArrayList<Integer>();
+ List<Boolean> consider = new ArrayList<Boolean>();
elem = elem.trim();
if(elem.charAt(0) == '{' && elem.charAt(elem.length() - 1) == '}') {
@@ -448,14 +457,14 @@
if(index == -1 && index1 == -1) {
// 3. {AnnotationType}
// this can be {AnnotationType, AnnotationType...}
- ArrayList fields = splitString(elem, ',', true);
+ ArrayList<String> fields = splitString(elem, ',', true);
for(int p = 0; p < fields.size(); p++) {
if(areAllTermsTokens
- && !((String)fields.get(p)).equals(baseTokenAnnotationType))
+ && !fields.get(p).equals(baseTokenAnnotationType))
areAllTermsTokens = false;
- terms.add(new Term(field, norm(((String)fields.get(p))), "*"));
+ terms.add(new Term(field, norm(fields.get(p)), "*"));
pos.add(new Integer(position));
if(p == 0)
consider.add(new Boolean(true));
@@ -468,16 +477,16 @@
// 4. {AnnotationType==String}
// 5. {AnnotationType=="String"}
- ArrayList fields = splitString(elem, ',', false);
+ ArrayList<String> fields = splitString(elem, ',', false);
for(int p = 0; p < fields.size(); p++) {
- index = ((String)fields.get(p)).indexOf("==");
+ index = fields.get(p).indexOf("==");
// here this is also posible
// {AnnotationType, AnnotationType=="String"}
if(index != -1) {
- String annotType = norm(((String)fields.get(p)).substring(0, index)
+ String annotType = norm(fields.get(p).substring(0, index)
.trim());
- String annotText = norm(((String)fields.get(p)).substring(
- index + 2, ((String)fields.get(p)).length()).trim());
+ String annotText = norm(fields.get(p).substring(
+ index + 2, fields.get(p).length()).trim());
if(annotText.length() > 2 && annotText.charAt(0) == '\"'
&& annotText.charAt(annotText.length() - 1) == '\"') {
annotText = annotText.substring(1, annotText.length() - 1);
@@ -493,10 +502,10 @@
}
else {
- if(!(norm((String)fields.get(p))).equals(baseTokenAnnotationType))
+ if(!(norm(fields.get(p))).equals(baseTokenAnnotationType))
areAllTermsTokens = false;
- terms.add(new Term(field, norm(((String)fields.get(p))), "*"));
+ terms.add(new Term(field, norm(fields.get(p)), "*"));
pos.add(new Integer(position));
if(p == 0)
consider.add(new Boolean(true));
@@ -522,10 +531,10 @@
subElems = new String[] {elem};
}
else {
- ArrayList list = splitString(elem, ',', false);
+ ArrayList<String> list = splitString(elem, ',', false);
subElems = new String[list.size()];
for(int k = 0; k < list.size(); k++) {
- subElems[k] = (String)list.get(k);
+ subElems[k] = list.get(k);
}
}
@@ -622,7 +631,7 @@
}
}
}
- return new ArrayList[] {terms, pos, consider};
+ return new List<?>[] {terms, pos, consider};
}
public boolean needValidation() {
Modified: gate/trunk/src/main/gate/creole/annic/lucene/StatsCalculator.java
===================================================================
--- gate/trunk/src/main/gate/creole/annic/lucene/StatsCalculator.java
2014-03-04 06:50:03 UTC (rev 17521)
+++ gate/trunk/src/main/gate/creole/annic/lucene/StatsCalculator.java
2014-03-04 08:00:35 UTC (rev 17522)
@@ -82,7 +82,7 @@
corpusHits = searcher.search(tq);
}
- ArrayList[] firstTermPositions = searcher.getFirstTermPositions();
+ List<?>[] firstTermPositions = searcher.getFirstTermPositions();
// if no result available, set null to our scores
if(firstTermPositions[0].size() == 0) {
Modified: gate/trunk/src/main/gate/creole/annic/lucene/SubQueryParser.java
===================================================================
--- gate/trunk/src/main/gate/creole/annic/lucene/SubQueryParser.java
2014-03-04 06:50:03 UTC (rev 17521)
+++ gate/trunk/src/main/gate/creole/annic/lucene/SubQueryParser.java
2014-03-04 08:00:35 UTC (rev 17522)
@@ -30,7 +30,7 @@
if(line.length() == -1) break;
- ArrayList<String> queries = parseQuery(line);
+ List<String> queries = parseQuery(line);
for(int i = 0; i < queries.size(); i++) {
System.out.println("=>" + queries.get(i));
}
@@ -161,10 +161,10 @@
* 2. {B}{C}
* @throws SearchException
*/
- public static ArrayList<String> parseQuery(String q1) throws SearchException
{
+ public static List<String> parseQuery(String q1) throws SearchException {
// arraylist to return - will contain all the OR normalized queries
- ArrayList<String> queries = new ArrayList<String>();
+ List<String> queries = new ArrayList<String>();
// remove all extra spaces from the query
q1 = q1.trim();
@@ -383,7 +383,7 @@
* @param dupliSize
* @return
*/
- private static ArrayList<String> writeTokens(ArrayList<String> tokens,
ArrayList<String> queries,
+ private static List<String> writeTokens(List<String> tokens, List<String>
queries,
int dupliSize) {
if(dupliSize == 0) dupliSize = 1;
@@ -413,11 +413,11 @@
/**
* This is a helper method that helps in duplicating the provided tokens.
*/
- private static ArrayList<String> duplicate(ArrayList<String> queries, String
s, int dupliSize,
+ private static List<String> duplicate(List<String> queries, String s, int
dupliSize,
int no) {
if(s == null) s = "";
- ArrayList<String> strings = new ArrayList<String>();
+ List<String> strings = new ArrayList<String>();
if(dupliSize == 0) {
strings.add(s);
}
@@ -523,7 +523,7 @@
* @param queries
* @return
*/
- private static ArrayList<String> writeCharInAll(char c, int no,
ArrayList<String> queries) {
+ private static List<String> writeCharInAll(char c, int no, List<String>
queries) {
for(int i = 0; i < no; i++) {
String s = queries.get(queries.size() - (i + 1));
s += "" + c;
@@ -539,7 +539,7 @@
* @param queries
* @return
*/
- private static ArrayList<String> writeStringInAll(String c, int no,
ArrayList<String> queries) {
+ private static List<String> writeStringInAll(String c, int no, List<String>
queries) {
for(int i = 0; i < no; i++) {
String s = (String)queries.get(queries.size() - (i + 1));
s += "" + c;
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
