From: <nic...@us...> - 2003-09-02 08:54:47
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/scratchpad/org/krysalis/jcharts/gantt In directory sc8-pr-cvs1:/tmp/cvs-serv11386/src/scratchpad/org/krysalis/jcharts/gantt Modified Files: DateHandler.java PlanRenderer.java Log Message: Decouple DateHandler from PlanRenderer Index: DateHandler.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/scratchpad/org/krysalis/jcharts/gantt/DateHandler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DateHandler.java 2 Sep 2003 08:43:15 -0000 1.1 --- DateHandler.java 2 Sep 2003 08:54:19 -0000 1.2 *************** *** 48,52 **** **/ public class DateHandler { - private final PlanRenderer dh; private Date currentDate; private long currentTime; --- 48,51 ---- *************** *** 137,143 **** } ! public DateHandler(PlanRenderer renderer, Date startDate, Date endDate) { df = DateFormat.getDateInstance(DateFormat.SHORT); - this.dh = renderer; df_ddMM = new SimpleDateFormat("dd/MM"); dmf = new SimpleDateFormat("MMMMM"); --- 136,141 ---- } ! public DateHandler(Date startDate, Date endDate) { df = DateFormat.getDateInstance(DateFormat.SHORT); df_ddMM = new SimpleDateFormat("dd/MM"); dmf = new SimpleDateFormat("MMMMM"); *************** *** 197,200 **** --- 195,204 ---- intVal = Integer.valueOf(str).intValue(); cal.set(Calendar.DATE, intVal); + + cal.set(Calendar.HOUR, 0); + cal.set(Calendar.MINUTE, 0); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND, 0); + return cal.getTime(); } *************** *** 202,206 **** public static Date getDate(Element ele) { String label = ele.getFirstChild().getNodeValue(); ! return DateHandler.getDate(label); } --- 206,210 ---- public static Date getDate(Element ele) { String label = ele.getFirstChild().getNodeValue(); ! return getDate(label); } Index: PlanRenderer.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/scratchpad/org/krysalis/jcharts/gantt/PlanRenderer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlanRenderer.java 2 Sep 2003 08:43:15 -0000 1.1 --- PlanRenderer.java 2 Sep 2003 08:54:20 -0000 1.2 *************** *** 127,131 **** g2.drawString(title, pos, 18); ! DateHandler dh = new DateHandler(this, startDate, endDate); g2.setPaint(Color.BLACK); --- 127,131 ---- g2.drawString(title, pos, 18); ! DateHandler dh = new DateHandler(startDate, endDate); g2.setPaint(Color.BLACK); |