perfsonar development work

Author: michael.bischoff
Date: 2008-11-28 14:47:05 -0500 (Fri, 28 Nov 2008)
New Revision: 4725

Added:
   branches/perfsonarui/jars/logging/
   branches/perfsonarui/jars/logging/jcl-over-slf4j-1.5.5.jar
   branches/perfsonarui/jars/logging/log4j-1.2.15.jar
   branches/perfsonarui/jars/logging/slf4j-api-1.5.5.jar
   branches/perfsonarui/jars/logging/slf4j-log4j12-1.5.5.jar
   branches/perfsonarui/jars/ls/LS-client-api-1.0RC2.jar
   branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.jar
Removed:
   branches/perfsonarui/jars/axis/commons-logging-1.0.4.jar
   branches/perfsonarui/jars/axis/log4j-1.2.15.jar
   branches/perfsonarui/jars/axis/slf4j-api-1.4.3.jar
   branches/perfsonarui/jars/axis/slf4j-simple-1.4.3.jar
   branches/perfsonarui/jars/ls/LS-client-api-1.0RC1.jar
   branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA.jar
Modified:
   branches/perfsonarui/ant/build.xml
   branches/perfsonarui/dist/
   branches/perfsonarui/jnlp/perfsonar.jnlp
   
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
   branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMRequest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/PSDelayDatum.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/PSJitterDatum.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMPairsTablePanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMResponseChartPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundPanel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/ResponseChartPanel.java
   branches/perfsonarui/src/resources.files
Log:
Improved logging.
Fixed issue with selecting MA/MP's
bumped ls client version


Modified: branches/perfsonarui/ant/build.xml
===================================================================
--- branches/perfsonarui/ant/build.xml  2008-11-28 19:13:08 UTC (rev 4724)
+++ branches/perfsonarui/ant/build.xml  2008-11-28 19:47:05 UTC (rev 4725)
@@ -66,6 +66,9 @@
         <fileset dir="./jars/dns/">
           <include name="*.jar"/>
         </fileset>
+      <fileset dir="./jars/logging/">
+        <include name="*.jar"/>
+      </fileset>
       <fileset dir="./jars/ls/">
         <include name="*.jar"/>
       </fileset>


Property changes on: branches/perfsonarui/dist
___________________________________________________________________
Name: svn:ignore
   - PerfsonarUI-v0.13

   + PerfsonarUI-v0.13

PerfsonarUI-v0.14

PerfsonarUI-v0.14.zip


Deleted: branches/perfsonarui/jars/axis/commons-logging-1.0.4.jar

Deleted: branches/perfsonarui/jars/axis/log4j-1.2.15.jar

Deleted: branches/perfsonarui/jars/axis/slf4j-api-1.4.3.jar

Deleted: branches/perfsonarui/jars/axis/slf4j-simple-1.4.3.jar

Added: branches/perfsonarui/jars/logging/jcl-over-slf4j-1.5.5.jar


Property changes on: 
branches/perfsonarui/jars/logging/jcl-over-slf4j-1.5.5.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/perfsonarui/jars/logging/log4j-1.2.15.jar


Property changes on: branches/perfsonarui/jars/logging/log4j-1.2.15.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/perfsonarui/jars/logging/slf4j-api-1.5.5.jar


Property changes on: branches/perfsonarui/jars/logging/slf4j-api-1.5.5.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: branches/perfsonarui/jars/logging/slf4j-log4j12-1.5.5.jar


Property changes on: branches/perfsonarui/jars/logging/slf4j-log4j12-1.5.5.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: branches/perfsonarui/jars/ls/LS-client-api-1.0RC1.jar

Added: branches/perfsonarui/jars/ls/LS-client-api-1.0RC2.jar


Property changes on: branches/perfsonarui/jars/ls/LS-client-api-1.0RC2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA.jar

Added: branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.jar


Property changes on: 
branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/perfsonarui/jnlp/perfsonar.jnlp
===================================================================
--- branches/perfsonarui/jnlp/perfsonar.jnlp    2008-11-28 19:13:08 UTC (rev 
4724)
+++ branches/perfsonarui/jnlp/perfsonar.jnlp    2008-11-28 19:47:05 UTC (rev 
4725)
@@ -44,8 +44,7 @@
 
 
        <jar href="jars/axis/commons-discovery-0.2.jar" download="eager"/>
-       <jar href="jars/axis/commons-logging-1.0.4.jar" download="eager"/>
-       <jar href="jars/axis/commons-collections-3.1.jar" download="eager"/>
+  <jar href="jars/axis/commons-collections-3.1.jar" download="eager"/>
        <jar href="jars/axis/commons-lang-2.1.jar" download="eager"/>
        <jar href="jars/axis/jaxrpc.jar" download="eager"/>
 
@@ -67,13 +66,17 @@
        <jar href="jars/axis/xmlsec-1.4.1.jar" download="lazy"/>
        <jar href="jars/axis/xmltooling-trunk-jdk-1.5.jar" download="lazy"/>
 
-       <jar href="jars/axis/log4j-1.2.15.jar" download="eager"/>
        <jar href="jars/axis/wsdl4j-1.5.1.jar" download="eager"/>
        <jar href="jars/axis/slf4j-api-1.4.3.jar" download="lazy"/>
        <jar href="jars/axis/slf4j-simple-1.4.3.jar" download="lazy"/>
        <jar href="jars/axis/velocity-1.5.jar" download="lazy"/>
        <jar href="jars/axis/openws-trunk-jdk-1.5.jar" download="lazy"/>
 
+       <jar href="jars/logging/jcl-over-slf4j-1.5.5.jar" download="eager"/>
+       <jar href="jars/logging/slf4j-api-1.5.5.jar" download="eager"/>
+       <jar href="jars/logging/slf4j-log4j12-1.5.5.jar" download="eager"/>
+       <jar href="jars/logging/log4j-1.2.15.jar" download="eager"/>
+
        <jar href="jars/xml/jdom.jar" download="eager"/>
        <jar href="jars/xml/commons-cli-1.0.jar" download="eager"/>
        <jar href="jars/l2fprod/l2fprod-common-all.jar" download="eager"/>

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLMainComponent.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLMainComponent.java
    2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLMainComponent.java
    2008-11-28 19:47:05 UTC (rev 4725)
@@ -4,20 +4,16 @@
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.GridLayout;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.net.URL;
-import java.text.NumberFormat;
 import java.util.Hashtable;
 
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
 import javax.swing.ButtonModel;
-import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
-import javax.swing.JPanel;
 import javax.swing.JPasswordField;
 import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
@@ -26,6 +22,7 @@
 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;
@@ -39,8 +36,6 @@
 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;
@@ -70,7 +65,7 @@
        protected JTextField windowSize;
        protected JLabel windowSizeLabel;
        
-       protected JFormattedTextField userRTT;
+       protected JTextField userRTT;
        protected JLabel userRTTLabel;
 
        protected JTextField bufferSize;
@@ -98,19 +93,16 @@
        protected JPasswordField password;
        protected JLabel passwordLabel;
 
-       protected JSeparator infoLabelSeparator;
+       protected JSeparator oneWayDelaySeparator;
        
-       protected JLabel infoLabelLine1;
-       protected JLabel infoLabelLine2;
+       protected JLabel oneWayDelayInfoLabel;
        
        protected JSeparator resultSeparator;
        
        protected JTextArea result;
-       
-       protected BWCTLGraphPanel graph;
 
        public BWCTLMainComponent(Component parentComponent, IPerfsonarTab 
psModel) {
-               super(parentComponent, psModel, new GridLayout());
+               super(parentComponent, psModel);
                namePairs.put("ARNES_Ljubljana_JRA1", "Ljubljana_ARNES");
                namePairs.put("BELNET_Gent_JRA1","Gent_BELNET");
                namePairs.put("CARNET_Zagreb_JRA1", "Zagreb_CARNET");
@@ -124,16 +116,15 @@
                namePairs.put("ISTF_Sofia_JRA1", "Sofia_ISTF");
                namePairs.put("RENATER_Paris_JRA1", "none");
                namePairs.put("SURFNet_Amsterdam_JRA1", "Amsterdam_SURFnet");
-               namePairs.put("PSNC_Poznan_JRA1", "Poznan_PSNC");
+               namePairs.put("PSNC_Poznan_JRA1", "Poznan_GEANT");
                namePairs.put("UNINet_Tromsoe_JRA1", "Tromso_UNINet");
        }
        
 
        public void addWidgets() {
-               JPanel panel = new JPanel();
                GridBagConstraints constraints;
-               this.setLayout(new GridLayout());
-               panel.setLayout(new GridBagLayout());
+
+               setLayout(new GridBagLayout());
                constraints = new GridBagConstraints();
                constraints.fill = GridBagConstraints.BOTH;
         constraints.insets = new Insets(2,2,2,2);
@@ -142,30 +133,31 @@
                constraints.gridx = 2;
                constraints.gridy = 0;
                constraints.gridheight = 8;
-               panel.add(leftRightDivider, constraints);
+               add(leftRightDivider, constraints);
                constraints.gridheight = 1;
+
                sourceAddress = new JTextField(getEndpointHost(
                        model.getEndpointList()));
         
                constraints.gridx = 4;
                constraints.gridy = 0;
-               panel.add(sourceAddress, constraints);
+               add(sourceAddress, constraints);
 
                sourceAddressLabel = new JLabel("Source Address");
                sourceAddressLabel.setLabelFor(sourceAddress);
                constraints.gridx -= 1;
-               panel.add(sourceAddressLabel, constraints);
+               add(sourceAddressLabel, constraints);
 
                destinationAddress = new JTextField("");
 
                constraints.gridx = 4;
                constraints.gridy = 1;
-               panel.add(destinationAddress, constraints);
+               add(destinationAddress, constraints);
 
                destinationAddressLabel = new JLabel("Destination Address");
                destinationAddressLabel.setLabelFor(destinationAddress);
                constraints.gridx -= 1;
-               panel.add(destinationAddressLabel, constraints);
+               add(destinationAddressLabel, constraints);
 
                addressTypeIPV4 = new JRadioButton("IPv4");
                addressTypeIPV4.setSelected(true);
@@ -180,21 +172,21 @@
 
                constraints.gridx = 1;
                constraints.gridy = 0;
-               panel.add(addressTypeIPV4, constraints);
+               add(addressTypeIPV4, constraints);
                constraints.gridy = 1;
-               panel.add(addressTypeIPV6, constraints);
+               add(addressTypeIPV6, constraints);
 
                addressTypeLabel = new JLabel("Address type");
                addressTypeLabel.setLabelFor(addressTypeIPV4);
                constraints.gridx = 0;
                constraints.gridy = 0;
-               panel.add(addressTypeLabel, constraints);
+               add(addressTypeLabel, constraints);
 
                addressSeparator = new JSeparator();
                constraints.gridx = 0;
                constraints.gridy = 2;
                constraints.gridwidth = 5;
-               panel.add(addressSeparator, constraints);
+               add(addressSeparator, constraints);
                constraints.gridwidth = 1;
 
                protocolTCP = new JRadioButton("TCP");
@@ -212,69 +204,69 @@
 
                constraints.gridx = 1;
                constraints.gridy = 3;
-               panel.add(protocolTCP, constraints);
+               add(protocolTCP, constraints);
                constraints.gridy = 4;
-               panel.add(protocolUDP, constraints);
+               add(protocolUDP, constraints);
 
                protocolLabel = new JLabel("Transport layer");
                addressTypeLabel.setLabelFor(protocolTCP);
                constraints.gridx = 0;
                constraints.gridy = 3;
-               panel.add(protocolLabel, constraints);
+               add(protocolLabel, constraints);
 
                windowSize = new JTextField("");
                constraints.gridx = 4;
                constraints.gridy = 3;
-               panel.add(windowSize, constraints);
+               add(windowSize, constraints);
 
                windowSizeLabel = new JLabel("TCP Window Size");
                constraints.gridx -= 1;
                windowSizeLabel.setLabelFor(windowSize);
-               panel.add(windowSizeLabel, constraints);
+               add(windowSizeLabel, constraints);
 
-               userRTT = new 
JFormattedTextField(NumberFormat.getNumberInstance());
+               userRTT = new JTextField("");
                constraints.gridx = 4;
                constraints.gridy = 4;
                userRTT.setToolTipText("Note: Either enter RTT manually " +
                                "or retrieve it using IPPM OneWayDelay 
requsets "+
                                "by clicking 'Estimate RTT' command");
-               panel.add(userRTT, constraints);
+               add(userRTT, constraints);
 
-               userRTTLabel = new JLabel("RTT (ms)");
+               userRTTLabel = new JLabel("RTT (s)");
                constraints.gridx -= 1;
                userRTTLabel.setLabelFor(userRTT);
-               panel.add(userRTTLabel, constraints);
+               add(userRTTLabel, constraints);
 
                
                bufferSize = new JTextField("");
                constraints.gridx = 4;
                constraints.gridy = 3;
                bufferSize.setVisible(false);
-               panel.add(bufferSize, constraints);
+               add(bufferSize, constraints);
 
                bufferSizeLabel = new JLabel("UDP Buffer Size");
                constraints.gridx -= 1;
                bufferSizeLabel.setLabelFor(bufferSize);
                bufferSizeLabel.setVisible(false);
-               panel.add(bufferSizeLabel, constraints);
+               add(bufferSizeLabel, constraints);
 
                bandwidth = new JTextField("");
                constraints.gridx = 4;
                constraints.gridy = 4;
                bandwidth.setVisible(false);
-               panel.add(bandwidth, constraints);
+               add(bandwidth, constraints);
 
                bandwidthLabel = new JLabel("Maximum Bandwidth");
                constraints.gridx -= 1;
                bandwidthLabel.setLabelFor(bandwidth);
                bandwidthLabel.setVisible(false);
-               panel.add(bandwidthLabel, constraints);
+               add(bandwidthLabel, constraints);
 
                transportSeparator = new JSeparator();
                constraints.gridx = 0;
                constraints.gridy = 5;
                constraints.gridwidth = 5;
-               panel.add(transportSeparator, constraints);
+               add(transportSeparator, constraints);
                constraints.gridwidth = 1;
 
                duration = new JTextField("");
@@ -283,90 +275,83 @@
                        "results!");
                constraints.gridx = 1;
                constraints.gridy = 6;
-               panel.add(duration, constraints);
+               add(duration, constraints);
 
                durationLabel = new JLabel("Test Duration (s)");
                constraints.gridx -= 1;
                windowSizeLabel.setLabelFor(duration);
-               panel.add(durationLabel, constraints);
+               add(durationLabel, constraints);
 
                interval = new JTextField("");
                constraints.gridx = 4;
                constraints.gridy = 6;
-               panel.add(interval, constraints);
+               add(interval, constraints);
 
                intervalLabel = new JLabel("Reporting Interval (s)");
                constraints.gridx -= 1;
                intervalLabel.setLabelFor(interval);
-               panel.add(intervalLabel, constraints);
+               add(intervalLabel, constraints);
 
                tos = new JTextField("");
                constraints.gridx = 1;
                constraints.gridy = 7;
-               panel.add(tos, constraints);
+               add(tos, constraints);
 
                tosLabel = new JLabel("Type of Service bits");
                constraints.gridx -= 1;
                tosLabel.setLabelFor(tos);
-               panel.add(tosLabel, constraints);
+               add(tosLabel, constraints);
 
                loginSeparator = new JSeparator();
                constraints.gridx = 0;
                constraints.gridy = 8;
                constraints.gridwidth = 5;
-               panel.add(loginSeparator, constraints);
+               add(loginSeparator, constraints);
                constraints.gridwidth = 1;
 
                login = new JTextField("");
                constraints.gridx = 1;
                constraints.gridy = 9;
-               panel.add(login, constraints);
+               add(login, constraints);
 
                loginLabel = new JLabel("BWCTL Login");
                constraints.gridx -= 1;
                loginLabel.setLabelFor(login);
-               panel.add(loginLabel, constraints);
+               add(loginLabel, constraints);
 
                password = new JPasswordField();
                constraints.gridx = 4;
-               panel.add(password, constraints);
+               add(password, constraints);
 
                passwordLabel = new JLabel("Password");
                constraints.gridx -= 1;
                passwordLabel.setLabelFor(password);
-               panel.add(passwordLabel, constraints);
+               add(passwordLabel, constraints);
 
                resultSeparator = new JSeparator();
                constraints.gridx = 0;
                constraints.gridy = 10;
                constraints.gridwidth = 5;
-               panel.add(resultSeparator, constraints);
+               add(resultSeparator, constraints);
                //constraints.gridwidth = 1;
 
-               infoLabelLine1 = new JLabel("Click 'Estimate RTT' to get the 
estimated RTT between two points (based on IPPM OWD)");
+               oneWayDelayInfoLabel = new JLabel("Click 'Estimate RTT' to 
get the estimated RTT between two points (based on IPPM OWD)");
                constraints.gridx = 0;
                constraints.gridy = 11;
                constraints.gridwidth = 5;
                constraints.fill = GridBagConstraints.HORIZONTAL;
-               panel.add(infoLabelLine1, constraints);
+               add(oneWayDelayInfoLabel, constraints);
 
-               infoLabelLine2 = new JLabel("    ");
+               oneWayDelaySeparator = new JSeparator();
                constraints.gridx = 0;
                constraints.gridy = 12;
                constraints.gridwidth = 5;
-               constraints.fill = GridBagConstraints.HORIZONTAL;
-               panel.add(infoLabelLine2, constraints);
+               add(oneWayDelaySeparator, constraints);
                
-               infoLabelSeparator = new JSeparator();
-               constraints.gridx = 0;
-               constraints.gridy = 13;
-               constraints.gridwidth = 5;
-               panel.add(infoLabelSeparator, constraints);
-               
                result = new JTextArea("Result");
                result.setBorder(BorderFactory.createEtchedBorder());
                constraints.gridx = 0;
-               constraints.gridy = 14;
+               constraints.gridy = 13;
                constraints.gridwidth = 5;
                constraints.fill = GridBagConstraints.BOTH;
         //result.setAutoscrolls(true);
@@ -374,31 +359,23 @@
         JScrollPane sp = new JScrollPane(result);
         sp.setBorder(BorderFactory.createTitledBorder("Result"));        
         result.setWrapStyleWord(true);
-//      sp.setPreferredSize(new Dimension(200,200));
-        panel.add(sp, constraints);
-               
-               graph = new BWCTLGraphPanel(this);
-               constraints.gridx = 0;
-               constraints.gridy = 15;
-               constraints.gridwidth = 5;
-               constraints.fill = GridBagConstraints.BOTH;
-//             graph.setPreferredSize(new Dimension(200,300));
-               panel.add(graph,constraints);
+        sp.setPreferredSize(new Dimension(200,200));
+               add(sp, constraints);
 
         Dimension d = new Dimension(128,20);
-//      sourceAddress.setMinimumSize(d);
-//      sourceAddress.setPreferredSize(d);
-//      destinationAddress.setMinimumSize(d);
-//      destinationAddress.setPreferredSize(d);
+        sourceAddress.setMinimumSize(d);
+        sourceAddress.setPreferredSize(d);
+        destinationAddress.setMinimumSize(d);
+        destinationAddress.setPreferredSize(d);
         duration.setMinimumSize(d);
         duration.setPreferredSize(d);
         interval.setMinimumSize(d);
         interval.setPreferredSize(d);
         
-//      d = new Dimension(600,600);
-//      setPreferredSize(d);
-        JScrollPane mainSrcPane = new JScrollPane(panel);
-        add(mainSrcPane);
+        d = new Dimension(300,300);
+        
+        setMinimumSize(d);
+        setPreferredSize(d);
        }
 
        public String getAddressType()
@@ -425,14 +402,12 @@
                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;
                        }
                }
@@ -441,18 +416,9 @@
 
        public void updateDestination()
        {
-               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;
-                       }
-               }
+               destinationAddress.setText(getEndpointHost(
+                       ((BWCTLPerfsonarTab) model).destinations));
+               destinationName = 
getEndpointName(((BWCTLPerfsonarTab)model).destinations);
                resetRTTData();
        }
 
@@ -562,25 +528,7 @@
                }
        }
        public void resetRTTData(){
-               userRTT.setValue(0.0);
-               infoLabelLine1.setText("Click 'Estimate RTT' to get the 
estimated RTT between two points (based on IPPM OWD)");
-               infoLabelLine2.setText("    ");
+               userRTT.setText("");
+               oneWayDelayInfoLabel.setText("Click 'Estimate RTT' to get the 
estimated RTT between two points (based on IPPM OWD)");
        }
-       
-       public void clearInfoLabels(){
-               infoLabelLine1.setText("    ");
-               infoLabelLine2.setText("    ");
-       }
-       
-       public void addValueToGraph(double time, double value){
-               graph.setChartValue(time, value);
-       }
-       
-       public void addAverageToGraph(double startTime, double endTime, 
double value){
-               graph.setAverageValue(startTime, endTime, value);
-       }
-       
-       public void clearGraph(){
-               graph.clearChart();
-       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLPerfsonarTab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLPerfsonarTab.java
     2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLPerfsonarTab.java
     2008-11-28 19:47:05 UTC (rev 4725)
@@ -5,8 +5,7 @@
 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;
 import org.perfsonar.perfsonarui.PerfsonarSchema;
@@ -28,11 +27,7 @@
 public class BWCTLPerfsonarTab extends PerfsonarModel {
 
        protected MAEndpointList destinations;
-       
-       protected int endpointSrcIndex = -1;
 
-       protected int endpointDstIndex = -1;
-
        private BWCTLMainComponent pane;
 
        public BWCTLPerfsonarTab()
@@ -52,6 +47,14 @@
                                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");
+               */
        }
        /**
         * 
@@ -87,7 +90,8 @@
        }
        
        public PerfsonarRequestAction createMetadataRequestAction(){
-               RTTUserData rttUserData = new RTTUserData();
+               AbstractUserData rttUserData = new AbstractUserData();
+               rttUserData.setEndpoint(new 
MAEndpoint("GEANT,http://radagast.x-win.dfn.de:8090/services/MA/HADES/GEANT,ippm,,ippm_aggregated,ippm_aggregated";));
                return new 
SetupDataRequestAction(createSmartRequest(),rttUserData,responseData,"Estimate
 RTT",null,defaultGroupQuery);
        }
        
@@ -121,36 +125,19 @@
         * Override in order not to create a default Options button.
         */
        public PSUIAction createOptionsAction() {
-               
-               ShowEndpointsAction action = new 
ShowEndpointsAction(getDestinations(),"BWCTL Destination"){
-                       
-                       protected JDialog createDialog(){
-                               setEndpointSelected(endpoints, 
endpointDstIndex);
-                               return super.createDialog();
-                       }
-               };
-               
+               ShowEndpointsAction action = new 
ShowEndpointsAction(getDestinations(),"BWCTL Destination");
                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"){
-                        
-                       protected JDialog createDialog(){
-                               setEndpointSelected(endpoints, 
endpointSrcIndex);
-                               return super.createDialog();
-                       }
-               };
-               
+               ShowEndpointsAction action =  new 
ShowEndpointsAction(endpointList, "BWCTL MP/Source");
                action.addListener(new ShowEndpointsAction.Listener() {
-                       
                        public void actionFinished(Collection<MAEndpoint> 
selected) {
                                pane.updateSource();
                        }                               
@@ -172,11 +159,4 @@
                }
                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-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLRequest.java  
2008-11-28 19:47:05 UTC (rev 4725)
@@ -47,8 +47,6 @@
                }
 
                if 
(messageType.equals(IPerfsonarRequest.MA_SetupDataRequest)) {
-                       mainComponent.clearInfoLabels();
-                       mainComponent.infoLabelLine1.setText("Querying 
service");
                        return createSetupDataRequest(uData);
                }
                else {
@@ -236,11 +234,6 @@
 
                /* No error, read normal return data */
                output = new String();
-               mainComponent.clearGraph();
-               String startTime = "";
-               String endTime = mainComponent.duration.getText();
-               double duration = 
Double.parseDouble(mainComponent.duration.getText());
-
                datas = response.getElementsByTagName("nmwg:data");
 
                for (i = 0; i < datas.getLength(); i++)
@@ -250,61 +243,33 @@
                        for (j = 0; j < datums.getLength(); j++)
                        {
                                datum = (Element) datums.item(j);
-                               String interval = 
datum.getAttribute("duration");
-                               String time = interval.split("-")[1];
-                               if(startTime.equals("")) startTime = time;
-                               String value = datum.getAttribute("value");   
  
-//                             output = output +
-//                                     "Interval: " +
-//                                     datum.getAttribute("duration") +
-//                                     " Transferred: " +
-//                                     datum.getAttribute("numBytes") + " " +
-//                                     datum.getAttribute("numBytesUnits") +
-//                                     " / " +
-//                                     datum.getAttribute("value") +
-//                                     " " +
-//                                     datum.getAttribute("valueUnits") +
-//                                     "\n";
-                               output = output + "Interval: 
"+datum.getAttribute("duration")+" Transferred: ";
-                               String units1 = 
datum.getAttribute("numBytesUnits");
-                               String value1 = 
datum.getAttribute("numBytes");
-                               Long transferred = Long.parseLong(value1);
-                               if(units1.equals("Bytes")){
-                                       transferred/=(1024*1024);
-                                       output = output+transferred+" MB ";
-                               }
-                               output = output+"("+value1+" "+units1+") / ";
-                               String units2 = 
datum.getAttribute("valueUnits");
-                               String value2 = datum.getAttribute("value");
-                               Long througput = Long.parseLong(value2);
-                               if(units2.equals("bits/sec")){
-                                       througput/=(1000*1000);
-                                       output = output+througput+" Mbps ";
-                               }
-                               output = output+"("+value2+" "+units2+")\n";
-                               
if(!(interval.startsWith("0.0")&&Double.parseDouble(time)>=duration)){
-                                       
mainComponent.addValueToGraph(Double.parseDouble(time), 
Double.parseDouble(value)/(1000*1000));
-                               }
-                               else{
-                                       
if(!mainComponent.interval.getText().equals(""))mainComponent.addAverageToGraph(Double.parseDouble(startTime),Double.parseDouble(endTime),Double.parseDouble(value)/(1000*1000));
-                                       else 
mainComponent.infoLabelLine2.setText("Graph is not displayed because no 
reporting interval value was entered");
-                               }
+                               output = output +
+                                       "Interval: " +
+                                       datum.getAttribute("duration") +
+                                       " Transferred: " +
+                                       datum.getAttribute("numBytes") + " " +
+                                       datum.getAttribute("numBytesUnits") +
+                                       " / " +
+                                       datum.getAttribute("value") +
+                                       " " +
+                                       datum.getAttribute("valueUnits") +
+                                       "\n";
                        }
                        if(mainComponent.protocolTCP.isSelected()){
-                               Double rtt = 
(Double)mainComponent.userRTT.getValue();
+                               Double rtt = 0.0;
                                Double window = 0.0;
                                Double maxBW = 0.0;
-                               try{
+                               try {
+                                       rtt = 
Double.parseDouble(mainComponent.userRTT.getText());
                                        window = 
Double.parseDouble(mainComponent.windowSize.getText());
-                               }catch(NumberFormatException e){
-                                       
mainComponent.infoLabelLine1.setText("Window size cannot be converted from 
string to number");
+                               }catch (NumberFormatException e){
+                                       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) 
mainComponent.infoLabelLine1.setText("Expected maximum theoretical bandwidth 
(TCP window size * RTT) is: " + maxBWLong + " bits/sec ("+ 
maxBWLong/(1000*1000) +" Mbits/sec)");
-                               else mainComponent.infoLabelLine1.setText("If 
you wish to see the Expected maximum theoretical bandwidth (TCP window size * 
RTT) both RTT value and a window size must be entered");
+                               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";
                        }
                }
                mainComponent.result.setText(output);
@@ -314,7 +279,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;
@@ -333,7 +298,7 @@
                        return null;
                }
                return stringOutput.toString();
-       }*/
+       }
 
        private void setQueryEndpoint(String address, String type,
                Document request, String target)
@@ -367,7 +332,7 @@
                }
        }
 
-       /*private void setQueryParameter(String name, String value,
+       private void setQueryParameter(String name, String value,
                Document request)
        {
                NodeList nodes;
@@ -382,6 +347,7 @@
                nodes = request.getElementsByTagName("nmwg:parameters");
                if (nodes.getLength() != 1)
                {
+                       /* Malformed request template */
                        return;
                }
                parameterRoot = (Element) nodes.item(0);
@@ -391,7 +357,7 @@
                parameterElement.setAttribute("value", value);
 
                parameterRoot.appendChild(parameterElement);
-       }*/
+       }
 
 
         private void setQueryParameter(String name, String value, String ns,
@@ -411,6 +377,7 @@
                 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-28 19:13:08 UTC (rev 4724)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTRequest.java  
  2008-11-28 19:47:05 UTC (rev 4725)
@@ -1,11 +1,19 @@
 package org.perfsonar.perfsonarui.bwctl;
 
+import java.net.URL;
 import java.text.DecimalFormat;
 import java.util.Calendar;
+import java.util.LinkedList;
 
+import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.soap.SOAPEnvelope;
 
+
+import org.apache.axis.Message;
+import org.apache.axis.client.Call;
+import org.apache.axis.message.SOAPBodyElement;
 import org.perfsonar.perfsonarui.AbstractMARequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarResponse;
@@ -17,9 +25,17 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-public class RTTRequest extends AbstractMARequest{
+public class RTTRequest extends AbstractMARequest {
        public static final String REQUEST_TYPE = "ippm";
+       public static final int DELAY_MEASUREMENTS = 2;
+       protected LinkedList<Double> delays;
+       protected RTTUserData forward;
+       protected RTTUserData backward;
+       protected SOAPBodyElement requestMessageFwd;
+       protected SOAPBodyElement requestMessageBck;
        protected IPerfsonarResponse response;
+       protected Call callFwd;
+       protected Call callBck;
        protected int timeout = 10000; //10 sec
 
 
@@ -27,8 +43,10 @@
 
        public RTTRequest(BWCTLMainComponent pane){
                super();
-               this.mainComponent = pane;
-               this.query = new 
RTTUserData(mainComponent.getSourceName(),mainComponent.getDestinationName());
+               mainComponent = pane;
+               delays = new LinkedList<Double>();
+               forward = new 
RTTUserData(mainComponent.getSourceName(),mainComponent.getDestinationName());
+               backward = new 
RTTUserData(mainComponent.getDestinationName(),mainComponent.getSourceName());
        }
 
        public Document createRequest(MAEndpoint endpoint,
@@ -46,18 +64,131 @@
                }
 
                if 
(messageType.equals(IPerfsonarRequest.MA_SetupDataRequest)) {
-                       if(RTTDelays.getInstance().getRecievedDelays()==0) 
return 
createIPPMDataRequest(((RTTUserData)query).getSourceName(),((RTTUserData)query).getDestinationName());
-                       else return 
createIPPMDataRequest(((RTTUserData)query).getDestinationName(), 
((RTTUserData)query).getSourceName());
+                       return 
createIPPMDataRequest(((RTTUserData)uData).getSourceName(),((RTTUserData)uData).getDestinationName());
                }
                else {
                        throw new Exception("Unknown message type! " +
                                messageType);
                }
        }
+
+
+       @Override
+       public void makeRequest(MAEndpoint endpoint, IUserData uData,
+                       String messageType, IPerfsonarResponse response, 
boolean runInThread) {
+        try {
+               forward.setSourceName(mainComponent.getSourceName());
+               
forward.setDestinationName(mainComponent.getDestinationName());
+               backward.setSourceName(mainComponent.getDestinationName());
+               backward.setDestinationName(mainComponent.getSourceName());
+                       this.response = response;
+                       if (callFwd == null) {
+                               callFwd = (Call)service.createCall();
+                       }
+                       
+                   callFwd.setTargetEndpointAddress(new 
URL(endpoint.getEndpoint()));
+                   callFwd.setOperationName(new QName(URI_SOAP,"submit"));
+                       if (callBck == null) {
+                               callBck = (Call)service.createCall();
+                       }
+                   callBck.setTargetEndpointAddress(new 
URL(endpoint.getEndpoint()));
+                   callBck.setOperationName(new QName(URI_SOAP,"submit"));
        
+                   Document requestForward = 
createRequest(forward,messageType);
+                   requestMessageFwd = new 
SOAPBodyElement(requestForward.getDocumentElement());
+                   Document requestBackward = 
createRequest(backward,messageType);
+                   requestMessageBck = new 
SOAPBodyElement(requestBackward.getDocumentElement());
+
+                   queries = null;
+                   if (runInThread)  {
+                           Thread t = new Thread(this,endpoint.getTitle());
+                           t.start();
+                   } else run();
+    
+        } catch (Exception x) {
+            logger.error(x);
+            fireAxisCallException(uData, x);
+        }
+       }
+
+    public void run() {
+           long startTime = System.currentTimeMillis();
+           setInterrupted(false);
+       
+           Object resultObjectFwd = null;
+           Object resultObjectBck = null;
+           try{
+                               addPropertyChangeListener(response);
+                       fireAxisCallInitiated(forward);
+                       logger.debug("Sending request to\t" + 
forward.getEndpoint());
+                       logger.debug(requestMessageFwd);
+                
+                       callFwd.setTimeout(new Integer(timeout)); 
+                logger.debug("Timeout set to "+callFwd.getTimeout());
+                
+                SOAPEnvelope envelopeFwd = 
prepareEnvelope(requestMessageFwd);
+                
+                long now = System.currentTimeMillis();
+                if (envelopeFwd != null) {
+                       resultObjectFwd = callFwd.invoke(new 
Message(envelopeFwd));
+                } else
+                       resultObjectFwd = callFwd.invoke(new Object[] 
{requestMessageFwd});
+                
+                requestMessageFwd = null;
+                
+                logger.info("Axis call completed in 
"+(System.currentTimeMillis()-now)+" ms.");
+                
+                if (!isInterrupted()) {
+                    logger.debug("request completed");
+                       fireAxisCallCompleted(forward);
+                       fireAxisCallResult(forward, resultObjectFwd);
+                }
+                
+                addPropertyChangeListener(response);
+                       fireAxisCallInitiated(backward);
+                       logger.debug("Sending request to\t" + 
backward.getEndpoint());
+                       logger.debug(requestMessageBck);
+                
+                       callBck.setTimeout(new Integer(timeout));
+                logger.debug("Timeout set to "+callBck.getTimeout());
+                
+                SOAPEnvelope envelopeBck = 
prepareEnvelope(requestMessageBck);
+                
+                now = System.currentTimeMillis();
+                if (envelopeBck != null) {
+                       resultObjectBck = callBck.invoke(new 
Message(envelopeBck));
+                } else
+                       resultObjectBck = callBck.invoke(new Object[] 
{requestMessageBck});
+
+                requestMessageBck = null;
+                
+                logger.info("Axis call completed in 
"+(System.currentTimeMillis()-now)+" ms.");
+                
+                if (!isInterrupted()) {
+                    logger.debug("request completed");
+                       fireAxisCallCompleted(backward);
+                       fireAxisCallResult(backward, resultObjectBck);
+                }
+
+               }catch(Exception e){
+               if (!isInterrupted()) {
+                    logger.error("request exception");
+                    if (queries != null) 
+                        fireAxisCallException(queries, e);
+                    else
+                        fireAxisCallException(forward, e);
+                       fireAxisCallException(backward, e);
+               }
+            }
+            forward.setServiceTime(System.currentTimeMillis()-startTime);
+            backward.setServiceTime(System.currentTimeMillis()-startTime);
+            queries = null;
+    }
+    
        private Document createIPPMDataRequest(String sourceName, String 
destinationName)
                throws Exception
                {
+                       
                        DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
                factory.setNamespaceAware(true);
                            
@@ -175,15 +306,6 @@
                NodeList datums;
                Element datum;
 
-               /*
-                * 
-                * 
-                * NEED TO PROCESS THE ERRORS
-                * 
-                * 
-                * */
-               
-               
                datas = response.getElementsByTagName("nmwg:data");
                for (int i = 0; i < datas.getLength(); i++)
         {
@@ -195,34 +317,20 @@
                        String mes = datum.getAttribute("med_delay");
                        if(!mes.equals("")){
                                last_med_delay=Double.parseDouble(mes);
-                               last_med_delay*=1000;
                        }
-                       RTTDelays.getInstance().addDelay(last_med_delay);
+                       delays.add(last_med_delay);
                }
-               DecimalFormat fourDigits = new DecimalFormat("0.0000");
-               if(RTTDelays.getInstance().getRecievedDelays() == 1){
-                       Double rtt = RTTDelays.getInstance().getSrc2Dst();
+               if(delays.size() == DELAY_MEASUREMENTS){
+                       Double rtt = delays.get(0) + delays.get(1);
                        if(rtt == 0.0){
-                               mainComponent.infoLabelLine1.setText("No Src 
to Dst measurement available");
+                               
mainComponent.oneWayDelayInfoLabel.setText("No RTT measurement available");
                        }
                        else {
-                               mainComponent.infoLabelLine1.setText("Src to 
Dst delay ("+fourDigits.format(rtt)+")");
+                               DecimalFormat fourDigits = new 
DecimalFormat("0.0000");
+                               
mainComponent.oneWayDelayInfoLabel.setText("Estimated RTT 
"+fourDigits.format(rtt)+" = Src to Dst delay 
("+fourDigits.format(delays.get(0))+") + Dst to Src delay 
("+fourDigits.format(delays.get(1))+")");
+                               
mainComponent.userRTT.setText(fourDigits.format(rtt));
                        }
                }
-               else if(RTTDelays.getInstance().getRecievedDelays() == 2){
-                       Double rtt1 = RTTDelays.getInstance().getSrc2Dst();
-                       Double rtt2 = RTTDelays.getInstance().getDst2Src();
-                       if(rtt1 == 0.0){
-                               mainComponent.infoLabelLine1.setText("No Src 
to Dst measurement available");
-                       }
-                       if(rtt2 == 0.0){
-                               mainComponent.infoLabelLine2.setText("No Dst 
to Src measurement available");
-                       }
-                       if(rtt1!=0 && rtt2!=0) {
-                               mainComponent.infoLabelLine1.setText("Src to 
Dst delay ("+fourDigits.format(rtt1)+"); Dst to Src delay 
("+fourDigits.format(rtt2)+")");
-                               mainComponent.infoLabelLine2.setText("Total 
estimated RTT ("+fourDigits.format(rtt1+rtt2)+")");
-                               mainComponent.userRTT.setValue(rtt1+rtt2);
-                       }
-               }
        }
+
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTUserData.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTUserData.java 
  2008-11-28 19:13:08 UTC (rev 4724)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/RTTUserData.java 
  2008-11-28 19:47:05 UTC (rev 4725)
@@ -2,39 +2,21 @@
 
 import org.perfsonar.perfsonarui.AbstractUserData;
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
-import org.perfsonar.perfsonarui.plugins.MAEndpointList;
 
 public class RTTUserData extends AbstractUserData {
        
-       private static final long serialVersionUID = 6650070627813545094L;
        protected String sourceName;
        protected String destinationName;
+       protected MAEndpoint serviceEndpoint;
        
        public RTTUserData(){
-               this.endpoints = new MAEndpointList(){
-                   public void add(MAEndpoint endpoint) {
-                       list.add(endpoint);
-                       endpoint.addObserver(this);
-                       setChanged();
-                       notifyObservers(endpoint);
-                   }
-
-               };
-               MAEndpoint serviceEndpointF = new 
MAEndpoint("GEANT,http://radagast.x-win.dfn.de:8090/services/MA/HADES/GEANT,ippm,,ippm_aggregated,ippm_aggregated";);
-               MAEndpoint serviceEndpointB = new 
MAEndpoint("GEANT,http://radagast.x-win.dfn.de:8090/services/MA/HADES/GEANT,ippm,,ippm_aggregated,ippm_aggregated";);
-
-               this.endpoints.add(serviceEndpointF);
-               this.endpoints.add(serviceEndpointB);
+               serviceEndpoint = new 
MAEndpoint("GEANT,http://radagast.x-win.dfn.de:8090/services/MA/HADES/GEANT,ippm,,ippm_aggregated,ippm_aggregated";);
        }
        
        public RTTUserData(String src, String dst){
                sourceName = src;
                destinationName = dst;
-               MAEndpoint serviceEndpointF = new 
MAEndpoint("GEANT,http://radagast.x-win.dfn.de:8090/services/MA/HADES/GEANT,ippm,,ippm_aggregated,ippm_aggregated";);
-               MAEndpoint serviceEndpointB = new 
MAEndpoint("GEANT,http://radagast.x-win.dfn.de:8090/services/MA/HADES/GEANT,ippm,,ippm_aggregated,ippm_aggregated";);
-
-               this.endpoints.add(serviceEndpointF);
-               this.endpoints.add(serviceEndpointB);
+               serviceEndpoint = new 
MAEndpoint("GEANT,http://radagast.x-win.dfn.de:8090/services/MA/HADES/GEANT,ippm,,ippm_aggregated,ippm_aggregated";);
        }
        
        public String getSourceName() {
@@ -49,6 +31,11 @@
        public void setDestinationName(String dst) {
                destinationName = dst;
        }
-       
+       public MAEndpoint getEndpoint() {
+               return serviceEndpoint;
+       }
+       public void setEndpoint(MAEndpoint endpoint) {
+               serviceEndpoint = endpoint;
+       }
 
 }

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf   
2008-11-28 19:13:08 UTC (rev 4724)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/config/MA.conf   
2008-11-28 19:47:05 UTC (rev 4725)
@@ -25,7 +25,6 @@
 
;RIPE,http://gandalf.rrze.uni-erlangen.de:8090/gandalf/Hades/perfSONAR/MA,ippm,,ripe,ripe
 
;MDM,http://radagast.x-win.dfn.de:8090/services/MA/HADES/MDM,ippm,,ippm_aggregated,ippm_aggregated
 ;RIPE,http://radagast.x-win.dfn.de:8090/services/MA/RIPE,ippm,,ripe,ripe
-GEANT-STATUS,http://radagast.rrze.uni-erlangen.de:3070/services/MA/HADES/STATUS,ippmstatus,,http://ggf.org/ns/nmwg/tools/hades/traceroute/aggregated/2.0,http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0
 
;ARNES_Ljubljana_JRA1,http://193.2.63.2:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
 
;BELNET_Gent_JRA1,http://193.191.172.162:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl
 
;CARNET_Zagreb_JRA1,http://193.198.229.166:8090/services/MP/BWCTL,bwctl,"",bwctl,bwctl

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
     2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
     2008-11-28 19:47:05 UTC (rev 4725)
@@ -63,12 +63,6 @@
  *
  */
 public class IPPMPerfsonarModel extends PerfsonarModel {
-       protected MAEndpointList hopsEndpoint = null;
-       
-       public MAEndpoint getHopsEndpoint() {
-               return hopsEndpoint.get(0);
-       }
-
        ITimeSetAction timeAction = null;
        public static long timeIntervals[] = {  //seconds
            24*60*60, //24 hour
@@ -87,7 +81,6 @@
        }       
        public IPPMPerfsonarModel(MAEndpointList endpoints) {
                super(endpoints);
-               hopsEndpoint = createHoplistEndpoints();
            int enabledEndpoint = -1;
            endpointList.setMultipleEndpoints(false);
            for (int i=0; i < endpointList.size(); i++) {
@@ -193,14 +186,13 @@
                        public IPerfsonarRequest createMARequest(MAEndpoint 
endpoint) {
                                IPerfsonarSchema schema = 
endpoint.getSchema();
                                if (schema.equals(IPPMRequest.requestType)) 
return new IPPMRequest();
-                               if 
(schema.equals("http://ggf.org/ns/nmwg/tools/hades/traceroute";)) return new 
HoplistRequest();
                                else return null;
                        }                       
                };
        }
        @Override
        public ITimeValueResponse createTimeValueResponseListener() {
-        PerfsonarHoplistTimeSeriesDataset ifDataset = new 
PerfsonarHoplistTimeSeriesDataset();
+        PerfsonarTimeSeriesDataset ifDataset = new 
PerfsonarTimeSeriesDataset();
         for (int m=0; m < IPPMRequest.measurements.length; m++)
             for (int i=0; i < IPPMRequest.measurements[m].length; i++) {
                 PerfsonarTimeSeries series;
@@ -212,33 +204,8 @@
                 
             }
 
-//        for (int i=1; i <= 10; i++) {
-            PerfsonarTimeSeries series;
-            series = new PerfsonarTimeSeries("Route"+1);
-            ifDataset.addSeries("Route"+1,series);
-//        }
            return ifDataset;
        }
-
-       /**
-        * This is a bit of hack; have to be changed when we start using 
Lookup Service...
-        * Also , it will not reflect changing the endpoints via the UI.
-        * @return
-        */
-       public MAEndpointList createHoplistEndpoints() {
-               
-           ArrayList<IPerfsonarSchema> supported = new 
ArrayList<IPerfsonarSchema>();
-               
supported.add(PerfsonarSchema.getInstance("http://ggf.org/ns/nmwg/tools/hades/traceroute";));
-               
-           MAEndpointList endpoints = new MAEndpointList(new 
File("MA.conf"),supported);
-           if (endpoints.size() == 0) {
-               MAEndpoint hopsEndpoint = new 
MAEndpoint("GEANT-STATUS,http://radagast.rrze.uni-erlangen.de:3070/services/MA/HADES/STATUS,http://ggf.org/ns/nmwg/tools/hades/traceroute,,http://ggf.org/ns/nmwg/tools/hades/traceroute/aggregated/2.0,http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0";);
-               endpoints.add(hopsEndpoint);
-           }   
-           return endpoints;
-       }
-
-       
        public MAEndpointList createEndpoints() {
            MAEndpointList endpoints = new MAEndpointList(new 
File("MA.conf"),getSupportedRequests());
            if (endpoints.size() == 0) {

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMRequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMRequest.java  
  2008-11-28 19:13:08 UTC (rev 4724)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMRequest.java  
  2008-11-28 19:47:05 UTC (rev 4725)
@@ -66,8 +66,8 @@
         {"duplicates","loss"}
         };
     public static final String[] measurement_title = {
-        "IPDV (ms)",
-        "Delay(ms)",
+        "IPDV (s)",
+        "Delay(s)",
         "Loss/Dups"
         };    
     protected static final String[] type_classes = {

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/PSDelayDatum.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/PSDelayDatum.java 
  2008-11-28 19:13:08 UTC (rev 4724)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/PSDelayDatum.java 
  2008-11-28 19:47:05 UTC (rev 4725)
@@ -29,7 +29,6 @@
 
 package org.perfsonar.perfsonarui.ippm;
 
-import org.perfsonar.perfsonarui.UnsupportedTypeException;
 import org.perfsonar.perfsonarui.plugins.PSCountsDatum;
 
 /**
@@ -38,16 +37,9 @@
  * <b>Modified</b> Jun 5, 2008
  */
 public class PSDelayDatum extends PSCountsDatum {
-    protected static final String units = "ms";
+    protected static final String units = "s";
     @Override
     public String getDefaultType() {
         return units;
     }
-    
-    @Override
-    public void setValue(String value) throws UnsupportedTypeException {
-       super.setValue(value);
-       this.value = this.value*1000;
-    }
-
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/PSJitterDatum.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/PSJitterDatum.java  
2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/PSJitterDatum.java  
2008-11-28 19:47:05 UTC (rev 4725)
@@ -29,19 +29,12 @@
 
 package org.perfsonar.perfsonarui.ippm;
 
-import org.perfsonar.perfsonarui.UnsupportedTypeException;
 import org.perfsonar.perfsonarui.plugins.PSCountsDatum;
 
 public class PSJitterDatum extends PSCountsDatum {
-    protected static final String units="ms";
+    protected static final String units="?";
     @Override
     public String getDefaultType() {
         return units;
     }
-    
-    @Override
-    public void setValue(String value) throws UnsupportedTypeException {
-       super.setValue(value);
-       this.value = this.value*1000;
-    }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMPairsTablePanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMPairsTablePanel.java
  2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMPairsTablePanel.java
  2008-11-28 19:47:05 UTC (rev 4725)
@@ -50,7 +50,6 @@
 import org.perfsonar.perfsonarui.ippm.IPPMPairsTableModel;
 import org.perfsonar.perfsonarui.ippm.IPPMUserData;
 import org.perfsonar.perfsonarui.plugins.IUserData;
-import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.ui.actions.ITimeSet;
 import org.perfsonar.perfsonarui.ui.actions.ITimeSetAction;
 import org.perfsonar.perfsonarui.ui.actions.SetupDataRequestAction;
@@ -72,11 +71,9 @@
        protected IPPMUserData query;
        protected int cellSize = 16;
        protected ITimeSetAction timeAction = null;
-       protected MAEndpoint hopsEndpoint;
        
-       public IPPMPairsTablePanel(IPPMMetaDataList mpoints, IPPMUserData 
query, ITimeSetAction action, MAEndpoint hopsEndpoint) {
+       public IPPMPairsTablePanel(IPPMMetaDataList mpoints, IPPMUserData 
query, ITimeSetAction action) {
                super(new BorderLayout());
-               this.hopsEndpoint = hopsEndpoint;
                this.query = query;
                mpoints.addObserver(this);
                model = new IPPMPairsTableModel(mpoints,query);
@@ -172,12 +169,7 @@
                query.setQuery(IPPMUserData.IFNAME_DST, 
pair.getResponse(IPPMUserData.IFNAME_DST));
            if (timeAction != null) {
                pair.makeQueryFromResponse();
-               pair.setEndpoint(null);
-               for (MAEndpoint endpoint:query.getEndpoints())
-                       pair.addEndpoint(endpoint);
-
-               pair.addEndpoint(hopsEndpoint);
-               
+               pair.setEndpoint(query.getFirstEndpoint());
                ((SetupDataRequestAction)timeAction).setUserData(pair);
                timeAction.actionPerformed(null);
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMResponseChartPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMResponseChartPanel.java
       2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMResponseChartPanel.java
       2008-11-28 19:47:05 UTC (rev 4725)
@@ -25,13 +25,10 @@
 import java.text.SimpleDateFormat;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
 import org.jfree.chart.ChartColor;
-import org.jfree.chart.ChartMouseEvent;
-import org.jfree.chart.ChartMouseListener;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.axis.DateAxis;
 import org.jfree.chart.axis.NumberAxis;
@@ -40,12 +37,8 @@
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.renderer.xy.XYItemRenderer;
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
-import org.jfree.chart.renderer.xy.XYStepAreaRenderer;
-import org.jfree.data.general.DatasetChangeEvent;
 import org.jfree.ui.RectangleInsets;
-import org.perfsonar.perfsonarui.ippm.HoplistRoutes;
 import org.perfsonar.perfsonarui.ippm.IPPMRequest;
-import org.perfsonar.perfsonarui.ippm.PerfsonarHoplistTimeSeriesDataset;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.ui.panels.PerfsonarTimeSeries;
 import org.perfsonar.perfsonarui.ui.panels.PerfsonarTimeSeriesDataset;
@@ -56,12 +49,11 @@
  * @author Nina Jeliazkova 

  * <b>Modified</b> 2006-3-7
  */
-public class IPPMResponseChartPanel extends 
ResponseChartPanel<PerfsonarTimeSeries> implements ChartMouseListener{
+public class IPPMResponseChartPanel extends 
ResponseChartPanel<PerfsonarTimeSeries> {
        protected XYPlot[] plots = null;
-       IPerfsonarTab psModel;
+
        protected Hashtable<String,Integer> lookup;
        protected Hashtable<String,Color> colorLookup;
-       private int routeSeriesCounter;
     /**
      * Comment for <code>serialVersionUID</code>
      */
@@ -114,12 +106,6 @@
         setTitle("");
 
     }
-    
-       public void datasetChanged(DatasetChangeEvent arg0) {
-               super.datasetChanged(arg0);
-               chartPanel.restoreAutoBounds();
-       }
-    
     protected void preparePlots() {
                dateAxis = new DateAxis("", TimeZone.getDefault(), 
Locale.getDefault());
                dateAxis.setAutoRange(true);
@@ -127,7 +113,7 @@
                
        lookup = new Hashtable<String,Integer>();
         colorLookup = new Hashtable<String,Color>();
-        plots = new XYPlot[IPPMRequest.measurements.length+1];
+        plots = new XYPlot[IPPMRequest.measurements.length];
         for (int m=0; m < IPPMRequest.measurements.length;m++)
             for (int i=0; i < IPPMRequest.measurements[m].length;i++) {
 
@@ -160,96 +146,94 @@
                 colorLookup.put(IPPMRequest.measurements[m][i], Color.BLACK);
             } else colorLookup.put(IPPMRequest.measurements[m][i], 
Color.ORANGE);            
        }
-        bitAxis = new NumberAxis("Routes");
-               bitAxis.setAutoRange(true);
-               bitAxis.setAxisLinePaint(gridColor);
-               bitAxis.setTickMarkPaint(gridColor);
-               bitAxis.setTickUnit(new NumberTickUnit(1));
-               bitAxis.setTickMarksVisible(true);
-               bitAxis.setAutoRangeIncludesZero(false);
-               plots[IPPMRequest.measurements.length] = new 
XYPlot(null,dateAxis,bitAxis,new XYStepAreaRenderer());
+        /*
+       for (int i=0; i < 4; i++) {
+               
+                       bitAxis = new NumberAxis("IPDV (ms)");
+                       bitAxis.setAutoRange(true);
+                       bitAxis.setAxisLinePaint(gridColor);
+                       bitAxis.setTickMarkPaint(gridColor);
+                       bitAxis.setTickMarksVisible(true);
+                       bitAxis.setAutoRangeIncludesZero(false);
+                       
+                       ipdvPlot = new XYPlot(null,dateAxis,bitAxis,new 
XYLineAndShapeRenderer(true,false));
+                       ipdvPlot.setRangeAxis(bitAxis);                 
+                       ipdvPlot.setDomainAxis(dateAxis);
+               lookup.put(IPPMRequest.types[i],"ipdv");
+       }
+       for (int i=8; i < IPPMRequest.types.length; i++) {
+                       bitAxis = new NumberAxis("Loss/Dups"); 
//(loss/duplicates) "Packet counts"
 
-        for(int i = 1; i<=50; i++){
-                       lookup.put("Route"+i,new 
Integer(IPPMRequest.measurements.length));
-        }
-        
-        colorLookup.put("Route1", ChartColor.LIGHT_GREEN);
-        colorLookup.put("Route2", ChartColor.LIGHT_BLUE);
-        colorLookup.put("Route3", ChartColor.LIGHT_CYAN);
-        colorLookup.put("Route4", ChartColor.LIGHT_YELLOW);
-        colorLookup.put("Route5", ChartColor.LIGHT_RED);
-        colorLookup.put("Route6", ChartColor.LIGHT_MAGENTA);
-        colorLookup.put("Route7", ChartColor.LIGHT_GRAY);
-        colorLookup.put("Route8", ChartColor.DARK_GREEN);
-        colorLookup.put("Route9", ChartColor.DARK_RED);
-        colorLookup.put("Route10", ChartColor.VERY_DARK_BLUE);             
-        
-        HoplistRoutes.getInstance().registerChart(this);
-        routeSeriesCounter = 1;
+                       bitAxis.setAutoRange(true);
+                       bitAxis.setAxisLinePaint(gridColor);
+                       bitAxis.setTickMarkPaint(gridColor);
+                       bitAxis.setTickMarksVisible(true);
+                       bitAxis.setAutoRangeIncludesZero(false);
+                       
bitAxis.setStandardTickUnits(NumberAxis.createIntegerTickUnits()); 
+                       
+                       packetPlot = new XYPlot(null,dateAxis,bitAxis,new 
XYLineAndShapeRenderer(true,false));
+                       packetPlot.setRangeAxis(bitAxis);
+                       packetPlot.setDomainAxis(dateAxis);
+               lookup.put(IPPMRequest.types[i],"packet");
+       }
+        */
+       
+
+               
     }
     @Override
        public void addWidgets(IPerfsonarTab psModel, 
PerfsonarTimeSeriesDataset ifDataset) {
        super.addWidgets(psModel, ifDataset);
                chartPanel.setDomainZoomable(true);
                chartPanel.setRangeZoomable(true);
-       chartPanel.addChartMouseListener(this);
+               
+               
+               
     }
-
-    
     /* (non-Javadoc)
      * @see 
org.perfsonar.perfsonarui.ui.panels.ResponseChartPanel#createChart(java.util.Hashtable)
      */
     @Override
        protected JFreeChart createChart(IPerfsonarTab 
psModel,Hashtable<String,PerfsonarTimeSeries> datasets) {
        preparePlots();
-               this.psModel = psModel;
+               
                CombinedDomainXYPlot plot = new 
CombinedDomainXYPlot(dateAxis);
                plot.setInsets(new RectangleInsets(20,50,20,20));
                XYPlot subplot = null;
                int n = 0;
                Enumeration<String> keys = datasets.keys();
                while (keys.hasMoreElements()) {
-                       String type = keys.nextElement();
+                   Object type = keys.nextElement();
                    Integer plotType = lookup.get(type);
+                   
             if (plotType == null) continue;
-            else if (plotType != 3) {
-               subplot = plots[plotType.intValue()];
-                           PerfsonarTimeSeries series = datasets.get(type);
-                           int seriesN = 0;
-                           if (subplot.getDataset() == null) {
-                               subplot.setDataset(series);
-                           } else {    
-                               seriesN = subplot.getDatasetCount();
-                               
subplot.setDataset(subplot.getDatasetCount(),series);
-                           }   
-                           
-                           XYItemRenderer renderer;
-                               renderer = new 
XYLineAndShapeRenderer(true,false);
-                               Color clr = colorLookup.get(type);
-                           renderer.setSeriesPaint(0,clr);
-                           subplot.setRenderer(seriesN,renderer);
-       
-                           n++;
-            }
-            else{
-               subplot = plots[plotType.intValue()];
-                           PerfsonarTimeSeries series = datasets.get(type);
-                           int seriesN = 0;
-                           if (subplot.getDataset() == null) {
-                               subplot.setDataset(series);
-                           } else {    
-                               seriesN = subplot.getDatasetCount();
-                               
subplot.setDataset(subplot.getDatasetCount(),series);
-                           }   
-                           
-                           XYItemRenderer renderer;
-                               renderer = new XYStepAreaRenderer();
-                               Color clr = colorLookup.get(type);
-                           renderer.setSeriesPaint(0,clr);
-                           subplot.setRenderer(seriesN,renderer);
-       
-                           n++;
-            }
+            subplot = plots[plotType.intValue()];
+            /*
+                   if (plotType.equals("owd")) subplot = owdPlot;
+                   else if (plotType.equals("ipdv")) subplot = ipdvPlot;
+                   else if (plotType.equals("packet")) subplot = packetPlot;
+                   else continue;
+            */
+                   
+                   //subplot = (XYPlot)lookup.get(type);
+                   
+                   PerfsonarTimeSeries series = datasets.get(type);
+                   int seriesN = 0;
+                   if (subplot.getDataset() == null) {
+                       subplot.setDataset(series);
+                   } else {    
+                       seriesN = subplot.getDatasetCount();
+                       subplot.setDataset(subplot.getDatasetCount(),series);
+                   }   
+                   
+                   XYItemRenderer renderer;
+                       renderer = new XYLineAndShapeRenderer(true,false);
+                       Color clr = colorLookup.get(type);
+                   renderer.setSeriesPaint(0,clr);
+                   subplot.setRenderer(seriesN,renderer);
+
+                   n++;
+
                }
         for (int i=0; i < plots.length;i++)
             plot.add(plots[i]);
@@ -261,64 +245,4 @@
                return result;
                
     }
-    
-    public void addRouteSeries(){
-       List plots = ((CombinedDomainXYPlot)chart.getPlot()).getSubplots();
-               XYPlot current = (XYPlot)plots.get(3);
-               int index = ++routeSeriesCounter;
-
-               PerfsonarTimeSeries series;
-               series = new PerfsonarTimeSeries("Route"+index);
-               ifDataset.addSeries("Route"+index,series);
-
-               current.setDataset(index-1,series);
-               XYItemRenderer renderer;
-               renderer = new XYStepAreaRenderer();
-               Color clr = colorLookup.get("Route"+index);
-               renderer.setSeriesPaint(0,clr);
-               current.setRenderer(index-1,renderer);
-    }
-    
-    public void removeRouteSeries(){
-       List plots = ((CombinedDomainXYPlot)chart.getPlot()).getSubplots();
-               XYPlot current = (XYPlot)plots.get(3);
-               
-               for(int i=1; i<routeSeriesCounter; i++){
-                       current.setDataset(i,null);
-                       
((PerfsonarHoplistTimeSeriesDataset)ifDataset).removeRouteSeries(i+1);
-               }
-               routeSeriesCounter = 1;
-    }
-    
-    public Color getLookupColor(String type){
-               return colorLookup.get(type);
-    }
-    
-       public void chartMouseClicked(ChartMouseEvent event) {
-               String temp = null;
-               String clicked = null;
-               if(event.getEntity()!=null) temp = 
event.getEntity().toString();
-        if(temp!=null) {
-               if(temp.contains("LegendItemEntity")){
-                       int start = temp.indexOf("seriesKey");
-                       int end = temp.indexOf(',');
-                       temp = temp.substring(start, end);
-                       String[] res = temp.split("=");
-               clicked = res[1];
-               }
-        }
-       if(clicked != null){
-               if(clicked.startsWith("Route")){
-                       String index = clicked.substring(5);
-                       int ind = Integer.parseInt(index);
-                       if(ind<=HoplistRoutes.getInstance().routesSize()){
-                               HoplistInfoTable tableDialog = new 
HoplistInfoTable(ind);
-                       }
-               }
-       }
-       }
-
-       public void chartMouseMoved(ChartMouseEvent event) {
-
-       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
        2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/MainPanelIPPM.java
        2008-11-28 19:47:05 UTC (rev 4725)
@@ -89,13 +89,9 @@
                leftP.add(scrollPaneQuery,BorderLayout.SOUTH);
                topPanel.add(leftP,BorderLayout.WEST);
 
-               //                              MAEndpoint hopsEndpoint = new 
MAEndpoint("GEANT-STATUS,http://radagast.rrze.uni-erlangen.de:3070/services/MA/HADES/STATUS,http://ggf.org/ns/nmwg/tools/hades/traceroute,,http://ggf.org/ns/nmwg/tools/hades/traceroute/aggregated/2.0,http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0";);
-
                topPanel.add(new 
IPPMPairsTablePanel((IPPMMetaDataList)psModel.getDataList(),
                                (IPPMUserData)psModel.getUserData(),
-                               
(ITimeSetAction)psModel.getDataRequestAction(),
-                               psModel.getHopsEndpoint()
-                               ),BorderLayout.CENTER);
+                               
(ITimeSetAction)psModel.getDataRequestAction()),BorderLayout.CENTER);
                topPanel.setPreferredSize(new Dimension(600,300));
                
                psModel.getRequest().addPropertyChangeListener(responsePanel);

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java 
2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java 
2008-11-28 19:47:05 UTC (rev 4725)
@@ -22,6 +22,7 @@
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JComponent;
+import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -332,4 +333,11 @@
 
        }
 
+       public static void main(String[] args) {
+               JFrame frame = new JFrame();
+               frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+               frame.setContentPane(new LSEndpointsPanel(false));
+               frame.pack();
+               frame.setVisible(true);
+       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2008-11-28 19:47:05 UTC (rev 4725)
@@ -38,7 +38,6 @@
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.plugins.MAEndpointList;
 import org.perfsonar.perfsonarui.ui.PerfsonarModel;
-import org.perfsonar.perfsonarui.ui.PluginMainPanel;
 import org.perfsonar.perfsonarui.ui.actions.PSUIAction;
 import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.SelectOneEndpointAction;
@@ -84,7 +83,7 @@
                                if(point.isEnabled()) {
                                        if(point.isEnabled()) {
                                                userData.setEndpoint(point);
-                                   break;
+                                   return;
                                }
                                }
                                }
@@ -139,7 +138,7 @@
                return null;
        }
 
-       public PluginMainPanel createMainComponent(Component parentComponent) 
{
+       public PlaygroundPanel createMainComponent(Component parentComponent) 
{
                return new PlaygroundPanel(parentComponent,this);
        }
        @Override

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundPanel.java
  2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundPanel.java
  2008-11-28 19:47:05 UTC (rev 4725)
@@ -131,18 +131,16 @@
     public void update(Observable arg0, Object arg1) {
         if (arg0 instanceof IUserData) {
                IUserData data = (IUserData) arg0;
-               if (AbstractUserData.DOCUMENT_QUERY.equals(arg1)) {
-                   
-                   
query.getTextArea().setText(data.getQuery(AbstractUserData.DOCUMENT_QUERY));
-                  
+               if (AbstractUserData.DOCUMENT_QUERY.equals(arg1)) {           
      
+                       
query.getTextArea().setText(data.getQuery(AbstractUserData.DOCUMENT_QUERY));  
             
                } else if (AbstractUserData.DOCUMENT_RESPONSE.equals(arg1)) {
-                       
response.getTextArea().setText(data.getResponse(AbstractUserData.DOCUMENT_RESPONSE));
-               } else
+                   
response.getTextArea().setText(data.getResponse(AbstractUserData.DOCUMENT_RESPONSE));
+               } else {
                        for (MAEndpoint e: data.getEndpoints()) {
                                setActive_endpoint(e);
                                break;
                        }       
-                               
+               }
         }
         
     }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT     
  2008-11-28 19:13:08 UTC (rev 4724)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT     
  2008-11-28 19:47:05 UTC (rev 4725)
@@ -1,12 +1,12 @@
 Manifest-version: 1.0
 Main-Class: org.perfsonar.perfsonarui.ui.PerfSonarApp
-Class-Path: jars/axis/axis-ant.jar jars/axis/axis.jar 
jars/axis/bcprov-jdk15-138.jar jars/axis/codec-1.0.jar 
jars/axis/commons-collections-3.1.jar jars/axis/commons-discovery-0.2.jar 
jars/axis/commons-lang-2.1.jar jars/axis/commons-logging-1.0.4.jar 
jars/axis/edugain-1.0-RC2.jar jars/axis/javolution-3.7.jar 
jars/axis/jaxrpc.jar jars/axis/joda-time-1.4.jar jars/axis/log4j-1.2.15.jar 
jars/axis/opensaml-1.1.jar jars/axis/opensaml-trunk-jdk-1.5.jar 
jars/axis/openws-trunk-jdk-1.5.jar jars/axis/perfsonar-base-1.0.20080924.jar 
jars/axis/sasl-ca-1.0.jar jars/axis/slf4j-api-1.4.3.jar 
jars/axis/slf4j-simple-1.4.3.jar jars/axis/velocity-1.5.jar 
jars/axis/wsdl4j-1.5.1.jar jars/axis/wss4j-1.5.3.jar 
jars/axis/xmlsec-1.4.1.jar jars/axis/xmltooling-trunk-jdk-1.5.jar 
jars/dns/dnsjava-2.0.3.jar jars/l2fprod/l2fprod-common-all.jar 
jars/ui/jcommon-1.0.14.jar jars/ui/jfreechart-1.0.11.jar jars/ui/junit.jar 
jars/ui/swing-layout-1.0.jar jars/xalan/xalan-2.7.0.jar 
jars/xalan/xalan-serializer-2.7.0.
 jar jars/xalan/xerces-2.9.1-xercesImpl.jar 
jars/xalan/xerces-2.9.1-xml-apis.jar jars/xml/commons-cli-1.0.jar 
jars/xml/jdom.jar jars/xml/mail.jar jars/xml/xercesImpl.jar 
jars/xml/saaj-api-1.3.jar jars/xml/saaj-impl-1.3.jar 
jars/xml/wstx-lgpl-3.2.7.jar jars/ls/activation-1.1.jar 
jars/ls/LS-client-api-1.0RC1.jar jars/ls/LSclient-Implementation-1.0-BETA.jar 
jars/xml/stax-api-1.0.1.jar jars/xml/jaxb-api-2.1.jar 
jars/xml/jaxb-impl-2.1.7.jar
+Class-Path: jars/axis/axis-ant.jar jars/axis/axis.jar 
jars/axis/bcprov-jdk15-138.jar jars/axis/codec-1.0.jar 
jars/axis/commons-collections-3.1.jar jars/axis/commons-discovery-0.2.jar 
jars/axis/commons-lang-2.1.jar jars/axis/commons-logging-1.0.4.jar 
jars/axis/edugain-1.0-RC2.jar jars/axis/javolution-3.7.jar 
jars/axis/jaxrpc.jar jars/axis/joda-time-1.4.jar jars/axis/log4j-1.2.15.jar 
jars/axis/opensaml-1.1.jar jars/axis/opensaml-trunk-jdk-1.5.jar 
jars/axis/openws-trunk-jdk-1.5.jar jars/axis/perfsonar-base-1.0.20080924.jar 
jars/axis/sasl-ca-1.0.jar jars/axis/slf4j-api-1.4.3.jar 
jars/axis/slf4j-simple-1.4.3.jar jars/axis/velocity-1.5.jar 
jars/axis/wsdl4j-1.5.1.jar jars/axis/wss4j-1.5.3.jar 
jars/axis/xmlsec-1.4.1.jar jars/axis/xmltooling-trunk-jdk-1.5.jar 
jars/dns/dnsjava-2.0.3.jar jars/l2fprod/l2fprod-common-all.jar 
jars/ui/jcommon-1.0.14.jar jars/ui/jfreechart-1.0.11.jar jars/ui/junit.jar 
jars/ui/swing-layout-1.0.jar jars/xalan/xalan-2.7.0.jar 
jars/xalan/xalan-serializer-2.7.0.
 jar jars/xalan/xerces-2.9.1-xercesImpl.jar 
jars/xalan/xerces-2.9.1-xml-apis.jar jars/xml/commons-cli-1.0.jar 
jars/xml/jdom.jar jars/xml/mail.jar jars/xml/xercesImpl.jar 
jars/xml/saaj-api-1.3.jar jars/xml/saaj-impl-1.3.jar 
jars/xml/wstx-lgpl-3.2.7.jar jars/ls/activation-1.1.jar 
jars/ls/LS-client-api-1.0RC2.jar 
jars/ls/LSclient-Implementation-1.0-BETA2.jar jars/xml/stax-api-1.0.1.jar 
jars/xml/jaxb-api-2.1.jar jars/xml/jaxb-impl-2.1.7.jar
 Specification-Title: perfSonar test application
-Specification-Version: 0.14a
+Specification-Version: 0.14
 Specification-Vendor: perfsonar.acad.bg
 Package-Title: org.perfsonar.perfsonarui
-Package-Version: 0.14a
+Package-Version: 0.14
 Package-Vendor: acad.bg
 Implementation-Title: Perfsonar UI
-Implementation-Version: 0.14a
+Implementation-Version: 0.14
 Implementation-Vendor: 

\ No newline at end of file

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
      2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
      2008-11-28 19:47:05 UTC (rev 4725)
@@ -153,7 +153,7 @@
 
        protected Collection<MAEndpoint> getSelectedEndpoints() {
                List<MAEndpoint> points = new ArrayList<MAEndpoint>();
-               for(MAEndpoint point : points) {
+               for(MAEndpoint point : endpoints) {
                        if(point.isEnabled()) {
                                points.add(point);
                        }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/ResponseChartPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/ResponseChartPanel.java
        2008-11-28 19:13:08 UTC (rev 4724)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/ResponseChartPanel.java
        2008-11-28 19:47:05 UTC (rev 4725)
@@ -60,7 +60,7 @@
     protected String title = ""; //Detailed interface statistics";
     protected static Color gridColor = new Color(130,30,30);
     protected ChartPanel chartPanel; 
-    protected PerfsonarTimeSeriesDataset ifDataset;
+    PerfsonarTimeSeriesDataset ifDataset;
     
        protected JFreeChart chart;
 

Modified: branches/perfsonarui/src/resources.files
===================================================================
--- branches/perfsonarui/src/resources.files    2008-11-28 19:13:08 UTC (rev 
4724)
+++ branches/perfsonarui/src/resources.files    2008-11-28 19:47:05 UTC (rev 
4725)
@@ -17,7 +17,6 @@
 org/perfsonar/perfsonarui/ippm/SetupGeant-template.xml
 org/perfsonar/perfsonarui/ippm/SetupGeant-template-mid.xml
 org/perfsonar/perfsonarui/ippm/SetupGeant-template-noparams.xml
-org/perfsonar/perfsonarui/ippm/Hoplist-request.xml
 org/perfsonar/perfsonarui/ippm/KeyRequestEmpty.xml
 org/perfsonar/perfsonarui/flowsa/raw.xml
 org/perfsonar/perfsonarui/flowsa/stat.xml