perfsonar development work

Author: nina
Date: 2007-12-11 07:40:00 -0500 (Tue, 11 Dec 2007)
New Revision: 3111

Added:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ResourceBundle.properties
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ResourceBundle.properties
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ResourceBundle.properties
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ResourceBundle_us.properties
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/ResourceBundle.properties
Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMResponseChartPanel.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MAResponseChartPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MainPanelMA.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarTab.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SearchByIPActionTest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ClearAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SetOptionsAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/RequestOptionsPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/ResponseChartPanel.java
Log:
Inital steps to making use of Resource Bundles for strings. Fixed some 
spelling according to suggestions in Bug 274 
http://bugzilla.perfsonar.net/show_bug.cgi?id=274 

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ResourceBundle.properties

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ResourceBundle.properties

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMResponseChartPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMResponseChartPanel.java
       2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ippm/ui/panels/IPPMResponseChartPanel.java
       2007-12-11 12:40:00 UTC (rev 3111)
@@ -184,7 +184,7 @@
      * @see 
org.perfsonar.perfsonarui.ui.panels.ResponseChartPanel#createChart(java.util.Hashtable)
      */
     @Override
-       protected JFreeChart createChart(Hashtable datasets) {
+       protected JFreeChart createChart(IPerfsonarTab psModel,Hashtable 
datasets) {
        preparePlots();
                
                CombinedDomainXYPlot plot = new 
CombinedDomainXYPlot(dateAxis);

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/MAPerfsonarModel.java 
2007-12-11 12:40:00 UTC (rev 3111)
@@ -56,10 +56,8 @@
 import org.perfsonar.perfsonarui.plugins.MAEndpointList;
 import org.perfsonar.perfsonarui.plugins.MetaDataList;
 import org.perfsonar.perfsonarui.plugins.PerfsonarTabsList;
-import org.perfsonar.perfsonarui.plugins.UnsupportedSchemaException;
 import org.perfsonar.perfsonarui.ui.PerfsonarModel;
 import org.perfsonar.perfsonarui.ui.actions.ITimeSetAction;
-import org.perfsonar.perfsonarui.ui.actions.PSActionMap;
 import org.perfsonar.perfsonarui.ui.actions.PSUIAction;
 import org.perfsonar.perfsonarui.ui.actions.PerfsonarRequestAction;
 import org.perfsonar.perfsonarui.ui.actions.SetupDataRequestAction;
@@ -92,6 +90,14 @@
  *
  */
 public class MAPerfsonarModel extends PerfsonarModel {
+       public static String msg_utilization="msg_utilization";
+       public static String 
msg_utilization_percent="msg_utilization_percent";
+       public static String msg_utilization_mbs="msg_utilization_mbs";
+       public static String msg_input_errors="msg_input_errors";
+       public static String msg_output_drops="msg_output_drops";
+       public static String msg_select_interface="msg_select_interface";
+       public static String action_trace="action_trace";
+       
     public static Color[] inSeriesColor = {new Color(64,255,64,120),new 
Color(0,207,0,200)};
     public static Color[] outSeriesColor = {new Color(64,64,255,120),new 
Color(0,42,151,200)};
        public static Pattern ip4Pattern = 
Pattern.compile("^((\\b((25[0-5])|(2[0-4]\\d)|([0-1]?[0-9]{0,2}))\\b)\\.){3}(\\b((25[0-5])|(2[0-4]\\d)|([0-1]?[0-9]{0,2}))\\b)$");
@@ -116,8 +122,10 @@
        public MAPerfsonarModel(MAEndpointList endpoints) {
                super(endpoints);
                tracerouteShell = new TracerouteShell();
-
-               traceAction = new 
TracerouteAction(request,(UserData)userData,dataList,endpointList,searchText,getTracerouteShell());
+               
+               
+               traceAction = new 
TracerouteAction(request,(UserData)userData,dataList,endpointList,searchText,getTracerouteShell(),
+                               getResourceBundle().getString(action_trace));
                //traceAction.setGroup("Interface selection");
                traceAction.setGroup(IPerfsonarTab.defaultGroupHidden);
                actions.put(traceAction.getValue(Action.NAME),traceAction);
@@ -360,7 +368,7 @@
        public JComponent[] createDetailsComponent(Component parentComponent) 
{
                String[][] s = new String[][] {
                                {UserData.C_HOSTNAME,"Hostname"},
-                               {UserData.C_IFADDRESS,"IP Address"},
+                               {UserData.C_IFADDRESS,"IP address"},
                                {UserData.C_IFNAME,"Interface name"},
                                {UserData.C_IFDESCRIPTION,"Interface 
description"},
                                {UserData.C_CAPACITY,"Capacity"},

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ResourceBundle.properties

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ResourceBundle_us.properties

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java
      2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/actions/TracerouteAction.java
      2007-12-11 12:40:00 UTC (rev 3111)
@@ -39,10 +39,6 @@
         */
        private static final long serialVersionUID = 8090077760328367182L;
        protected TracerouteShell shell;
-       public TracerouteAction(IPerfsonarRequest request, UserData userData,
-                       MetaDataList dataList, MAEndpointList endpoints, 
Vector searchText,TracerouteShell shell) {
-               this(request, userData, dataList, endpoints, 
searchText,shell,"Traceroute & Search");
-       }
 
        public TracerouteAction(IPerfsonarRequest request, UserData userData,
                        MetaDataList dataList, MAEndpointList endpoints, 
Vector searchText,TracerouteShell shell,

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
  2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
  2007-12-11 12:40:00 UTC (rev 3111)
@@ -79,6 +79,7 @@
  * <b>Modified</b> 2005-12-4
  */
 public class BarChartPanel extends PSPanel implements ChartMouseListener , 
DatasetChangeListener, PropertyChangeListener{
+
        protected CategoryDataset dataset ;
        protected Plot radarPlot = null;
        protected Plot barPlot = null;
@@ -167,7 +168,8 @@
         popup.add(item);
         */ 
         //utilization 
-        a = new AbstractAction("Utilization,%/Utilization, Mb/s") {
+        a = new 
AbstractAction(psModel.getResourceBundle().getString(MAPerfsonarModel.msg_utilization_percent)+"/"+
+                       
psModel.getResourceBundle().getString(MAPerfsonarModel.msg_utilization_mbs)) {
                        /**
                         * 
                         */
@@ -301,8 +303,8 @@
                                
                                return "<html>" +
                                Integer.toString(((MetadataChartSet) 
dataset).fromIndex() + arg2+1) + ") " +
-                               data.toString() + "<br> input utilization " + 
-                               formatValue(data.getUtilizationIn()) + "% 
<br>output utilization " +  
+                               data.toString() + "<br> input utilisation " + 
+                               formatValue(data.getUtilizationIn()) + "% 
<br>output utilisation " +  
                                formatValue(data.getUtilizationOut()) + "%"; 
                        } else return "NA";
                        } catch (Exception x) {
@@ -349,7 +351,7 @@
 
        //cAxis.setTickMarksVisible(false);
        na = new NumberAxis();
-       na.setLabel("Utilization, %");
+       
na.setLabel(psModel.getResourceBundle().getString(MAPerfsonarModel.msg_utilization_percent));
         barPlot = new CategoryPlot(dataset,cAxis, na, barRenderer);
         
         barRenderer.setDrawBarOutline(false);
@@ -482,9 +484,9 @@
     
     protected void updateLabels(MetadataChartSet ds) {
        if (ds.isUtilization())
-               na.setLabel("Utilization, %");
+               
na.setLabel(psModel.getResourceBundle().getString(MAPerfsonarModel.msg_utilization_percent));
        else
-           na.setLabel("Utilization, Mb/s");
+           
na.setLabel(psModel.getResourceBundle().getString(MAPerfsonarModel.msg_utilization_mbs));
        page.setText((ds.getPage()+1) + " / " + (ds.maxPages()+1));
        items.setText((ds.fromIndex()+1) + "-" + (ds.toIndex()+1));
         utilizationBox.setSelected(ds.isUtilization());        

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MAResponseChartPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MAResponseChartPanel.java
   2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MAResponseChartPanel.java
   2007-12-11 12:40:00 UTC (rev 3111)
@@ -26,6 +26,7 @@
 import java.awt.LayoutManager;
 import java.text.SimpleDateFormat;
 import java.util.Hashtable;
+import java.util.ResourceBundle;
 import java.util.TimeZone;
 
 import org.jfree.chart.JFreeChart;
@@ -99,9 +100,9 @@
         * @return A sample chart.
         */
        @Override
-       protected JFreeChart createChart(Hashtable datasets) {
-
-               bitAxis = new NumberAxis("Utilization, Mb/s") {
+       protected JFreeChart createChart(IPerfsonarTab psModel,Hashtable 
datasets) {
+               ResourceBundle rb = psModel.getResourceBundle();
+               bitAxis = new 
NumberAxis(rb.getString(MAPerfsonarModel.msg_utilization_mbs)) {
                        /**
                         * 
                         */
@@ -117,7 +118,8 @@
                bitAxis.setTickMarkPaint(gridColor);
                bitAxis.setTickMarksVisible(true);
                
-        NumberAxis countAxis = new NumberAxis("Input Errors / Output Drops") 
{
+        NumberAxis countAxis = new 
NumberAxis(rb.getString(MAPerfsonarModel.msg_input_errors)
+                       +'/'+ 
rb.getString(MAPerfsonarModel.msg_output_drops)) {
 
             /**
                         * 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MainPanelMA.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MainPanelMA.java
    2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MainPanelMA.java
    2007-12-11 12:40:00 UTC (rev 3111)
@@ -25,6 +25,7 @@
 import java.awt.GridLayout;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.JSplitPane;

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataPanel.java
  2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/MetaDataPanel.java
  2007-12-11 12:40:00 UTC (rev 3111)
@@ -43,6 +43,7 @@
 import javax.swing.table.TableColumnModel;
 
 import org.perfsonar.perfsonarui.AbstractUserData;
+import org.perfsonar.perfsonarui.ma.MAPerfsonarModel;
 import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
 import org.perfsonar.perfsonarui.plugins.MetaDataList;
 import org.perfsonar.perfsonarui.ui.panels.PSPanel;
@@ -84,7 +85,7 @@
        public void addWidgets(IPerfsonarTab psModel) {
            setMinimumSize(minDimension);
                setLayout(new BorderLayout());
-               setBorder(BorderFactory.createTitledBorder("Select 
Interface"));
+               
setBorder(BorderFactory.createTitledBorder(psModel.getResourceBundle().getString(MAPerfsonarModel.msg_select_interface)));
                
                psModel.getDataList().addObserver(this);
                dataTable = new JTable(new 
MetaDataTableModel(psModel.getDataList()),

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/ResourceBundle.properties

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarTab.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarTab.java 
      2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/plugins/IPerfsonarTab.java 
      2007-12-11 12:40:00 UTC (rev 3111)
@@ -22,6 +22,7 @@
 
 import java.awt.Component;
 import java.util.Observer;
+import java.util.ResourceBundle;
 
 import javax.swing.JComponent;
 
@@ -155,4 +156,6 @@
      * @return
      */
     public int getOrder();
+    
+    public ResourceBundle getResourceBundle();
 }
\ No newline at end of file

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java 
      2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/MetaDataListTest.java 
      2007-12-11 12:40:00 UTC (rev 3111)
@@ -139,9 +139,9 @@
        MAMetadataList list = (MAMetadataList)m.getDataList();
        for (int i=0; i < list.size();i++) {
                System.out.print(list.get(i));
-               System.out.print("\tUtilization in\t");
+               System.out.print("\tUtilisation in\t");
                System.out.print(list.getUserData(i).getUtilizationIn());
-               System.out.print("Utilization out\t");
+               System.out.print("Utilisation out\t");
                System.out.print(list.getUserData(i).getUtilizationOut());
                System.out.println();
        }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SearchByIPActionTest.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SearchByIPActionTest.java
   2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/SearchByIPActionTest.java
   2007-12-11 12:40:00 UTC (rev 3111)
@@ -99,9 +99,9 @@
        MAMetadataList list = (MAMetadataList)m.getDataList();
        for (int i=0; i < list.size();i++) {
                System.out.print(list.get(i));
-               System.out.print("\tUtilization in\t");
+               System.out.print("\tUtilisation in\t");
                System.out.print(list.getUserData(i).getUtilizationIn());
-               System.out.print("Utilization out\t");
+               System.out.print("Utilisation out\t");
                System.out.print(list.getUserData(i).getUtilizationOut());
                System.out.println();
        }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java   
  2007-12-11 11:57:10 UTC (rev 3110)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfSonarApp.java   
  2007-12-11 12:40:00 UTC (rev 3111)
@@ -28,6 +28,8 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.Collections;
+import java.util.Locale;
+import java.util.ResourceBundle;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
@@ -408,7 +410,15 @@
     }
 
     protected boolean canClose() {
-        return (JOptionPane.showConfirmDialog(null,"Are you sure to exit 
?","Please confirm",JOptionPane.YES_NO_OPTION)
+       
+       String msgexit = "Are you sure you want to exit?";
+       try {
+               ResourceBundle b = 
ResourceBundle.getBundle("org.perfsonar.perfsonarui.ResourceBundle",Locale.getDefault());
+               msgexit = b.getString("msg_exit");
+       } catch (Exception x) {
+               
+       }
+        return (JOptionPane.showConfirmDialog(null,msgexit,"Please 
confirm",JOptionPane.YES_NO_OPTION)
                        ==JOptionPane.YES_OPTION);
      }
     protected void doClose() {

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2007-12-11 11:57:10 UTC (rev 3110)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/PerfsonarModel.java 
  2007-12-11 12:40:00 UTC (rev 3111)
@@ -26,7 +26,9 @@
 import java.net.URL;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Observable;
+import java.util.ResourceBundle;
 import java.util.Vector;
 
 import javax.swing.Action;
@@ -106,6 +108,7 @@
  * @author Nina Jeliazkova
  */
 public abstract class PerfsonarModel extends Observable implements 
IPerfsonarTab {
+       protected ResourceBundle resourceBundle;
        protected static PSLogger logger = new PSLogger(PerfsonarModel.class);
     public SmartMARequest request = null;
        public static long timeIntervals[] = {  //seconds
@@ -189,6 +192,7 @@
         */
        public PerfsonarModel(MAEndpointList endpoints) {
                super();
+               resourceBundle = createResourceBundle();
                request = createSmartRequest();
                this.responseData = createTimeValueResponseListener();
                searchText = new Vector<String>();
@@ -237,6 +241,24 @@
                clearAction.setActions(actions);
                
        }
+       /**
+        * Creates ResourceBundle from 
"org.perfsonar.perfsonarui.your_class.ResourceBundle.properties".<br>
+        * If that file does not exist, loads 
"org.perfsonar.perfsonarui.ResourceBundle.properties"
+        * @return
+        */
+       protected ResourceBundle createResourceBundle() {
+               try {
+                 String resource = getClass().getName();
+                 int p = resource.lastIndexOf('.');
+                 if (p > -1) resource = resource.substring(0,p+1) + 
"ResourceBundle";
+                 logger.info("Loading resources from "+resource);
+             return ResourceBundle.getBundle(resource,Locale.getDefault());
+               } catch (Exception x) {
+                       logger.warn(x.getMessage());
+                       logger.info("Loading resources from  
org.perfsonar.perfsonarui.ResourceBundle");
+                       return 
ResourceBundle.getBundle("org.perfsonar.perfsonarui.ResourceBundle",Locale.getDefault());
        
+               }
+       }
        public IUserData createUserData() {
                return new AbstractUserData();
        }
@@ -563,4 +585,10 @@
        public int compareTo(IPerfsonarTab arg0) {
                return getOrder() - arg0.getOrder();
        }
+       public ResourceBundle getResourceBundle() {
+               return resourceBundle;
+       }
+       public void setResourceBundle(ResourceBundle resourceBundle) {
+               this.resourceBundle = resourceBundle;
+       }
 }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ClearAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ClearAction.java
      2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ClearAction.java
      2007-12-11 12:40:00 UTC (rev 3111)
@@ -47,6 +47,7 @@
 
        public ClearAction(IPerfsonarTab perfsonarTab,String name, Icon arg1, 
String group) {
                super(name, arg1, group);
+               putValue(SHORT_DESCRIPTION,"Clears all retrieved data");  
                this.perfsonarTab = perfsonarTab;
        }
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SetOptionsAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SetOptionsAction.java
 2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/SetOptionsAction.java
 2007-12-11 12:40:00 UTC (rev 3111)
@@ -59,6 +59,7 @@
 
        public SetOptionsAction(PerfsonarModel model,String arg0, Icon arg1, 
String group) {
                super(arg0, arg1, group);
+               putValue(Action.SHORT_DESCRIPTION, "Modify connection 
timeout, number of parallel connections, enable/disable authorization and 
authentication.");
                setModel(model);
        }
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
      2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/actions/ShowEndpointsAction.java
      2007-12-11 12:40:00 UTC (rev 3111)
@@ -77,7 +77,7 @@
      */
     public ShowEndpointsAction(MAEndpointList endpoints,String arg0, Icon 
arg1) {
         super(endpoints, arg0, arg1);
-        putValue(SHORT_DESCRIPTION,"Select Measurement Archives to be  
queried");        
+        putValue(SHORT_DESCRIPTION,"Select Measurement archives to be 
queried");        
     }
     /* (non-Javadoc)
      * @see 
org.perfsonar.perfsonarui.ui.actions.MARequestAction#actionPerformed(java.awt.event.ActionEvent)

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
  2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
  2007-12-11 12:40:00 UTC (rev 3111)
@@ -39,7 +39,7 @@
  */
 public class MAEndpointListTableModel extends AbstractTableModel implements 
Observer {
     protected MAEndpointList endpointList;
-    protected String[] columnNames = {"Use","Measurement Archive","URL", 
"Schema","Status","Status Explanation"};
+    protected String[] columnNames = {"Use","Measurement archive","URL", 
"Schema","Status","Status explanation"};
     /**
      * Comment for <code>serialVersionUID</code>
      */

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/RequestOptionsPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/RequestOptionsPanel.java
       2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/RequestOptionsPanel.java
       2007-12-11 12:40:00 UTC (rev 3111)
@@ -161,7 +161,7 @@
                }
            };
 
-               Action aaAction = new AbstractAction("Enable Authentication 
and Authorization") {
+               Action aaAction = new AbstractAction("Enable authentication 
and authorization") {
                // This method is called when the button is pressed
                public void actionPerformed(ActionEvent evt) {
                    JCheckBox cb = (JCheckBox)evt.getSource();

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/ResponseChartPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/ResponseChartPanel.java
        2007-12-11 11:57:10 UTC (rev 3110)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/ResponseChartPanel.java
        2007-12-11 12:40:00 UTC (rev 3111)
@@ -122,7 +122,7 @@
 
            this.ifDataset = ifDataset;
            ifDataset.addChangeListener(this);
-               chart = createChart(ifDataset.getDatasets());
+               chart = createChart(psModel,ifDataset.getDatasets());
                chart.setAntiAlias(true);
                chartPanel = new ChartPanel(chart);
 
@@ -133,7 +133,7 @@
                add(chartPanel, BorderLayout.CENTER);
        }
 
-       protected abstract JFreeChart createChart(Hashtable datasets) ;
+       protected abstract JFreeChart createChart(IPerfsonarTab 
psModel,Hashtable datasets) ;
 
        /*
         * (non-Javadoc)