Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2900 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . demo links linkstatus lookingglass lookingglass/model ma plugins test ui ui/panels

Subject: perfsonar development work

List archive

perfsonar: r2900 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . demo links linkstatus lookingglass lookingglass/model ma plugins test ui ui/panels


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2900 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . demo links linkstatus lookingglass lookingglass/model ma plugins test ui ui/panels
  • Date: Thu, 4 Oct 2007 07:33:05 -0400
Author: nina
Date: 2007-10-04 07:33:04 -0400 (Thu, 04 Oct 2007)
New Revision: 2900

Added:

branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/UnsupportedSchemaException.java
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoSmartRequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/UnsupportedTypeException.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson3.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson4.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LinkStatusModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/LSRequestTest.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SmartMARequestTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/TimeoutTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataPanel.java
Log:
SmartMARequest methods getRequest and createRequest now throw
UnsupportedTypeException. If the exception is thrown, the lower right red box
on status bar will appear and details can be viewed on mouse click

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoSmartRequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoSmartRequest.java
2007-10-03 13:04:09 UTC (rev 2899)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/EchoSmartRequest.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -38,7 +38,7 @@
* Creates
{@link
EchoMARequest} for any type of
{@link
MAEndpoint}.
*/
@Override
- public IPerfsonarRequest createMARequest(MAEndpoint endpoint) {
+ public IPerfsonarRequest createMARequest(MAEndpoint endpoint) throws
PSException {
//

EchoMARequest r = new EchoMARequest();

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
2007-10-03 13:04:09 UTC (rev 2899)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -188,9 +188,9 @@
break;

}
- public abstract IPerfsonarRequest createMARequest(MAEndpoint
endpoint);
+ public abstract IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException;

- public IPerfsonarRequest getMARequest(MAEndpoint endpoint) {
+ public IPerfsonarRequest getMARequest(MAEndpoint endpoint) throws
PSException {
try {
PerfsonarRequestsPool pool =
requestsPool.get(endpoint.getSchema());
if (pool == null) {
@@ -202,8 +202,7 @@
if (request == null) {
IPerfsonarRequest newRequest =
createMARequest(endpoint);
if (newRequest == null) {
- logger.error("Can't create request for "+endpoint);
- return null;
+ throw new Exception("Can't create request for
"+endpoint);
}
newRequest.setTimeout(timeout);
pool.addConnection(newRequest);
@@ -221,8 +220,7 @@
return request;

} catch (Exception x) {
- logger.error(endpoint,x);
- return null;
+ throw new PSException(endpoint,x);
}
}
@Override
@@ -231,7 +229,8 @@
IPerfsonarRequest mr =
getMARequest(uData.getEndpoint());
if (mr != null) {
mr.makeRequest(uData, messageType, response,
parallel & runInThread);
- }
+ } else
+ fireAxisCallException(uData,new
Exception("Request not created "+uData.getEndpoint()));
} catch (Exception x) {
fireAxisCallException(uData,x);
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/UnsupportedTypeException.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/UnsupportedTypeException.java
2007-10-03 13:04:09 UTC (rev 2899)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/UnsupportedTypeException.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -33,14 +33,14 @@
import org.perfsonar.perfsonarui.plugins.MAEndpoint;

public class UnsupportedTypeException extends PSException {
-
+ protected static String m = "Unsupported schema type";
/**
*
*/
private static final long serialVersionUID = 1515852343242654736L;

public UnsupportedTypeException(MAEndpoint maEndpoint) {
- super(maEndpoint);
+ this(maEndpoint,m);
}

public UnsupportedTypeException(MAEndpoint maEndpoint, String message) {
@@ -59,5 +59,11 @@
Throwable cause) {
super(maEndpoint, message, cause);
}
-
+ @Override
+ public String toString() {
+ if (maEndpoint != null)
+ return getMessage() + " " + maEndpoint.getSchema();
+ else
+ return super.toString();
+ }
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
2007-10-03 13:04:09 UTC (rev 2899)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -30,6 +30,7 @@

import org.perfsonar.perfsonarui.AbstractUserData;
import org.perfsonar.perfsonarui.IPerfsonarSchema;
+import org.perfsonar.perfsonarui.PSException;
import org.perfsonar.perfsonarui.PerfsonarSchema;
import org.perfsonar.perfsonarui.ResponseData;
import org.perfsonar.perfsonarui.SmartMARequest;
@@ -46,6 +47,7 @@
import org.perfsonar.perfsonarui.plugins.MAEndpointList;
import org.perfsonar.perfsonarui.plugins.PSDatum;
import org.perfsonar.perfsonarui.plugins.PSTime;
+import org.perfsonar.perfsonarui.plugins.UnsupportedSchemaException;
import org.perfsonar.perfsonarui.ui.PerfSonarApp;
import org.perfsonar.perfsonarui.ui.PerfsonarModel;
import org.perfsonar.perfsonarui.ui.PluginMainPanel;
@@ -76,10 +78,10 @@
protected SmartMARequest createSmartRequest() {
return new SmartMARequest() {
@Override
- public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) {
+ public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException {
IPerfsonarSchema schema =
endpoint.getSchema();
if
(schema.equals(MARequestPerfsonar2_0.schemaID)) return new
MARequestPerfsonar2_0();
- else return null;
+ else throw new
UnsupportedSchemaException(endpoint);
}
};
}

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson3.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson3.java
2007-10-03 13:04:09 UTC (rev 2899)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson3.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -26,6 +26,7 @@

import org.perfsonar.perfsonarui.IPerfsonarSchema;
import org.perfsonar.perfsonarui.MetadataListResponseListener;
+import org.perfsonar.perfsonarui.PSException;
import org.perfsonar.perfsonarui.SmartMARequest;
import org.perfsonar.perfsonarui.ippm.IPPMRequest;
import org.perfsonar.perfsonarui.ma.MARequest;
@@ -37,6 +38,7 @@
import org.perfsonar.perfsonarui.plugins.IUserData;
import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.plugins.MetaDataList;
+import org.perfsonar.perfsonarui.plugins.UnsupportedSchemaException;

/**
* Usage of
{@link
SmartMARequest} to send MetadataKeyRequest.
@@ -74,14 +76,14 @@
SmartMARequest smartRequest = new SmartMARequest() {
@Override

- public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) {
+ public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException {
IPerfsonarSchema schema =
endpoint.getSchema();
if (schema.equals("NMWG2v2")) return new
MARequest_NMWG2();
else if (schema.equals("NMWG2v2_netutil"))
return new MARequest_NMWG2_Netutil();
else if
(schema.equals(MARequestPerfsonar2_0.schemaID)) return new
MARequestPerfsonar2_0();
else if (schema.equals("perfsonar")) return
new MARequest();
else if (schema.equals("ippm")) return new
IPPMRequest();
- else return null;
+ else throw new
UnsupportedSchemaException(endpoint);
}
};
//Create MetaDataList to hold all metadata retrieved

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson4.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson4.java
2007-10-03 13:04:09 UTC (rev 2899)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/Lesson4.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -26,6 +26,7 @@

import org.perfsonar.perfsonarui.IPerfsonarSchema;
import org.perfsonar.perfsonarui.MetadataListResponseListener;
+import org.perfsonar.perfsonarui.PSException;
import org.perfsonar.perfsonarui.ResponseData;
import org.perfsonar.perfsonarui.SmartMARequest;
import org.perfsonar.perfsonarui.TimeValueResponseListener;
@@ -40,6 +41,7 @@
import org.perfsonar.perfsonarui.plugins.IUserData;
import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.plugins.MetaDataList;
+import org.perfsonar.perfsonarui.plugins.UnsupportedSchemaException;

public class Lesson4 {
protected SmartMARequest smartRequest;
@@ -48,14 +50,14 @@
smartRequest = new SmartMARequest() {
@Override

- public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) {
+ public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException {
IPerfsonarSchema schema =
endpoint.getSchema();
if (schema.equals("NMWG2v2")) return new
MARequest_NMWG2();
else if (schema.equals("NMWG2v2_netutil"))
return new MARequest_NMWG2_Netutil();
else if
(schema.equals(MARequestPerfsonar2_0.schemaID)) return new
MARequestPerfsonar2_0();
else if (schema.equals("perfsonar")) return
new MARequest();
else if (schema.equals("ippm")) return new
IPPMRequest();
- else return null;
+ else throw new
UnsupportedSchemaException(endpoint);
}
};
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksModel.java
2007-10-03 13:04:09 UTC (rev 2899)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksModel.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -281,7 +281,7 @@
return new SmartMARequest()
{
@Override
- public IPerfsonarRequest createMARequest(MAEndpoint
endpoint)
+ public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException
{
return new PlaygroundRequest();
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LinkStatusModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LinkStatusModel.java
2007-10-03 13:04:09 UTC (rev 2899)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LinkStatusModel.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -412,7 +412,7 @@
return new SmartMARequest()
{
@Override
- public IPerfsonarRequest createMARequest(MAEndpoint
endpoint)
+ public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException
{
return new PlaygroundRequest();
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
2007-10-03 13:04:09 UTC (rev 2899)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -29,6 +29,7 @@
import java.util.List;

import org.perfsonar.perfsonarui.IPerfsonarSchema;
+import org.perfsonar.perfsonarui.PSException;
import org.perfsonar.perfsonarui.PerfsonarSchema;
import org.perfsonar.perfsonarui.SmartMARequest;
import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
@@ -59,7 +60,7 @@
protected SmartMARequest createSmartRequest() {
return new SmartMARequest() {
@Override
- public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) {
+ public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException {
return new LGRequest();
}
};

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
2007-10-03 13:04:09 UTC (rev 2899)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LookingGlassClientModel.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -10,7 +10,6 @@

package org.perfsonar.perfsonarui.lookingglass.model;

-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
@@ -21,19 +20,20 @@
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 javax.swing.event.ChangeListener;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.rpc.ServiceException;
+
import org.apache.axis.client.Call;
import org.apache.axis.client.Service;
import org.apache.axis.message.MessageElement;
import org.apache.axis.message.SOAPBodyElement;
-import org.apache.xml.serialize.XMLSerializer;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
2007-10-03 13:04:09 UTC (rev 2899)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -34,9 +34,11 @@
import org.apache.commons.cli.CommandLine;
import org.perfsonar.perfsonarui.AbstractUserData;
import org.perfsonar.perfsonarui.IPerfsonarSchema;
+import org.perfsonar.perfsonarui.PSException;
import org.perfsonar.perfsonarui.PerfsonarSchema;
import org.perfsonar.perfsonarui.SmartMARequest;
import org.perfsonar.perfsonarui.TracerouteShell;
+import org.perfsonar.perfsonarui.UnsupportedTypeException;
import org.perfsonar.perfsonarui.ippm.IPPMRequest;
import org.perfsonar.perfsonarui.ma.ui.actions.MASetupDataRequestAction;
import org.perfsonar.perfsonarui.ma.ui.actions.SearchByIPAction;
@@ -55,6 +57,7 @@
import org.perfsonar.perfsonarui.plugins.MAEndpointList;
import org.perfsonar.perfsonarui.plugins.MetaDataList;
import org.perfsonar.perfsonarui.plugins.PerfsonarTabsList;
+import org.perfsonar.perfsonarui.plugins.UnsupportedSchemaException;
import org.perfsonar.perfsonarui.ui.PerfsonarModel;
import org.perfsonar.perfsonarui.ui.actions.ITimeSetAction;
import org.perfsonar.perfsonarui.ui.actions.PSUIAction;
@@ -170,7 +173,7 @@
if (request != null) return request;
return new SmartMARequest() {
@Override
- public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) {
+ public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException {
IPerfsonarSchema schema =
endpoint.getSchema();
if (schema.equals("NMWG2v2")) return new
MARequest_NMWG2();
else if (schema.equals("NMWG2v2_netutil"))
return new MARequest_NMWG2_Netutil();
@@ -190,7 +193,7 @@
if
("http://ggf.org/ns/nmwg/characteristic/packets/nonunicast/2.0/".equals(getCurrentEventType()))
return new MANonunicastPackets();
}
- return null;
+ throw new UnsupportedTypeException(endpoint);
}
};
}

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/UnsupportedSchemaException.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/LSRequestTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/LSRequestTest.java
2007-10-03 13:04:09 UTC (rev 2899)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/LSRequestTest.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -29,6 +29,7 @@
import junit.framework.TestCase;

import org.perfsonar.perfsonarui.AbstractUserData;
+import org.perfsonar.perfsonarui.PSException;
import org.perfsonar.perfsonarui.PSLogger;
import org.perfsonar.perfsonarui.SmartMARequest;
import org.perfsonar.perfsonarui.ls.LSRequest;
@@ -47,7 +48,7 @@
public void test() {
SmartMARequest smart = new SmartMARequest() {
@Override
- public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) {
+ public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException {
return new
LSRequest("org/perfsonar/perfsonarui/ls/LSQueryRequestFull.xml");
}
};
@@ -82,7 +83,7 @@
public void testProcess() {
SmartMARequest smart = new SmartMARequest() {
@Override
- public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) {
+ public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException {
return new LSRequest();
}
};

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SmartMARequestTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SmartMARequestTest.java
2007-10-03 13:04:09 UTC (rev 2899)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SmartMARequestTest.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -33,6 +33,7 @@
import org.perfsonar.perfsonarui.EmptyMARequest;
import org.perfsonar.perfsonarui.IPerfsonarSchema;
import org.perfsonar.perfsonarui.MetadataListResponseListener;
+import org.perfsonar.perfsonarui.PSException;
import org.perfsonar.perfsonarui.PSLogger;
import org.perfsonar.perfsonarui.ResponseData;
import org.perfsonar.perfsonarui.SmartMARequest;
@@ -47,6 +48,7 @@
import org.perfsonar.perfsonarui.plugins.IUserData;
import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.plugins.MetaDataList;
+import org.perfsonar.perfsonarui.plugins.UnsupportedSchemaException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -66,13 +68,13 @@
smartRequest = new SmartMARequest() {
@Override

- public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) {
+ public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException {
IPerfsonarSchema schema =
endpoint.getSchema();
if (schema.equals("NMWG2v2")) return new
MARequest_NMWG2();
else if (schema.equals("NMWG2v2_netutil"))
return new MARequest_NMWG2_Netutil();
else if (schema.equals("perfsonar")) return
new MARequest();
else if (schema.equals("ippm")) return new
IPPMRequest();
- else return null;
+ else throw new
UnsupportedSchemaException(endpoint);
}
};
PSLogger.configureLog4j(true);
@@ -264,7 +266,7 @@
* @see
org.perfsonar.perfsonarui.SmartMARequest#createMARequest(org.perfsonar.perfsonarui.MAEndpoint)
*/
@Override
- public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) {
+ public IPerfsonarRequest createMARequest(MAEndpoint
endpoint) throws PSException {
return new EmptyMARequest(500);
}
};

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/TimeoutTest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/test/TimeoutTest.java
2007-10-03 13:04:09 UTC (rev 2899)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/test/TimeoutTest.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -160,11 +160,12 @@
MAEndpoint e = new
MAEndpoint("GEANT2,http://stats.geant2.net/perfsonar/RRDMA-access/MeasurementArchiveService,http://schemas.perfsonar.net/2.0,,http://ggf.org/ns/nmwg/characteristic/utilization/2.0,http://ggf.org/ns/nmwg/characteristic/utilization/2.0";);
//
"ISTF-J,http://selena.acad.bg:8080/axis/services/MeasurementArchiveService,NMWG2v2_netutil,'',utilization,utilization");
EchoSmartRequest factory = new EchoSmartRequest();
- EchoMARequest echo = (EchoMARequest)factory.createMARequest(e);
- AbstractUserData data = new AbstractUserData();
- data.setEndpoint(e);

try {
+ EchoMARequest echo = (EchoMARequest)factory.createMARequest(e);
+ AbstractUserData data = new AbstractUserData();
+ data.setEndpoint(e);
+
Document doc =
echo.createRequest(data,IPerfsonarRequest.MA_EchoRequest);
SOAPBodyElement requestMessage = new
SOAPBodyElement(doc.getDocumentElement());


Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
2007-10-03 13:04:09 UTC (rev 2899)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -255,9 +255,11 @@
perfsonarTabs.add(tab);
*/
//for testing purposes only
+ /*
tab = new LookingGlassTab();
tab.setParameters(cmdOpts);
perfsonarTabs.add(tab);
+ */


Collections.sort(perfsonarTabs);

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java
2007-10-03 13:04:09 UTC (rev 2899)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -46,8 +46,7 @@
import javax.swing.border.BevelBorder;

import org.apache.axis.AxisFault;
-import org.jdesktop.layout.GroupLayout;
-import org.jdesktop.layout.GroupLayout.SequentialGroup;
+import org.perfsonar.perfsonarui.PerfsonarResponseEvent;
import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.plugins.MetaDataList;

@@ -178,16 +177,8 @@
//progressBar.setString(percent.toString() +
"%");
progressBar.setString("");
} else if
(arg0.getPropertyName().equals(BusyIdleEvent.PROPERTY_ERROR)) {
- theError = (Exception ) arg0.getNewValue();
- if (theError != null) {
- errorsLabel.setText(theError.getMessage());
- errorsLabel.setBackground(Color.red);
- errorsLabel.setToolTipText("Click here for
error details");
- } else {
- errorsLabel.setText("");
- errorsLabel.setBackground(Color.black);
- errorsLabel.setToolTipText("");
- }
+
+ handleException((Exception ) arg0.getNewValue());
} else
label.setText(arg0.getNewValue().toString());
}
@@ -197,12 +188,28 @@
if (arg0.getNewValue() != null) {
progressBar.setString("");
label.setText(arg0.getNewValue().toString());
+ }
+ if (arg0 instanceof PerfsonarResponseEvent) {
+ if (((PerfsonarResponseEvent)arg0).getException() != null)
+
handleException(((PerfsonarResponseEvent)arg0).getException());
}

}


}
+ protected void handleException(Exception x) {
+ theError = x;
+ if (theError != null) {
+ errorsLabel.setText(theError.getMessage());
+ errorsLabel.setBackground(Color.red);
+ errorsLabel.setToolTipText("Click here for error details");
+ } else {
+ errorsLabel.setText("");
+ errorsLabel.setBackground(Color.black);
+ errorsLabel.setToolTipText("");
+ }
+ }

public void showErrorlog(Exception x) {
if (x == null) return;

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataPanel.java
2007-10-03 13:04:09 UTC (rev 2899)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataPanel.java
2007-10-04 11:33:04 UTC (rev 2900)
@@ -81,7 +81,11 @@
@Override
public void focusLost(FocusEvent e) {
super.focusLost(e);
-
userDataTable.getCellEditor().stopCellEditing();

+ try {
+
userDataTable.getCellEditor().stopCellEditing();
+ } catch (Exception x) {
+
+ }
}
});
userDataTable.setToolTipText("The query column is used to
construct a query for the measurement data");


  • perfsonar: r2900 - in branches/perfsonarui/src/org/perfsonar/perfsonarui: . demo links linkstatus lookingglass lookingglass/model ma plugins test ui ui/panels, svnlog, 10/04/2007

Archive powered by MHonArc 2.6.16.

Top of Page