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.
From-SVN: r125302
This commit is contained in:
Matthias Klose
parent
af333b9a7f
commit
e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
libjava/classpath/java/util
|
|
@ -46,6 +46,8 @@ import java.io.ObjectInputStream;
|
|||
import java.io.ObjectOutputStream;
|
||||
import java.io.Serializable;
|
||||
|
||||
import java.util.spi.LocaleNameProvider;
|
||||
|
||||
/**
|
||||
* Locales represent a specific country and culture. Classes which can be
|
||||
* passed a Locale object tailor their information for a given locale. For
|
||||
|
|
@ -161,6 +163,11 @@ public final class Locale implements Serializable, Cloneable
|
|||
/** Locale which represents the French speaking portion of Canada. */
|
||||
public static final Locale CANADA_FRENCH = getLocale("fr", "CA");
|
||||
|
||||
/** The root locale, used as the base case in lookups by
|
||||
* locale-sensitive operations.
|
||||
*/
|
||||
public static final Locale ROOT = new Locale("","","");
|
||||
|
||||
/**
|
||||
* Compatible with JDK 1.1+.
|
||||
*/
|
||||
|
|
@ -674,6 +681,8 @@ public final class Locale implements Serializable, Cloneable
|
|||
*/
|
||||
public String getDisplayLanguage(Locale inLocale)
|
||||
{
|
||||
if (language.isEmpty())
|
||||
return "";
|
||||
try
|
||||
{
|
||||
ResourceBundle res =
|
||||
|
|
@ -685,8 +694,27 @@ public final class Locale implements Serializable, Cloneable
|
|||
}
|
||||
catch (MissingResourceException e)
|
||||
{
|
||||
return language;
|
||||
/* This means runtime support for the locale
|
||||
* is not available, so we check providers. */
|
||||
}
|
||||
for (LocaleNameProvider p :
|
||||
ServiceLoader.load(LocaleNameProvider.class))
|
||||
{
|
||||
for (Locale loc : p.getAvailableLocales())
|
||||
{
|
||||
if (loc.equals(inLocale))
|
||||
{
|
||||
String locLang = p.getDisplayLanguage(language,
|
||||
inLocale);
|
||||
if (locLang != null)
|
||||
return locLang;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (inLocale.equals(Locale.ROOT)) // Base case
|
||||
return language;
|
||||
return getDisplayLanguage(LocaleHelper.getFallbackLocale(inLocale));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -732,6 +760,8 @@ public final class Locale implements Serializable, Cloneable
|
|||
*/
|
||||
public String getDisplayCountry(Locale inLocale)
|
||||
{
|
||||
if (country.isEmpty())
|
||||
return "";
|
||||
try
|
||||
{
|
||||
ResourceBundle res =
|
||||
|
|
@ -743,8 +773,27 @@ public final class Locale implements Serializable, Cloneable
|
|||
}
|
||||
catch (MissingResourceException e)
|
||||
{
|
||||
return country;
|
||||
/* This means runtime support for the locale
|
||||
* is not available, so we check providers. */
|
||||
}
|
||||
for (LocaleNameProvider p :
|
||||
ServiceLoader.load(LocaleNameProvider.class))
|
||||
{
|
||||
for (Locale loc : p.getAvailableLocales())
|
||||
{
|
||||
if (loc.equals(inLocale))
|
||||
{
|
||||
String locCountry = p.getDisplayCountry(country,
|
||||
inLocale);
|
||||
if (locCountry != null)
|
||||
return locCountry;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (inLocale.equals(Locale.ROOT)) // Base case
|
||||
return country;
|
||||
return getDisplayCountry(LocaleHelper.getFallbackLocale(inLocale));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -791,6 +840,8 @@ public final class Locale implements Serializable, Cloneable
|
|||
*/
|
||||
public String getDisplayVariant(Locale inLocale)
|
||||
{
|
||||
if (variant.isEmpty())
|
||||
return "";
|
||||
try
|
||||
{
|
||||
ResourceBundle res =
|
||||
|
|
@ -802,8 +853,27 @@ public final class Locale implements Serializable, Cloneable
|
|||
}
|
||||
catch (MissingResourceException e)
|
||||
{
|
||||
return variant;
|
||||
/* This means runtime support for the locale
|
||||
* is not available, so we check providers. */
|
||||
}
|
||||
for (LocaleNameProvider p :
|
||||
ServiceLoader.load(LocaleNameProvider.class))
|
||||
{
|
||||
for (Locale loc : p.getAvailableLocales())
|
||||
{
|
||||
if (loc.equals(inLocale))
|
||||
{
|
||||
String locVar = p.getDisplayVariant(variant,
|
||||
inLocale);
|
||||
if (locVar != null)
|
||||
return locVar;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (inLocale.equals(Locale.ROOT)) // Base case
|
||||
return country;
|
||||
return getDisplayVariant(LocaleHelper.getFallbackLocale(inLocale));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue