perfsonar-dev - perfsonar: r4696 - branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl
Subject: perfsonar development work
List archive
- From:
- To:
- Subject: perfsonar: r4696 - branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl
- Date: Fri, 14 Nov 2008 10:44:14 -0500
Author: nemanja.zutic
Date: 2008-11-14 10:44:13 -0500 (Fri, 14 Nov 2008)
New Revision: 4696
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLMainComponent.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLPerfsonarTab.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLRequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTUserData.java
Log:
Fixed some bugs on the BWCTL tab
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLMainComponent.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLMainComponent.java
2008-11-14 15:17:35 UTC (rev 4695)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLMainComponent.java
2008-11-14 15:44:13 UTC (rev 4696)
@@ -22,7 +22,6 @@
import javax.swing.JTextField;
import javax.swing.SwingConstants;
-import org.apache.commons.collections.functors.OnePredicate;
import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.plugins.MAEndpoint;
import org.perfsonar.perfsonarui.plugins.MAEndpointList;
@@ -36,6 +35,8 @@
public class BWCTLMainComponent extends PluginMainPanel
implements ActionListener
{
+ private static final long serialVersionUID = 1016070292100053577L;
+
protected Hashtable<String,String> namePairs = new
Hashtable<String,String>();
protected String sourceName;
@@ -402,12 +403,14 @@
endpoints = model.getEndpointList();
sourceAddress.setText(getEndpointHost(endpoints));
sourceName = getEndpointName(endpoints);
+ ((BWCTLPerfsonarTab)model).endpointSrcIndex = -1;
for (int i = 0; i < endpoints.size(); i++)
{
endpoint = endpoints.get(i);
if (endpoint.isEnabled())
{
model.getUserData().setEndpoint(endpoint);
+ ((BWCTLPerfsonarTab)model).endpointSrcIndex =
i;
break;
}
}
@@ -416,9 +419,18 @@
public void updateDestination()
{
- destinationAddress.setText(getEndpointHost(
- ((BWCTLPerfsonarTab) model).destinations));
- destinationName =
getEndpointName(((BWCTLPerfsonarTab)model).destinations);
+ MAEndpointList endpoints;
+
+ endpoints = model.getEndpointList();
+ destinationAddress.setText(getEndpointHost(endpoints));
+ destinationName = getEndpointName(endpoints);
+ ((BWCTLPerfsonarTab)model).endpointDstIndex = -1;
+ for(int i = 0; i < endpoints.size(); i++){
+ if(endpoints.get(i).isEnabled()){
+ ((BWCTLPerfsonarTab)model).endpointDstIndex =
i;
+ break;
+ }
+ }
resetRTTData();
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLPerfsonarTab.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLPerfsonarTab.java
2008-11-14 15:17:35 UTC (rev 4695)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLPerfsonarTab.java
2008-11-14 15:44:13 UTC (rev 4696)
@@ -5,6 +5,8 @@
import java.util.Collection;
import java.util.List;
+import javax.swing.JDialog;
+
import org.perfsonar.perfsonarui.AbstractUserData;
import org.perfsonar.perfsonarui.IPerfsonarSchema;
import org.perfsonar.perfsonarui.PSException;
@@ -27,7 +29,11 @@
public class BWCTLPerfsonarTab extends PerfsonarModel {
protected MAEndpointList destinations;
+
+ protected int endpointSrcIndex = -1;
+ protected int endpointDstIndex = -1;
+
private BWCTLMainComponent pane;
public BWCTLPerfsonarTab()
@@ -47,14 +53,6 @@
break;
}
}
- /*
- userData.setQuery("type", "ipv4");
- userData.setQuery("dst", "195.113.161.91");
- userData.setQuery("protocol", "TCP");
- userData.setQuery("windowSize", "50000");
- userData.setQuery("duration", "5");
- userData.setQuery("interval", "2");
- */
}
/**
*
@@ -125,19 +123,36 @@
* Override in order not to create a default Options button.
*/
public PSUIAction createOptionsAction() {
- ShowEndpointsAction action = new
ShowEndpointsAction(getDestinations(),"BWCTL Destination");
+
+ ShowEndpointsAction action = new
ShowEndpointsAction(getDestinations(),"BWCTL Destination"){
+
+ protected JDialog createDialog(){
+ setEndpointSelected(endpoints,
endpointDstIndex);
+ return super.createDialog();
+ }
+ };
+
action.addListener(new ShowEndpointsAction.Listener() {
-
+
public void actionFinished(Collection<MAEndpoint>
selected) {
pane.updateDestination();
}
});
return action;
}
+
public PSUIAction createEndpointsAction(MAEndpointList endpointList)
{
- ShowEndpointsAction action = new
ShowEndpointsAction(endpointList, "BWCTL MP/Source");
+ ShowEndpointsAction action = new
ShowEndpointsAction(endpointList, "BWCTL MP/Source"){
+
+ protected JDialog createDialog(){
+ setEndpointSelected(endpoints,
endpointSrcIndex);
+ return super.createDialog();
+ }
+ };
+
action.addListener(new ShowEndpointsAction.Listener() {
+
public void actionFinished(Collection<MAEndpoint>
selected) {
pane.updateSource();
}
@@ -159,4 +174,11 @@
}
return destinations;
}
+
+ public void setEndpointSelected(MAEndpointList endpoints, int index){
+ for(int i = 0; i < endpoints.size(); i++){
+ if(i!=index)endpoints.get(i).setEnabled(false);
+ else endpoints.get(i).setEnabled(true);
+ }
+ }
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLRequest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLRequest.java
2008-11-14 15:17:35 UTC (rev 4695)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLRequest.java
2008-11-14 15:44:13 UTC (rev 4696)
@@ -263,14 +263,14 @@
rtt =
Double.parseDouble(mainComponent.userRTT.getText());
window =
Double.parseDouble(mainComponent.windowSize.getText());
}catch (NumberFormatException e){
- output+="\nRTT or window size is not
a valid number";
+// output+="\nRTT or window size is not
a valid number";
}
window*=8;
rtt/=1000;
if(rtt!=0.0) maxBW = window/rtt;
Long maxBWLong = new Long(maxBW.longValue());
- if (maxBWLong!=0) output+="\nExpected maximum
BW (based on window size and RTT) is:\n" + maxBWLong + " bits/sec";
- else output+="\nCannot calculate expected
maximum BW\nCheck window size and RTT";
+ if (maxBWLong!=0) output+="\nExpected maximum
theoretical bandwidth (TCP window size * RTT) is:\n" + maxBWLong + "
bits/sec";
+ else output+="\nIf you wish to see the
Expected maximum theoretical bandwidth (TCP window size * RTT) please enter a
RTT value and a window size";
}
}
mainComponent.result.setText(output);
@@ -280,7 +280,7 @@
* Helper method to serialize an XML request/response into a String.
* Not really useful besides for debugging.
*/
- private String dumpXML(Document document)
+ /*private String dumpXML(Document document)
{
java.io.StringWriter stringOutput;
com.sun.org.apache.xml.internal.serialize.OutputFormat
stringFormat;
@@ -299,7 +299,7 @@
return null;
}
return stringOutput.toString();
- }
+ }*/
private void setQueryEndpoint(String address, String type,
Document request, String target)
@@ -333,7 +333,7 @@
}
}
- private void setQueryParameter(String name, String value,
+ /*private void setQueryParameter(String name, String value,
Document request)
{
NodeList nodes;
@@ -348,7 +348,6 @@
nodes = request.getElementsByTagName("nmwg:parameters");
if (nodes.getLength() != 1)
{
- /* Malformed request template */
return;
}
parameterRoot = (Element) nodes.item(0);
@@ -358,7 +357,7 @@
parameterElement.setAttribute("value", value);
parameterRoot.appendChild(parameterElement);
- }
+ }*/
private void setQueryParameter(String name, String value, String ns,
@@ -378,7 +377,6 @@
nodes = request.getElementsByTagName(nsParameters);
if (nodes.getLength() != 1)
{
- /* Malformed request template */
return;
}
parameterRoot = (Element) nodes.item(0);
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java
2008-11-14 15:17:35 UTC (rev 4695)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java
2008-11-14 15:44:13 UTC (rev 4696)
@@ -306,6 +306,15 @@
NodeList datums;
Element datum;
+ /*
+ *
+ *
+ * NEED TO PROCESS THE ERRORS
+ *
+ *
+ * */
+
+
datas = response.getElementsByTagName("nmwg:data");
for (int i = 0; i < datas.getLength(); i++)
{
@@ -321,6 +330,15 @@
}
delays.add(last_med_delay);
}
+ if(delays.size() == 1){
+ Double rtt = delays.get(0);
+ if(rtt == 0.0){
+
mainComponent.oneWayDelayInfoLabel.setText("No RTT measurement available");
+ }
+ else {
+
mainComponent.oneWayDelayInfoLabel.setText("Only one OWD measurement
received");
+ }
+ }
if(delays.size() == DELAY_MEASUREMENTS){
Double rtt = delays.get(0) + delays.get(1);
if(rtt == 0.0){
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTUserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTUserData.java
2008-11-14 15:17:35 UTC (rev 4695)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTUserData.java
2008-11-14 15:44:13 UTC (rev 4696)
@@ -5,6 +5,7 @@
public class RTTUserData extends AbstractUserData {
+ private static final long serialVersionUID = 6650070627813545094L;
protected String sourceName;
protected String destinationName;
protected MAEndpoint serviceEndpoint;
- perfsonar: r4696 - branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl, svnlog, 11/14/2008
Archive powered by MHonArc 2.6.16.