Revision: 7984
http://languagetool.svn.sourceforge.net/languagetool/?rev=7984&view=rev
Author: dnaber
Date: 2012-09-04 21:18:07 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
fix writing of ignore.txt files: adapt paths; read and write files in UTF-8
Modified Paths:
--------------
trunk/JLanguageTool/src/main/java/org/languagetool/rules/spelling/SpellingCheckRule.java
trunk/JLanguageTool/src/main/java/org/languagetool/rules/spelling/SuggestionExtractor.java
Modified:
trunk/JLanguageTool/src/main/java/org/languagetool/rules/spelling/SpellingCheckRule.java
===================================================================
---
trunk/JLanguageTool/src/main/java/org/languagetool/rules/spelling/SpellingCheckRule.java
2012-09-04 21:16:59 UTC (rev 7983)
+++
trunk/JLanguageTool/src/main/java/org/languagetool/rules/spelling/SpellingCheckRule.java
2012-09-04 21:18:07 UTC (rev 7984)
@@ -115,7 +115,7 @@
private void loadWordsToBeIgnored(String ignoreFile) throws IOException {
final InputStream inputStream =
JLanguageTool.getDataBroker().getFromResourceDirAsStream(ignoreFile);
try {
- final Scanner scanner = new Scanner(inputStream);
+ final Scanner scanner = new Scanner(inputStream, "utf-8");
try {
while (scanner.hasNextLine()) {
final String line = scanner.nextLine();
Modified:
trunk/JLanguageTool/src/main/java/org/languagetool/rules/spelling/SuggestionExtractor.java
===================================================================
---
trunk/JLanguageTool/src/main/java/org/languagetool/rules/spelling/SuggestionExtractor.java
2012-09-04 21:16:59 UTC (rev 7983)
+++
trunk/JLanguageTool/src/main/java/org/languagetool/rules/spelling/SuggestionExtractor.java
2012-09-04 21:18:07 UTC (rev 7984)
@@ -25,9 +25,7 @@
import org.languagetool.rules.RuleMatch;
import org.languagetool.rules.patterns.PatternRule;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -110,7 +108,8 @@
}
final File ignoreFile = new File(hunspellDir, "ignore.txt");
final Set<String> tokens = entry.getValue();
- final FileWriter writer = new FileWriter(ignoreFile);
+ final FileOutputStream fos = new FileOutputStream(ignoreFile);
+ final OutputStreamWriter writer = new OutputStreamWriter(fos, "utf-8");
try {
writeIntro(writer, language);
for (String token : tokens) {
@@ -119,17 +118,18 @@
}
} finally {
writer.close();
+ fos.close();
}
System.out.println("Wrote " + tokens.size() + " words to " + ignoreFile);
}
}
- private void writeIntro(FileWriter writer, Language language) throws
IOException {
+ private void writeIntro(Writer writer, Language language) throws IOException
{
writer.write("# words to be ignored by the spellchecker
(auto-generated)\n");
writeArtificialTestCaseItems(writer, language);
}
- private void writeArtificialTestCaseItems(FileWriter writer, Language
language) throws IOException {
+ private void writeArtificialTestCaseItems(Writer writer, Language language)
throws IOException {
if (language == Language.AMERICAN_ENGLISH) {
writer.write("anArtificialTestWordForLanguageTool\n");
} else if (language == Language.GERMANY_GERMAN) {
@@ -181,13 +181,12 @@
}
private File getLanguageDir(Language language) {
- final File dir = new File("resource", language.getShortName());
+ final File dir = new File("org/languagetool/resource",
language.getShortName());
if (dir.exists()) {
return dir;
} else {
// during development (in SVN):
- final File sourceDir = new File("src", "resource");
- return new File(sourceDir, language.getShortName());
+ return new File("src/main/resources/org/languagetool/resource/",
language.getShortName());
}
}
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
Languagetool-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
