perfsonar development work

Author: melis
Date: 2008-06-02 06:18:00 -0400 (Mon, 02 Jun 2008)
New Revision: 3935

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.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/model/LGEndpoint.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesTableModel.java
Log:
updated SVN with latest work on Looking Glass plugin

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2008-06-02 09:41:08 UTC (rev 3934)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LGRequest.java
      2008-06-02 10:18:00 UTC (rev 3935)
@@ -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);
 
     }
 
@@ -237,7 +237,7 @@
 
            SOAPEnvelope envelope = prepareEnvelope(requestMessage);
 
-           //System.out.println("[LGRequest] requestMessage: " + 
requestMessage);
+           System.out.println("[LGRequest] requestMessage: " + 
requestMessage);
            
            if (envelope != null) {
                resultObject = call.invoke(new Message(envelope));

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2008-06-02 09:41:08 UTC (rev 3934)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassMainPanel.java
  2008-06-02 10:18:00 UTC (rev 3935)
@@ -119,6 +119,8 @@
     private LatestResultListModel latestResultListModel;
     private IPerfsonarTab iperftab;
 
+    private WebservicesModel webservicesModel;
+    
     private boolean and = true;
     
     private boolean importExportEnabled = false;
@@ -130,9 +132,16 @@
        super(parentFrame, iperftab);
        this.iperftab = iperftab;
        
-       WebservicesModel.initWebservicesModel();
+       if (WebservicesModel.isFirst()){
+           webservicesModel = new 
WebservicesModel(iperftab.getEndpointList());
+           webservicesModel.initWebservicesModel();
+       }
     }
 
+    public WebservicesModel getWebservicesModel() {
+       return webservicesModel;
+    }
+    
     @Override
     protected void addWidgets() {
        model = new LookingGlassClientModel();

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2008-06-02 09:41:08 UTC (rev 3934)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/LookingGlassTab.java
        2008-06-02 10:18:00 UTC (rev 3935)
@@ -33,7 +33,7 @@
 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.lookingglass.model.WebservicesModel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
@@ -135,6 +135,10 @@
     public JComponent[] createOptionsComponent(Component parentComponent) {
        return new JComponent[]{new LGRequestOptionsPanel(this)};
     }
+    
+    public WebservicesModel getWebservicesModel(){
+       return panel.getWebservicesModel();
+    }
 }
 
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LGEndpoint.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LGEndpoint.java
       2008-06-02 09:41:08 UTC (rev 3934)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/LGEndpoint.java
       2008-06-02 10:18:00 UTC (rev 3935)
@@ -18,6 +18,10 @@
        super(line);    
     }
     
+    public LGEndpoint (MAEndpoint mae) {
+       super(mae.toString());
+    }
+    
     @Override
     public String toString(){
        return title;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesModel.java
 2008-06-02 09:41:08 UTC (rev 3934)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesModel.java
 2008-06-02 10:18:00 UTC (rev 3935)
@@ -4,20 +4,11 @@
  */
 package org.perfsonar.perfsonarui.lookingglass.model;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.util.HashMap;
-import java.util.StringTokenizer;
 import java.util.Vector;
 
-import javax.swing.JOptionPane;
+import org.perfsonar.perfsonarui.plugins.MAEndpoint;
+import org.perfsonar.perfsonarui.plugins.MAEndpointList;
 
 /**
  *
@@ -27,14 +18,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() {
+    private MAEndpointList endpoints = null;
+    
+    //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 WebservicesModel (MAEndpointList endpoints){
+       this.endpoints = endpoints;
+    }
+    
+    public void initWebservicesModel() {
        //System.out.println("WebservicesModel initiated!");
        
-       if (first) {
+       /*if (first) {
                        
                //System.out.println("First pass --> initialise and fill 
HashMap");
            try {
@@ -78,6 +75,27 @@
            }
 
            first = false;
+       }*/
+       
+       if (first) {
+                       
+               System.out.println("First pass --> initialise and fill 
HashMap");
+           
+               webservicesMap = new HashMap<String, LGEndpoint>();
+               
+               int i = 0;
+               MAEndpoint mae = null;
+               while (i < endpoints.size()) {
+                   mae = endpoints.get(i);
+                   if (mae.getEvent(0).equals("lg") && mae.isEnabled()) {
+                       webservicesMap.put(mae.getTitle(), new 
LGEndpoint(mae));
+                       System.out.println("Endpoint added to HashMap: " + 
mae.getTitle() + " -- " + mae.getEndpoint());
+                   }
+                   
+                   i++;
+               }
+           
+           first = false;
        }
     }
 
@@ -110,8 +128,12 @@
        return index;
     }
 
-    public static void addMP(Object[] data) {
-       FileInputStream fis = null;
+    public static boolean isFirst () {
+       return first;
+    }
+    
+    public void addMP(Object[] data) {
+       /*FileInputStream fis = null;
        FileOutputStream fos = null;
 
        File src = new File(SRC);
@@ -162,11 +184,25 @@
        }
 
        src.delete();
-       dst.renameTo(src);
+       dst.renameTo(src);*/
+
+       if (!webservicesMap.containsKey(data[0])) {
+           //key not yet present, so just add it
+           System.out.println("adding row: " + data[0] + ", " + data[1]);
+
+           endpoints.add(new MAEndpoint(data[0] + "," + data[1] + 
",lg,\"\",lg,lg"));
+       } else {
+           System.out.println("updating row: " + data[0] + ", " + data[1]);
+           
+           endpoints.add(new MAEndpoint(data[0] + "," + data[1] + 
",lg,\"\",lg,lg"));
+       }
+
+       webservicesMap.put((String) data[0], new LGEndpoint(data[0] + "," + 
data[1] + ",lg,\"\",lg,lg"));
+
     }
 
-    public static void addMP(Vector data) {
-       FileInputStream fis = null;
+    public void addMP(Vector data) {
+       /*FileInputStream fis = null;
        FileOutputStream fos = null;
        File src = new File(SRC);
        File dst = new File(TMP);
@@ -217,11 +253,19 @@
        }
 
        src.delete();
-       dst.renameTo(src);
+       dst.renameTo(src);*/
+       if (!webservicesMap.containsKey(data.get(0))) {
+           //key not yet present, so just add it
+           System.out.println("adding row: " + data.get(0) + ", " + 
data.get(1));
+
+           endpoints.add(new MAEndpoint(data.get(0) + "," + data.get(1) + 
",lg,\"\",lg,lg"));
+       }
+
+       webservicesMap.put((String) data.get(0), new LGEndpoint(data.get(0) + 
"," + data.get(1) + ",lg,\"\",lg,lg"));
     }
 
-    public static void removeMP(int row) {
-       FileInputStream fis = null;
+    public void removeMP(int row) {
+       /*FileInputStream fis = null;
        FileOutputStream fos = null;
 
        File src = new File(SRC);
@@ -262,6 +306,15 @@
            }
        }
        src.delete();
-       dst.renameTo(src);
+       dst.renameTo(src);*/
+
+        System.out.println("removing row: " + row);
+        String key = (String) webservicesMap.keySet().toArray()[row];
+        webservicesMap.remove(key);
+
+       int index = 0;
+       while (!key.equals(endpoints.get(index).getTitle()))
+           index++;
+        endpoints.remove(index);
     }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesTableModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesTableModel.java
    2008-06-02 09:41:08 UTC (rev 3934)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/lookingglass/model/WebservicesTableModel.java
    2008-06-02 10:18:00 UTC (rev 3935)
@@ -22,17 +22,25 @@
 
     LookingGlassTab parentFrame;
     
+    WebservicesModel model;
+    
     //WebservicesModel model;
     /** Creates a new instance of WebservicesTableModel */
     public WebservicesTableModel(LookingGlassTab parentFrame) {
        this.parentFrame = parentFrame;
        
+       if (WebservicesModel.isFirst()){
+           model = new WebservicesModel(parentFrame.getEndpointList());
+           model.initWebservicesModel();
+       } else {
+           model = parentFrame.getWebservicesModel();
+       }
     //this.model = model;
     }
 
     @Override
     public void addRow(Vector rowData) {
-       WebservicesModel.addMP(rowData);
+       model.addMP(rowData);
 
        fireTableDataChanged();
        parentFrame.getMainPanel().fireStateChanged();
@@ -40,7 +48,7 @@
 
     @Override
     public void addRow(Object[] rowData) {
-       WebservicesModel.addMP(rowData);
+       model.addMP(rowData);
 
        fireTableDataChanged();
        parentFrame.getMainPanel().fireStateChanged();
@@ -48,7 +56,7 @@
 
     @Override
     public void removeRow(int row) {
-       WebservicesModel.removeMP(row);
+       model.removeMP(row);
 
        fireTableDataChanged();
        parentFrame.getMainPanel().fireStateChanged();