perfsonar development work

Author: melis
Date: 2007-11-16 11:36:15 -0500 (Fri, 16 Nov 2007)
New Revision: 3042

Added:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
Log:
Added the LGSetupDataRequestAction to the SVN

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2007-11-16 01:07:08 UTC (rev 3041)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2007-11-16 16:36:15 UTC (rev 3042)
@@ -207,11 +207,11 @@
        //also add this class to the SetupDataRequestAction as parent
        PSActionMap map = super.model.getActions();
        Object[] keys = map.allKeys();
-       SetupDataRequestAction sdra = null;
+       LGSetupDataRequestAction sdra = null;
        for (int i = 0; i < keys.length; i++){
            if (map.get(keys[i]).getValue(Action.DEFAULT)!= null &&
                    
map.get(keys[i]).getValue(Action.DEFAULT).equals("SetupDataRequestAction")){
-               sdra = (SetupDataRequestAction)map.get(keys[i]);
+               sdra = (LGSetupDataRequestAction)map.get(keys[i]);
                break;
            }
        }
@@ -813,7 +813,7 @@
     public void addCurrentDeviceToDevicesList() {
        if 
(!deviceListModel.contains((String)deviceCombobox.getSelectedItem()))
            
deviceListModel.addElement((String)deviceCombobox.getSelectedItem());
-       
+       System.out.println("Mijn eend ruikt naar eend");
     }
     
     

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2007-11-16 01:07:08 UTC (rev 3041)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2007-11-16 16:36:15 UTC (rev 3042)
@@ -39,7 +39,9 @@
 import org.perfsonar.perfsonarui.ui.PerfsonarModel;
 import org.perfsonar.perfsonarui.ui.PluginMainPanel;
 import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
+import org.perfsonar.perfsonarui.lookingglass.LGSetupDataRequestAction;
 
+
 /**
  *  @author Stijn Melis
  *  @author Nina Jeliazkova (skeleton framework)
@@ -60,7 +62,7 @@
     @Override
     public PerfsonarRequestAction createDataRequestAction() {
     
-       dataRequestAction = new SetupDataRequestAction(request, userData, 
dataList, endpointList, "Query");
+       dataRequestAction = new LGSetupDataRequestAction(request, userData, 
dataList, endpointList, "Query");
        return dataRequestAction;
     }
     

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java   
  2007-11-16 01:07:08 UTC (rev 3041)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java   
  2007-11-16 16:36:15 UTC (rev 3042)
@@ -52,10 +52,11 @@
 import org.perfsonar.perfsonarui.JAXPCheck;
 import org.perfsonar.perfsonarui.PSLogger;
 import org.perfsonar.perfsonarui.SmartMARequest;
-// FIXME package seems absent from the svn import 
org.perfsonar.perfsonarui.bwctl.BWCTLPerfsonarTab;
+//import org.perfsonar.perfsonarui.bwctl.BWCTLPerfsonarTab;
 import org.perfsonar.perfsonarui.demo.DemoPlugin;
 import org.perfsonar.perfsonarui.demo.DemoPluginMainPanel;
 import org.perfsonar.perfsonarui.ippm.IPPMPerfsonarModel;
+import org.perfsonar.perfsonarui.lookingglass.LookingGlassTab;
 import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
 import org.perfsonar.perfsonarui.playground.PerfsonarPlaygroundModel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
@@ -246,26 +247,29 @@
                 */
         if (perfsonarTabs.size()==0) {
                logger.info("Plugins not found, loading MA and IPPM tabs.");
-               IPerfsonarTab tab = new MAPerfsonarModel();
+               IPerfsonarTab tab /*= new MAPerfsonarModel()*/;/*
                tab.setParameters(cmdOpts);
            perfsonarTabs.add(tab);
            tab = new IPPMPerfsonarModel();
            tab.setParameters(cmdOpts);
            perfsonarTabs.add(tab);
-           
+           */
+           /*
            tab = new PerfsonarPlaygroundModel();
            tab.setParameters(cmdOpts);
            perfsonarTabs.add(tab);
-
-        // FIXME   tab = new BWCTLPerfsonarTab();
-        // FIXME   tab.setParameters(cmdOpts);
-        // FIXME   perfsonarTabs.add(tab);
+*/
+           /*
+           tab = new BWCTLPerfsonarTab();
+           tab.setParameters(cmdOpts);
+           perfsonarTabs.add(tab);
            //for testing purposes only
-           /*
+            */
+           
            tab = new LookingGlassTab();
            tab.setParameters(cmdOpts);
            perfsonarTabs.add(tab);
-           */
+           
 
            
            Collections.sort(perfsonarTabs);