Revision: 7322
http://languagetool.svn.sourceforge.net/languagetool/?rev=7322&view=rev
Author: milek_pl
Date: 2012-06-12 12:39:07 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
fix the bug in http server: sorting languages could have side-effects
Modified Paths:
--------------
trunk/JLanguageTool/.classpath
trunk/JLanguageTool/src/java/org/languagetool/Language.java
trunk/JLanguageTool/src/java/org/languagetool/server/LanguageToolHttpHandler.java
Modified: trunk/JLanguageTool/.classpath
===================================================================
--- trunk/JLanguageTool/.classpath 2012-06-12 09:47:14 UTC (rev 7321)
+++ trunk/JLanguageTool/.classpath 2012-06-12 12:39:07 UTC (rev 7322)
@@ -41,7 +41,7 @@
<classpathentry kind="lib" path="libs/CJFtransform_v1.0.1_bin.jar"/>
<classpathentry kind="lib" path="libs/commons-validator-1.3.1.jar"/>
<classpathentry kind="lib" path="libs/xml-text-editor-0.0.3.jar"/>
- <classpathentry kind="lib" path="libs/morfologik-fsa-1.5.2.jar"/>
+ <classpathentry kind="lib" path="libs/morfologik-fsa-1.5.2.jar"
sourcepath="C:/Users/user/.m2/repository/org/carrot2/morfologik-fsa/1.5.2/morfologik-fsa-1.5.2-sources.jar"/>
<classpathentry kind="lib" path="libs/morfologik-stemming-1.5.2.jar"
sourcepath="C:/Users/user/.m2/repository/org/carrot2/morfologik-stemming/1.5.2/morfologik-stemming-1.5.2-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/JLanguageTool/src/java/org/languagetool/Language.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/Language.java 2012-06-12
09:47:14 UTC (rev 7321)
+++ trunk/JLanguageTool/src/java/org/languagetool/Language.java 2012-06-12
12:39:07 UTC (rev 7322)
@@ -381,6 +381,7 @@
return null;
}
+ //FIXME: if the list of languages ever gets sorted, we might get unexpected
results!
private static Language getLanguageForLanguageNameOnly(Locale locale) {
for (Language language : Language.REAL_LANGUAGES) {
if (language.getShortName().equals(locale.getLanguage()) &&
!language.hasVariant()) {
Modified:
trunk/JLanguageTool/src/java/org/languagetool/server/LanguageToolHttpHandler.java
===================================================================
---
trunk/JLanguageTool/src/java/org/languagetool/server/LanguageToolHttpHandler.java
2012-06-12 09:47:14 UTC (rev 7321)
+++
trunk/JLanguageTool/src/java/org/languagetool/server/LanguageToolHttpHandler.java
2012-06-12 12:39:07 UTC (rev 7322)
@@ -267,7 +267,8 @@
* @return an xml string containing all supported languages.
*/
public static String getSupportedLanguagesAsXML() {
- final List<Language> languages = Arrays.asList(Language.REAL_LANGUAGES);
+ Language[] languageCopy = Language.REAL_LANGUAGES.clone();
+ final List<Language> languages = Arrays.asList(languageCopy);
Collections.sort(languages, new Comparator<Language>() {
@Override
public int compare(Language o1, Language o2) {
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
