Revision: 7408
http://languagetool.svn.sourceforge.net/languagetool/?rev=7408&view=rev
Author: milek_pl
Date: 2012-06-19 09:44:21 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
small refactoring to simplify code
Modified Paths:
--------------
trunk/JLanguageTool/.classpath
trunk/JLanguageTool/src/java/org/languagetool/synthesis/BaseSynthesizer.java
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ca/CatalanSynthesizer.java
trunk/JLanguageTool/src/java/org/languagetool/synthesis/el/GreekSynthesizer.java
trunk/JLanguageTool/src/java/org/languagetool/synthesis/en/EnglishSynthesizer.java
trunk/JLanguageTool/src/java/org/languagetool/synthesis/es/SpanishSynthesizer.java
trunk/JLanguageTool/src/java/org/languagetool/synthesis/gl/GalicianSynthesizer.java
trunk/JLanguageTool/src/java/org/languagetool/synthesis/nl/DutchSynthesizer.java
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ro/RomanianSynthesizer.java
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ru/RussianSynthesizer.java
trunk/JLanguageTool/src/java/org/languagetool/synthesis/sk/SlovakSynthesizer.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/BaseTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/ast/AsturianTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/br/BretonTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/ca/CatalanTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/cs/CzechTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/da/DanishTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/el/GreekTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/en/EnglishTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/es/SpanishTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/fr/FrenchTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/gl/GalicianTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/it/ItalianTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/km/KhmerTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/ml/MalayalamTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/nl/DutchTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/pl/PolishTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/ro/RomanianTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/ru/RussianTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/sk/SlovakTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/sv/SwedishTagger.java
trunk/JLanguageTool/src/java/org/languagetool/tagging/tl/TagalogTagger.java
trunk/JLanguageTool/src/test/org/languagetool/TestTools.java
Modified: trunk/JLanguageTool/.classpath
===================================================================
--- trunk/JLanguageTool/.classpath 2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/.classpath 2012-06-19 09:44:21 UTC (rev 7408)
@@ -25,7 +25,7 @@
<attribute
name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY"
value="JLanguageTool/libs/native-lib"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib" path="libs/morfologik-stemming-1.5.3.jar"/>
+ <classpathentry kind="lib" path="libs/morfologik-stemming-1.5.3.jar"
sourcepath="/morfologik-stemming"/>
<classpathentry kind="lib" path="libs/morfologik-speller-1.5.4.jar"
sourcepath="/morfologik-speller"/>
<classpathentry exported="true" kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
Modified:
trunk/JLanguageTool/src/java/org/languagetool/synthesis/BaseSynthesizer.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/synthesis/BaseSynthesizer.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/synthesis/BaseSynthesizer.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -13,6 +13,7 @@
import morfologik.stemming.WordData;
import org.languagetool.AnalyzedToken;
+import org.languagetool.JLanguageTool;
import org.languagetool.tools.Tools;
public class BaseSynthesizer implements Synthesizer {
@@ -80,13 +81,13 @@
protected void initPossibleTags() throws IOException {
if (possibleTags == null) {
- possibleTags = SynthesizerTools.loadWords(Tools.getStream(tagFileName));
+ possibleTags =
SynthesizerTools.loadWords(JLanguageTool.getDataBroker().getFromResourceDirAsStream(tagFileName));
}
}
protected void initSynthesizer() throws IOException {
if (synthesizer == null) {
- final URL url = this.getClass().getResource(resourceFileName);
+ final URL url =
JLanguageTool.getDataBroker().getFromResourceDirAsUrl(resourceFileName);
synthesizer = new DictionaryLookup(Dictionary.read(url));
}
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ca/CatalanSynthesizer.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ca/CatalanSynthesizer.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ca/CatalanSynthesizer.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import morfologik.stemming.WordData;
import org.languagetool.AnalyzedToken;
-import org.languagetool.JLanguageTool;
import org.languagetool.synthesis.BaseSynthesizer;
import java.io.IOException;
@@ -66,8 +65,7 @@
private static final Pattern pFemNo = Pattern.compile("host|ira|inxa");
public CatalanSynthesizer() {
- super(JLanguageTool.getDataBroker().getResourceDir() +
RESOURCE_FILENAME,
- JLanguageTool.getDataBroker().getResourceDir()
+ TAGS_FILE_NAME);
+ super(RESOURCE_FILENAME, TAGS_FILE_NAME);
}
@Override
Modified:
trunk/JLanguageTool/src/java/org/languagetool/synthesis/el/GreekSynthesizer.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/synthesis/el/GreekSynthesizer.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/synthesis/el/GreekSynthesizer.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -18,7 +18,6 @@
*/
package org.languagetool.synthesis.el;
-import org.languagetool.JLanguageTool;
import org.languagetool.synthesis.BaseSynthesizer;
/**
@@ -31,7 +30,6 @@
private static final String TAGS_FILE_NAME = "/el/el_tags.txt";
public GreekSynthesizer() {
- super(JLanguageTool.getDataBroker().getResourceDir() +
RESOURCE_FILENAME,
- JLanguageTool.getDataBroker().getResourceDir() +
TAGS_FILE_NAME);
+ super(RESOURCE_FILENAME, TAGS_FILE_NAME);
}
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/synthesis/en/EnglishSynthesizer.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/synthesis/en/EnglishSynthesizer.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/synthesis/en/EnglishSynthesizer.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -59,8 +59,7 @@
private static final String ADD_IND_DETERMINER = "+INDT";
public EnglishSynthesizer() {
- super(JLanguageTool.getDataBroker().getResourceDir() + RESOURCE_FILENAME,
- JLanguageTool.getDataBroker().getResourceDir() +
TAGS_FILE_NAME);
+ super(RESOURCE_FILENAME, TAGS_FILE_NAME);
}
/**
Modified:
trunk/JLanguageTool/src/java/org/languagetool/synthesis/es/SpanishSynthesizer.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/synthesis/es/SpanishSynthesizer.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/synthesis/es/SpanishSynthesizer.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -18,7 +18,6 @@
*/
package org.languagetool.synthesis.es;
-import org.languagetool.JLanguageTool;
import org.languagetool.synthesis.BaseSynthesizer;
/**
@@ -36,8 +35,7 @@
private static final String TAGS_FILE_NAME = "/es/spanish_tags.txt";
public SpanishSynthesizer() {
- super(JLanguageTool.getDataBroker().getResourceDir() + RESOURCE_FILENAME,
- JLanguageTool.getDataBroker().getResourceDir() +
TAGS_FILE_NAME);
+ super(RESOURCE_FILENAME, TAGS_FILE_NAME);
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/synthesis/gl/GalicianSynthesizer.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/synthesis/gl/GalicianSynthesizer.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/synthesis/gl/GalicianSynthesizer.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -18,7 +18,6 @@
*/
package org.languagetool.synthesis.gl;
-import org.languagetool.JLanguageTool;
import org.languagetool.synthesis.BaseSynthesizer;
/**
@@ -36,7 +35,6 @@
private static final String TAGS_FILE_NAME = "/gl/galician_tags.txt";
public GalicianSynthesizer() {
- super(JLanguageTool.getDataBroker().getResourceDir() + RESOURCE_FILENAME,
- JLanguageTool.getDataBroker().getResourceDir() +
TAGS_FILE_NAME);
+ super(RESOURCE_FILENAME, TAGS_FILE_NAME);
}
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/synthesis/nl/DutchSynthesizer.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/synthesis/nl/DutchSynthesizer.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/synthesis/nl/DutchSynthesizer.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -18,7 +18,6 @@
*/
package org.languagetool.synthesis.nl;
-import org.languagetool.JLanguageTool;
import org.languagetool.synthesis.BaseSynthesizer;
/**
@@ -34,8 +33,7 @@
private static final String TAGS_FILE_NAME = "/nl/dutch_tags.txt";
public DutchSynthesizer() {
- super(JLanguageTool.getDataBroker().getResourceDir() + RESOURCE_FILENAME,
- JLanguageTool.getDataBroker().getResourceDir() +
TAGS_FILE_NAME);
+ super(RESOURCE_FILENAME, TAGS_FILE_NAME);
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ro/RomanianSynthesizer.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ro/RomanianSynthesizer.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ro/RomanianSynthesizer.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -40,8 +40,7 @@
private static ManualSynthesizer manualSynthesizer;
public RomanianSynthesizer() {
- super(JLanguageTool.getDataBroker().getResourceDir() + RESOURCE_FILENAME,
- JLanguageTool.getDataBroker().getResourceDir() +
TAGS_FILE_NAME);
+ super(RESOURCE_FILENAME, TAGS_FILE_NAME);
}
@Override
Modified:
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ru/RussianSynthesizer.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ru/RussianSynthesizer.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/synthesis/ru/RussianSynthesizer.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -18,16 +18,14 @@
*/
package org.languagetool.synthesis.ru;
-import org.languagetool.JLanguageTool;
import org.languagetool.synthesis.BaseSynthesizer;
/**
* Russian word form synthesizer. <br/>
* @author Yakov Reztsov
*
- * Based on Dutch word from synthesizer
- *
- * @author Marcin Miłkowski
+ * Based on Dutch word form synthesizer
+ *
*/
public class RussianSynthesizer extends BaseSynthesizer {
@@ -37,8 +35,7 @@
private static final String TAGS_FILE_NAME = "/ru/tags_russian.txt";
public RussianSynthesizer() {
- super(JLanguageTool.getDataBroker().getResourceDir() + RESOURCE_FILENAME,
- JLanguageTool.getDataBroker().getResourceDir() +
TAGS_FILE_NAME);
+ super(RESOURCE_FILENAME, TAGS_FILE_NAME);
}
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/synthesis/sk/SlovakSynthesizer.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/synthesis/sk/SlovakSynthesizer.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/synthesis/sk/SlovakSynthesizer.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -18,7 +18,6 @@
*/
package org.languagetool.synthesis.sk;
-import org.languagetool.JLanguageTool;
import org.languagetool.synthesis.BaseSynthesizer;
/**
@@ -34,7 +33,6 @@
private static final String TAGS_FILE_NAME = "/sk/slovak_tags.txt";
public SlovakSynthesizer() {
- super(JLanguageTool.getDataBroker().getResourceDir() + RESOURCE_FILENAME,
- JLanguageTool.getDataBroker().getResourceDir() +
TAGS_FILE_NAME);
+ super(RESOURCE_FILENAME, TAGS_FILE_NAME);
}
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/tagging/BaseTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/BaseTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/BaseTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -30,6 +30,7 @@
import morfologik.stemming.WordData;
import org.languagetool.AnalyzedToken;
import org.languagetool.AnalyzedTokenReadings;
+import org.languagetool.JLanguageTool;
import org.languagetool.tools.StringTools;
/**
@@ -61,7 +62,7 @@
int pos = 0;
// caching IStemmer instance - lazy init
if (dictLookup == null) {
- final URL url = this.getClass().getResource(getFileName());
+ final URL url =
JLanguageTool.getDataBroker().getFromResourceDirAsUrl(getFileName());
dictLookup = new DictionaryLookup(Dictionary.read(url));
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/ast/AsturianTagger.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/tagging/ast/AsturianTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/tagging/ast/AsturianTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/** Asturian Part-of-speech tagger.
@@ -32,7 +31,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() +
"/ast/asturian.dict";
+ return "/ast/asturian.dict";
}
public AsturianTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/br/BretonTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/br/BretonTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/br/BretonTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -29,10 +29,10 @@
import morfologik.stemming.Dictionary;
import morfologik.stemming.DictionaryLookup;
import morfologik.stemming.IStemmer;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
import org.languagetool.AnalyzedToken;
import org.languagetool.AnalyzedTokenReadings;
+import org.languagetool.JLanguageTool;
import org.languagetool.tools.StringTools;
/** Breton Tagger.
@@ -59,7 +59,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + "/br/breton.dict";
+ return "/br/breton.dict";
}
public BretonTagger() {
@@ -81,7 +81,7 @@
int pos = 0;
// caching IStemmer instance - lazy init
if (dictLookup == null) {
- final URL url = this.getClass().getResource(getFileName());
+ final URL url =
JLanguageTool.getDataBroker().getFromResourceDirAsUrl(getFileName());
dictLookup = new DictionaryLookup(Dictionary.read(url));
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/ca/CatalanTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/ca/CatalanTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/ca/CatalanTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/** Catalan Tagger
@@ -33,7 +32,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + "/ca/catalan.dict";
+ return "/ca/catalan.dict";
}
public CatalanTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/cs/CzechTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/cs/CzechTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/cs/CzechTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -47,7 +47,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + RESOURCE_FILENAME;
+ return RESOURCE_FILENAME;
}
@Override
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/da/DanishTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/da/DanishTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/da/DanishTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/**
@@ -41,7 +40,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + "/da/danish.dict";
+ return "/da/danish.dict";
}
public DanishTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/el/GreekTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/el/GreekTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/el/GreekTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -19,7 +19,6 @@
package org.languagetool.tagging.el;
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/**
@@ -30,7 +29,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + "/el/el.dict";
+ return "/el/el.dict";
}
public GreekTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/en/EnglishTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/en/EnglishTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/en/EnglishTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/** English Part-of-speech tagger.
@@ -34,7 +33,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() +
"/en/english.dict";
+ return "/en/english.dict";
}
public EnglishTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/es/SpanishTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/es/SpanishTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/es/SpanishTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/** Spanish Tagger
@@ -34,7 +33,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() +
"/es/spanish.dict";
+ return "/es/spanish.dict";
}
public SpanishTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/fr/FrenchTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/fr/FrenchTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/fr/FrenchTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/** French Tagger
@@ -33,7 +32,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + "/fr/french.dict";
+ return "/fr/french.dict";
}
public FrenchTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/gl/GalicianTagger.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/tagging/gl/GalicianTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/tagging/gl/GalicianTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/** Galician Part-of-speech tagger.
@@ -34,7 +33,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() +
"/gl/galician.dict";
+ return "/gl/galician.dict";
}
public GalicianTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/it/ItalianTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/it/ItalianTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/it/ItalianTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/**
@@ -36,7 +35,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() +
"/it/italian.dict";
+ return "/it/italian.dict";
}
public ItalianTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/km/KhmerTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/km/KhmerTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/km/KhmerTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/** Khmer Part-of-speech tagger.
@@ -34,7 +33,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + "/km/khmer.dict";
+ return "/km/khmer.dict";
}
public KhmerTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/ml/MalayalamTagger.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/tagging/ml/MalayalamTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/tagging/ml/MalayalamTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -21,7 +21,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/** Malayalam Part-of-speech tagger.
@@ -32,7 +31,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() +
"/ml/malayalam.dict";
+ return "/ml/malayalam.dict";
}
public MalayalamTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/nl/DutchTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/nl/DutchTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/nl/DutchTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/**
@@ -32,7 +31,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + "/nl/dutch.dict";
+ return "/nl/dutch.dict";
}
public DutchTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/pl/PolishTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/pl/PolishTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/pl/PolishTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -47,7 +47,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + RESOURCE_FILENAME;
+ return RESOURCE_FILENAME;
}
@Override
@@ -60,7 +60,7 @@
int pos = 0;
// caching Lametyzator instance - lazy init
if (morfologik == null) {
- final URL url =
JLanguageTool.getDataBroker().getFromResourceDirAsUrl(RESOURCE_FILENAME);
+ final URL url =
JLanguageTool.getDataBroker().getFromResourceDirAsUrl(getFileName());
morfologik = new DictionaryLookup(Dictionary.read(url));
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/ro/RomanianTagger.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/tagging/ro/RomanianTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++
trunk/JLanguageTool/src/java/org/languagetool/tagging/ro/RomanianTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -51,7 +51,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + RESOURCE_FILENAME;
+ return RESOURCE_FILENAME;
}
public RomanianTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/ru/RussianTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/ru/RussianTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/ru/RussianTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/** Part-of-speech tagger.
@@ -33,7 +32,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() +
"/ru/russian.dict";
+ return "/ru/russian.dict";
}
public RussianTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/sk/SlovakTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/sk/SlovakTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/sk/SlovakTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/** Slovak Part-of-speech tagger based on Russian Part-of-speech tagger.
@@ -31,7 +30,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + "/sk/slovak.dict";
+ return "/sk/slovak.dict";
}
public SlovakTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/sv/SwedishTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/sv/SwedishTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/sv/SwedishTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/** Swedish Part-of-speech tagger.
@@ -30,7 +29,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() +
"/sv/swedish.dict";
+ return "/sv/swedish.dict";
}
public SwedishTagger() {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tagging/tl/TagalogTagger.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tagging/tl/TagalogTagger.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/java/org/languagetool/tagging/tl/TagalogTagger.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -20,7 +20,6 @@
import java.util.Locale;
-import org.languagetool.JLanguageTool;
import org.languagetool.tagging.BaseTagger;
/**
@@ -32,7 +31,7 @@
@Override
public final String getFileName() {
- return JLanguageTool.getDataBroker().getResourceDir() + "/tl/tagalog.dict";
+ return "/tl/tagalog.dict";
}
public TagalogTagger() {
Modified: trunk/JLanguageTool/src/test/org/languagetool/TestTools.java
===================================================================
--- trunk/JLanguageTool/src/test/org/languagetool/TestTools.java
2012-06-19 08:50:55 UTC (rev 7407)
+++ trunk/JLanguageTool/src/test/org/languagetool/TestTools.java
2012-06-19 09:44:21 UTC (rev 7408)
@@ -210,7 +210,7 @@
}
public static void testDictionary(BaseTagger tagger, Language language)
throws IOException {
- final Dictionary dictionary =
Dictionary.read(tagger.getClass().getResource(tagger.getFileName()));
+ final Dictionary dictionary =
Dictionary.read(JLanguageTool.getDataBroker().getFromResourceDirAsUrl(tagger.getFileName()));
final DictionaryLookup lookup = new DictionaryLookup(dictionary);
for (WordData wordData : lookup) {
if (wordData.getTag() == null || wordData.getTag().length() == 0) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
