Updated demos to compile with new calendar classes in

com.ibm.util

X-SVN-Rev: 1043
This commit is contained in:
John Fitzpatrick 2000-03-31 18:49:02 +00:00
parent 2dbef4e207
commit baa708ff68
8 changed files with 94 additions and 64 deletions

View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/demo/calendar/Attic/CalendarCalc.java,v $
* $Date: 2000/03/10 03:47:42 $
* $Revision: 1.4 $
* $Date: 2000/03/31 18:49:02 $
* $Revision: 1.5 $
*
*****************************************************************************************
*/
@ -20,11 +20,14 @@ import java.util.Date;
import java.awt.*;
import java.awt.event.*;
import java.text.DateFormat;
//import java.text.DateFormat;
import com.ibm.text.DateFormat;
import java.text.ParsePosition;
import java.util.Calendar;
import java.util.GregorianCalendar;
//import java.util.Calendar;
import com.ibm.util.Calendar;
//import java.util.GregorianCalendar;
import com.ibm.util.GregorianCalendar;
import java.util.TimeZone;
import java.util.Locale;
@ -485,7 +488,7 @@ class CalendarCalcFrame extends Frame
class CalendarRec {
public CalendarRec(String nameStr, java.util.Calendar cal)
public CalendarRec(String nameStr, Calendar cal)
{
name = nameStr;
calendar = cal;
@ -510,22 +513,24 @@ class CalendarCalcFrame extends Frame
public void applyPattern(String pattern) {
if (format instanceof SimpleDateFormat) {
((SimpleDateFormat)format).applyPattern(pattern);
} else if (format instanceof java.text.SimpleDateFormat) {
((java.text.SimpleDateFormat)format).applyPattern(pattern);
//hey {al} -
// } else if (format instanceof java.text.SimpleDateFormat) {
// ((java.text.SimpleDateFormat)format).applyPattern(pattern);
}
}
private String toPattern() {
if (format instanceof SimpleDateFormat) {
return ((SimpleDateFormat)format).toPattern();
} else if (format instanceof java.text.SimpleDateFormat) {
return ((java.text.SimpleDateFormat)format).toPattern();
//hey {al} -
// } else if (format instanceof java.text.SimpleDateFormat) {
// return ((java.text.SimpleDateFormat)format).toPattern();
} else {
return "";
}
}
java.util.Calendar calendar;
Calendar calendar;
DateFormat format;
String name;
JTextField text;

View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/demo/calendar/Attic/CalendarFrame.java,v $
* $Date: 2000/03/10 03:47:42 $
* $Revision: 1.4 $
* $Date: 2000/03/31 18:49:02 $
* $Revision: 1.5 $
*
*****************************************************************************************
*/
@ -26,11 +26,14 @@ import java.awt.*;
import java.awt.event.*;
import java.net.*;
import java.io.*;
import java.text.DateFormat;
//import java.text.DateFormat;
import com.ibm.text.DateFormat;
import java.text.MessageFormat;
import java.util.Calendar;
//import java.util.Calendar;
import com.ibm.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
//import java.util.GregorianCalendar;
import com.ibm.util.GregorianCalendar;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@ -240,10 +243,11 @@ class CalendarFrame extends Frame
com.ibm.text.SimpleDateFormat f1 = (com.ibm.text.SimpleDateFormat) f;
f1.applyPattern("MMMM, yyyy G");
f1.setTimeZone(new SimpleTimeZone(0, "UTC"));
} else if (f instanceof java.text.SimpleDateFormat) {
java.text.SimpleDateFormat f1 = (java.text.SimpleDateFormat) f;
f1.applyPattern("MMMM, yyyy G");
f1.setTimeZone(new SimpleTimeZone(0, "UTC"));
//hey {al} -
// } else if (f instanceof java.text.SimpleDateFormat) {
// java.text.SimpleDateFormat f1 = (java.text.SimpleDateFormat) f;
// f1.applyPattern("MMMM, yyyy G");
// f1.setTimeZone(new SimpleTimeZone(0, "UTC"));
}
monthFormat[i] = f;
}
@ -392,13 +396,13 @@ class CalendarFrame extends Frame
}
class CalendarRec {
public CalendarRec(String nameStr, java.util.Calendar cal)
public CalendarRec(String nameStr, Calendar cal)
{
name = nameStr;
calendar = cal;
}
java.util.Calendar calendar;
Calendar calendar;
String name;
};

View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/demo/calendar/Attic/CalendarPanel.java,v $
* $Date: 2000/03/10 03:47:43 $
* $Revision: 1.3 $
* $Date: 2000/03/31 18:49:02 $
* $Revision: 1.4 $
*
*****************************************************************************************
*/
@ -22,9 +22,12 @@ import java.awt.event.*;
import java.net.*;
import java.io.*;
import java.text.DateFormat;
//import java.text.DateFormat;
import com.ibm.text.DateFormat;
import java.util.SimpleTimeZone;
import java.util.*;
//import java.util.*;
import java.util.Date;
import java.util.Locale;
import com.ibm.util.*;
import com.ibm.text.*;

View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/demo/holiday/Attic/HolidayCalendarDemo.java,v $
* $Date: 2000/03/10 03:47:43 $
* $Revision: 1.2 $
* $Date: 2000/03/31 18:49:02 $
* $Revision: 1.3 $
*
*****************************************************************************************
*/
@ -16,14 +16,17 @@ package com.ibm.demo.holiday;
import com.ibm.demo.*;
import java.applet.Applet;
import java.awt.*;
import java.util.*;
//import java.util.*;
import java.net.*;
import java.io.*;
import java.text.SimpleDateFormat;
//import java.text.SimpleDateFormat;
import com.ibm.text.SimpleDateFormat;
import java.text.DateFormatSymbols;
import java.util.SimpleTimeZone;
import java.util.*;
import java.util.Locale;
import java.util.Vector;
import java.util.Date;
import com.ibm.util.*;
@ -425,7 +428,7 @@ public class HolidayCalendarDemo extends DemoApplet
repaint();
}
public Calendar getCalendar() {
public com.ibm.util.Calendar getCalendar() {
return fCalendar;
}

View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/demo/calendar/CalendarCalc.java,v $
* $Date: 2000/03/10 03:47:42 $
* $Revision: 1.4 $
* $Date: 2000/03/31 18:49:02 $
* $Revision: 1.5 $
*
*****************************************************************************************
*/
@ -20,11 +20,14 @@ import java.util.Date;
import java.awt.*;
import java.awt.event.*;
import java.text.DateFormat;
//import java.text.DateFormat;
import com.ibm.text.DateFormat;
import java.text.ParsePosition;
import java.util.Calendar;
import java.util.GregorianCalendar;
//import java.util.Calendar;
import com.ibm.util.Calendar;
//import java.util.GregorianCalendar;
import com.ibm.util.GregorianCalendar;
import java.util.TimeZone;
import java.util.Locale;
@ -485,7 +488,7 @@ class CalendarCalcFrame extends Frame
class CalendarRec {
public CalendarRec(String nameStr, java.util.Calendar cal)
public CalendarRec(String nameStr, Calendar cal)
{
name = nameStr;
calendar = cal;
@ -510,22 +513,24 @@ class CalendarCalcFrame extends Frame
public void applyPattern(String pattern) {
if (format instanceof SimpleDateFormat) {
((SimpleDateFormat)format).applyPattern(pattern);
} else if (format instanceof java.text.SimpleDateFormat) {
((java.text.SimpleDateFormat)format).applyPattern(pattern);
//hey {al} -
// } else if (format instanceof java.text.SimpleDateFormat) {
// ((java.text.SimpleDateFormat)format).applyPattern(pattern);
}
}
private String toPattern() {
if (format instanceof SimpleDateFormat) {
return ((SimpleDateFormat)format).toPattern();
} else if (format instanceof java.text.SimpleDateFormat) {
return ((java.text.SimpleDateFormat)format).toPattern();
//hey {al} -
// } else if (format instanceof java.text.SimpleDateFormat) {
// return ((java.text.SimpleDateFormat)format).toPattern();
} else {
return "";
}
}
java.util.Calendar calendar;
Calendar calendar;
DateFormat format;
String name;
JTextField text;

View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/demo/calendar/CalendarFrame.java,v $
* $Date: 2000/03/10 03:47:42 $
* $Revision: 1.4 $
* $Date: 2000/03/31 18:49:02 $
* $Revision: 1.5 $
*
*****************************************************************************************
*/
@ -26,11 +26,14 @@ import java.awt.*;
import java.awt.event.*;
import java.net.*;
import java.io.*;
import java.text.DateFormat;
//import java.text.DateFormat;
import com.ibm.text.DateFormat;
import java.text.MessageFormat;
import java.util.Calendar;
//import java.util.Calendar;
import com.ibm.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
//import java.util.GregorianCalendar;
import com.ibm.util.GregorianCalendar;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@ -240,10 +243,11 @@ class CalendarFrame extends Frame
com.ibm.text.SimpleDateFormat f1 = (com.ibm.text.SimpleDateFormat) f;
f1.applyPattern("MMMM, yyyy G");
f1.setTimeZone(new SimpleTimeZone(0, "UTC"));
} else if (f instanceof java.text.SimpleDateFormat) {
java.text.SimpleDateFormat f1 = (java.text.SimpleDateFormat) f;
f1.applyPattern("MMMM, yyyy G");
f1.setTimeZone(new SimpleTimeZone(0, "UTC"));
//hey {al} -
// } else if (f instanceof java.text.SimpleDateFormat) {
// java.text.SimpleDateFormat f1 = (java.text.SimpleDateFormat) f;
// f1.applyPattern("MMMM, yyyy G");
// f1.setTimeZone(new SimpleTimeZone(0, "UTC"));
}
monthFormat[i] = f;
}
@ -392,13 +396,13 @@ class CalendarFrame extends Frame
}
class CalendarRec {
public CalendarRec(String nameStr, java.util.Calendar cal)
public CalendarRec(String nameStr, Calendar cal)
{
name = nameStr;
calendar = cal;
}
java.util.Calendar calendar;
Calendar calendar;
String name;
};

View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/demo/calendar/CalendarPanel.java,v $
* $Date: 2000/03/10 03:47:43 $
* $Revision: 1.3 $
* $Date: 2000/03/31 18:49:02 $
* $Revision: 1.4 $
*
*****************************************************************************************
*/
@ -22,9 +22,12 @@ import java.awt.event.*;
import java.net.*;
import java.io.*;
import java.text.DateFormat;
//import java.text.DateFormat;
import com.ibm.text.DateFormat;
import java.util.SimpleTimeZone;
import java.util.*;
//import java.util.*;
import java.util.Date;
import java.util.Locale;
import com.ibm.util.*;
import com.ibm.text.*;

View file

@ -5,8 +5,8 @@
*******************************************************************************
*
* $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/demo/holiday/HolidayCalendarDemo.java,v $
* $Date: 2000/03/10 03:47:43 $
* $Revision: 1.2 $
* $Date: 2000/03/31 18:49:02 $
* $Revision: 1.3 $
*
*****************************************************************************************
*/
@ -16,14 +16,17 @@ package com.ibm.demo.holiday;
import com.ibm.demo.*;
import java.applet.Applet;
import java.awt.*;
import java.util.*;
//import java.util.*;
import java.net.*;
import java.io.*;
import java.text.SimpleDateFormat;
//import java.text.SimpleDateFormat;
import com.ibm.text.SimpleDateFormat;
import java.text.DateFormatSymbols;
import java.util.SimpleTimeZone;
import java.util.*;
import java.util.Locale;
import java.util.Vector;
import java.util.Date;
import com.ibm.util.*;
@ -425,7 +428,7 @@ public class HolidayCalendarDemo extends DemoApplet
repaint();
}
public Calendar getCalendar() {
public com.ibm.util.Calendar getCalendar() {
return fCalendar;
}