Revision: 6294 http://languagetool.svn.sourceforge.net/languagetool/?rev=6294&view=rev Author: dnaber Date: 2012-01-19 21:07:56 +0000 (Thu, 19 Jan 2012) Log Message: ----------- another small code cleanup
Modified Paths: -------------- trunk/JLanguageTool/src/java/org/languagetool/Main.java Modified: trunk/JLanguageTool/src/java/org/languagetool/Main.java =================================================================== --- trunk/JLanguageTool/src/java/org/languagetool/Main.java 2012-01-19 21:00:26 UTC (rev 6293) +++ trunk/JLanguageTool/src/java/org/languagetool/Main.java 2012-01-19 21:07:56 UTC (rev 6294) @@ -612,29 +612,23 @@ // TODO: alter tika's language profiles so they are in line with LT's supported languages private static Language detectLanguageOfFile(String filename, String encoding) throws IOException { final String text = StringTools.readFile(new FileInputStream(filename), encoding); + return detectLanguageOfString(text); + } + + private static Language detectLanguageOfString(String text) { final LanguageIdentifier identifier = new LanguageIdentifier(text); final Language lang = Language.getLanguageForShortName(identifier.getLanguage()); return lang; } - private static Language detectLanguageOfString(String string) { - final LanguageIdentifier identifier = new LanguageIdentifier(string); - final Language lang = Language.getLanguageForShortName(identifier.getLanguage()); - return lang; - } - - private static Language getLanguageOrExit(final String userSuppliedLang) { - Language language = null; - final List<String> supportedLanguages = new ArrayList<String>(); - for (final Language lang : Language.LANGUAGES) { - supportedLanguages.add(lang.getShortName()); - if (userSuppliedLang.equals(lang.getShortName())) { - language = lang; - break; - } - } + private static Language getLanguageOrExit(final String userSuppliedLangCode) { + final Language language = Language.getLanguageForShortName(userSuppliedLangCode); if (language == null) { - System.out.println("Unknown language '" + userSuppliedLang + final List<String> supportedLanguages = new ArrayList<String>(); + for (final Language lang : Language.LANGUAGES) { + supportedLanguages.add(lang.getShortName()); + } + System.out.println("Unknown language '" + userSuppliedLangCode + "'. Supported languages are: " + supportedLanguages); exitWithUsageMessage(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Keep Your Developer Skills Current with LearnDevNow! 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-d2d _______________________________________________ Languagetool-cvs mailing list Languagetool-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/languagetool-cvs