Revision: 17699
http://sourceforge.net/p/gate/code/17699
Author: markagreenwood
Date: 2014-03-19 09:11:55 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
cleaned up the imports in some classes to remove wildcard use which means that
GATE now compiles under Java 8 -- shame it won't actually work though :(
Modified Paths:
--------------
gate/trunk/plugins/Parser_Stanford/src/gate/stanford/Parser.java
gate/trunk/plugins/Tagger_MetaMap/src/gate/metamap/MetaMapPR.java
gate/trunk/plugins/TermRaider/src/gate/termraider/bank/TfIdfTermbank.java
gate/trunk/plugins/TermRaider/src/gate/termraider/gui/TermbankViewer.java
gate/trunk/plugins/Web_Crawler_Websphinx/src/crawl/CrawlPR.java
gate/trunk/src/main/gate/corpora/DocumentImpl.java
gate/trunk/src/main/gate/creole/POSTagger.java
gate/trunk/src/main/gate/creole/SerialAnalyserController.java
gate/trunk/src/main/gate/fsm/State.java
Modified: gate/trunk/plugins/Parser_Stanford/src/gate/stanford/Parser.java
===================================================================
--- gate/trunk/plugins/Parser_Stanford/src/gate/stanford/Parser.java
2014-03-19 09:09:28 UTC (rev 17698)
+++ gate/trunk/plugins/Parser_Stanford/src/gate/stanford/Parser.java
2014-03-19 09:11:55 UTC (rev 17699)
@@ -11,20 +11,47 @@
*/
package gate.stanford;
-import edu.stanford.nlp.parser.lexparser.*;
-import edu.stanford.nlp.trees.*;
-import gate.*;
-import gate.util.*;
-import gate.creole.*;
-import gate.creole.metadata.*;
+import edu.stanford.nlp.ling.Word;
+import edu.stanford.nlp.parser.lexparser.LexicalizedParser;
+import edu.stanford.nlp.parser.lexparser.TreebankLangParserParams;
+import edu.stanford.nlp.trees.GrammaticalStructure;
+import edu.stanford.nlp.trees.GrammaticalStructureFactory;
+import edu.stanford.nlp.trees.Tree;
+import edu.stanford.nlp.trees.Trees;
+import edu.stanford.nlp.trees.TypedDependency;
+import gate.Annotation;
+import gate.AnnotationSet;
+import gate.Factory;
+import gate.FeatureMap;
+import gate.Gate;
+import gate.ProcessingResource;
+import gate.Resource;
+import gate.creole.ANNIEConstants;
+import gate.creole.AbstractLanguageAnalyser;
+import gate.creole.ExecutionException;
+import gate.creole.ExecutionInterruptedException;
+import gate.creole.ResourceInstantiationException;
+import gate.creole.metadata.CreoleParameter;
+import gate.creole.metadata.CreoleResource;
+import gate.creole.metadata.Optional;
+import gate.creole.metadata.RunTime;
+import gate.creole.metadata.Sharable;
+import gate.util.Files;
+import gate.util.InvalidOffsetException;
-import java.io.*;
-import java.net.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.text.NumberFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
-import edu.stanford.nlp.ling.*;
-
/**
* GATE PR wrapper around the Stanford Parser. This class expects to find Token
* and Sentence annotations (such as those created by the ANNIE tokenizer and
Modified: gate/trunk/plugins/Tagger_MetaMap/src/gate/metamap/MetaMapPR.java
===================================================================
--- gate/trunk/plugins/Tagger_MetaMap/src/gate/metamap/MetaMapPR.java
2014-03-19 09:09:28 UTC (rev 17698)
+++ gate/trunk/plugins/Tagger_MetaMap/src/gate/metamap/MetaMapPR.java
2014-03-19 09:11:55 UTC (rev 17699)
@@ -15,30 +15,49 @@
*/
package gate.metamap;
-import gov.nih.nlm.nls.metamap.*;
-
-import gate.*;
-import gate.creole.*;
-import gate.creole.metadata.*;
-import gate.util.*;
-
import gate.Annotation;
import gate.AnnotationSet;
-import gate.Document;
import gate.Factory;
import gate.FeatureMap;
+import gate.ProcessingResource;
+import gate.Resource;
+import gate.creole.AbstractLanguageAnalyser;
+import gate.creole.ExecutionException;
+import gate.creole.ResourceInstantiationException;
+import gate.creole.metadata.CreoleParameter;
+import gate.creole.metadata.CreoleResource;
+import gate.creole.metadata.Optional;
+import gate.creole.metadata.RunTime;
+import gate.util.InvalidOffsetException;
+import gate.util.OffsetComparator;
+import gov.nih.nlm.nls.metamap.Ev;
+import gov.nih.nlm.nls.metamap.Mapping;
+import gov.nih.nlm.nls.metamap.MetaMapApi;
+import gov.nih.nlm.nls.metamap.MetaMapApiImpl;
+import gov.nih.nlm.nls.metamap.Negation;
+import gov.nih.nlm.nls.metamap.PCM;
+import gov.nih.nlm.nls.metamap.Phrase;
+import gov.nih.nlm.nls.metamap.Position;
+import gov.nih.nlm.nls.metamap.Result;
+import gov.nih.nlm.nls.metamap.Utterance;
+import info.olteanu.interfaces.StringFilter;
+import info.olteanu.utils.TextNormalizer;
-import java.util.*;
-import java.io.*;
-
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
// TextNormalizer code from phramer.org
// Allows compilation under both Java 5 and Java 6
-import info.olteanu.utils.*;
-import info.olteanu.interfaces.StringFilter;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-
/**
* This class is the implementation of the resource METAMAP.
*/
Modified:
gate/trunk/plugins/TermRaider/src/gate/termraider/bank/TfIdfTermbank.java
===================================================================
--- gate/trunk/plugins/TermRaider/src/gate/termraider/bank/TfIdfTermbank.java
2014-03-19 09:09:28 UTC (rev 17698)
+++ gate/trunk/plugins/TermRaider/src/gate/termraider/bank/TfIdfTermbank.java
2014-03-19 09:11:55 UTC (rev 17699)
@@ -11,15 +11,30 @@
*/
package gate.termraider.bank;
+import gate.Annotation;
+import gate.AnnotationSet;
+import gate.Document;
+import gate.Factory;
+import gate.FeatureMap;
import gate.creole.ResourceInstantiationException;
-import gate.creole.metadata.*;
+import gate.creole.metadata.CreoleParameter;
+import gate.creole.metadata.CreoleResource;
+import gate.creole.metadata.Optional;
import gate.gui.ActionsPublisher;
-import gate.*;
-import gate.termraider.modes.*;
-import gate.termraider.util.*;
-import java.util.*;
+import gate.termraider.modes.IdfCalculation;
+import gate.termraider.modes.Normalization;
+import gate.termraider.modes.TfCalculation;
+import gate.termraider.util.ScoreType;
+import gate.termraider.util.Term;
+import gate.termraider.util.Utilities;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
@CreoleResource(name = "TfIdfTermbank",
icon = "termbank-lr.png",
comment = "TermRaider Termbank derived from vectors in document
features")
Modified:
gate/trunk/plugins/TermRaider/src/gate/termraider/gui/TermbankViewer.java
===================================================================
--- gate/trunk/plugins/TermRaider/src/gate/termraider/gui/TermbankViewer.java
2014-03-19 09:09:28 UTC (rev 17698)
+++ gate/trunk/plugins/TermRaider/src/gate/termraider/gui/TermbankViewer.java
2014-03-19 09:11:55 UTC (rev 17699)
@@ -20,10 +20,12 @@
import gate.gui.MainFrame;
import gate.swing.JMenuButton;
import gate.swing.XJFileChooser;
-import gate.termraider.bank.*;
+import gate.termraider.bank.AbstractTermbank;
+import gate.termraider.bank.HyponymyTermbank;
import gate.termraider.gui.ColorMenu.Callback;
import gate.termraider.output.CloudGenerator;
-import gate.termraider.util.*;
+import gate.termraider.util.ScoreType;
+import gate.termraider.util.Term;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -32,7 +34,12 @@
import java.io.ByteArrayInputStream;
import java.io.FileWriter;
import java.io.PrintWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import javax.swing.Box;
import javax.swing.JButton;
Modified: gate/trunk/plugins/Web_Crawler_Websphinx/src/crawl/CrawlPR.java
===================================================================
--- gate/trunk/plugins/Web_Crawler_Websphinx/src/crawl/CrawlPR.java
2014-03-19 09:09:28 UTC (rev 17698)
+++ gate/trunk/plugins/Web_Crawler_Websphinx/src/crawl/CrawlPR.java
2014-03-19 09:11:55 UTC (rev 17699)
@@ -11,19 +11,30 @@
*/
package crawl;
+import gate.Corpus;
import gate.Document;
import gate.Factory;
import gate.ProcessingResource;
import gate.Resource;
-import gate.creole.*;
-import gate.creole.metadata.*;
-import gate.util.*;
-import gate.*;
+import gate.creole.AbstractLanguageAnalyser;
+import gate.creole.ExecutionException;
+import gate.creole.ExecutionInterruptedException;
+import gate.creole.ResourceInstantiationException;
+import gate.creole.metadata.CreoleParameter;
+import gate.creole.metadata.CreoleResource;
+import gate.creole.metadata.HiddenCreoleParameter;
+import gate.creole.metadata.Optional;
+import gate.creole.metadata.RunTime;
+import gate.util.Err;
+import gate.util.Strings;
+
import java.net.URL;
-import java.util.*;
-import websphinx.*;
+import java.util.List;
+import websphinx.Crawler;
+import websphinx.DownloadParameters;
+
@CreoleResource(name = "Crawler PR",
comment = "GATE implementation of the Websphinx crawling API",
helpURL = "http://gate.ac.uk/userguide/sec:misc-creole:crawler";)
Modified: gate/trunk/src/main/gate/corpora/DocumentImpl.java
===================================================================
--- gate/trunk/src/main/gate/corpora/DocumentImpl.java 2014-03-19 09:09:28 UTC
(rev 17698)
+++ gate/trunk/src/main/gate/corpora/DocumentImpl.java 2014-03-19 09:11:55 UTC
(rev 17699)
@@ -15,17 +15,58 @@
*/
package gate.corpora;
-import java.io.IOException;
-import java.net.URL;
-import java.util.*;
-import gate.*;
+import gate.Annotation;
+import gate.AnnotationSet;
+import gate.DataStore;
+import gate.DocumentContent;
+import gate.DocumentFormat;
+import gate.Factory;
+import gate.FeatureMap;
+import gate.Gate;
+import gate.GateConstants;
+import gate.Node;
+import gate.Resource;
+import gate.TextualDocument;
import gate.annotation.AnnotationSetImpl;
import gate.creole.AbstractLanguageResource;
import gate.creole.ResourceInstantiationException;
-import gate.creole.metadata.*;
-import gate.event.*;
-import gate.util.*;
+import gate.creole.metadata.CreoleParameter;
+import gate.creole.metadata.CreoleResource;
+import gate.creole.metadata.Optional;
+import gate.event.CreoleEvent;
+import gate.event.CreoleListener;
+import gate.event.DatastoreEvent;
+import gate.event.DatastoreListener;
+import gate.event.DocumentEvent;
+import gate.event.DocumentListener;
+import gate.event.StatusListener;
+import gate.util.DocumentFormatException;
+import gate.util.Err;
+import gate.util.GateRuntimeException;
+import gate.util.InvalidOffsetException;
+import gate.util.OptionsMap;
+import gate.util.Out;
+import gate.util.SimpleFeatureMapImpl;
+import gate.util.Strings;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.Stack;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.Vector;
+
/**
* Represents the commonalities between all sorts of documents.
*
Modified: gate/trunk/src/main/gate/creole/POSTagger.java
===================================================================
--- gate/trunk/src/main/gate/creole/POSTagger.java 2014-03-19 09:09:28 UTC
(rev 17698)
+++ gate/trunk/src/main/gate/creole/POSTagger.java 2014-03-19 09:11:55 UTC
(rev 17699)
@@ -14,15 +14,29 @@
package gate.creole;
+import gate.Annotation;
+import gate.AnnotationSet;
+import gate.Factory;
+import gate.FeatureMap;
+import gate.Resource;
+import gate.Utils;
+import gate.creole.metadata.CreoleParameter;
+import gate.creole.metadata.CreoleResource;
+import gate.creole.metadata.Optional;
+import gate.creole.metadata.RunTime;
+import gate.util.GateRuntimeException;
+import gate.util.OffsetComparator;
+
import java.text.NumberFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
-import gate.*;
-import gate.creole.metadata.*;
-import gate.util.GateRuntimeException;
-import gate.util.OffsetComparator;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
/**
* This class is a wrapper for HepTag, Mark Hepple's POS tagger.
*/
Modified: gate/trunk/src/main/gate/creole/SerialAnalyserController.java
===================================================================
--- gate/trunk/src/main/gate/creole/SerialAnalyserController.java
2014-03-19 09:09:28 UTC (rev 17698)
+++ gate/trunk/src/main/gate/creole/SerialAnalyserController.java
2014-03-19 09:11:55 UTC (rev 17699)
@@ -15,14 +15,27 @@
package gate.creole;
+import gate.Controller;
+import gate.CorpusController;
+import gate.Document;
+import gate.Factory;
+import gate.Gate;
+import gate.LanguageAnalyser;
+import gate.ProcessingResource;
+import gate.creole.metadata.CreoleParameter;
+import gate.creole.metadata.CreoleResource;
+import gate.creole.metadata.Optional;
+import gate.creole.metadata.RunTime;
+import gate.event.CreoleEvent;
+import gate.util.Benchmark;
+import gate.util.GateRuntimeException;
+import gate.util.Out;
+
import java.lang.reflect.UndeclaredThrowableException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
-import gate.*;
-import gate.creole.metadata.*;
-import gate.event.CreoleEvent;
-import gate.util.*;
-
/**
* This class implements a SerialController that only contains
* {@link gate.LanguageAnalyser}s. It has a {@link gate.Corpus} and its execute
Modified: gate/trunk/src/main/gate/fsm/State.java
===================================================================
--- gate/trunk/src/main/gate/fsm/State.java 2014-03-19 09:09:28 UTC (rev
17698)
+++ gate/trunk/src/main/gate/fsm/State.java 2014-03-19 09:11:55 UTC (rev
17699)
@@ -193,14 +193,14 @@
* state.
* The value for fileIndex is correct only on final states!
*/
- int getFileIndex() { return fileIndex; }
+ protected int getFileIndex() { return fileIndex; }
/**
* Returns the priority in the definition file of the rule that generated
* this state.
* This value is correct only on final states!
*/
- int getPriority() { return priority; }
+ protected int getPriority() { return priority; }
/**
* Adds a new transition to the list of outgoing transitions for this state.
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
