perfsonar development work

Author: michael.bischoff
Date: 2007-09-07 03:23:44 -0400 (Fri, 07 Sep 2007)
New Revision: 2782

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/panels/RouterOptionsPanel.java
Log:


Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java  
2007-09-06 19:05:24 UTC (rev 2781)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java  
2007-09-07 07:23:44 UTC (rev 2782)
@@ -41,6 +41,7 @@
  */
 public class FlowSAModel extends PerfsonarModel {
 
+       private static final PerfsonarSchema PERFSONAR_SCHEMA = new 
PerfsonarSchema("flowsa");
        private final MainOptionsPanel mainOptionsPanel = new 
MainOptionsPanel();
        private final MomentOptionsPanel momentOptionsPanel = new 
MomentOptionsPanel();
        private final RouterOptionsPanel routerOptionsPanel = new 
RouterOptionsPanel();
@@ -63,13 +64,13 @@
        public FlowSAModel(MAEndpointList endpoints) {
                super(endpoints);
                MAEndpoint currentEndPoint = 
initialiseEndPoints(this.endpointList);    
-               logger.error("currentEndpoint = "+currentEndPoint);
+               logger.debug("currentEndpoint = "+currentEndPoint);
                getUserData().setEndpoint(currentEndPoint);             
        }
 
        /**
         * Looks through the list and selects the fist avail endpoint if 
-        * non are availiable then it picks the first from the list enables 
+        * none are available then it picks the first from the list enables 
         * it and returns that endpoint
         * @param endpointList
         * @return a endpoint if avail or null.
@@ -122,8 +123,8 @@
        @Override
        public MAEndpointList createEndpoints() {
                MAEndpointList endpoints = new MAEndpointList(false);
-               endpoints.add(new 
MAEndpoint("local,http://sonar1.amsterdam.surfnet.nl:8080/flowsa-ma-0.0.1/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
-               endpoints.add(new 
MAEndpoint("SURFnet,http://localhost:8080/flowsa-ma-0.0.1/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
+               endpoints.add(new 
MAEndpoint("local,http://localhost:8080/flowsa-ma-0.0.1/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
+               endpoints.add(new 
MAEndpoint("SURFnet,http://sonar1.amsterdam.surfnet.nl:8080/flowsa-ma-0.0.1/services/FlowsaMeasurementArchiveService,\"\",flowsa,flowsa";));
                return endpoints;
        }
 
@@ -155,32 +156,19 @@
 
                        @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.TOPFILTER,
-                                               topOptionsPanel.getFilter());
-                               
getUserData().setQuery(FlowSAUserData.TOPAGGREGATION,
-                                               
topOptionsPanel.getAggregation());
+                               
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.TOPFILTER, topOptionsPanel.getFilter());
+                               
getUserData().setQuery(FlowSAUserData.TOPAGGREGATION, 
topOptionsPanel.getAggregation());
                        }
                };
        }
@@ -233,7 +221,7 @@
        @Override
        public List<IPerfsonarSchema> getSupportedRequests() {
                ArrayList<IPerfsonarSchema> supported = new 
ArrayList<IPerfsonarSchema>();
-               supported.add(new PerfsonarSchema("flowsa"));
+               supported.add(PERFSONAR_SCHEMA);
                return supported;
        }
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java  
      2007-09-06 19:05:24 UTC (rev 2781)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java  
      2007-09-07 07:23:44 UTC (rev 2782)
@@ -43,7 +43,7 @@
                FlowSARequest request = new FlowSARequest();
 
                FlowSAUserData fakeUserData = new FlowSAUserData();
-               fakeUserData.setQuery(FlowSAUserData.ROUTERS, "ford arthur");
+               fakeUserData.setQuery(FlowSAUserData.ROUTERS, "test arthur");
                fakeUserData.setQuery(FlowSAUserData.RAWAGGREGATION, 
"aggregation rule");
                fakeUserData.setQuery(FlowSAUserData.RAWFILTER, "filter 
rule");
                fakeUserData.setQuery(FlowSAUserData.RAWFIELDS, 
"AddressFamily TimeFirstSeen MsecFirstSeen");

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RouterOptionsPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RouterOptionsPanel.java
    2007-09-06 19:05:24 UTC (rev 2781)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RouterOptionsPanel.java
    2007-09-07 07:23:44 UTC (rev 2782)
@@ -22,7 +22,7 @@
 
                routerList.setModel(new javax.swing.AbstractListModel() {
                        private static final long serialVersionUID = 1L;
-                       String[] strings = { "Arthur", "Zaphod", "Ford", 
"Trillian" };
+                       String[] strings = { "test","Arthur", "Zaphod", 
"Ford", "Trillian" };
 
                        public Object getElementAt(int i) {
                                return strings[i];