ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/conient/uk/org/iscream/cms/conient/Conient.java
(Generate patch)

Comparing projects/cms/source/conient/uk/org/iscream/cms/conient/Conient.java (file contents):
Revision 1.3 by ajm, Sun Jan 14 23:14:35 2001 UTC vs.
Revision 1.4 by ajm, Mon Jan 15 00:12:31 2001 UTC

# Line 12 | Line 12 | import java.io.*;
12   import java.util.Date;
13   import java.text.DateFormat;
14   import java.util.Locale;
15 + import java.util.HashMap;
16  
17   /**
18   * NASTY AND BASIC, PLEASE DON'T COMPLAIN
# Line 46 | Line 47 | public class SwingClient extends JFrame implements Run
47              Thread cliThread = new Thread(cli);
48              cliThread.start();
49          } catch (Exception e) {
50 <            System.err.println("ERROR: " + e);
50 >            System.err.println("ERROR START: " + e);
51          }  
52      }
53      
# Line 72 | Line 73 | public class SwingClient extends JFrame implements Run
73          header.add(Box.createHorizontalGlue());
74          header.add(iscream);
75          
75 –        ImageIcon icon = new ImageIcon("server.gif");
76 –        JTabbedPane tabbedPane = new JTabbedPane();
77 –        JPanel mainPanel = new JPanel();
78 –        mainPanel.setLayout(new GridLayout(21, 1));
79 –
80 –        JPanel panel1 = makeTextPanel("Machine Name : ", _machine_name);
81 –        JPanel panel2 = makeTextPanel("IP : ", _ip);
82 –        JPanel panel3 = makeTextPanel("Date : ", _date);
83 –        JPanel panel4 = makeTextPanel("Sequence Number : ", _seq_no);
84 –        JPanel panel5 = makeTextPanel("Host Time : ", _sTime);
85 –        JPanel panel6 = makeTextPanel("Load Average (1 min) : ", _load_load1);
86 –        JPanel panel7 = makeTextPanel("Load Average (5 min) : ", _load_load5);
87 –        JPanel panel8 = makeTextPanel("Load Average (15 min) : ", _load_load15);
88 –        JPanel panel9 = makeTextPanel("Processes Total : ", _processes_total);
89 –        JPanel panel10 = makeTextPanel("Processes Sleeping : ", _processes_sleeping);
90 –        JPanel panel11 = makeTextPanel("Processes Zombie : ", _processes_zombie);
91 –        JPanel panel12 = makeTextPanel("Processes Stopped : ", _processes_stopped);
92 –        JPanel panel13 = makeTextPanel("CPU % idle : ", _cpu_idle);
93 –        JPanel panel14 = makeTextPanel("CPU % user : ", _cpu_user);
94 –        JPanel panel15 = makeTextPanel("CPU % kernel : ", _cpu_kernel);
95 –        JPanel panel16 = makeTextPanel("CPU % i/o wait : ", _cpu_iowait);
96 –        JPanel panel17 = makeTextPanel("CPU % swapping : ", _cpu_swap);
97 –        JPanel panel18 = makeTextPanel("Real Memory : ", _memory_real);
98 –        JPanel panel19 = makeTextPanel("Real Free : ", _memory_free);
99 –        JPanel panel20 = makeTextPanel("Swap in use : ", _memory_swapinuse);
100 –        JPanel panel21 = makeTextPanel("Swap free : ", _memory_swapfree);
101 –        mainPanel.add(panel1);
102 –        mainPanel.add(panel2);
103 –        mainPanel.add(panel3);
104 –        mainPanel.add(panel4);
105 –        mainPanel.add(panel5);
106 –        mainPanel.add(panel6);
107 –        mainPanel.add(panel7);
108 –        mainPanel.add(panel8);
109 –        mainPanel.add(panel9);
110 –        mainPanel.add(panel10);
111 –        mainPanel.add(panel11);
112 –        mainPanel.add(panel12);
113 –        mainPanel.add(panel13);
114 –        mainPanel.add(panel14);
115 –        mainPanel.add(panel15);
116 –        mainPanel.add(panel16);
117 –        mainPanel.add(panel17);
118 –        mainPanel.add(panel18);
119 –        mainPanel.add(panel19);
120 –        mainPanel.add(panel20);
121 –        mainPanel.add(panel21);
76          
123 –        tabbedPane.addTab("Raptor", icon, mainPanel, "Monitor raptor.ukc.ac.uk");
77          
78 <        tabbedPane.setSelectedIndex(0);
79 <
78 >        //_tabbedPane.setSelectedIndex(0);
79 >        
80          // build the frame
81          box.add(header);
82 <        box.add(tabbedPane);
82 >        box.add(_tabbedPane);
83 >        box.add(_status);
84          getContentPane().add(box);
85  
86          // show the window
87          show();
88 +        _status.setText("Running...");
89      }
90  
91   //---PUBLIC METHODS---
92  
93      public void run() {
94 +        HashMap hostList = new HashMap();
95          try {
96          _data.start();
97          while(true) {
# Line 144 | Line 100 | public class SwingClient extends JFrame implements Run
100              }
101              String xml = _data.getXML();
102              if (xml == null) {
103 <                // nothing
103 >                _status.setText("No XML to update...");
104              } else {
105              
106              // Get a string without any null characters in it.
# Line 159 | Line 115 | public class SwingClient extends JFrame implements Run
115              // Use XMLPacketMaker to make an XMLPacket object.
116              XMLPacketMaker xmlPacketMaker = new XMLPacketMaker(xml);
117              XMLPacket packet = xmlPacketMaker.createXMLPacket();
118 <            
119 <            _machine_name.setText(packet.getParam("packet.attributes.machine_name"));
120 <            _ip.setText(packet.getParam("packet.attributes.ip"));
121 <            _date.setText(DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM).format(new Date(Long.parseLong(packet.getParam("packet.attributes.date")))));
122 <            _seq_no.setText(packet.getParam("packet.attributes.seq_no"));
123 <            
124 <            _sTime.setText(packet.getParam("packet.sTime"));
125 <            
170 <            _load_load1.setText(packet.getParam("packet.load.load1"));
171 <            _load_load5.setText(packet.getParam("packet.load.load5"));
172 <            _load_load15.setText(packet.getParam("packet.load.load15"));
173 <            
174 <            _processes_total.setText(packet.getParam("packet.processes.total"));
175 <            _processes_sleeping.setText(packet.getParam("packet.processes.sleeping"));
176 <            _processes_zombie.setText(packet.getParam("packet.processes.zombie"));
177 <            _processes_stopped.setText(packet.getParam("packet.processes.stopped"));
178 <            
179 <            _cpu_idle.setString(packet.getParam("packet.cpu.idle") + "%");
180 <            _cpu_idle.setValue(new Double(packet.getParam("packet.cpu.idle")).intValue());
181 <            _cpu_user.setString(packet.getParam("packet.cpu.user") + "%");
182 <            _cpu_user.setValue(new Double(packet.getParam("packet.cpu.user")).intValue());
183 <            _cpu_kernel.setString(packet.getParam("packet.cpu.kernel") + "%");
184 <            _cpu_kernel.setValue(new Double(packet.getParam("packet.cpu.kernel")).intValue());
185 <            _cpu_iowait.setString(packet.getParam("packet.cpu.iowait") + "%");
186 <            _cpu_iowait.setValue(new Double(packet.getParam("packet.cpu.iowait")).intValue());
187 <            _cpu_swap.setString(packet.getParam("packet.cpu.swap") + "%");
188 <            _cpu_swap.setValue(new Double(packet.getParam("packet.cpu.swap")).intValue());
189 <            
190 <            _memory_real.setText(packet.getParam("packet.memory.real"));
191 <            _memory_free.setText(packet.getParam("packet.memory.free"));
192 <            _memory_swapinuse.setText(packet.getParam("packet.memory.swapinuse"));
193 <            _memory_swapfree.setText(packet.getParam("packet.memory.swapfree"));
118 >            String hostName = packet.getParam("packet.attributes.machine_name");
119 >            if(!hostList.containsKey(hostName)) {
120 >                host = new HostDisplayPanel();      
121 >                _tabbedPane.addTab(hostName, _serverIcon, host, "Monitor " + hostName);
122 >                hostList.put(hostName, host);
123 >                _status.setText("New Host added: " + hostName);
124 >            }
125 >            ((HostDisplayPanel) hostList.get(hostName)).updateHost(packet);
126              }
127          }
128          } catch (Exception e) {
129 <            System.err.println("ERROR: " + e);
129 >            System.err.println("ERROR RUN: " + e);
130          }
131      }
132  
# Line 215 | Line 147 | public class SwingClient extends JFrame implements Run
147   //---ACCESSOR/MUTATOR METHODS---
148  
149   //---ATTRIBUTES---
150 +    HostDisplayPanel host;
151 +    JTabbedPane _tabbedPane = new JTabbedPane();
152  
153      JLabel _machine_name = new JLabel();
154      JLabel _ip = new JLabel();
# Line 260 | Line 194 | public class SwingClient extends JFrame implements Run
194      JLabel _memory_swapinuse = new JLabel();
195      JLabel _memory_swapfree = new JLabel();
196      DataReader _data;
197 +    JLabel _status = new JLabel();
198 +    ImageIcon _serverIcon = new ImageIcon("server.gif");
199      
200   //---STATIC ATTRIBUTES---
201      

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines