Revision: 17599
http://sourceforge.net/p/gate/code/17599
Author: markagreenwood
Date: 2014-03-08 16:30:42 +0000 (Sat, 08 Mar 2014)
Log Message:
-----------
yet more generics and serialVersionUIDs
Modified Paths:
--------------
gate/trunk/src/main/gate/jape/MultiPhaseTransducer.java
gate/trunk/src/main/gate/jape/MutableBoolean.java
gate/trunk/src/main/gate/jape/MutableInteger.java
gate/trunk/src/main/gate/jape/NonFatalJapeException.java
gate/trunk/src/main/gate/jape/PatternElement.java
gate/trunk/src/main/gate/jape/RightHandSide.java
gate/trunk/src/main/gate/jape/Rule.java
gate/trunk/src/main/gate/jape/SinglePhaseTransducer.java
gate/trunk/src/main/gate/jape/Transducer.java
gate/trunk/src/main/gate/jape/constraint/AbstractConstraintPredicate.java
gate/trunk/src/main/gate/jape/constraint/AbstractRegExpPredicate.java
gate/trunk/src/main/gate/jape/constraint/AnnotationAccessor.java
gate/trunk/src/main/gate/jape/constraint/AnnotationFeatureAccessor.java
gate/trunk/src/main/gate/jape/constraint/CleanStringAccessor.java
gate/trunk/src/main/gate/jape/constraint/ComparablePredicate.java
gate/trunk/src/main/gate/jape/constraint/ContainsPredicate.java
gate/trunk/src/main/gate/jape/constraint/EmbeddedConstraintPredicate.java
gate/trunk/src/main/gate/jape/constraint/EqualPredicate.java
gate/trunk/src/main/gate/jape/constraint/GreaterEqualPredicate.java
gate/trunk/src/main/gate/jape/constraint/GreaterPredicate.java
gate/trunk/src/main/gate/jape/constraint/LengthAccessor.java
gate/trunk/src/main/gate/jape/constraint/LesserEqualPredicate.java
gate/trunk/src/main/gate/jape/constraint/LesserPredicate.java
gate/trunk/src/main/gate/jape/constraint/MetaPropertyAccessor.java
gate/trunk/src/main/gate/jape/constraint/NotContainsPredicate.java
gate/trunk/src/main/gate/jape/constraint/NotEqualPredicate.java
gate/trunk/src/main/gate/jape/constraint/NotRegExpFindPredicate.java
gate/trunk/src/main/gate/jape/constraint/NotRegExpMatchPredicate.java
gate/trunk/src/main/gate/jape/constraint/NotWithinPredicate.java
gate/trunk/src/main/gate/jape/constraint/RegExpFindPredicate.java
gate/trunk/src/main/gate/jape/constraint/RegExpMatchPredicate.java
gate/trunk/src/main/gate/jape/constraint/SimpleAnnotationAccessor.java
gate/trunk/src/main/gate/jape/constraint/StringAccessor.java
gate/trunk/src/main/gate/jape/constraint/WithinPredicate.java
Modified: gate/trunk/src/main/gate/jape/MultiPhaseTransducer.java
===================================================================
--- gate/trunk/src/main/gate/jape/MultiPhaseTransducer.java 2014-03-08
16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/MultiPhaseTransducer.java 2014-03-08
16:30:42 UTC (rev 17599)
@@ -58,16 +58,16 @@
@Override
public synchronized void interrupt(){
interrupted = true;
- Iterator phasesIter = phases.iterator();
+ Iterator<Transducer> phasesIter = phases.iterator();
while(phasesIter.hasNext()){
- ((Transducer)phasesIter.next()).interrupt();
+ phasesIter.next().interrupt();
}
}
/** Anonymous construction */
public MultiPhaseTransducer() {
- phases = new ArrayList();
+ phases = new ArrayList<Transducer>();
} // anon construction
/** Set the name. */
@@ -76,7 +76,7 @@
/** The SinglePhaseTransducers that make up this one.
* Keyed by their phase names.
*/
- private List phases;
+ private List<Transducer> phases;
/**
@@ -86,9 +86,9 @@
@Override
public void setOntology(Ontology ontology) {
super.setOntology(ontology);
- Iterator phasesIter = phases.iterator();
+ Iterator<Transducer> phasesIter = phases.iterator();
while(phasesIter.hasNext()){
- ((Transducer)phasesIter.next()).setOntology(ontology);
+ phasesIter.next().setOntology(ontology);
}
}
@@ -125,8 +125,8 @@
*/
@Override
public void finish(GateClassLoader classloader){
- for(Iterator i = phases.iterator(); i.hasNext(); )
- ((Transducer) i.next()).finish(classloader);
+ for(Iterator<Transducer> i = phases.iterator(); i.hasNext(); )
+ i.next().finish(classloader);
} // finish
@@ -162,8 +162,8 @@
}
};
- for(Iterator i = phases.iterator(); i.hasNext(); ) {
- Transducer t = (Transducer) i.next();
+ for(Iterator<Transducer> i = phases.iterator(); i.hasNext(); ) {
+ Transducer t = i.next();
if(isInterrupted()) throw new ExecutionInterruptedException(
"The execution of the \"" + getName() +
@@ -208,7 +208,7 @@
this.enableDebugging = enableDebugging;
//propagate
for(int i = 0; i < phases.size(); i++){
- ((Transducer)phases.get(i)).setEnableDebugging(enableDebugging);
+ phases.get(i).setEnableDebugging(enableDebugging);
}
}
@@ -217,8 +217,8 @@
@Override
public void cleanUp() {
- for(Iterator i = phases.iterator(); i.hasNext(); )
- ((Transducer) i.next()).cleanUp();
+ for(Iterator<Transducer> i = phases.iterator(); i.hasNext(); )
+ i.next().cleanUp();
benchmarkFeatures.remove(Benchmark.DOCUMENT_NAME_FEATURE);
@@ -237,9 +237,9 @@
pad + "MPT: name(" + name + "); phases(" + newline + pad
);
- for(Iterator i = phases.iterator(); i.hasNext(); )
+ for(Iterator<Transducer> i = phases.iterator(); i.hasNext(); )
buf.append(
- ((Transducer) i.next()).toString(
+ i.next().toString(
Strings.addPadding(pad, INDENT_PADDING)
) + " "
);
@@ -250,37 +250,37 @@
} // toString
//needed by FSM
- public List getPhases(){ return phases; }
+ public List<Transducer> getPhases(){ return phases; }
/**
* Sets the phases
* @param phases
*/
- public void setPhases(ArrayList phases) {
+ public void setPhases(List<Transducer> phases) {
this.phases = phases;
}
@Override
public void runControllerExecutionStartedBlock(
ActionContext ac, Controller c, Ontology o) throws ExecutionException {
- for(Iterator i = phases.iterator(); i.hasNext(); ) {
- Transducer t = (Transducer) i.next();
+ for(Iterator<Transducer> i = phases.iterator(); i.hasNext(); ) {
+ Transducer t = i.next();
t.runControllerExecutionStartedBlock(ac, c, o);
}
}
@Override
public void runControllerExecutionFinishedBlock(
ActionContext ac, Controller c, Ontology o) throws ExecutionException {
- for(Iterator i = phases.iterator(); i.hasNext(); ) {
- Transducer t = (Transducer) i.next();
+ for(Iterator<Transducer> i = phases.iterator(); i.hasNext(); ) {
+ Transducer t = i.next();
t.runControllerExecutionFinishedBlock(ac, c, o);
}
}
@Override
public void runControllerExecutionAbortedBlock(
ActionContext ac, Controller c, Throwable throwable, Ontology o) throws
ExecutionException {
- for(Iterator i = phases.iterator(); i.hasNext(); ) {
- Transducer t = (Transducer) i.next();
+ for(Iterator<Transducer> i = phases.iterator(); i.hasNext(); ) {
+ Transducer t = i.next();
t.runControllerExecutionAbortedBlock(ac, c,throwable, o);
}
}
Modified: gate/trunk/src/main/gate/jape/MutableBoolean.java
===================================================================
--- gate/trunk/src/main/gate/jape/MutableBoolean.java 2014-03-08 16:25:35 UTC
(rev 17598)
+++ gate/trunk/src/main/gate/jape/MutableBoolean.java 2014-03-08 16:30:42 UTC
(rev 17599)
@@ -26,10 +26,6 @@
*/
public class MutableBoolean
{
- /** Debug flag */
- private static final boolean DEBUG = false;
-
public boolean value = false;
-
} // class MutableBoolean
Modified: gate/trunk/src/main/gate/jape/MutableInteger.java
===================================================================
--- gate/trunk/src/main/gate/jape/MutableInteger.java 2014-03-08 16:25:35 UTC
(rev 17598)
+++ gate/trunk/src/main/gate/jape/MutableInteger.java 2014-03-08 16:30:42 UTC
(rev 17599)
@@ -18,17 +18,17 @@
package gate.jape;
+import java.io.Serializable;
+
/**
* A mutable wrapper for int, so you can return
* integer values via a method parameter. If public data members bother you
* I suggest you get a hobby, or have more sex or something.
*/
-public class MutableInteger implements java.io.Serializable
+public class MutableInteger implements Serializable
{
- /** Debug flag */
- private static final boolean DEBUG = false;
+ private static final long serialVersionUID = -5619478724698259637L;
- public int value = 0;
-
+ public int value = 0;
} // class MutableInteger
Modified: gate/trunk/src/main/gate/jape/NonFatalJapeException.java
===================================================================
--- gate/trunk/src/main/gate/jape/NonFatalJapeException.java 2014-03-08
16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/NonFatalJapeException.java 2014-03-08
16:30:42 UTC (rev 17599)
@@ -16,6 +16,8 @@
public class NonFatalJapeException extends JapeException {
+ private static final long serialVersionUID = -4395817316344064153L;
+
public NonFatalJapeException() {
super();
}
Modified: gate/trunk/src/main/gate/jape/PatternElement.java
===================================================================
--- gate/trunk/src/main/gate/jape/PatternElement.java 2014-03-08 16:25:35 UTC
(rev 17598)
+++ gate/trunk/src/main/gate/jape/PatternElement.java 2014-03-08 16:30:42 UTC
(rev 17599)
@@ -17,6 +17,7 @@
package gate.jape;
+import java.io.Serializable;
import java.util.Stack;
@@ -27,10 +28,9 @@
* multilevel rollback of those caches. Stores the match history.
*/
abstract public class PatternElement implements Cloneable,
- JapeConstants, java.io.Serializable
+ JapeConstants, Serializable
{
- /** Debug flag */
- private static final boolean DEBUG = false;
+ private static final long serialVersionUID = -3721781489731606247L;
/** Match history stack, for use in rollback. In BasicPatternElements
* the objects on the stack are Integers giving the number of annots that
@@ -40,11 +40,11 @@
* elements are arrays representing conjunctions of PatternElement that
* succeeded at that point in the history.
*/
- protected Stack matchHistory;
+ protected Stack<Object> matchHistory;
/** Anonymous construction. */
public PatternElement() {
- matchHistory = new Stack();
+ matchHistory = new Stack<Object>();
} // Anonymous constructor.
/** Cloning for processing of macro references. Note that it doesn't
@@ -57,7 +57,7 @@
public Object clone() {
try {
PatternElement newPE = (PatternElement) super.clone();
- newPE.matchHistory = new Stack();
+ newPE.matchHistory = new Stack<Object>();
return newPE;
} catch(CloneNotSupportedException e) {
throw(new InternalError(e.toString()));
Modified: gate/trunk/src/main/gate/jape/RightHandSide.java
===================================================================
--- gate/trunk/src/main/gate/jape/RightHandSide.java 2014-03-08 16:25:35 UTC
(rev 17598)
+++ gate/trunk/src/main/gate/jape/RightHandSide.java 2014-03-08 16:30:42 UTC
(rev 17599)
@@ -30,6 +30,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
@@ -43,9 +44,6 @@
public class RightHandSide implements JapeConstants, java.io.Serializable
{
private static final long serialVersionUID = -4359589687308736378L;
-
- /** Debug flag */
- private static final boolean DEBUG = false;
/** An instance of theActionClass. */
transient private Object theActionObject;
@@ -53,9 +51,6 @@
/** The string we use to create the action class. */
private StringBuffer actionClassString;
- /** The bytes of the compiled action class. */
- private byte[] actionClassBytes;
-
/** The name of the action class. */
private String actionClassName;
@@ -96,7 +91,7 @@
private LeftHandSide lhs;
/** A list of the files and directories we create. */
- static private ArrayList tempFiles = new ArrayList();
+ static private List<File> tempFiles = new ArrayList<File>();
/** Local fashion for newlines. */
private final String nl = Strings.getNl();
@@ -105,8 +100,6 @@
static final boolean debug = false;
private String phaseName;
private String ruleName;
-
- private static Set<StackTraceElement> warnings = new
HashSet<StackTraceElement>();
/** Construction from the transducer name, rule name and the LHS. */
public RightHandSide(
@@ -253,10 +246,10 @@
// traverse the list in reverse order, coz any directories we
// created were done first
- for(ListIterator i = tempFiles.listIterator(tempFiles.size()-1);
+ for(ListIterator<File> i = tempFiles.listIterator(tempFiles.size()-1);
i.hasPrevious();
) {
- File tempFile = (File) i.previous();
+ File tempFile = i.previous();
tempFile.delete();
} // for each tempFile
@@ -268,7 +261,7 @@
out.defaultWriteObject();
//now we need to save the class for the action
try{
- Class class1 =
Gate.getClassLoader().loadClass(actionClassQualifiedName);
+ Class<?> class1 =
Gate.getClassLoader().loadClass(actionClassQualifiedName);
//System.out.println(class1.getName());
out.writeObject(class1);
}catch(ClassNotFoundException cnfe){
Modified: gate/trunk/src/main/gate/jape/Rule.java
===================================================================
--- gate/trunk/src/main/gate/jape/Rule.java 2014-03-08 16:25:35 UTC (rev
17598)
+++ gate/trunk/src/main/gate/jape/Rule.java 2014-03-08 16:30:42 UTC (rev
17599)
@@ -25,12 +25,16 @@
import gate.util.Out;
import gate.util.Strings;
+import java.io.Serializable;
+
/**
* A CPSL rule. Has an LHS, RHS and a name, and a priority.
*/
public class Rule extends Transducer
-implements JapeConstants, java.io.Serializable
+implements JapeConstants, Serializable
{
+ private static final long serialVersionUID = 564304936210127542L;
+
/** Debug flag */
private static final boolean DEBUG = false;
Modified: gate/trunk/src/main/gate/jape/SinglePhaseTransducer.java
===================================================================
--- gate/trunk/src/main/gate/jape/SinglePhaseTransducer.java 2014-03-08
16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/SinglePhaseTransducer.java 2014-03-08
16:30:42 UTC (rev 17599)
@@ -16,28 +16,54 @@
package gate.jape;
-import java.util.*;
-
-import org.apache.log4j.Logger;
-
-import gate.*;
+import gate.Annotation;
+import gate.AnnotationSet;
+import gate.Controller;
+import gate.Corpus;
+import gate.CorpusController;
+import gate.Document;
+import gate.Gate;
+import gate.Node;
import gate.annotation.AnnotationSetImpl;
import gate.creole.ExecutionException;
import gate.creole.ExecutionInterruptedException;
import gate.creole.ontology.Ontology;
import gate.event.ProgressListener;
-import gate.fsm.*;
-import gate.util.*;
+import gate.fsm.FSM;
+import gate.fsm.FSMInstance;
+import gate.fsm.RuleTime;
+import gate.fsm.State;
+import gate.fsm.Transition;
+import gate.util.Benchmark;
+import gate.util.GateClassLoader;
+import gate.util.GateRuntimeException;
+import gate.util.SimpleSortedSet;
+import gate.util.Strings;
+
import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.log4j.Logger;
+
/**
* Represents a complete CPSL grammar, with a phase name, options and
* rule set (accessible by name and by sequence). Implements a transduce
* method taking a Document as input. Constructs from String or File.
*/
public class SinglePhaseTransducer extends Transducer implements JapeConstants,
- java.io.Serializable {
+ Serializable {
private static final long serialVersionUID = -2749474684496896114L;
@@ -186,10 +212,10 @@
// private void addAnnotationsByOffset(Map map, SortedSet keys, Set
// annotations){
private void addAnnotationsByOffset(/* Map map, */SimpleSortedSet keys,
- Set annotations) {
- Iterator annIter = annotations.iterator();
+ Set<Annotation> annotations) {
+ Iterator<Annotation> annIter = annotations.iterator();
while(annIter.hasNext()) {
- Annotation ann = (Annotation)annIter.next();
+ Annotation ann = annIter.next();
// ignore empty annotations
long offset = ann.getStartNode().getOffset().longValue();
if(offset == ann.getEndNode().getOffset().longValue()) continue;
@@ -228,10 +254,10 @@
addAnnotationsByOffset(offsets, inputAS);
}
else {
- Iterator typesIter = input.iterator();
+ Iterator<String> typesIter = input.iterator();
AnnotationSet ofOneType = null;
while(typesIter.hasNext()) {
- ofOneType = inputAS.get((String)typesIter.next());
+ ofOneType = inputAS.get(typesIter.next());
if(ofOneType != null) {
addAnnotationsByOffset(offsets, ofOneType);
}
@@ -259,8 +285,8 @@
List<FSMInstance> acceptingFSMInstances = new LinkedList<FSMInstance>();
// find the first node of the document
- Node startNode = ((Annotation)((List)annotationsByOffset.get(offsets
- .first())).get(0)).getStartNode();
+ Node startNode = ((List<Annotation>)annotationsByOffset.get(offsets
+ .first())).get(0).getStartNode();
// used to calculate the percentage of processing done
long lastNodeOff = doc.getContent().size().longValue();
@@ -396,12 +422,12 @@
.getAGPosition().getOffset().longValue());
long theFirst = offsetsTailSet.first();
List<Annotation> paths = (theFirst >= 0 ) ?
- (List)annotationsByOffset.get(theFirst) : null;
+ (List<Annotation>)annotationsByOffset.get(theFirst) : null;
if(paths != null && !paths.isEmpty()) {
// get the transitions for the current state of the FSM
State currentState = currentClone.getFSMPosition();
- Iterator transitionsIter = currentState.getTransitions().iterator();
+ Iterator<Transition> transitionsIter =
currentState.getTransitions().iterator();
// A flag used to indicate when advancing the current instance requires
// the creation of a clone (i.e. when there are more than 1 ways to
advance).
@@ -411,7 +437,7 @@
// current node (the "paths") that match each constraint of the
// transition.
transitionsWhile: while(transitionsIter.hasNext()) {
- Transition currentTransition = (Transition)transitionsIter.next();
+ Transition currentTransition = transitionsIter.next();
// There will only be multiple constraints if this transition is
// over
@@ -502,7 +528,7 @@
}
List<List<Annotation>> combinations = combine(matchLists, matchLists
- .size(), new LinkedList());
+ .size(), new LinkedList<Annotation>());
// Create a new FSM for every tuple of annot
for(List<Annotation> tuple : combinations) {
@@ -533,14 +559,13 @@
newFSMI.setFSMPosition(currentTransition.getTarget());
// bindings
- java.util.Map binds = newFSMI.getBindings();
- java.util.Iterator labelsIter = currentTransition.getBindings()
- .iterator();
+ Map<String,AnnotationSet> binds = newFSMI.getBindings();
+ Iterator<String> labelsIter =
currentTransition.getBindings().iterator();
String oneLabel;
AnnotationSet boundAnnots, newSet;
while(labelsIter.hasNext()) {
- oneLabel = (String)labelsIter.next();
- boundAnnots = (AnnotationSet)binds.get(oneLabel);
+ oneLabel = labelsIter.next();
+ boundAnnots = binds.get(oneLabel);
if(boundAnnots != null)
newSet = new AnnotationSetImpl(boundAnnots);
else newSet = new AnnotationSetImpl(document);
@@ -616,7 +641,7 @@
// use for loop instead of ListIterator to increase speed
// (critical here)
for(int i = 0; i < currentSourceList.size(); i++) {
- List<Annotation> augmentedTuple =
(List<Annotation>)((LinkedList<Annotation>)incompleteTuple).clone();
+ List<Annotation> augmentedTuple = new
LinkedList<Annotation>(incompleteTuple);
augmentedTuple.add(currentSourceList.get(i));
newTupleList.addAll(combine(sourceLists, maxTupleSize,
augmentedTuple));
}
@@ -785,8 +810,8 @@
fireProcessFinished();
} else {
long nextKey = theFirst;
- startNode = ((Annotation)((List)annotationsByOffset.get(nextKey))
- .get(0)). // nextKey
+ startNode = ((List<Annotation>)annotationsByOffset.get(nextKey))
+ .get(0). // nextKey
getStartNode();
startNodeOff = startNode.getOffset().longValue();
@@ -803,8 +828,8 @@
}
else {
nextKey = theFirst;
- startNode = ((Annotation)((List)annotationsByOffset.get(theFirst))
- .get(0)).getStartNode();
+ startNode = ((List<Annotation>)annotationsByOffset.get(theFirst))
+ .get(0).getStartNode();
startNodeOff = startNode.getOffset().longValue();
}
}// if(oldStartNodeOff == startNodeOff)
@@ -868,9 +893,9 @@
buf.append("rules(" + newline);
if(rules != null) {
- Iterator rulesIterator = rules.iterator();
+ Iterator<Rule> rulesIterator = rules.iterator();
while(rulesIterator.hasNext())
- buf.append(((Rule)rulesIterator.next()).toString(newPad) + " ");
+ buf.append(rulesIterator.next().toString(newPad) + " ");
}
buf.append(newline + pad + ")." + newline);
@@ -920,7 +945,8 @@
@Override
public synchronized void removeProgressListener(ProgressListener l) {
if(progressListeners != null && progressListeners.contains(l)) {
- Vector v = (Vector)progressListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<ProgressListener> v =
(Vector<ProgressListener>)progressListeners.clone();
v.removeElement(l);
progressListeners = v;
}
@@ -928,9 +954,10 @@
@Override
public synchronized void addProgressListener(ProgressListener l) {
- Vector v = progressListeners == null
- ? new Vector(2)
- : (Vector)progressListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<ProgressListener> v = progressListeners == null
+ ? new Vector<ProgressListener>(2)
+ : (Vector<ProgressListener>)progressListeners.clone();
if(!v.contains(l)) {
v.addElement(l);
progressListeners = v;
@@ -944,19 +971,19 @@
* list ignoring all other types of annotations.
*/
// by Shafirin Andrey start (modifier changed to public)
- public java.util.Set input = new java.util.HashSet();
+ public Set<String> input = new HashSet<String>();
// java.util.Set input = new java.util.HashSet();
// by Shafirin Andrey end
- private transient Vector progressListeners;
+ private transient Vector<ProgressListener> progressListeners;
@Override
protected void fireProgressChanged(int e) {
if(progressListeners != null) {
- Vector listeners = progressListeners;
+ Vector<ProgressListener> listeners = progressListeners;
int count = listeners.size();
for(int i = 0; i < count; i++) {
- ((ProgressListener)listeners.elementAt(i)).progressChanged(e);
+ listeners.elementAt(i).progressChanged(e);
}
}
}
@@ -964,10 +991,10 @@
@Override
protected void fireProcessFinished() {
if(progressListeners != null) {
- Vector listeners = progressListeners;
+ Vector<ProgressListener> listeners = progressListeners;
int count = listeners.size();
for(int i = 0; i < count; i++) {
- ((ProgressListener)listeners.elementAt(i)).processFinished();
+ listeners.elementAt(i).processFinished();
}
}
}
Modified: gate/trunk/src/main/gate/jape/Transducer.java
===================================================================
--- gate/trunk/src/main/gate/jape/Transducer.java 2014-03-08 16:25:35 UTC
(rev 17598)
+++ gate/trunk/src/main/gate/jape/Transducer.java 2014-03-08 16:30:42 UTC
(rev 17599)
@@ -39,8 +39,7 @@
*/
public abstract class Transducer implements Serializable, Benchmarkable
{
- /** Debug flag */
- private static final boolean DEBUG = false;
+ private static final long serialVersionUID = -5607520609825899179L;
/** Name of this transducer. */
protected String name;
@@ -125,13 +124,15 @@
}
public synchronized void removeProgressListener(ProgressListener l) {
if (progressListeners != null && progressListeners.contains(l)) {
- Vector v = (Vector) progressListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<ProgressListener> v = (Vector<ProgressListener>)
progressListeners.clone();
v.removeElement(l);
progressListeners = v;
}
}
public synchronized void addProgressListener(ProgressListener l) {
- Vector v = progressListeners == null ? new Vector(2) : (Vector)
progressListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<ProgressListener> v = progressListeners == null ? new
Vector<ProgressListener>(2) :
(Vector<ProgressListener>)progressListeners.clone();
if (!v.contains(l)) {
v.addElement(l);
progressListeners = v;
@@ -171,8 +172,8 @@
private URL baseURL;
- private transient Vector progressListeners;
- private transient Vector statusListeners;
+ private transient Vector<ProgressListener> progressListeners;
+ private transient Vector<StatusListener> statusListeners;
/**
* Switch used to activate the JAPE debugger
@@ -186,31 +187,33 @@
*/
protected void fireProgressChanged(int e) {
if (progressListeners != null && !progressListeners.isEmpty()) {
- Vector listeners = progressListeners;
+ Vector<ProgressListener> listeners = progressListeners;
int count = listeners.size();
for (int i = 0; i < count; i++) {
- ((ProgressListener) listeners.elementAt(i)).progressChanged(e);
+ listeners.elementAt(i).progressChanged(e);
}
}
}
protected void fireProcessFinished() {
if (progressListeners != null) {
- Vector listeners = progressListeners;
+ Vector<ProgressListener> listeners = progressListeners;
int count = listeners.size();
for (int i = 0; i < count; i++) {
- ((ProgressListener) listeners.elementAt(i)).processFinished();
+ listeners.elementAt(i).processFinished();
}
}
}
public synchronized void removeStatusListener(StatusListener l) {
if (statusListeners != null && statusListeners.contains(l)) {
- Vector v = (Vector) statusListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<StatusListener> v =
(Vector<StatusListener>)statusListeners.clone();
v.removeElement(l);
statusListeners = v;
}
}
public synchronized void addStatusListener(StatusListener l) {
- Vector v = statusListeners == null ? new Vector(2) : (Vector)
statusListeners.clone();
+ @SuppressWarnings("unchecked")
+ Vector<StatusListener> v = statusListeners == null ? new
Vector<StatusListener>(2) : (Vector<StatusListener>) statusListeners.clone();
if (!v.contains(l)) {
v.addElement(l);
statusListeners = v;
@@ -218,10 +221,10 @@
}
protected void fireStatusChanged(String e) {
if (statusListeners != null) {
- Vector listeners = statusListeners;
+ Vector<StatusListener> listeners = statusListeners;
int count = listeners.size();
for (int i = 0; i < count; i++) {
- ((StatusListener) listeners.elementAt(i)).statusChanged(e);
+ listeners.elementAt(i).statusChanged(e);
}
}
}
Modified:
gate/trunk/src/main/gate/jape/constraint/AbstractConstraintPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/AbstractConstraintPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/AbstractConstraintPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -15,18 +15,21 @@
*/
package gate.jape.constraint;
-import gate.*;
+import gate.Annotation;
+import gate.AnnotationSet;
import gate.jape.JapeException;
/**
* Base class for most {@link ConstraintPredicate}s. Contains standard
* getters/setters and other routines.
*
- * @version $Revision$
* @author esword
*/
public abstract class AbstractConstraintPredicate implements
ConstraintPredicate {
+
+ private static final long serialVersionUID = -4564142595796620686L;
+
protected AnnotationAccessor accessor;
protected Object value;
Modified: gate/trunk/src/main/gate/jape/constraint/AbstractRegExpPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/AbstractRegExpPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/AbstractRegExpPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -34,6 +34,8 @@
extends
AbstractConstraintPredicate {
+ private static final long serialVersionUID = 8218973149540251171L;
+
@Override
public String toString() {
String val = ((Pattern)getValue()).pattern();
Modified: gate/trunk/src/main/gate/jape/constraint/AnnotationAccessor.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/AnnotationAccessor.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/AnnotationAccessor.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -15,7 +15,9 @@
*/
package gate.jape.constraint;
-import gate.*;
+import gate.Annotation;
+import gate.AnnotationSet;
+import gate.Document;
import java.io.Serializable;
@@ -25,7 +27,6 @@
* length of text it spans or the text itself if the associated document
* is available).
*
- * @version $Revision$
* @author esword
*/
public interface AnnotationAccessor extends Serializable {
Modified:
gate/trunk/src/main/gate/jape/constraint/AnnotationFeatureAccessor.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/AnnotationFeatureAccessor.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/AnnotationFeatureAccessor.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -21,11 +21,12 @@
/**
* Accessor that returns a named feature value.
*
- * @version $Revision$
* @author esword
*/
public class AnnotationFeatureAccessor implements AnnotationAccessor {
+ private static final long serialVersionUID = 9118181222280392932L;
+
protected String featureName;
public AnnotationFeatureAccessor() {
Modified: gate/trunk/src/main/gate/jape/constraint/CleanStringAccessor.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/CleanStringAccessor.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/CleanStringAccessor.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -13,19 +13,23 @@
*/
package gate.jape.constraint;
-import gate.*;
+import gate.Annotation;
+import gate.AnnotationSet;
+import gate.Document;
+import gate.Utils;
/**
- * Accessor that returns the underlying string of an annotation in a document.
- * The string is cleaned up a bit as follows:
- * <code>
+ * Accessor that returns the underlying string of an annotation in a
+ * document. The string is cleaned up a bit as follows: <code>
* cleanString = string.replaceAll("\\s+", " ").trim();
* </code>
- *
- * @version $Revision$
+ *
* @author esword
*/
public class CleanStringAccessor extends StringAccessor {
+
+ private static final long serialVersionUID = -4213321436300709066L;
+
/**
* Return the cleaned up underlying string for the annotation. Context
* must be a {@link Document} or an {@link AnnotationSet} which points
@@ -37,8 +41,8 @@
}
/**
- * Always returns "cleanString", the name of the meta-property which this
- * accessor provides.
+ * Always returns "cleanString", the name of the meta-property which
+ * this accessor provides.
*/
@Override
public Object getKey() {
Modified: gate/trunk/src/main/gate/jape/constraint/ComparablePredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/ComparablePredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/ComparablePredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -22,11 +22,13 @@
* Base class for those predicates which use <code>compareTo</code> to
* compare values.
*
- * @version $Revision$
* @author esword
*/
-@SuppressWarnings("unchecked")
+@SuppressWarnings({"unchecked","rawtypes"})
public abstract class ComparablePredicate extends AbstractConstraintPredicate {
+
+ private static final long serialVersionUID = -5667456294601338967L;
+
protected Comparable comparableValue;
/**
Modified: gate/trunk/src/main/gate/jape/constraint/ContainsPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/ContainsPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/ContainsPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -25,6 +25,8 @@
*/
public class ContainsPredicate extends EmbeddedConstraintPredicate {
+ private static final long serialVersionUID = 2129108867232668824L;
+
public static final String OPERATOR = "contains";
@Override
Modified:
gate/trunk/src/main/gate/jape/constraint/EmbeddedConstraintPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/EmbeddedConstraintPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/EmbeddedConstraintPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -27,11 +27,12 @@
* Predicate whose {@link #getValue()} property may be set to a
* Constraint itself, allowing for recursive evaluations.
*
- * @version $Revision$
* @author esword
*/
public abstract class EmbeddedConstraintPredicate extends
AbstractConstraintPredicate {
+ private static final long serialVersionUID = 7472456256804424432L;
+
protected Constraint valueConstraint;
protected String annotType;
Modified: gate/trunk/src/main/gate/jape/constraint/EqualPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/EqualPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/EqualPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -20,6 +20,8 @@
public class EqualPredicate extends AbstractConstraintPredicate {
+ private static final long serialVersionUID = 3833632644179230280L;
+
@Override
public String getOperator() {
return EQUAL;
Modified: gate/trunk/src/main/gate/jape/constraint/GreaterEqualPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/GreaterEqualPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/GreaterEqualPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -19,6 +19,8 @@
public class GreaterEqualPredicate extends ComparablePredicate {
+ private static final long serialVersionUID = 727305593922603191L;
+
@Override
public String getOperator() {
return GREATER_OR_EQUAL;
Modified: gate/trunk/src/main/gate/jape/constraint/GreaterPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/GreaterPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/GreaterPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -19,6 +19,8 @@
public class GreaterPredicate extends ComparablePredicate {
+ private static final long serialVersionUID = 3494482770043124864L;
+
@Override
public String getOperator() {
return GREATER;
Modified: gate/trunk/src/main/gate/jape/constraint/LengthAccessor.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/LengthAccessor.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/LengthAccessor.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -24,6 +24,8 @@
*/
public class LengthAccessor extends MetaPropertyAccessor {
+ private static final long serialVersionUID = -7632284854801892163L;
+
/**
* Return the length of the span of the annotation.
*/
Modified: gate/trunk/src/main/gate/jape/constraint/LesserEqualPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/LesserEqualPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/LesserEqualPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -19,6 +19,8 @@
public class LesserEqualPredicate extends ComparablePredicate {
+ private static final long serialVersionUID = 4844219899117114197L;
+
@Override
public String getOperator() {
return LESSER_OR_EQUAL;
Modified: gate/trunk/src/main/gate/jape/constraint/LesserPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/LesserPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/LesserPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -19,6 +19,8 @@
public class LesserPredicate extends ComparablePredicate {
+ private static final long serialVersionUID = 7526887952184973246L;
+
@Override
public String getOperator() {
return LESSER;
Modified: gate/trunk/src/main/gate/jape/constraint/MetaPropertyAccessor.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/MetaPropertyAccessor.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/MetaPropertyAccessor.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -20,10 +20,12 @@
* Accessor which returns a particular property or meta-property of an
* annotation, such as length or string.
*
- * @version $Revision$
* @author esword
*/
public abstract class MetaPropertyAccessor implements AnnotationAccessor {
+
+ private static final long serialVersionUID = 2736859945392088458L;
+
protected static final Logger log =
Logger.getLogger(MetaPropertyAccessor.class);
public MetaPropertyAccessor() {
Modified: gate/trunk/src/main/gate/jape/constraint/NotContainsPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/NotContainsPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/NotContainsPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -25,6 +25,8 @@
*/
public class NotContainsPredicate extends ContainsPredicate {
+ private static final long serialVersionUID = -6988665289497332784L;
+
public static final String OPERATOR = "notContains";
@Override
Modified: gate/trunk/src/main/gate/jape/constraint/NotEqualPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/NotEqualPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/NotEqualPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -20,6 +20,8 @@
public class NotEqualPredicate extends EqualPredicate {
+ private static final long serialVersionUID = 4065258361559210239L;
+
@Override
public String getOperator() {
return NOT_EQUAL;
Modified: gate/trunk/src/main/gate/jape/constraint/NotRegExpFindPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/NotRegExpFindPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/NotRegExpFindPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -24,6 +24,8 @@
*/
public class NotRegExpFindPredicate extends AbstractRegExpPredicate {
+ private static final long serialVersionUID = -2958686314966008138L;
+
@Override
public String getOperator() {
return NOT_REGEXP_FIND;
Modified: gate/trunk/src/main/gate/jape/constraint/NotRegExpMatchPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/NotRegExpMatchPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/NotRegExpMatchPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -24,6 +24,8 @@
*/
public class NotRegExpMatchPredicate extends AbstractRegExpPredicate {
+ private static final long serialVersionUID = -9202060612128234805L;
+
@Override
protected boolean matcherResult(Matcher m) {
return !m.matches();
Modified: gate/trunk/src/main/gate/jape/constraint/NotWithinPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/NotWithinPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/NotWithinPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -27,8 +27,10 @@
*/
public class NotWithinPredicate extends WithinPredicate {
- public static final String OPERATOR = "notWithin";
+ private static final long serialVersionUID = 4478339733567901830L;
+ public static final String OPERATOR = "notWithin";
+
@Override
public String getOperator() {
return OPERATOR;
Modified: gate/trunk/src/main/gate/jape/constraint/RegExpFindPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/RegExpFindPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/RegExpFindPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -24,6 +24,8 @@
*/
public class RegExpFindPredicate extends AbstractRegExpPredicate {
+ private static final long serialVersionUID = -5086396660307583088L;
+
@Override
protected boolean matcherResult(Matcher m) {
return m.find();
Modified: gate/trunk/src/main/gate/jape/constraint/RegExpMatchPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/RegExpMatchPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/RegExpMatchPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -24,6 +24,8 @@
*/
public class RegExpMatchPredicate extends AbstractRegExpPredicate {
+ private static final long serialVersionUID = -8817259881078665699L;
+
@Override
protected boolean matcherResult(Matcher m) {
return m.matches();
Modified: gate/trunk/src/main/gate/jape/constraint/SimpleAnnotationAccessor.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/SimpleAnnotationAccessor.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/SimpleAnnotationAccessor.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -13,16 +13,18 @@
*/
package gate.jape.constraint;
-import gate.*;
+import gate.Annotation;
+import gate.AnnotationSet;
/**
* Accessor that returns the annotation itself
*
- * @version $Revision$
* @author esword
*/
public class SimpleAnnotationAccessor extends MetaPropertyAccessor {
+ private static final long serialVersionUID = 5875035087239642161L;
+
@Override
public Object getValue(Annotation annot, AnnotationSet context) {
return annot;
Modified: gate/trunk/src/main/gate/jape/constraint/StringAccessor.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/StringAccessor.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/StringAccessor.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -22,6 +22,9 @@
* @author esword
*/
public class StringAccessor extends MetaPropertyAccessor {
+
+ private static final long serialVersionUID = 2694222663341694646L;
+
/**
* Return the underlying string for the annotation. Context
* must be a {@link Document} or an {@link AnnotationSet} which
Modified: gate/trunk/src/main/gate/jape/constraint/WithinPredicate.java
===================================================================
--- gate/trunk/src/main/gate/jape/constraint/WithinPredicate.java
2014-03-08 16:25:35 UTC (rev 17598)
+++ gate/trunk/src/main/gate/jape/constraint/WithinPredicate.java
2014-03-08 16:30:42 UTC (rev 17599)
@@ -25,6 +25,8 @@
*/
public class WithinPredicate extends EmbeddedConstraintPredicate {
+ private static final long serialVersionUID = -7174064590321365180L;
+
public static final String OPERATOR = "within";
@Override
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
