perfsonar development work

Author: michael.bischoff
Date: 2008-12-02 12:58:55 -0500 (Tue, 02 Dec 2008)
New Revision: 4732

Added:
   branches/perfsonarui/dist/PerfsonarUI-v0.14.zip
   branches/perfsonarui/jars/ls/LS-client-api-1.0RC2.jar
   branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.jar
   branches/perfsonarui/src/org/perfsonar/perfsonarui/NamedthreadFactory.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LsResources.java
Removed:
   branches/perfsonarui/jars/ls/LS-client-api-1.0RC2.jar
   branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.jar
Modified:
   branches/perfsonarui/dist/
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LookupProcess.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
Log:
Eager loading of lsclient enabled
fixes in endpointspanel


Property changes on: branches/perfsonarui/dist
___________________________________________________________________
Name: svn:ignore
   - PerfsonarUI-v0.13

   + PerfsonarUI-v0.13

PerfsonarUI-v0.14


Added: branches/perfsonarui/dist/PerfsonarUI-v0.14.zip


Property changes on: branches/perfsonarui/dist/PerfsonarUI-v0.14.zip
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: branches/perfsonarui/jars/ls/LS-client-api-1.0RC2.jar

Added: branches/perfsonarui/jars/ls/LS-client-api-1.0RC2.jar

Deleted: branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.jar

Added: branches/perfsonarui/jars/ls/LSclient-Implementation-1.0-BETA2.jar

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/NamedthreadFactory.java


Property changes on: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/NamedthreadFactory.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java 
2008-12-02 17:49:54 UTC (rev 4731)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LSEndpointsPanel.java 
2008-12-02 17:58:55 UTC (rev 4732)
@@ -29,6 +29,7 @@
 import javax.swing.JSeparator;
 import javax.swing.JTable;
 import javax.swing.JTextField;
+import javax.swing.WindowConstants;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 import javax.swing.event.TableModelEvent;
@@ -176,11 +177,10 @@
                                this.currentFilter = 
currentFilter.toLowerCase();
                                Set<Entry> set = new HashSet<Entry>(values);
                                for(Iterator<Entry> i = set.iterator(); 
i.hasNext();) {
-                                       Entry entry = i.next();
-                                       
if(entry.service.getDescription().toLowerCase().contains(currentFilter)) {
-                                               continue;
-                                       }
-                                       i.remove();
+                                       String description = 
i.next().service.getDescription();
+                                       if(description == null || 
!description.toLowerCase().contains(currentFilter)) {
+                                               i.remove();
+                                       }                                     
  
                                }
                                view = set.toArray(new Entry[set.size()]);
                        }
@@ -190,10 +190,11 @@
                public void setCanSelectOnlyOne(boolean canSelectOnlyOne) {
                        this.singleSelection = canSelectOnlyOne;
                }
+
        }
 
        private static final long serialVersionUID = 1L;
-       private final LookupProcess process = new LookupProcess();      
+       private final LookupProcess process = new 
LookupProcess(LsResources.getClient(),LsResources.getExecutor());     
        private final LsEndpointsModel myModel = new LsEndpointsModel();
 
        public LSEndpointsPanel(boolean canSelectOnlyOne) {
@@ -271,7 +272,7 @@
                
                return panel;
        }
-       protected JComponent createEndpointList(LsEndpointsModel model) {
+       protected JComponent createEndpointList(final LsEndpointsModel model) 
{
                JTable table = new JTable(model);
                table.setShowVerticalLines(false);
                table.getColumnModel().getColumn(0).setMaxWidth(20);
@@ -282,7 +283,8 @@
                                HORIZONTAL_SCROLLBAR_NEVER
                        )
                );
-               table.setSelectionBackground(table.getBackground());
+               table.setSelectionForeground(table.getForeground());
+               table.setSelectionBackground(table.getBackground());          
  
                
busyAwareComponent.setBorder(BorderFactory.createEtchedBorder());
                process.addProcessListener(new 
LookupProcess.ProcessListener() {                        
                        public void onStart() {
@@ -335,7 +337,7 @@
 
        public static void main(String[] args) {
                JFrame frame = new JFrame();
-               frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+               
frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
                frame.setContentPane(new LSEndpointsPanel(false));
                frame.pack();
                frame.setVisible(true);

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LookupProcess.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LookupProcess.java  
  2008-12-02 17:49:54 UTC (rev 4731)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LookupProcess.java  
  2008-12-02 17:58:55 UTC (rev 4732)
@@ -7,6 +7,7 @@
 import java.util.concurrent.CompletionService;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -94,11 +95,27 @@
                }
        }
        
-       //TODO unified executor service (share cached pool.)
-       private CompletionService<Set<Service>> tracker = new 
ExecutorCompletionService<Set<Service>>(Executors.newCachedThreadPool());
-       private Collection<ProcessListener> listeners = new 
CopyOnWriteArrayList<ProcessListener>();
+       private final CompletionService<Set<Service>> tracker;
+       private final Collection<ProcessListener> listeners = new 
CopyOnWriteArrayList<ProcessListener>();
+       private final LsClient client;
        private Thread processThread;
        
+       public LookupProcess() {
+               this.tracker = new 
ExecutorCompletionService<Set<Service>>(Executors.newCachedThreadPool());
+               this.client = LsClientProvider.getClient();
+       }
+       
+       public LookupProcess(Executor executor) {
+               this.tracker = new 
ExecutorCompletionService<Set<Service>>(executor);
+               this.client = LsClientProvider.getClient();
+       }
+       
+       public LookupProcess(LsClient client, Executor executor) {
+               this.client = client;
+               this.tracker = new 
ExecutorCompletionService<Set<Service>>(executor);
+       }
+       
+       
        public void addProcessListener(ProcessListener modelListener) {
                listeners.add(modelListener);
        }       
@@ -125,16 +142,14 @@
                }
 
                // TODO remove
-               types.add(new EventType() {
-                       public String getValue() {
-                               return 
"http://ggf.org/ns/nmwg/characteristic/utilization/2.0";;
-                       }
-                       public void setValue(String arg0) { /**/}             
                                                          
-               });
-               // TODO recycle
-               LsClient client = LsClientProvider.getClient();
+//             types.add(new EventType() {
+//                     public String getValue() {
+//                             return 
"http://ggf.org/ns/nmwg/characteristic/utilization/2.0";;
+//                     }
+//                     public void setValue(String arg0) { /**/}             
                                                          
+//             });
                
-               processThread = new Thread(new LookupTask(client, elements, 
types, null), "LS-Lookup");
+               processThread = new Thread(new LookupTask(client, elements, 
types, null), "Ls-Lookup");
                processThread.start();
        }
        

Added: branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LsResources.java


Property changes on: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ls/LsResources.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java   
  2008-12-02 17:49:54 UTC (rev 4731)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java   
  2008-12-02 17:58:55 UTC (rev 4732)
@@ -54,6 +54,11 @@
 import org.perfsonar.perfsonarui.JAXPCheck;
 import org.perfsonar.perfsonarui.PSLogger;
 import org.perfsonar.perfsonarui.SmartMARequest;
+import org.perfsonar.perfsonarui.demo.DemoPlugin;
+import org.perfsonar.perfsonarui.demo.DemoPluginMainPanel;
+import org.perfsonar.perfsonarui.ippm.IPPMPerfsonarModel;
+import org.perfsonar.perfsonarui.ls.LsResources;
+import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
 import org.perfsonar.perfsonarui.playground.PerfsonarPlaygroundModel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
@@ -150,8 +155,9 @@
        public PerfSonarApp(String title, int width, int height) {
                super();
 
+               loadLogging();
+               loadLsclient();
                
-               PSLogger.configureLog4j(false);
                String sp = "java.endorsed.dirs";
                logger.debug(sp + "\t" + System.getProperty(sp));
         mainFrame = new JFrame(title);
@@ -231,6 +237,22 @@
         mainFrame.setExtendedState(state);        
                 
        }
+       protected void loadLogging() {
+               PSLogger.configureLog4j(false);
+       }
+       @SuppressWarnings("boxing")
+       protected void loadLsclient() {
+               String value;
+               try {
+                       value = 
System.getProperty("application.perfsonar.lsclient.eagerRootLses");
+               } catch(SecurityException e) {
+                       return;
+               }
+               if(value != null && Boolean.valueOf(value)) {
+                       // trigger creation.
+                       LsResources.getClient();
+               }
+       }
        public void loadPlugins(PerfsonarTabsList perfsonarTabs,String[] 
cmdOpts) {
         try {
                perfsonarTabs.loadAllFromPlugins(cmdOpts);
@@ -518,7 +540,8 @@
                                </pre> 
         */
        public static void main(String[] args) {
-
+               handleSystemProperties();
+               
                cmdOpts = args;
         javax.swing.SwingUtilities.invokeLater(new Runnable() {
             public void run() {
@@ -527,8 +550,24 @@
             }
         });
    }
+
+       protected static void handleSystemProperties() {
+               String value = null;
+               try {
+                       value = 
System.getProperty("application.perfsonar.lsclient.eagerRootLses");
+               } catch (SecurityException e) {
+                       System.out.println("Warn: couldn't read 
\"application.perfsonar.lsclient.eagerRootLses\"");
+                       return;
+               }
+               try {
+                       if(value==null) {
+                               
System.setProperty("application.perfsonar.lsclient.eagerRootLses", 
Boolean.TRUE.toString());
+                       }
+               } catch (SecurityException e) {
+                       System.out.println("Warn: couldn't set 
\"application.perfsonar.lsclient.eagerRootLses\" to true");
+               }
+       }
        
-       
        private void getXmlProperties(StringBuffer b) {
                String[] p = {
                                "javax.xml.datatype.DatatypeFactory",

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
      2008-12-02 17:49:54 UTC (rev 4731)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
      2008-12-02 17:58:55 UTC (rev 4732)
@@ -153,7 +153,7 @@
 
        protected Collection<MAEndpoint> getSelectedEndpoints() {
                List<MAEndpoint> points = new ArrayList<MAEndpoint>();
-               for(MAEndpoint point : points) {
+               for(MAEndpoint point : endpoints) {
                        if(point.isEnabled()) {
                                points.add(point);
                        }