Revision: 6369
http://languagetool.svn.sourceforge.net/languagetool/?rev=6369&view=rev
Author: dnaber
Date: 2012-01-29 11:33:53 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
small code cleanup
Modified Paths:
--------------
trunk/JLanguageTool/src/java/org/languagetool/Main.java
trunk/JLanguageTool/src/java/org/languagetool/openoffice/Main.java
Modified: trunk/JLanguageTool/src/java/org/languagetool/Main.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/Main.java 2012-01-29
06:14:32 UTC (rev 6368)
+++ trunk/JLanguageTool/src/java/org/languagetool/Main.java 2012-01-29
11:33:53 UTC (rev 6369)
@@ -164,22 +164,16 @@
boolean oneTime = false;
if (!"-".equals(filename)) {
if (autoDetect) {
- Language language = detectLanguageOfFile(filename, encoding);
- if (language == null) {
- System.err.println("Could not detect language well enough, using
English");
- language = Language.ENGLISH;
- }
- try {
- changeLanguage(language, motherTongue, disabledRules,
enabledRules);
- } catch (SAXException e) {
- e.printStackTrace();
- } catch (ParserConfigurationException e) {
- e.printStackTrace();
- }
- System.out.println("Using " + language.getName() + " for file " +
filename);
+ Language language = detectLanguageOfFile(filename, encoding);
+ if (language == null) {
+ System.err.println("Could not detect language well enough, using
English");
+ language = Language.ENGLISH;
+ }
+ changeLanguage(language, motherTongue, disabledRules, enabledRules);
+ System.out.println("Using " + language.getName() + " for file " +
filename);
}
final File file = new File(filename);
- // run once on file if the file size < MAXFILESIZE or
+ // run once on file if the file size < MAX_FILE_SIZE or
// when we use the bitext mode (we use a bitext reader
// instead of a direct file access)
oneTime = file.length() < MAX_FILE_SIZE || bitextMode;
@@ -256,22 +250,16 @@
sb.append(line);
lineCount++;
// to detect language from the first input line
- if (lineCount == 1 && autoDetect) {
- Language language = detectLanguageOfString(line);
- if (language == null) {
- System.err.println("Could not detect language well enough,
using English");
- language = Language.ENGLISH;
- }
- System.out.println("Language used is: " + language.getName());
-
language.getSentenceTokenizer().setSingleLineBreaksMarksParagraph(
- singleLineBreakMarksParagraph);
- try {
- changeLanguage(language, motherTongue, disabledRules,
enabledRules);
- } catch (SAXException e) {
- e.printStackTrace();
- } catch (ParserConfigurationException e) {
- e.printStackTrace();
- }
+ if (lineCount == 1 && autoDetect) {
+ Language language = detectLanguageOfString(line);
+ if (language == null) {
+ System.err.println("Could not detect language well enough, using
English");
+ language = Language.ENGLISH;
+ }
+ System.out.println("Language used is: " + language.getName());
+ language.getSentenceTokenizer().setSingleLineBreaksMarksParagraph(
+ singleLineBreakMarksParagraph);
+ changeLanguage(language, motherTongue, disabledRules,
enabledRules);
}
sb.append('\n');
tmpLineOffset++;
@@ -634,9 +622,10 @@
}
return language;
}
-
- private void changeLanguage(Language language, Language motherTongue,
- String[] disabledRules, String[] enabledRules ) throws IOException,
SAXException, ParserConfigurationException {
+
+ private void changeLanguage(Language language, Language motherTongue,
+ String[] disabledRules, String[] enabledRules) {
+ try {
lt = new JLanguageTool(language, motherTongue);
lt.activateDefaultPatternRules();
lt.activateDefaultFalseFriendRules();
@@ -644,6 +633,9 @@
if (verbose) {
lt.setOutput(System.err);
}
+ } catch (Exception e) {
+ throw new RuntimeException("Could not create LanguageTool instance for
language " + language, e);
+ }
}
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/openoffice/Main.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/openoffice/Main.java
2012-01-29 06:14:32 UTC (rev 6368)
+++ trunk/JLanguageTool/src/java/org/languagetool/openoffice/Main.java
2012-01-29 11:33:53 UTC (rev 6369)
@@ -255,13 +255,11 @@
private synchronized ProofreadingResult doGrammarCheckingInternal(
final String paraText, final Locale locale, final ProofreadingResult
paRes) {
- if (!StringTools.isEmpty(paraText)
- && hasLocale(locale)) {
+ if (!StringTools.isEmpty(paraText) && hasLocale(locale)) {
// caching the instance of LT
- if (!Language.getLanguageForShortName(locale.Language).equals(
- docLanguage)
- || langTool == null || recheck) {
- docLanguage = Language.getLanguageForShortName(locale.Language);
+ final Language langForShortName =
Language.getLanguageForShortName(locale.Language);
+ if (!langForShortName.equals(docLanguage) || langTool == null ||
recheck) {
+ docLanguage = langForShortName;
if (docLanguage == null) {
return paRes;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
