DateFormat.java (computeInstance): Separate time and date styles.
* java/text/DateFormat.java (computeInstance): Separate time
and date styles.
(getDateTimeInstance): Ditto.
(getDateTimeInstance(int,int)): New method.
* Makefile.in: Rebuilt.
* Makefile.am (ordinary_java_source_files): Add new classes.
* java/util/PropertyResourceBundle.java: New file.
* gnu/gcj/util/EnumerationChain.java: New file.
From-SVN: r26842
This commit is contained in:
committed by
Anthony Green
parent
81a1c8c397
commit
e3884aeea7
@@ -93,6 +93,15 @@ public abstract class DateFormat extends Format implements Cloneable
|
||||
private static final DateFormat computeInstance (int style, Locale loc,
|
||||
boolean use_date,
|
||||
boolean use_time)
|
||||
{
|
||||
return computeInstance (style, style, loc, use_date, use_time);
|
||||
}
|
||||
|
||||
private static final DateFormat computeInstance (int dateStyle,
|
||||
int timeStyle,
|
||||
Locale loc,
|
||||
boolean use_date,
|
||||
boolean use_time)
|
||||
{
|
||||
ResourceBundle res;
|
||||
try
|
||||
@@ -108,7 +117,7 @@ public abstract class DateFormat extends Format implements Cloneable
|
||||
if (use_date)
|
||||
{
|
||||
String name, def;
|
||||
switch (style)
|
||||
switch (dateStyle)
|
||||
{
|
||||
case FULL:
|
||||
name = "fullDateFormat";
|
||||
@@ -147,7 +156,7 @@ public abstract class DateFormat extends Format implements Cloneable
|
||||
pattern += " ";
|
||||
|
||||
String name, def;
|
||||
switch (style)
|
||||
switch (timeStyle)
|
||||
{
|
||||
case FULL:
|
||||
name = "fullTimeFormat";
|
||||
@@ -201,23 +210,31 @@ public abstract class DateFormat extends Format implements Cloneable
|
||||
|
||||
public static final DateFormat getDateTimeInstance ()
|
||||
{
|
||||
return getDateTimeInstance (DEFAULT, Locale.getDefault());
|
||||
return getDateTimeInstance (DEFAULT, DEFAULT, Locale.getDefault());
|
||||
}
|
||||
|
||||
public static final DateFormat getDateTimeInstance (int style)
|
||||
{
|
||||
return getDateTimeInstance (style, Locale.getDefault());
|
||||
return getDateTimeInstance (style, style, Locale.getDefault());
|
||||
}
|
||||
|
||||
public static final DateFormat getDateTimeInstance (int style, Locale loc)
|
||||
public static final DateFormat getDateTimeInstance (int dateStyle,
|
||||
int timeStyle)
|
||||
{
|
||||
return computeInstance (style, loc, true, true);
|
||||
return getDateTimeInstance (dateStyle, timeStyle, Locale.getDefault());
|
||||
}
|
||||
|
||||
public static final DateFormat getDateTimeInstance (int dateStyle,
|
||||
int timeStyle,
|
||||
Locale loc)
|
||||
{
|
||||
return computeInstance (dateStyle, timeStyle, loc, true, true);
|
||||
}
|
||||
|
||||
public static final DateFormat getInstance ()
|
||||
{
|
||||
// JCL book says SHORT.
|
||||
return getDateTimeInstance (SHORT, Locale.getDefault());
|
||||
return getDateTimeInstance (SHORT, SHORT, Locale.getDefault());
|
||||
}
|
||||
|
||||
public NumberFormat getNumberFormat ()
|
||||
|
||||
Reference in New Issue
Block a user