addad a clock

1 files changed, 75 insertions, 35 deletions

diff --git a/sources/client/NetCalendarClient.java b/sources/client/NetCalendarClient.java
index d723e20..823a382 100644
--- a/sources/client/NetCalendarClient.java
+++ b/sources/client/NetCalendarClient.java
@@ -9,9 +9,10 @@ package client;
 
 import java.awt.*;
 import java.awt.event.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import javax.swing.*;
 import javax.swing.table.*;
-import java.util.*;
 
 import shared.*;
 import shared.remotecall.*;
@@ -30,6 +31,8 @@ public class NetCalendarClient extends JFrame {
     private NetCalendarClient netCalendarClient;
     private Vector vecFrames = new Vector();
 
+    private Thread currentTimeThread;
+
     // Diverse components
     private ClientRequest lastClientRequest = null;
     protected int iCurrentMouseSelectedRow = 0;
@@ -43,6 +46,7 @@ public class NetCalendarClient extends JFrame {
 
     private JTextField jTextFieldRegexp;
     private JTextField jTextFieldStatusMessages;
+    private JTextField jTextFieldCurrentTime;
 
     // Some callback objects
     private DoCallback doCallbackEditEvent;
@@ -62,6 +66,7 @@ public class NetCalendarClient extends JFrame {
     private final static String SORT_BY_COL = "Sort by this row";
     private final static String REVERSE_SORT_BY_COL = "Reverse sort by this row";
     private final static String ENTER_REGEXP_HERE ="Enter some regexp search string here...";
+    private static final String DATE_FORMAT_NOW = "yyyy/MM/dd HH:mm:ss";
 
     /**
      * Standard constructor, creates the client GUI.
@@ -111,11 +116,11 @@ public class NetCalendarClient extends JFrame {
         setJMenuBar(jMenuBar);
 
         JMenu jMenuSession = new JMenu("Session");
-		jMenuSession.setMnemonic(KeyEvent.VK_S);	
+        jMenuSession.setMnemonic(KeyEvent.VK_S);
         jMenuBar.add(jMenuSession);
 
         JMenuItem jMenuItemNewWindow = new JMenuItem("New window");
-		jMenuItemNewWindow.setMnemonic(KeyEvent.VK_N);	
+        jMenuItemNewWindow.setMnemonic(KeyEvent.VK_N);
         jMenuSession.add(jMenuItemNewWindow);
         jMenuItemNewWindow.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -124,7 +129,7 @@ public class NetCalendarClient extends JFrame {
         });
 
         JMenuItem jMenuItemCloseWindow = new JMenuItem("Close window");
-		jMenuItemCloseWindow.setMnemonic(KeyEvent.VK_C);	
+        jMenuItemCloseWindow.setMnemonic(KeyEvent.VK_C);
         jMenuSession.add(jMenuItemCloseWindow);
         jMenuItemCloseWindow.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -135,7 +140,7 @@ public class NetCalendarClient extends JFrame {
         jMenuSession.add(new JSeparator());
 
         JMenuItem jMenuItemPreferences = new JMenuItem("Preferences");
-		jMenuItemPreferences.setMnemonic(KeyEvent.VK_P);	
+        jMenuItemPreferences.setMnemonic(KeyEvent.VK_P);
         jMenuSession.add(jMenuItemPreferences);
         jMenuItemPreferences.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -146,7 +151,7 @@ public class NetCalendarClient extends JFrame {
         jMenuSession.add(new JSeparator());
 
         JMenuItem jMenuItemQuit = new JMenuItem("Quit");
-		jMenuItemQuit.setMnemonic(KeyEvent.VK_Q);	
+        jMenuItemQuit.setMnemonic(KeyEvent.VK_Q);
         jMenuSession.add(jMenuItemQuit);
         jMenuItemQuit.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -155,11 +160,11 @@ public class NetCalendarClient extends JFrame {
         });
 
         JMenu jMenuEdit = new JMenu("Edit");
-		jMenuEdit.setMnemonic(KeyEvent.VK_E);	
+        jMenuEdit.setMnemonic(KeyEvent.VK_E);
         jMenuBar.add(jMenuEdit);
 
         JMenuItem jMenuItemCreate = new JMenuItem(CREATE_EVENT);
-		jMenuItemCreate.setMnemonic(KeyEvent.VK_C);	
+        jMenuItemCreate.setMnemonic(KeyEvent.VK_C);
         jMenuEdit.add(jMenuItemCreate);
         jMenuItemCreate.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -168,7 +173,7 @@ public class NetCalendarClient extends JFrame {
         });
 
         JMenuItem jMenuItemEdit = new JMenuItem(EDIT_EVENT);
-		jMenuItemEdit.setMnemonic(KeyEvent.VK_E);	
+        jMenuItemEdit.setMnemonic(KeyEvent.VK_E);
         jMenuEdit.add(jMenuItemEdit);
         doCallbackEditEvent = new DoCallback() {
             public void callback(Object obj) {
@@ -182,7 +187,7 @@ public class NetCalendarClient extends JFrame {
         });
 
         JMenuItem jMenuItemCopy = new JMenuItem(COPY_EVENT);
-		jMenuItemCopy.setMnemonic(KeyEvent.VK_O);	
+        jMenuItemCopy.setMnemonic(KeyEvent.VK_O);
         jMenuEdit.add(jMenuItemCopy);
         doCallbackCopyEvent = new DoCallback() {
             public void callback(Object obj) {
@@ -200,7 +205,7 @@ public class NetCalendarClient extends JFrame {
         });
 
         JMenuItem jMenuItemDelete = new JMenuItem(DELETE_EVENT);
-		jMenuItemDelete.setMnemonic(KeyEvent.VK_D);	
+        jMenuItemDelete.setMnemonic(KeyEvent.VK_D);
         jMenuEdit.add(jMenuItemDelete);
         doCallbackDeleteEvent = new DoCallback() {
             public void callback(Object obj) {
@@ -217,7 +222,7 @@ public class NetCalendarClient extends JFrame {
         jMenuEdit.add(new JSeparator());
 
         JMenuItem jMenuItemRenameCategory = new JMenuItem(RENAME_CATEGORY);
-		jMenuItemRenameCategory.setMnemonic(KeyEvent.VK_R);	
+        jMenuItemRenameCategory.setMnemonic(KeyEvent.VK_R);
         jMenuEdit.add(jMenuItemRenameCategory);
         doCallbackRenameCategory = new DoCallback() {
             public void callback(Object obj) {
@@ -232,7 +237,7 @@ public class NetCalendarClient extends JFrame {
         });
 
         JMenuItem jMenuItemDeleteCategory = new JMenuItem(DELETE_CATEGORY);
-		jMenuItemDeleteCategory.setMnemonic(KeyEvent.VK_L);	
+        jMenuItemDeleteCategory.setMnemonic(KeyEvent.VK_L);
         jMenuEdit.add(jMenuItemDeleteCategory);
         doCallbackDeleteCategory = new DoCallback() {
             public void callback(Object obj) {
@@ -248,11 +253,11 @@ public class NetCalendarClient extends JFrame {
 
 
         JMenu jMenuSorting = new JMenu("Sorting");
-		jMenuSorting.setMnemonic(KeyEvent.VK_O);	
+        jMenuSorting.setMnemonic(KeyEvent.VK_O);
         jMenuBar.add(jMenuSorting);
 
         JMenuItem jMenuItemSortByDate = new JMenuItem("Sort by date");
-		jMenuItemSortByDate.setMnemonic(KeyEvent.VK_D);	
+        jMenuItemSortByDate.setMnemonic(KeyEvent.VK_D);
         jMenuSorting.add(jMenuItemSortByDate);
         jMenuItemSortByDate.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -260,7 +265,7 @@ public class NetCalendarClient extends JFrame {
             }
         });
         JMenuItem jMenuItemSortByCategory = new JMenuItem("Sort by category");
-		jMenuItemSortByCategory.setMnemonic(KeyEvent.VK_C);	
+        jMenuItemSortByCategory.setMnemonic(KeyEvent.VK_C);
         jMenuSorting.add(jMenuItemSortByCategory);
         jMenuItemSortByCategory.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -268,7 +273,7 @@ public class NetCalendarClient extends JFrame {
             }
         });
         JMenuItem jMenuItemSortByDescr = new JMenuItem("Sort by description");
-		jMenuItemSortByDescr.setMnemonic(KeyEvent.VK_E);	
+        jMenuItemSortByDescr.setMnemonic(KeyEvent.VK_E);
         jMenuSorting.add(jMenuItemSortByDescr);
         jMenuItemSortByDescr.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -276,7 +281,7 @@ public class NetCalendarClient extends JFrame {
             }
         });
         JMenuItem jMenuItemSortByPlace = new JMenuItem("Sort by place");
-		jMenuItemSortByPlace.setMnemonic(KeyEvent.VK_P);	
+        jMenuItemSortByPlace.setMnemonic(KeyEvent.VK_P);
         jMenuSorting.add(jMenuItemSortByPlace);
         jMenuItemSortByPlace.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -284,7 +289,7 @@ public class NetCalendarClient extends JFrame {
             }
         });
         JMenuItem jMenuItemSortByEventIDs = new JMenuItem("Sort by event IDs");
-		jMenuItemSortByEventIDs.setMnemonic(KeyEvent.VK_I);	
+        jMenuItemSortByEventIDs.setMnemonic(KeyEvent.VK_I);
         jMenuSorting.add(jMenuItemSortByEventIDs);
         jMenuItemSortByEventIDs.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -296,7 +301,7 @@ public class NetCalendarClient extends JFrame {
 
         JMenuItem jMenuItemReverseSortByDate = new JMenuItem(
             "Reverse sort by date");
-		jMenuItemReverseSortByDate.setMnemonic(KeyEvent.VK_A);	
+        jMenuItemReverseSortByDate.setMnemonic(KeyEvent.VK_A);
         jMenuSorting.add(jMenuItemReverseSortByDate);
         jMenuItemReverseSortByDate.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -305,7 +310,7 @@ public class NetCalendarClient extends JFrame {
         });
         JMenuItem jMenuItemReverseSortByCategory = new JMenuItem(
             "Reverse sort by category");
-		jMenuItemReverseSortByCategory.setMnemonic(KeyEvent.VK_T);	
+        jMenuItemReverseSortByCategory.setMnemonic(KeyEvent.VK_T);
         jMenuSorting.add(jMenuItemReverseSortByCategory);
         jMenuItemReverseSortByCategory.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -314,7 +319,7 @@ public class NetCalendarClient extends JFrame {
         });
         JMenuItem jMenuItemReverseSortByDescr = new JMenuItem(
             "Reverse sort by description");
-		jMenuItemReverseSortByDescr.setMnemonic(KeyEvent.VK_S);	
+        jMenuItemReverseSortByDescr.setMnemonic(KeyEvent.VK_S);
         jMenuSorting.add(jMenuItemReverseSortByDescr);
         jMenuItemReverseSortByDescr.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -323,7 +328,7 @@ public class NetCalendarClient extends JFrame {
         });
         JMenuItem jMenuItemReverseSortByPlace = new JMenuItem(
             "Reverse sort by place");
-		jMenuItemReverseSortByPlace.setMnemonic(KeyEvent.VK_L);	
+        jMenuItemReverseSortByPlace.setMnemonic(KeyEvent.VK_L);
         jMenuSorting.add(jMenuItemReverseSortByPlace);
         jMenuItemReverseSortByPlace.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -332,7 +337,7 @@ public class NetCalendarClient extends JFrame {
         });
         JMenuItem jMenuItemReverseSortByIDs = new JMenuItem(
             "Reverse sort by event IDs");
-		jMenuItemReverseSortByIDs.setMnemonic(KeyEvent.VK_R);	
+        jMenuItemReverseSortByIDs.setMnemonic(KeyEvent.VK_R);
         jMenuSorting.add(jMenuItemReverseSortByIDs);
         jMenuItemReverseSortByIDs.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -341,11 +346,11 @@ public class NetCalendarClient extends JFrame {
         });
 
         JMenu jMenuServer = new JMenu("Server");
-		jMenuServer.setMnemonic(KeyEvent.VK_R);	
+        jMenuServer.setMnemonic(KeyEvent.VK_R);
         jMenuBar.add(jMenuServer);
 
         JMenuItem jMenuItemUpdate = new JMenuItem("Update events from server");
-		jMenuItemUpdate.setMnemonic(KeyEvent.VK_U);	
+        jMenuItemUpdate.setMnemonic(KeyEvent.VK_U);
         jMenuServer.add(jMenuItemUpdate);
         jMenuItemUpdate.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -354,7 +359,7 @@ public class NetCalendarClient extends JFrame {
         });
 
         JMenuItem jMenuItemGetAll = new JMenuItem("Get all events from server");
-		jMenuItemGetAll.setMnemonic(KeyEvent.VK_G);	
+        jMenuItemGetAll.setMnemonic(KeyEvent.VK_G);
         jMenuServer.add(jMenuItemGetAll);
         ActionListener actionListenerGetAll = new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -365,7 +370,7 @@ public class NetCalendarClient extends JFrame {
 
         JMenuItem jMenuItemAdvancedSearch = new JMenuItem(
             "Advanced searching for events");
-		jMenuItemAdvancedSearch.setMnemonic(KeyEvent.VK_A);	
+        jMenuItemAdvancedSearch.setMnemonic(KeyEvent.VK_A);
         jMenuServer.add(jMenuItemAdvancedSearch);
         jMenuItemAdvancedSearch.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -376,7 +381,7 @@ public class NetCalendarClient extends JFrame {
         jMenuServer.add(new JSeparator());
 
         JMenuItem jMenuItemReloadDatabase = new JMenuItem("Reload database");
-		jMenuItemReloadDatabase.setMnemonic(KeyEvent.VK_R);	
+        jMenuItemReloadDatabase.setMnemonic(KeyEvent.VK_R);
         jMenuServer.add(jMenuItemReloadDatabase);
         jMenuItemReloadDatabase.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -386,7 +391,7 @@ public class NetCalendarClient extends JFrame {
             }
         });
         JMenuItem jMenuItemFlushDatabase = new JMenuItem("Flush database");
-		jMenuItemFlushDatabase.setMnemonic(KeyEvent.VK_F);	
+        jMenuItemFlushDatabase.setMnemonic(KeyEvent.VK_F);
         jMenuServer.add(jMenuItemFlushDatabase);
         jMenuItemFlushDatabase.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -398,7 +403,7 @@ public class NetCalendarClient extends JFrame {
         jMenuServer.add(new JSeparator());
 
         JMenuItem jMenuItemShutdownServer = new JMenuItem("Shutdown server");
-		jMenuItemShutdownServer.setMnemonic(KeyEvent.VK_S);	
+        jMenuItemShutdownServer.setMnemonic(KeyEvent.VK_S);
         jMenuServer.add(jMenuItemShutdownServer);
         jMenuItemShutdownServer.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -408,11 +413,11 @@ public class NetCalendarClient extends JFrame {
         });
 
         JMenu jMenuAbout = new JMenu("About");
-		jMenuAbout.setMnemonic(KeyEvent.VK_A);	
+        jMenuAbout.setMnemonic(KeyEvent.VK_A);
         jMenuBar.add(jMenuAbout);
 
         JMenuItem jMenuItemAbout = new JMenuItem("About");
-		jMenuItemAbout.setMnemonic(KeyEvent.VK_A);	
+        jMenuItemAbout.setMnemonic(KeyEvent.VK_A);
         jMenuBar.add(jMenuAbout);
         jMenuAbout.add(jMenuItemAbout);
         jMenuItemAbout.addActionListener(new ActionListener() {
@@ -421,7 +426,7 @@ public class NetCalendarClient extends JFrame {
             }
         });
         JMenuItem jMenuItemLicense = new JMenuItem("License");
-		jMenuItemLicense.setMnemonic(KeyEvent.VK_L);	
+        jMenuItemLicense.setMnemonic(KeyEvent.VK_L);
         jMenuAbout.add(jMenuItemLicense);
         jMenuItemLicense.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent event) {
@@ -608,12 +613,23 @@ public class NetCalendarClient extends JFrame {
                 + Config.VERSION);
         jTextFieldStatusMessages.setEditable(false);
 
+        jTextFieldCurrentTime = new JTextField();
+        jTextFieldCurrentTime.setEditable(false);
+
         // Set split pane components
+        JSplitPane jSplitPaneStatus =
+            new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
+        jSplitPaneStatus.setDividerSize(0);
+        jSplitPaneStatus.setResizeWeight(1);
+
+        jSplitPaneStatus.setLeftComponent(jTextFieldStatusMessages);
+        jSplitPaneStatus.setRightComponent(jTextFieldCurrentTime);
+
         jSplitPane.setTopComponent(jScrollPaneTable);
         jSplitPane.setBottomComponent(jSplitPane2);
 
         jSplitPane2.setTopComponent(jSplitPane3);
-        jSplitPane2.setBottomComponent(jTextFieldStatusMessages);
+        jSplitPane2.setBottomComponent(jSplitPaneStatus);
 
         JPanel jPanelButtons = new JPanel();
         jPanelButtons.add(jButtonSearch);
@@ -623,6 +639,21 @@ public class NetCalendarClient extends JFrame {
         jSplitPane3.setRightComponent(jPanelButtons);
 
         container.add(jSplitPane);
+
+        currentTimeThread = new Thread() {
+            public void run() {
+                while (true) {
+                    updateCurrentTime();
+                    try {
+                        Thread.sleep(1000);
+                    } catch (Exception e) {
+                        System.err.println(e);
+                    }
+                }
+            }
+        };
+
+        currentTimeThread.start();
     }
 
     /**
@@ -735,6 +766,15 @@ public class NetCalendarClient extends JFrame {
     }
 
     /**
+     * This method updates the current time in the time frame in the GUI
+     */
+    public synchronized void updateCurrentTime() {
+        Calendar cal = Calendar.getInstance();
+        SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT_NOW);
+        jTextFieldCurrentTime.setText(sdf.format(cal.getTime()));
+    }
+
+    /**
      * This method disposes this JFrame window including all the JFrame windows which
      * belong to this session.
      */