aboutsummaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java')
-rw-r--r--libjava/java/lang/StringBuffer.java8
-rw-r--r--libjava/java/text/CollationElementIterator.java8
-rw-r--r--libjava/java/text/RuleBasedCollator.java31
-rw-r--r--libjava/java/text/natCollator.cc2
-rw-r--r--libjava/java/util/Locale.java29
-rw-r--r--libjava/java/util/ResourceBundle.java98
6 files changed, 96 insertions, 80 deletions
diff --git a/libjava/java/lang/StringBuffer.java b/libjava/java/lang/StringBuffer.java
index 4127d54..70f78fb 100644
--- a/libjava/java/lang/StringBuffer.java
+++ b/libjava/java/lang/StringBuffer.java
@@ -98,7 +98,13 @@ public final class StringBuffer implements Serializable
{
if (shared || minimumCapacity > value.length)
{
- minimumCapacity = Math.max(minimumCapacity, value.length*2+2);
+ // We don't want to make a larger vector when `shared' is
+ // set. If we do, then setLength becomes very inefficient
+ // when repeatedly reusing a StringBuffer in a loop.
+ int max = (minimumCapacity > value.length
+ ? value.length*2+2
+ : value.length);
+ minimumCapacity = Math.max(minimumCapacity, max);
char[] nb = new char[minimumCapacity];
System.arraycopy(value, 0, nb, 0, count);
value = nb;
diff --git a/libjava/java/text/CollationElementIterator.java b/libjava/java/text/CollationElementIterator.java
index a654629..15e6056 100644
--- a/libjava/java/text/CollationElementIterator.java
+++ b/libjava/java/text/CollationElementIterator.java
@@ -27,7 +27,7 @@ public final class CollationElementIterator
{
if (index == text.length())
return NULLORDER;
- return RuleBasedCollator.ceiNext(this);
+ return collator.ceiNext(this);
}
// This one returns int while the others return short.
@@ -55,12 +55,13 @@ public final class CollationElementIterator
}
// Non-public constructor.
- CollationElementIterator (String text)
+ CollationElementIterator (String text, RuleBasedCollator collator)
{
this.text = text;
this.index = 0;
this.lookahead_set = false;
this.lookahead = 0;
+ this.collator = collator;
}
// Text over which we iterate.
@@ -72,4 +73,7 @@ public final class CollationElementIterator
// A piece of lookahead.
boolean lookahead_set;
int lookahead;
+
+ // The RuleBasedCollator which created this object.
+ RuleBasedCollator collator;
}
diff --git a/libjava/java/text/RuleBasedCollator.java b/libjava/java/text/RuleBasedCollator.java
index 18046ad..fd4002b 100644
--- a/libjava/java/text/RuleBasedCollator.java
+++ b/libjava/java/text/RuleBasedCollator.java
@@ -43,7 +43,7 @@ public class RuleBasedCollator extends Collator
}
// A helper for CollationElementIterator.next().
- static int ceiNext (CollationElementIterator cei)
+ int ceiNext (CollationElementIterator cei)
{
if (cei.lookahead_set)
{
@@ -61,7 +61,7 @@ public class RuleBasedCollator extends Collator
boolean found = false;
int i;
- for (i = save; i < max; ++i)
+ for (i = save + 1; i <= max; ++i)
{
s = cei.text.substring(save, i);
if (prefixes.get(s) == null)
@@ -108,16 +108,15 @@ public class RuleBasedCollator extends Collator
switch (strength)
{
case PRIMARY:
- c |= CollationElementIterator.primaryOrder(os);
- /* Fall through. */
+ c = os & ~0xffff;
+ break;
case SECONDARY:
- c |= CollationElementIterator.secondaryOrder(os);
- /* Fall through. */
- case TERTIARY:
- c |= CollationElementIterator.tertiaryOrder(os);
+ c = os & ~0x00ff;
break;
+ case TERTIARY:
case IDENTICAL:
c = os;
+ break;
}
if (c != 0)
return c;
@@ -128,8 +127,8 @@ public class RuleBasedCollator extends Collator
{
CollationElementIterator cs, ct;
- cs = new CollationElementIterator (source);
- ct = new CollationElementIterator (target);
+ cs = new CollationElementIterator (source, this);
+ ct = new CollationElementIterator (target, this);
while (true)
{
@@ -140,9 +139,15 @@ public class RuleBasedCollator extends Collator
&& ot == CollationElementIterator.NULLORDER)
break;
else if (os == CollationElementIterator.NULLORDER)
- return 1;
+ {
+ // Source string is shorter, so return "less than".
+ return -1;
+ }
else if (ot == CollationElementIterator.NULLORDER)
- return -1;
+ {
+ // Target string is shorter, so return "greater than".
+ return 1;
+ }
if (os != ot)
return os - ot;
@@ -168,7 +173,7 @@ public class RuleBasedCollator extends Collator
int max = source.length();
for (int i = 0; i < max; ++i)
decomposeCharacter (source.charAt(i), expand);
- return new CollationElementIterator (expand.toString());
+ return new CollationElementIterator (expand.toString(), this);
}
public CollationKey getCollationKey (String source)
diff --git a/libjava/java/text/natCollator.cc b/libjava/java/text/natCollator.cc
index 7624b7c..378ac5c 100644
--- a/libjava/java/text/natCollator.cc
+++ b/libjava/java/text/natCollator.cc
@@ -30,7 +30,7 @@ java::text::Collator::decomposeCharacter (jchar c,
return;
}
- struct decomp_entry *base;
+ const struct decomp_entry *base;
int high;
if (decmp == FULL_DECOMPOSITION)
diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index e47cd1d..6278414 100644
--- a/libjava/java/util/Locale.java
+++ b/libjava/java/util/Locale.java
@@ -36,33 +36,34 @@ public final class Locale implements java.io.Serializable, Cloneable
public Locale (String languageCode, String countryCode)
{
- language = languageCode.toLowerCase();
- country = countryCode.toUpperCase();
- hashcode = languageCode.hashCode() ^ countryCode.hashCode();
+ this (languageCode, countryCode, "");
}
public Locale (String languageCode, String countryCode,
String variantCode)
{
- this (languageCode, countryCode);
- variant = variantCode;
- hashcode ^= variantCode.hashCode();
+ // We must explicitly check the arguments.
+ if (languageCode == null || countryCode == null
+ || variantCode == null)
+ throw new NullPointerException ();
+ language = languageCode.toLowerCase();
+ country = countryCode.toUpperCase();
+ variant = variantCode.toUpperCase();
+ hashcode = (languageCode.hashCode()
+ ^ countryCode.hashCode()
+ ^ variantCode.hashCode());
}
public Object clone ()
- {
- return (Object) new Locale (language, country, variant);
- }
+ {
+ return (Object) new Locale (language, country, variant);
+ }
public boolean equals (Object obj)
{
if (! (obj instanceof Locale))
return false;
Locale loc = (Locale) obj;
- if ((language == null && loc.language != null)
- || (country == null && loc.country != null)
- || (variant == null && loc.variant != null))
- return false;
return (language.equals(loc.language)
&& country.equals(loc.country)
&& variant.equals(loc.variant));
@@ -115,7 +116,7 @@ public final class Locale implements java.io.Serializable, Cloneable
result.append(language);
result.append('_');
result.append(country);
- if (variant != null && variant.length() > 0)
+ if (variant.length() > 0)
{
result.append('_');
result.append(variant);
diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java
index ba1d3f9..05503c6 100644
--- a/libjava/java/util/ResourceBundle.java
+++ b/libjava/java/util/ResourceBundle.java
@@ -20,6 +20,9 @@ public abstract class ResourceBundle
{
protected ResourceBundle parent;
+ // This is used to cache resource bundles.
+ private static Hashtable resource_cache = new Hashtable ();
+
public ResourceBundle ()
{
}
@@ -65,15 +68,17 @@ public abstract class ResourceBundle
String stopHere)
{
Class rbc;
+ ResourceBundle needs_parent = null, r, result = null;
while (true)
{
try
{
rbc = Class.forName(bundleName);
+ r = null;
try
{
- return (ResourceBundle) rbc.newInstance();
+ r = (ResourceBundle) rbc.newInstance();
}
catch (IllegalAccessException ex)
{
@@ -83,45 +88,61 @@ public abstract class ResourceBundle
{
// Fall through
}
- return null;
+ if (r != null)
+ {
+ if (result == null)
+ result = r;
+ if (needs_parent != null)
+ {
+ // We've been through the loop one or more times
+ // already. Set the parent and keep going.
+ needs_parent.setParent(r);
+ }
+ needs_parent = r;
+ }
}
catch (ClassNotFoundException ex)
{
- if (bundleName.compareTo(stopHere) == 0)
- return null;
- else
- {
- int last = bundleName.lastIndexOf('_');
-
- // No more underscores?
- if (last == -1)
- return null;
+ // Fall through.
+ }
+
+ if (bundleName.equals(stopHere))
+ return result;
+ else
+ {
+ int last = bundleName.lastIndexOf('_');
- // Loop around, testing this new shorter name.
- bundleName = bundleName.substring(0, last);
- }
+ // No more underscores?
+ if (last == -1)
+ return result;
+
+ // Loop around, testing this new shorter name.
+ bundleName = bundleName.substring(0, last);
}
}
}
-
- // Search for bundles, but stop at baseName_language.
- private static final ResourceBundle partialGetBundle (String baseName,
- Locale locale)
+
+ // Search for bundles, but stop at baseName_language (if required).
+ // This is synchronized so that the cache works correctly.
+ private static final synchronized ResourceBundle
+ partialGetBundle (String baseName, Locale locale, boolean langStop)
{
ResourceBundle rb;
- String bundleName = (baseName
- + "_"
- + locale.getLanguage() + "_"
- + locale.getCountry() + "_"
- + locale.getVariant());
+ String bundleName = baseName + "_" + locale;
+
+ // Check the cache.
+ Object obj = resource_cache.get(bundleName);
+ if (obj != null)
+ return (ResourceBundle) obj;
String stopHere = (baseName
- + "_"
- + locale.getLanguage());
+ + (langStop ? ("_" + locale.getLanguage()) : ""));
rb = trySomeGetBundle(bundleName, stopHere);
+ if (rb != null)
+ resource_cache.put(bundleName, rb);
return rb;
}
@@ -138,39 +159,18 @@ public abstract class ResourceBundle
if (locale == null)
throw new NullPointerException ();
- rb = partialGetBundle(baseName, locale);
+ rb = partialGetBundle(baseName, locale, false);
if (rb != null)
return rb;
+ // Finally, try the default locale.
if (! locale.equals(Locale.getDefault()))
{
- rb = partialGetBundle(baseName, Locale.getDefault());
+ rb = partialGetBundle(baseName, Locale.getDefault(), true);
if (rb != null)
return rb;
}
- // Try just the baseName.
- try
- {
- rbc = Class.forName (baseName);
- try
- {
- return (ResourceBundle) rbc.newInstance();
- }
- catch (IllegalAccessException ex)
- {
- // Fall through.
- }
- catch (InstantiationException ex)
- {
- // Fall through.
- }
- }
- catch (ClassNotFoundException ex)
- {
- // Fall through.
- }
-
throw new MissingResourceException("can't load bundle",
baseName,
"bundle");
generated by cgit v1.1 at 2025-04-16 02:54:22 +0000