perfsonar development work

Author: melis
Date: 2007-11-21 08:58:51 -0500 (Wed, 21 Nov 2007)
New Revision: 3066

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
Log:
Further development for merging of Looking Glass into psUI

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
       2007-11-21 11:59:30 UTC (rev 3065)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
       2007-11-21 13:58:51 UTC (rev 3066)
@@ -83,7 +83,8 @@
                if (isInterrupted()) break;
                MAEndpoint mae = endpoints.get(i);
                //System.out.println("Endpoint : " + mae.getTitle());
-               if (mae.isEnabled() && 
mae.getTitle().equalsIgnoreCase(parent.getWebserviceComboBox()
+               if (mae.isEnabled() && 
parent.getWebserviceComboBox().getSelectedItem() != null
+                       && 
mae.getTitle().equalsIgnoreCase(parent.getWebserviceComboBox()
                        .getSelectedItem().toString())) {
                //if (mae.isEnabled()){
                    ok = true;
@@ -158,7 +159,8 @@
                ((SmartMARequest) request).isReady();
            
            dataList.setNotificationEnabled(true);
-           if (!ok) JOptionPane.showMessageDialog(frame,"No IPPM service 
selected!","Error",JOptionPane.ERROR_MESSAGE);
+           if (!ok && parent.getWebserviceComboBox().getSelectedItem() != 
null)
+               JOptionPane.showMessageDialog(frame,"No IPPM service 
selected!","Error",JOptionPane.ERROR_MESSAGE);
        } catch (Exception x) {
            
JOptionPane.showMessageDialog(frame,x,"Error",JOptionPane.ERROR_MESSAGE);
            x.printStackTrace();

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2007-11-21 11:59:30 UTC (rev 3065)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2007-11-21 13:58:51 UTC (rev 3066)
@@ -122,7 +122,6 @@
     private QueriedDeviceComboboxModel queriedDeviceComboboxModel1;
     private QueriedDeviceComboboxModel queriedDeviceComboboxModel2;
     
-    
     private IPerfsonarTab iperftab;
     
     public LookingGlassMainPanel(Component parentFrame, IPerfsonarTab 
iperftab) {
@@ -825,6 +824,34 @@
        }
     }
     
+    public void clear() {
+       deviceListModel.removeAllElements();
+       
+        functionCombobox.setEnabled(false);
+        functionCombobox.setSelectedItem(null);
+       functionComboboxModel.removeAllElements();
+        
+        deviceCombobox.setEnabled(false);
+        deviceComboboxModel.removeAllElements();
+        
+        webserviceComboboxModel.setSelectedItem(null);
+        
+        resultTextArea.setText(null);
+        
+        statusTextField.setText(null);
+        
+        addDeviceButton.setEnabled(false);
+        removeDeviceButton.setEnabled(false);
+        
+        parameterStringTextField.setEnabled(false);
+        parameterStringTextField.setText("");
+        
+        searchTextField.setEnabled(false);
+        highlightButton.setEnabled(false);
+    }
+ 
+
+    
     /**
      * Housekeeping code for ChangeListeners
      **/

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2007-11-21 11:59:30 UTC (rev 3065)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2007-11-21 13:58:51 UTC (rev 3066)
@@ -75,6 +75,11 @@
            }
        };
     }
+
+    @Override
+    public void clear() {
+       panel.clear();
+    }
     
     @Override
     public List<IPerfsonarSchema> getSupportedRequests() {

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
       2007-11-21 11:59:30 UTC (rev 3065)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/MetadataKeyRequestAction.java
       2007-11-21 13:58:51 UTC (rev 3066)
@@ -82,7 +82,8 @@
                if (isInterrupted()) break;
                MAEndpoint mae = endpoints.get(i);
                //System.out.println("Endpoint : " + mae.getTitle());
-               if (mae.isEnabled() && 
mae.getTitle().equalsIgnoreCase(parent.getWebserviceComboBox()
+               if (mae.isEnabled() && 
parent.getWebserviceComboBox().getSelectedItem() != null && 
+                       
mae.getTitle().equalsIgnoreCase(parent.getWebserviceComboBox()
                        .getSelectedItem().toString())) {
                //if (mae.isEnabled()){
                    ok = true;
@@ -146,7 +147,8 @@
                ((SmartMARequest) request).isReady();
            
            dataList.setNotificationEnabled(true);
-           if (!ok) JOptionPane.showMessageDialog(frame,"No IPPM service 
selected!","Error",JOptionPane.ERROR_MESSAGE);
+           if (!ok && parent.getWebserviceComboBox().getSelectedItem() != 
null)
+               JOptionPane.showMessageDialog(frame,"No IPPM service 
selected!","Error",JOptionPane.ERROR_MESSAGE);
        } catch (Exception x) {
            
JOptionPane.showMessageDialog(frame,x,"Error",JOptionPane.ERROR_MESSAGE);
            x.printStackTrace();