Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2957 - in branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass: . model

Subject: perfsonar development work

List archive

perfsonar: r2957 - in branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass: . model


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2957 - in branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass: . model
  • Date: Tue, 16 Oct 2007 05:06:58 -0400
Author: melis
Date: 2007-10-16 05:06:58 -0400 (Tue, 16 Oct 2007)
New Revision: 2957

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/DeviceComboboxModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
Log:
update of the ongoing development for the merging of Looking Glass into psUI

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
2007-10-15 12:58:05 UTC (rev 2956)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
2007-10-16 09:06:58 UTC (rev 2957)
@@ -46,6 +46,8 @@
*/
public class LGRequest extends AbstractMARequest {

+ 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)
*/
@@ -120,55 +122,71 @@
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");
- msg.addContent(metadata);
-
+
Element subject = new
Element("subject",Namespace.getNamespace("nmwg",NMWG2));
subject.setAttribute("id", "server");
+
+ Element endpoint = new Element("endpoint",
Namespace.getNamespace("nmwgtopo", NMWG2TOPO));
+ endpoint.setAttribute("type", "hostname");
+ endpoint.setText(uData.getEndpoint().getEndpoint());
+ subject.addContent(endpoint);
+
metadata.addContent(subject);
-
+
Element params = new
Element("parameters",Namespace.getNamespace("nmwg",NMWG2));
params.setAttribute("id", "params1");
- subject.addContent(params);
+
+ // add parameters to parameters element

Element param = new
Element("parameter",Namespace.getNamespace("nmwg",NMWG2));
param.setAttribute("id", "param1");
- params.addContent(param);
+ 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

/*
- <?xml version='1.0' encoding='UTF-8'?>
- <nmwg:message id="msg1" type="SetupDataRequest"
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
- <nmwg:metadata id="meta1">
- <nmwg:subject id="subject1">
- <nmwgtopo:endPoint type="hostname"
xmlns:nmwgtopo="http://ggf.org/ns/nmwg/topology/2.0/";>cisco</nmwgtopo:endPoint>
- </nmwg:subject>
- <nmwg:parameters id="params1"/>
- <nmwg:eventType>STATUS_SHOW_ENVIRONMENT</nmwg:eventType>
- </nmwg:metadata>
- <nmwg:data id="data1" metadataIdRef="meta1"/>
+ <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", "data1");
data.setAttribute("metadataIdRef", "meta1");

+
+ msg.addContent(metadata);
msg.addContent(data);
- */



+
jdoc.setRootElement(msg);

DOMOutputter domout = new DOMOutputter ();
@@ -216,15 +234,9 @@
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");
+

- StringWriter sw = new StringWriter();
- XMLSerializer ser = new XMLSerializer(sw, new OutputFormat(response));
- ser.serialize(response.getDocumentElement());
-
- String XMLStr = sw.toString();
-
- System.out.println("MetadataKeyRequest (DOM): " + XMLStr);
-
}
}


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
2007-10-15 12:58:05 UTC (rev 2956)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
2007-10-16 09:06:58 UTC (rev 2957)
@@ -32,13 +32,12 @@
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JList;
+import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTextArea;
import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.EventListenerList;
@@ -49,7 +48,6 @@
import org.perfsonar.perfsonarui.lookingglass.model.FunctionComboboxModel;
import org.perfsonar.perfsonarui.lookingglass.model.LatestResultListModel;
import org.perfsonar.perfsonarui.lookingglass.model.LookingGlassClientModel;
-import org.perfsonar.perfsonarui.lookingglass.model.ParameterListModel;
import
org.perfsonar.perfsonarui.lookingglass.model.QueriedDeviceComboboxModel;
import org.perfsonar.perfsonarui.lookingglass.model.WebserviceComboboxModel;
import org.perfsonar.perfsonarui.lookingglass.model.WebservicesTableModel;
@@ -58,6 +56,7 @@

import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.ui.PluginMainPanel;
+import org.w3c.dom.Document;


/**
@@ -113,7 +112,7 @@
private ChangeEvent changeEvent;
private DeviceComboboxModel deviceComboboxModel;
private FunctionComboboxModel functionComboboxModel;
- private ParameterListModel parameterListModel;
+ //private ParameterListModel parameterListModel;
private DeviceListModel deviceListModel;
private WebservicesTableModel webservicesTableModel;
private LatestResultListModel latestResultListModel;
@@ -144,7 +143,7 @@
deviceComboboxModel = new DeviceComboboxModel(model);
functionComboboxModel = new FunctionComboboxModel(model);

- parameterListModel = new ParameterListModel(model);
+ //parameterListModel = new ParameterListModel(model);
deviceListModel = new DeviceListModel(model);
webservicesTableModel = new WebservicesTableModel();
latestResultListModel = new LatestResultListModel(model);
@@ -165,8 +164,10 @@
webserviceCombobox = new javax.swing.JComboBox();
jLabel2 = new javax.swing.JLabel();
deviceCombobox = new javax.swing.JComboBox();
+ deviceCombobox.setEnabled(false);
jLabel3 = new javax.swing.JLabel();
functionCombobox = new javax.swing.JComboBox();
+ functionCombobox.setEnabled(false);
//jLabel27 = new javax.swing.JLabel();
//progressBar = new javax.swing.JProgressBar();
jScrollPane8 = new javax.swing.JScrollPane();
@@ -184,7 +185,7 @@
parameterLabel = new javax.swing.JLabel();
parameterStringTextField = new javax.swing.JTextField();

-
+

jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Request"));
jLabel1.setText("Telnet / SSH Measurement Point:");

@@ -199,6 +200,7 @@
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);

jLabel2.setText("Device:");

@@ -275,42 +277,44 @@
org.jdesktop.layout.GroupLayout jPanel3Layout = new
org.jdesktop.layout.GroupLayout(jPanel3);
jPanel3.setLayout(jPanel3Layout);
jPanel3Layout.setHorizontalGroup(
-
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel3Layout.createSequentialGroup()
- .addContainerGap()
-
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel3Layout.createSequentialGroup()
- .add(jLabel31)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(commandTextField,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 88, Short.MAX_VALUE))
- .add(jPanel3Layout.createSequentialGroup()
- .add(jLabel29)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(descriptionTextField,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 134, Short.MAX_VALUE))
- .add(jPanel3Layout.createSequentialGroup()
- .add(jLabel30)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(syntaxTextField,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 153, Short.MAX_VALUE)))
- .addContainerGap())
- );
- jPanel3Layout.setVerticalGroup(
-
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel3Layout.createSequentialGroup()
- .addContainerGap()
-
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel29)
- .add(descriptionTextField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel30)
- .add(syntaxTextField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel31)
- .add(commandTextField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(0, 0, Short.MAX_VALUE))
- );
+
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel3Layout.createSequentialGroup()
+ .addContainerGap()
+
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel3Layout.createSequentialGroup()
+ .add(jLabel31)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(commandTextField,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 232, Short.MAX_VALUE))
+ .add(jPanel3Layout.createSequentialGroup()
+ .add(jLabel29)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(descriptionTextField,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 278, Short.MAX_VALUE))
+ .add(jPanel3Layout.createSequentialGroup()
+ .add(jLabel30)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(syntaxTextField,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 297, Short.MAX_VALUE)))
+ .addContainerGap())
+ );
+ jPanel3Layout.setVerticalGroup(
+
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel3Layout.createSequentialGroup()
+ .addContainerGap()
+
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(jLabel29)
+ .add(descriptionTextField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(jLabel30)
+ .add(syntaxTextField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(jLabel31)
+ .add(commandTextField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .add(0, 0, Short.MAX_VALUE))
+ );

+
+
parameterLabel.setText("Parameterstring:");

parameterStringTextField.setEnabled(false);
@@ -318,77 +322,80 @@
org.jdesktop.layout.GroupLayout jPanel1Layout = new
org.jdesktop.layout.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
-
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel1Layout.createSequentialGroup()
- .addContainerGap()
-
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel3,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(jPanel1Layout.createSequentialGroup()
- .add(jLabel3)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(functionCombobox, 0, 176, Short.MAX_VALUE))
- .add(jPanel1Layout.createSequentialGroup()
-
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING,
jPanel1Layout.createSequentialGroup()
- .add(jLabel1)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(webserviceCombobox, 0, 69,
Short.MAX_VALUE))
- .add(org.jdesktop.layout.GroupLayout.LEADING,
jPanel1Layout.createSequentialGroup()
- .add(jLabel2)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(deviceCombobox, 0, 191,
Short.MAX_VALUE)))
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED))
- .add(jPanel1Layout.createSequentialGroup()
- .add(parameterLabel)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(parameterStringTextField,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE)))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel1Layout.createSequentialGroup()
- .add(jLabel28)
- .addContainerGap())
- .add(org.jdesktop.layout.GroupLayout.TRAILING,
jPanel1Layout.createSequentialGroup()
-
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING,
jScrollPane8, 0, 0, Short.MAX_VALUE)
- .add(jPanel1Layout.createSequentialGroup()
- .add(addDeviceButton,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(removeDeviceButton)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)))
- .add(253, 253, 253))))
- );
- jPanel1Layout.setVerticalGroup(
-
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel1Layout.createSequentialGroup()
- .addContainerGap()
-
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel1Layout.createSequentialGroup()
-
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel1)
- .add(webserviceCombobox,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel28))
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel2)
- .add(deviceCombobox,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(addDeviceButton)
- .add(removeDeviceButton))
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel3)
- .add(functionCombobox,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(parameterLabel)
- .add(parameterStringTextField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel3,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 108, Short.MAX_VALUE))
- .add(org.jdesktop.layout.GroupLayout.TRAILING,
jPanel1Layout.createSequentialGroup()
- .add(jScrollPane8,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE))))
- .addContainerGap())
- );
+
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel1Layout.createSequentialGroup()
+ .addContainerGap()
+
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel1Layout.createSequentialGroup()
+ .add(jLabel3)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(functionCombobox, 0, 320, Short.MAX_VALUE))
+ .add(jPanel1Layout.createSequentialGroup()
+
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(org.jdesktop.layout.GroupLayout.LEADING,
jPanel1Layout.createSequentialGroup()
+ .add(jLabel1)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(webserviceCombobox, 0, 213, Short.MAX_VALUE))
+ .add(org.jdesktop.layout.GroupLayout.LEADING,
jPanel1Layout.createSequentialGroup()
+ .add(jLabel2)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(deviceCombobox, 0, 335, Short.MAX_VALUE)))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED))
+ .add(jPanel1Layout.createSequentialGroup()
+ .add(parameterLabel)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(parameterStringTextField,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 290, Short.MAX_VALUE))
+ .add(jPanel3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(jPanel1Layout.createSequentialGroup()
+ .add(12, 12, 12)
+
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(org.jdesktop.layout.GroupLayout.TRAILING,
jPanel1Layout.createSequentialGroup()
+ .add(addDeviceButton,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 180, Short.MAX_VALUE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(removeDeviceButton,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 180, Short.MAX_VALUE))
+ .add(jLabel28)))
+ .add(jPanel1Layout.createSequentialGroup()
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(jScrollPane8,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 498,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+ .addContainerGap())
+ );
+ jPanel1Layout.setVerticalGroup(
+
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel1Layout.createSequentialGroup()
+ .addContainerGap()
+
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(jPanel1Layout.createSequentialGroup()
+
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(jLabel1)
+ .add(webserviceCombobox,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(jLabel28))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(jLabel2)
+ .add(deviceCombobox,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+ .add(jPanel1Layout.createSequentialGroup()
+
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(removeDeviceButton)
+ .add(addDeviceButton))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)))
+
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jPanel1Layout.createSequentialGroup()
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(jLabel3)
+ .add(functionCombobox,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(parameterLabel)
+ .add(parameterStringTextField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(jPanel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
109, Short.MAX_VALUE))
+ .add(jPanel1Layout.createSequentialGroup()
+ .add(5, 5, 5)
+ .add(jScrollPane8,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 163, Short.MAX_VALUE)))
+ .addContainerGap())
+ );

return jPanel1;
}
@@ -465,7 +472,7 @@
.add(jLabel32)
.add(statusTextField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jScrollPane2,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 277, Short.MAX_VALUE)
+ .add(jScrollPane2,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 276, Short.MAX_VALUE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)

.add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(jLabel35)
@@ -510,7 +517,7 @@
getSelectedValue());
statusTextField.setText(status);

- parameterListModel.removeAllElements();
+ //parameterListModel.removeAllElements();



@@ -522,17 +529,17 @@
statusTextField.setText("Please select the device in the list " +
"above of which the result has to be displayed.");

- parameterListModel.removeAllElements();
+ //parameterListModel.removeAllElements();


commandTextField.setText(model.getCommand(
(String)functionCombobox.getSelectedItem(),
(String)deviceCombobox.getSelectedItem()));

- Iterator it = parameterListModel.getAllElements().iterator();
- while (it.hasNext())
- commandTextField.setText(commandTextField.getText()
- + " " + (String)it.next());
+ //Iterator it = parameterListModel.getAllElements().iterator();
+ //while (it.hasNext())
+ // commandTextField.setText(commandTextField.getText()
+ // + " " + (String)it.next());
}

searchTextField.setEnabled(true);
@@ -548,65 +555,45 @@

}

+ public JComboBox getWebserviceComboBox() {
+ return webserviceCombobox;
+ }
+
/**
* Code for the handling when a MP has been chosen from the
* Combobox
**/
- private void
webserviceComboboxActionperformedHandler(java.awt.event.ActionEvent evt) {
+ public void webserviceComboboxActionperformedHandler(Document response) {

parameterStringTextField.setText("");

this.deviceCombobox.removeAllItems();
+ this.deviceCombobox.setEnabled(true);
this.deviceComboboxModel.removeAllElements();
this.functionCombobox.removeAllItems();
+ this.functionCombobox.setEnabled(false);
this.functionComboboxModel.removeAllElements();

- //Code for the infite Progress Panel
- SwingUtilities.invokeLater(new Runnable() { //execute our task
+ System.out.println("Vul deviceCombobox en functionCombobox in");
+ try {
+ model.addMetadataForCurrentMP(response);
+
this.deviceComboboxModel.initComboBox(this.webserviceCombobox.getSelectedItem());
+ } catch (Exception ex) {
+ //JOptionPane.showMessageDialog(this,"An error occured while
getting\n" +
+ // "the metadata from the Measurement Point","Error!",
JOptionPane.ERROR_MESSAGE);

- public void run() {
-
- try {
-
- //infiniteProgressPanel.start();
- //progressBar.setString("Contacting MP ...");
- //progressBar.setStringPainted(true);
- //progressBar.setIndeterminate(true);
- Thread performer = new Thread(new Runnable(){
-
- public void run() {
-
- if (webserviceComboboxModel.getSelectedItem() !=
null) {
-
- String url =
webserviceComboboxModel.getUrl((String)webserviceComboboxModel.getSelectedItem());
- deviceComboboxModel.initComboBox(url);
- deviceCombobox.setEnabled(true);
-
- } else {
-
- deviceComboboxModel.removeAllElements();
- deviceCombobox.setEnabled(false);
-
- }
-
- //infiniteProgressPanel.stop();
- //progressBar.setString("");
- //progressBar.setStringPainted(false);
- //progressBar.setIndeterminate(false);
-
-
- }
-
- });
-
- performer.start();
-
- } catch (Exception e) {
-
- }}});
-
+ ex.printStackTrace();
+ }
}

+
+ public void disableComboboxes() {
+ deviceCombobox.setEnabled(false);
+ deviceCombobox.setSelectedItem(null);
+ functionCombobox.setEnabled(false);
+ functionCombobox.setSelectedItem(null);
+ }
+
/**
* Code for the handling when a device has been chosen from the
* Combobox
@@ -640,7 +627,7 @@

if (this.functionCombobox.getSelectedIndex() > -1) {

model.setSelectedCommand((String)functionCombobox.getSelectedItem());
-
+
this.parameterStringTextField.setEnabled(true);

descriptionTextField.setText(model.getDescription(
@@ -655,7 +642,7 @@


} else {
-
+
this.parameterStringTextField.setEnabled(false);


@@ -667,7 +654,7 @@
}
deviceList.repaint();
}
-
+
private void addDeviceButtonActionPerformed(java.awt.event.ActionEvent
evt) {

if (deviceCombobox.getSelectedIndex() > -1) {

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
2007-10-15 12:58:05 UTC (rev 2956)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
2007-10-16 09:06:58 UTC (rev 2957)
@@ -52,7 +52,7 @@
@Override
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
MetadataRequestAction(request,userData,dataList,endpointList,"Meta data
request");
+ metadataRequestAction = new
MetadataKeyRequestAction(request,userData,dataList,endpointList,"Meta data
request");
//metadataRequestAction.setGroup(IPerfsonarTab.defaultGroupQuery);
return metadataRequestAction;
//return null

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
2007-10-15 12:58:05 UTC (rev 2956)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
2007-10-16 09:06:58 UTC (rev 2957)
@@ -32,6 +32,9 @@

protected MetaDataList dataList;
protected MAEndpointList endpoints;
+
+ protected LookingGlassMainPanel parent;
+
/**
*
*/
@@ -59,6 +62,10 @@

@Override
public void run(ActionEvent arg0) {
+ //System.out.println("Selected item:
"+parent.getWebserviceComboBox().getSelectedItem());
+
+ //System.out.println("Number of endpoints: " + endpoints.size());
+
if (request == null) return;
try {
enableActions(true);
@@ -74,16 +81,22 @@
for (int i=0; i < endpoints.size();i++) {
if (isInterrupted()) break;
MAEndpoint mae = endpoints.get(i);
- if (mae.isEnabled()) {
+ //System.out.println("Endpoint : " + mae.getTitle());
+ if (mae.isEnabled() &&
mae.getTitle().equalsIgnoreCase(parent.getWebserviceComboBox()
+ .getSelectedItem().toString())) {
ok = true;
dataList.setNotificationEnabled(false);
userData.setEndpoint(mae);
+ //System.out.println("Retrieving metadata from " +
userData.getEndpoint());
request.fireStatusMessage("Retrieving metadata from " +
userData.getEndpoint());
try {
MetadataListResponseListener listener = new
MetadataListResponseListener(dataList) {
@Override
public synchronized void
callException(PerfsonarResponseEvent e) {
super.callException(e);
+
+ //System.out.println("callException called");
+
getDataList().clear();
logger.error(e.getException());

handleException(e.getException(),userData.getEndpoint());
@@ -94,16 +107,21 @@
public synchronized void
callCompleted(IPerfsonarRequest request) {
super.callCompleted(request);
//request.removePropertyChangeListener(this);
+
+ //System.out.println("callCompleted called");
}
@Override
public void process(IPerfsonarRequest request,
IUserData uData, Document response) throws Exception {
super.process(request, uData, response);
getDataList().setSelectedItem(null);
+
parent.webserviceComboboxActionperformedHandler(response);
}
@Override
public synchronized void
processingCompleted(IPerfsonarRequest request) {
super.processingCompleted(request);
getDataList().setSelectedItem(null);
+
+ //System.out.println("processingCompleted
called");
}

};
@@ -155,12 +173,18 @@
endpoint.setStatus(x.getMessage());
endpoint.setStatusExplanation(x);
endpoint.setAlive(false);
- if (JOptionPane.showConfirmDialog(frame,
- x.getMessage() + "\nContinue querying service "+
endpoint.getTitle() + "?"
- ,"Please confirm",
- JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE) ==
JOptionPane.NO_OPTION)
- if (endpoint != null)
- endpoint.setEnabled(false);
+ parent.disableComboboxes();
+ JOptionPane.showMessageDialog(frame,
+ x.getMessage() + "\nThere seems to be a problem with the
connection\n" +
+ "to the device. Please check if the URL is valid."
+ ,"Error",JOptionPane.ERROR_MESSAGE);
+
}

+ public void setParent (LookingGlassMainPanel parent) {
+ System.out.println("setParent called!");
+
+ this.parent = parent;
+ }
+
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/DeviceComboboxModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/DeviceComboboxModel.java
2007-10-15 12:58:05 UTC (rev 2956)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/DeviceComboboxModel.java
2007-10-16 09:06:58 UTC (rev 2957)
@@ -37,7 +37,7 @@

this.removeAllElements();

- Iterator it = model.getDevices((String)selectedItem).iterator();
+ Iterator it = model.getDevices().iterator();
while (it.hasNext()) {

this.addElement((String)it.next().toString());

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
2007-10-15 12:58:05 UTC (rev 2956)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
2007-10-16 09:06:58 UTC (rev 2957)
@@ -9,9 +9,10 @@
*/

package org.perfsonar.perfsonarui.lookingglass.model;
-
+
import java.io.File;
import java.io.IOException;
+import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URL;
import java.rmi.RemoteException;
@@ -33,6 +34,11 @@
import org.apache.axis.client.Service;
import org.apache.axis.message.MessageElement;
import org.apache.axis.message.SOAPBodyElement;
+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;
import org.xml.sax.SAXException;

@@ -116,237 +122,46 @@
/**
* Transmits a request towards the selected MP
**/
- public void send(Document request, String endPoint)
+ public void addMetadataForCurrentMP(Document response)
throws Exception {
- send(request, endPoint, 1);
- }
-
- /**
- * Transmits a request towards the selected MP
- **/
- public void send(Document request, String endPoint, int size)
- throws Exception {
- System.out.println("***
LookingGlassClientModel.send("+request+","+endPoint+","+size+") called ***");
+ System.out.println("***
LookingGlassClientModel.addMetadataForCurrentMP("+response+") called ***");

- try {
-
- resultStringTable = new String[size];
- resultTimeTypeTable = new String[size];
- resultTimeValueTable = new String[size];
- resultValueUnitsTable = new String[size];
- statusStringTable = new String[size];
- devicesTable = new String[size];
-
- Service service = new Service();
- Call call = (Call)service.createCall();
- call.setTargetEndpointAddress(new URL(endPoint));
- call.setOperation("acceptCall");
-
- SOAPBodyElement requestMessage =
- new SOAPBodyElement(request.getDocumentElement());
-
- //System.out.println("REQUESTMessage: " + requestMessage);
-
- Object resultObject = call.invoke(new Object[] {requestMessage});
-
- SOAPBodyElement resultSBE;
- Document result = null;
-
- resultSBE= (SOAPBodyElement)((Vector)resultObject).get(0);
-
- System.out.println("REQUESTMessage: " + requestMessage);
-
- System.out.println("RESPONSEMessage: " + resultSBE);
-
- Iterator it = resultSBE.getChildElements();
- boolean ok = true;
- int place = 0;
- while (it.hasNext()) {
- MessageElement message = (MessageElement)it.next();
-
- if (message.getName().contains("meta")) {
-
- if (!(message.getAttribute("id").contains("resultCode")))
{
- String name = message.getAttribute("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.getChildElements();
- while (itmeta.hasNext()) {
- MessageElement subject =
(MessageElement)itmeta.next();
- //System.out.println("subject:
"+subject.getValue());
- if (subject.getName().contains("subject")) {
- Iterator itsubject =
subject.getChildElements();
- while (itsubject.hasNext()) {
- MessageElement hostname =
- (MessageElement)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.getAttribute("id");
- //System.out.println("data id:" + name);
- String nr = name.substring(name.length()-1);
- place = Integer.parseInt(nr);
- //place--;
-
- if (message.getAttribute("id").contains("resultCode")) {
- Iterator it2 = message.getChildElements();
- MessageElement datum = (MessageElement)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.getChildElements();
- MessageElement datum = (MessageElement)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) {
- resultStringTable[place] = "";
- ok = false;
- }
- }
- }
- }
-
- fireStateChanged();
-
- } catch (MalformedURLException ex) {
-
- //JOptionPane.showMessageDialog(null,
- // "The URL of the MP is not valid!",
- // "Sending Error",
- // JOptionPane.ERROR_MESSAGE);
-
- ex.printStackTrace();
- fireStateChanged();
- throw ex;
-
- } catch (RemoteException ex) {
-
- //JOptionPane.showMessageDialog(null,
- // "An error occured while executing your task!",
- // "Sending Error",
- // JOptionPane.ERROR_MESSAGE);
-
- ex.printStackTrace();
- fireStateChanged();
- throw ex;
-
- } catch (ServiceException ex) {
-
- //JOptionPane.showMessageDialog(null,
- // "An error occured while executing your task!",
- // "Sending Error",
- // JOptionPane.ERROR_MESSAGE);
-
- ex.printStackTrace();
- fireStateChanged();
- throw ex;
-
- } catch (Exception ex) {
-
- //JOptionPane.showMessageDialog(null,
- // "An error occured while executing your task!",
- // "Sending Error",
- // JOptionPane.ERROR_MESSAGE);
-
- ex.printStackTrace();
- fireStateChanged();
- throw ex;
-
- }
+ devices.clear();
+ metadata.clear();

- }
-
-
- /**
- * Retrieves the functionality from the MP
- **/
- public void getConfiguration(String endPoint) {
-
try {
+ DOMBuilder dom = new DOMBuilder();
+ org.jdom.Document resp = dom.build(response);

- // Get current classloader
- //ClassLoader cl = this.getClass().getClassLoader();
- devices.clear();
- metadata.clear();
+ org.jdom.Element root = resp.getRootElement();

- // Create file
- //URI uri = null;
- //URL url = null;
+ List children = root.getChildren();
+ Iterator it = children.iterator();

- //System.out.println("ClassLoader: "+ cl);
-
- //url = cl.getResource("configRequest.xml");
-
- //System.out.println("url: "+ url);
-
- //uri = new URI(url.toString());
-
- Document request = null;
- DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- DocumentBuilder builder;
-
- builder = factory.newDocumentBuilder();
- request = builder.parse(new File("../../configRequest.xml"));
-
- Service service = new Service();
- Call call = (Call)service.createCall();
- call.setTargetEndpointAddress(new URL(endPoint));
- call.setOperation("acceptCall");
-
- SOAPBodyElement requestMessage =
- new SOAPBodyElement(request.getDocumentElement());
-
- Object resultObject = call.invoke(new Object[] {requestMessage});
-
- SOAPBodyElement resultSBE = (SOAPBodyElement)
- ((Vector)resultObject).get(0);
-
- Iterator it = resultSBE.getChildElements();
while (it.hasNext()) {
- MessageElement next = (MessageElement)it.next();
- //System.out.println(next);
+ org.jdom.Element next = (org.jdom.Element)it.next();
+ System.out.println(next);

if (next.getName().equalsIgnoreCase("metadata")) {
- //System.out.println(next.getAttribute("id"));
- String metadataId = next.getAttribute("id");
+ System.out.println(next.getAttribute("id"));
+ String metadataId = next.getAttributeValue("id");
if (metadataId.contains("resultCode")) {} else {
metadata.add(metadataId);

- Iterator it2 = next.getChildElements();
+ Iterator it2 = next.getChildren().iterator();
while (it2.hasNext()) {
- MessageElement device =
(MessageElement)it2.next();
-
+ org.jdom.Element device =
(org.jdom.Element)it2.next();
if (device.getName().equalsIgnoreCase("subject"))

devices.add(metadata.indexOf(metadataId),
device.getValue());

else {

- Iterator urlpit = device.getChildElements();
+ Iterator urlpit =
device.getChildren().iterator();
while (urlpit.hasNext()) {

- MessageElement ur =
(MessageElement)urlpit.next();
- urls.add(ur.getAttribute("value"));
+ org.jdom.Element ur =
(org.jdom.Element)urlpit.next();
+ urls.add(ur.getAttributeValue("value"));

}
}
@@ -355,14 +170,14 @@

}
} else if (next.getName().equalsIgnoreCase("data")) {
- String metadataId = next.getAttribute("metadataIdRef");
+ String metadataId =
next.getAttributeValue("metadataIdRef");

- Iterator it2 = next.getChildElements();
+ Iterator it2 = next.getChildren().iterator();
while (it2.hasNext()) {

- MessageElement datum = (MessageElement)it2.next();
+ org.jdom.Element datum = (org.jdom.Element)it2.next();

- Iterator it3 = datum.getChildElements();
+ Iterator it3 = datum.getChildren().iterator();

String function = null;
String command = null;
@@ -371,38 +186,33 @@

while (it3.hasNext()) {

- Object obj = it3.next();
-
//System.out.println(obj.getClass().getSimpleName());
+ org.jdom.Element element =
(org.jdom.Element)it3.next();

- if
(obj.getClass().getSimpleName().equalsIgnoreCase("MessageElement")) {
+ //System.out.println("INTERN");
+ if
(element.getName().equalsIgnoreCase("eventType")) {

- //System.out.println("INTERN");
- MessageElement element = (MessageElement)obj;
+ function = element.getText();
+ System.out.println("Function: " + function);

- if
(element.getName().equalsIgnoreCase("eventType")) {
+ } else if
(element.getName().equalsIgnoreCase("parameters")) {
+
+ Iterator it4 =
element.getChildren().iterator();
+
+ while (it4.hasNext()) {

- function = element.getValue();
- //System.out.println("Function: " +
function);
-
- } else if
(element.getName().equalsIgnoreCase("parameters")) {
-
- Iterator it4 = element.getChildElements();
-
- while (it4.hasNext()) {
-
- MessageElement element2 =
(MessageElement)it4.next();
- if
(element2.getAttribute("name").equalsIgnoreCase("command")) {
- command =
element2.getAttribute("value");
- } else if
(element2.getAttribute("name").equalsIgnoreCase("description")) {
- description =
element2.getAttribute("value");
- } else if
(element2.getAttribute("name").equalsIgnoreCase("syntax")) {
- syntax =
element2.getAttribute("value");
- }
+ org.jdom.Element element2 =
(org.jdom.Element)it4.next();
+ if
(element2.getAttributeValue("name").equalsIgnoreCase("command")) {
+ command =
element2.getAttributeValue("value");
+ } else if
(element2.getAttributeValue("name").equalsIgnoreCase("description")) {
+ description =
element2.getAttributeValue("value");
+ } else if
(element2.getAttributeValue("name").equalsIgnoreCase("syntax")) {
+ syntax =
element2.getAttributeValue("value");
}
}
}
}

+
Vector v;

//System.out.println(function + " " + command + " " +
description + " " + syntax);
@@ -416,15 +226,15 @@
}
}
} /*catch (URISyntaxException ex) {
-
+
JOptionPane.showMessageDialog(null,
"An error occured while executing your task!",
"Configuration Error",
JOptionPane.ERROR_MESSAGE);
ex.printStackTrace();
+
+ } catch (RemoteException ex) {

- } */catch (RemoteException ex) {
-
JOptionPane.showMessageDialog(null,
"An error occured while executing your task!",
"Configuration Error",
@@ -470,7 +280,13 @@
"Communication Error",
JOptionPane.ERROR_MESSAGE);
ex.printStackTrace();
-
+ */
+ catch (Exception e) {
+ JOptionPane.showMessageDialog(null,
+ "An error occured while contacting the remote service!",
+ "Communication Error",
+ JOptionPane.ERROR_MESSAGE);
+ e.printStackTrace();
}

}
@@ -528,7 +344,7 @@
/**
* Returns a list with all supported devices by given MP
**/
- public List getDevices(String webservice) {
+ /*public List getDevices(String webservice) {


devices = new ArrayList();
@@ -537,7 +353,7 @@
getConfiguration((String)webservice);
return devices;

- }
+ }*/

/**
* Returns a list with all supported devices by given MP


  • perfsonar: r2957 - in branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass: . model, svnlog, 10/16/2007

Archive powered by MHonArc 2.6.16.

Top of Page