ICU-10706 Spoof Check, Rename SINGLE_SCRIPT -> SINGLE_SCRIPT_RESTRICTIVE as discussed...

X-SVN-Rev: 35177

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/IdentifierInfo.java b/icu4j/main/classes/core/src/com/ibm/icu/text/IdentifierInfo.java
index 4fd310b63033ead9553118642c03541a84130733..0451c515ea587a3add8de7c4fe4a57dad19ed66e 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/IdentifierInfo.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/IdentifierInfo.java
@@ -251,7 +251,7 @@ public class IdentifierInfo {
         //       time it is created, in setIdentifier().
         final int cardinalityPlus = requiredScripts.cardinality() + (commonAmongAlternates.cardinality() == 0 ? scriptSetSet.size() : 1);
         if (cardinalityPlus < 2) {
-            return RestrictionLevel.SINGLE_SCRIPT;
+            return RestrictionLevel.SINGLE_SCRIPT_RESTRICTIVE;
         }
         if (containsWithAlternates(JAPANESE, requiredScripts) || containsWithAlternates(CHINESE, requiredScripts)
                 || containsWithAlternates(KOREAN, requiredScripts)) {

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/SpoofChecker.java b/icu4j/main/classes/core/src/com/ibm/icu/text/SpoofChecker.java
index 761db986c74577ecae756dc1c25238b110eaa513..590907beef53c141dfffae92959f7a1f19535b21 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/SpoofChecker.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/SpoofChecker.java
@@ -160,7 +160,7 @@ public class SpoofChecker {
          * 
          * @draft ICU 53
          */
-        SINGLE_SCRIPT,        
+        SINGLE_SCRIPT_RESTRICTIVE,        
          /**
          * All characters in each identifier must be from a single script, or from the combinations: Latin + Han +
          * Hiragana + Katakana; Latin + Han + Bopomofo; or Latin + Han + Hangul. Note that this level will satisfy the

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/text/SpoofCheckerTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/text/SpoofCheckerTest.java
index 6d30934a2a0a5f073c6e84da66493d543a1651c3..b03935d12dda573284d64f1da519b27dde1403be 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/text/SpoofCheckerTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/text/SpoofCheckerTest.java
@@ -490,7 +490,7 @@ public class SpoofCheckerTest extends TestFmwk {
         Object[][] tests = {
                 {"aγ♥", RestrictionLevel.UNRESTRICTIVE},
                 {"a", RestrictionLevel.ASCII},
-                {"γ", RestrictionLevel.SINGLE_SCRIPT},
+                {"γ", RestrictionLevel.SINGLE_SCRIPT_RESTRICTIVE},
                 {"aアー", RestrictionLevel.HIGHLY_RESTRICTIVE},
                 {"aऄ", RestrictionLevel.MODERATELY_RESTRICTIVE},
                 {"aγ", RestrictionLevel.MINIMALLY_RESTRICTIVE},