perfsonar development work

Author: melis
Date: 2008-05-26 08:44:33 -0400 (Mon, 26 May 2008)
New Revision: 3873

Added:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGOptionsAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequestOptionsPanel.java
Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesModel.java
Log:
Updated with the latest work

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

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2008-05-23 11:27:46 UTC (rev 3872)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2008-05-26 12:44:33 UTC (rev 3873)
@@ -204,15 +204,15 @@
            IPerfsonarResponse listener) throws Exception {
        // TODO Auto-generated method stub
 
-       System.out.print("[LGRequest] The response is:");
+       //System.out.print("[LGRequest] The response is:");
 
        StringWriter sw = new StringWriter();
        XMLSerializer ser = new XMLSerializer(sw, new OutputFormat(response));
        ser.serialize(response.getDocumentElement());
 
-       String XMLStr = sw.toString();
+       //String XMLStr = sw.toString();
 
-       System.out.println("" + XMLStr);
+       //System.out.println("" + XMLStr);
 
     }
 

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

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
       2008-05-23 11:27:46 UTC (rev 3872)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGSetupDataRequestAction.java
       2008-05-26 12:44:33 UTC (rev 3873)
@@ -17,6 +17,7 @@
 import org.perfsonar.perfsonarui.MetadataListResponseListener;
 import org.perfsonar.perfsonarui.PerfsonarResponseEvent;
 import org.perfsonar.perfsonarui.SmartMARequest;
+import org.perfsonar.perfsonarui.aa.AAPerfsonarRequest;
 import org.perfsonar.perfsonarui.lookingglass.model.LGEndpoint;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2008-05-23 11:27:46 UTC (rev 3872)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2008-05-26 12:44:33 UTC (rev 3873)
@@ -28,10 +28,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.swing.JComponent;
 import org.perfsonar.perfsonarui.IPerfsonarSchema;
 import org.perfsonar.perfsonarui.PSException;
 import org.perfsonar.perfsonarui.PerfsonarSchema;
 import org.perfsonar.perfsonarui.SmartMARequest;
+import org.perfsonar.perfsonarui.aa.AAPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
@@ -77,6 +79,11 @@
     }
     
     @Override
+    public PSUIAction createOptionsAction() {
+       return new LGOptionsAction(this);
+    }
+    
+    @Override
     protected SmartMARequest createSmartRequest() {
        return new SmartMARequest() {
            @Override
@@ -123,6 +130,11 @@
     public LookingGlassMainPanel getMainPanel(){
        return panel;
     }
+    
+    @Override
+    public JComponent[] createOptionsComponent(Component parentComponent) {
+       return new JComponent[]{new LGRequestOptionsPanel(this)};
+    }
 }
 
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesModel.java
 2008-05-23 11:27:46 UTC (rev 3872)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesModel.java
 2008-05-26 12:44:33 UTC (rev 3873)
@@ -16,6 +16,7 @@
 import java.util.HashMap;
 import java.util.StringTokenizer;
 import java.util.Vector;
+
 import javax.swing.JOptionPane;
 
 /**
@@ -27,16 +28,20 @@
     private static HashMap<String, LGEndpoint> webservicesMap = null;
     private static boolean first = true;
 
+    private final static String SRC = 
"../../src/org/perfsonar/perfsonarui/config/MA.conf";
+    private final static String TMP = 
"../../src/org/perfsonar/perfsonarui/config/MA.conf.tmp";
+    
     public static void initWebservicesModel() {
        //System.out.println("WebservicesModel initiated!");
        
        if (first) {
-           //System.out.println("First pass --> initialise and fill 
HashMap");
+                       
+               //System.out.println("First pass --> initialise and fill 
HashMap");
            try {
 
                webservicesMap = new HashMap<String, LGEndpoint>();
                
-               FileInputStream in = new 
FileInputStream("org/perfsonar/perfsonarui/config/MA.conf");
+               FileInputStream in = new FileInputStream(SRC);
                BufferedReader br = new BufferedReader(new 
InputStreamReader(in));
 
                String line = br.readLine();
@@ -109,8 +114,8 @@
        FileInputStream fis = null;
        FileOutputStream fos = null;
 
-       File src = new File("org/perfsonar/perfsonarui/config/MA.conf");
-       File dst = new File("org/perfsonar/perfsonarui/config/MA.conf.tmp");
+       File src = new File(SRC);
+       File dst = new File(TMP);
        try {
            //System.out.println("adding row: " + data[0] + ", " + data[1]);
 
@@ -163,8 +168,8 @@
     public static void addMP(Vector data) {
        FileInputStream fis = null;
        FileOutputStream fos = null;
-       File src = new File("org/perfsonar/perfsonarui/config/MA.conf");
-       File dst = new File("org/perfsonar/perfsonarui/config/MA.conf.tmp");
+       File src = new File(SRC);
+       File dst = new File(TMP);
        try {
            //System.out.println("adding row: " + data.get(0) + ", " + 
data.get(1));
 
@@ -219,8 +224,8 @@
        FileInputStream fis = null;
        FileOutputStream fos = null;
 
-       File src = new File("org/perfsonar/perfsonarui/config/MA.conf");
-       File dst = new File("org/perfsonar/perfsonarui/config/MA.conf.tmp");
+       File src = new File(SRC);
+       File dst = new File(TMP);
 
        try {
            //System.out.println("removing row: " + row);