perfsonar development work

Author: gijs
Date: 2007-07-02 10:04:07 -0400 (Mon, 02 Jul 2007)
New Revision: 2492

Added:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/UserData.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MainOptionsPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MomentOptionsPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RawOptionsPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RawPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RouterOptionsPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/StatPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/TopOptionsPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/TopPanel.java
Removed:
   
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
Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/PerfsonarFlowSAModel.java
Log:
made plugin more perfsonarui'isch looking. 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/PerfsonarFlowSAModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/PerfsonarFlowSAModel.java
 2007-07-02 12:46:07 UTC (rev 2491)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/PerfsonarFlowSAModel.java
 2007-07-02 14:04:07 UTC (rev 2492)
@@ -1,31 +1,27 @@
 package org.perfsonar.perfsonarui.flowsa;
 
 import java.awt.Component;
-import java.awt.event.ActionEvent;
 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;
-import org.perfsonar.perfsonarui.plugins.IUserData;
-import org.perfsonar.perfsonarui.plugins.IUserDataComparator;
 import org.perfsonar.perfsonarui.plugins.MAEndpoint;
-import org.perfsonar.perfsonarui.plugins.MAEndpointList;
 import org.perfsonar.perfsonarui.ui.PerfsonarModel;
 import org.perfsonar.perfsonarui.ui.PluginMainPanel;
-import org.perfsonar.perfsonarui.ui.actions.PSUIAction;
 import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
-import org.perfsonar.perfsonarui.ui.actions.SelectOneEndpointAction;
+import org.perfsonar.perfsonarui.ui.panels.ResponseDetailsPane;
 
-import org.perfsonar.perfsonarui.flowsa.panels.MainPanel;
-import org.perfsonar.perfsonarui.flowsa.panels.MomentPanel;
-import org.perfsonar.perfsonarui.flowsa.panels.RouterPanel;
+import org.perfsonar.perfsonarui.flowsa.panels.MainOptionsPanel;
+import org.perfsonar.perfsonarui.flowsa.panels.MomentOptionsPanel;
+import org.perfsonar.perfsonarui.flowsa.panels.RawOptionsPanel;
+import org.perfsonar.perfsonarui.flowsa.panels.RawPanel;
+import org.perfsonar.perfsonarui.flowsa.panels.RouterOptionsPanel;
+import org.perfsonar.perfsonarui.flowsa.panels.TopOptionsPanel;
 
 
 
@@ -38,50 +34,36 @@
                getEndpointList().setMultipleEndpoints(false);
        }
        
-       @Override
-       public IUserData createUserData() {
-               return new AbstractUserData();
-       }
        
        @Override
-       protected IUserDataComparator createComparator() {
-               return null;
-       }
-       
-       @Override
-       public PSUIAction createEndpointsAction(MAEndpointList endpointList) {
-               return new SelectOneEndpointAction(endpointList) {
-                       private static final long serialVersionUID = 
-8031072786983472041L;
-
-                       @Override
-                   public void actionPerformed(ActionEvent arg0) {
-                       super.actionPerformed(arg0);
-                for (int i=0; i < endpoints.size();i++)
-                    if (endpoints.get(i).isEnabled()) {
-                        userData.setEndpoint(endpoints.get(i));
-                        break;
-                    }
-                   }
-        };
-       }
-       
-       @Override
-       /**
-        * No real options here. These are only to illustrate the idea.
-        */
        public JComponent[] createOptionsComponent(Component parentComponent) 
{
                return new JComponent[] { 
-                               new MomentPanel(),
-                               new RouterPanel()
+                               new MainOptionsPanel(),
+                               new MomentOptionsPanel(),
+                               new RouterOptionsPanel(),
+                               new RawOptionsPanel(),
+                               new TopOptionsPanel()
                };
        }
+
        
        @Override
-       public ITimeValueResponse createTimeValueResponseListener() {
-               return null;
+       public JComponent[] createDetailsComponent(Component parentComponent) 
{
+               String[][] s = new String[][] {
+                               {UserData.C_QUERYTYPE,"Query Type"},
+
+                       };              
+               ResponseDetailsPane scrollPaneResponse = new 
ResponseDetailsPane(" Query Details",
+                               getUserData(),
+                               getDataList(),
+                               s,
+                               false,
+                               false);
+               return new JComponent[] {scrollPaneResponse};
        }
        
 
+
        @Override
        protected SmartMARequest createSmartRequest() {
                if (request != null) return request;
@@ -93,22 +75,32 @@
                };
        }
 
+
+       
        @Override
        protected PerfsonarRequestAction createMetadataRequestAction() {
                return null;
        }
+       
 
        public PluginMainPanel createMainComponent(Component parentComponent) 
{
-               return new MainPanel(parentComponent,this);
+               //return new MainPanel(parentComponent,this);
+               return new RawPanel(parentComponent,this);
+               //return new StatPanel(parentComponent,this);
+               //return new TopPanel(parentComponent,this);
        }
+
        @Override
        public String toString() {
                return "FlowSA";
        }
 
+       
        public int getOrder() {
                return 1000000;
        }
+       
+       
        @Override
        public List<IPerfsonarSchema> getSupportedRequests() {
            ArrayList<IPerfsonarSchema> supported = new 
ArrayList<IPerfsonarSchema>();

Added: branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/UserData.java

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

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

Copied: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MomentOptionsPanel.java
 (from rev 2489, 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MomentPanel.java)

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

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

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

Copied: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RouterOptionsPanel.java
 (from rev 2489, 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RouterPanel.java)

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

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

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

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