perfsonar development work

Author: melis
Date: 2007-11-14 09:44:14 -0500 (Wed, 14 Nov 2007)
New Revision: 3039

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebserviceComboboxModel.java
Log:
Added ongoing development for integration of Looking Glass into perfsonarUI

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2007-11-13 16:17:31 UTC (rev 3038)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2007-11-14 14:44:14 UTC (rev 3039)
@@ -26,6 +26,10 @@
 
 import java.io.StringWriter;
 
+import java.util.StringTokenizer;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
+
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.Namespace;
@@ -37,17 +41,13 @@
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.plugins.MetaDataList;
 
-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-
-
 /**
  *  @author Stijn Melis
  *  @author Nina Jeliazkova (skeleton framework)
  */
 public class LGRequest extends AbstractMARequest {
     
-    private static String NMWG2TOPO = "http://ggf.org/ns/nmwg/topology/2.0";;
+    private static String NMWG2TOPO = "http://ggf.org/ns/nmwg/topology/2.0/";;
     
     /**
      * uData.getEndpoint is the service address to be queried, use 
messagetype if necessary to distinguish between different types of messages 
(metadatarequest, setupdatarequest)
@@ -61,7 +61,7 @@
        
        if (IPerfsonarRequest.MA_MetadataKeyRequest.equals(messageType)) {
            
-           System.out.println("MetadataKeyRequest is being made...");
+           //System.out.println("MetadataKeyRequest is being made...");
            
            jdoc = new Document();
            //DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
@@ -100,15 +100,14 @@
            DOMOutputter domout = new DOMOutputter ();
            
            doc = domout.output(jdoc);
-           
-           StringWriter sw = new StringWriter();
+                 
+           /*StringWriter sw = new StringWriter();
            XMLSerializer ser = new XMLSerializer(sw, new OutputFormat(doc));
            ser.serialize(doc.getDocumentElement());
  
            String XMLStr = sw.toString();
            
-           System.out.println("MetadataKeyRequest (DOM): " + XMLStr);
-           
+           System.out.println("MetadataKeyRequest (DOM): " + XMLStr);*/
        } else if (IPerfsonarRequest.MA_SetupDataRequest.equals(messageType)) 
{
            
            System.out.println("SetupDataRequest is being made...");
@@ -117,77 +116,88 @@
            //factory.setNamespaceAware(true);
            //DocumentBuilder builder = factory.newDocumentBuilder();
            //doc = builder.newDocument();
-           
+                   
            jdoc = new Document();
            
            Element msg = new 
Element("message",Namespace.getNamespace("nmwg",NMWG2));
            msg.setAttribute("id", "msg1");
            msg.setAttribute("type", messageType);
-                   
-           Element metadata = new 
Element("metadata",Namespace.getNamespace("nmwg",NMWG2));
-           metadata.setAttribute("id", "meta1");
-                   
-           Element subject = new 
Element("subject",Namespace.getNamespace("nmwg",NMWG2));
-           subject.setAttribute("id", "server");
+         
+           String devices = uData.getQuery("endpoint");
+           StringTokenizer tok = new StringTokenizer(devices, "@@@");
            
-           Element endpoint = new Element("endpoint", 
Namespace.getNamespace("nmwgtopo", NMWG2TOPO));
-           endpoint.setAttribute("type", "hostname");
-           endpoint.setText(uData.getEndpoint().getEndpoint());
-           subject.addContent(endpoint);
+           String device;
+           int i = 1;
+           while (tok.hasMoreTokens()){
            
-           metadata.addContent(subject);
-                   
-           Element params = new 
Element("parameters",Namespace.getNamespace("nmwg",NMWG2));
-           params.setAttribute("id", "params1");
-                   
-           // add parameters to parameters element
-           
-           Element param = new 
Element("parameter",Namespace.getNamespace("nmwg",NMWG2));
-           param.setAttribute("id", "param1");
-           params.addContent(param);      
-           
-           metadata.addContent(params);
-           
-           Element eventType = new Element ("eventType", 
Namespace.getNamespace("nmwg", NMWG2));
-           eventType.setText(uData.getEventTypes().get(0)); //there is only 
one eventType, so we pick the first one
-           metadata.addContent(eventType);
-           
-           //here comes the data entered in by the user
-           //param.addContent(doc.createTextNode(uData.getQuery("param1")));
-           
-           //create the relevant Document, get parameters from udata
-           
-           /*
-           <nmwg:message type="SetupDataRequest" id="msg1" 
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; 
xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";>
-               <nmwg:metadata id="meta1">
-                   <nmwg:subject id="subject1">
-                       <nmwgtopo:endpoint 
type="hostname">cisco1</nmwgtopo:endpoint> 
-                   </nmwg:subject>
-                   <nmwg:eventType>IP_ROUTE</nmwg:eventType> 
-                   <nmwg:parameters id="params1">
-                       <nmwg:parameter 
name="param1">157.193.214.0</nmwg:parameter> 
-                   </nmwg:parameters>
-               </nmwg:metadata>
-               <nmwg:data id="data1" metadataIdRef="meta1" /> 
-           </nmwg:message>
+               device = tok.nextToken();
+               
+               Element metadata = new 
Element("metadata",Namespace.getNamespace("nmwg",NMWG2));
+               metadata.setAttribute("id", "meta"+i);
 
+               Element subject = new 
Element("subject",Namespace.getNamespace("nmwg",NMWG2));
+               subject.setAttribute("id", "subject"+i);
+
+               Element endpoint = new Element("endPoint", 
Namespace.getNamespace("nmwgtopo", NMWG2TOPO));
+               endpoint.setAttribute("type", "hostname");
+               endpoint.setText(device);
+               subject.addContent(endpoint);
+
+               metadata.addContent(subject);
+
+               Element params = new 
Element("parameters",Namespace.getNamespace("nmwg",NMWG2));
+               params.setAttribute("id", "params1");
+
+               // add parameters to parameters element
+               if (uData.getQuery("parameters")!=null && 
!uData.getQuery("parameters").equals("")) {
+                   Element param = new 
Element("parameter",Namespace.getNamespace("nmwg",NMWG2));
+                   param.setAttribute("id", "param1");
+                   param.setText(uData.getQuery("parameters"));
+                   params.addContent(param);      
+               }
+               metadata.addContent(params);
+
+               Element eventType = new Element ("eventType", 
Namespace.getNamespace("nmwg", NMWG2));
+               eventType.setText(uData.getQuery("command")); //there is only 
one eventType, so we pick the first one
+               metadata.addContent(eventType);
+
+               //here comes the data entered in by the user
+               
//param.addContent(doc.createTextNode(uData.getQuery("param1")));
+
+               //create the relevant Document, get parameters from udata
+
+               /*
+               <nmwg:message type="SetupDataRequest" id="msg1" 
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/"; 
xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";>
+                   <nmwg:metadata id="meta1">
+                       <nmwg:subject id="subject1">
+                           <nmwgtopo:endpoint 
type="hostname">cisco1</nmwgtopo:endpoint> 
+                       </nmwg:subject>
+                       <nmwg:eventType>IP_ROUTE</nmwg:eventType> 
+                       <nmwg:parameters id="params1">
+                           <nmwg:parameter 
name="param1">157.193.214.0</nmwg:parameter> 
+                       </nmwg:parameters>
+                   </nmwg:metadata>
+                   <nmwg:data id="data1" metadataIdRef="meta1" /> 
+               </nmwg:message>
+
+
+               */
+
+
+
+
+               Element data = new Element("data", 
Namespace.getNamespace("nmwg", NMWG2));
+               data.setAttribute("id", "data"+i);
+               data.setAttribute("metadataIdRef", "meta"+i);
+               
+               i++;
+               
+               msg.addContent(metadata);
+               msg.addContent(data);
            
-           */
+           }
            
            
-           
-           
-           Element data = new Element("data", Namespace.getNamespace("nmwg", 
NMWG2));
-           data.setAttribute("id", "data1");
-           data.setAttribute("metadataIdRef", "meta1");
-           
-           
-           msg.addContent(metadata);
-           msg.addContent(data);
-           
-           
-           
-           
            jdoc.setRootElement(msg);
            
            DOMOutputter domout = new DOMOutputter ();
@@ -200,7 +210,7 @@
  
            String XMLStr = sw.toString();
            
-           System.out.println("MetadataKeyRequest (DOM): " + XMLStr);
+           System.out.println("SetupDataRequest (DOM): " + XMLStr);
        }
        return doc;
     }
@@ -236,8 +246,17 @@
            IPerfsonarResponse listener) throws Exception {
        // TODO Auto-generated method stub
        System.out.println("LGRequest.process(...) called");
-
        
+       System.out.println("The response is:");
+           
+       StringWriter sw = new StringWriter();
+       XMLSerializer ser = new XMLSerializer(sw, new OutputFormat(response));
+       ser.serialize(response.getDocumentElement());
+ 
+       String XMLStr = sw.toString();
+           
+       System.out.println("" + XMLStr);
+       
     }
 }
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2007-11-13 16:17:31 UTC (rev 3038)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2007-11-14 14:44:14 UTC (rev 3039)
@@ -28,11 +28,11 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
+import javax.swing.Action;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JList;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
@@ -41,6 +41,8 @@
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.EventListenerList;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
 import javax.swing.text.DefaultCaret;
 import org.perfsonar.perfsonarui.lookingglass.model.Command;
 import org.perfsonar.perfsonarui.lookingglass.model.DeviceComboboxModel;
@@ -56,6 +58,7 @@
 
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.ui.PluginMainPanel;
+import org.perfsonar.perfsonarui.ui.actions.PSActionMap;
 import org.w3c.dom.Document;
 
 
@@ -64,7 +67,7 @@
  *  @author Nina Jeliazkova (skeleton framework)
  */
 public class LookingGlassMainPanel extends PluginMainPanel
-       implements ChangeListener{
+       implements ChangeListener, ListSelectionListener{
     protected JTextArea demo;
     /**
      *
@@ -125,8 +128,6 @@
     public LookingGlassMainPanel(Component parentFrame, IPerfsonarTab 
iperftab) {
        super(parentFrame, iperftab);
        this.iperftab = iperftab;
-       
-       System.out.println("iperftab (in constructor): " + iperftab);
     }
     
     @Override
@@ -145,6 +146,7 @@
        
        //parameterListModel = new ParameterListModel(model);
        deviceListModel = new DeviceListModel(model);
+       
        webservicesTableModel = new WebservicesTableModel();
        latestResultListModel = new LatestResultListModel(model);
        
@@ -197,11 +199,24 @@
        //      webserviceComboboxActionperformedHandler(evt);
        //    }
        //});
-       System.out.println("model (in addTopPane): "+super.model);
-       System.out.println("Action :" + super.model.getActions().get("0"));
+       //System.out.println("model (in addTopPane): "+super.model);
+       //System.out.println("Action :" + super.model.getActions().get("0"));
        webserviceCombobox.setAction(super.model.getActions().get("0")); // 
this should be the LGMetadataKeyRequestAction
        
((MetadataKeyRequestAction)super.model.getActions().get("0")).setParent(this);
        
+       //also add this class to the SetupDataRequestAction as parent
+       PSActionMap map = super.model.getActions();
+       Object[] keys = map.allKeys();
+       SetupDataRequestAction sdra = null;
+       for (int i = 0; i < keys.length; i++){
+           if (map.get(keys[i]).getValue(Action.DEFAULT)!= null &&
+                   
map.get(keys[i]).getValue(Action.DEFAULT).equals("SetupDataRequestAction")){
+               sdra = (SetupDataRequestAction)map.get(keys[i]);
+               break;
+           }
+       }
+       sdra.setParent(this);
+       
        jLabel2.setText("Device:");
        
        deviceCombobox.setModel(deviceComboboxModel);
@@ -232,6 +247,9 @@
        deviceList.setModel(deviceListModel);
        
deviceList.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
        deviceList.setToolTipText("This list represents a set of devices to 
which the same command will be sent. It can also be used to select the 
appropriate result to be displayed in the large box below.");
+       
+       deviceList.addListSelectionListener(this);
+       
        jScrollPane8.setViewportView(deviceList);
        
        addDeviceButton.setText("Add Device");
@@ -502,6 +520,39 @@
        
     }
     
+    public void valueChanged(ListSelectionEvent e) {
+       
+       String command = model.getCommand
+               ((String)functionCombobox.getSelectedItem(),
+               (String)deviceList.getSelectedValue());
+       
+       String syntax = model.getSyntax
+               ((String)functionCombobox.getSelectedItem(),
+               (String)deviceList.getSelectedValue());
+       
+       String description = model.getDescription
+               ((String)functionCombobox.getSelectedItem(),
+               (String)deviceList.getSelectedValue());
+       
+       this.commandTextField.setText(command);
+       this.syntaxTextField.setText(syntax);
+       this.descriptionTextField.setText(description);
+       
+       try {
+           String result = model.getResult((String)deviceList.
+                   getSelectedValue());
+           resultTextArea.setText(result.replaceAll("@@@", "\n"));
+           
+           resultTextArea.setCaretPosition(0);
+           
+           String status = model.getStatus((String)deviceList.
+                   getSelectedValue());
+           statusTextField.setText(status);
+       } catch (Exception ex) {
+           ex.printStackTrace();
+       }
+       
+    }
     
     public void stateChanged(ChangeEvent event) {
        
@@ -550,9 +601,6 @@
        
        queriedDeviceComboboxModel2.initComboBox
                (deviceListModel.getAllElements());
-       
-       
-       
     }
     
     public JComboBox getWebserviceComboBox() {
@@ -574,8 +622,8 @@
        this.functionCombobox.setEnabled(false);
        this.functionComboboxModel.removeAllElements();
        
-       System.out.println("Vul deviceCombobox en functionCombobox in");
        try {
+           model.clearMetadata();
            model.addMetadataForCurrentMP(response);
            
this.deviceComboboxModel.initComboBox(this.webserviceCombobox.getSelectedItem());
        } catch (Exception ex) {
@@ -625,7 +673,7 @@
      **/
     private void functionComboboxActionPerformed(java.awt.event.ActionEvent 
evt) {
        
-       if (this.functionCombobox.getSelectedIndex() > -1) {
+       if (functionCombobox.isEnabled() && 
functionCombobox.getSelectedIndex() > -1) {
            
model.setSelectedCommand((String)functionCombobox.getSelectedItem());
            
            this.parameterStringTextField.setEnabled(true);
@@ -645,7 +693,6 @@
            
            this.parameterStringTextField.setEnabled(false);
            
-           
            descriptionTextField.setText("N/A");
            syntaxTextField.setText("N/A");
            commandTextField.setText("N/A");
@@ -736,6 +783,48 @@
     }
     
     
+    public String getSelectedCommand() {
+       String res = (String)functionCombobox.getSelectedItem();
+       System.out.println("Command: "+res);
+       if (res.equals("N/A"))
+           return "";
+       else return res;
+       
+    }
+    
+    public String getParameters() {
+       String res = parameterStringTextField.getText();
+       System.out.println("Parameters: "+res);
+       if(res.equals("N/A"))
+           return "";
+       else return res;
+    }
+    
+    public String getSelectedDevices() {
+       String devices = "";
+       Iterator it = deviceListModel.getAllElements().iterator();
+       while (it.hasNext()){
+           devices+=(String)it.next()+"@@@";
+       }
+       
+       return devices.substring(0,devices.length()-"@@@".length());
+    }
+    
+    public void addCurrentDeviceToDevicesList() {
+       if 
(!deviceListModel.contains((String)deviceCombobox.getSelectedItem()))
+           
deviceListModel.addElement((String)deviceCombobox.getSelectedItem());
+       
+    }
+    
+    
+    public void setResponse(Document response){
+       try{
+           model.setQueryResult(response);
+       } catch (Exception e){
+           e.printStackTrace();
+       }
+    }
+    
     /**
      * Housekeeping code for ChangeListeners
      **/

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2007-11-13 16:17:31 UTC (rev 3038)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2007-11-14 14:44:14 UTC (rev 3039)
@@ -38,7 +38,6 @@
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.ui.PerfsonarModel;
 import org.perfsonar.perfsonarui.ui.PluginMainPanel;
-import org.perfsonar.perfsonarui.ui.actions.MetadataRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
 
 /**
@@ -53,16 +52,17 @@
     protected PerfsonarRequestAction createMetadataRequestAction() {
        //the idea is to fill in dataList with entries coming from the 
response. MetadataListResponseListener is responsible for processing the 
request
        metadataRequestAction = new 
MetadataKeyRequestAction(request,userData,dataList,endpointList,"Meta data 
request");
-       //metadataRequestAction.setGroup(IPerfsonarTab.defaultGroupQuery);
+       metadataRequestAction.setGroup(IPerfsonarTab.defaultGroupHidden);
        return metadataRequestAction;
        //return null
     }
     
-    //@overide
-    //public PerfsonarRequestAction createDataRequestAction() {
+    @Override
+    public PerfsonarRequestAction createDataRequestAction() {
     
-    // return null;
-    //}
+       dataRequestAction = new SetupDataRequestAction(request, userData, 
dataList, endpointList, "Query");
+       return dataRequestAction;
+    }
     
     @Override
     protected SmartMARequest createSmartRequest() {

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
       2007-11-13 16:17:31 UTC (rev 3038)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
       2007-11-14 14:44:14 UTC (rev 3039)
@@ -84,6 +84,7 @@
                //System.out.println("Endpoint : " + mae.getTitle());
                if (mae.isEnabled() && 
mae.getTitle().equalsIgnoreCase(parent.getWebserviceComboBox()
                        .getSelectedItem().toString())) {
+               //if (mae.isEnabled()){
                    ok = true;
                    dataList.setNotificationEnabled(false);
                    userData.setEndpoint(mae);
@@ -148,6 +149,7 @@
            if (!ok) JOptionPane.showMessageDialog(frame,"No IPPM service 
selected!","Error",JOptionPane.ERROR_MESSAGE);
        } catch (Exception x) {
            
JOptionPane.showMessageDialog(frame,x,"Error",JOptionPane.ERROR_MESSAGE);
+           x.printStackTrace();
            logger.error(x);
        }
        return null;
@@ -183,8 +185,6 @@
     }
     
     public void setParent (LookingGlassMainPanel parent) {
-       System.out.println("setParent called!");
-       
        this.parent = parent;   
     }
     

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
  2007-11-13 16:17:31 UTC (rev 3038)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
  2007-11-14 14:44:14 UTC (rev 3039)
@@ -10,19 +10,22 @@
 
 package org.perfsonar.perfsonarui.lookingglass.model;
 
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
-
 import javax.swing.JOptionPane;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.EventListenerList;
-
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
 import org.jdom.input.DOMBuilder;
 import org.w3c.dom.Document;
 
+
+
 /**
  * Main model class for the application
  *
@@ -100,12 +103,19 @@
        
     }
     
+    public void clearMetadata() {
+       metadata.clear();
+       functions.clear();
+       devices.clear();
+       urls.clear();   
+    }
+    
     /**
      * Transmits a request towards the selected MP
      **/
     public void addMetadataForCurrentMP(Document response)
     throws Exception {
-       System.out.println("*** 
LookingGlassClientModel.addMetadataForCurrentMP("+response+") called ***");
+       //System.out.println("*** 
LookingGlassClientModel.addMetadataForCurrentMP("+response+") called ***");
        
        devices.clear();
        metadata.clear();
@@ -121,10 +131,10 @@
            
            while (it.hasNext()) {
                org.jdom.Element next = (org.jdom.Element)it.next();
-               System.out.println(next);
+               //System.out.println(next);
                
                if (next.getName().equalsIgnoreCase("metadata")) {
-                   System.out.println(next.getAttribute("id"));
+                   //System.out.println(next.getAttribute("id"));
                    String metadataId = next.getAttributeValue("id");
                    if (metadataId.contains("resultCode")) {} else {
                        metadata.add(metadataId);
@@ -173,7 +183,7 @@
                            if 
(element.getName().equalsIgnoreCase("eventType")) {
                                
                                function = element.getText();
-                               System.out.println("Function: " + function);
+                               //System.out.println("Function: " + function);
                                
                            } else if 
(element.getName().equalsIgnoreCase("parameters")) {
                                
@@ -272,6 +282,118 @@
        
     }
     
+    public void setQueryResult(Document response) 
+    throws Exception{
+        try {
+            StringWriter sw = new StringWriter();
+           XMLSerializer ser = new XMLSerializer(sw, new 
OutputFormat(response));
+           ser.serialize(response.getDocumentElement());
+ 
+           String XMLStr = sw.toString();
+           
+           //System.out.println("SetupDataResult (DOM): " + XMLStr);
+           
+           
+           int size = 1;
+           
+            resultStringTable = new String[size];
+            resultTimeTypeTable = new String[size];
+            resultTimeValueTable = new String[size];
+            resultValueUnitsTable = new String[size];
+            statusStringTable = new String[size];
+            devicesTable = new String[size];
+           
+           DOMBuilder dom = new DOMBuilder();
+           org.jdom.Document result = dom.build(response);
+           
+           org.jdom.Element root = result.getRootElement();
+           
+           List children = root.getChildren();
+           Iterator it = children.iterator();     
+
+            boolean ok = true;
+            int place = 0;
+            while (it.hasNext()) {
+                org.jdom.Element message = (org.jdom.Element)it.next();
+                
+                if (message.getName().contains("meta")) {
+                    
+                    if 
((message.getAttributeValue("id").contains("resultCode"))) {
+                        String name = message.getAttributeValue("id");
+                        //System.out.println("id: "+name);
+                        String nr = name.substring(name.length()-1);
+                        place = Integer.parseInt(nr);
+                        //System.out.println("place uit message: "+place);
+                        place--;
+                        //System.out.println("place na place--: "+place);
+                        Iterator itmeta = message.getChildren().iterator();
+                        while (itmeta.hasNext()) {
+                            org.jdom.Element subject = 
(org.jdom.Element)itmeta.next();
+                            //System.out.println("subject: 
"+subject.getValue());
+                            if (subject.getName().contains("subject")) {
+                                Iterator itsubject = 
subject.getChildren().iterator();
+                                while (itsubject.hasNext()) {
+                                    org.jdom.Element hostname =
+                                            
(org.jdom.Element)itsubject.next();
+                                    //System.out.println("hostname: 
"+hostname.getValue());
+                                    if 
(hostname.getName().contains("endPoint")) {
+                                        //System.out.println("place: 
"+place);
+                                        devicesTable[place] =
+                                                hostname.getValue();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    
+                } else {
+                    
+                    String name = message.getAttributeValue("id");
+                    //System.out.println("data id:" + name);
+                    String nr = name.substring(name.length()-1);
+                    place = Integer.parseInt(nr);
+                    place--;
+                    
+                    if 
(message.getAttributeValue("id").contains("resultCode")) {
+                        Iterator it2 = message.getChildren().iterator();
+                        org.jdom.Element datum = 
(org.jdom.Element)it2.next();
+                        System.out.println("DATUM: " + datum);
+                        System.out.println("RESULTSTRING: " + 
datum.getValue());
+                        statusStringTable[place] = datum.getValue();
+                        //System.out.println("statusStringTable["+place+"]: 
"+statusStringTable[place]);
+                    } else {
+                        try {
+                            Iterator it2 = message.getChildren().iterator();
+                            org.jdom.Element datum = 
(org.jdom.Element)it2.next();
+                            //System.out.println("DATUM: " + datum);
+                            //System.out.println("RESULTSTRING: " + 
datum.getValue());
+                            resultStringTable[place] = datum.getValue();
+                            
//System.out.println("resultStringTable["+place+"]: 
"+resultStringTable[place]);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                           resultStringTable[place] = "";
+                            ok = false;
+                        }
+                    }
+                }
+            }
+            
+            fireStateChanged();
+            
+          } catch (Exception ex) {
+            
+            JOptionPane.showMessageDialog(null,
+                   "An error occured while executing your task!",
+                   "Sending Error",
+                    JOptionPane.ERROR_MESSAGE);
+            
+            ex.printStackTrace();
+            fireStateChanged();
+            throw ex;
+            
+        }
+    }
+    
     /**
      * Return the result from the MP to the requestor
      **/
@@ -279,16 +401,16 @@
        
        int place = getDevicePlace(device);
        String result = resultStringTable[place];
-       System.out.println("place to check: "+place);
+       //System.out.println("place to check: "+place);
        if (result == null || result.equalsIgnoreCase("")){
            if (place+1 < statusStringTable.length)
                result = statusStringTable[place+1];
            //resultcode has index 1 higher than corresponding data
-           else result = statusStringTable[place-1];
+           else result = statusStringTable[place];
            //resultcode has index 1 lower than
            //corresponding data when last device
        }
-       System.out.println("\n**** result to be displayed: "+result + 
"******\n");
+       //System.out.println("\n**** result to be displayed: "+result + 
"******\n");
        return result;
        
     }
@@ -314,8 +436,8 @@
        //}
        
        for (int i = 0; i < devicesTable.length; i++) {
-           System.out.println("i:" + i);
-           System.out.println("devicesTable[" +i+ "] = " + devicesTable[i]);
+           //System.out.println("i:" + i);
+           //System.out.println("devicesTable[" +i+ "] = " + 
devicesTable[i]);
            if (devicesTable[i] != null && 
devicesTable[i].equalsIgnoreCase(device))
                return i;
        }
@@ -488,7 +610,6 @@
     }
     
     public void setSelectedCommand(String selectedCommand) {
-       System.out.println("Selected Command set to: " + selectedCommand);
        this.selectedCommand = selectedCommand;
     }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebserviceComboboxModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebserviceComboboxModel.java
  2007-11-13 16:17:31 UTC (rev 3038)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebserviceComboboxModel.java
  2007-11-14 14:44:14 UTC (rev 3039)
@@ -93,8 +93,7 @@
                     JOptionPane.ERROR_MESSAGE);
             ex.printStackTrace();
             
-        }
-        
+        }       
     }
     
     
@@ -132,8 +131,7 @@
                       webservicesMap.put(title, endpoint);
                }
                line = br.readLine();
-           }
-            
+           }            
         } catch (FileNotFoundException ex) {
             
             /*