perfsonar development work

Author: nina
Date: 2007-09-05 09:32:52 -0400 (Wed, 05 Sep 2007)
New Revision: 2775

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
Log:
all PerfsonarModel descendants will have by default Options menu, displaying 
requests option (timeout, aggregation level, sequential/parallel requests). 
Override createOptionsComponent or createOptionsAction to change this 
behaviour. 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
     2007-09-05 10:14:00 UTC (rev 2774)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/IPPMPerfsonarModel.java
     2007-09-05 13:32:52 UTC (rev 2775)
@@ -232,10 +232,6 @@
        return new IPPMMetaDataList(comparator);
     }
     @Override
-    public PSUIAction createOptionsAction() {
-       return null;
-    }
-    @Override
        public PerfsonarRequestAction createDataRequestAction() {
        SetupDataRequestAction dr = new 
SetupDataRequestAction(request,userData,responseData,"Query") {
                /**

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2007-09-05 10:14:00 UTC (rev 2774)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2007-09-05 13:32:52 UTC (rev 2775)
@@ -86,11 +86,8 @@
                    }
         };
        }
-       @Override
-       public PSUIAction createOptionsAction() {
-               return null;
-       }
 
+
        @Override
        public ITimeValueResponse createTimeValueResponseListener() {
                return null;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2007-09-05 10:14:00 UTC (rev 2774)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2007-09-05 13:32:52 UTC (rev 2775)
@@ -44,6 +44,8 @@
 import org.perfsonar.perfsonarui.ResponseData;
 import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
+import org.perfsonar.perfsonarui.ma.ui.panels.MetricsOptionPanel;
+import org.perfsonar.perfsonarui.ma.ui.panels.RequestOptionsPanel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
 import org.perfsonar.perfsonarui.plugins.IUserData;
@@ -53,6 +55,7 @@
 import org.perfsonar.perfsonarui.plugins.MetaDataList;
 import org.perfsonar.perfsonarui.ui.actions.ClearAction;
 import org.perfsonar.perfsonarui.ui.actions.EndpointsAction;
+import org.perfsonar.perfsonarui.ui.actions.ITimeSetAction;
 import org.perfsonar.perfsonarui.ui.actions.MetadataRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.PSActionMap;
 import org.perfsonar.perfsonarui.ui.actions.PSUIAction;
@@ -60,6 +63,7 @@
 import org.perfsonar.perfsonarui.ui.actions.SetOptionsAction;
 import org.perfsonar.perfsonarui.ui.actions.SetupDataRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.ShowEndpointsAction;
+import org.perfsonar.perfsonarui.ui.panels.TimeOptionsPanel;
 
 
 /**
@@ -507,7 +511,7 @@
                return null;
        }
        public JComponent[] createOptionsComponent(Component parentComponent) 
{
-               return null;
+               return new JComponent[]{new RequestOptionsPanel(this)};
        }
        public PSUIAction getEndpointsAction() {
                return endpointsAction;