perfsonar development work

Author: gijs
Date: 2007-06-13 11:12:17 -0400 (Wed, 13 Jun 2007)
New Revision: 2469

Added:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MainPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MomentPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RouterPanel.java
Removed:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAPanel.java
Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/PerfsonarFlowSAModel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/package.html
   branches/perfsonarui/src/plugins.flowsa.classes
Log:


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

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/PerfsonarFlowSAModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/PerfsonarFlowSAModel.java
 2007-06-12 11:23:00 UTC (rev 2468)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/PerfsonarFlowSAModel.java
 2007-06-13 15:12:17 UTC (rev 2469)
@@ -2,11 +2,14 @@
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
-import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.JComponent;
+
 import org.perfsonar.perfsonarui.AbstractUserData;
 import org.perfsonar.perfsonarui.IPerfsonarSchema;
+import org.perfsonar.perfsonarui.PerfsonarSchema;
 import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
@@ -20,38 +23,35 @@
 import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.SelectOneEndpointAction;
 
+import org.perfsonar.perfsonarui.flowsa.panels.MainPanel;
+import org.perfsonar.perfsonarui.flowsa.panels.MomentPanel;
+import org.perfsonar.perfsonarui.flowsa.panels.RouterPanel;
 
+
+
+
 public class PerfsonarFlowSAModel extends PerfsonarModel {
 
        
        public PerfsonarFlowSAModel() {
                super();
-
-        for (int i=0; i < endpointList.size();i++)
-            if (endpointList.get(i).isEnabled()) {
-                userData.setEndpoint(endpointList.get(i));
-                break;
-            }
+               getEndpointList().setMultipleEndpoints(false);
        }
+       
        @Override
        public IUserData createUserData() {
                return new AbstractUserData();
        }
+       
        @Override
        protected IUserDataComparator createComparator() {
                return null;
        }
+       
        @Override
-       public PerfsonarRequestAction createDataRequestAction() {
-               return new 
FlowSARequestAction(request,userData,endpointList,"Query",null,defaultGroupQuery);
-       }
-       @Override
        public PSUIAction createEndpointsAction(MAEndpointList endpointList) {
                return new SelectOneEndpointAction(endpointList) {
-                   /**
-                        * 
-                        */
-                       private static final long serialVersionUID = 1L;
+                       private static final long serialVersionUID = 
-8031072786983472041L;
 
                        @Override
                    public void actionPerformed(ActionEvent arg0) {
@@ -64,29 +64,24 @@
                    }
         };
        }
+       
        @Override
-       public PSUIAction createOptionsAction() {
-               return null;
+       /**
+        * No real options here. These are only to illustrate the idea.
+        */
+       public JComponent[] createOptionsComponent(Component parentComponent) 
{
+               return new JComponent[] { 
+                               new MomentPanel(),
+                               new RouterPanel()
+               };
        }
-
+       
        @Override
        public ITimeValueResponse createTimeValueResponseListener() {
                return null;
-       }       
-       
-       /**
-        * Loads all service addresses frmo "MA.conf" file. 
-        * @return
-        */
-       public MAEndpointList createEndpoints() {
-               try {
-                       MAEndpointList list = new MAEndpointList(new 
File("MA.conf"),null);
-                       list.setMultipleEndpoints(false);
-                       return list;
-               } catch (Exception x) {
-                       return new MAEndpointList(false);
-               }
        }
+       
+
        @Override
        protected SmartMARequest createSmartRequest() {
                if (request != null) return request;
@@ -104,7 +99,7 @@
        }
 
        public PluginMainPanel createMainComponent(Component parentComponent) 
{
-               return new FlowSAPanel(parentComponent,this);
+               return new MainPanel(parentComponent,this);
        }
        @Override
        public String toString() {
@@ -116,8 +111,9 @@
        }
        @Override
        public List<IPerfsonarSchema> getSupportedRequests() {
-               // TODO Auto-generated method stub
-               return null;
+           ArrayList<IPerfsonarSchema> supported = new 
ArrayList<IPerfsonarSchema>();
+               supported.add(new PerfsonarSchema("flowsa"));
+               return supported;
        }
 }
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/package.html
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/package.html    
  2007-06-12 11:23:00 UTC (rev 2468)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/package.html    
  2007-06-13 15:12:17 UTC (rev 2469)
@@ -1,7 +1,6 @@
 <HTML><HEAD><TITLE>Ambit project</TITLE>
 <META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
 
-</SCRIPT>
 
 <META NAME="Description" CONTENT="PerfsonarUI">
 <META NAME="Keywords" CONTENT="perfsonar, perfsonar UI">

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MainPanel.java

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MomentPanel.java

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RouterPanel.java

Modified: branches/perfsonarui/src/plugins.flowsa.classes
===================================================================
--- branches/perfsonarui/src/plugins.flowsa.classes     2007-06-12 11:23:00 
UTC (rev 2468)
+++ branches/perfsonarui/src/plugins.flowsa.classes     2007-06-13 15:12:17 
UTC (rev 2469)
@@ -1 +1,3 @@
-org/perfsonar/perfsonarui/flowsa/*.class
\ No newline at end of file
+org/perfsonar/perfsonarui/flowsa/*.class
+org/perfsonar/perfsonarui/flowsa/actions/*.class
+org/perfsonar/perfsonarui/flowsa/panels/*.class
\ No newline at end of file