ICU-8876 Revert [30811] for PluralRules, RBBIDataWrapper, RBBISetBuilder.

X-SVN-Rev: 31070

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
index db7305c90d3bc175d4d87f8135cc45656aa43cde..861306614922f4d268bfa153777b5c083efcc567 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralRules.java
@@ -664,7 +664,6 @@ public class PluralRules implements Serializable {
      * Implementation of Rule that uses a constraint.
      * Provides 'and' and 'or' to combine constraints.  Immutable.
      */
-    ///CLOVER:OFF
     private static class ConstrainedRule implements Rule, Serializable {
         private static final long serialVersionUID = 1;
         private final String keyword;
@@ -705,7 +704,6 @@ public class PluralRules implements Serializable {
             return keyword + ": " + constraint;
         }
     }
-    ///CLOVER:ON
 
     /*
      * Implementation of RuleList that is itself a node in a linked list.

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java
index 91a9b7a4375c39f245656556799d556143a5effe..046061aee573ca46efea353bfc9186b6c5344d8e 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBIDataWrapper.java
@@ -130,7 +130,6 @@ final class RBBIDataWrapper {
         return ROW_DATA + state * (fHeader.fCatCount + 4);
     }
     
-    ///CLOVER:OFF
     static class TrieFoldingFunc implements  Trie.DataManipulate {
         public int getFoldingOffset(int data) {
             if ((data & 0x8000) != 0) {
@@ -140,7 +139,6 @@ final class RBBIDataWrapper {
             }
         }
     }
-    ///CLOVER:ON
     static TrieFoldingFunc  fTrieFoldingFunc = new TrieFoldingFunc();
  
     

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBISetBuilder.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBISetBuilder.java
index 70fae327a448e439710a6150889e603b26f2c339..68b92c6c7a08e185fcb64ce03a683e96b688492b 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RBBISetBuilder.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RBBISetBuilder.java
@@ -301,7 +301,6 @@ class RBBISetBuilder {
     //                       getFoldedValue() function needed for Trie table creation.
     //
     //-----------------------------------------------------------------------------------
-   ///CLOVER:OFF
    class RBBIDataManipulate implements IntTrieBuilder.DataManipulate {
         public int getFoldedValue(int start, int offset) {
             int  value;
@@ -322,7 +321,6 @@ class RBBISetBuilder {
             return 0;
          }
     }
-    ///CLOVER:ON
     RBBIDataManipulate dm = new RBBIDataManipulate();
     
     //-----------------------------------------------------------------------------------