--- projects/cms/source/host/java/DecodeCPU_TXT.java	2000/12/13 19:00:37	1.5
+++ projects/cms/source/host/java/DecodeCPU_TXT.java	2001/01/18 17:55:55	1.7
@@ -45,7 +45,7 @@ class DecodeCPU_TXT {
 			tok = new StringTokenizer(line," ",false);
 			String totalProcesses = tok.nextToken(); // "632"
 			//    System.out.println("totalProcesses: "+totalProcesses);
-			tok.nextToken(); // processes
+			tok.nextToken(":"); // processes:
 			String sleeping = tok.nextToken(": ,"); // "591"	
 			//    System.out.println("sleeping: "+sleeping);
 			tok.nextToken(); // sleeping
@@ -119,10 +119,12 @@ class DecodeCPU_TXT {
 				packet.addElement("swap",swap.trim());
 			packet.closeNest();
 			packet.addNest("memory");
-				packet.addElement("real",real.substring(0, real.length()-1));
+				packet.addElement("total",real.substring(0, real.length()-1));
 				packet.addElement("free",free.substring(0, free.length()-1));
-				packet.addElement("swapinuse",swapInUse.substring(0, swapInUse.length()-1));
-				packet.addElement("swapfree",swapFree.substring(0, swapFree.length()-1));
+			packet.closeNest();
+			packet.addNest("swap");
+				packet.addElement("inuse",swapInUse.substring(0, swapInUse.length()-1));
+				packet.addElement("free",swapFree.substring(0, swapFree.length()-1));
 			packet.closeNest();
 			
 			in.close();