perfsonar development work

Author: nina
Date: 2007-07-03 03:30:13 -0400 (Tue, 03 Jul 2007)
New Revision: 2494

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/RadarChartPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataPanel.java
Log:
updates related to jfreechart 1.06 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
  2007-07-03 07:29:14 UTC (rev 2493)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/BarChartPanel.java
  2007-07-03 07:30:13 UTC (rev 2494)
@@ -418,14 +418,14 @@
                if (arg0.getEntity() instanceof CategoryItemEntity) {
                        CategoryItemEntity item = (CategoryItemEntity) 
arg0.getEntity();
                        try {
-                               if (item.getCategory() instanceof UserData) {
-                                       
psModel.getUserData().assign((UserData)item.getCategory());
+                               if (item.getColumnKey() instanceof UserData) {
+                                       
psModel.getUserData().assign((UserData)item.getColumnKey());
                                        
action.setUserData(psModel.getUserData());
-                                       ((MetadataChartSet) 
dataset).setSelected((UserData)item.getCategory());
+                                       ((MetadataChartSet) 
dataset).setSelected((UserData)item.getColumnKey());
                                        if (action instanceof ITimeSet)
                                                
((UserData)psModel.getUserData()).lastSeconds(((ITimeSet)action).getTimeInterval());
                                        action.actionPerformed(null);
-                               } else 
JOptionPane.showMessageDialog(null,item.getCategory());
+                               } else 
JOptionPane.showMessageDialog(null,item.getColumnKey());
 
                        } catch (Exception x) {
                                //smth else went wrong

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/RadarChartPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/RadarChartPanel.java
        2007-07-03 07:29:14 UTC (rev 2493)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/RadarChartPanel.java
        2007-07-03 07:30:13 UTC (rev 2494)
@@ -118,7 +118,18 @@
        //webPlot.setSeriesOutlineStroke(new BasicStroke());
        //newPlot.setInteriorGap(0.1);
        
-       newPlot.setToolTipGenerator(new StandardCategoryToolTipGenerator());
+       newPlot.setToolTipGenerator(new StandardCategoryToolTipGenerator() {
+               @Override
+               protected String generateLabelString(CategoryDataset arg0, 
int arg1, int arg2) {
+                       if (arg0 == null) return "";
+                       else return super.generateLabelString(arg0, arg1, 
arg2);
+               }
+               @Override
+               public String generateToolTip(CategoryDataset arg0, int arg1, 
int arg2) {
+                       if (arg0 == null) return "";
+                       else return super.generateToolTip(arg0, arg1, arg2);
+               }
+       });
        newPlot.setURLGenerator(new StandardCategoryURLGenerator(){
                    /**
                         * 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
  2007-07-03 07:29:14 UTC (rev 2493)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointListTableModel.java
  2007-07-03 07:30:13 UTC (rev 2494)
@@ -115,7 +115,7 @@
             return;
             }
         case 2: {
-            endpointList.get(rowIndex).setEndpoint(aValue.toString());
+            //endpointList.get(rowIndex).setEndpoint(aValue.toString());
             return;
             }        
         }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
  2007-07-03 07:29:14 UTC (rev 2493)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/MAEndpointsPanel.java
  2007-07-03 07:30:13 UTC (rev 2494)
@@ -325,7 +325,8 @@
     
     protected JFormattedTextField field_url;
     protected JFormattedTextField field_name;
-    protected JComboBox field_schema;
+    protected JFormattedTextField field_schema;
+    //protected JComboBox field_schema;
     protected JFormattedTextField[] field_events;
     
     public MAEndpointPanel(List<IPerfsonarSchema> supportedSchemas) {
@@ -344,6 +345,10 @@
 
         field_name = new JFormattedTextField();
         field_name.addPropertyChangeListener("value",this);
+       field_schema = new JFormattedTextField();
+       field_schema.addPropertyChangeListener("value",this); 
+
+       /*
         if (supportedSchemas != null) {
                field_schema = new JComboBox(supportedSchemas.toArray());
                field_schema.setEditable(false);
@@ -351,7 +356,9 @@
                field_schema = new JComboBox();
                field_schema.setEditable(true);
         }      
+        
         field_schema.addPropertyChangeListener("value",this);
+        */
         
         c.weightx = 0.25;
         c.gridwidth  = 1;
@@ -401,7 +408,8 @@
         if (this.endpoint != null)  {
             this.endpoint.setEndpoint(field_url.getText());
             this.endpoint.setTitle(field_name.getText());
-            
this.endpoint.setSchema(field_schema.getSelectedItem().toString());
+            this.endpoint.setSchema(field_schema.getText());
+            
//this.endpoint.setSchema(field_schema.getSelectedItem().toString());
             for (int i=0; i < 2; i++) 
                this.endpoint.setEvent(field_events[i].getText(), i);
         }
@@ -409,13 +417,15 @@
         if (endpoint != null) {
             field_url.setText(endpoint.getEndpoint());
             field_name.setText(endpoint.getTitle());
-            field_schema.setSelectedItem(endpoint.getSchema().getSchema());
+            field_schema.setText(endpoint.getSchema().getSchema());
+            //field_schema.setSelectedItem(endpoint.getSchema().getSchema());
             for (int i=0; i < 2; i++) 
                field_events[i].setText(endpoint.getEvent(i));            
         } else {
             field_url.setText("");
             field_name.setText("");
-            field_schema.setSelectedItem("");
+            //field_schema.setSelectedItem("");
+            field_schema.setText("");
             for (int i=0; i < 2; i++) 
                field_events[i].setText("");
         }
@@ -428,7 +438,8 @@
         else if (src.equals(field_name))
             endpoint.setTitle(field_name.getText());
         else if (src.equals(field_schema))
-            endpoint.setSchema(field_schema.getSelectedItem().toString());
+               endpoint.setSchema(field_schema.getText());
+            //endpoint.setSchema(field_schema.getSelectedItem().toString());
         else if (src.equals(field_events[0]))
             endpoint.setEvent(field_events[0].getText(),0);
         else if (src.equals(field_events[1]))

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataPanel.java
     2007-07-03 07:29:14 UTC (rev 2493)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/panels/UserDataPanel.java
     2007-07-03 07:30:13 UTC (rev 2494)
@@ -27,8 +27,12 @@
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.LayoutManager;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
 
 import javax.swing.BorderFactory;
+import javax.swing.InputVerifier;
+import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
@@ -68,7 +72,18 @@
                setLayout(new BorderLayout());
                //if (userData instanceof Observable) 
(Observable)userData).addObserver(this);
                tableModel = new UserDataTableModel(userData,columns,query);
+               
                userDataTable = new JTable(tableModel);
+               userDataTable.setFocusTraversalKeysEnabled(true);
+               userDataTable.setSurrendersFocusOnKeystroke(true);
+               userDataTable.setRequestFocusEnabled(true);
+               userDataTable.addFocusListener(new FocusAdapter() {
+                       @Override
+                       public void focusLost(FocusEvent e) {
+                               super.focusLost(e);
+                               
userDataTable.getCellEditor().stopCellEditing();                              
  
+                       }
+               });
                userDataTable.setToolTipText("The query column is used to 
construct a query for the measurement data");
                JScrollPane scrollPane = new JScrollPane(userDataTable);
                
scrollPane.setBorder(BorderFactory.createTitledBorder("Data"));