perfsonar development work

Author: nina
Date: 2007-12-05 01:29:40 -0500 (Wed, 05 Dec 2007)
New Revision: 3084

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java
Log:
"Populate" action added, allowing to send metadata request only.

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-12-05 06:27:06 UTC (rev 3083)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-12-05 06:29:40 UTC (rev 3084)
@@ -59,6 +59,7 @@
 import org.perfsonar.perfsonarui.plugins.UnsupportedSchemaException;
 import org.perfsonar.perfsonarui.ui.PerfsonarModel;
 import org.perfsonar.perfsonarui.ui.actions.ITimeSetAction;
+import org.perfsonar.perfsonarui.ui.actions.PSActionMap;
 import org.perfsonar.perfsonarui.ui.actions.PSUIAction;
 import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.SetupDataRequestAction;
@@ -162,7 +163,17 @@
        }
        @Override
        protected PerfsonarRequestAction createMetadataRequestAction() {
+        //metadata only
+        SetupDataRetrieveAllAction populate  = new 
SetupDataRetrieveAllAction(request,(UserData)userData,dataList,endpointList,"Populate");
+        populate.setMetadataOnly(true);
+        populate.putValue(Action.SHORT_DESCRIPTION, "Retrieves metadata of 
all defined interfaces of selected MA services");
+        populate.setGroup(IPerfsonarTab.defaultGroupQuery);
+        populate.setOrderInGroup(-3);
+        actions.put(populate);
+        populate.setActions(actions);
+        
                metadataRequestAction = new 
SetupDataRetrieveAllAction(request,(UserData)userData,dataList,endpointList);
+        metadataRequestAction.setOrderInGroup(4);
                
metadataRequestAction.setGroup(IPerfsonarTab.defaultGroupQuery);
                
//actions.put(metadataRequestAction.getValue(Action.NAME),metadataRequestAction);
                return metadataRequestAction;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java
    2007-12-05 06:27:06 UTC (rev 3083)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/SetupDataRetrieveAllAction.java
    2007-12-05 06:29:40 UTC (rev 3084)
@@ -39,7 +39,7 @@
  *
  */
 public class SetupDataRetrieveAllAction extends SetupDataRefreshActionAll {
-
+    protected boolean metadataOnly = false;
        /**
         * 
         */
@@ -106,7 +106,7 @@
                        if (dataList.size() > 0) {
                                request.fireStatusMessage("Metadata 
retrieved.");                       
                                
-                               
+                       if (isMetadataOnly()) return null;      
                                //long timeNow = 
Calendar.getInstance(TimeZone.getDefault()).getTimeInMillis()/1000;
                                for (int i=0; i < dataList.size();i++) {
                //                              responce --> query
@@ -138,4 +138,12 @@
        public synchronized void setTimeInterval(long timeInterval) {
         this.timeInterval = timeInterval;
     }
+
+    public synchronized boolean isMetadataOnly() {
+        return metadataOnly;
+    }
+
+    public synchronized void setMetadataOnly(boolean metadataOnly) {
+        this.metadataOnly = metadataOnly;
+    }
 }