Make addLocalizedErrorFromToken variadic function

redpen-cc · Oct 9, 2017 · 98ccea6 · 98ccea6
1 parent b0165b0
commit 98ccea6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/redpen-core/src/main/java/cc/redpen/validator/JavaScriptLoader.java b/redpen-core/src/main/java/cc/redpen/validator/JavaScriptLoader.java
@@ -169,8 +169,8 @@ public void addLocalizedError(String messageKey, Sentence sentenceWithError, Obj
     }
 
     @Override
-    public void addLocalizedErrorFromToken(Sentence sentenceWithError, TokenElement token) {
-        super.addLocalizedErrorFromToken(sentenceWithError, token);
+    public void addLocalizedErrorFromToken(Sentence sentenceWithError, TokenElement token, Object... args) {
+        super.addLocalizedErrorFromToken(sentenceWithError, token, args);
     }
 
     @Override

diff --git a/redpen-core/src/main/java/cc/redpen/validator/Validator.java b/redpen-core/src/main/java/cc/redpen/validator/Validator.java
@@ -404,13 +404,15 @@ protected void addLocalizedError(String messageKey, Sentence sentenceWithError,
      * @param sentenceWithError sentence
      * @param token             the TokenElement that has the error
      */
-    protected void addLocalizedErrorFromToken(Sentence sentenceWithError, TokenElement token) {
+    protected void addLocalizedErrorFromToken(Sentence sentenceWithError, TokenElement token, Object... args) {
+        List<Object> argList = new ArrayList<>();
+        for(Object o : args) argList.add(o);
+        argList.add(0, token.getSurface());
         addLocalizedErrorWithPosition(
                 sentenceWithError,
                 token.getOffset(),
                 token.getOffset() + token.getSurface().length(),
-                token.getSurface(),
-                getLevel()
+                argList.toArray()
         );
     }
 

diff --git a/...core/src/main/java/cc/redpen/validator/document/JapaneseExpressionVariationValidator.java b/...core/src/main/java/cc/redpen/validator/document/JapaneseExpressionVariationValidator.java
@@ -44,7 +44,7 @@ public void validate(Document document) {
                 List<TokenElement> tokens = this.words.get(reading);
                 for (TokenElement candidate : tokens) {
                     if (candidate != token && !token.getSurface().equals(candidate.getSurface())) {
-                        addLocalizedErrorFromToken(sentence, token);
+                        addLocalizedErrorFromToken(sentence, token, candidate.getSurface());
                     }
                 }
             }

diff --git a/.../src/test/java/cc/redpen/validator/document/JapaneseExpressionVariationValidatorTest.java b/.../src/test/java/cc/redpen/validator/document/JapaneseExpressionVariationValidatorTest.java
@@ -38,7 +38,7 @@ protected JapaneseExpressionVariationValidatorTest() {
     }
 
     @Test
-    void japanese() throws RedPenException {
+    void detectSameReadings() throws RedPenException {
         config = Configuration.builder("ja")
                 .addValidatorConfig(new ValidatorConfiguration(validatorName))
                 .build();