ICU-10880 Minor optimization and documentation fix

X-SVN-Rev: 36202

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/NFRule.java b/icu4j/main/classes/core/src/com/ibm/icu/text/NFRule.java
index d5fb5c4829fae21af4e930a6ad11ed1db8f0a4ba..938284b55cd96bfd5113323aa4dd776d9c3f21d6 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/NFRule.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/NFRule.java
@@ -384,7 +384,7 @@ final class NFRule {
         int pluralRuleStart = ruleText.indexOf("$(");
         int pluralRuleEnd = (pluralRuleStart >= 0 ? ruleText.indexOf(')', pluralRuleStart) : -1);
         if (pluralRuleEnd >= 0) {
-            int endType = ruleText.indexOf(',');
+            int endType = ruleText.indexOf(',', pluralRuleStart);
             if (endType < 0) {
                 throw new IllegalArgumentException("Rule \"" + ruleText + "\" does not have a defined type");
             }

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralFormat.java
index 3b26452bc70800e3b0a5edcc6c127586930a7f13..9a47df5cfbc1f9823713c8efb3889ddb0400221f 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/PluralFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/PluralFormat.java
@@ -755,7 +755,7 @@ public class PluralFormat extends UFormat {
             else {
                 currMatchIndex = source.indexOf(currArg);
             }
-            if (currMatchIndex > matchedIndex && (matchedWord == null || currArg.length() > matchedWord.length())) {
+            if (currMatchIndex >= 0 && currMatchIndex >= matchedIndex && (matchedWord == null || currArg.length() > matchedWord.length())) {
                 matchedIndex = currMatchIndex;
                 matchedWord = currArg;
                 keyword = pattern.substring(partStart.getLimit(), partLimit.getIndex());

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java
index 310869405f6eaeb668a66dbc61c655724720501c..03a156f43cfee3f143873773824010139eaf8dbc 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/RuleBasedNumberFormat.java
@@ -437,15 +437,19 @@ import com.ibm.icu.util.UResourceBundleIterator;
  *     <td width="37">$(cardinal,<i>plural syntax</i>)</td>
  *     <td width="23"></td>
  *     <td width="165" valign="top">in all rule sets</td>
- *     <td>This provides the ability to choose a word based on the number divided by the base value for the specified locale.
- *     This uses the cardinal plural rules from PluralFormat. All strings used in the plural format are treated as the same base value for parsing.</td>
+ *     <td>This provides the ability to choose a word based on the number divided by the radix to the power of the
+ *     exponent of the base value for the specified locale, which is normally equivalent to the &lt;&lt; value.
+ *     This uses the cardinal plural rules from PluralFormat. All strings used in the plural format are treated
+ *     as the same base value for parsing.</td>
  *   </tr>
  *   <tr>
  *     <td width="37">$(ordinal,<i>plural syntax</i>)</td>
  *     <td width="23"></td>
  *     <td width="165" valign="top">in all rule sets</td>
- *     <td>This provides the ability to choose a word based on the number divided by the base value for the specified locale.
- *     This uses the ordinal plural rules from PluralFormat. All strings used in the plural format are treated as the same base value for parsing.</td>
+ *     <td>This provides the ability to choose a word based on the number divided by the radix to the power of the
+ *     exponent of the base value for the specified locale, which is normally equivalent to the &lt;&lt; value.
+ *     This uses the ordinal plural rules from PluralFormat. All strings used in the plural format are treated
+ *     as the same base value for parsing.</td>
  *   </tr>
  * </table>
  *