perfsonar development work

Author: michael.bischoff
Date: 2008-12-09 08:36:04 -0500 (Tue, 09 Dec 2008)
New Revision: 4756

Added:
   branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.jar
   branches/perfsonarui/src/org/perfsonar/perfsonarui/util/
   branches/perfsonarui/src/org/perfsonar/perfsonarui/util/Collections.java
Removed:
   branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.jar
Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLPerfsonarTab.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LinkStatusModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.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/plugins/MAEndpointList.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SelectOneEndpointAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
Log:
Filtering by eventType implemented for tab.
Selection of ls tab is merged with the conf tab and is used.

made some changes to the playground.  - should have preserved functionality 
that was present.

Deleted: branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.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/src/org/perfsonar/perfsonarui/bwctl/BWCTLPerfsonarTab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLPerfsonarTab.java
     2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/bwctl/BWCTLPerfsonarTab.java
     2008-12-09 13:36:04 UTC (rev 4756)
@@ -3,7 +3,9 @@
 import java.awt.Component;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.JDialog;
 
@@ -20,6 +22,7 @@
 import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.SetupDataRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.ShowEndpointsAction;
+import org.perfsonar.perfsonarui.util.Collections;
 
 /**
  * Plugin for BWCTL perfSonar measurement access
@@ -120,38 +123,34 @@
        /**
         * Override in order not to create a default Options button.
         */
-       public PSUIAction createOptionsAction() {
-               
-               ShowEndpointsAction action = new 
ShowEndpointsAction(getDestinations(),"BWCTL Destination"){
-                       
-                       protected JDialog createDialog(){
+       public PSUIAction createOptionsAction() {               
+               ShowEndpointsAction action = new 
ShowEndpointsAction(getEventTypes(), getDestinations(),"BWCTL Destination"){
+                       protected JDialog createDialog(Set<String> 
eventTypes){
                                setEndpointSelected(endpoints, 
endpointDstIndex);
-                               return super.createDialog();
+                               return super.createDialog(eventTypes);
                        }
                };
                
                action.addListener(new ShowEndpointsAction.Listener() {
        
-                       public void actionFinished(Collection<MAEndpoint> 
selected) {
+                       public void selectionChanged(Collection<MAEndpoint> 
selected) {
                                pane.updateDestination();
                        }                               
                });
                return action;
        }
 
-       public PSUIAction createEndpointsAction(MAEndpointList endpointList)
-       {
-               ShowEndpointsAction action =  new 
ShowEndpointsAction(endpointList, "BWCTL MP/Source"){
-                        
-                       protected JDialog createDialog(){
+       public PSUIAction createEndpointsAction(Set<String> eventTypes, 
MAEndpointList endpointList) {
+               ShowEndpointsAction action = new 
ShowEndpointsAction(eventTypes, endpointList, "BWCTL MP/Source"){             
          
+                       protected JDialog createDialog(Set<String> 
eventTypes){
                                setEndpointSelected(endpoints, 
endpointSrcIndex);
-                               return super.createDialog();
+                               return super.createDialog(eventTypes);
                        }
                };
                
                action.addListener(new ShowEndpointsAction.Listener() {
                        
-                       public void actionFinished(Collection<MAEndpoint> 
selected) {
+                       public void selectionChanged(Collection<MAEndpoint> 
selected) {
                                pane.updateSource();
                        }                               
                });
@@ -179,4 +178,11 @@
                        else endpoints.get(i).setEnabled(true);
                }
        }
+
+       @Override
+       public Set<String> getEventTypes() {
+               Set<String> eventTypes = new HashSet<String>();
+               //TODO eventTypes.add("");              
+               return Collections.umodifiableCopy(eventTypes);
+       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java   
  2008-12-09 11:17:17 UTC (rev 4755)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java   
  2008-12-09 13:36:04 UTC (rev 4756)
@@ -23,7 +23,9 @@
 import java.awt.Component;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -59,6 +61,7 @@
 import org.perfsonar.perfsonarui.ui.actions.ShowEndpointsAction;
 import org.perfsonar.perfsonarui.ui.panels.InterfaceUtilizationSeries;
 import org.perfsonar.perfsonarui.ui.panels.PerfsonarTimeSeriesDataset;
+import org.perfsonar.perfsonarui.util.Collections;
 
 /**
  * Demo plugin. See 
{@link
 PerfSonarApp} how to write plugins.
@@ -97,10 +100,10 @@
        }
 
        @Override
-       public PSUIAction createEndpointsAction(MAEndpointList endpointList) {
-               SelectOneEndpointAction action =  new 
SelectOneEndpointAction(endpointList);
+       public PSUIAction createEndpointsAction(Set<String> eventTypes, 
MAEndpointList endpointList) {
+               SelectOneEndpointAction action =  new 
SelectOneEndpointAction(eventTypes, endpointList);
                action.addListener(new ShowEndpointsAction.Listener() {
-                       public void actionFinished(Collection<MAEndpoint> 
selected) {
+                       public void selectionChanged(Collection<MAEndpoint> 
selected) {
                                for (MAEndpoint point : selected) {
                                if (point.isEnabled()) {
                                        userData.setEndpoint(point);
@@ -167,7 +170,12 @@
        public PluginMainPanel createMainComponent(Component parentComponent) 
{
                return new DemoPluginMainPanel(parentComponent,this);
        }
-       
+       @Override
+       public Set<String> getEventTypes() {
+               Set<String> eventTypes = new HashSet<String>();
+               //TODO eventTypes.add("");              
+               return Collections.umodifiableCopy(eventTypes);
+       }
 }
 
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java  
2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowsaMATab.java  
2008-12-09 13:36:04 UTC (rev 4756)
@@ -25,7 +25,9 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.JComponent;
 
@@ -45,6 +47,7 @@
 import org.perfsonar.perfsonarui.ui.actions.SetOptionsAction;
 import org.perfsonar.perfsonarui.ui.actions.ShowEndpointsAction;
 import org.perfsonar.perfsonarui.ui.panels.UserDataDetailsPane;
+import org.perfsonar.perfsonarui.util.Collections;
 
 /**
  * Implementation of the FlowSA tab.
@@ -111,10 +114,10 @@
         * @see 
org.perfsonar.perfsonarui.ui.PerfsonarModel#createEndpointsAction(org.perfsonar.perfsonarui.plugins.MAEndpointList)
         */
        @Override
-       public PSUIAction createEndpointsAction(MAEndpointList list) {
-               SelectOneEndpointAction action = new 
SelectOneEndpointAction(list);
+       public PSUIAction createEndpointsAction(Set<String> eventTypes, 
MAEndpointList list) {
+               SelectOneEndpointAction action = new 
SelectOneEndpointAction(eventTypes, list);
                action.addListener(new ShowEndpointsAction.Listener() {
-                       public void actionFinished(Collection<MAEndpoint> 
selected) {
+                       public void selectionChanged(Collection<MAEndpoint> 
selected) {
                                for(MAEndpoint point : selected) {
                                if (point.isEnabled()) {
                                        setEndpoint(point);
@@ -289,5 +292,14 @@
                
                return null;
        }
+
+       @Override
+       public Set<String> getEventTypes() {
+               Set<String> eventTypes = new HashSet<String>();
+               eventTypes.add("http://ggf.org/ns/nmwg/tools/flow/raw/2.0/";);
+               eventTypes.add("http://ggf.org/ns/nmwg/tools/flow/stat/2.0/";);
+               eventTypes.add("http://ggf.org/ns/nmwg/tools/flow/top/2.0/";);
+               return Collections.umodifiableCopy(eventTypes);
+       }
        
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
     2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
     2008-12-09 13:36:04 UTC (rev 4756)
@@ -22,7 +22,9 @@
 import java.awt.Component;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.Action;
 import javax.swing.JComponent;
@@ -52,9 +54,9 @@
 import org.perfsonar.perfsonarui.ui.actions.SetupDataRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.TimeSetAction;
 import org.perfsonar.perfsonarui.ui.panels.PerfsonarTimeSeries;
-import org.perfsonar.perfsonarui.ui.panels.PerfsonarTimeSeriesDataset;
 import org.perfsonar.perfsonarui.ui.panels.PerfsonarTimeSeriesDelay;
 import org.perfsonar.perfsonarui.ui.panels.ResponseDetailsPane;
+import org.perfsonar.perfsonarui.util.Collections;
 
 /**
  * An implementation of 
{@link
 IPerfsonarTab} for querying IPPM Measurement Archives.
@@ -138,8 +140,8 @@
        }       
 
        @Override
-       public PSUIAction createEndpointsAction(MAEndpointList endpointList) {
-               return new SelectOneEndpointAction(endpointList);
+       public PSUIAction createEndpointsAction(Set<String> eventTypes, 
MAEndpointList endpointList) {
+               return new SelectOneEndpointAction(eventTypes, endpointList);
        }
        @Override
        protected PerfsonarRequestAction createMetadataRequestAction() {
@@ -317,4 +319,11 @@
                return 4;
        }
 
+       @Override
+       public Set<String> getEventTypes() {
+               Set<String> eventTypes = new HashSet<String>();
+               
eventTypes.add("http://ggf.org/ns/nmwg/tools/hades/traceroute/aggregated/2.0";);
+               
eventTypes.add("http://ggf.org/ns/nmwg/tools/hades/traceroute/hoplist/2.0";);
+               return Collections.umodifiableCopy(eventTypes);
+       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksModel.java  
  2008-12-09 11:17:17 UTC (rev 4755)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/links/LinksModel.java  
  2008-12-09 13:36:04 UTC (rev 4756)
@@ -9,25 +9,32 @@
 
 package org.perfsonar.perfsonarui.links;
 
-import org.perfsonar.perfsonarui.*;
+import java.awt.Component;
+import java.awt.Image;
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
 
-import java.awt.*;
-import java.util.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.io.*;
-import java.net.*;
-import javax.imageio.*;
+import javax.imageio.ImageIO;
+import javax.swing.JComponent;
 
-import org.perfsonar.perfsonarui.vertexedgegraph.*;
-import org.perfsonar.perfsonarui.mapprojection.*;
-import org.perfsonar.perfsonarui.*;
-import org.perfsonar.perfsonarui.plugins.*;
-import org.perfsonar.perfsonarui.ui.*;
-import org.perfsonar.perfsonarui.ui.actions.*;
-import org.perfsonar.perfsonarui.ui.panels.*;
-import org.perfsonar.perfsonarui.ma.*;
-import org.perfsonar.perfsonarui.playground.*;
+import org.perfsonar.perfsonarui.AbstractUserData;
+import org.perfsonar.perfsonarui.IPerfsonarSchema;
+import org.perfsonar.perfsonarui.PSException;
+import org.perfsonar.perfsonarui.SmartMARequest;
+import org.perfsonar.perfsonarui.playground.PlaygroundRequest;
+import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
+import org.perfsonar.perfsonarui.plugins.IUserData;
+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.SetOptionsAction;
+import org.perfsonar.perfsonarui.ui.actions.ShowEndpointsAction;
+import org.perfsonar.perfsonarui.util.Collections;
+import org.perfsonar.perfsonarui.vertexedgegraph.VertexEdgeGraph;
 
 /**
 The 'main' class of the plugin
@@ -214,9 +221,8 @@
        */
 
        @Override
-       public PSUIAction createEndpointsAction(MAEndpointList endpointList)
-       {
-               return new ShowEndpointsAction(endpointList);
+       public PSUIAction createEndpointsAction(Set<String> eventTypes, 
MAEndpointList endpointList) {
+               return new ShowEndpointsAction(eventTypes, endpointList);
        }
 
        /**
@@ -341,4 +347,11 @@
        {
                return null;
        }
+
+       @Override
+       public Set<String> getEventTypes() {
+               Set<String> eventTypes = new HashSet<String>();
+               //TODO eventTypes.add("");              
+               return Collections.umodifiableCopy(eventTypes);
+       }
 }
\ No newline at end of file

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LinkStatusModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LinkStatusModel.java
  2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/linkstatus/LinkStatusModel.java
  2008-12-09 13:36:04 UTC (rev 4756)
@@ -9,25 +9,39 @@
 
 package org.perfsonar.perfsonarui.linkstatus;
 
-import org.perfsonar.perfsonarui.*;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Image;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
 
-import java.awt.*;
-import java.util.*;
-import java.awt.geom.*;
-import javax.swing.*;
-import java.io.*;
-import java.net.*;
-import javax.imageio.*;
+import javax.imageio.ImageIO;
+import javax.swing.JComponent;
 
-import org.perfsonar.perfsonarui.vertexedgegraph.*;
-import org.perfsonar.perfsonarui.mapprojection.*;
-import org.perfsonar.perfsonarui.*;
-import org.perfsonar.perfsonarui.plugins.*;
-import org.perfsonar.perfsonarui.ui.*;
-import org.perfsonar.perfsonarui.ui.actions.*;
-import org.perfsonar.perfsonarui.ui.panels.*;
-import org.perfsonar.perfsonarui.ma.*;
-import org.perfsonar.perfsonarui.playground.*;
+import org.perfsonar.perfsonarui.AbstractUserData;
+import org.perfsonar.perfsonarui.IPerfsonarSchema;
+import org.perfsonar.perfsonarui.PSException;
+import org.perfsonar.perfsonarui.SmartMARequest;
+import org.perfsonar.perfsonarui.playground.PlaygroundRequest;
+import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
+import org.perfsonar.perfsonarui.plugins.IUserData;
+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.ShowEndpointsAction;
+import org.perfsonar.perfsonarui.util.Collections;
+import org.perfsonar.perfsonarui.vertexedgegraph.Edge;
+import org.perfsonar.perfsonarui.vertexedgegraph.Vertex;
+import org.perfsonar.perfsonarui.vertexedgegraph.VertexEdgeGraph;
 
 /**
 The 'main' class of the plugin
@@ -373,9 +387,8 @@
        */
 
        @Override
-       public PSUIAction createEndpointsAction(MAEndpointList endpointList)
-       {
-               return new ShowEndpointsAction(endpointList);
+       public PSUIAction createEndpointsAction(Set<String> eventTypes, 
MAEndpointList endpointList) {
+               return new ShowEndpointsAction(eventTypes, endpointList);
        }
 
        /**
@@ -469,4 +482,11 @@
        {
                return null;
        }
+
+       @Override
+       public Set<String> getEventTypes() {
+               Set<String> eventTypes = new HashSet<String>();
+               //TODO eventTypes.add("");              
+               return Collections.umodifiableCopy(eventTypes);
+       }
 }
\ No newline at end of file

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2008-12-09 13:36:04 UTC (rev 4756)
@@ -26,9 +26,12 @@
 
 import java.awt.Component;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.swing.JComponent;
+
 import org.perfsonar.perfsonarui.IPerfsonarSchema;
 import org.perfsonar.perfsonarui.PSException;
 import org.perfsonar.perfsonarui.PerfsonarSchema;
@@ -38,11 +41,12 @@
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
 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.plugins.MAEndpointList;
-import org.perfsonar.perfsonarui.ui.actions.PSUIAction;
+import org.perfsonar.perfsonarui.util.Collections;
 
 
 /**
@@ -73,7 +77,7 @@
     }
     
     @Override
-    public PSUIAction createEndpointsAction(MAEndpointList endpointList) {
+    public PSUIAction createEndpointsAction(Set<String> eventTypes, 
MAEndpointList endpointList) {
        
        return new LGShowEndpointsAction(endpointList, this);
     }
@@ -139,6 +143,13 @@
     public WebservicesModel getWebservicesModel(){
        return panel.getWebservicesModel();
     }
+
+       @Override
+       public Set<String> getEventTypes() {
+               Set<String> eventTypes = new HashSet<String>();
+               //TODO eventTypes.add("");              
+               return Collections.umodifiableCopy(eventTypes);
+       }
 }
 
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java 
2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java 
2008-12-09 13:36:04 UTC (rev 4756)
@@ -12,6 +12,8 @@
 
 import java.awt.LayoutManager;
 import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -22,14 +24,12 @@
 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;
 import javax.swing.JSeparator;
 import javax.swing.JTable;
 import javax.swing.JTextField;
-import javax.swing.WindowConstants;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 import javax.swing.event.TableModelEvent;
@@ -42,6 +42,7 @@
 import org.perfsonar.lsclient.data.ServiceType;
 import org.perfsonar.lsclient.data.TopologyElement;
 import org.perfsonar.perfsonarui.ui.panels.BusyAwareComponent;
+import org.perfsonar.perfsonarui.util.Collections;
 
 /**
  * Panel that displays and handles discovery(results)
@@ -191,20 +192,46 @@
                        this.singleSelection = canSelectOnlyOne;
                }
 
+               public Collection<Service> getSelectedServices() {
+                       List<Service> selected = new ArrayList<Service>();
+                       for(Entry value : values) {
+                               if(value.use == true) {
+                                       selected.add(value.service);
+                               }
+                       }
+                       return selected;
+               }
        }
 
        private static final long serialVersionUID = 1L;
        private final LookupProcess process = new 
LookupProcess(LsResources.getClient(),LsResources.getExecutor());     
        private final LsEndpointsModel myModel = new LsEndpointsModel();
+       private final Set<EventType> eventTypes;
 
-       public LSEndpointsPanel(boolean canSelectOnlyOne) {
+       public LSEndpointsPanel(Set<String> eventType, boolean 
canSelectOnlyOne) {
                JComponent endpointList = createEndpointList(myModel);
                JComponent toolbar = createToolBar(myModel);
                myModel.setCanSelectOnlyOne(canSelectOnlyOne);
                decorate();             
                setLayout(createLayoutManager(endpointList,toolbar));
+               Set<EventType> types = new HashSet<EventType>();
+               for(final String type : eventType) {
+                       types.add(new EventType() {
+                               public String getValue() {
+                                       return type;
+                               }
+                               public void setValue(String value) {
+                                       //ignored                             
  
+                               }
+                       });
+               }
+               this.eventTypes = Collections.umodifiableCopy(types);
        }
 
+       public Collection<Service> getSelectedServices() {
+               return myModel.getSelectedServices();
+       }
+       
        protected LayoutManager createLayoutManager(JComponent endpointList, 
JComponent toolbar) {
         GroupLayout layout = new GroupLayout(this);
         layout.setHorizontalGroup(
@@ -330,16 +357,8 @@
                
                public void actionPerformed(ActionEvent e) {
                        setEnabled(false);
-                       process.start(new HashSet<TopologyElement>(), new 
HashSet<EventType>(), new HashSet<ServiceType>());
+                       process.start(new HashSet<TopologyElement>(), 
eventTypes , new HashSet<ServiceType>());
                }
 
        }
-
-       public static void main(String[] args) {
-               JFrame frame = new JFrame();
-               
frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-               frame.setContentPane(new LSEndpointsPanel(false));
-               frame.pack();
-               frame.setVisible(true);
-       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2008-12-09 13:36:04 UTC (rev 4756)
@@ -24,7 +24,9 @@
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.Vector;
 import java.util.regex.Pattern;
 
@@ -86,7 +88,6 @@
  * 
<li>{@link
 SetupDataRefreshActionAll}
  * 
<li>{@link
 MASetupDataRequestAction}
  * 
<li>{@link
 SearchByIPAction}
- * 
<li>{@link
 ClearMetadataListAction}
  * </ul>
  * @author Nina Jeliazkova 

  *
@@ -172,8 +173,8 @@
                return a;
        }
        @Override
-       public PSUIAction createEndpointsAction(MAEndpointList endpointList) {
-               PSUIAction a = super.createEndpointsAction(endpointList);
+       public PSUIAction createEndpointsAction(Set<String> eventTypes, 
MAEndpointList endpointList) {
+               PSUIAction a = super.createEndpointsAction(eventTypes, 
endpointList);
                a.setGroup("Query & search options");
                return a;
        }
@@ -400,5 +401,12 @@
     public int getOrder() {
        return 2;
     }
-
+       @Override
+       public Set<String> getEventTypes() {
+               Set<String> eventTypes = new HashSet<String>();
+               
eventTypes.add("http://ggf.org/ns/nmwg/characteristic/utilization/2.0";);
+               
eventTypes.add("http://ggf.org/ns/nmwg/characteristic/errors/2.0";);
+               
eventTypes.add("http://ggf.org/ns/nmwg/characteristic/discards/2.0";);
+               return 
org.perfsonar.perfsonarui.util.Collections.umodifiableCopy(eventTypes);
+       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2008-12-09 13:36:04 UTC (rev 4756)
@@ -24,20 +24,16 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
-import javax.swing.JComponent;
-import javax.swing.JTabbedPane;
-import javax.swing.SwingConstants;
-
 import org.perfsonar.perfsonarui.AbstractUserData;
-import org.perfsonar.perfsonarui.EchoSmartRequest;
 import org.perfsonar.perfsonarui.IPerfsonarSchema;
 import org.perfsonar.perfsonarui.PerfsonarSchema;
 import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.aa.ICredentialsListener;
 import org.perfsonar.perfsonarui.aa.SwingCredentialListener;
-import org.perfsonar.perfsonarui.ls.LSEndpointsPanel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
@@ -46,14 +42,10 @@
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.plugins.MAEndpointList;
 import org.perfsonar.perfsonarui.ui.PerfsonarModel;
-import org.perfsonar.perfsonarui.ui.actions.EchoAction;
-import org.perfsonar.perfsonarui.ui.actions.FileEndpointsAction;
-import org.perfsonar.perfsonarui.ui.actions.NewEndpointAction;
 import org.perfsonar.perfsonarui.ui.actions.PSUIAction;
 import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.SelectOneEndpointAction;
 import org.perfsonar.perfsonarui.ui.actions.ShowEndpointsAction;
-import org.perfsonar.perfsonarui.ui.panels.MAEndpointsPanel;
 
 /**
  * Simple instance of 
{@link
 IPerfsonarTab}. 
@@ -61,21 +53,19 @@
  *
  */
 public class PerfsonarPlaygroundModel extends PerfsonarModel {
-       
-       public MAEndpointList myEndpoints;
-       
+
        /**
         * Constructor. 
         *
         */
        public PerfsonarPlaygroundModel() {
                super();
-
-        for (int i=0; i < endpointList.size();i++)
+        for (int i=0; i < endpointList.size();i++) {
             if (endpointList.get(i).isEnabled()) {
                 userData.setEndpoint(endpointList.get(i));
                 break;
             }
+        }
        }
        @Override
        public IUserData createUserData() {
@@ -90,93 +80,11 @@
                return new 
PlaygroundRequestAction(request,userData,endpointList,"Query",null,defaultGroupQuery);
        }
        @Override
-       public PSUIAction createEndpointsAction(MAEndpointList endpointList) {
-               SelectOneEndpointAction action = new 
SelectOneEndpointAction(endpointList){
-                       
-                   protected JComponent createEndpointsPanel() {
-                       boolean selected = false;
-                       if(myEndpoints==null){
-                               for (int i=0; i < endpoints.size();i++)
-                                       if (endpoints.get(i).isEnabled()) {
-                                               if (selected) 
endpoints.get(i).setEnabled(false);                               
-                                               selected = true;        
-                                       }
-                               return  super.createEndpointsPanel();
-                       }
-                       else{
-                               for (int i=0; i < myEndpoints.size();i++)
-                                       if (myEndpoints.get(i).isEnabled()) {
-                                               if (selected) 
myEndpoints.get(i).setEnabled(false);                             
-                                               selected = true;        
-                                       }
-                               actions = createActions();
-                               JTabbedPane pane = new 
JTabbedPane(SwingConstants.BOTTOM, JTabbedPane.SCROLL_TAB_LAYOUT);
-                               pane.addTab(".conf file", new 
MAEndpointsPanel(myEndpoints,actions));
-                               pane.addTab("Lookup Service", new 
LSEndpointsPanel(!myEndpoints.isMultipleEndpoints()));
-                               
-                               for (int i=0; i < actions.length;i++) {
-                                       actions[i].setActions(allActions);
-                                       actions[i].setFrame(pane);
-                                       allActions.put(Integer.toString(i+1), 
actions[i]);
-                               }        
-                               
-                               return pane;
-                       }
-                   }
-                       
-                       protected PSUIAction[] createActions() {
-                       PSUIAction[] actions = new PSUIAction[4];
-                       EchoSmartRequest echoRequest = new EchoSmartRequest();
-                       echoRequest.setTimeout(10000);
-                       
-                       if(myEndpoints==null){
-                               actions[0] = new EchoAction(echoRequest, new 
AbstractUserData() {
-                                       @Override
-                                               public void 
makeQueryFromResponse() {}
-                               },endpoints);                   
-                               actions[1] = new 
FileEndpointsAction(endpoints,true);
-                               actions[2] = new 
FileEndpointsAction(endpoints,false);
-                               actions[3] = new NewEndpointAction(endpoints);
-                               //actions[4] = new 
LSRetrieveEndpointsAction(endpoints);
-                               return actions;
-                       }
-                       else {
-                               actions[0] = new EchoAction(echoRequest, new 
AbstractUserData() {
-                                       @Override
-                                               public void 
makeQueryFromResponse() {}
-                               },myEndpoints);                 
-                               actions[1] = new 
FileEndpointsAction(myEndpoints,true);
-                               actions[2] = new 
FileEndpointsAction(myEndpoints,false);
-                               actions[3] = new 
NewEndpointAction(myEndpoints);
-                               //actions[4] = new 
LSRetrieveEndpointsAction(endpoints);
-                               return actions;
-                       }
-                       }
-                       
-                       protected Collection<MAEndpoint> 
getSelectedEndpoints() {
-                               List<MAEndpoint> points = new 
ArrayList<MAEndpoint>();
-                               if(myEndpoints==null){
-                                       for(MAEndpoint point : endpoints) {
-                                               if(point.isEnabled()) {
-                                                       points.add(point);
-                                               }
-                                       }
-                                       return points;          
-                               }
-                               else{
-                                       for(MAEndpoint point : myEndpoints) {
-                                               if(point.isEnabled()) {
-                                                       points.add(point);
-                                               }
-                                       }
-                                       return points;          
-                               }
-                       }
-                   
-               };
+       public PSUIAction createEndpointsAction(Set<String> eventTypes, 
MAEndpointList endpointList) {
+               SelectOneEndpointAction action = new 
SelectOneEndpointAction(eventTypes, endpointList);
                action.addListener(new ShowEndpointsAction.Listener() {
-                       
-                       public void actionFinished(Collection<MAEndpoint> 
selected) {
+
+                       public void selectionChanged(Collection<MAEndpoint> 
selected) {
                                for(MAEndpoint point : selected) {
                                if(point.isEnabled()) {
                                        if(point.isEnabled()) {
@@ -242,6 +150,10 @@
                return 1000000;
        }
        @Override
+       public Set<String> getEventTypes() {    
+               return Collections.emptySet();
+       }
+       @Override
        public List<IPerfsonarSchema> getSupportedRequests() {
                String selected = 
PlaygroundPredefined.getInstance().getCurrentSchema();
                if(selected==null) return null;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundPanel.java
  2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundPanel.java
  2008-12-09 13:36:04 UTC (rev 4756)
@@ -33,7 +33,6 @@
 import java.util.Observer;
 
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JComboBox;
 import javax.swing.JFormattedTextField;
 import javax.swing.JLabel;
@@ -177,7 +176,7 @@
        }
        
     public  synchronized void updateData(DocumentEvent d) {
-       Document text = (Document)d.getDocument();
+       Document text = d.getDocument();
         Document doc = text.getDefaultRootElement().getDocument();
         try {
                model.getUserData().setNotificationEnabled(false);
@@ -215,7 +214,7 @@
                                String queryString = 
PlaygroundPredefined.getInstance().getPredefinedRequest();
                                query.getTextArea().setText(queryString);
                                MAEndpointList filteredEndpoints = 
((PerfsonarPlaygroundModel)model).createEndpoints();
-                               ((PerfsonarPlaygroundModel)model).myEndpoints 
= filteredEndpoints;
+                               
model.getEndpointList().replace(filteredEndpoints);
                                
((PerfsonarPlaygroundModel)model).activateSpecific();
                                if(filteredEndpoints.size()!=0){
                                        
filteredEndpoints.get(0).setEnabled(true);
@@ -225,7 +224,7 @@
                        }
                        else {
                                
PlaygroundPredefined.getInstance().setSelectedItem(null);
-                               ((PerfsonarPlaygroundModel)model).myEndpoints 
= null;
+                               
model.getEndpointList().replace(model.getEndpointList());
                                
((PerfsonarPlaygroundModel)model).activateSpecific();
                                query.getTextArea().setText("");
                        }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpointList.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpointList.java
      2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/MAEndpointList.java
      2008-12-09 13:36:04 UTC (rev 4756)
@@ -211,6 +211,18 @@
         setChanged();
         notifyObservers(endpoint);
     }
+    public void replace(MAEndpointList newList) {
+       for(MAEndpoint item : list) {
+               item.deleteObserver(this);
+       }
+       list.clear();
+       for(MAEndpoint item : newList) {
+               list.add(item);
+               item.addObserver(this);
+       }
+        setChanged();
+        notifyObservers();
+    }
     public MAEndpoint remove(MAEndpoint o) {
         if (list.remove(o)) {
                if (o instanceof Observable) 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2008-12-09 11:17:17 UTC (rev 4755)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2008-12-09 13:36:04 UTC (rev 4756)
@@ -224,7 +224,7 @@
                //actions
                actions = new PSActionMap();
                
-               endpointsAction = createEndpointsAction(getEndpointList());
+               endpointsAction = 
createEndpointsAction(getEventTypes(),getEndpointList());
                actions.put(endpointsAction);
                endpointsAction.setActions(actions);
                
@@ -301,8 +301,8 @@
         else return endpointList;
        }
        
-       public PSUIAction createEndpointsAction(MAEndpointList endpointList) {
-               return new ShowEndpointsAction(endpointList);
+       public PSUIAction createEndpointsAction(Set<String> eventTypes, 
MAEndpointList endpointList) {
+               return new ShowEndpointsAction(eventTypes, endpointList);
        }
        
        public PSUIAction createOptionsAction() {
@@ -403,6 +403,8 @@
        public void setUserData(IUserData userData) {
                this.userData = userData;
        }
+
+       public abstract Set<String> getEventTypes();
        
        public void update(Observable arg0, Object arg1) { /* TODO check: 
Template method? */}
        
@@ -419,7 +421,8 @@
                if (timeIntervals[i] == time) return timeIntervalsTitle[i];
        return Long.toString(time/60) + " min";
     }
-    
+
+       
        protected IUserDataComparator createComparator() {
                return null;
        }
@@ -610,4 +613,5 @@
                        in.close();
        }       
     }
+
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SelectOneEndpointAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SelectOneEndpointAction.java
  2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SelectOneEndpointAction.java
  2008-12-09 13:36:04 UTC (rev 4756)
@@ -20,6 +20,8 @@
 
 package org.perfsonar.perfsonarui.ui.actions;
 
+import java.util.Set;
+
 import javax.swing.Icon;
 import javax.swing.JComponent;
 
@@ -39,17 +41,16 @@
         */
        private static final long serialVersionUID = -6503240291606393428L;
 
-       public SelectOneEndpointAction(MAEndpointList endpoints) {
-               super(endpoints);
+       public SelectOneEndpointAction(Set<String> eventTypes, MAEndpointList 
endpoints) {
+               super(eventTypes, endpoints);
        }
 
-       public SelectOneEndpointAction(MAEndpointList endpoints, String arg0) 
{
-               super(endpoints, arg0);
+       public SelectOneEndpointAction(Set<String> eventTypes, MAEndpointList 
endpoints, String arg0) {
+               super(eventTypes, endpoints, arg0);
        }
 
-       public SelectOneEndpointAction(MAEndpointList endpoints, String arg0,
-                       Icon arg1) {
-               super(endpoints, arg0, arg1);
+       public SelectOneEndpointAction(Set<String> eventTypes, MAEndpointList 
endpoints, String arg0, Icon arg1) {
+               super(eventTypes, endpoints, arg0, arg1);
        }
        /*
     @Override
@@ -87,6 +88,7 @@
                actions[0] = new EchoAction(echoRequest, new 
AbstractUserData() {
                        @Override
                                public void makeQueryFromResponse() {
+                               //Do nothing
                        }
                },endpoints);                   
                actions[1] = new FileEndpointsAction(endpoints,true);
@@ -97,14 +99,14 @@
                return actions;
        }       
     @Override
-    protected JComponent createEndpointsPanel() {
+    protected JComponent createEndpointsPanel(Set<String> eventTypes) {
         boolean selected = false;
         for (int i=0; i < endpoints.size();i++)
                if (endpoints.get(i).isEnabled()) {
                        if (selected) endpoints.get(i).setEnabled(false);     
                          
                        selected = true;        
                }
-       return  super.createEndpointsPanel();
+       return  super.createEndpointsPanel(eventTypes);
     }
 }
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
      2008-12-09 11:17:17 UTC (rev 4755)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
      2008-12-09 13:36:04 UTC (rev 4756)
@@ -40,6 +40,7 @@
 import javax.swing.SwingConstants;
 import javax.swing.WindowConstants;
 
+import org.perfsonar.lsclient.data.Service;
 import org.perfsonar.perfsonarui.AbstractUserData;
 import org.perfsonar.perfsonarui.EchoSmartRequest;
 import org.perfsonar.perfsonarui.ls.LSEndpointsPanel;
@@ -55,7 +56,7 @@
 public class ShowEndpointsAction extends EndpointsAction {
 
        public interface Listener {
-               void actionFinished(Collection<MAEndpoint> selected);
+               void selectionChanged(Collection<MAEndpoint> selected);
        }
 
     /**
@@ -65,34 +66,39 @@
 
        protected final Set<Listener> listeners = new 
CopyOnWriteArraySet<Listener>();
        protected final PSActionMap allActions = new PSActionMap();
-       
-       protected PSUIAction[] actions; 
+       protected final Set<String> eventTypes;
                
+       protected PSUIAction[] actions;
+
+       private LSEndpointsPanel ls;
+               
     /**
-     * @param userData
-     * @param dataList
+     * @param eventTypes 
      * @param endpoints
      */
-    public ShowEndpointsAction(MAEndpointList endpoints) {
-        this(endpoints,"Service addresses");
+    public ShowEndpointsAction(Set<String> eventTypes, MAEndpointList 
endpoints) {
+        this(eventTypes,endpoints,"Service addresses");
     }
 
     /**
+     * @param eventTypes 
      * @param endpoints
      * @param arg0
      */
-    public ShowEndpointsAction(MAEndpointList endpoints,String arg0) {
-        this(endpoints,arg0,null);        
+    public ShowEndpointsAction(Set<String> eventTypes, MAEndpointList 
endpoints,String arg0) {
+        this(eventTypes, endpoints,arg0,null);        
     }
 
     /**
+     * @param eventTypes 
      * @param endpoints
      * @param arg0
      * @param arg1
      */
-    public ShowEndpointsAction(MAEndpointList endpoints,String arg0, Icon 
arg1) {
+    public ShowEndpointsAction(Set<String> eventTypes, MAEndpointList 
endpoints,String arg0, Icon arg1) {
         super(endpoints, arg0, arg1);
-        putValue(SHORT_DESCRIPTION,"Select Measurement archives to be 
queried");        
+        putValue(SHORT_DESCRIPTION,"Select Measurement archives to be 
queried");
+        this.eventTypes = eventTypes;
     }
 
     /* (non-Javadoc)
@@ -104,10 +110,10 @@
     }
 
     public final void actionPerformed(ActionEvent e) {
-       JDialog dialog = createDialog();
+       JDialog dialog = createDialog(eventTypes);
         dialog.setVisible(true);
         postAction();
-        fireActionFinished(getSelectedEndpoints());
+        fireSelectionChanged(getSelectedEndpoints());
     }
 
     public void addListener(Listener listener) {
@@ -118,12 +124,10 @@
        listeners.remove(listener);
     }
     
-    protected JComponent createEndpointsPanel() {   
+    protected JComponent createEndpointsPanel(Set<String> eventTypes) {   
        actions = createActions();
-       JTabbedPane pane = new JTabbedPane(SwingConstants.BOTTOM, 
JTabbedPane.SCROLL_TAB_LAYOUT);
-       pane.addTab(".conf file", new MAEndpointsPanel(endpoints,actions));
-       pane.addTab("Lookup Service", new 
LSEndpointsPanel(!endpoints.isMultipleEndpoints()));
-        
+       JComponent pane = createMethodSelector(eventTypes);
+       
         for (int i=0; i < actions.length;i++) {
                actions[i].setActions(allActions);
                actions[i].setFrame(pane);
@@ -132,6 +136,18 @@
         
         return pane;
     }
+
+       protected JComponent createMethodSelector(Set<String> eventTypes) {
+               final JTabbedPane pane = new 
JTabbedPane(SwingConstants.BOTTOM, JTabbedPane.SCROLL_TAB_LAYOUT);
+               
+               JComponent confFile = new MAEndpointsPanel(endpoints,actions);
+               ls = new 
LSEndpointsPanel(eventTypes,!endpoints.isMultipleEndpoints());
+       
+               pane.addTab(".conf file", confFile);
+       pane.addTab("Lookup Service", ls);
+
+               return pane;
+       }
     
        protected void postAction() {           
                for(PSUIAction action : actions) {
@@ -140,9 +156,9 @@
         allActions.clear();    
        }
 
-       protected JDialog createDialog() {
+       protected JDialog createDialog(Set<String> eventTypes) {
                JDialog dialog = new JDialog((JFrame)frame,"Measurement 
archives");
-        dialog.setContentPane(createEndpointsPanel());
+        dialog.setContentPane(createEndpointsPanel(eventTypes));
         dialog.setModal(true);
         dialog.pack();
         dialog.setComponentOrientation(((frame == null) ? 
dialog.getRootPane() : frame).getComponentOrientation());
@@ -158,12 +174,16 @@
                                points.add(point);
                        }
                }
+               for(Service service : ls.getSelectedServices()) {
+                       MAEndpoint endpoint = new 
MAEndpoint(service.getEndPoint().toASCIIString());
+                       points.add(endpoint);
+               }
                return points;          
        }
        
-       protected void fireActionFinished(Collection<MAEndpoint> selected) {
+       protected void fireSelectionChanged(Collection<MAEndpoint> selected) {
        for(Listener listener : listeners) {
-               listener.actionFinished(selected);
+               listener.selectionChanged(selected);
        }
     }
 

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/util/Collections.java


Property changes on: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/util/Collections.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain