Revision: 7380
http://languagetool.svn.sourceforge.net/languagetool/?rev=7380&view=rev
Author: dnaber
Date: 2012-06-17 14:06:03 +0000 (Sun, 17 Jun 2012)
Log Message:
-----------
make the API more type-safe by not using String parameter
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/language/Belarusian.java
trunk/JLanguageTool/src/java/org/languagetool/language/Catalan.java
trunk/JLanguageTool/src/java/org/languagetool/language/Danish.java
trunk/JLanguageTool/src/java/org/languagetool/language/Dutch.java
trunk/JLanguageTool/src/java/org/languagetool/language/English.java
trunk/JLanguageTool/src/java/org/languagetool/language/Esperanto.java
trunk/JLanguageTool/src/java/org/languagetool/language/Galician.java
trunk/JLanguageTool/src/java/org/languagetool/language/German.java
trunk/JLanguageTool/src/java/org/languagetool/language/Greek.java
trunk/JLanguageTool/src/java/org/languagetool/language/Icelandic.java
trunk/JLanguageTool/src/java/org/languagetool/language/Khmer.java
trunk/JLanguageTool/src/java/org/languagetool/language/Malayalam.java
trunk/JLanguageTool/src/java/org/languagetool/language/Polish.java
trunk/JLanguageTool/src/java/org/languagetool/language/Portuguese.java
trunk/JLanguageTool/src/java/org/languagetool/language/Romanian.java
trunk/JLanguageTool/src/java/org/languagetool/language/Russian.java
trunk/JLanguageTool/src/java/org/languagetool/language/Slovak.java
trunk/JLanguageTool/src/java/org/languagetool/language/Slovenian.java
trunk/JLanguageTool/src/java/org/languagetool/language/Spanish.java
trunk/JLanguageTool/src/java/org/languagetool/language/Ukrainian.java
trunk/JLanguageTool/src/java/org/languagetool/tokenizers/SRXSentenceTokenizer.java
trunk/JLanguageTool/src/test/org/languagetool/tagging/disambiguation/PolishChunkerTest.java
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/RussianSRXSentenceTokenizerTest.java
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/SRXSentenceTokenizerTest.java
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/da/DanishSRXSentenceTokenizerTest.java
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/de/GermanSRXSentenceTokenizerTest.java
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/nl/DutchSRXSentenceTokenizerTest.java
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/pl/PolishSentenceTokenizerTest.java
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/ro/RomanianSentenceTokenizerTest.java
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/sk/SlovakSentenceTokenizerTest.java
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Belarusian.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Belarusian.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Belarusian.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -71,7 +71,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Catalan.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Catalan.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Catalan.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -126,7 +126,7 @@
@Override
public final SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Danish.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Danish.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Danish.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -74,7 +74,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Dutch.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Dutch.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Dutch.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -91,7 +91,7 @@
@Override
public final SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/English.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/English.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/English.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -55,7 +55,7 @@
@Override
public final SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Esperanto.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Esperanto.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Esperanto.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -47,7 +47,7 @@
@Override
public final SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Galician.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Galician.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Galician.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -55,7 +55,7 @@
@Override
public final SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/German.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/German.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/German.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -80,7 +80,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Greek.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Greek.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Greek.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -100,7 +100,7 @@
@Override
public final SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Icelandic.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Icelandic.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Icelandic.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -73,7 +73,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Khmer.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Khmer.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Khmer.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -73,7 +73,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Malayalam.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Malayalam.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Malayalam.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -44,7 +44,7 @@
@Override
public final SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer("en");
+ sentenceTokenizer = new SRXSentenceTokenizer(Language.ENGLISH);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Polish.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Polish.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Polish.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -79,7 +79,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Portuguese.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Portuguese.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Portuguese.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -81,7 +81,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Romanian.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Romanian.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Romanian.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -142,7 +142,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Russian.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Russian.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Russian.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -93,7 +93,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Slovak.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Slovak.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Slovak.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -87,7 +87,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Slovenian.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Slovenian.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Slovenian.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -63,7 +63,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Spanish.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Spanish.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Spanish.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -130,7 +130,7 @@
@Override
public final SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/language/Ukrainian.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/Ukrainian.java
2012-06-17 13:28:13 UTC (rev 7379)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/Ukrainian.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -76,7 +76,7 @@
@Override
public SentenceTokenizer getSentenceTokenizer() {
if (sentenceTokenizer == null) {
- sentenceTokenizer = new SRXSentenceTokenizer(getShortName());
+ sentenceTokenizer = new SRXSentenceTokenizer(this);
}
return sentenceTokenizer;
}
Modified:
trunk/JLanguageTool/src/java/org/languagetool/tokenizers/SRXSentenceTokenizer.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/tokenizers/SRXSentenceTokenizer.java
2012-06-17 13:28:13 UTC (rev 7379)
+++
trunk/JLanguageTool/src/java/org/languagetool/tokenizers/SRXSentenceTokenizer.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -24,6 +24,7 @@
import net.sourceforge.segment.srx.SrxTextIterator;
import net.sourceforge.segment.srx.io.Srx2SaxParser;
import org.languagetool.JLanguageTool;
+import org.languagetool.Language;
import java.io.BufferedReader;
import java.io.IOException;
@@ -44,7 +45,7 @@
private static final String RULES = "/segment.srx";
private static final SrxDocument document = createSrxDocument();
- private final String language;
+ private final String languageCode;
private String parCode;
@@ -77,15 +78,15 @@
}
}
- public SRXSentenceTokenizer(final String language) {
- this.language = language;
+ public SRXSentenceTokenizer(final Language language) {
+ this.languageCode = language.getShortName();
setSingleLineBreaksMarksParagraph(false);
}
@Override
public final List<String> tokenize(final String text) {
final List<String> segments = new ArrayList<String>();
- final TextIterator textIterator = new SrxTextIterator(document, language +
parCode, text);
+ final TextIterator textIterator = new SrxTextIterator(document,
languageCode + parCode, text);
while (textIterator.hasNext()) {
segments.add(textIterator.next());
}
Modified:
trunk/JLanguageTool/src/test/org/languagetool/tagging/disambiguation/PolishChunkerTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/tagging/disambiguation/PolishChunkerTest.java
2012-06-17 13:28:13 UTC (rev 7379)
+++
trunk/JLanguageTool/src/test/org/languagetool/tagging/disambiguation/PolishChunkerTest.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -22,6 +22,7 @@
import java.io.IOException;
import junit.framework.TestCase;
+import org.languagetool.Language;
import org.languagetool.TestTools;
import org.languagetool.tagging.pl.PolishTagger;
import org.languagetool.tokenizers.SentenceTokenizer;
@@ -38,7 +39,7 @@
public void setUp() {
tagger = new PolishTagger();
tokenizer = new WordTokenizer();
- sentenceTokenizer = new SRXSentenceTokenizer("pl");
+ sentenceTokenizer = new SRXSentenceTokenizer(Language.POLISH);
disambiguator = new MultiWordChunker("/pl/multiwords.txt");
}
Modified:
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/RussianSRXSentenceTokenizerTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/RussianSRXSentenceTokenizerTest.java
2012-06-17 13:28:13 UTC (rev 7379)
+++
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/RussianSRXSentenceTokenizerTest.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -20,6 +20,7 @@
package org.languagetool.tokenizers;
import junit.framework.TestCase;
+import org.languagetool.Language;
import org.languagetool.TestTools;
/*
@@ -31,9 +32,9 @@
public class RussianSRXSentenceTokenizerTest extends TestCase {
// accept \n as paragraph:
- private SentenceTokenizer stokenizer = new SRXSentenceTokenizer("ru");
+ private final SentenceTokenizer stokenizer = new
SRXSentenceTokenizer(Language.RUSSIAN);
// accept only \n\n as paragraph:
- private SentenceTokenizer stokenizer2 = new SRXSentenceTokenizer("ru");
+ private final SentenceTokenizer stokenizer2 = new
SRXSentenceTokenizer(Language.RUSSIAN);
public final void setUp() {
Modified:
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/SRXSentenceTokenizerTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/SRXSentenceTokenizerTest.java
2012-06-17 13:28:13 UTC (rev 7379)
+++
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/SRXSentenceTokenizerTest.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -28,9 +28,9 @@
public class SRXSentenceTokenizerTest extends TestCase {
// accept \n as paragraph:
- private SentenceTokenizer stokenizer = new SRXSentenceTokenizer("en");
+ private final SentenceTokenizer stokenizer = new
SRXSentenceTokenizer(Language.ENGLISH);
// accept only \n\n as paragraph:
- private SentenceTokenizer stokenizer2 = new SRXSentenceTokenizer("en");
+ private final SentenceTokenizer stokenizer2 = new
SRXSentenceTokenizer(Language.ENGLISH);
public void setUp() {
stokenizer.setSingleLineBreaksMarksParagraph(true);
@@ -114,7 +114,7 @@
continue;
}
final String input = "A sentence.\u0002 And another one.";
- final SentenceTokenizer tokenizer = new
SRXSentenceTokenizer(language.getShortName());
+ final SentenceTokenizer tokenizer = new SRXSentenceTokenizer(language);
assertEquals("Sentence not split correctly for " + language + ": '" +
input + "'",
"[A sentence.\u0002 , And another one.]",
tokenizer.tokenize(input).toString());
}
Modified:
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/da/DanishSRXSentenceTokenizerTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/da/DanishSRXSentenceTokenizerTest.java
2012-06-17 13:28:13 UTC (rev 7379)
+++
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/da/DanishSRXSentenceTokenizerTest.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -19,6 +19,7 @@
package org.languagetool.tokenizers.da;
import junit.framework.TestCase;
+import org.languagetool.Language;
import org.languagetool.TestTools;
import org.languagetool.tokenizers.SRXSentenceTokenizer;
@@ -28,7 +29,7 @@
public class DanishSRXSentenceTokenizerTest extends TestCase {
// accept \n as paragraph:
- private final SRXSentenceTokenizer stokenizer = new
SRXSentenceTokenizer("da");
+ private final SRXSentenceTokenizer stokenizer = new
SRXSentenceTokenizer(Language.DANISH);
public void setUp() {
stokenizer.setSingleLineBreaksMarksParagraph(true);
Modified:
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/de/GermanSRXSentenceTokenizerTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/de/GermanSRXSentenceTokenizerTest.java
2012-06-17 13:28:13 UTC (rev 7379)
+++
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/de/GermanSRXSentenceTokenizerTest.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -19,6 +19,7 @@
package org.languagetool.tokenizers.de;
import junit.framework.TestCase;
+import org.languagetool.Language;
import org.languagetool.TestTools;
import org.languagetool.tokenizers.SRXSentenceTokenizer;
@@ -28,9 +29,9 @@
public class GermanSRXSentenceTokenizerTest extends TestCase {
// accept \n as paragraph:
- private SRXSentenceTokenizer stokenizer = new SRXSentenceTokenizer("de");
+ private final SRXSentenceTokenizer stokenizer = new
SRXSentenceTokenizer(Language.GERMAN);
// accept only \n\n as paragraph:
- private SRXSentenceTokenizer stokenizer2 = new SRXSentenceTokenizer("de");
+ private final SRXSentenceTokenizer stokenizer2 = new
SRXSentenceTokenizer(Language.GERMAN);
public void setUp() {
stokenizer.setSingleLineBreaksMarksParagraph(true);
Modified:
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/nl/DutchSRXSentenceTokenizerTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/nl/DutchSRXSentenceTokenizerTest.java
2012-06-17 13:28:13 UTC (rev 7379)
+++
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/nl/DutchSRXSentenceTokenizerTest.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -19,6 +19,7 @@
package org.languagetool.tokenizers.nl;
import junit.framework.TestCase;
+import org.languagetool.Language;
import org.languagetool.TestTools;
import org.languagetool.tokenizers.SRXSentenceTokenizer;
@@ -28,7 +29,7 @@
*/
public class DutchSRXSentenceTokenizerTest extends TestCase {
- private SRXSentenceTokenizer stokenizer = new SRXSentenceTokenizer("nl");
+ private final SRXSentenceTokenizer stokenizer = new
SRXSentenceTokenizer(Language.DUTCH);
public void setUp() {
stokenizer.setSingleLineBreaksMarksParagraph(true);
Modified:
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/pl/PolishSentenceTokenizerTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/pl/PolishSentenceTokenizerTest.java
2012-06-17 13:28:13 UTC (rev 7379)
+++
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/pl/PolishSentenceTokenizerTest.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -20,6 +20,7 @@
package org.languagetool.tokenizers.pl;
import junit.framework.TestCase;
+import org.languagetool.Language;
import org.languagetool.TestTools;
import org.languagetool.tokenizers.SentenceTokenizer;
import org.languagetool.tokenizers.SRXSentenceTokenizer;
@@ -27,9 +28,9 @@
public class PolishSentenceTokenizerTest extends TestCase {
// accept \n as paragraph:
- private SentenceTokenizer stokenizer = new SRXSentenceTokenizer("pl");
+ private final SentenceTokenizer stokenizer = new
SRXSentenceTokenizer(Language.POLISH);
// accept only \n\n as paragraph:
- private SentenceTokenizer stokenizer2 = new SRXSentenceTokenizer("pl");
+ private final SentenceTokenizer stokenizer2 = new
SRXSentenceTokenizer(Language.POLISH);
public final void setUp() {
stokenizer.setSingleLineBreaksMarksParagraph(true);
@@ -145,7 +146,7 @@
testSplit(new String[] { "Mam w magazynie dwie skrzynie LMD20. ", "Jestem
żołnierzem i wiem, jak można ich użyć"});
}
- private final void testSplit(final String[] sentences) {
+ private void testSplit(final String[] sentences) {
TestTools.testSplit(sentences, stokenizer2);
}
Modified:
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/ro/RomanianSentenceTokenizerTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/ro/RomanianSentenceTokenizerTest.java
2012-06-17 13:28:13 UTC (rev 7379)
+++
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/ro/RomanianSentenceTokenizerTest.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -19,6 +19,7 @@
package org.languagetool.tokenizers.ro;
import junit.framework.TestCase;
+import org.languagetool.Language;
import org.languagetool.TestTools;
import org.languagetool.tokenizers.SRXSentenceTokenizer;
import org.languagetool.tokenizers.SentenceTokenizer;
@@ -32,9 +33,9 @@
public class RomanianSentenceTokenizerTest extends TestCase {
// accept \n as paragraph:
- private SentenceTokenizer stokenizer = new SRXSentenceTokenizer("ro");
+ private final SentenceTokenizer stokenizer = new
SRXSentenceTokenizer(Language.ROMANIAN);
// accept only \n\n as paragraph:
- private SentenceTokenizer stokenizer2 = new
SRXSentenceTokenizer("ro");
+ private final SentenceTokenizer stokenizer2 = new
SRXSentenceTokenizer(Language.ROMANIAN);
public final void setUp() {
stokenizer.setSingleLineBreaksMarksParagraph(true);
Modified:
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/sk/SlovakSentenceTokenizerTest.java
===================================================================
---
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/sk/SlovakSentenceTokenizerTest.java
2012-06-17 13:28:13 UTC (rev 7379)
+++
trunk/JLanguageTool/src/test/org/languagetool/tokenizers/sk/SlovakSentenceTokenizerTest.java
2012-06-17 14:06:03 UTC (rev 7380)
@@ -20,6 +20,7 @@
package org.languagetool.tokenizers.sk;
import junit.framework.TestCase;
+import org.languagetool.Language;
import org.languagetool.TestTools;
import org.languagetool.tokenizers.SentenceTokenizer;
import org.languagetool.tokenizers.SRXSentenceTokenizer;
@@ -27,9 +28,9 @@
public class SlovakSentenceTokenizerTest extends TestCase {
// accept \n as paragraph:
- private SentenceTokenizer stokenizer = new SRXSentenceTokenizer("sk");
+ private final SentenceTokenizer stokenizer = new
SRXSentenceTokenizer(Language.SLOVAK);
// accept only \n\n as paragraph:
- private SentenceTokenizer stokenizer2 = new SRXSentenceTokenizer("sk");
+ private final SentenceTokenizer stokenizer2 = new
SRXSentenceTokenizer(Language.SLOVAK);
public final void setUp() {
stokenizer.setSingleLineBreaksMarksParagraph(true);
@@ -136,7 +137,7 @@
"He lives in Spain now." });
}
- private final void testSplit(final String[] sentences) {
+ private void testSplit(final String[] sentences) {
TestTools.testSplit(sentences, stokenizer2);
}
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
