From 691744c1203936b79d3326672fff50f7517795ad Mon Sep 17 00:00:00 2001
From: Markus Scherer <markus.icu@gmail.com>
Date: Thu, 15 Sep 2016 23:54:13 +0000
Subject: [PATCH] ICU-5456 minor fixes parallel with C++, and no code coverage
 for implicit default constructors of all-static classes

X-SVN-Rev: 39252
---
 icu4j/coverage-exclusion.txt                              | 2 ++
 icu4j/main/classes/core/src/com/ibm/icu/impl/CaseMap.java | 8 ++++----
 .../classes/core/src/com/ibm/icu/impl/UCaseProps.java     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/icu4j/coverage-exclusion.txt b/icu4j/coverage-exclusion.txt
index 56dd437418a..355df8c844f 100644
--- a/icu4j/coverage-exclusion.txt
+++ b/icu4j/coverage-exclusion.txt
@@ -32,6 +32,8 @@ com/ibm/icu/impl/BMPSet#<init>:(Lcom/ibm/icu/impl/BMPSet;[II)V
 com/ibm/icu/impl/CacheValue$Strength#valueOf:(Ljava/lang/String;)Lcom/ibm/icu/impl/CacheValue$Strength;
 com/ibm/icu/impl/CacheValue$Strength#values:()[Lcom/ibm/icu/impl/CacheValue$Strength;
 com/ibm/icu/impl/CalendarUtil#<init>:()V
+com/ibm/icu/impl/CaseMap#<init>:()V
+com/ibm/icu/impl/CaseMap$GreekUpper#<init>:()V
 com/ibm/icu/impl/CharacterIteration#<init>:()V
 com/ibm/icu/impl/CharTrie#equals:(Ljava/lang/Object;)Z
 com/ibm/icu/impl/CharTrie#getBMPValue:(C)C
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/CaseMap.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/CaseMap.java
index 7dc25af3e84..ed68fdbc99a 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/CaseMap.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/CaseMap.java
@@ -643,7 +643,7 @@ public final class CaseMap {
             while (i < s.length()) {
                 int c = Character.codePointAt(s, i);
                 int type = UCaseProps.INSTANCE.getTypeOrIgnorable(c);
-                if ((type & 4) != 0) {
+                if ((type & UCaseProps.IGNORABLE) != 0) {
                     // Case-ignorable, continue with the loop.
                 } else if (type != UCaseProps.NONE) {
                     return true;  // Followed by cased letter.
@@ -668,7 +668,7 @@ public final class CaseMap {
                 int nextIndex = i + Character.charCount(c);
                 int nextState = 0;
                 int type = UCaseProps.INSTANCE.getTypeOrIgnorable(c);
-                if ((type & 4) != 0) {
+                if ((type & UCaseProps.IGNORABLE) != 0) {
                     // c is case-ignorable
                     nextState |= (state & AFTER_CASED);
                 } else if (type != UCaseProps.NONE) {
@@ -684,8 +684,8 @@ public final class CaseMap {
                     // Adding one only to the final vowel in a longer sequence
                     // (which does not occur in normal writing) would require lookahead.
                     // Set the same flag as for preserving an existing dialytika.
-                    if ((data & HAS_VOWEL) != 0 && (state & AFTER_VOWEL_WITH_ACCENT)
-                            != 0 && (upper == 'Ι' || upper == 'Υ')) {
+                    if ((data & HAS_VOWEL) != 0 && (state & AFTER_VOWEL_WITH_ACCENT) != 0 &&
+                            (upper == 'Ι' || upper == 'Υ')) {
                         data |= HAS_DIALYTIKA;
                     }
                     int numYpogegrammeni = 0;  // Map each one to a trailing, spacing, capital iota.
diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/UCaseProps.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/UCaseProps.java
index 68d45e72b1c..afc01736a3d 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/UCaseProps.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/UCaseProps.java
@@ -1343,7 +1343,7 @@ public final class UCaseProps {
         return props&7;
     }
 
-    //private static final int IGNORABLE=   4;
+    public static final int IGNORABLE=      4;
     private static final int SENSITIVE=     8;
     private static final int EXCEPTION=     0x10;
 
-- 
2.40.0