perfsonar development work

Author: nemanja.zutic
Date: 2009-03-20 11:44:24 -0400 (Fri, 20 Mar 2009)
New Revision: 5094

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
Log:
Playground tab: fix for acquiering endpoints in predefined requests

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2009-03-18 10:21:31 UTC (rev 5093)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
 2009-03-20 15:44:24 UTC (rev 5094)
@@ -22,18 +22,25 @@
 
 import java.awt.Component;
 import java.io.File;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
 import org.perfsonar.perfsonarui.AbstractUserData;
 import org.perfsonar.perfsonarui.IPerfsonarSchema;
 import org.perfsonar.perfsonarui.PerfsonarSchema;
 import org.perfsonar.perfsonarui.SmartMARequest;
+import org.perfsonar.perfsonarui.aa.AACertificate;
+import org.perfsonar.perfsonarui.aa.IAACapable;
 import org.perfsonar.perfsonarui.aa.ICredentialsListener;
 import org.perfsonar.perfsonarui.aa.SwingCredentialListener;
+import org.perfsonar.perfsonarui.ls.LSManager;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
@@ -53,7 +60,9 @@
  *
  */
 public class PerfsonarPlaygroundModel extends PerfsonarModel {
-
+       
+       protected String endpointListURL = ""; 
+       
        /**
         * Constructor. 
         *
@@ -111,11 +120,21 @@
         */
        public MAEndpointList createEndpoints() {
                try {
-                       MAEndpointList list = new MAEndpointList(new 
File("MA.conf"),getSupportedRequests());
+                       MAEndpointList list;
+                       
if((!endpointListURL.equals(""))&&(endpointListURL!=null)) {
+//                             Using URL to create endpoints
+                               list = new MAEndpointList(new 
URL(endpointListURL),getSupportedRequests());
+                               LSManager.getInstance(new 
URL(endpointListURL));
+                       }
+                       else {
+//                             Using MA.conf to create endpoints
+                               list = new MAEndpointList(new 
File("MA.conf"),getSupportedRequests());
+                               LSManager.getInstance(new File("MA.conf"));
+                       }
                        list.setMultipleEndpoints(false);
                        return list;
                } catch (Exception x) {
-                       return new MAEndpointList(false);
+               return new MAEndpointList(new 
File("MA.conf"),getSupportedRequests());
                }
        }
        @Override
@@ -133,8 +152,16 @@
                        }
                };
        }
-
+       
        @Override
+       protected void setOptions(CommandLine line){
+               super.setOptions(line);
+               if( line.hasOption( 'e' ) ) {
+                       endpointListURL = line.getOptionValue( 'e' );
+               }
+       }
+       
+       @Override
        protected PerfsonarRequestAction createMetadataRequestAction() {
                return null;
        }
@@ -164,13 +191,14 @@
        }
        
        public void activateSpecific(){
+               if(endpointList==null || endpointList.size()==0) return;
                String specific = 
PlaygroundPredefined.getInstance().getCurrentSchema();
                if(specific==null){
                        endpointList.setEnabled(0, true);
                        userData.setEndpoint(endpointList.get(0));
                        return;
                }
-               for(int i = 0; i<=endpointList.size();i++){
+               for(int i = 0; i<endpointList.size();i++){
                        if(endpointList.get(i).getSchema().equals(specific)){
                                endpointList.setEnabled(i, true);
                                userData.setEndpoint(endpointList.get(i));