perfsonar development work

Author: melis
Date: 2007-11-21 05:57:31 -0500 (Wed, 21 Nov 2007)
New Revision: 3063

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
Log:
Added ongoing development for merging of LG into psUI

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2007-11-21 10:36:37 UTC (rev 3062)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2007-11-21 10:57:31 UTC (rev 3063)
@@ -245,7 +245,6 @@
     public void process(IUserData uData, org.w3c.dom.Document response,
            IPerfsonarResponse listener) throws Exception {
        // TODO Auto-generated method stub
-       System.out.println("LGRequest.process(...) called");
        
        System.out.println("The response is:");
            

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
       2007-11-21 10:36:37 UTC (rev 3062)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
       2007-11-21 10:57:31 UTC (rev 3063)
@@ -134,6 +134,7 @@
                        };                      
                        
                        
userData.setQuery("endpoint",parent.getSelectedDevices());
+                       
                        userData.setQuery("command", 
parent.getSelectedCommand());
                        userData.setQuery("parameters", 
parent.getParameters());
                        

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2007-11-21 10:36:37 UTC (rev 3062)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2007-11-21 10:57:31 UTC (rev 3063)
@@ -614,6 +614,7 @@
     public void webserviceComboboxActionperformedHandler(Document response) {
        
        parameterStringTextField.setText("");
+       this.parameterStringTextField.setEnabled(false);
        
        this.deviceCombobox.removeAllItems();
        this.deviceCombobox.setEnabled(true);
@@ -650,15 +651,16 @@
        
        parameterStringTextField.setText("");
        
+       
        if (deviceComboboxModel.getSelectedItem() != null) {
-           
+           this.parameterStringTextField.setEnabled(true);
            functionComboboxModel.initComboBox
                    ((String)deviceCombobox.getSelectedItem());
            functionCombobox.setEnabled(true);
            addDeviceButton.setEnabled(true);
            
        } else {
-           
+           this.parameterStringTextField.setEnabled(false);
            functionComboboxModel.initComboBox
                    ((String)deviceCombobox.getSelectedItem());
            functionCombobox.setEnabled(false);
@@ -691,7 +693,7 @@
            
        } else {
            
-           this.parameterStringTextField.setEnabled(false);
+           //this.parameterStringTextField.setEnabled(false);
            
            descriptionTextField.setText("N/A");
            syntaxTextField.setText("N/A");
@@ -785,7 +787,6 @@
     
     public String getSelectedCommand() {
        String res = (String)functionCombobox.getSelectedItem();
-       System.out.println("Command: "+res);
        if (res.equals("N/A"))
            return "";
        else return res;
@@ -794,7 +795,6 @@
     
     public String getParameters() {
        String res = parameterStringTextField.getText();
-       System.out.println("Parameters: "+res);
        if(res.equals("N/A"))
            return "";
        else return res;
@@ -813,7 +813,7 @@
     public void addCurrentDeviceToDevicesList() {
        if 
(!deviceListModel.contains((String)deviceCombobox.getSelectedItem()))
            
deviceListModel.addElement((String)deviceCombobox.getSelectedItem());
-       System.out.println("Mijn eend ruikt naar eend");
+       
     }
     
     

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
  2007-11-21 10:36:37 UTC (rev 3062)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
  2007-11-21 10:57:31 UTC (rev 3063)
@@ -21,7 +21,9 @@
 import javax.swing.event.EventListenerList;
 import org.apache.xml.serialize.OutputFormat;
 import org.apache.xml.serialize.XMLSerializer;
+import org.jdom.Namespace;
 import org.jdom.input.DOMBuilder;
+import org.perfsonar.perfsonarui.AbstractMARequest;
 import org.w3c.dom.Document;
 
 
@@ -294,14 +296,7 @@
            //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);
@@ -311,6 +306,15 @@
            List children = root.getChildren();
            Iterator it = children.iterator();     
 
+           int size = 
root.getChildren("metadata",Namespace.getNamespace("nmwg",AbstractMARequest.NMWG2)).size();
+           
+            resultStringTable = new String[size];
+            resultTimeTypeTable = new String[size];
+            resultTimeValueTable = new String[size];
+            resultValueUnitsTable = new String[size];
+            statusStringTable = new String[size];
+            devicesTable = new String[size];
+           
             boolean ok = true;
             int place = 0;
             while (it.hasNext()) {
@@ -320,24 +324,24 @@
                     
                     if 
((message.getAttributeValue("id").contains("resultCode"))) {
                         String name = message.getAttributeValue("id");
-                        //System.out.println("id: "+name);
+                        //System.out.println("*** id: "+name);
                         String nr = name.substring(name.length()-1);
                         place = Integer.parseInt(nr);
-                        //System.out.println("place uit message: "+place);
+                        //System.out.println("*** place uit message: 
"+place);
                         place--;
-                        //System.out.println("place na 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());
+                            //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());
+                                    //System.out.println("*** hostname: 
"+hostname.getValue());
                                     if 
(hostname.getName().contains("endPoint")) {
-                                        //System.out.println("place: 
"+place);
+                                        //System.out.println("*** place: 
"+place);
                                         devicesTable[place] =
                                                 hostname.getValue();
                                     }
@@ -349,7 +353,7 @@
                 } else {
                     
                     String name = message.getAttributeValue("id");
-                    //System.out.println("data id:" + name);
+                    //System.out.println("*** data id:" + name);
                     String nr = name.substring(name.length()-1);
                     place = Integer.parseInt(nr);
                     place--;
@@ -357,18 +361,20 @@
                     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());
+                        //System.out.println("*** DATUM: " + datum);
+                        //System.out.println("*** RESULTSTRING: " + 
datum.getValue());
                         statusStringTable[place] = datum.getValue();
-                        //System.out.println("statusStringTable["+place+"]: 
"+statusStringTable[place]);
+                        //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]);
+                            //System.out.println("*** DATUM: " + datum);
+                            //System.out.println("*** RESULTSTRING: " + 
datum.getValue());
+                            if (place == -1)
+                               place = 0;
+                           resultStringTable[place] = datum.getValue();
+                            //System.out.println("*** 
resultStringTable["+place+"]: "+resultStringTable[place]);
                         } catch (Exception e) {
                             e.printStackTrace();
                            resultStringTable[place] = "";