Revision: 16791
http://sourceforge.net/p/gate/code/16791
Author: markagreenwood
Date: 2013-08-15 18:17:31 +0000 (Thu, 15 Aug 2013)
Log Message:
-----------
cleaned up the imports and some generics work
Modified Paths:
--------------
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/RussIEConstants.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/WrongFormatException.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteer.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteerXMLReader.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/RussGazetteer.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/LemmaImpl.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/MorphologyReader.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSMapper.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSTagger.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixNest.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixNestImpl.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixPool.java
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/TypePool.java
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/RussIEConstants.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/RussIEConstants.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/RussIEConstants.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -1,6 +1,8 @@
package com.ontotext.russie;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
/**
* RussIEConstants.java
@@ -75,7 +77,7 @@
"\u044F","\u042F"
};
-static final Set SET_OF_VOWELS = new HashSet(Arrays.asList(arrVowels));
+static final Set<String> SET_OF_VOWELS = new
HashSet<String>(Arrays.asList(arrVowels));
/*Consonant Suffixes*/
final static String [] arrConsonantSuffixes = {
@@ -101,7 +103,7 @@
"\u044F\u0445","\u042F\u0425",
};
-static Set SET_OF_CONSONANT_SUFFIXES = new
HashSet(Arrays.asList(arrConsonantSuffixes));
+static Set<String> SET_OF_CONSONANT_SUFFIXES = new
HashSet<String>(Arrays.asList(arrConsonantSuffixes));
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/WrongFormatException.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/WrongFormatException.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/WrongFormatException.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -10,6 +10,8 @@
*/
public class WrongFormatException extends Exception {
+ private static final long serialVersionUID = -6149480951422115298L;
+
public WrongFormatException() {
super();
}
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteer.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteer.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteer.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -9,20 +9,36 @@
* @author bp
* @version 1.0
*/
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import gate.AnnotationSet;
+import gate.FeatureMap;
+import gate.Resource;
+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.LuckyException;
+import gate.util.profile.Profiler;
-import gate.util.*;
-import gate.creole.*;
-import gate.creole.gazetteer.*;
-import gate.creole.metadata.*;
-import gate.event.*;
-import gate.*;
-import gate.util.profile.*;
-import com.ontotext.russie.*;
-import com.ontotext.russie.morph.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import com.ontotext.russie.RussIEConstants;
+import com.ontotext.russie.morph.Lemma;
+import com.ontotext.russie.morph.SuffixNest;
+import com.ontotext.russie.morph.SuffixPool;
+import com.ontotext.russie.morph.TypePool;
+
@CreoleResource(name = "Inflectional gazetteer")
public class InflectionalGazetteer extends gate.creole.AbstractLanguageAnalyser
implements RussIEConstants {
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteerXMLReader.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteerXMLReader.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteerXMLReader.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -5,14 +5,29 @@
package com.ontotext.russie.gazetteer;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
import com.ontotext.russie.RussIEConstants;
import com.ontotext.russie.morph.Lemma;
import com.ontotext.russie.morph.LemmaImpl;
-import java.io.*;
-import java.net.URL;
-import java.util.*;
-import org.xml.sax.*;
-import org.xml.sax.helpers.XMLReaderFactory;
public class InflectionalGazetteerXMLReader
implements RussIEConstants, ContentHandler
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/RussGazetteer.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/RussGazetteer.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/RussGazetteer.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -24,17 +24,32 @@
package com.ontotext.russie.gazetteer;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import gate.AnnotationSet;
+import gate.Factory;
+import gate.FeatureMap;
+import gate.Resource;
+import gate.creole.ExecutionException;
+import gate.creole.ResourceInstantiationException;
+import gate.creole.gazetteer.AbstractGazetteer;
+import gate.creole.gazetteer.GazetteerException;
+import gate.creole.gazetteer.GazetteerList;
+import gate.creole.gazetteer.LinearDefinition;
+import gate.creole.gazetteer.LinearNode;
+import gate.creole.gazetteer.Lookup;
+import gate.creole.gazetteer.MappingNode;
+import gate.util.InvalidOffsetException;
+import gate.util.LuckyException;
-import gate.util.*;
-import gate.creole.*;
-import gate.creole.gazetteer.*;
-import gate.event.*;
-import gate.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
-import com.ontotext.russie.*;
+import com.ontotext.russie.RussIEConstants;
/**RussGazetteer.java
*
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/LemmaImpl.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/LemmaImpl.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/LemmaImpl.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -1,8 +1,12 @@
package com.ontotext.russie.morph;
-import java.util.*;
+import gate.Factory;
+import gate.FeatureMap;
-import gate.*;
-import gate.creole.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
/**LemmaImpl.java
* Implementation of the Lemma inteface that contains the wordforms of a word
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/MorphologyReader.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/MorphologyReader.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/MorphologyReader.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -1,13 +1,15 @@
package com.ontotext.russie.morph;
-import java.util.*;
-
-import java.io.*;
-import java.nio.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.net.URL;
-import com.ontotext.russie.*;
-import gate.util.*;
+import java.util.HashSet;
+import java.util.Set;
+import com.ontotext.russie.RussIEConstants;
+import com.ontotext.russie.WrongFormatException;
+
/**
* MorphologyReader.java
*
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSMapper.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSMapper.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSMapper.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -5,15 +5,28 @@
package com.ontotext.russie.morph;
-import com.ontotext.russie.RussIEConstants;
-import gate.*;
+import gate.Annotation;
+import gate.AnnotationSet;
+import gate.Resource;
import gate.annotation.AnnotationSetImpl;
-import gate.creole.*;
-import gate.creole.metadata.*;
-import gate.util.FeatureBearer;
+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.OffsetComparator;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import com.ontotext.russie.RussIEConstants;
+
@CreoleResource(name = "POS Mapper")
public class POSMapper extends AbstractLanguageAnalyser
implements RussIEConstants
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSTagger.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSTagger.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSTagger.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -19,19 +19,34 @@
*/
package com.ontotext.russie.morph;
-import java.io.*;
-import java.util.*;
-import java.net.*;
+import gate.AnnotationSet;
+import gate.Factory;
+import gate.FeatureMap;
+import gate.Resource;
+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.GateRuntimeException;
+import gate.util.InvalidOffsetException;
+import gate.util.LuckyException;
+import gate.util.profile.Profiler;
-import gate.util.*;
-import gate.creole.*;
-import gate.creole.gazetteer.*;
-import gate.creole.metadata.*;
-import gate.event.*;
-import gate.*;
-import gate.util.profile.*;
-import com.ontotext.russie.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import com.ontotext.russie.RussIEConstants;
+
@CreoleResource(name = "Russian POS Tagger", icon = "pos-tagger")
public class POSTagger extends gate.creole.AbstractLanguageAnalyser
implements RussIEConstants {
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixNest.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixNest.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixNest.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -1,6 +1,6 @@
package com.ontotext.russie.morph;
-import java.util.*;
+import java.util.Set;
/**SuffixNest.java
*
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixNestImpl.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixNestImpl.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixNestImpl.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -1,8 +1,16 @@
package com.ontotext.russie.morph;
-import java.util.*;
-import gate.*;
+import gate.Factory;
+import gate.FeatureMap;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
/**SuffixNest.java
*
* The suffit nest keeps the inflection suffixes of a lemma with their
respective
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixPool.java
===================================================================
---
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixPool.java
2013-08-15 18:15:28 UTC (rev 16790)
+++
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/SuffixPool.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -1,6 +1,7 @@
package com.ontotext.russie.morph;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
/**SuffixPool.java
*
Modified:
gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/TypePool.java
===================================================================
--- gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/TypePool.java
2013-08-15 18:15:28 UTC (rev 16790)
+++ gate/trunk/plugins/Lang_Russian/src/com/ontotext/russie/morph/TypePool.java
2013-08-15 18:17:31 UTC (rev 16791)
@@ -1,6 +1,7 @@
package com.ontotext.russie.morph;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
/**TypePool.java
* Represents a pool of distinct morpho-syntactic types.
* <p>Title: RussIE</p>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
