From bdb8ae03b64a6a8a7692c3f8b35ff6b40b6689ef Mon Sep 17 00:00:00 2001
From: Henri Yandell <bayard@apache.org>
Date: Sun, 18 Oct 2009 20:32:40 +0000
Subject: [PATCH] Changing Param to Option. A Parameter is a user supplied
 value; an Option is a user supplied choice. LANG-507 related.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@826518 13f79535-47bb-0310-9956-ffa450edef68
---
 .../lang/text/translate/UnicodeUnescaper.java    | 16 ++++++++--------
 .../text/translate/UnicodeUnescaperTest.java     |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/java/org/apache/commons/lang/text/translate/UnicodeUnescaper.java b/src/java/org/apache/commons/lang/text/translate/UnicodeUnescaper.java
index 6e9b12e79..de903b869 100644
--- a/src/java/org/apache/commons/lang/text/translate/UnicodeUnescaper.java
+++ b/src/java/org/apache/commons/lang/text/translate/UnicodeUnescaper.java
@@ -29,18 +29,18 @@ import java.util.Arrays;
  */
 public class UnicodeUnescaper extends CharSequenceTranslator {
 
-    public static enum PARAM { escapePlus };
+    public static enum OPTION { escapePlus };
 
-    private EnumSet<PARAM> params;
+    private EnumSet<OPTION> options;
 
-    public UnicodeUnescaper(PARAM... params) {
-        if(params.length > 0) {
-            this.params = EnumSet.copyOf(Arrays.asList(params));
+    public UnicodeUnescaper(OPTION... options) {
+        if(options.length > 0) {
+            this.options = EnumSet.copyOf(Arrays.asList(options));
         }
     }
 
-    public boolean isSet(PARAM p) { 
-        return (params == null) ? false : params.contains(p);
+    public boolean isSet(OPTION opt) { 
+        return (options == null) ? false : options.contains(opt);
     }
 
     /**
@@ -58,7 +58,7 @@ public class UnicodeUnescaper extends CharSequenceTranslator {
                 }
 
                 // consume + symbol in \\u+0045
-                if(isSet(PARAM.escapePlus)) {
+                if(isSet(OPTION.escapePlus)) {
                     if( (index + i < input.length()) && (input.charAt(index + i) == '+') ) {
                         i++;
                     }
diff --git a/src/test/org/apache/commons/lang/text/translate/UnicodeUnescaperTest.java b/src/test/org/apache/commons/lang/text/translate/UnicodeUnescaperTest.java
index a6053d8a2..44586238c 100644
--- a/src/test/org/apache/commons/lang/text/translate/UnicodeUnescaperTest.java
+++ b/src/test/org/apache/commons/lang/text/translate/UnicodeUnescaperTest.java
@@ -36,7 +36,7 @@ public class UnicodeUnescaperTest extends TestCase {
             // expected
         }
 
-        uu = new UnicodeUnescaper(UnicodeUnescaper.PARAM.escapePlus);
+        uu = new UnicodeUnescaper(UnicodeUnescaper.OPTION.escapePlus);
         assertEquals("Failed to unescape unicode characters with 'u+' notation", "G", uu.translate(input));
     }