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
|
|
@ -1,5 +1,6 @@
|
|||
/* NumberFormat.java -- Formats and parses numbers
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
|
||||
Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2007
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
|
|
@ -38,14 +39,20 @@ exception statement from your version. */
|
|||
|
||||
package java.text;
|
||||
|
||||
import gnu.java.locale.LocaleHelper;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InvalidObjectException;
|
||||
import java.io.ObjectInputStream;
|
||||
import java.io.ObjectOutputStream;
|
||||
|
||||
import java.text.spi.NumberFormatProvider;
|
||||
|
||||
import java.util.Currency;
|
||||
import java.util.Locale;
|
||||
import java.util.MissingResourceException;
|
||||
import java.util.ResourceBundle;
|
||||
import java.util.ServiceLoader;
|
||||
|
||||
/**
|
||||
* This is the abstract superclass of all classes which format and
|
||||
|
|
@ -309,17 +316,13 @@ public abstract class NumberFormat extends Format implements Cloneable
|
|||
|
||||
private static NumberFormat computeInstance(Locale loc, String resource,
|
||||
String def)
|
||||
throws MissingResourceException
|
||||
{
|
||||
ResourceBundle res;
|
||||
try
|
||||
{
|
||||
res = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
||||
loc, ClassLoader.getSystemClassLoader());
|
||||
}
|
||||
catch (MissingResourceException x)
|
||||
{
|
||||
res = null;
|
||||
}
|
||||
if (loc.equals(Locale.ROOT))
|
||||
return new DecimalFormat(def, DecimalFormatSymbols.getInstance(loc));
|
||||
ResourceBundle res =
|
||||
ResourceBundle.getBundle("gnu.java.locale.LocaleInformation",
|
||||
loc, ClassLoader.getSystemClassLoader());
|
||||
String fmt;
|
||||
try
|
||||
{
|
||||
|
|
@ -329,7 +332,7 @@ public abstract class NumberFormat extends Format implements Cloneable
|
|||
{
|
||||
fmt = def;
|
||||
}
|
||||
DecimalFormatSymbols dfs = new DecimalFormatSymbols (loc);
|
||||
DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(loc);
|
||||
return new DecimalFormat (fmt, dfs);
|
||||
}
|
||||
|
||||
|
|
@ -352,11 +355,33 @@ public abstract class NumberFormat extends Format implements Cloneable
|
|||
*/
|
||||
public static NumberFormat getCurrencyInstance (Locale loc)
|
||||
{
|
||||
NumberFormat format;
|
||||
|
||||
format = computeInstance (loc, "currencyFormat", "\u00A4#,##0.00;(\u00A4#,##0.00)");
|
||||
format.setMaximumFractionDigits(format.getCurrency().getDefaultFractionDigits());
|
||||
return format;
|
||||
try
|
||||
{
|
||||
NumberFormat format;
|
||||
|
||||
format = computeInstance (loc, "currencyFormat",
|
||||
"\u00A4#,##0.00;(\u00A4#,##0.00)");
|
||||
format.setMaximumFractionDigits(format.getCurrency().getDefaultFractionDigits());
|
||||
return format;
|
||||
}
|
||||
catch (MissingResourceException e)
|
||||
{
|
||||
for (NumberFormatProvider p :
|
||||
ServiceLoader.load(NumberFormatProvider.class))
|
||||
{
|
||||
for (Locale l : p.getAvailableLocales())
|
||||
{
|
||||
if (l.equals(loc))
|
||||
{
|
||||
NumberFormat nf = p.getCurrencyInstance(loc);
|
||||
if (nf != null)
|
||||
return nf;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return getCurrencyInstance(LocaleHelper.getFallbackLocale(loc));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -456,7 +481,28 @@ public abstract class NumberFormat extends Format implements Cloneable
|
|||
*/
|
||||
public static NumberFormat getNumberInstance (Locale loc)
|
||||
{
|
||||
return computeInstance (loc, "numberFormat", "#,##0.###");
|
||||
try
|
||||
{
|
||||
return computeInstance (loc, "numberFormat", "#,##0.###");
|
||||
}
|
||||
catch (MissingResourceException e)
|
||||
{
|
||||
for (NumberFormatProvider p :
|
||||
ServiceLoader.load(NumberFormatProvider.class))
|
||||
{
|
||||
for (Locale l : p.getAvailableLocales())
|
||||
{
|
||||
if (l.equals(loc))
|
||||
{
|
||||
NumberFormat nf = p.getNumberInstance(loc);
|
||||
if (nf != null)
|
||||
return nf;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return getNumberInstance(LocaleHelper.getFallbackLocale(loc));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -484,10 +530,32 @@ public abstract class NumberFormat extends Format implements Cloneable
|
|||
*/
|
||||
public static NumberFormat getIntegerInstance(Locale locale)
|
||||
{
|
||||
NumberFormat format = computeInstance (locale, "integerFormat", "#,##0");
|
||||
format.setMaximumFractionDigits(0);
|
||||
format.setParseIntegerOnly (true);
|
||||
return format;
|
||||
try
|
||||
{
|
||||
NumberFormat format = computeInstance (locale,
|
||||
"integerFormat", "#,##0");
|
||||
format.setMaximumFractionDigits(0);
|
||||
format.setParseIntegerOnly (true);
|
||||
return format;
|
||||
}
|
||||
catch (MissingResourceException e)
|
||||
{
|
||||
for (NumberFormatProvider p :
|
||||
ServiceLoader.load(NumberFormatProvider.class))
|
||||
{
|
||||
for (Locale l : p.getAvailableLocales())
|
||||
{
|
||||
if (l.equals(locale))
|
||||
{
|
||||
NumberFormat nf = p.getIntegerInstance(locale);
|
||||
if (nf != null)
|
||||
return nf;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return getIntegerInstance(LocaleHelper.getFallbackLocale(locale));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -511,7 +579,28 @@ public abstract class NumberFormat extends Format implements Cloneable
|
|||
*/
|
||||
public static NumberFormat getPercentInstance (Locale loc)
|
||||
{
|
||||
return computeInstance (loc, "percentFormat", "#,##0%");
|
||||
try
|
||||
{
|
||||
return computeInstance (loc, "percentFormat", "#,##0%");
|
||||
}
|
||||
catch (MissingResourceException e)
|
||||
{
|
||||
for (NumberFormatProvider p :
|
||||
ServiceLoader.load(NumberFormatProvider.class))
|
||||
{
|
||||
for (Locale l : p.getAvailableLocales())
|
||||
{
|
||||
if (l.equals(loc))
|
||||
{
|
||||
NumberFormat nf = p.getPercentInstance(loc);
|
||||
if (nf != null)
|
||||
return nf;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return getPercentInstance(LocaleHelper.getFallbackLocale(loc));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue