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 03:51:19 UTC
svn commit: r1482655 -
/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/
Author: cm
Date: Wed May 15 01:51:18 2013
New Revision: 1482655
URL: http://svn.apache.org/r1482655
Log:
Fixed compilation warnings (LUCENE-4956)
Modified:
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/EomiUtil.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/FileUtil.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/HanjaUtils.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/JarResources.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/MorphUtil.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/NounUtil.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/StrBuilder.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/SyllableUtil.java
lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/VerbUtil.java
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/EomiUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/EomiUtil.java?rev=1482655&r1=1482654&r2=1482655&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/EomiUtil.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/EomiUtil.java Wed May 15 01:51:18 2013
@@ -234,9 +234,9 @@ public class EomiUtil {
/**
* ë¶ê·ì¹ ì©ì¸ì ìíì 구íë¤.
*/
- public static List irregular(AnalysisOutput output) throws MorphException {
+ public static List<AnalysisOutput> irregular(AnalysisOutput output) throws MorphException {
- List results = new ArrayList();
+ List<AnalysisOutput> results = new ArrayList<AnalysisOutput>();
if(output.getStem()==null||output.getStem().length()==0)
return results;
@@ -244,7 +244,7 @@ public class EomiUtil {
String ending = output.getEomi();
if(output.getPomi()!=null) ending = output.getPomi();
- List<String[]> irrs = new ArrayList();
+ List<String[]> irrs = new ArrayList<String[]>();
irregularStem(irrs,output.getStem(),ending);
irregularEnding(irrs,output.getStem(),ending);
@@ -274,7 +274,7 @@ public class EomiUtil {
* @param stem
* @param ending
*/
- private static void irregularStem(List results, String stem, String ending) {
+ private static void irregularStem(List<String[]> results, String stem, String ending) {
char feCh = ending.charAt(0);
char[] fechJaso = MorphUtil.decompose(feCh);
@@ -334,7 +334,7 @@ public class EomiUtil {
* @param stem
* @param ending
*/
- private static void irregularEnding(List results, String stem, String ending) {
+ private static void irregularEnding(List<String[]> results, String stem, String ending) {
if(ending.startsWith("ã
")) return;
char feCh = ending.charAt(0);
@@ -371,7 +371,7 @@ public class EomiUtil {
* @param stem
* @param ending
*/
- private static void irregularAO(List results, String stem, String ending) {
+ private static void irregularAO(List<String[]> results, String stem, String ending) {
char ls = stem.charAt(stem.length()-1);
char[] lsJaso = MorphUtil.decompose(ls);
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/FileUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/FileUtil.java?rev=1482655&r1=1482654&r2=1482655&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/FileUtil.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/FileUtil.java Wed May 15 01:51:18 2013
@@ -213,7 +213,7 @@ public class FileUtil {
*/
public static List<String> readLines(Reader input) throws IOException {
BufferedReader reader = new BufferedReader(input);
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
String line = reader.readLine();
while (line != null) {
if ( ! (line.startsWith("!") || line.startsWith("\uFEFF!"))) { // Skip comment lines starting with '!'
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/HanjaUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/HanjaUtils.java?rev=1482655&r1=1482654&r2=1482655&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/HanjaUtils.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/HanjaUtils.java Wed May 15 01:51:18 2013
@@ -31,7 +31,7 @@ public class HanjaUtils {
public synchronized static void loadDictionary() throws MorphException {
try {
List<String> strList = FileUtil.readLines("org/apache/lucene/analysis/kr/dic/mapHanja.dic","UTF-8");
- mapHanja = new HashMap();
+ mapHanja = new HashMap<String, char[]>();
for(int i=0;i<strList.size();i++) {
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/JarResources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/JarResources.java?rev=1482655&r1=1482654&r2=1482655&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/JarResources.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/JarResources.java Wed May 15 01:51:18 2013
@@ -22,7 +22,8 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Enumeration;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream;
@@ -38,7 +39,7 @@ public final class JarResources {
public boolean debugOn=false;
// jar resource mapping tables
- private Hashtable htSizes=new Hashtable();
+ private Map<String, Integer> htSizes=new HashMap<String, Integer>();
// a jar file
private String jarFileName;
@@ -67,9 +68,9 @@ public final class JarResources {
try {
// extracts just sizes only.
ZipFile zf=new ZipFile(jarFileName);
- Enumeration e=zf.entries();
+ Enumeration<? extends ZipEntry> e=zf.entries();
while (e.hasMoreElements()) {
- ZipEntry ze=(ZipEntry)e.nextElement();
+ ZipEntry ze=e.nextElement();
if (debugOn) {
System.out.println(dumpZipEntry(ze));
}
@@ -94,13 +95,13 @@ public final class JarResources {
int size=(int)ze.getSize();
// -1 means unknown size.
if (size==-1) {
- size=((Integer)htSizes.get(ze.getName())).intValue();
+ size=(htSizes.get(ze.getName())).intValue();
}
- byte[] b=new byte[(int)size];
+ byte[] b=new byte[size];
int rb=0;
int chunk=0;
- while (((int)size - rb) > 0) {
- chunk=zis.read(b,rb,(int)size - rb);
+ while ((size - rb) > 0) {
+ chunk=zis.read(b,rb,size - rb);
if (chunk==-1) {
break;
}
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/MorphUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/MorphUtil.java?rev=1482655&r1=1482654&r2=1482655&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/MorphUtil.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/MorphUtil.java Wed May 15 01:51:18 2013
@@ -115,7 +115,7 @@ public class MorphUtil {
}
- public static void buildPtnVM(AnalysisOutput output, List candidates) throws MorphException {
+ public static void buildPtnVM(AnalysisOutput output, List<AnalysisOutput> candidates) throws MorphException {
String end = output.getEomi();
if(output.getPomi()!=null) end = output.getPomi();
@@ -142,7 +142,7 @@ public class MorphUtil {
* @param candidates
* @throws MorphException
*/
- public static void buildPtnCM(AnalysisOutput output, List candidates) throws MorphException {
+ public static void buildPtnCM(AnalysisOutput output, List<AnalysisOutput> candidates) throws MorphException {
char ch = output.getStem().charAt(output.getStem().length()-2);
char[] jasos = MorphUtil.decompose(ch);
@@ -153,7 +153,7 @@ public class MorphUtil {
}
}
- private static void buildPtnVMCM(AnalysisOutput output, List candidates) throws MorphException {
+ private static void buildPtnVMCM(AnalysisOutput output, List<AnalysisOutput> candidates) throws MorphException {
String stem = output.getStem();
output.setPatn(PatternConstants.PTN_VMCM);
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/NounUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/NounUtil.java?rev=1482655&r1=1482654&r2=1482655&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/NounUtil.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/NounUtil.java Wed May 15 01:51:18 2013
@@ -21,13 +21,14 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.lucene.analysis.kr.morph.AnalysisOutput;
+import org.apache.lucene.analysis.kr.morph.CompoundEntry;
import org.apache.lucene.analysis.kr.morph.MorphException;
import org.apache.lucene.analysis.kr.morph.PatternConstants;
import org.apache.lucene.analysis.kr.morph.WordEntry;
public class NounUtil {
- private static final List DNouns = new ArrayList();
+ private static final List<String> DNouns = new ArrayList<String>();
static {
String[] strs = new String[]{"ë±", "ë¤","ì","ê°","ë¿","ë³"};
@@ -44,7 +45,7 @@ public class NounUtil {
* @param candidates
* @throws MorphException
*/
- public static boolean analysisMJ(AnalysisOutput o, List candidates) throws MorphException {
+ public static boolean analysisMJ(AnalysisOutput o, List<AnalysisOutput> candidates) throws MorphException {
int strlen = o.getStem().length();
@@ -98,7 +99,7 @@ public class NounUtil {
* @param candidates
* @throws MorphException
*/
- public static boolean analysisVMJ(AnalysisOutput o, List candidates) throws MorphException {
+ public static boolean analysisVMJ(AnalysisOutput o, List<AnalysisOutput> candidates) throws MorphException {
String[] irrs = IrregularUtil.restoreIrregularVerb(o.getStem(), o.getElist().get(0));
if(irrs!=null) {
@@ -123,7 +124,7 @@ public class NounUtil {
* @param candidates
* @throws MorphException
*/
- public static boolean analysisVMXMJ(AnalysisOutput o, List candidates) throws MorphException {
+ public static boolean analysisVMXMJ(AnalysisOutput o, List<AnalysisOutput> candidates) throws MorphException {
int idxXVerb = VerbUtil.endsWithXVerb(o.getStem());
@@ -168,7 +169,7 @@ public class NounUtil {
* @param candidates
* @throws MorphException
*/
- public static boolean analysisNSMJ(AnalysisOutput o, List candidates) throws MorphException {
+ public static boolean analysisNSMJ(AnalysisOutput o, List<AnalysisOutput> candidates) throws MorphException {
int idxVbSfix = VerbUtil.endsWithVerbSuffix(o.getStem());
if(idxVbSfix==-1) return false;
@@ -195,7 +196,7 @@ public class NounUtil {
return true;
}
- public static boolean analysisNSMXMJ(AnalysisOutput o, List candidates) throws MorphException {
+ public static boolean analysisNSMXMJ(AnalysisOutput o, List<AnalysisOutput> candidates) throws MorphException {
int idxVbSfix = VerbUtil.endsWithVerbSuffix(o.getStem());
if(idxVbSfix==-1) return false;
@@ -306,9 +307,9 @@ public class NounUtil {
* return ë¨ìëª
ì¬ ë¦¬ì¤í¸
* @throws MorphException
*/
- private static List findNouns(String str, int pos, AnalysisOutput o) throws MorphException {
+ private static List<WordEntry> findNouns(String str, int pos, AnalysisOutput o) throws MorphException {
- List<WordEntry> nList = new ArrayList();
+ List<WordEntry> nList = new ArrayList<WordEntry>();
if(str.length()==2&&DictionaryUtil.existSuffix(str.substring(0,1))&&DNouns.contains(str.substring(1))) {
o.setStem(o.getStem().substring(0,o.getStem().length()-1));
@@ -356,7 +357,7 @@ public class NounUtil {
if(cnoun.getFeature(WordEntry.IDX_NOUN)=='2')
output.setCNoun(cnoun.getCompounds());
else
- output.setCNoun(new ArrayList());
+ output.setCNoun(new ArrayList<CompoundEntry>());
output.setScore(AnalysisOutput.SCORE_CORRECT);
}
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/StrBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/StrBuilder.java?rev=1482655&r1=1482654&r2=1482655&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/StrBuilder.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/StrBuilder.java Wed May 15 01:51:18 2013
@@ -964,15 +964,15 @@ public class StrBuilder implements Clone
* @return this, to enable chaining
* @since 2.3
*/
- public StrBuilder appendAll(Collection coll) {
- if (coll != null && coll.size() > 0) {
- Iterator it = coll.iterator();
- while (it.hasNext()) {
- append(it.next());
- }
- }
- return this;
- }
+// public StrBuilder appendAll(Collection coll) {
+// if (coll != null && coll.size() > 0) {
+// Iterator it = coll.iterator();
+// while (it.hasNext()) {
+// append(it.next());
+// }
+// }
+// return this;
+// }
/**
* Appends each item in an iterator to the builder without any separators.
@@ -983,14 +983,14 @@ public class StrBuilder implements Clone
* @return this, to enable chaining
* @since 2.3
*/
- public StrBuilder appendAll(Iterator it) {
- if (it != null) {
- while (it.hasNext()) {
- append(it.next());
- }
- }
- return this;
- }
+// public StrBuilder appendAll(Iterator it) {
+// if (it != null) {
+// while (it.hasNext()) {
+// append(it.next());
+// }
+// }
+// return this;
+// }
//-----------------------------------------------------------------------
/**
@@ -1025,19 +1025,19 @@ public class StrBuilder implements Clone
* @param separator the separator to use, null means no separator
* @return this, to enable chaining
*/
- public StrBuilder appendWithSeparators(Collection coll, String separator) {
- if (coll != null && coll.size() > 0) {
- separator = (separator == null ? "" : separator);
- Iterator it = coll.iterator();
- while (it.hasNext()) {
- append(it.next());
- if (it.hasNext()) {
- append(separator);
- }
- }
- }
- return this;
- }
+// public StrBuilder appendWithSeparators(Collection coll, String separator) {
+// if (coll != null && coll.size() > 0) {
+// separator = (separator == null ? "" : separator);
+// Iterator it = coll.iterator();
+// while (it.hasNext()) {
+// append(it.next());
+// if (it.hasNext()) {
+// append(separator);
+// }
+// }
+// }
+// return this;
+// }
/**
* Appends an iterator placing separators between each value, but
@@ -1049,18 +1049,18 @@ public class StrBuilder implements Clone
* @param separator the separator to use, null means no separator
* @return this, to enable chaining
*/
- public StrBuilder appendWithSeparators(Iterator it, String separator) {
- if (it != null) {
- separator = (separator == null ? "" : separator);
- while (it.hasNext()) {
- append(it.next());
- if (it.hasNext()) {
- append(separator);
- }
- }
- }
- return this;
- }
+// public StrBuilder appendWithSeparators(Iterator it, String separator) {
+// if (it != null) {
+// separator = (separator == null ? "" : separator);
+// while (it.hasNext()) {
+// append(it.next());
+// if (it.hasNext()) {
+// append(separator);
+// }
+// }
+// }
+// return this;
+// }
//-----------------------------------------------------------------------
/**
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/SyllableUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/SyllableUtil.java?rev=1482655&r1=1482654&r2=1482655&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/SyllableUtil.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/SyllableUtil.java Wed May 15 01:51:18 2013
@@ -71,7 +71,7 @@ public class SyllableUtil {
public static int IDX_EOGAN = 39; // ì´ë¯¸ ëë ì´ë¯¸ì ë³íì¼ë¡ ì¡´ì¬í ì ìë ì (ì¦ IDX_EOMI ì´ê±°ë IDX_YNPNA ì´íì 1ì´ ìë ìì )
- private static List Syllables; // ìì í¹ì± ì ë³´
+ private static List<char[]> Syllables; // ìì í¹ì± ì ë³´
/**
* ì¸ë±ì¤ ê°ì í´ë¹íë ìì ì í¹ì±ì ë°ííë¤.
@@ -85,9 +85,9 @@ public class SyllableUtil {
if(Syllables==null) Syllables = getSyllableFeature();
if(idx<0||idx>=Syllables.size())
- return (char[])Syllables.get(Syllables.size()-1);
+ return Syllables.get(Syllables.size()-1);
else
- return (char[])Syllables.get(idx);
+ return Syllables.get(idx);
}
@@ -108,7 +108,7 @@ public class SyllableUtil {
*
* @throws Exception
*/
- private static List getSyllableFeature() throws MorphException {
+ private static List<char[]> getSyllableFeature() throws MorphException {
try{
Syllables = new ArrayList<char[]>();
Modified: lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/VerbUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/VerbUtil.java?rev=1482655&r1=1482654&r2=1482655&view=diff
==============================================================================
--- lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/VerbUtil.java (original)
+++ lucene/dev/branches/lucene4956/lucene/analysis/arirang/src/java/org/apache/lucene/analysis/kr/utils/VerbUtil.java Wed May 15 01:51:18 2013
@@ -28,9 +28,9 @@ import org.apache.lucene.analysis.kr.mor
public class VerbUtil {
- public static final Map verbSuffix = new HashMap();
+ public static final Map<String, String> verbSuffix = new HashMap<String, String>();
- public static final Map XVerb = new HashMap();
+ public static final Map<String, String> XVerb = new HashMap<String, String>();
static {
String[] suffixs = {
@@ -88,7 +88,7 @@ public class VerbUtil {
/**
* 3. íêµììì´ë¤ : ì²´ì¸ + 'ìì/ë¶í°/ììë¶í°' + 'ì´' + ì´ë¯¸ (PTN_NJCM) <br>
*/
- public static boolean ananlysisNJCM(AnalysisOutput o, List candidates) throws MorphException {
+ public static boolean ananlysisNJCM(AnalysisOutput o, List<AnalysisOutput> candidates) throws MorphException {
int strlen = o.getStem().length();
boolean success = false;
@@ -125,7 +125,7 @@ public class VerbUtil {
* @param candidates
* @throws MorphException
*/
- public static boolean ananlysisNSM(AnalysisOutput o, List candidates) throws MorphException {
+ public static boolean ananlysisNSM(AnalysisOutput o, List<AnalysisOutput> candidates) throws MorphException {
if(o.getStem().endsWith("ì¤ë¬ì°")) o.setStem(o.getStem().substring(0,o.getStem().length()-3)+"ì¤ë½");
int idxVbSfix = VerbUtil.endsWithVerbSuffix(o.getStem());
@@ -164,7 +164,7 @@ public class VerbUtil {
}
- public static boolean ananlysisNSMXM(AnalysisOutput o, List candidates) throws MorphException {
+ public static boolean ananlysisNSMXM(AnalysisOutput o, List<AnalysisOutput> candidates) throws MorphException {
int idxXVerb = VerbUtil.endsWithXVerb(o.getStem());
if(idxXVerb==-1) return false;
@@ -204,7 +204,7 @@ public class VerbUtil {
return true;
}
- public static boolean analysisVMCM(AnalysisOutput o, List candidates) throws MorphException {
+ public static boolean analysisVMCM(AnalysisOutput o, List<AnalysisOutput> candidates) throws MorphException {
int strlen = o.getStem().length();
@@ -253,7 +253,7 @@ public class VerbUtil {
* 6. ëìì£¼ë¤ : ì©ì¸ + 'ì/ì´' + ë³´ì¡°ì©ì¸ + ì´ë¯¸ (PTN_VMXM)
*
*/
- public static boolean analysisVMXM(AnalysisOutput o, List candidates) throws MorphException {
+ public static boolean analysisVMXM(AnalysisOutput o, List<AnalysisOutput> candidates) throws MorphException {
int idxXVerb = VerbUtil.endsWithXVerb(o.getStem());