perfsonar development work

Author: nina
Date: 2007-05-31 11:25:55 -0400 (Thu, 31 May 2007)
New Revision: 2445

Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/IPerfsonarSchema.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
Log:
Changed PerfsonarModel.getSupportedRequest to abstract
Changed PerfsonarModel.getSupportedRequest to return List<IPerfsonarSchema>

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/IPerfsonarSchema.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/IPerfsonarSchema.java  
  2007-05-31 15:25:51 UTC (rev 2444)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/IPerfsonarSchema.java  
  2007-05-31 15:25:55 UTC (rev 2445)
@@ -24,8 +24,11 @@
 
 package org.perfsonar.perfsonarui;
 
+import org.perfsonar.perfsonarui.plugins.MAEndpoint;
+import org.perfsonar.perfsonarui.ui.PerfsonarModel;
+
 /**
- * Markup interface to specify supported perfsonar schemas. 
+ * Markup interface to specify supported perfsonar schemas. Used by 
{@link
 MAEndpoint#getSchema()} and 
{@link
 PerfsonarModel#getSupportedRequests()}.
  * @author nina
  *
  */

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java   
  2007-05-31 15:25:51 UTC (rev 2444)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/demo/DemoPlugin.java   
  2007-05-31 15:25:55 UTC (rev 2445)
@@ -27,6 +27,8 @@
 import javax.swing.JComponent;
 
 import org.perfsonar.perfsonarui.AbstractUserData;
+import org.perfsonar.perfsonarui.IPerfsonarSchema;
+import org.perfsonar.perfsonarui.PerfsonarSchema;
 import org.perfsonar.perfsonarui.ResponseData;
 import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.ma.MARequest_NMWG2_Netutil;
@@ -132,9 +134,10 @@
                return Integer.MAX_VALUE;
        }
 
-       public List getSupportedRequests() {
-               ArrayList<String> supported = new ArrayList<String>();
-               
supported.add("org.perfsonar.perfsonarui.ma.MARequest_NMWG2_Netutil");
+       
+       public List<IPerfsonarSchema> getSupportedRequests() {
+               ArrayList<IPerfsonarSchema> supported = new 
ArrayList<IPerfsonarSchema>();
+               supported.add(new PerfsonarSchema("NMWG2v2_netutil"));
                return supported;
        }
        

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-05-31 15:25:51 UTC (rev 2444)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-05-31 15:25:55 UTC (rev 2445)
@@ -34,6 +34,7 @@
 import org.apache.commons.cli.CommandLine;
 import org.perfsonar.perfsonarui.AbstractUserData;
 import org.perfsonar.perfsonarui.IPerfsonarSchema;
+import org.perfsonar.perfsonarui.PerfsonarSchema;
 import org.perfsonar.perfsonarui.SmartMARequest;
 import org.perfsonar.perfsonarui.TracerouteShell;
 import org.perfsonar.perfsonarui.ippm.IPPMRequest;
@@ -187,18 +188,13 @@
            ifDataset.addSeries("outbound",new 
InterfaceUtilizationSeries("outbound",false));
            return ifDataset;
        }
-       public List getSupportedRequests() {
-               ArrayList<String> supported = new ArrayList<String>();
-               /*
-               supported.add("org.perfsonar.perfsonarui.ma.MARequest");
-               supported.add("org.perfsonar.perfsonarui.ma.MARequest_NMWG2");
-               
supported.add("org.perfsonar.perfsonarui.ma.MARequest_NMWG2_Netutil");
-               
supported.add("org.perfsonar.perfsonarui.ma.MARequestPerfsonar2_0");
-               */
-               supported.add("perfsonar");
-               supported.add("NMWG2v2");
-               supported.add("NMWG2v2_netutil");
-               supported.add("http://schemas.perfsonar.net/2.0";);
+       public List<IPerfsonarSchema> getSupportedRequests() {
+               ArrayList<IPerfsonarSchema> supported = new 
ArrayList<IPerfsonarSchema>();
+
+               supported.add(new PerfsonarSchema("perfsonar"));
+               supported.add(new PerfsonarSchema("NMWG2v2"));
+               supported.add(new PerfsonarSchema("NMWG2v2_netutil"));
+               supported.add(new 
PerfsonarSchema("http://schemas.perfsonar.net/2.0";));
                return supported;
        }
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2007-05-31 15:25:51 UTC (rev 2444)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2007-05-31 15:25:55 UTC (rev 2445)
@@ -22,6 +22,7 @@
 import java.awt.Component;
 import java.io.File;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Observable;
@@ -39,9 +40,11 @@
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
 import org.perfsonar.perfsonarui.AbstractUserData;
+import org.perfsonar.perfsonarui.IPerfsonarSchema;
 import org.perfsonar.perfsonarui.PSLogger;
 import org.perfsonar.perfsonarui.ResponseData;
 import org.perfsonar.perfsonarui.SmartMARequest;
+import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
 import org.perfsonar.perfsonarui.plugins.IUserData;
@@ -240,13 +243,27 @@
        public ITimeValueResponse createTimeValueResponseListener() {
                return new ResponseData();
        }
+       /**
+        * Creates new (@link MAEndpointList} with supported services set by 
{@link
 #getSupportedRequests()}. 
+        * @return
+        */
        public MAEndpointList createEndpoints() {
                return new 
MAEndpointList(getMAconf("MA.conf"),getSupportedRequests());
        }
-       public List getSupportedRequests() {
-               
-               return null;
-       }
+       /**
+        * Returns List<IPerfsonarSchema> of supported perfsonar schemas.  
This is used to filter available endpoints and to load only those entries 
that are going to be supported
+        * <br> 
+        * (e.g. 
{@link
 MAPerfsonarModel} will load only 
{@link
 MAEndpoint}s where 
{@link
 MAEndpoint#getSchema()} is within the supported schemas).<br>
+        * 
+        * Example:
+        * <pre>
+        * ArrayList<IPerfsonarSchema> supported = new 
ArrayList<IPerfsonarSchema>();
+        * supported.add(PerfsonarSchema("NMWG2v2_netutil"));
+        * return supported;
+        * </pre>
+        * @return
+        */
+       public abstract List<IPerfsonarSchema> getSupportedRequests();
        
        public static File getMAconf(String filename) {
                try {