libjava/classpath/ChangeLog.gcj:

2007-05-31  Matthias Klose  <doko@ubuntu.com>

        * javax/management/NotificationBroadcasterSupport.java
        (getNotificationInfo): Add cast.
        * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
        directories.
        * native/jni/qt-peer/Makefile.in: Regenerate.

libjava/ChangeLog:

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/natFileWin32.cc (setFilePermissions): New (stub only).
        _access: Handle EXEC query, stub only.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/File.java: Merge with classpath-0.95, new method
        setFilePermissions, new attribute EXEC.
        * java/io/natFilePosix.cc (setFilePermissions): New.
        _access: Handle EXEC query.
        * classpath/lib/java/io/File.class, java/io/File.h: Regenerate.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Imported GNU Classpath 0.95.

        * classpath/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
        classpath/native/fdlibm/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, classpath/doc/Makefile.in,
        classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
        classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/include/Makefile.in,
        classpath/examples/Makefile.in: Regenerate.
        * classpath/config.guess, classpath/config.sub,
        classpath/ltmain.sh : Update.
        * classpath/configure, classpath/depcomp, classpath/missing,
        classpath/aclocal.m4, classpath/install-sh: Regenerate.

        * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
        * sources.am: Regenerate.
        * Makefile.in: Regenerate.

        * Update the .class files and generated CNI header files, add new
        .class and generated CNI header files.
        * Remove generated files for removed java source files:
        classpath/gnu/java/net/BASE64.java,
        classpath/gnu/java/security/util/Base64.java,
        classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
        classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
        classpath/gnu/java/awt/font/autofit/Scaler.java,
        classpath/gnu/classpath/jdwp/util/Value.java,
        classpath/gnu/javax/net/ssl/Base64.java.
        * Remove empty directories.

        * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
        * java/lang/Class.java(setAccessible): Merge from classpath.
        * java/util/Locale.java: Remove.
        * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
        gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
        * gcj/javaprims.h: Update class declarations.
        * scripts/classes.pl: Update usage.
        * HACKING: Mention to build all peers.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125302 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 94 insertions, 23 deletions

diff --git a/libjava/classpath/java/text/BreakIterator.java b/libjava/classpath/java/text/BreakIterator.java
index 7ba116870de..30e5f2b9491 100644
--- a/libjava/classpath/java/text/BreakIterator.java
+++ b/libjava/classpath/java/text/BreakIterator.java
@@ -1,5 +1,6 @@
 /* BreakIterator.java -- Breaks text into elements
-   Copyright (C) 1998, 1999, 2001, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2004, 2005, 2007
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,9 +39,19 @@ exception statement from your version. */
 
 package java.text;
 
+import gnu.java.locale.LocaleHelper;
+
+import gnu.java.text.CharacterBreakIterator;
+import gnu.java.text.LineBreakIterator;
+import gnu.java.text.SentenceBreakIterator;
+import gnu.java.text.WordBreakIterator;
+
+import java.text.spi.BreakIteratorProvider;
+
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.util.ServiceLoader;
 
 /**
  * This class iterates over text elements such as words, lines, sentences,
@@ -179,19 +190,34 @@ public abstract class BreakIterator implements Cloneable
 
   /**
    * This method returns an instance of <code>BreakIterator</code> that will
-   * iterate over characters as defined in the specified locale.  If the
-   * desired locale is not available, the default locale is used.
+   * iterate over characters as defined in the specified locale.
    *
    * @param locale The desired locale.
    *
-   * @return A <code>BreakIterator</code> instance for the default locale.
+   * @return A <code>BreakIterator</code> instance for the specified locale.
    */
   public static BreakIterator getCharacterInstance (Locale locale)
   {
-    BreakIterator r = getInstance ("CharacterIterator", locale);
-    if (r == null)
-      r = new gnu.java.text.CharacterBreakIterator ();
-    return r;
+    BreakIterator r = getInstance("CharacterIterator", locale);
+    if (r != null)
+      return r;
+    for (BreakIteratorProvider p :
+	   ServiceLoader.load(BreakIteratorProvider.class))
+      {
+	for (Locale loc : p.getAvailableLocales())
+	  {
+	    if (loc.equals(locale))
+	      {
+		BreakIterator bi = p.getCharacterInstance(locale);
+		if (bi != null)
+		  return bi;
+		break;
+	      }
+	  }
+      }
+    if (locale.equals(Locale.ROOT))
+      return new CharacterBreakIterator();
+    return getCharacterInstance(LocaleHelper.getFallbackLocale(locale));
   }
 
   /**
@@ -207,8 +233,7 @@ public abstract class BreakIterator implements Cloneable
 
   /**
    * This method returns an instance of <code>BreakIterator</code> that will
-   * iterate over line breaks as defined in the specified locale.  If the
-   * desired locale is not available, the default locale is used.
+   * iterate over line breaks as defined in the specified locale.
    *
    * @param locale The desired locale.
    *
@@ -217,9 +242,25 @@ public abstract class BreakIterator implements Cloneable
   public static BreakIterator getLineInstance (Locale locale)
   {
     BreakIterator r = getInstance ("LineIterator", locale);
-    if (r == null)
-      r = new gnu.java.text.LineBreakIterator ();
-    return r;
+    if (r != null)
+      return r;
+    for (BreakIteratorProvider p :
+	   ServiceLoader.load(BreakIteratorProvider.class))
+      {
+	for (Locale loc : p.getAvailableLocales())
+	  {
+	    if (loc.equals(locale))
+	      {
+		BreakIterator bi = p.getLineInstance(locale);
+		if (bi != null)
+		  return bi;
+		break;
+	      }
+	  }
+      }
+    if (locale.equals(Locale.ROOT))
+      return new LineBreakIterator();
+    return getLineInstance(LocaleHelper.getFallbackLocale(locale));
   }
 
   /**
@@ -235,8 +276,7 @@ public abstract class BreakIterator implements Cloneable
 
   /**
    * This method returns an instance of <code>BreakIterator</code> that will
-   * iterate over sentences as defined in the specified locale.  If the
-   * desired locale is not available, the default locale is used.
+   * iterate over sentences as defined in the specified locale.
    *
    * @param locale The desired locale.
    *
@@ -245,9 +285,25 @@ public abstract class BreakIterator implements Cloneable
   public static BreakIterator getSentenceInstance (Locale locale)
   {
     BreakIterator r = getInstance ("SentenceIterator", locale);
-    if (r == null)
-      r = new gnu.java.text.SentenceBreakIterator ();
-    return r;
+    if (r != null)
+      return r;
+    for (BreakIteratorProvider p :
+	   ServiceLoader.load(BreakIteratorProvider.class))
+      {
+	for (Locale loc : p.getAvailableLocales())
+	  {
+	    if (loc.equals(locale))
+	      {
+		BreakIterator bi = p.getSentenceInstance(locale);
+		if (bi != null)
+		  return bi;
+		break;
+	      }
+	  }
+      }
+    if (locale.equals(Locale.ROOT))
+      return new SentenceBreakIterator();
+    return getSentenceInstance(LocaleHelper.getFallbackLocale(locale));
   }
 
   /**
@@ -271,8 +327,7 @@ public abstract class BreakIterator implements Cloneable
 
   /**
    * This method returns an instance of <code>BreakIterator</code> that will
-   * iterate over words as defined in the specified locale.  If the
-   * desired locale is not available, the default locale is used.
+   * iterate over words as defined in the specified locale.  
    *
    * @param locale The desired locale.
    *
@@ -281,9 +336,25 @@ public abstract class BreakIterator implements Cloneable
   public static BreakIterator getWordInstance (Locale locale)
   {
     BreakIterator r = getInstance ("WordIterator", locale);
-    if (r == null)
-      r = new gnu.java.text.WordBreakIterator ();
-    return r;
+    if (r != null)
+      return r;
+    for (BreakIteratorProvider p :
+	   ServiceLoader.load(BreakIteratorProvider.class))
+      {
+	for (Locale loc : p.getAvailableLocales())
+	  {
+	    if (loc.equals(locale))
+	      {
+		BreakIterator bi = p.getWordInstance(locale);
+		if (bi != null)
+		  return bi;
+		break;
+	      }
+	  }
+      }
+    if (locale.equals(Locale.ROOT))
+      return new WordBreakIterator();
+    return getWordInstance(LocaleHelper.getFallbackLocale(locale));
   }
 
   /**