JCalendarDatePicker improved

2 files changed, 24 insertions, 0 deletions

diff --git a/sources/client/NetCalendarClient.java b/sources/client/NetCalendarClient.java
index 77d6366..fff3223 100644
--- a/sources/client/NetCalendarClient.java
+++ b/sources/client/NetCalendarClient.java
@@ -50,6 +50,7 @@ public class NetCalendarClient extends JFrame {
 
     // Some callback objects
     private DoCallback doCallbackEditEvent;
+    private DoCallback doCallbackEditEventDate;
     private DoCallback doCallbackDeleteEvent;
     private DoCallback doCallbackCopyEvent;
     private DoCallback doCallbackDeleteCategory;
@@ -58,6 +59,7 @@ public class NetCalendarClient extends JFrame {
     // Static GUI strings which needs to be specified at least twice
     private final static String DELETE_EVENT = "Delete event(s)";
     private final static String EDIT_EVENT = "Edit event(s)";
+    private final static String EDIT_EVENT_DATE = "Edit event date(s)";
     private final static String COPY_EVENT = "Copy event(s)";
     private final static String CREATE_EVENT = "Create new event";
     private final static String DELETE_CATEGORY = "Delete whole category(s)";
@@ -191,6 +193,11 @@ public class NetCalendarClient extends JFrame {
                 new EditExistingEvent(netCalendarClient, (CalendarEvent) obj);
             }
         };
+        doCallbackEditEventDate = new DoCallback() {
+            public void callback(Object obj) {
+                new JCalendarDatePicker(netCalendarClient, (CalendarEvent) obj);
+            }
+        };
         jMenuItemEdit.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
                 foreachSelectedEvent(doCallbackEditEvent);
@@ -458,6 +465,9 @@ public class NetCalendarClient extends JFrame {
                 } else if (sActionCommand.equals(EDIT_EVENT)) {
                     foreachSelectedEvent(doCallbackEditEvent);
 
+                } else if (sActionCommand.equals(EDIT_EVENT_DATE)) {
+                    foreachSelectedEvent(doCallbackEditEventDate);
+
                 } else if (sActionCommand.equals(COPY_EVENT)) {
                     foreachSelectedEvent(doCallbackCopyEvent);
 
@@ -485,6 +495,9 @@ public class NetCalendarClient extends JFrame {
         JMenuItem jMenuItemPopupEdit = new JMenuItem(EDIT_EVENT);
         jMenuItemPopupEdit.addActionListener(jPopupMenuActionListener);
         jPopupMenu.add(jMenuItemPopupEdit);
+        JMenuItem jMenuItemPopupEditDate = new JMenuItem(EDIT_EVENT_DATE);
+        jMenuItemPopupEditDate.addActionListener(jPopupMenuActionListener);
+        jPopupMenu.add(jMenuItemPopupEditDate);
         JMenuItem jMenuItemPopupCopy = new JMenuItem(COPY_EVENT);
         jMenuItemPopupCopy.addActionListener(jPopupMenuActionListener);
         jPopupMenu.add(jMenuItemPopupCopy);
diff --git a/sources/shared/MyDate.java b/sources/shared/MyDate.java
index 1c13787..5ff35ab 100644
--- a/sources/shared/MyDate.java
+++ b/sources/shared/MyDate.java
@@ -15,6 +15,7 @@ import java.util.*;
 public class MyDate extends Date {
     private final static long serialVersionUID = 1L;
     private final static String [] DAYS = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+    //private Date date;
 
     /**
      * Copy constructor.
@@ -25,6 +26,16 @@ public class MyDate extends Date {
     }
 
     /**
+     * Copy constructor.
+     * @param calendar Specifies the date objekt to copy the time from.
+     */
+    /*
+    public MyDate(Calendar calendar) {
+        super(calendar.getTime());
+    }
+    */
+
+    /**
      * @see java.lang.Object#toString()
      */
     public String toString() {