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
This commit is contained in:
parent
0fd4b3afe1
commit
bdb8ae03b6
|
@ -29,18 +29,18 @@ import java.util.Arrays;
|
||||||
*/
|
*/
|
||||||
public class UnicodeUnescaper extends CharSequenceTranslator {
|
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) {
|
public UnicodeUnescaper(OPTION... options) {
|
||||||
if(params.length > 0) {
|
if(options.length > 0) {
|
||||||
this.params = EnumSet.copyOf(Arrays.asList(params));
|
this.options = EnumSet.copyOf(Arrays.asList(options));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isSet(PARAM p) {
|
public boolean isSet(OPTION opt) {
|
||||||
return (params == null) ? false : params.contains(p);
|
return (options == null) ? false : options.contains(opt);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -58,7 +58,7 @@ public class UnicodeUnescaper extends CharSequenceTranslator {
|
||||||
}
|
}
|
||||||
|
|
||||||
// consume + symbol in \\u+0045
|
// consume + symbol in \\u+0045
|
||||||
if(isSet(PARAM.escapePlus)) {
|
if(isSet(OPTION.escapePlus)) {
|
||||||
if( (index + i < input.length()) && (input.charAt(index + i) == '+') ) {
|
if( (index + i < input.length()) && (input.charAt(index + i) == '+') ) {
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ public class UnicodeUnescaperTest extends TestCase {
|
||||||
// expected
|
// 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));
|
assertEquals("Failed to unescape unicode characters with 'u+' notation", "G", uu.translate(input));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue