You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cm...@apache.org on 2013/05/15 14:10:36 UTC
svn commit: r1482778 - in
/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr:
./ morph/ tagging/ utils/
Author: cm
Date: Wed May 15 12:10:36 2013
New Revision: 1482778
URL: http://svn.apache.org/r1482778
Log:
Removed warnings. Suppressed warnings.
Modified:
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/KoreanFilter.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/morph/WordSpaceAnalyzer.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/tagging/Tagger.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/DictionaryUtil.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/Trie.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/UnmodifiableIterator.java
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/KoreanFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/KoreanFilter.java?rev=1482778&r1=1482777&r2=1482778&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/KoreanFilter.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/KoreanFilter.java Wed May 15 12:10:36 2013
@@ -325,7 +325,7 @@ public class KoreanFilter extends TokenF
sb.append(chs[k]);
if(k>0) candiList.add(sb);
- Iterator iter = DictionaryUtil.findWithPrefix(sb.toString());
+ Iterator<String[]> iter = DictionaryUtil.findWithPrefix(sb.toString());
if(!iter.hasNext()) // ì¬ì ì ìì¼ë©´ ìì íë³´
removeList.add(sb);
}
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/morph/WordSpaceAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/morph/WordSpaceAnalyzer.java?rev=1482778&r1=1482777&r2=1482778&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/morph/WordSpaceAnalyzer.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/morph/WordSpaceAnalyzer.java Wed May 15 12:10:36 2013
@@ -55,7 +55,7 @@ public class WordSpaceAnalyzer {
char[] f = SyllableUtil.getFeature(input.charAt(i));
String prefix = i==input.length()-1 ? "X" : input.substring(wStart,i+2);
- Iterator iter = DictionaryUtil.findWithPrefix(prefix);
+ Iterator<String[]> iter = DictionaryUtil.findWithPrefix(prefix);
List<AnalysisOutput> candidates = new ArrayList<AnalysisOutput>();
@@ -292,7 +292,7 @@ public class WordSpaceAnalyzer {
// ëì¬ìì ëª
ì¬ë¶ë¦¬
int vstart = 0;
for(int i=estart-1;i>=0;i--) {
- Iterator iter = DictionaryUtil.findWithPrefix(snipt.substring(i,estart));
+ Iterator<String[]> iter = DictionaryUtil.findWithPrefix(snipt.substring(i,estart));
if(iter.hasNext()) vstart=i;
else break;
}
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/tagging/Tagger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/tagging/Tagger.java?rev=1482778&r1=1482777&r2=1482778&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/tagging/Tagger.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/tagging/Tagger.java Wed May 15 12:10:36 2013
@@ -261,11 +261,12 @@ public class Tagger {
return false;
}
-
+
+ @SuppressWarnings("unchecked")
public static synchronized Iterator<String[]> getGR(String prefix) throws MorphException {
if(occurrences==null) loadTaggerDic();
-
+
return occurrences.getPrefixedBy(prefix);
}
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/DictionaryUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/DictionaryUtil.java?rev=1482778&r1=1482777&r2=1482778&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/DictionaryUtil.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/DictionaryUtil.java Wed May 15 12:10:36 2013
@@ -80,8 +80,9 @@ public class DictionaryUtil {
dictionary.add(entry.getWord(), entry);
}
}
-
- public static Iterator findWithPrefix(String prefix) throws MorphException {
+
+ @SuppressWarnings({"rawtypes","unchecked"})
+ public static Iterator<String[]> findWithPrefix(String prefix) throws MorphException {
if(dictionary==null) loadDictionary();
return dictionary.getPrefixedBy(prefix);
}
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/Trie.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/Trie.java?rev=1482778&r1=1482777&r2=1482778&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/Trie.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/Trie.java Wed May 15 12:10:36 2013
@@ -53,6 +53,7 @@ import java.util.NoSuchElementException;
* See http://www.csse.monash.edu.au/~lloyd/tildeAlgDS/Tree/Trie.html for a
* discussion of Tries.
*/
+
public class Trie<S,V> {
/**
* Our representation consists of a tree of nodes whose edges are labelled
@@ -95,6 +96,7 @@ public class Trie<S,V> {
/**
* The constant EmptyIterator to return when nothing matches.
*/
+ @SuppressWarnings({"rawtypes","unchecked"})
private final static Iterator EMPTY_ITERATOR = new EmptyIterator();
/**
@@ -308,6 +310,7 @@ public class Trie<S,V> {
* k.startsWith(prefix) and get(k) == v. The remove() operation on the
* iterator is unimplemented.
*/
+ @SuppressWarnings({"rawtypes","unchecked"})
public Iterator getPrefixedBy(String prefix) {
// Early conversion of search key
prefix = canonicalCase(prefix);
@@ -327,6 +330,7 @@ public class Trie<S,V> {
* requires 0 <= startOffset <= stopOffset <= prefix.length
* @see #canonicalCase(String)
*/
+ @SuppressWarnings({"rawtypes","unchecked"})
public Iterator getPrefixedBy(String prefix, int startOffset, int stopOffset) {
// Find the first node for which "prefix" prefixes KEY(node). (See the
// implementation overview for a definition of KEY(node).) This code is
@@ -366,6 +370,7 @@ public class Trie<S,V> {
* Returns all the (non-null) values associated with a given node and its
* children. (internal)
*/
+ @SuppressWarnings({"rawtypes","unchecked"})
private class ValueIterator extends NodeIterator {
ValueIterator(TrieNode start) {
super(start, false);
@@ -380,6 +385,7 @@ public class Trie<S,V> {
/**
* Yields nothing. (internal)
*/
+ @SuppressWarnings({"rawtypes","unchecked"})
private static class EmptyIterator implements Iterator {
// inherits javadoc comment
public boolean hasNext() {
@@ -405,6 +411,7 @@ public class Trie<S,V> {
* INVARIANT: Top of stack contains the next node with not null value to
* pop. All other elements in stack are iterators.
*/
+ @SuppressWarnings({"rawtypes","unchecked"})
private ArrayList /* of Iterator of TrieNode */stack = new ArrayList();
private boolean withNulls;
@@ -412,6 +419,7 @@ public class Trie<S,V> {
* Creates a new iterator that yields all the nodes of start and its
* children that have values (ignoring internal nodes).
*/
+ @SuppressWarnings({"rawtypes","unchecked"})
public NodeIterator(TrieNode start, boolean withNulls) {
this.withNulls = withNulls;
if (withNulls || start.getValue() != null)
@@ -428,6 +436,7 @@ public class Trie<S,V> {
}
// inherits javadoc comment
+ @SuppressWarnings({"rawtypes","unchecked"})
public Object next() {
int size;
if ((size = stack.size()) == 0)
@@ -444,6 +453,7 @@ public class Trie<S,V> {
* empty stack, or a stack whose top will be the next node returned by
* next().
*/
+ @SuppressWarnings({"rawtypes","unchecked"})
private void advance(TrieNode node) {
Iterator children = node.childrenForward();
while (true) { // scan siblings and their children
@@ -484,6 +494,7 @@ public class Trie<S,V> {
* Prints a description of the substree starting with start to buf. The
* printing starts with the given indent level. (internal)
*/
+ @SuppressWarnings({"rawtypes","unchecked"})
private void toStringHelper(TrieNode start, StringBuffer buf, int indent) {
// Print value of node.
if (start.getValue() != null) {
@@ -684,6 +695,7 @@ final class TrieNode<V> {
* Returns the children of this in forward order, as an iterator of
* TrieNode.
*/
+ @SuppressWarnings({"rawtypes","unchecked"})
public Iterator childrenForward() {
return new ChildrenForwardIterator();
}
@@ -731,6 +743,7 @@ final class TrieNode<V> {
* Returns the labels of the children of this in forward order, as an
* iterator of Strings.
*/
+ @SuppressWarnings({"rawtypes","unchecked"})
public Iterator labelsForward() {
return new LabelForwardIterator();
}
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/UnmodifiableIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/UnmodifiableIterator.java?rev=1482778&r1=1482777&r2=1482778&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/UnmodifiableIterator.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/UnmodifiableIterator.java Wed May 15 12:10:36 2013
@@ -19,6 +19,7 @@ package org.apache.lucene.analysis.kr.ut
import java.util.Iterator;
+@SuppressWarnings({"rawtypes","unchecked"})
public abstract class UnmodifiableIterator implements Iterator {
public void remove() {