Revision: 17673
          http://sourceforge.net/p/gate/code/17673
Author:   markagreenwood
Date:     2014-03-15 10:22:11 +0000 (Sat, 15 Mar 2014)
Log Message:
-----------
and that's all the I* and J* plugins cleaned up and the compiler warnings 
enabled

Modified Paths:
--------------
    gate/trunk/plugins/Inter_Annotator_Agreement/build.xml
    
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/ContingencyTable.java
    
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/FMeasure.java
    gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/IaaMain.java
    
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/test/TestIaa.java
    gate/trunk/plugins/JAPE_Plus/build.xml
    gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/FSMPDA.java
    gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/StatePDA.java
    gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/TransitionPDA.java
    gate/trunk/plugins/JAPE_Plus/src/gate/gui/jape/plus/Viewer.java
    gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Predicate.java
    gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/SPTBase.java
    gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/SPTBuilder.java
    gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Transducer.java

Modified: gate/trunk/plugins/Inter_Annotator_Agreement/build.xml
===================================================================
--- gate/trunk/plugins/Inter_Annotator_Agreement/build.xml      2014-03-15 
10:06:34 UTC (rev 17672)
+++ gate/trunk/plugins/Inter_Annotator_Agreement/build.xml      2014-03-15 
10:22:11 UTC (rev 17673)
@@ -57,6 +57,7 @@
 
        <property name="gate.jar" location="${gate.home}/bin/gate.jar" />
        <property name="gate.lib.dir" location="${gate.home}/lib" />
+       <property name="gate.compile.maxwarnings" value="10000" />
 
        <fileset id="gate.libs" dir="${gate.lib.dir}">
                <include name="*.jar" />
@@ -84,7 +85,11 @@
        <!-- This target compiles all the classes -->
        <target name="compile" description="compile the source " 
depends="prepare">
                <!-- Compile the java code from ${srcDir} into ${buildDir} -->
-               <javac srcdir="${srcDir}" destdir="${buildDir}" source="1.5" 
target="1.5" encoding="UTF-8" debug="true" debuglevel="lines,source" 
classpathref="build.class.path" />
+               <javac srcdir="${srcDir}" destdir="${buildDir}" source="1.6" 
target="1.6" encoding="UTF-8" debug="true" debuglevel="lines,source" 
classpathref="build.class.path">
+                       <compilerarg value="-Xmaxwarns" />
+                       <compilerarg value="${gate.compile.maxwarnings}" />
+                       <compilerarg value="-Xlint:all" />
+               </javac>
        </target>
 
        <target name="jar" depends="compile">

Modified: 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/ContingencyTable.java
===================================================================
--- 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/ContingencyTable.java
       2014-03-15 10:06:34 UTC (rev 17672)
+++ 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/ContingencyTable.java
       2014-03-15 10:22:11 UTC (rev 17673)
@@ -162,7 +162,7 @@
         term2 += (assignmentMatrix[i][j] - pc[i])
           * (assignmentMatrix[i][j] - pc[i]);
     if(numInstances > 0 && numJudges > 1 && (term1 > 0 || term2 > 0))
-      kappaDF = 1 - (float)(numInstances * numJudges * numJudges - ySum)
+      kappaDF = 1f - (numInstances * numJudges * numJudges - ySum)
         / (numInstances * (numJudges * (numJudges - 1) * term1 + term2));
     else kappaDF = 0;
     // Compute the observed agreement and the S&C kappa

Modified: 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/FMeasure.java
===================================================================
--- 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/FMeasure.java   
    2014-03-15 10:06:34 UTC (rev 17672)
+++ 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/FMeasure.java   
    2014-03-15 10:22:11 UTC (rev 17673)
@@ -82,10 +82,10 @@
     }
     if((keySize) == 0)
       precision = 0;
-    else precision = (float)correct / keySize;
+    else precision = correct / keySize;
     if((resSize) == 0)
       recall = 0;
-    else recall = (float)correct / resSize;
+    else recall = correct / resSize;
     if((precision + recall) == 0)
       f1 = 0;
     else f1 = 2 * precision * recall / (precision + recall);
@@ -102,10 +102,10 @@
     }
     if((keySize) == 0)
       precisionLenient = 0;
-    else precisionLenient = (float)(correct + partialCor) / keySize;
+    else precisionLenient = (correct + partialCor) / keySize;
     if((resSize) == 0)
       recallLenient = 0;
-    else recallLenient = (float)(correct + partialCor) / resSize;
+    else recallLenient = (correct + partialCor) / resSize;
     if((precisionLenient + recallLenient) == 0)
       f1Lenient = 0;
     else f1Lenient =

Modified: 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/IaaMain.java
===================================================================
--- 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/IaaMain.java    
    2014-03-15 10:06:34 UTC (rev 17672)
+++ 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/IaaMain.java    
    2014-03-15 10:22:11 UTC (rev 17673)
@@ -7,6 +7,14 @@
  */
 package gate.iaaplugin;
 
+import gate.Annotation;
+import gate.AnnotationSet;
+import gate.ProcessingResource;
+import gate.creole.AbstractLanguageAnalyser;
+import gate.creole.ExecutionException;
+import gate.creole.ResourceInstantiationException;
+import gate.util.AnnotationDiffer;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,16 +32,6 @@
 import java.util.Set;
 import java.util.Vector;
 
-import gate.Annotation;
-import gate.AnnotationSet;
-import gate.Factory;
-import gate.FeatureMap;
-import gate.ProcessingResource;
-import gate.creole.AbstractLanguageAnalyser;
-import gate.creole.ExecutionException;
-import gate.creole.ResourceInstantiationException;
-import gate.util.AnnotationDiffer;
-
 // import gate.util.FMeasure;
 // import gate.util.IaaCalculation;
 /**
@@ -43,6 +41,9 @@
  */
 public class IaaMain extends AbstractLanguageAnalyser implements
                                                      ProcessingResource {
+
+  private static final long serialVersionUID = 6987588770277158507L;
+
   /** Annotation sets for merging in one document. */
   private String annSetsForIaa;
 
@@ -194,7 +195,7 @@
     boolean isAvailabelAllAnnSets = true;
     // Get the annotation sets for computing the IAA
     // Get all the existing annotation sets from the current document
-    Set annsExisting = document.getAnnotationSetNames();
+    Set<String> annsExisting = document.getAnnotationSetNames();
     String[] annsArray = null;
     if(annSetsForIaa == null || annSetsForIaa.trim().length() == 0) {
       // if there is no annotation specified, compare all the annotation
@@ -235,8 +236,8 @@
       // If not specify the annotation type and features, use
       // all the types but no feature.
       for(int i = 0; i < numAnns; ++i) {
-        Set types = document.getAnnotations(annsArray[i]).getAllTypes();
-        for(Object obj : types)
+        Set<String> types = 
document.getAnnotations(annsArray[i]).getAllTypes();
+        for(String obj : types)
           if(!annsTypes.containsKey(obj)) annsTypes.put(obj.toString(), "");
       }
     }
@@ -456,7 +457,7 @@
 
   private void printOverallResultsFmeasure(Vector<String> typeNames,
           String[] annsArray) {
-    ArrayList<String> keyList = new ArrayList(fMeasuresPairwiseLabel.keySet());
+    List<String> keyList = new 
ArrayList<String>(fMeasuresPairwiseLabel.keySet());
     Collections.sort(keyList);
     int numDoc = corpus.size();
     numDoc -= numDocNotCounted;
@@ -569,8 +570,8 @@
 
   private void printOverallResultsFmeasureBDM(Vector<String> typeNames,
           String[] annsArray) {
-    ArrayList<String> keyList =
-            new ArrayList(fMeasuresPairwiseLabelBDM.keySet());
+    List<String> keyList =
+            new ArrayList<String>(fMeasuresPairwiseLabelBDM.keySet());
     Collections.sort(keyList);
     int numDoc = corpus.size();
     numDoc -= numDocNotCounted;

Modified: 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/test/TestIaa.java
===================================================================
--- 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/test/TestIaa.java
   2014-03-15 10:06:34 UTC (rev 17672)
+++ 
gate/trunk/plugins/Inter_Annotator_Agreement/src/gate/iaaplugin/test/TestIaa.java
   2014-03-15 10:22:11 UTC (rev 17673)
@@ -123,7 +123,7 @@
     AnnotationSet[][] annArr2 = new AnnotationSet[numDocs][numJudges];
    
     for(int i = 0; i < numDocs; ++i) {
-      Document doc = (Document)data.get(i);
+      Document doc = data.get(i);
       for(int j=0; j<numJudges; ++j) {
         // Get the annotation
         annArr2[i][j] = doc.getAnnotations(annSetsN[j]).get(nameAnnType);
@@ -147,10 +147,10 @@
 
     iaa.pairwiseIaaFmeasure();
     int[] nPwF = new int[4];
-    nPwF[0] = (int)Math.ceil((double)iaa.fMeasureOverall.correct);
-    nPwF[1] = (int)Math.ceil((double)iaa.fMeasureOverall.partialCor);
-    nPwF[2] = (int)Math.ceil((double)iaa.fMeasureOverall.spurious);
-    nPwF[3] = (int)Math.ceil((double)iaa.fMeasureOverall.missing);
+    nPwF[0] = (int)Math.ceil(iaa.fMeasureOverall.correct);
+    nPwF[1] = (int)Math.ceil(iaa.fMeasureOverall.partialCor);
+    nPwF[2] = (int)Math.ceil(iaa.fMeasureOverall.spurious);
+    nPwF[3] = (int)Math.ceil(iaa.fMeasureOverall.missing);
 
     boolean isSuitable = true;
     for(int i = 0; i < annArr2.length; ++i)
@@ -165,7 +165,7 @@
     for(int i = 0; i < annArr2.length; ++i)
       isMerged[i] = false;
     for(int iJ = 0; iJ < annArr2.length; ++iJ) {
-      Document docC = (Document)data.get(iJ);
+      Document docC = data.get(iJ);
       HashMap<Annotation, String> mergeInfor = new HashMap<Annotation, 
String>();
       AnnotationMerging.mergeAnnotation(annArr2[iJ], nameAnnFeat, mergeInfor, 
2, isSuitable);
       AnnotationSet annsDoc = docC.getAnnotations("mergedAnns");
@@ -187,15 +187,15 @@
     iaa.allwayIaaFmeasure(refAnnsArr);
     //  remove the reference annotations created
     for(int iJ = 0; iJ < numDocs; ++iJ) {
-      Document docC = (Document)data.get(iJ);
+      Document docC = data.get(iJ);
       docC.removeAnnotationSet("mergedAnns");
     }
     
     int[] nAwF = new int[4];
-    nAwF[0] = (int)Math.ceil((double)iaa.fMeasureOverall.correct);
-    nAwF[1] = (int)Math.ceil((double)iaa.fMeasureOverall.partialCor);
-    nAwF[2] = (int)Math.ceil((double)iaa.fMeasureOverall.spurious);
-    nAwF[3] = (int)Math.ceil((double)iaa.fMeasureOverall.missing);
+    nAwF[0] = (int)Math.ceil(iaa.fMeasureOverall.correct);
+    nAwF[1] = (int)Math.ceil(iaa.fMeasureOverall.partialCor);
+    nAwF[2] = (int)Math.ceil(iaa.fMeasureOverall.spurious);
+    nAwF[3] = (int)Math.ceil(iaa.fMeasureOverall.missing);
 
     // Compute the kappa
     iaa.pairwiseIaaKappa();

Modified: gate/trunk/plugins/JAPE_Plus/build.xml
===================================================================
--- gate/trunk/plugins/JAPE_Plus/build.xml      2014-03-15 10:06:34 UTC (rev 
17672)
+++ gate/trunk/plugins/JAPE_Plus/build.xml      2014-03-15 10:22:11 UTC (rev 
17673)
@@ -23,6 +23,7 @@
        <property name="doc.dir" location="doc" />
   <property name="javadoc.dir" location="${doc.dir}/javadoc" />
   <property name="jar.location" location="jape-plus.jar" />
+  <property name="gate.compile.maxwarnings" value="10000" />
 
   <!-- Path to compile - includes gate.jar and GATE/lib/*.jar -->
   <path id="compile.classpath">
@@ -47,7 +48,11 @@
            debug="true"
            debuglevel="lines,source"
            encoding="UTF-8"
-           source="1.5" target="1.5" />
+           source="1.6" target="1.6">
+               <compilerarg value="-Xmaxwarns" />
+               <compilerarg value="${gate.compile.maxwarnings}" />
+               <compilerarg value="-Xlint:all" />
+    </javac>
   </target>
 
   <!-- create the JAR file -->

Modified: gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/FSMPDA.java
===================================================================
--- gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/FSMPDA.java  
2014-03-15 10:06:34 UTC (rev 17672)
+++ gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/FSMPDA.java  
2014-03-15 10:22:11 UTC (rev 17673)
@@ -40,7 +40,10 @@
 import com.ontotext.jape.automaton.TripleTransitions;
 
 public class FSMPDA extends FSM {
-       private transient ClosedHashOfStrings setOfBindingNames;
+       
+  private static final long serialVersionUID = 5672459102751022260L;
+  
+  private transient ClosedHashOfStrings setOfBindingNames;
        private transient TripleTransitions tripleTransitions;
        private String[] arrayOfBindingNames;
        private StatePDA initialState;
@@ -67,10 +70,10 @@
 
        @Override
        protected void addRules(PrioritisedRuleList rules) {
-               Iterator rulesEnum = rules.iterator();
+               Iterator<Rule> rulesEnum = rules.iterator();
 
                while (rulesEnum.hasNext()) {
-                       FSMPDA ruleFSM = spawn((Rule) rulesEnum.next());
+                       FSMPDA ruleFSM = spawn(rulesEnum.next());
                        initialState.addTransition(new TransitionPDA(null, 
ruleFSM.initialState), tripleTransitions);
                }
                arrayOfBindingNames = setOfBindingNames.getCopyOfStrings();

Modified: gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/StatePDA.java
===================================================================
--- gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/StatePDA.java        
2014-03-15 10:06:34 UTC (rev 17672)
+++ gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/StatePDA.java        
2014-03-15 10:22:11 UTC (rev 17673)
@@ -19,7 +19,10 @@
 import com.ontotext.jape.automaton.TripleTransitions;
 
 public class StatePDA extends State {
-       public void setAction(RightHandSide rhs, TripleTransitions 
tripleTransitions) {
+
+  private static final long serialVersionUID = 2995079945805849819L;
+
+  public void setAction(RightHandSide rhs, TripleTransitions 
tripleTransitions) {
                action = rhs;
                isFinal = (action != null);
                if (tripleTransitions != null) {

Modified: 
gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/TransitionPDA.java
===================================================================
--- gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/TransitionPDA.java   
2014-03-15 10:06:34 UTC (rev 17672)
+++ gate/trunk/plugins/JAPE_Plus/src/com/ontotext/jape/pda/TransitionPDA.java   
2014-03-15 10:22:11 UTC (rev 17673)
@@ -17,7 +17,10 @@
 import gate.jape.BasicPatternElement;
 
 public class TransitionPDA extends Transition {
-       public TransitionPDA() {
+
+  private static final long serialVersionUID = 1666743948471929109L;
+
+  public TransitionPDA() {
                super();
        }
 

Modified: gate/trunk/plugins/JAPE_Plus/src/gate/gui/jape/plus/Viewer.java
===================================================================
--- gate/trunk/plugins/JAPE_Plus/src/gate/gui/jape/plus/Viewer.java     
2014-03-15 10:06:34 UTC (rev 17672)
+++ gate/trunk/plugins/JAPE_Plus/src/gate/gui/jape/plus/Viewer.java     
2014-03-15 10:22:11 UTC (rev 17673)
@@ -6,6 +6,8 @@
 
 @CreoleResource(name = "JAPE-Plus Viewer", comment = "A JAPE grammar file 
viewer", resourceDisplayed = "gate.jape.plus.Transducer", mainViewer = true, 
helpURL = "http://gate.ac.uk/userguide/chap:jape";, guiType = GuiType.LARGE)
 public class Viewer extends JapeViewer {
+
+  private static final long serialVersionUID = -5950038358004951578L;
   // an empty file to allow the same VR to be used for two different PRs 
without
   // a common superclass
 }
\ No newline at end of file

Modified: gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Predicate.java
===================================================================
--- gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Predicate.java      
2014-03-15 10:06:34 UTC (rev 17672)
+++ gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Predicate.java      
2014-03-15 10:22:11 UTC (rev 17673)
@@ -26,6 +26,8 @@
  */
 public class Predicate implements Serializable{
 
+  private static final long serialVersionUID = 915414429992023708L;
+
   public static enum PredicateType {
     EQ,
     NOT_EQ,

Modified: gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/SPTBase.java
===================================================================
--- gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/SPTBase.java        
2014-03-15 10:06:34 UTC (rev 17672)
+++ gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/SPTBase.java        
2014-03-15 10:22:11 UTC (rev 17673)
@@ -14,51 +14,55 @@
  */
 package gate.jape.plus;
 
+import gate.Annotation;
+import gate.AnnotationSet;
+import gate.Controller;
+import gate.Corpus;
+import gate.CorpusController;
+import gate.Factory;
+import gate.FeatureMap;
 import gate.annotation.AnnotationSetImpl;
-import gate.creole.*;
-import gate.creole.ontology.OClass;
-import gate.creole.ontology.OConstants;
-import gate.creole.ontology.OConstants.Closure;
-import gate.creole.ontology.OResource;
+import gate.creole.ANNIEConstants;
+import gate.creole.AbstractLanguageAnalyser;
+import gate.creole.ExecutionException;
+import gate.creole.ExecutionInterruptedException;
+import gate.creole.ResourceInstantiationException;
 import gate.creole.ontology.Ontology;
+import gate.jape.ActionContext;
+import gate.jape.ControllerEventBlocksAction;
+import gate.jape.DefaultActionContext;
 import gate.jape.JapeException;
 import gate.jape.Rule;
-import gate.jape.DefaultActionContext;
-import gate.jape.ActionContext;
-import gate.*;
+import gate.jape.constraint.ConstraintPredicate;
+import gate.jape.plus.Transducer.SinglePhaseTransducerPDA;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.regex.Pattern;
 
 import org.apache.log4j.Logger;
 
-import com.ontotext.jape.pda.TransitionPDA;
-
-import cern.colt.GenericSorting;
 import cern.colt.Sorting;
-import cern.colt.Swapper;
 import cern.colt.bitvector.QuickBitVector;
 import cern.colt.function.IntComparator;
 import cern.colt.list.IntArrayList;
-import gate.jape.ControllerEventBlocksAction;
-import gate.jape.constraint.ConstraintPredicate;
 
+import com.ontotext.jape.pda.TransitionPDA;
+
 /**
  * An optimised implementation for a JAPE single phase transducer.
  */
 public abstract class SPTBase extends AbstractLanguageAnalyser {
 
+  private static final long serialVersionUID = 5250715506654515025L;
+
   protected ActionContext actionContext;
   
   /**
@@ -813,6 +817,7 @@
             predicateId);
   }
 
+  @SuppressWarnings({"rawtypes", "unchecked"})
   protected boolean calculatePredicateValue(int annotationId, int predicateId) 
       throws JapeException {
     Predicate predicate =

Modified: gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/SPTBuilder.java
===================================================================
--- gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/SPTBuilder.java     
2014-03-15 10:06:34 UTC (rev 17672)
+++ gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/SPTBuilder.java     
2014-03-15 10:22:11 UTC (rev 17673)
@@ -15,46 +15,40 @@
 
 package gate.jape.plus;
 
+import gate.creole.ResourceInstantiationException;
+import gate.jape.Constraint;
+import gate.jape.JapeConstants;
+import gate.jape.RightHandSide;
+import gate.jape.Rule;
+import gate.jape.SinglePhaseTransducer;
+import gate.jape.constraint.ConstraintPredicate;
+import gate.jape.constraint.ContainsPredicate;
+import gate.jape.constraint.WithinPredicate;
+import gate.jape.plus.Predicate.PredicateType;
+import gate.jape.plus.SPTBase.MatchMode;
+import gate.jape.plus.SPTBase.State;
+import gate.jape.plus.SPTBase.Transition;
+import gate.jape.plus.Transducer.SPTData;
+import gate.util.GateClassLoader;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
+import cern.colt.list.IntArrayList;
+import cern.colt.map.OpenIntIntHashMap;
+
 import com.ontotext.jape.pda.FSMPDA;
 import com.ontotext.jape.pda.StatePDA;
 import com.ontotext.jape.pda.TransitionPDA;
 
-import cern.colt.list.IntArrayList;
-import cern.colt.map.OpenIntIntHashMap;
-
-import gate.Gate;
-import gate.creole.ResourceInstantiationException;
-import gate.jape.plus.SPTBase.Transition;
-import gate.jape.Constraint;
-import gate.jape.JapeConstants;
-import gate.jape.RightHandSide;
-import gate.jape.Rule;
-import gate.jape.SinglePhaseTransducer;
-import gate.jape.constraint.ConstraintPredicate;
-import gate.jape.constraint.ContainsPredicate;
-import gate.jape.constraint.WithinPredicate;
-import gate.jape.plus.Predicate.PredicateType;
-import gate.jape.plus.SPTBase.MatchMode;
-import gate.jape.plus.SPTBase.State;
-import gate.jape.plus.Transducer.SPTData;
-import gate.util.GateClassLoader;
-import gate.util.GateException;
-import gate.util.Javac;
-
 /**
  * An utility class for converting a default JAPE transducer into a JAPE-Plus 
transducer. 
  */
@@ -174,7 +168,7 @@
     SPTData sptData = new SPTData(GENERATED_CLASS_PACKAGE + "." + className, 
         sptCode.toString(), 
         
oldSpt.generateControllerEventBlocksCode(GENERATED_CLASS_PACKAGE,className+"CEAB"),
 rules, 
-        predicatesByTypeArray, (Set<String>)oldSpt.input);
+        predicatesByTypeArray, oldSpt.input);
     
     //cleanup
     annotationTypes = null;

Modified: gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Transducer.java
===================================================================
--- gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Transducer.java     
2014-03-15 10:06:34 UTC (rev 17672)
+++ gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Transducer.java     
2014-03-15 10:22:11 UTC (rev 17673)
@@ -92,6 +92,7 @@
 @CreoleResource(name = "JAPE-Plus Transducer", 
     comment = "An optimised, JAPE-compatible transducer.", 
     icon="JapePlus")
+@SuppressWarnings("serial")
 public class Transducer extends AbstractLanguageAnalyser 
     implements ControllerAwarePR, ProgressListener , ActionsPublisher {
 
@@ -259,6 +260,7 @@
           duplicatedRules, that.predicatesByType, that.inputTypes);
     }
     
+    @SuppressWarnings("unchecked")
     public SPTBase generateSpt(GateClassLoader classLoader) throws 
ResourceInstantiationException {
       
       SPTBase optimisedTransducer = null;
@@ -275,7 +277,7 @@
         if(!classes.isEmpty()) {
           Javac.loadClasses(classes, classLoader);
         }
-        @SuppressWarnings("unchecked")
+        
         Class<? extends SPTBase> sptClass = (Class<? extends SPTBase>)
             classLoader.loadClass(className);
         

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/13534_NeoTech
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs

Reply via email to