commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ki...@apache.org
Subject [1/2] [text] TEXT-67: use [lang]'s Range to replace if/else logic
Date Mon, 12 Jun 2017 08:52:14 GMT
Repository: commons-text
Updated Branches:
  refs/heads/master 1304d79eb -> 2a9d97036


TEXT-67: use [lang]'s Range to replace if/else logic


Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/9493dfb2
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/9493dfb2
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/9493dfb2

Branch: refs/heads/master
Commit: 9493dfb271c140ba9bbc0ace0ae0e89f4a8b7d4a
Parents: 343b4a9
Author: Bruno P. Kinoshita <brunodepaulak@yahoo.com.br>
Authored: Mon May 22 21:49:27 2017 +1200
Committer: Bruno P. Kinoshita <brunodepaulak@yahoo.com.br>
Committed: Mon May 22 21:49:27 2017 +1200

----------------------------------------------------------------------
 .../text/translate/NumericEntityEscaper.java    | 23 ++++++--------------
 1 file changed, 7 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-text/blob/9493dfb2/src/main/java/org/apache/commons/text/translate/NumericEntityEscaper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/translate/NumericEntityEscaper.java b/src/main/java/org/apache/commons/text/translate/NumericEntityEscaper.java
index 0cdb808..b402974 100644
--- a/src/main/java/org/apache/commons/text/translate/NumericEntityEscaper.java
+++ b/src/main/java/org/apache/commons/text/translate/NumericEntityEscaper.java
@@ -19,6 +19,8 @@ package org.apache.commons.text.translate;
 import java.io.IOException;
 import java.io.Writer;
 
+import org.apache.commons.lang3.Range;
+
 /**
  * Translates codepoints to their XML numeric entity escaped value.
  *
@@ -26,13 +28,10 @@ import java.io.Writer;
  */
 public class NumericEntityEscaper extends CodePointTranslator {
 
-    /** int value representing the lowest codepoint boundary. */
-    private final int below;
-    /** int value representing the highest codepoint boundary. */
-    private final int above;
     /** whether to escape between the boundaries or outside them. */
     private final boolean between;
-
+    /** range from lowest codepoint to highest codepoint. */
+    private final Range<Integer> range;
     /**
      * <p>Constructs a <code>NumericEntityEscaper</code> for the specified
range. This is
      * the underlying method for the other constructors/builders. The <code>below</code>
@@ -44,8 +43,7 @@ public class NumericEntityEscaper extends CodePointTranslator {
      * @param between whether to escape between the boundaries or outside them
      */
     private NumericEntityEscaper(final int below, final int above, final boolean between)
{
-        this.below = below;
-        this.above = above;
+        this.range = Range.between(below, above);
         this.between = between;
     }
 
@@ -103,16 +101,9 @@ public class NumericEntityEscaper extends CodePointTranslator {
      */
     @Override
     public boolean translate(final int codepoint, final Writer out) throws IOException {
-        if (between) {
-            if (codepoint < below || codepoint > above) {
-                return false;
-            }
-        } else {
-            if (codepoint >= below && codepoint <= above) {
-                return false;
-            }
+        if (this.between != this.range.contains(codepoint)) {
+            return false;
         }
-
         out.write("&#");
         out.write(Integer.toString(codepoint, 10));
         out.write(';');


Mime
View raw message