perfsonar development work

Author: gijs
Date: 2007-07-24 10:13:10 -0400 (Tue, 24 Jul 2007)
New Revision: 2568

Added:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAResponse.java
Removed:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAPerfsonarResponse.java
Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequestAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAUserData.java
Log:
more query building work

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java  
2007-07-24 12:54:03 UTC (rev 2567)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java  
2007-07-24 14:13:10 UTC (rev 2568)
@@ -3,7 +3,7 @@
  $Id$
  $Copyright$
  
-*/
+ */
 
 package org.perfsonar.perfsonarui.flowsa;
 
@@ -17,7 +17,6 @@
 import org.perfsonar.perfsonarui.PerfsonarSchema;
 import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
-import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.plugins.MAEndpointList;
 import org.perfsonar.perfsonarui.ui.PerfsonarModel;
@@ -41,34 +40,54 @@
        private RawOptionsPanel rawOptionsPanel;
        private TopOptionsPanel topOptionsPanel;
 
-       
        public FlowSAModel() {
                this(null);
        }
-       
+
        public FlowSAModel(MAEndpointList endpoints) {
                super(endpoints);
-               getEndpointList().setMultipleEndpoints(false);
+               int enabledEndpoint = -1;
+
+               // reset status
+               for (int i = 0; i < endpointList.size(); i++) {
+                       ((MAEndpoint) 
endpointList.get(i)).setStatusExplanation("");
+                       ((MAEndpoint) endpointList.get(i)).setStatus("");
+               }
+
+               // find first selected
+               for (int i = 0; i < endpointList.size(); i++)
+                       if (((MAEndpoint) endpointList.get(i)).isEnabled()) {
+                               enabledEndpoint = i;
+                               break;
+                       }
+
+               // if no selected; select first
+               if (enabledEndpoint == -1) {
+                       ((MAEndpoint) endpointList.get(0)).setEnabled(true);
+                       enabledEndpoint = 0;
+               }
+
+               getUserData().setEndpoint(endpointList.get(enabledEndpoint));
+
                mainOptionsPanel = new MainOptionsPanel();
                momentOptionsPanel = new MomentOptionsPanel();
                routerOptionsPanel = new RouterOptionsPanel();
                rawOptionsPanel = new RawOptionsPanel();
                topOptionsPanel = new TopOptionsPanel();
        }
-               
-       
-       
+
        @Override
-       public MAEndpointList getEndpointList() {
-           MAEndpointList endpoints = new MAEndpointList();
-       MAEndpoint endpoint = new 
MAEndpoint("SURFnet,http://sonar1.amsterdam.surfnet.nl:8080/services/flowsama,flowsa,,flowsa,flowsa";);
-       endpoints.add(endpoint);
-       return endpoints;
+       public MAEndpointList createEndpoints() {
+               MAEndpointList endpoints = new MAEndpointList(false);
+               MAEndpoint endpoint = new MAEndpoint(
+                               
"SURFnet,http://sonar1.amsterdam.surfnet.nl:8080/services/flowsama,flowsa,\"\",flowsa,flowsa";);
+               endpoints.add(endpoint);
+               return endpoints;
        }
 
        @Override
        public JComponent[] createOptionsComponent(Component parentComponent) 
{
-               return new JComponent[] {mainOptionsPanel, momentOptionsPanel,
+               return new JComponent[] { mainOptionsPanel, 
momentOptionsPanel,
                                routerOptionsPanel, rawOptionsPanel, 
topOptionsPanel };
        }
 
@@ -76,7 +95,7 @@
        public FlowSAUserData createUserData() {
                return new FlowSAUserData();
        }
-       
+
        public PSUIAction createOptionsAction() {
                return new SetOptionsAction(this) {
 
@@ -84,37 +103,48 @@
 
                        @Override
                        protected void confirm(JComponent[] optionPanels) {
-                               
getUserData().setQuery(FlowSAUserData.QUERYTYPE, 
mainOptionsPanel.getQueryType());
-                               
getUserData().setQuery(FlowSAUserData.STARTMOMENT, 
momentOptionsPanel.getStartMoment());
-                               
getUserData().setQuery(FlowSAUserData.ENDMOMENT, 
momentOptionsPanel.getEndMoment());
-                               
getUserData().setQuery(FlowSAUserData.ROUTERS, 
routerOptionsPanel.getRouters());
-                               
getUserData().setQuery(FlowSAUserData.RAWFILTER, rawOptionsPanel.getFilter());
-                               
getUserData().setQuery(FlowSAUserData.RAWAGGREGATION, 
rawOptionsPanel.getAggregation());
-                               
getUserData().setQuery(FlowSAUserData.RAWFIELDS, rawOptionsPanel.getFields());
-                               
getUserData().setQuery(FlowSAUserData.TOPELEMENTS, 
topOptionsPanel.getElement());
-                               
getUserData().setQuery(FlowSAUserData.TOPORDERBY, 
topOptionsPanel.getOrderBy());
-                               
getUserData().setQuery(FlowSAUserData.TOPNUMBER, topOptionsPanel.getNumber());
-                               
getUserData().setQuery(FlowSAUserData.TOPTRANSGROUP, 
topOptionsPanel.getTransGroup());
+                               
getUserData().setQuery(FlowSAUserData.QUERYTYPE,
+                                               
mainOptionsPanel.getQueryType());
+                               
getUserData().setQuery(FlowSAUserData.STARTMOMENT,
+                                               
momentOptionsPanel.getStartMoment());
+                               
getUserData().setQuery(FlowSAUserData.ENDMOMENT,
+                                               
momentOptionsPanel.getEndMoment());
+                               getUserData().setQuery(FlowSAUserData.ROUTERS,
+                                               
routerOptionsPanel.getRouters());
+                               
getUserData().setQuery(FlowSAUserData.RAWFILTER,
+                                               rawOptionsPanel.getFilter());
+                               
getUserData().setQuery(FlowSAUserData.RAWAGGREGATION,
+                                               
rawOptionsPanel.getAggregation());
+                               
getUserData().setQuery(FlowSAUserData.RAWFIELDS,
+                                               rawOptionsPanel.getFields());
+                               
getUserData().setQuery(FlowSAUserData.TOPELEMENTS,
+                                               topOptionsPanel.getElement());
+                               
getUserData().setQuery(FlowSAUserData.TOPORDERBY,
+                                               topOptionsPanel.getOrderBy());
+                               
getUserData().setQuery(FlowSAUserData.TOPNUMBER,
+                                               topOptionsPanel.getNumber());
+                               
getUserData().setQuery(FlowSAUserData.TOPTRANSGROUP,
+                                               
topOptionsPanel.getTransGroup());
                        }
                };
        }
 
        @Override
        public JComponent[] createDetailsComponent(Component parentComponent) 
{
-               String[][] s = new String[][] { 
-                               {FlowSAUserData.QUERYTYPE, "Query Type" },
-                               {FlowSAUserData.ROUTERS, "Routers" },
-                               {FlowSAUserData.STARTMOMENT, "Start Moment" },
-                               {FlowSAUserData.ENDMOMENT, "End Moment" },
-                               {FlowSAUserData.RAWFILTER, "Raw Filter rule" 
},
-                               {FlowSAUserData.RAWAGGREGATION, "Raw 
Aggregation rule" },
-                               {FlowSAUserData.RAWFIELDS, "Raw fields" },
-                               {FlowSAUserData.TOPELEMENTS, "Top fields" },
-                               {FlowSAUserData.TOPORDERBY, "Top Order by" },
-                               {FlowSAUserData.TOPNUMBER, "Top Numbers" },
-                               {FlowSAUserData.TOPTRANSGROUP, "Top Group 
Transport ports" }
-               };
-               UserDataDetailsPane userDataPanel = new 
UserDataDetailsPane("Settings", getUserData(), s, true, false);
+               String[][] s = new String[][] {
+                               { FlowSAUserData.QUERYTYPE, "Query Type" },
+                               { FlowSAUserData.ROUTERS, "Routers" },
+                               { FlowSAUserData.STARTMOMENT, "Start Moment" 
},
+                               { FlowSAUserData.ENDMOMENT, "End Moment" },
+                               { FlowSAUserData.RAWFILTER, "Raw Filter rule" 
},
+                               { FlowSAUserData.RAWAGGREGATION, "Raw 
Aggregation rule" },
+                               { FlowSAUserData.RAWFIELDS, "Raw fields" },
+                               { FlowSAUserData.TOPELEMENTS, "Top fields" },
+                               { FlowSAUserData.TOPORDERBY, "Top Order by" },
+                               { FlowSAUserData.TOPNUMBER, "Top Numbers" },
+                               { FlowSAUserData.TOPTRANSGROUP, "Top Group 
Transport ports" } };
+               UserDataDetailsPane userDataPanel = new 
UserDataDetailsPane("Settings",
+                               getUserData(), s, true, false);
                return new JComponent[] { userDataPanel };
        }
 
@@ -130,17 +160,9 @@
                };
        }
 
-       
-       @Override
-       protected PerfsonarRequestAction createMetadataRequestAction() {
-               metadataRequestAction = new FlowSARequestAction(request, 
(FlowSAUserData)getUserData(), endpointList);
-               
metadataRequestAction.setGroup(IPerfsonarTab.defaultGroupQuery);
-               return metadataRequestAction;
-       }
-       
-       
        public PluginMainPanel createMainComponent(Component parentComponent) 
{
-               return new QueryResultPanel(parentComponent, this, 
(FlowSAUserData)getUserData());
+               return new QueryResultPanel(parentComponent, this,
+                               (FlowSAUserData) getUserData());
        }
 
        @Override
@@ -154,13 +176,20 @@
 
        @Override
        public FlowSAUserData getUserData() {
-               return (FlowSAUserData)userData;
+               return (FlowSAUserData) userData;
        }
-       
+
        @Override
        public List<IPerfsonarSchema> getSupportedRequests() {
                ArrayList<IPerfsonarSchema> supported = new 
ArrayList<IPerfsonarSchema>();
                supported.add(new PerfsonarSchema("flowsa"));
                return supported;
        }
+
+       @Override
+       protected PerfsonarRequestAction createMetadataRequestAction() {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
 }

Deleted: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAPerfsonarResponse.java

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java  
      2007-07-24 12:54:03 UTC (rev 2567)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java  
      2007-07-24 14:13:10 UTC (rev 2568)
@@ -7,196 +7,79 @@
 
 package org.perfsonar.perfsonarui.flowsa;
 
+import java.io.InputStream;
+import java.io.StringWriter;
+
+import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.jdom.Element;
-import org.jdom.Namespace;
 import org.perfsonar.perfsonarui.AbstractMARequest;
-import org.perfsonar.perfsonarui.AbstractUserData;
-import org.perfsonar.perfsonarui.ma.UserData;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarResponse;
 import org.perfsonar.perfsonarui.plugins.IUserData;
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 import org.perfsonar.perfsonarui.plugins.MetaDataList;
 import org.w3c.dom.Document;
 
+import com.sun.org.apache.xml.internal.serialize.OutputFormat;
+import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
+
 public class FlowSARequest extends AbstractMARequest {
-       protected static String[] URI_nmwgt = { "",
-                       "http://ggf.org/ns/nmwg/topology/";,
-                       "http://ggf.org/ns/nmwg/topology/2.0/"; };
-       protected static String[] URI_nmwg = { "", NMWG, NMWG2 };
-       protected static String[][] URI_perfsonar = {
-                       { "perfsonar", 
"http://ggf.org/ns/nmwg/tools/org/perfsonar/"; },
-                       { "perfsonar", 
"http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/"; },
-                       { "flow", "http://ggf.org/ns/nmwg/tools/flow/2.0/"; } 
};
-       protected static String[] URI_nmwg_select = { "",
-                       "http://ggf.org/ns/nmwg/ops/select/";,
-                       "http://ggf.org/ns/nmwg/ops/select/2.0/"; };
 
-       protected Namespace nmwg = null;
-       protected Namespace nmwgt = null;
-       protected Namespace perfsonar = null;
-       protected Namespace select = null;
-       protected int nmwg_version; // nmwgv2
-       protected int perfsonar_version; // nmwgv2
-       protected int subjectid = 1;
-
-       public DocumentBuilderFactory factory;
-
        public FlowSARequest() {
                super();
        }
 
        @Override
-       public Document createRequest(IUserData uData, String messageType)
+       public Document createRequest(IUserData data, String messageType)
                        throws Exception {
-               return createSetupDataReq((UserData) uData);
+               String inputFile = 
"org/perfsonar/perfsonarui/flowsa/rawquery.xml";
+               Document request = null;
+               DocumentBuilderFactory factory = 
DocumentBuilderFactory.newInstance();
+               factory.setNamespaceAware(true);
+               DocumentBuilder builder = factory.newDocumentBuilder();
+               InputStream stream = this.getClass().getClassLoader()
+                               .getResourceAsStream(inputFile);
+
+               request = builder.parse(stream);
+               StringWriter sw = new StringWriter();
+               OutputFormat format = new OutputFormat(request);
+               format.setLineWidth(65);
+               format.setIndenting(true);
+               format.setIndent(2);
+
+               XMLSerializer output = new XMLSerializer(sw, format);
+               output.serialize(request);
+               logger.debug(sw.toString());
+               return request;
        }
 
        @Override
        public Document createRequest(MAEndpoint endpoint, MetaDataList query,
                        String messageType) throws Exception {
-               throw new Exception("Request not available");
+               System.out.println("request.createRequest2");
+               return null;
        }
 
-       protected Document createSetupDataReq(UserData userData) throws 
Exception {
-               initializeNamespaces();
-
-               Element MesgElem = new Element(E_MESSAGE, nmwg);
-               MesgElem.setAttribute(E_TYPE, MA_SetupDataRequest);
-               MesgElem.setAttribute(E_ID, "message" + getId());
-               MesgElem.addNamespaceDeclaration(nmwgt);
-               MesgElem.addNamespaceDeclaration(perfsonar);
-               MesgElem.addNamespaceDeclaration(select);
-
-               createSetupDataMetaData(userData, MesgElem, userData
-                               .getQuery(UserData.C_DIRECTION));
-
-               return createDocumentFromElement(MesgElem);
-       }
-
-       protected Element createSetupDataMetaData(UserData userData,
-                       Element MesgElem, String id) {
-               String metadataID1 = "meta_" + id;// +
-               // Long.toString(System.currentTimeMillis());
-               Element MetElem = createMetadataSection(userData, 
metadataID1);
-               MesgElem.addContent(MetElem);
-
-               String metadataID2 = "m_param_" + id;// 
+Long.toString(System.currentTimeMillis());
-               Element MetElem2 = createMetadataSection2(userData, 
metadataID2,
-                               MetElem.getAttributeValue(E_ID));
-               MesgElem.addContent(MetElem2);
-
-               Element data = new Element(E_DATA, nmwg);
-               data.setAttribute(E_ID, "data_" + id);// 
Long.toString(System.currentTimeMillis()));
-               data.setAttribute(E_METADATAIDREF, 
MetElem2.getAttributeValue(E_ID));
-               MesgElem.addContent(data);
-               return MesgElem;
-
-       }
-
-       public Element createMetadataSection(UserData userData, String 
metadataID) {
-               Element MetElem = new Element(E_METADATA, nmwg);
-               MetElem.setAttribute(E_ID, metadataID);
-               Element SubjElem = new Element(E_SUBJECT, perfsonar);
-               SubjElem.setAttribute(E_ID, "subject_" + subjectid);
-               subjectid++;
-               return MetElem;
-       }
-
-       public Element createMetadataSection2(UserData userData, String 
metadataID,
-                       String metadataIDRef) {
-
-               Namespace selectParams = getParamsNamespace();
-               Namespace subjectNS = getSubjectNamespace();
-
-               Element MetElem = new Element(E_METADATA, nmwg);
-
-               MetElem.setAttribute(E_ID, metadataID);
-
-               Element SubjElem = new Element(E_SUBJECT, subjectNS);
-
-               // SubjElem.setAttribute(E_ID,
-               // "subject"+Long.toString(System.currentTimeMillis()));
-               SubjElem.setAttribute(E_ID, "subject1_" + subjectid);
-               subjectid++;
-               SubjElem.setAttribute(E_METADATAIDREF, metadataIDRef);
-
-               MetElem.addContent(SubjElem);
-
-               MetElem.addContent(new Element("eventType", nmwg)
-                               .setText(getSelectEventType()));
-
-               Element ParamElem = new Element(E_PARAMETERS, select);
-               ParamElem.setAttribute(E_ID, "param_" + subjectid);
-               MetElem.addContent(ParamElem);
-
-               Element ParamIntElem1 = new Element(E_PARAMETER, 
selectParams);
-               ParamIntElem1.setAttribute(E_PARAMETERNAME, E_STARTTIME);
-               
ParamIntElem1.setText(userData.getStartTime(AbstractUserData.ID_QUERY));
-               ParamElem.addContent(ParamIntElem1);
-
-               Element ParamIntElem2 = new Element(E_PARAMETER, 
selectParams);
-               ParamIntElem2.setAttribute(E_PARAMETERNAME, E_ENDTIME);
-               
ParamIntElem2.setText(userData.getEndTime(AbstractUserData.ID_QUERY));
-               ParamElem.addContent(ParamIntElem2);
-
-               Element ParamIntElem4 = new Element(E_PARAMETER, 
selectParams);
-               ParamIntElem4.setAttribute(E_PARAMETERNAME, 
E_CONSOLIDATIONFUNCTION);
-               ParamIntElem4.setText(userData
-                               
.getConsolidationFunc(AbstractUserData.ID_QUERY));
-               ParamElem.addContent(ParamIntElem4);
-
-               Element ParamIntElem5 = new Element(E_PARAMETER, 
selectParams);
-               ParamIntElem5.setAttribute(E_PARAMETERNAME, E_RESOLUTION);
-               ParamIntElem5
-                               
.setText(userData.getResolution(AbstractUserData.ID_QUERY));
-               ParamElem.addContent(ParamIntElem5);
-
-               return MetElem;
-       }
-
-       public void initializeNamespaces() {
-               if (nmwg == null)
-                       nmwg = Namespace.getNamespace("nmwg", 
URI_nmwg[nmwg_version]);
-               if (nmwgt == null)
-                       nmwgt = Namespace.getNamespace("nmwgt", 
URI_nmwgt[nmwg_version]);
-               if (perfsonar == null)
-                       perfsonar = Namespace.getNamespace(
-                                       URI_perfsonar[perfsonar_version][0],
-                                       URI_perfsonar[perfsonar_version][1]);
-               if (select == null)
-                       select = Namespace.getNamespace("select",
-                                       URI_nmwg_select[nmwg_version]);
-
-       }
-
-       protected Namespace getParamsNamespace() {
-               return select;
-       }
-
-       protected Namespace getSubjectNamespace() {
-               return perfsonar;
-       }
-
-       protected String getSelectEventType() {
-               return "select";
-       }
-
        @Override
        public String getMessageNamespace() {
-               return getClass().getName();
+               System.out.println("request.getMessageNamespace");
+               return null;
        }
 
        public String[] getNamespaces() {
-               return new String[] { getClass().getName() };
+               System.out.println("request.getNamespaces");
+               return null;
        }
 
        public String getRequestType() {
-               return getClass().getName();
+               System.out.println("request.getRequestType");
+               return null;
        }
 
-       public void process(IUserData uData, Document response,
+       public void process(IUserData data, Document response,
                        IPerfsonarResponse listener) throws Exception {
+               System.out.println("request.process");
+
        }
+
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequestAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequestAction.java
  2007-07-24 12:54:03 UTC (rev 2567)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequestAction.java
  2007-07-24 14:13:10 UTC (rev 2568)
@@ -9,72 +9,36 @@
 
 import java.awt.event.ActionEvent;
 
-import javax.swing.Icon;
-import javax.swing.JOptionPane;
-
 import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
-import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
+import org.perfsonar.perfsonarui.plugins.IUserData;
 import org.perfsonar.perfsonarui.plugins.MAEndpointList;
 import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
 
 public class FlowSARequestAction extends PerfsonarRequestAction {
 
-       private static final long serialVersionUID = -97086740851913593L;
-       protected MAEndpointList endpoints;
+       private static final long serialVersionUID = 1L;
 
-       public FlowSARequestAction(IPerfsonarRequest request, FlowSAUserData 
userData,
-                       MAEndpointList endpoints) {
-               this(request, userData, endpoints, "Query",
-                               IPerfsonarTab.defaultGroupQuery);
+       public FlowSARequestAction(IPerfsonarRequest request, IUserData 
userData) {
+               super(request, userData);
        }
 
-       public FlowSARequestAction(IPerfsonarRequest request, FlowSAUserData 
userData,
-                       MAEndpointList endpoints, String arg0, String group) {
-               this(request, userData, endpoints, arg0, null, group);
+       public FlowSARequestAction(SmartMARequest request, FlowSAUserData 
userData,
+                       MAEndpointList endpointList) {
+               super(request, userData);
        }
 
-       public FlowSARequestAction(IPerfsonarRequest request, FlowSAUserData 
userData,
-                       MAEndpointList endpoints, String arg0, Icon arg1, 
String group) {
-               super(request, userData, arg0, arg1, group);
-               this.endpoints = endpoints;
+       @Override
+       public void done() {
+               System.out.println("requestAction.done");
+               
        }
 
-
        @Override
        public void run(ActionEvent arg0) {
-               if (request == null)
-                       return;
-
-               try {
-                       request.fireStatusMessage("Sending request to "
-                                       + userData.getEndpoint() + " for " + 
userData.toString());
-
-                       boolean runInThread = false;
-                       request.makeRequest(
-                       userData,
-                       IPerfsonarRequest.MA_SetupDataRequest,
-                       new FlowSAPerfsonarResponse(userData),
-                       runInThread);
-
-                       if (request instanceof SmartMARequest)
-                               ((SmartMARequest) request).isReady();
-
-                       request.fireStatusMessage(userData.toString()
-                                       + " data retrieved in " + 
userData.getServiceTime()
-                                       + " ms.");
-
-               } catch (Exception x) {
-                       request.fireStatusMessage("Error retrieving data ");
-                       JOptionPane.showMessageDialog(frame, x, "Error",
-                                       JOptionPane.ERROR_MESSAGE);
-                       logger.error(x);
-               }
-
+               System.out.println("requestAction.run");
+               
        }
 
-       @Override
-       public void done() {
-       }
 
 }

Copied: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAResponse.java 
(from rev 2551, 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAPerfsonarResponse.java)

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAUserData.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAUserData.java 
      2007-07-24 12:54:03 UTC (rev 2567)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAUserData.java 
      2007-07-24 14:13:10 UTC (rev 2568)
@@ -10,6 +10,8 @@
 import java.util.Calendar;
 
 import org.perfsonar.perfsonarui.AbstractUserData;
+import org.perfsonar.perfsonarui.plugins.IUserData;
+import org.perfsonar.perfsonarui.plugins.MAEndpoint;
 
 public class FlowSAUserData extends AbstractUserData {
 
@@ -27,6 +29,7 @@
        public final static String TOPNUMBER = "Top Numbers";
        public final static String TOPTRANSGROUP = "Top Group Transport 
ports";
 
+
        public FlowSAUserData() {
                super();