Merge branch 'integration/master' of github.com:zanata/zanata into in…

…tegration/master
zanata · Aug 20, 2012 · d67cfa7 · d67cfa7
2 parents 91cfe03 + d525f4a
commit d67cfa7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/zanata-model/pom.xml b/zanata-model/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>net.sf.okapi.steps</groupId>
             <artifactId>okapi-step-wordcount</artifactId>
-            <version>0.9</version>
+            <version>0.17</version>
             <!-- see latest version at http://repository-okapi.forge.cloudbees.com/snapshot/net/sf/okapi/steps/okapi-step-wordcount/ -->
         </dependency>
 

diff --git a/zanata-model/src/main/java/org/zanata/util/OkapiUtil.java b/zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
@@ -70,7 +70,7 @@ public static long countWords(String s, String bcp47Locale)
             locale = LocaleId.ENGLISH;
          }
 
-         Tokens tokens = new StringTokenizer().tokenizeString(s, locale, "WORD");
+         Tokens tokens = StringTokenizer.tokenizeString(s, locale, "WORD");
          return tokens.size();
       }
       catch (Exception e)
@@ -83,11 +83,11 @@ public static long countWords(String s, String bcp47Locale)
 
    private static class StringTokenizer extends Tokenizer
    {
-      public Tokens tokenizeString(String text, LocaleId language, String... tokenNames)
+      public static Tokens tokenizeString(String text, LocaleId language, String... tokenNames)
       {
          synchronized (Tokenizer.class)
          {
-            return super.tokenizeString(text, language, tokenNames);
+            return Tokenizer.tokenizeString(text, language, tokenNames);
          }
       }
    }

diff --git a/zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java b/zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
@@ -36,11 +36,11 @@ public class OkapiUtilTest
       // @formatter:on
    long[] count = 
    {
-         8,
+         2,
          2,
          9,
 //         4+8+7+4+3+5+11+12 = 54 ?
-         49, 7, 2, 3,
+         49, 3, 2, 3,
    };
   @Test
   public void testCountWords()