perfsonar development work

Author: gijs
Date: 2007-07-20 10:23:54 -0400 (Fri, 20 Jul 2007)
New Revision: 2559

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MomentOptionsPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RawOptionsPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/StatPanel.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/TopOptionsPanel.java
Log:


Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MomentOptionsPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MomentOptionsPanel.java
    2007-07-20 14:18:04 UTC (rev 2558)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/MomentOptionsPanel.java
    2007-07-20 14:23:54 UTC (rev 2559)
@@ -617,20 +617,6 @@
                                                                              
                                                  
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                                                                              
  .addContainerGap()));
 
-               // Listen to the action
-               /*
-                * momentStartYearComboBox.addActionListener(this)
-                * momentStartMonthComboBox.addActionListener(this);
-                * momentStartDayComboBox.addActionListener(this);
-                * momentStartHourComboBox.addActionListener(this);
-                * momentStartSecondComboBox.addActionListener(this);
-                * momentEndYearComboBox.addActionListener(this);
-                * momentEndMonthComboBox.addActionListener(this);
-                * momentEndDayComboBox.addActionListener(this);
-                * momentEndHourComboBox.addActionListener(this);
-                * momentEndSecondComboBox.addActionListener(this);
-                * presetSelectComboBox.addActionListener(this);
-                */
                presetLoadButton.addActionListener(this);
 
        }

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RawOptionsPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RawOptionsPanel.java
       2007-07-20 14:18:04 UTC (rev 2558)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RawOptionsPanel.java
       2007-07-20 14:23:54 UTC (rev 2559)
@@ -3,7 +3,7 @@
  $Id$
  $Copyright$
 
-*/
+ */
 
 package org.perfsonar.perfsonarui.flowsa.panels;
 
@@ -11,6 +11,15 @@
 
        private static final long serialVersionUID = 1L;
 
+       private javax.swing.JPanel FilterAggregationPanel;
+       private javax.swing.JTextField rawAggregationField;
+       private javax.swing.JLabel rawAggregationLabel;
+       private javax.swing.JPanel rawFieldPanel;
+       private javax.swing.JScrollPane rawFieldScrollPane;
+       private javax.swing.JList rawFieldsList;
+       private javax.swing.JTextField rawFilterField;
+       private javax.swing.JLabel rawFilterlabel;
+
        public RawOptionsPanel() {
                addWidgets();
        }
@@ -197,10 +206,10 @@
        }
 
        public String getFields() {
-        StringBuffer buffer = new StringBuffer();
-        for (Object value: rawFieldsList.getSelectedValues())
-               buffer.append(value.toString() + " ");
-           return buffer.toString();
+               StringBuffer buffer = new StringBuffer();
+               for (Object value : rawFieldsList.getSelectedValues())
+                       buffer.append(value.toString() + " ");
+               return buffer.toString();
        }
 
        public String getAggregation() {
@@ -211,13 +220,4 @@
                return this.rawFilterField.getText();
        }
 
-       private javax.swing.JPanel FilterAggregationPanel;
-       private javax.swing.JTextField rawAggregationField;
-       private javax.swing.JLabel rawAggregationLabel;
-       private javax.swing.JPanel rawFieldPanel;
-       private javax.swing.JScrollPane rawFieldScrollPane;
-       private javax.swing.JList rawFieldsList;
-       private javax.swing.JTextField rawFilterField;
-       private javax.swing.JLabel rawFilterlabel;
-
 }
\ No newline at end of file

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/StatPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/StatPanel.java
     2007-07-20 14:18:04 UTC (rev 2558)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/StatPanel.java
     2007-07-20 14:23:54 UTC (rev 2559)
@@ -3,7 +3,7 @@
  $Id$
  $Copyright$
 
-*/
+ */
 
 package org.perfsonar.perfsonarui.flowsa.panels;
 
@@ -23,6 +23,47 @@
                DocumentListener, FocusListener {
 
        private static final long serialVersionUID = 1L;
+       private javax.swing.JPanel statQueryPanel;
+       private javax.swing.JTextField statsBytesField;
+       private javax.swing.JTextField statsBytesIcmpField;
+       private javax.swing.JLabel statsBytesIcmpLabel;
+       private javax.swing.JLabel statsBytesLabel;
+       private javax.swing.JTextField statsBytesOtherField;
+       private javax.swing.JLabel statsBytesOtherLabel;
+       private javax.swing.JTextField statsBytesTcpField;
+       private javax.swing.JLabel statsBytesTcpLabel;
+       private javax.swing.JTextField statsBytesUdpField;
+       private javax.swing.JLabel statsBytesUdpLabel;
+       private javax.swing.JTextField statsFirstField;
+       private javax.swing.JLabel statsFirstLabel;
+       private javax.swing.JTextField statsFlowsField;
+       private javax.swing.JTextField statsFlowsIcmpField;
+       private javax.swing.JLabel statsFlowsIcmpLabel;
+       private javax.swing.JLabel statsFlowsLabel;
+       private javax.swing.JTextField statsFlowsOtherField;
+       private javax.swing.JLabel statsFlowsOthersLabel;
+       private javax.swing.JLabel statsFlowsPacketsLabel;
+       private javax.swing.JTextField statsFlowsTcpField;
+       private javax.swing.JLabel statsFlowsTcpLabel;
+       private javax.swing.JLabel statsFlowsUdpLabel;
+       private javax.swing.JTextField statsFlowsudpField;
+       private javax.swing.JTextField statsLastField;
+       private javax.swing.JLabel statsLastLabel;
+       private javax.swing.JTextField statsMsecFirstField;
+       private javax.swing.JLabel statsMsecFirstLabel;
+       private javax.swing.JTextField statsMsecLastField;
+       private javax.swing.JLabel statsMsecLastLabel;
+       private javax.swing.JTextField statsPacketsField;
+       private javax.swing.JTextField statsPacketsIcmpField;
+       private javax.swing.JLabel statsPacketsIcmpLabel;
+       private javax.swing.JLabel statsPacketsOtherLabel;
+       private javax.swing.JTextField statsPacketsTcpField;
+       private javax.swing.JLabel statsPacketsTcpLabel;
+       private javax.swing.JTextField statsPacketsUdpField;
+       private javax.swing.JLabel statsPacketsUdpLabel;
+       private javax.swing.JTextField statsPacketsotherField;
+       private javax.swing.JTextField statsSeqFailField;
+       private javax.swing.JLabel statsSeqFailLabel;
 
        public StatPanel(Component parentFrame, IPerfsonarTab model) {
                super(parentFrame, model);
@@ -667,48 +708,6 @@
                                                
Short.MAX_VALUE).addContainerGap()));
        }
 
-       private javax.swing.JPanel statQueryPanel;
-       private javax.swing.JTextField statsBytesField;
-       private javax.swing.JTextField statsBytesIcmpField;
-       private javax.swing.JLabel statsBytesIcmpLabel;
-       private javax.swing.JLabel statsBytesLabel;
-       private javax.swing.JTextField statsBytesOtherField;
-       private javax.swing.JLabel statsBytesOtherLabel;
-       private javax.swing.JTextField statsBytesTcpField;
-       private javax.swing.JLabel statsBytesTcpLabel;
-       private javax.swing.JTextField statsBytesUdpField;
-       private javax.swing.JLabel statsBytesUdpLabel;
-       private javax.swing.JTextField statsFirstField;
-       private javax.swing.JLabel statsFirstLabel;
-       private javax.swing.JTextField statsFlowsField;
-       private javax.swing.JTextField statsFlowsIcmpField;
-       private javax.swing.JLabel statsFlowsIcmpLabel;
-       private javax.swing.JLabel statsFlowsLabel;
-       private javax.swing.JTextField statsFlowsOtherField;
-       private javax.swing.JLabel statsFlowsOthersLabel;
-       private javax.swing.JLabel statsFlowsPacketsLabel;
-       private javax.swing.JTextField statsFlowsTcpField;
-       private javax.swing.JLabel statsFlowsTcpLabel;
-       private javax.swing.JLabel statsFlowsUdpLabel;
-       private javax.swing.JTextField statsFlowsudpField;
-       private javax.swing.JTextField statsLastField;
-       private javax.swing.JLabel statsLastLabel;
-       private javax.swing.JTextField statsMsecFirstField;
-       private javax.swing.JLabel statsMsecFirstLabel;
-       private javax.swing.JTextField statsMsecLastField;
-       private javax.swing.JLabel statsMsecLastLabel;
-       private javax.swing.JTextField statsPacketsField;
-       private javax.swing.JTextField statsPacketsIcmpField;
-       private javax.swing.JLabel statsPacketsIcmpLabel;
-       private javax.swing.JLabel statsPacketsOtherLabel;
-       private javax.swing.JTextField statsPacketsTcpField;
-       private javax.swing.JLabel statsPacketsTcpLabel;
-       private javax.swing.JTextField statsPacketsUdpField;
-       private javax.swing.JLabel statsPacketsUdpLabel;
-       private javax.swing.JTextField statsPacketsotherField;
-       private javax.swing.JTextField statsSeqFailField;
-       private javax.swing.JLabel statsSeqFailLabel;
-
        public void update(Observable o, Object arg) {
                // TODO Auto-generated method stub
 

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/TopOptionsPanel.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/TopOptionsPanel.java
       2007-07-20 14:18:04 UTC (rev 2558)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/TopOptionsPanel.java
       2007-07-20 14:23:54 UTC (rev 2559)
@@ -3,7 +3,7 @@
  $Id$
  $Copyright$
 
-*/
+ */
 
 package org.perfsonar.perfsonarui.flowsa.panels;