Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java?rev=674351&r1=674350&r2=674351&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
 Sun Jul  6 14:47:12 2008
@@ -5,15 +5,15 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
  * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  * License for the specific language governing permissions and limitations
  * under the License.
- *  
+ *
  */
 
 package org.apache.jmeter.visualizers;
@@ -61,167 +61,167 @@
  * Excludes the Median and 90% columns, which are expensive in memory terms
  */
 public class SummaryReport extends AbstractVisualizer implements Clearable, 
ActionListener {
-       
-       private static final Logger log = LoggingManager.getLoggerForClass();
 
-       private final String[] COLUMNS = { 
+    private static final Logger log = LoggingManager.getLoggerForClass();
+
+    private final String[] COLUMNS = {
             JMeterUtils.getResString("sampler_label"),               
//$NON-NLS-1$
-                       JMeterUtils.getResString("aggregate_report_count"),     
 //$NON-NLS-1$
+            JMeterUtils.getResString("aggregate_report_count"),      
//$NON-NLS-1$
             JMeterUtils.getResString("average"),                     
//$NON-NLS-1$
-                       JMeterUtils.getResString("aggregate_report_min"),       
 //$NON-NLS-1$
+            JMeterUtils.getResString("aggregate_report_min"),        
//$NON-NLS-1$
             JMeterUtils.getResString("aggregate_report_max"),        
//$NON-NLS-1$
             JMeterUtils.getResString("aggregate_report_stddev"),     
//$NON-NLS-1$
-                       JMeterUtils.getResString("aggregate_report_error%"),    
 //$NON-NLS-1$
+            JMeterUtils.getResString("aggregate_report_error%"),     
//$NON-NLS-1$
             JMeterUtils.getResString("aggregate_report_rate"),       
//$NON-NLS-1$
-                       JMeterUtils.getResString("aggregate_report_bandwidth"), 
 //$NON-NLS-1$
+            JMeterUtils.getResString("aggregate_report_bandwidth"),  
//$NON-NLS-1$
             JMeterUtils.getResString("average_bytes"),               
//$NON-NLS-1$
             };
 
-       private final String TOTAL_ROW_LABEL 
+    private final String TOTAL_ROW_LABEL
         = JMeterUtils.getResString("aggregate_report_total_label");  
//$NON-NLS-1$
 
-       protected JTable myJTable;
+    protected JTable myJTable;
 
-       protected JScrollPane myScrollPane;
+    protected JScrollPane myScrollPane;
 
-    protected JButton saveTable = 
+    protected JButton saveTable =
         new JButton(JMeterUtils.getResString("aggregate_graph_save_table"));   
         //$NON-NLS-1$
-    
-    private JCheckBox useGroupName = 
+
+    private JCheckBox useGroupName =
         new 
JCheckBox(JMeterUtils.getResString("aggregate_graph_use_group_name"));          
  //$NON-NLS-1$
-    
-       private transient ObjectTableModel model;
 
-       Map tableRows = Collections.synchronizedMap(new HashMap());
+    private transient ObjectTableModel model;
+
+    Map tableRows = Collections.synchronizedMap(new HashMap());
 
-       // Column renderers
-       private static final TableCellRenderer[] RENDERERS = 
-               new TableCellRenderer[]{
-                   null, // Label
-                   null, // count
-                   null, // Mean
-                   null, // Min
-                   null, // Max
-                   new NumberRenderer("#0.00"), // Std Dev.
-                   new NumberRenderer("#0.00%"), // Error %age
-                   new RateRenderer("#.0"),      // Throughpur
-                   new NumberRenderer("#0.00"),  // kB/sec
-                   new NumberRenderer("#.0"),    // avg. pageSize
-               };
+    // Column renderers
+    private static final TableCellRenderer[] RENDERERS =
+        new TableCellRenderer[]{
+            null, // Label
+            null, // count
+            null, // Mean
+            null, // Min
+            null, // Max
+            new NumberRenderer("#0.00"), // Std Dev.
+            new NumberRenderer("#0.00%"), // Error %age
+            new RateRenderer("#.0"),      // Throughpur
+            new NumberRenderer("#0.00"),  // kB/sec
+            new NumberRenderer("#.0"),    // avg. pageSize
+        };
 
     public SummaryReport() {
-               super();
-               model = new ObjectTableModel(COLUMNS,
-                               Calculator.class,// All rows have this class
-                new Functor[] { 
+        super();
+        model = new ObjectTableModel(COLUMNS,
+                Calculator.class,// All rows have this class
+                new Functor[] {
                     new Functor("getLabel"),              //$NON-NLS-1$
                     new Functor("getCount"),              //$NON-NLS-1$
-                               new Functor("getMeanAsNumber"),       
//$NON-NLS-1$
+                    new Functor("getMeanAsNumber"),       //$NON-NLS-1$
                     new Functor("getMin"),                //$NON-NLS-1$
                     new Functor("getMax"),                //$NON-NLS-1$
                     new Functor("getStandardDeviation"),  //$NON-NLS-1$
                     new Functor("getErrorPercentage"),    //$NON-NLS-1$
                     new Functor("getRate"),               //$NON-NLS-1$
-                               new Functor("getKBPerSecond"),        
//$NON-NLS-1$
+                    new Functor("getKBPerSecond"),        //$NON-NLS-1$
                     new Functor("getAvgPageBytes"),       //$NON-NLS-1$
                 },
-                new Functor[] { null, null, null, null, null, null, null, null 
, null, null }, 
-                new Class[] { String.class, Long.class, Long.class, 
Long.class, Long.class, 
+                new Functor[] { null, null, null, null, null, null, null, null 
, null, null },
+                new Class[] { String.class, Long.class, Long.class, 
Long.class, Long.class,
                               String.class, String.class, String.class, 
String.class, String.class });
-               clearData();
-               init();
-       }
-    
-       public static boolean testFunctors(){
-               SummaryReport instance = new SummaryReport();
-               return instance.model.checkFunctors(null,instance.getClass());
-       }
-       
-       public String getLabelResource() {
-               return "summary_report";  //$NON-NLS-1$
-       }
+        clearData();
+        init();
+    }
+
+    public static boolean testFunctors(){
+        SummaryReport instance = new SummaryReport();
+        return instance.model.checkFunctors(null,instance.getClass());
+    }
+
+    public String getLabelResource() {
+        return "summary_report";  //$NON-NLS-1$
+    }
 
-       public void add(SampleResult res) {
-               Calculator row = null;
+    public void add(SampleResult res) {
+        Calculator row = null;
         final String sampleLabel = 
res.getSampleLabel(useGroupName.isSelected());
-               synchronized (tableRows) {
+        synchronized (tableRows) {
             row = (Calculator) tableRows.get(sampleLabel);
-                       if (row == null) {
-                               row = new Calculator(sampleLabel);
-                               tableRows.put(row.getLabel(), row);
-                               model.insertRow(row, model.getRowCount() - 1);
-                       }
-               }
-               /*
-                * Synch is needed because multiple threads can update the 
counts.
-                */
-               synchronized(row) {
-                   row.addSample(res);
-               }
-               Calculator tot = ((Calculator) tableRows.get(TOTAL_ROW_LABEL));
-               synchronized(tot) {
-                   tot.addSample(res);
-               }
-               model.fireTableDataChanged();
-       }
-
-       /**
-        * Clears this visualizer and its model, and forces a repaint of the 
table.
-        */
-       public void clearData() {
+            if (row == null) {
+                row = new Calculator(sampleLabel);
+                tableRows.put(row.getLabel(), row);
+                model.insertRow(row, model.getRowCount() - 1);
+            }
+        }
+        /*
+         * Synch is needed because multiple threads can update the counts.
+         */
+        synchronized(row) {
+            row.addSample(res);
+        }
+        Calculator tot = ((Calculator) tableRows.get(TOTAL_ROW_LABEL));
+        synchronized(tot) {
+            tot.addSample(res);
+        }
+        model.fireTableDataChanged();
+    }
+
+    /**
+     * Clears this visualizer and its model, and forces a repaint of the table.
+     */
+    public void clearData() {
         synchronized (tableRows) {
-               model.clearData();
-               tableRows.clear();
-               tableRows.put(TOTAL_ROW_LABEL, new Calculator(TOTAL_ROW_LABEL));
-               model.addRow(tableRows.get(TOTAL_ROW_LABEL));
+            model.clearData();
+            tableRows.clear();
+            tableRows.put(TOTAL_ROW_LABEL, new Calculator(TOTAL_ROW_LABEL));
+            model.addRow(tableRows.get(TOTAL_ROW_LABEL));
         }
-       }
+    }
 
-       /**
-        * Main visualizer setup.
-        */
-       private void init() {
-               this.setLayout(new BorderLayout());
-
-               // MAIN PANEL
-               JPanel mainPanel = new JPanel();
-               Border margin = new EmptyBorder(10, 10, 5, 10);
-
-               mainPanel.setBorder(margin);
-               mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
-
-               mainPanel.add(makeTitlePanel());
-
-               myJTable = new JTable(model);
-               myJTable.setPreferredScrollableViewportSize(new Dimension(500, 
70));
-               RendererUtils.applyRenderers(myJTable, RENDERERS);
-               myScrollPane = new JScrollPane(myJTable);
-               this.add(mainPanel, BorderLayout.NORTH);
-               this.add(myScrollPane, BorderLayout.CENTER);
-               saveTable.addActionListener(this);
-               JPanel opts = new JPanel();
+    /**
+     * Main visualizer setup.
+     */
+    private void init() {
+        this.setLayout(new BorderLayout());
+
+        // MAIN PANEL
+        JPanel mainPanel = new JPanel();
+        Border margin = new EmptyBorder(10, 10, 5, 10);
+
+        mainPanel.setBorder(margin);
+        mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
+
+        mainPanel.add(makeTitlePanel());
+
+        myJTable = new JTable(model);
+        myJTable.setPreferredScrollableViewportSize(new Dimension(500, 70));
+        RendererUtils.applyRenderers(myJTable, RENDERERS);
+        myScrollPane = new JScrollPane(myJTable);
+        this.add(mainPanel, BorderLayout.NORTH);
+        this.add(myScrollPane, BorderLayout.CENTER);
+        saveTable.addActionListener(this);
+        JPanel opts = new JPanel();
         opts.add(useGroupName, BorderLayout.WEST);
-               opts.add(saveTable, BorderLayout.CENTER);
-               this.add(opts,BorderLayout.SOUTH);
-       }
-
-       public void actionPerformed(ActionEvent ev) {
-               if (ev.getSource() == saveTable) {
-               JFileChooser chooser = 
FileDialoger.promptToSaveFile("summary.csv");//$NON-NLS-1$
+        opts.add(saveTable, BorderLayout.CENTER);
+        this.add(opts,BorderLayout.SOUTH);
+    }
+
+    public void actionPerformed(ActionEvent ev) {
+        if (ev.getSource() == saveTable) {
+            JFileChooser chooser = 
FileDialoger.promptToSaveFile("summary.csv");//$NON-NLS-1$
             if (chooser == null) {
                 return;
             }
-                       FileWriter writer = null;
-                       try {
-                           writer = new FileWriter(chooser.getSelectedFile());
-                           CSVSaveService.saveCSVStats(model,writer);
-                       } catch (FileNotFoundException e) {
-                           log.warn(e.getMessage());
-                       } catch (IOException e) {
-                           log.warn(e.getMessage());
-                       } finally {
-                           JOrphanUtils.closeQuietly(writer);
-                       }
-               }
-       }
+            FileWriter writer = null;
+            try {
+                writer = new FileWriter(chooser.getSelectedFile());
+                CSVSaveService.saveCSVStats(model,writer);
+            } catch (FileNotFoundException e) {
+                log.warn(e.getMessage());
+            } catch (IOException e) {
+                log.warn(e.getMessage());
+            } finally {
+                JOrphanUtils.closeQuietly(writer);
+            }
+        }
+    }
 }

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java?rev=674351&r1=674350&r2=674351&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
 (original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TableVisualizer.java
 Sun Jul  6 14:47:12 2008
@@ -13,7 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  */
 
 package org.apache.jmeter.visualizers;
@@ -52,237 +52,237 @@
  * This class implements a statistical analyser that calculates both the 
average
  * and the standard deviation of the sampling process. The samples are 
displayed
  * in a JTable, and the statistics are displayed at the bottom of the table.
- * 
+ *
  * created March 10, 2002
- * 
+ *
  */
 public class TableVisualizer extends AbstractVisualizer implements Clearable {
-       private static final Logger log = LoggingManager.getLoggerForClass();
-       
-       private static final ImageIcon imageSuccess = JMeterUtils.getImage(
+    private static final Logger log = LoggingManager.getLoggerForClass();
+
+    private static final ImageIcon imageSuccess = JMeterUtils.getImage(
             JMeterUtils.getPropDefault("viewResultsTree.success",  
//$NON-NLS-1$
-                       "icon_success_sml.gif"), //$NON-NLS-1$
+                    "icon_success_sml.gif"), //$NON-NLS-1$
             JMeterUtils.getResString("table_visualizer_success")); 
//$NON-NLS-1$
 
-       private static final ImageIcon imageFailure = JMeterUtils.getImage(
+    private static final ImageIcon imageFailure = JMeterUtils.getImage(
             JMeterUtils.getPropDefault("viewResultsTree.failure",  
//$NON-NLS-1$
-                       "icon_warning_sml.gif"), //$NON-NLS-1$
+                    "icon_warning_sml.gif"), //$NON-NLS-1$
             JMeterUtils.getResString("table_visualizer_warning")); 
//$NON-NLS-1$
 
-       private final String[] COLUMNS = new String[] {
+    private final String[] COLUMNS = new String[] {
             JMeterUtils.getResString("table_visualizer_sample_num"), // 
$NON-NLS-1$
             JMeterUtils.getResString("table_visualizer_start_time"), // 
$NON-NLS-1$
             JMeterUtils.getResString("table_visualizer_thread_name"),// 
$NON-NLS-1$
-                       JMeterUtils.getResString("sampler_label"),  // 
$NON-NLS-1$
+            JMeterUtils.getResString("sampler_label"),  // $NON-NLS-1$
             JMeterUtils.getResString("table_visualizer_sample_time"), // 
$NON-NLS-1$
-                       JMeterUtils.getResString("table_visualizer_status"),  
// $NON-NLS-1$
+            JMeterUtils.getResString("table_visualizer_status"),  // 
$NON-NLS-1$
             JMeterUtils.getResString("table_visualizer_bytes") }; // 
$NON-NLS-1$
 
-       private ObjectTableModel model = null;
+    private ObjectTableModel model = null;
 
-       private JTable table = null;
+    private JTable table = null;
 
-       private JTextField dataField = null;
+    private JTextField dataField = null;
 
-       private JTextField averageField = null;
+    private JTextField averageField = null;
 
-       private JTextField deviationField = null;
+    private JTextField deviationField = null;
 
-       private JTextField noSamplesField = null;
+    private JTextField noSamplesField = null;
 
-       private JScrollPane tableScrollPanel = null;
+    private JScrollPane tableScrollPanel = null;
 
-       private transient Calculator calc = new Calculator();
+    private transient Calculator calc = new Calculator();
 
-       private long currentData = 0;
+    private long currentData = 0;
 
     private Format format = new SimpleDateFormat("HH:mm:ss.SSS"); //$NON-NLS-1$
-    
-       // Column renderers
-       private static final TableCellRenderer[] RENDERERS = 
-               new TableCellRenderer[]{
-                   null, // Count
-                   new RightAlignRenderer(), // Start Time
-                   null, // Thread Name
-                   null, // Label
-                   null, // Sample Time
-                   null, // Status
-                   null, // Bytes
-               };
-
-       /**
-        * Constructor for the TableVisualizer object.
-        */
-       public TableVisualizer() {
-               super();
-               model = new ObjectTableModel(COLUMNS,
-                               Sample.class,         // The object used for 
each row
-                               new Functor[] {
+
+    // Column renderers
+    private static final TableCellRenderer[] RENDERERS =
+        new TableCellRenderer[]{
+            null, // Count
+            new RightAlignRenderer(), // Start Time
+            null, // Thread Name
+            null, // Label
+            null, // Sample Time
+            null, // Status
+            null, // Bytes
+        };
+
+    /**
+     * Constructor for the TableVisualizer object.
+     */
+    public TableVisualizer() {
+        super();
+        model = new ObjectTableModel(COLUMNS,
+                Sample.class,         // The object used for each row
+                new Functor[] {
                 new Functor("getCount"), // $NON-NLS-1$
                 new Functor("getStartTimeFormatted",  // $NON-NLS-1$
                         new Object[]{format}),
                 new Functor("getThreadName"), // $NON-NLS-1$
                 new Functor("getLabel"), // $NON-NLS-1$
-                               new Functor("getData"), // $NON-NLS-1$
+                new Functor("getData"), // $NON-NLS-1$
                 new SampleSuccessFunctor("isSuccess"), // $NON-NLS-1$
                 new Functor("getBytes") }, // $NON-NLS-1$
-                new Functor[] { null, null, null, null, null, null, null }, 
-                new Class[] { 
-                               Long.class, String.class, String.class, 
String.class, Long.class, ImageIcon.class, Integer.class });
-               init();
-       }
-
-       public static boolean testFunctors(){
-               TableVisualizer instance = new TableVisualizer();
-               return instance.model.checkFunctors(null,instance.getClass());
-       }
-       
-
-       public String getLabelResource() {
-               return "view_results_in_table"; // $NON-NLS-1$
-       }
-
-       protected synchronized void updateTextFields() {
-               noSamplesField.setText(Long.toString(calc.getCount()));
-               dataField.setText(Long.toString(currentData));
-               averageField.setText(Long.toString((long) calc.getMean()));
-               deviationField.setText(Long.toString((long) 
calc.getStandardDeviation()));
-       }
+                new Functor[] { null, null, null, null, null, null, null },
+                new Class[] {
+                Long.class, String.class, String.class, String.class, 
Long.class, ImageIcon.class, Integer.class });
+        init();
+    }
+
+    public static boolean testFunctors(){
+        TableVisualizer instance = new TableVisualizer();
+        return instance.model.checkFunctors(null,instance.getClass());
+    }
+
+
+    public String getLabelResource() {
+        return "view_results_in_table"; // $NON-NLS-1$
+    }
+
+    protected synchronized void updateTextFields() {
+        noSamplesField.setText(Long.toString(calc.getCount()));
+        dataField.setText(Long.toString(currentData));
+        averageField.setText(Long.toString((long) calc.getMean()));
+        deviationField.setText(Long.toString((long) 
calc.getStandardDeviation()));
+    }
 
-       public void add(SampleResult res) {
+    public void add(SampleResult res) {
         currentData = res.getTime();
-               synchronized (calc) {
-                       calc.addValue(currentData);
-                       int count = calc.getCount();
-                       Sample newS = new Sample(res.getSampleLabel(), 
res.getTime(), 0, 0, 0, 0, 0, 0,
+        synchronized (calc) {
+            calc.addValue(currentData);
+            int count = calc.getCount();
+            Sample newS = new Sample(res.getSampleLabel(), res.getTime(), 0, 
0, 0, 0, 0, 0,
                     res.isSuccessful(), count, res.getEndTime(),res.getBytes(),
                     res.getThreadName());
-                       model.addRow(newS);
-               }
-               updateTextFields();
-       }
-
-       public synchronized void clearData() {
-               model.clearData();
-               currentData = 0;
-               calc.clear();
-               noSamplesField.setText("0"); // $NON-NLS-1$
-               dataField.setText("0"); // $NON-NLS-1$
-               averageField.setText("0"); // $NON-NLS-1$
-               deviationField.setText("0"); // $NON-NLS-1$
-               repaint();
-       }
-
-       public String toString() {
-               return "Show the samples in a table";
-       }
-
-       private void init() {
-               this.setLayout(new BorderLayout());
-
-               // MAIN PANEL
-               JPanel mainPanel = new JPanel();
-               Border margin = new EmptyBorder(10, 10, 5, 10);
-
-               mainPanel.setBorder(margin);
-               mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.BOTH));
-
-               // NAME
-               mainPanel.add(makeTitlePanel());
-
-               // Set up the table itself
-               table = new JTable(model);
-               // table.getTableHeader().setReorderingAllowed(false);
-               RendererUtils.applyRenderers(table, RENDERERS);
-
-               tableScrollPanel = new JScrollPane(table);
-               
tableScrollPanel.setViewportBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
-
-               // Set up footer of table which displays numerics of the graphs
-               JPanel dataPanel = new JPanel();
-               JLabel dataLabel = new 
JLabel(JMeterUtils.getResString("graph_results_latest_sample")); // $NON-NLS-1$
-               dataLabel.setForeground(Color.black);
-               dataField = new JTextField(5);
-               dataField.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 
0));
-               dataField.setEditable(false);
-               dataField.setForeground(Color.black);
-               dataField.setBackground(getBackground());
-               dataPanel.add(dataLabel);
-               dataPanel.add(dataField);
-
-               JPanel averagePanel = new JPanel();
-               JLabel averageLabel = new 
JLabel(JMeterUtils.getResString("graph_results_average")); // $NON-NLS-1$
-               averageLabel.setForeground(Color.blue);
-               averageField = new JTextField(5);
-               averageField.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 
0));
-               averageField.setEditable(false);
-               averageField.setForeground(Color.blue);
-               averageField.setBackground(getBackground());
-               averagePanel.add(averageLabel);
-               averagePanel.add(averageField);
-
-               JPanel deviationPanel = new JPanel();
-               JLabel deviationLabel = new 
JLabel(JMeterUtils.getResString("graph_results_deviation")); // $NON-NLS-1$
-               deviationLabel.setForeground(Color.red);
-               deviationField = new JTextField(5);
-               deviationField.setBorder(BorderFactory.createEmptyBorder(0, 0, 
0, 0));
-               deviationField.setEditable(false);
-               deviationField.setForeground(Color.red);
-               deviationField.setBackground(getBackground());
-               deviationPanel.add(deviationLabel);
-               deviationPanel.add(deviationField);
-
-               JPanel noSamplesPanel = new JPanel();
-               JLabel noSamplesLabel = new 
JLabel(JMeterUtils.getResString("graph_results_no_samples")); // $NON-NLS-1$
-
-               noSamplesField = new JTextField(10);
-               noSamplesField.setBorder(BorderFactory.createEmptyBorder(0, 0, 
0, 0));
-               noSamplesField.setEditable(false);
-               noSamplesField.setForeground(Color.black);
-               noSamplesField.setBackground(getBackground());
-               noSamplesPanel.add(noSamplesLabel);
-               noSamplesPanel.add(noSamplesField);
-
-               JPanel tableInfoPanel = new JPanel();
-               tableInfoPanel.setLayout(new FlowLayout());
-               tableInfoPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 
0, 0));
-
-               tableInfoPanel.add(noSamplesPanel);
-               tableInfoPanel.add(dataPanel);
-               tableInfoPanel.add(averagePanel);
-               tableInfoPanel.add(deviationPanel);
-
-               // Set up the table with footer
-               JPanel tablePanel = new JPanel();
-
-               tablePanel.setLayout(new BorderLayout());
-               tablePanel.add(tableScrollPanel, BorderLayout.CENTER);
-               tablePanel.add(tableInfoPanel, BorderLayout.SOUTH);
-
-               // Add the main panel and the graph
-               this.add(mainPanel, BorderLayout.NORTH);
-               this.add(tablePanel, BorderLayout.CENTER);
-       }
-       
-       public static class SampleSuccessFunctor extends Functor {
-               public SampleSuccessFunctor(String methodName) {
-                       super(methodName);
-               }
-               
-               public Object invoke(Object p_invokee) {
-                       Boolean success = (Boolean)super.invoke(p_invokee);
-                       
-                       if(success != null) {
-                               if(success.booleanValue()) {
-                                       return imageSuccess;
-                               }
-                               else {
-                                       return imageFailure;
-                               }
-                       }
-                       else {
-                               return null;
-                       }
-               }
-       }
+            model.addRow(newS);
+        }
+        updateTextFields();
+    }
+
+    public synchronized void clearData() {
+        model.clearData();
+        currentData = 0;
+        calc.clear();
+        noSamplesField.setText("0"); // $NON-NLS-1$
+        dataField.setText("0"); // $NON-NLS-1$
+        averageField.setText("0"); // $NON-NLS-1$
+        deviationField.setText("0"); // $NON-NLS-1$
+        repaint();
+    }
+
+    public String toString() {
+        return "Show the samples in a table";
+    }
+
+    private void init() {
+        this.setLayout(new BorderLayout());
+
+        // MAIN PANEL
+        JPanel mainPanel = new JPanel();
+        Border margin = new EmptyBorder(10, 10, 5, 10);
+
+        mainPanel.setBorder(margin);
+        mainPanel.setLayout(new VerticalLayout(5, VerticalLayout.BOTH));
+
+        // NAME
+        mainPanel.add(makeTitlePanel());
+
+        // Set up the table itself
+        table = new JTable(model);
+        // table.getTableHeader().setReorderingAllowed(false);
+        RendererUtils.applyRenderers(table, RENDERERS);
+
+        tableScrollPanel = new JScrollPane(table);
+        tableScrollPanel.setViewportBorder(BorderFactory.createEmptyBorder(2, 
2, 2, 2));
+
+        // Set up footer of table which displays numerics of the graphs
+        JPanel dataPanel = new JPanel();
+        JLabel dataLabel = new 
JLabel(JMeterUtils.getResString("graph_results_latest_sample")); // $NON-NLS-1$
+        dataLabel.setForeground(Color.black);
+        dataField = new JTextField(5);
+        dataField.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        dataField.setEditable(false);
+        dataField.setForeground(Color.black);
+        dataField.setBackground(getBackground());
+        dataPanel.add(dataLabel);
+        dataPanel.add(dataField);
+
+        JPanel averagePanel = new JPanel();
+        JLabel averageLabel = new 
JLabel(JMeterUtils.getResString("graph_results_average")); // $NON-NLS-1$
+        averageLabel.setForeground(Color.blue);
+        averageField = new JTextField(5);
+        averageField.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        averageField.setEditable(false);
+        averageField.setForeground(Color.blue);
+        averageField.setBackground(getBackground());
+        averagePanel.add(averageLabel);
+        averagePanel.add(averageField);
+
+        JPanel deviationPanel = new JPanel();
+        JLabel deviationLabel = new 
JLabel(JMeterUtils.getResString("graph_results_deviation")); // $NON-NLS-1$
+        deviationLabel.setForeground(Color.red);
+        deviationField = new JTextField(5);
+        deviationField.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        deviationField.setEditable(false);
+        deviationField.setForeground(Color.red);
+        deviationField.setBackground(getBackground());
+        deviationPanel.add(deviationLabel);
+        deviationPanel.add(deviationField);
+
+        JPanel noSamplesPanel = new JPanel();
+        JLabel noSamplesLabel = new 
JLabel(JMeterUtils.getResString("graph_results_no_samples")); // $NON-NLS-1$
+
+        noSamplesField = new JTextField(10);
+        noSamplesField.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+        noSamplesField.setEditable(false);
+        noSamplesField.setForeground(Color.black);
+        noSamplesField.setBackground(getBackground());
+        noSamplesPanel.add(noSamplesLabel);
+        noSamplesPanel.add(noSamplesField);
+
+        JPanel tableInfoPanel = new JPanel();
+        tableInfoPanel.setLayout(new FlowLayout());
+        tableInfoPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
+
+        tableInfoPanel.add(noSamplesPanel);
+        tableInfoPanel.add(dataPanel);
+        tableInfoPanel.add(averagePanel);
+        tableInfoPanel.add(deviationPanel);
+
+        // Set up the table with footer
+        JPanel tablePanel = new JPanel();
+
+        tablePanel.setLayout(new BorderLayout());
+        tablePanel.add(tableScrollPanel, BorderLayout.CENTER);
+        tablePanel.add(tableInfoPanel, BorderLayout.SOUTH);
+
+        // Add the main panel and the graph
+        this.add(mainPanel, BorderLayout.NORTH);
+        this.add(tablePanel, BorderLayout.CENTER);
+    }
+
+    public static class SampleSuccessFunctor extends Functor {
+        public SampleSuccessFunctor(String methodName) {
+            super(methodName);
+        }
+
+        public Object invoke(Object p_invokee) {
+            Boolean success = (Boolean)super.invoke(p_invokee);
+
+            if(success != null) {
+                if(success.booleanValue()) {
+                    return imageSuccess;
+                }
+                else {
+                    return imageFailure;
+                }
+            }
+            else {
+                return null;
+            }
+        }
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to