perfsonar development work

Author: iva
Date: 2009-05-21 10:46:29 -0400 (Thu, 21 May 2009)
New Revision: 5135

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
Log:
--changed key values for dataRequestActionAll and populateAction
--populate action renamed to Load metadata

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2009-05-21 14:10:57 UTC (rev 5134)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2009-05-21 14:46:29 UTC (rev 5135)
@@ -181,7 +181,7 @@
 
                dataRequestActionAll = new 
SetupDataRefreshActionAll(request,(UserData)userData,dataList,endpointList);
                
dataRequestActionAll.setGroup(IPerfsonarTab.defaultGroupQuery);
-               actions.put("1",dataRequestActionAll);
+               actions.put("-2",dataRequestActionAll); //key value is now 
numeric and is to be used to set the order of the action in TaskPane
                dataRequestActionAll.setActions(actions);
                
                ippmModel = new IPPMPerfsonarModel(endpoints);
@@ -216,12 +216,12 @@
        @Override
        protected PerfsonarRequestAction createMetadataRequestAction() {
         //metadata only
-        populateAction  = new 
SetupDataRetrieveAllAction(request,(UserData)userData,dataList,endpointList,"Populate");
+        populateAction  = new 
SetupDataRetrieveAllAction(request,(UserData)userData,dataList,endpointList,"Load
 metadata"); //action name changed
         populateAction.setMetadataOnly(true);
         populateAction.putValue(Action.SHORT_DESCRIPTION, "Retrieves 
metadata of all defined interfaces of selected MA services");
         populateAction.setGroup(IPerfsonarTab.defaultGroupQuery);
         populateAction.setOrderInGroup(-3);
-        actions.put(populateAction);
+        actions.put("-1",populateAction); //all actions in MA are now added 
to the ActionMap with a numeric key, which are to be used when sorting the 
actions in the TaskPane
         populateAction.setActions(actions);
         
         SetupDataRetrieveAllAction action = new 
SetupDataRetrieveAllAction(request,(UserData)userData,dataList,endpointList);