Revision: 7379 http://languagetool.svn.sourceforge.net/languagetool/?rev=7379&view=rev Author: dnaber Date: 2012-06-17 13:28:13 +0000 (Sun, 17 Jun 2012) Log Message: ----------- small whitespace cleanup; improve order of methods
Modified Paths: -------------- trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Indexer.java trunk/JLanguageTool/src/java/org/languagetool/Language.java Modified: trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Indexer.java =================================================================== --- trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Indexer.java 2012-06-17 12:50:26 UTC (rev 7378) +++ trunk/JLanguageTool/src/dev/org/languagetool/dev/index/Indexer.java 2012-06-17 13:28:13 UTC (rev 7379) @@ -102,12 +102,12 @@ public static void run(String content, Directory dir, Language language, boolean isSentence) throws IOException { final BufferedReader br = new BufferedReader(new StringReader(content)); - final Indexer indexer = new Indexer(dir, language); - try { - run(br, indexer, isSentence); - } finally { - indexer.close(); - } + final Indexer indexer = new Indexer(dir, language); + try { + run(br, indexer, isSentence); + } finally { + indexer.close(); + } } public static void run(BufferedReader reader, Indexer indexer, boolean isSentence) throws IOException { Modified: trunk/JLanguageTool/src/java/org/languagetool/Language.java =================================================================== --- trunk/JLanguageTool/src/java/org/languagetool/Language.java 2012-06-17 12:50:26 UTC (rev 7378) +++ trunk/JLanguageTool/src/java/org/languagetool/Language.java 2012-06-17 13:28:13 UTC (rev 7379) @@ -317,34 +317,49 @@ langList.addAll(externalLanguages); return langList; } - + /** + * Get the Language object for the given language name. + * + * @param languageName e.g. <code>English</code> or <code>German</code> (case is significant) + * @return a Language object or <code>null</code> + */ + public static Language getLanguageForName(final String languageName) { + for (Language element : Language.LANGUAGES) { + if (languageName.equals(element.getName())) { + return element; + } + } + return null; + } + + /** * Get the Language object for the given short language name. - * + * * @param shortLanguageCode e.g. <code>en</code> or <code>de</code> * @return a Language object or <code>null</code> */ public static Language getLanguageForShortName(final String shortLanguageCode) { StringTools.assureSet(shortLanguageCode, "shortLanguageCode"); - + if (shortLanguageCode.indexOf('-') != -1) { final String[] parts = shortLanguageCode.split("-"); if (parts.length != 2) { - throw new IllegalArgumentException("'" + shortLanguageCode + "' isn't a valid language code"); + throw new IllegalArgumentException("'" + shortLanguageCode + "' isn't a valid language code"); } for (Language element : Language.LANGUAGES) { if (parts[0].equals(element.getShortName()) - && element.getCountryVariants().length == 1 + && element.getCountryVariants().length == 1 && parts[1].equals(element.getCountryVariants()[0])) { return element; } } throw new IllegalArgumentException("'" + shortLanguageCode + "' is not a language code known to LanguageTool"); - } + } if (shortLanguageCode.length() != "xx".length() && shortLanguageCode.length() != "xxx".length()) { throw new IllegalArgumentException("'" + shortLanguageCode + "' isn't a two- or three-character code"); } - + for (Language element : Language.LANGUAGES) { if (shortLanguageCode.equals(element.getShortName())) { return element; @@ -402,21 +417,6 @@ return null; } - /** - * Get the Language object for the given language name. - * - * @param languageName e.g. <code>English</code> or <code>German</code> (case is significant) - * @return a Language object or <code>null</code> - */ - public static Language getLanguageForName(final String languageName) { - for (Language element : Language.LANGUAGES) { - if (languageName.equals(element.getName())) { - return element; - } - } - return null; - } - @Override public final String toString() { return getName(); 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