--- projects/cms/source/conient/uk/org/iscream/cms/conient/Conient.java	2001/01/14 21:22:34	1.1
+++ projects/cms/source/conient/uk/org/iscream/cms/conient/Conient.java	2001/01/14 22:37:24	1.2
@@ -9,12 +9,15 @@ import java.awt.*;
 import java.awt.event.*;
 import java.net.*;
 import java.io.*;
+import java.util.Date;
+import java.text.DateFormat;
+import java.util.Locale;
 
 /**
  * NASTY AND BASIC, PLEASE DON'T COMPLAIN
  *
  * @author  $Author: ajm $
- * @version $Id: Conient.java,v 1.1 2001/01/14 21:22:34 ajm Exp $
+ * @version $Id: Conient.java,v 1.2 2001/01/14 22:37:24 ajm Exp $
  */
 public class SwingClient extends JFrame implements Runnable {
 
@@ -23,7 +26,7 @@ public class SwingClient extends JFrame implements Run
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.1 $";
+    public final String REVISION = "$Revision: 1.2 $";
     
     private final int width = 300;
     private final int height = 700;
@@ -78,7 +81,7 @@ public class SwingClient extends JFrame implements Run
         JPanel panel2 = makeTextPanel("IP : ", _ip);
         JPanel panel3 = makeTextPanel("Date : ", _date);
         JPanel panel4 = makeTextPanel("Sequence Number : ", _seq_no);
-        JPanel panel5 = makeTextPanel("sTime : ", _sTime);
+        JPanel panel5 = makeTextPanel("Host Time : ", _sTime);
         JPanel panel6 = makeTextPanel("Load Average (1 min) : ", _load_load1);
         JPanel panel7 = makeTextPanel("Load Average (5 min) : ", _load_load5);
         JPanel panel8 = makeTextPanel("Load Average (15 min) : ", _load_load15);
@@ -155,7 +158,7 @@ public class SwingClient extends JFrame implements Run
             
             _machine_name.setText(packet.getParam("packet.attributes.machine_name"));
             _ip.setText(packet.getParam("packet.attributes.ip"));
-            _date.setText(packet.getParam("packet.attributes.date"));
+            _date.setText(DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM).format(new Date(Long.parseLong(packet.getParam("packet.attributes.date")))));
             _seq_no.setText(packet.getParam("packet.attributes.seq_no"));
             
             _sTime.setText(packet.getParam("packet.sTime"));
@@ -169,11 +172,16 @@ public class SwingClient extends JFrame implements Run
             _processes_zombie.setText(packet.getParam("packet.processes.zombie"));
             _processes_stopped.setText(packet.getParam("packet.processes.stopped"));
             
-            _cpu_idle.setText(packet.getParam("packet.cpu.idle"));
-            _cpu_user.setText(packet.getParam("packet.cpu.user"));
-            _cpu_kernel.setText(packet.getParam("packet.cpu.kernel"));
-            _cpu_iowait.setText(packet.getParam("packet.cpu.iowait"));
-            _cpu_swap.setText(packet.getParam("packet.cpu.swap"));
+            _cpu_idle.setString(packet.getParam("packet.cpu.idle") + "%");
+            _cpu_idle.setValue(new Double(packet.getParam("packet.cpu.idle")).intValue());
+            _cpu_user.setString(packet.getParam("packet.cpu.user") + "%");
+            _cpu_user.setValue(new Double(packet.getParam("packet.cpu.user")).intValue());
+            _cpu_kernel.setString(packet.getParam("packet.cpu.kernel") + "%");
+            _cpu_kernel.setValue(new Double(packet.getParam("packet.cpu.kernel")).intValue());
+            _cpu_iowait.setString(packet.getParam("packet.cpu.iowait") + "%");
+            _cpu_iowait.setValue(new Double(packet.getParam("packet.cpu.iowait")).intValue());
+            _cpu_swap.setString(packet.getParam("packet.cpu.swap") + "%");
+            _cpu_swap.setValue(new Double(packet.getParam("packet.cpu.swap")).intValue());
             
             _memory_real.setText(packet.getParam("packet.memory.real"));
             _memory_free.setText(packet.getParam("packet.memory.free"));
@@ -185,11 +193,11 @@ public class SwingClient extends JFrame implements Run
 
 //---PRIVATE METHODS---
     
-    protected JPanel makeTextPanel(String text, JLabel item) {
+    protected JPanel makeTextPanel(String text, Component item) {
         JPanel panel = new JPanel(false);
         JLabel label = new JLabel(text);
         label.setHorizontalAlignment(JLabel.RIGHT);
-        item.setHorizontalAlignment(JLabel.LEFT);
+        //item.setHorizontalAlignment(JLabel.LEFT);
         panel.setLayout(new GridLayout(1, 2));
         panel.add(label);
         panel.add(item);
@@ -217,11 +225,28 @@ public class SwingClient extends JFrame implements Run
     JLabel _processes_zombie = new JLabel();
     JLabel _processes_stopped = new JLabel();
     
-    JLabel _cpu_idle = new JLabel();
-    JLabel _cpu_user = new JLabel();
-    JLabel _cpu_kernel = new JLabel();
-    JLabel _cpu_iowait = new JLabel();
-    JLabel _cpu_swap = new JLabel();
+    int min = 0;
+    int max = 100;
+    JProgressBar _cpu_idle = new JProgressBar(JProgressBar.HORIZONTAL, min, max);
+    {
+        _cpu_idle.setStringPainted(true);
+    }
+    JProgressBar _cpu_user = new JProgressBar(JProgressBar.HORIZONTAL, min, max);
+    {
+        _cpu_user.setStringPainted(true);
+    }
+    JProgressBar _cpu_kernel = new JProgressBar(JProgressBar.HORIZONTAL, min, max);
+    {
+        _cpu_kernel.setStringPainted(true);
+    }
+    JProgressBar _cpu_iowait = new JProgressBar(JProgressBar.HORIZONTAL, min, max);
+    {
+        _cpu_iowait.setStringPainted(true);
+    }
+    JProgressBar _cpu_swap = new JProgressBar(JProgressBar.HORIZONTAL, min, max);
+    {
+        _cpu_swap.setStringPainted(true);
+    }
     
     JLabel _memory_real = new JLabel();
     JLabel _memory_free = new JLabel();