Revision: 17668
http://sourceforge.net/p/gate/code/17668
Author: markagreenwood
Date: 2014-03-15 09:05:33 +0000 (Sat, 15 Mar 2014)
Log Message:
-----------
and that's all the C* plugins cleaned up and the compiler warnings enabled
Modified Paths:
--------------
gate/trunk/plugins/Copy_Annots_Between_Docs/build.xml
gate/trunk/plugins/Copy_Annots_Between_Docs/src/gate/copyAS2AnoDoc/CopyAS2AnoDocMain.java
gate/trunk/plugins/Copy_Annots_Between_Docs/src/gate/copyAS2AnoDoc/TestCopyAS2AnoDocPlugin.java
gate/trunk/plugins/Coref_Tools/build.xml
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/AliasMap.java
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/LegacyCorefDataWriter.java
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/Tagger.java
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/Utils.java
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/AbstractMatcher.java
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/False.java
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/True.java
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/AnnType.java
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/DocumentText.java
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/FixedTags.java
gate/trunk/plugins/Crowd_Sourcing/build.xml
gate/trunk/plugins/Crowd_Sourcing/src/gate/crowdsource/classification/EntityClassificationResultsImporter.java
gate/trunk/plugins/Crowd_Sourcing/src/gate/crowdsource/ne/EntityAnnotationResultsImporter.java
Modified: gate/trunk/plugins/Copy_Annots_Between_Docs/build.xml
===================================================================
--- gate/trunk/plugins/Copy_Annots_Between_Docs/build.xml 2014-03-15
08:57:17 UTC (rev 17667)
+++ gate/trunk/plugins/Copy_Annots_Between_Docs/build.xml 2014-03-15
09:05:33 UTC (rev 17668)
@@ -84,7 +84,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.5"
target="1.5" 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/Copy_Annots_Between_Docs/src/gate/copyAS2AnoDoc/CopyAS2AnoDocMain.java
===================================================================
---
gate/trunk/plugins/Copy_Annots_Between_Docs/src/gate/copyAS2AnoDoc/CopyAS2AnoDocMain.java
2014-03-15 08:57:17 UTC (rev 17667)
+++
gate/trunk/plugins/Copy_Annots_Between_Docs/src/gate/copyAS2AnoDoc/CopyAS2AnoDocMain.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -30,10 +30,12 @@
public class CopyAS2AnoDocMain extends AbstractLanguageAnalyser implements
ProcessingResource {
+ private static final long serialVersionUID = -2874636782869415162L;
+
URL sourceFilesURL = null;
private String inputASName;
private String outputASName;
- private List annotationTypes;
+ private List<String> annotationTypes;
/** Initialise this resource, and return it. */
@@ -102,7 +104,7 @@
AnnotationSet asToCopy = null;
if (annotationTypes != null && annotationTypes.size() > 0) {
//String [] annTypes = annotationTypes.split(";");
- asToCopy = sourceAS.get(new HashSet(annotationTypes));
+ asToCopy = sourceAS.get(new HashSet<String>(annotationTypes));
//asToCopy = sourceAS.get();
} else {
// transfer everything
@@ -193,11 +195,11 @@
return this.sourceFilesURL;
}
- public List getAnnotationTypes() {
+ public List<String> getAnnotationTypes() {
return this.annotationTypes;
}
- public void setAnnotationTypes(List newTypes) {
+ public void setAnnotationTypes(List<String> newTypes) {
annotationTypes = newTypes;
}
Modified:
gate/trunk/plugins/Copy_Annots_Between_Docs/src/gate/copyAS2AnoDoc/TestCopyAS2AnoDocPlugin.java
===================================================================
---
gate/trunk/plugins/Copy_Annots_Between_Docs/src/gate/copyAS2AnoDoc/TestCopyAS2AnoDocPlugin.java
2014-03-15 08:57:17 UTC (rev 17667)
+++
gate/trunk/plugins/Copy_Annots_Between_Docs/src/gate/copyAS2AnoDoc/TestCopyAS2AnoDocPlugin.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -103,7 +103,7 @@
controller.execute();
- Document doc = (Document)corpus.get(1);
+ Document doc = corpus.get(1);
AnnotationSet anns = doc.getAnnotations("ann5").get("Os");
int num;
num = anns.size();
@@ -114,7 +114,7 @@
assertEquals(num, 18);
doc.removeAnnotationSet("ann5");
- doc = (Document)corpus.get(0);
+ doc = corpus.get(0);
doc.removeAnnotationSet("ann5");
System.out.println("completed");
Modified: gate/trunk/plugins/Coref_Tools/build.xml
===================================================================
--- gate/trunk/plugins/Coref_Tools/build.xml 2014-03-15 08:57:17 UTC (rev
17667)
+++ gate/trunk/plugins/Coref_Tools/build.xml 2014-03-15 09:05:33 UTC (rev
17668)
@@ -49,7 +49,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/Coref_Tools/src/gate/creole/coref/AliasMap.java
===================================================================
--- gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/AliasMap.java
2014-03-15 08:57:17 UTC (rev 17667)
+++ gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/AliasMap.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -18,7 +18,6 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
-import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
Modified:
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/LegacyCorefDataWriter.java
===================================================================
---
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/LegacyCorefDataWriter.java
2014-03-15 08:57:17 UTC (rev 17667)
+++
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/LegacyCorefDataWriter.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -75,6 +75,7 @@
/* (non-Javadoc)
* @see gate.creole.AbstractProcessingResource#execute()
*/
+ @SuppressWarnings("unchecked")
@Override
public void execute() throws ExecutionException {
fireStatusChanged("Generating legacy co-reference data for " +
@@ -92,7 +93,7 @@
if(document.getFeatures().containsKey(DOCUMENT_COREF_FEATURE_NAME)){
Object oldMap = document.getFeatures().get(DOCUMENT_COREF_FEATURE_NAME);
if(Map.class.isAssignableFrom(oldMap.getClass())) {
- docCorefMap = (Map)oldMap;
+ docCorefMap = (Map<String,List<List<Integer>>>)oldMap;
} else {
log.warn("Old value for \"" + DOCUMENT_COREF_FEATURE_NAME +
"\" document feature was invalid and has been deleted");
Modified: gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/Tagger.java
===================================================================
--- gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/Tagger.java
2014-03-15 08:57:17 UTC (rev 17667)
+++ gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/Tagger.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -18,7 +18,6 @@
import gate.Annotation;
import gate.creole.ResourceInstantiationException;
-import java.util.List;
import java.util.Set;
public interface Tagger {
Modified: gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/Utils.java
===================================================================
--- gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/Utils.java
2014-03-15 08:57:17 UTC (rev 17667)
+++ gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/Utils.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -15,8 +15,6 @@
*/
package gate.creole.coref;
-import java.io.File;
-import java.util.Map;
import java.util.regex.Pattern;
/**
Modified:
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/AbstractMatcher.java
===================================================================
---
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/AbstractMatcher.java
2014-03-15 08:57:17 UTC (rev 17667)
+++
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/AbstractMatcher.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -15,7 +15,6 @@
*/
package gate.creole.coref.matchers;
-import gate.Annotation;
import gate.creole.ResourceInstantiationException;
import gate.creole.coref.CorefBase;
import gate.creole.coref.Matcher;
Modified:
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/False.java
===================================================================
--- gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/False.java
2014-03-15 08:57:17 UTC (rev 17667)
+++ gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/False.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -17,7 +17,6 @@
import gate.Annotation;
import gate.creole.coref.CorefBase;
-import gate.creole.coref.Matcher;
/**
*
Modified:
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/True.java
===================================================================
--- gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/True.java
2014-03-15 08:57:17 UTC (rev 17667)
+++ gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/matchers/True.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -15,11 +15,8 @@
*/
package gate.creole.coref.matchers;
-import java.util.List;
-
import gate.Annotation;
import gate.creole.coref.CorefBase;
-import gate.creole.coref.Matcher;
/**
*
Modified:
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/AnnType.java
===================================================================
--- gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/AnnType.java
2014-03-15 08:57:17 UTC (rev 17667)
+++ gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/AnnType.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -15,13 +15,12 @@
*/
package gate.creole.coref.taggers;
+import gate.Annotation;
+import gate.creole.coref.CorefBase;
+
import java.util.Collections;
import java.util.Set;
-import gate.Annotation;
-import gate.creole.coref.CorefBase;
-import gate.creole.coref.Tagger;
-
/**
*
*/
Modified:
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/DocumentText.java
===================================================================
---
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/DocumentText.java
2014-03-15 08:57:17 UTC (rev 17667)
+++
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/DocumentText.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -15,14 +15,13 @@
*/
package gate.creole.coref.taggers;
-import java.util.Collections;
-import java.util.Set;
-
import gate.Annotation;
import gate.Utils;
import gate.creole.coref.CorefBase;
-import gate.creole.coref.Tagger;
+import java.util.Collections;
+import java.util.Set;
+
/**
*
*/
Modified:
gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/FixedTags.java
===================================================================
--- gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/FixedTags.java
2014-03-15 08:57:17 UTC (rev 17667)
+++ gate/trunk/plugins/Coref_Tools/src/gate/creole/coref/taggers/FixedTags.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -15,14 +15,13 @@
*/
package gate.creole.coref.taggers;
+import gate.Annotation;
+import gate.creole.coref.CorefBase;
+
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import gate.Annotation;
-import gate.creole.coref.CorefBase;
-import gate.creole.coref.Tagger;
-
/**
*
*/
Modified: gate/trunk/plugins/Crowd_Sourcing/build.xml
===================================================================
--- gate/trunk/plugins/Crowd_Sourcing/build.xml 2014-03-15 08:57:17 UTC (rev
17667)
+++ gate/trunk/plugins/Crowd_Sourcing/build.xml 2014-03-15 09:05:33 UTC (rev
17668)
@@ -37,7 +37,11 @@
debug="true"
debuglevel="lines,source,vars"
source="1.6"
- target="1.6" />
+ target="1.6">
+ <compilerarg value="-Xmaxwarns" />
+ <compilerarg value="${gate.compile.maxwarnings}" />
+ <compilerarg value="-Xlint:all" />
+ </javac>
</target>
<!-- copy resource files (everything that's not .java) -->
Modified:
gate/trunk/plugins/Crowd_Sourcing/src/gate/crowdsource/classification/EntityClassificationResultsImporter.java
===================================================================
---
gate/trunk/plugins/Crowd_Sourcing/src/gate/crowdsource/classification/EntityClassificationResultsImporter.java
2014-03-15 08:57:17 UTC (rev 17667)
+++
gate/trunk/plugins/Crowd_Sourcing/src/gate/crowdsource/classification/EntityClassificationResultsImporter.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -41,6 +41,8 @@
extends
AbstractLanguageAnalyser {
+ private static final long serialVersionUID = -4933088333206339292L;
+
private static final Logger log = Logger
.getLogger(EntityClassificationResultsImporter.class);
Modified:
gate/trunk/plugins/Crowd_Sourcing/src/gate/crowdsource/ne/EntityAnnotationResultsImporter.java
===================================================================
---
gate/trunk/plugins/Crowd_Sourcing/src/gate/crowdsource/ne/EntityAnnotationResultsImporter.java
2014-03-15 08:57:17 UTC (rev 17667)
+++
gate/trunk/plugins/Crowd_Sourcing/src/gate/crowdsource/ne/EntityAnnotationResultsImporter.java
2014-03-15 09:05:33 UTC (rev 17668)
@@ -45,6 +45,8 @@
extends
AbstractLanguageAnalyser {
+ private static final long serialVersionUID = 3424823295729835240L;
+
private static final Logger log = Logger
.getLogger(EntityAnnotationResultsImporter.class);
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
