You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/01/09 17:07:48 UTC
svn commit: r1229233 - in
/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict:
BinaryDictionary.java CharacterDefinition.java ConnectionCosts.java
Author: uschindler
Date: Mon Jan 9 16:07:48 2012
New Revision: 1229233
URL: http://svn.apache.org/viewvc?rev=1229233&view=rev
Log:
LUCENE-3305: Some cleanups
Modified:
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/BinaryDictionary.java
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/CharacterDefinition.java
lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/ConnectionCosts.java
Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/BinaryDictionary.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/BinaryDictionary.java?rev=1229233&r1=1229232&r2=1229233&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/BinaryDictionary.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/BinaryDictionary.java Mon Jan 9 16:07:48 2012
@@ -132,9 +132,14 @@ public abstract class BinaryDictionary i
}
protected final InputStream getResource(String suffix) throws IOException {
- InputStream is = getClass().getResourceAsStream(getClass().getSimpleName() + suffix);
+ return getClassResource(getClass(), suffix);
+ }
+
+ // util, reused by ConnectionCosts and CharacterDefinition
+ public static final InputStream getClassResource(Class<?> clazz, String suffix) throws IOException {
+ final InputStream is = clazz.getResourceAsStream(clazz.getSimpleName() + suffix);
if (is == null)
- throw new FileNotFoundException("Not in classpath: " + getClass().getName().replace('.','/') + suffix);
+ throw new FileNotFoundException("Not in classpath: " + clazz.getName().replace('.','/') + suffix);
return is;
}
Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/CharacterDefinition.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/CharacterDefinition.java?rev=1229233&r1=1229232&r2=1229233&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/CharacterDefinition.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/CharacterDefinition.java Mon Jan 9 16:07:48 2012
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.kurom
import java.io.BufferedInputStream;
import java.io.IOException;
-import java.io.FileNotFoundException;
import java.io.InputStream;
import org.apache.lucene.store.DataInput;
@@ -63,9 +62,7 @@ public final class CharacterDefinition {
IOException priorE = null;
InputStream is = null;
try {
- is = getClass().getResourceAsStream(getClass().getSimpleName()+FILENAME_SUFFIX);
- if (is == null)
- throw new FileNotFoundException("Not in classpath: " + getClass().getName().replace('.','/')+FILENAME_SUFFIX);
+ is = BinaryDictionary.getClassResource(getClass(), FILENAME_SUFFIX);
is = new BufferedInputStream(is);
final DataInput in = new InputStreamDataInput(is);
CodecUtil.checkHeader(in, HEADER, VERSION, VERSION);
Modified: lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/ConnectionCosts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/ConnectionCosts.java?rev=1229233&r1=1229232&r2=1229233&view=diff
==============================================================================
--- lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/ConnectionCosts.java (original)
+++ lucene/dev/branches/lucene3305/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/kuromoji/dict/ConnectionCosts.java Mon Jan 9 16:07:48 2012
@@ -19,7 +19,6 @@ package org.apache.lucene.analysis.kurom
import java.io.BufferedInputStream;
import java.io.IOException;
-import java.io.FileNotFoundException;
import java.io.InputStream;
import org.apache.lucene.store.DataInput;
@@ -40,9 +39,7 @@ public final class ConnectionCosts {
InputStream is = null;
short[][] costs = null;
try {
- is = getClass().getResourceAsStream(getClass().getSimpleName()+FILENAME_SUFFIX);
- if (is == null)
- throw new FileNotFoundException("Not in classpath: " + getClass().getName().replace('.','/')+FILENAME_SUFFIX);
+ is = BinaryDictionary.getClassResource(getClass(), FILENAME_SUFFIX);
is = new BufferedInputStream(is);
final DataInput in = new InputStreamDataInput(is);
CodecUtil.checkHeader(in, HEADER, VERSION, VERSION);