--- projects/cms/source/conient/uk/org/iscream/cms/conient/Conient.java	2001/01/15 03:01:37	1.5
+++ projects/cms/source/conient/uk/org/iscream/cms/conient/Conient.java	2001/01/15 03:15:06	1.6
@@ -18,7 +18,7 @@ import java.util.HashMap;
  * NASTY AND BASIC, PLEASE DON'T COMPLAIN
  *
  * @author  $Author: ajm $
- * @version $Id: Conient.java,v 1.5 2001/01/15 03:01:37 ajm Exp $
+ * @version $Id: Conient.java,v 1.6 2001/01/15 03:15:06 ajm Exp $
  */
 public class SwingClient extends JFrame implements Runnable {
 
@@ -27,7 +27,7 @@ public class SwingClient extends JFrame implements Run
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.5 $";
+    public final String REVISION = "$Revision: 1.6 $";
     
     private final int width = 400;
     private final int height = 700;
@@ -102,38 +102,39 @@ public class SwingClient extends JFrame implements Run
     public void run() {
         HashMap hostList = new HashMap();
         try {
-        _data.start();
-        while(true) {
-            synchronized (_data) {
-                _data.wait();
+            _data.start();
+            while(true) {
+                synchronized (_data) {
+                    _data.wait();
+                }
+                String xml = _data.getXML();
+                if (xml == null) {
+                    // shouldn't really happen...but not sure
+                    _status.setText("No XML to update...");
+                } else {
+                    _status.setText("Got inbound data...handling");
+                    // Get a string without any null characters in it.
+                    //  -- maybe String.trim() would be better here ?
+                    if (xml.indexOf(0) != -1) {
+                        xml = xml.substring(0, xml.indexOf(0));
+                    }
+                    else {
+                        xml = xml.substring(0, xml.length());
+                    }
+                    
+                    // Use XMLPacketMaker to make an XMLPacket object.
+                    XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml);
+                    XMLPacket packet = xmlPacketMaker.createXMLPacket();
+                    String hostName = packet.getParam("packet.attributes.machine_name");
+                    if(!hostList.containsKey(hostName)) {
+                        host = new HostDisplayPanel();       
+                        _tabbedPane.addTab(hostName, _serverIcon, host, "Monitor " + hostName);
+                        hostList.put(hostName, host);
+                        _status.setText("New Host added: " + hostName);
+                    } 
+                    ((HostDisplayPanel) hostList.get(hostName)).updateHost(packet);
+                }
             }
-            String xml = _data.getXML();
-            if (xml == null) {
-                _status.setText("No XML to update...");
-            } else {
-            
-            // Get a string without any null characters in it.
-            //  -- maybe String.trim() would be better here ?
-            if (xml.indexOf(0) != -1) {
-                xml = xml.substring(0, xml.indexOf(0));
-            }
-            else {
-                xml = xml.substring(0, xml.length());
-            }
-            
-            // Use XMLPacketMaker to make an XMLPacket object.
-            XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml);
-            XMLPacket packet = xmlPacketMaker.createXMLPacket();
-            String hostName = packet.getParam("packet.attributes.machine_name");
-            if(!hostList.containsKey(hostName)) {
-                host = new HostDisplayPanel();       
-                _tabbedPane.addTab(hostName, _serverIcon, host, "Monitor " + hostName);
-                hostList.put(hostName, host);
-                _status.setText("New Host added: " + hostName);
-            } 
-            ((HostDisplayPanel) hostList.get(hostName)).updateHost(packet);
-            }
-        }
         } catch (Exception e) {
             System.err.println("ERROR RUN: " + e);
         }