perfsonar development work

Author: nina
Date: 2007-10-28 06:05:08 -0400 (Sun, 28 Oct 2007)
New Revision: 3003

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/BusyIdleEvent.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java
Log:
Updates to clear the reported error on starting a new request.

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java    
  2007-10-28 07:45:57 UTC (rev 3002)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java    
  2007-10-28 10:05:08 UTC (rev 3003)
@@ -230,8 +230,13 @@
        @Override
        public void makeRequest(IUserData uData, String messageType, 
IPerfsonarResponse response, boolean runInThread){
            try {
+            //in order to clear the status bar if an error had occurred on 
the previous requests
+            firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_CLEAR,
+                    null,messageType
+                    ));
                        IPerfsonarRequest mr = 
getMARequest(uData.getEndpoint());
                        if (mr != null)  {
+
                                mr.makeRequest(uData, messageType, response, 
parallel & runInThread);
                        } else 
                                fireAxisCallException(uData,new 
Exception("Request not created "+uData.getEndpoint())); 
@@ -246,6 +251,10 @@
        public void makeRequest(MAEndpoint endpoint, MetaDataList queryList,
             String messageType, IPerfsonarResponse response, boolean 
runInThread) {
            try {
+            //in order to clear the status bar if an error had occurred on 
the previous requests
+            firePropertyChange(new 
BusyIdleEvent(this,BusyIdleEvent.PROPERTY_ERROR,
+                    null,null
+                    ));
                //Makes different nodes for each endpoint, in order to create 
aggregated requests
             for (int i=0; i < queryList.size();i++)
                 queryList.get(i).setResponse(IUserData.C_STATUS, 
AbstractUserData.NULL_DATA);

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/BusyIdleEvent.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/BusyIdleEvent.java
     2007-10-28 07:45:57 UTC (rev 3002)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/BusyIdleEvent.java
     2007-10-28 10:05:08 UTC (rev 3003)
@@ -40,6 +40,7 @@
        public static final String PROPERTY_BUSY  = "STATUS_BUSY";
        public static final String PROPERTY_INDETERMINATE  = 
"STATUS_INDETERMINATE";
        public static final String PROPERTY_ERROR  = "STATUS_ERROR";
+    public static final String PROPERTY_CLEAR  = "ACTION_CLEAR";
        
        /**
         * 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java 
2007-10-28 07:45:57 UTC (rev 3002)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/StatusBar.java 
2007-10-28 10:05:08 UTC (rev 3003)
@@ -61,6 +61,7 @@
        protected MetaDataList dataList;
        protected Exception theError;
        protected JLabel errorsLabel;
+    
     /**
      * Comment for <code>serialVersionUID</code>
      */
@@ -179,6 +180,10 @@
                    } else if 
(arg0.getPropertyName().equals(BusyIdleEvent.PROPERTY_ERROR)) {
                        
                        handleException((Exception ) arg0.getNewValue());
+                } else if 
(arg0.getPropertyName().equals(BusyIdleEvent.PROPERTY_CLEAR)) {
+                    progressBar.setString("");
+                    label.setText("");
+                    handleException(null);                    
                    } else    
                        label.setText(arg0.getNewValue().toString());
                }
@@ -206,7 +211,7 @@
                errorsLabel.setToolTipText("Click here for error details");
        } else { 
                errorsLabel.setText("");
-               errorsLabel.setBackground(Color.black);
+               errorsLabel.setBackground(getBackground());
                errorsLabel.setToolTipText("");
        }       
     }
@@ -235,8 +240,25 @@
         sp.setPreferredSize(new Dimension(350,200));
         p.add(sp,BorderLayout.CENTER);
         
-        JOptionPane.showMessageDialog(this,p,"Last 
error",JOptionPane.ERROR_MESSAGE,null);
+        Object[] options = {"OK",
+                "Clear"
+                };
 
+        if (JOptionPane.showOptionDialog(this,
+                p,
+                "Last error",
+                JOptionPane.YES_NO_CANCEL_OPTION,
+                JOptionPane.QUESTION_MESSAGE,
+                null,
+                options,
+                options[1]) == 1) {
+            handleException(null);
+        }   
+        /*
+        JOptionPane.showConfirmDialog(
+                this,p,"Last error",JOptionPane.ERROR_MESSAGE,null);
+                */
+
         
     }
 }