From 618bf37b0547c0e994af34ea1e128af320410736 Mon Sep 17 00:00:00 2001 From: Tania Bento Date: Thu, 5 Apr 2007 00:15:16 +0000 Subject: DecimalFormatSymbols.java: Added the year 2007 to Copyright information and introduced new variable, currency. 2007-04-04 Tania Bento * java/text/DecimalFormatSymbols.java: Added the year 2007 to Copyright information and introduced new variable, currency. (DecimalFormatSymbols(Locale)): Define currency and intlCurrencySymbol to "XXX", currencySymbol to "?" and localCurrency appropriately. (getCurrency): Fixed documentation and return the value of currency. (setCurrency): Fixed documentation and update the value of currency. (setInternationalCurrencySymbol): Fixed documentation and update the value of currency. * java/util/Currency.java: Introduced two new variables, properties and fractionDigits. In the static block, a properties object is created and the currency resource is loaded. (Currency(Locale)): fractionDigits is defined. (Currency(String)): New method. (getDefaultFractionDigits): Return the value of fractionDigits. (getInstance(String)): Check if String is equal to "XXX". From-SVN: r123512 --- libjava/gnu/java/net/PlainSocketImpl.h | 2 +- libjava/gnu/java/util/jar/JarUtils.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'libjava/gnu/java') diff --git a/libjava/gnu/java/net/PlainSocketImpl.h b/libjava/gnu/java/net/PlainSocketImpl.h index 7872ac24a72..d907871df15 100644 --- a/libjava/gnu/java/net/PlainSocketImpl.h +++ b/libjava/gnu/java/net/PlainSocketImpl.h @@ -46,8 +46,8 @@ public: ::java::lang::Object * getOption(jint); void shutdownInput(); void shutdownOutput(); -public: // actually protected void create(jboolean); +public: // actually protected void connect(::java::lang::String *, jint); void connect(::java::net::InetAddress *, jint); void connect(::java::net::SocketAddress *, jint); diff --git a/libjava/gnu/java/util/jar/JarUtils.h b/libjava/gnu/java/util/jar/JarUtils.h index 4704582d0db..1d12845fd65 100644 --- a/libjava/gnu/java/util/jar/JarUtils.h +++ b/libjava/gnu/java/util/jar/JarUtils.h @@ -50,7 +50,6 @@ private: static void writeVersionInfo(::java::util::jar::Attributes *, ::java::io::OutputStream *); static void writeAttributeEntry(::java::util::Map$Entry *, ::java::io::OutputStream *); static void writeHeader(::java::lang::String *, ::java::lang::String *, ::java::io::OutputStream *); - static ::java::util::logging::Logger * log; public: static ::java::lang::String * META_INF; static ::java::lang::String * DSA_SUFFIX; -- cgit v1.2.1