Revision: 6122
http://languagetool.svn.sourceforge.net/languagetool/?rev=6122&view=rev
Author: dnaber
Date: 2011-12-31 15:09:26 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
merge changes back from 1.6 branch
Modified Paths:
--------------
trunk/JLanguageTool/CHANGES.txt
trunk/JLanguageTool/LanguageTool.jnlp
trunk/JLanguageTool/LanguageToolServer.jnlp
trunk/JLanguageTool/README.txt
trunk/JLanguageTool/build.properties
trunk/JLanguageTool/libs/README
trunk/JLanguageTool/src/dev/org/languagetool/dev/wikipedia/CheckWikipediaDump.java
trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
trunk/JLanguageTool/src/java/org/languagetool/Language.java
trunk/JLanguageTool/src/scripts/testwikipedia.sh
Property Changed:
----------------
trunk/JLanguageTool/
Property changes on: trunk/JLanguageTool
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/V_1_5:5611-5614
/branches/mbryant:5075-5236
/tags/V_1_5:5615
+ /branches/V_1_5:5611-5614
/branches/V_1_6:6112-6120
/branches/mbryant:5075-5236
/tags/V_1_5:5615
/tags/V_1_6:6121
Modified: trunk/JLanguageTool/CHANGES.txt
===================================================================
--- trunk/JLanguageTool/CHANGES.txt 2011-12-31 15:01:21 UTC (rev 6121)
+++ trunk/JLanguageTool/CHANGES.txt 2011-12-31 15:09:26 UTC (rev 6122)
@@ -1,14 +1,16 @@
LanguageTool Change Log
-1.6 (release planned for 2011-12-30)
+1.6 (2011-12-31)
-Breton:
- -updated dictionary from Apertium.
+ -updated dictionary from Apertium
-several new rules
- -corrected and improve style of messages, translated all messages
- thanks to Fulup Jakez.
+ -corrected and improved style of messages, translated all messages
+ thanks to Fulup Jakez
-Chinese:
-several new rules (Tao Lin)
+ -English:
+ -new Java rule to check if three successive sentences begin with the same
word
-Esperanto:
-fixed false positives
-updated list of transitive verbs
@@ -17,7 +19,8 @@
-fixed false positives
-German:
-several new rules
- -updated compound splitter component to fix some agreement errors
(jwordsplitter 3.3)
+ -new Java rule to check if three successive sentences begin with the same
word
+ -updated compound splitter component to fix some false alarms on agreement
(jwordsplitter 3.3)
-Italian:
-several new rules (Paolo Bianchini)
-Khmer:
Modified: trunk/JLanguageTool/LanguageTool.jnlp
===================================================================
(Binary files differ)
Modified: trunk/JLanguageTool/LanguageToolServer.jnlp
===================================================================
--- trunk/JLanguageTool/LanguageToolServer.jnlp 2011-12-31 15:01:21 UTC (rev
6121)
+++ trunk/JLanguageTool/LanguageToolServer.jnlp 2011-12-31 15:09:26 UTC (rev
6122)
@@ -24,13 +24,18 @@
<resources>
<j2se version="1.6+" />
- <jar href="@stempelator.lib@" />
+ <jar href="morfologik-stemming-1.5.2.jar" />
+ <jar href="morfologik-fsa-1.5.2.jar" />
+ <jar href="tika-core-0.9.jar" />
<jar href="@segment.lib@" />
<jar href="@logging.lib@" />
+ <jar href="commons-lang-2.4.jar" />
<jar href="rules.jar" />
<jar href="resource.jar" />
<jar href="jWordSplitter.jar" />
- <jar href="LanguageTool.jar" main="true" />
+ <jar href="ictclas4j-1.0.jar" />
+ <jar href="CJFtransform_v1.0.1_bin.jar" />
+ <jar href="LanguageTool.jar" main="true" />
</resources>
<application-desc main-class="org.languagetool.server.HTTPServer">
Modified: trunk/JLanguageTool/README.txt
===================================================================
--- trunk/JLanguageTool/README.txt 2011-12-31 15:01:21 UTC (rev 6121)
+++ trunk/JLanguageTool/README.txt 2011-12-31 15:09:26 UTC (rev 6122)
@@ -1,5 +1,5 @@
LanguageTool, a proof-reading tool for English, German, Polish,
-French, Dutch, Russian, Italian, Danish and more languages
+Chinese, French, Dutch, Russian, Italian, Danish and more languages
(see http://www.languagetool.org/languages/ for a list)
Copyright (C) 2005-2011 Daniel Naber (naber at danielnaber de)
Modified: trunk/JLanguageTool/build.properties
===================================================================
--- trunk/JLanguageTool/build.properties 2011-12-31 15:01:21 UTC (rev
6121)
+++ trunk/JLanguageTool/build.properties 2011-12-31 15:09:26 UTC (rev
6122)
@@ -1,6 +1,6 @@
debug = on
-version = 1.6-dev
+version = 1.6
src.dir = ./src
src.java.dir = ${src.dir}/java
Modified: trunk/JLanguageTool/libs/README
===================================================================
--- trunk/JLanguageTool/libs/README 2011-12-31 15:01:21 UTC (rev 6121)
+++ trunk/JLanguageTool/libs/README 2011-12-31 15:09:26 UTC (rev 6122)
@@ -1,15 +1,17 @@
LanguageTool is published under the GNU Lesser General Public License (LGPL).
-For more detailed license information, see README.txt.
+For more detailed license information, see COPYING.txt and README.txt.
This is the list of libraries used by LanguageTool and their licenses:
+bliki.jar: Eclipse Public License 1.0, http://code.google.com/p/gwtwiki/
commons-lang.jar: Apache License 2.0, http://commons.apache.org/lang/
commons-logging.jar: Apache License 2.0, http://commons.apache.org/logging/
commons-validator.jar: Apache License 2.0, http://commons.apache.org/validator/
-bliki.jar: Eclipse Public License 1.0, http://code.google.com/p/gwtwiki/
[email protected]@: Morfologik-license.txt, http://morfologik.blogspot.com,
http://www.cs.put.poznan.pl/dweiss
+ictclas4j-1.0.jar: ictclas4j-license.txt, Apache License 2.0,
http://code.google.com/p/ictclas4j/
junit.jar: Common Public License - v 1.0, CPL.txt, http://www.junit.org
jWordSplitter.jar: Apache License 2.0, http://www.danielnaber.de/jwordsplitter/
+lucene-*.jar: Apache License 2.0, http://lucene.apache.org
+morfologik-*.jar: Morfologik-license.txt, http://morfologik.blogspot.com,
http://www.cs.put.poznan.pl/dweiss
+segment-1.3.0.jar: segment-license.txt,
http://sourceforge.net/projects/segment/
tika-core-0.9.jar: Apache License 2.0, http://tika.apache.org
-lucene-*.jar: Apache License 2.0, http://lucene.apache.org
xml-text-editor-0.0.3.jar: Apache License 2.0,
http://code.google.com/p/xml-text-editor/
Modified:
trunk/JLanguageTool/src/dev/org/languagetool/dev/wikipedia/CheckWikipediaDump.java
===================================================================
---
trunk/JLanguageTool/src/dev/org/languagetool/dev/wikipedia/CheckWikipediaDump.java
2011-12-31 15:01:21 UTC (rev 6121)
+++
trunk/JLanguageTool/src/dev/org/languagetool/dev/wikipedia/CheckWikipediaDump.java
2011-12-31 15:09:26 UTC (rev 6122)
@@ -97,9 +97,9 @@
private static void ensureCorrectUsageOrExit(String[] args) {
if (args.length < 5 || args.length > 6) {
- System.err.println("Usage: CheckWikipediaDump <propertyFile> <language>
<filename> <ruleIds> [maxArticleCheck]");
+ System.err.println("Usage: CheckWikipediaDump <propertyFile>
<rulePropertyFile> <language> <filename> <ruleIds> [maxArticleCheck]");
System.err.println("\tpropertyFile a file to set database access
properties. Use '-' to print results to stdout.");
- System.err.println("\tpropertyFile a file to set rules which should be
disabled per language (e.g. en=RULE1,RULE2 or all=RULE3,RULE4). Use an empty
file if not valid.");
+ System.err.println("\trulePropertyFile a file to set rules which should
be disabled per language (e.g. en=RULE1,RULE2 or all=RULE3,RULE4). Use '-' to
ignore.");
System.err.println("\tlanguage languagecode like 'en' or 'de'");
System.err.println("\tfilename path to unpacked Wikipedia XML dump");
System.err.println("\truleIds comma-separated list of rule-ids to
activate. Use '-' to activate the default rules.");
@@ -161,13 +161,13 @@
final String filename = file.getName();
final String[] parts = filename.split("-");
if (parts.length < 3) {
- throw new IOException("Unexpected filename format: " + file.getName() +
". Must be like ??wiki-????????-pages-articles.xml");
+ throw new IOException("Unexpected filename format: " + file.getName() +
", must be like ??wiki-????????-pages-articles.xml");
}
final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
try {
return sdf.parse(parts[1]);
} catch (ParseException e) {
- throw new IOException("Unexpected date format: " + parts[1], e);
+ throw new IOException("Unexpected date format '" + parts[1] + "', must
be yyyymmdd", e);
}
}
Modified: trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
2011-12-31 15:01:21 UTC (rev 6121)
+++ trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
2011-12-31 15:09:26 UTC (rev 6122)
@@ -61,7 +61,7 @@
@SuppressWarnings({"UnusedDeclaration"})
public final class JLanguageTool {
- public static final String VERSION = "1.6-dev"; // keep in sync with
build.properties!
+ public static final String VERSION = "1.6"; // keep in sync with
build.properties!
public static final String BUILD_DATE = getBuildDate();
public static final String PATTERN_FILE = "grammar.xml";
Modified: trunk/JLanguageTool/src/java/org/languagetool/Language.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/Language.java 2011-12-31
15:01:21 UTC (rev 6121)
+++ trunk/JLanguageTool/src/java/org/languagetool/Language.java 2011-12-31
15:09:26 UTC (rev 6122)
@@ -18,12 +18,7 @@
*/
package org.languagetool;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
+import java.util.*;
import org.languagetool.language.*;
import org.languagetool.rules.Rule;
@@ -300,7 +295,7 @@
}
/**
- * Get sorted info about all maintainers.
+ * Get sorted info about all maintainers to be used in the About dialog.
* @since 0.9.9
* @param messages
* {{@link ResourceBundle} language bundle to translate
@@ -319,13 +314,13 @@
names.add(contributor.getName());
}
toSort.add(messages.getString(lang.getShortName()) +
- ": " + StringTools.listToString(names, ", "));
+ ": " + listToStringWithLineBreaks(names));
}
}
}
Collections.sort(toSort);
- for (final String lElem : toSort) {
- maintainersInfo.append(lElem);
+ for (final String lElem : toSort) {
+ maintainersInfo.append(lElem);
maintainersInfo.append('\n');
}
return maintainersInfo.toString();
@@ -335,4 +330,22 @@
return false;
}
+ private static String listToStringWithLineBreaks(final Collection<String> l)
{
+ final StringBuilder sb = new StringBuilder();
+ int i = 0;
+ for (final Iterator<String> iter = l.iterator(); iter.hasNext();) {
+ final String str = iter.next();
+ sb.append(str);
+ if (iter.hasNext()) {
+ if (i > 0 && i % 3 == 0) {
+ sb.append(",\n ");
+ } else {
+ sb.append(", ");
+ }
+ }
+ i++;
+ }
+ return sb.toString();
+ }
+
}
Modified: trunk/JLanguageTool/src/scripts/testwikipedia.sh
===================================================================
--- trunk/JLanguageTool/src/scripts/testwikipedia.sh 2011-12-31 15:01:21 UTC
(rev 6121)
+++ trunk/JLanguageTool/src/scripts/testwikipedia.sh 2011-12-31 15:09:26 UTC
(rev 6122)
@@ -2,4 +2,4 @@
: ${3?"Usage: $0 <lang> <wikipediaXmlDump> <ruleIds> (where <lang> is a
language code like 'en' or 'de', <ruleIds> is a comma-separated list of rules
to be activated or '-' for the default rules)"}
-java -Xmx512M -cp commons-lang-2.4.jar:bliki-3.0.3.jar:LanguageTool.jar
org.languagetool.dev.wikipedia.CheckWikipediaDump - $1 $2 $3
+java -Xmx512M -cp commons-lang-2.4.jar:bliki-3.0.3.jar:LanguageTool.jar
org.languagetool.dev.wikipedia.CheckWikipediaDump - - $1 $2 $3
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
