You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/11/03 01:55:08 UTC

svn commit: r330400 - in /jakarta/jmeter/branches/rel-2-1/src: core/org/apache/jmeter/testbeans/gui/ core/org/apache/jmeter/visualizers/ reports/org/apache/jmeter/gui/

Author: sebb
Date: Wed Nov  2 16:55:00 2005
New Revision: 330400

URL: http://svn.apache.org/viewcvs?rev=330400&view=rev
Log:
Allow serialisation to be checked

Modified:
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
    jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/ReportMainFrame.java

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=330400&r1=330399&r2=330400&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java Wed Nov  2 16:55:00 2005
@@ -96,7 +96,7 @@
  * @version $Revision$ updated on $Date$
  */
 public class GenericTestBeanCustomizer extends JPanel implements SharedCustomizer, PropertyChangeListener {
-	private static Logger log = LoggingManager.getLoggerForClass();
+	private static final Logger log = LoggingManager.getLoggerForClass();
 
 	public static final String GROUP = "group";
 
@@ -153,6 +153,9 @@
 	 */
 	private Map propertyMap;
 
+    public GenericTestBeanCustomizer(){
+        log.warn("Constructor only intended for use in testing"); // $NON-NLS-1$
+    }
 	/**
 	 * Create a customizer for a given test bean type.
 	 * 

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=330400&r1=330399&r2=330400&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Wed Nov  2 16:55:00 2005
@@ -87,7 +87,7 @@
  * @version $Revision$ updated on $Date$
  */
 public class TestBeanGUI extends AbstractJMeterGuiComponent implements JMeterGUIComponent {
-	private static Logger log = LoggingManager.getLoggerForClass();
+	private static final Logger log = LoggingManager.getLoggerForClass();
 
 	private Class testBeanClass;
 
@@ -136,8 +136,8 @@
 	}
 
 	// Dummy for JUnit test
-	TestBeanGUI() {
-		log.warn("Only for use in testing");// $NON-NLS-1$
+	public TestBeanGUI() {
+		log.warn("Constructor only for use in testing");// $NON-NLS-1$
 	}
 
 	public TestBeanGUI(Class testBeanClass) {

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java?rev=330400&r1=330399&r2=330400&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java Wed Nov  2 16:55:00 2005
@@ -39,7 +39,7 @@
  * @version $Revision$
  */
 public class SamplingStatCalculator implements Serializable {
-	static Logger log = LoggingManager.getLoggerForClass();
+	private static final Logger log = LoggingManager.getLoggerForClass();
 
 	private static DecimalFormat rateFormatter = new DecimalFormat("#.0");
 
@@ -59,7 +59,8 @@
 
 	// private int index;
 
-	private SamplingStatCalculator() {// Don't (can't) use this...
+	public SamplingStatCalculator() {// Don't (can't) use this...
+        log.warn("Constructor only intended for use in testing"); // $NON-NLS-1$
 	}
 
 	/**

Modified: jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/ReportMainFrame.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/ReportMainFrame.java?rev=330400&r1=330399&r2=330400&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/ReportMainFrame.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/gui/ReportMainFrame.java Wed Nov  2 16:55:00 2005
@@ -1,4 +1,3 @@
-// $Header$
 /*
  * Copyright 2005 The Apache Software Foundation.
  *
@@ -27,8 +26,6 @@
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.HashSet;
-import java.util.Set;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -61,6 +58,8 @@
 import org.apache.jmeter.testelement.TestListener;
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.gui.ComponentUtil;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
 
 /**
  * ReportMainFrame is based on MainFrame. it uses the same basic structure,
@@ -71,6 +70,8 @@
  */
 public class ReportMainFrame extends JFrame implements TestListener, Remoteable {
 
+    private static final Logger log = LoggingManager.getLoggerForClass();
+    
     /** The menu bar. */
     protected ReportMenuBar menuBar;
 
@@ -84,7 +85,7 @@
     protected JTree tree;
 
     /** An image which is displayed when a test is running. */
-	private ImageIcon runningIcon = JMeterUtils.getImage("thread.enabled.gif");
+	//private ImageIcon runningIcon = JMeterUtils.getImage("thread.enabled.gif");
 
 	/** An image which is displayed when a test is not currently running. */
 	private ImageIcon stoppedIcon = JMeterUtils.getImage("thread.disabled.gif");
@@ -99,11 +100,14 @@
 	private JButton runningIndicator;
 
 	/** The set of currently running hosts. */
-	private Set hosts = new HashSet();
+	//private Set hosts = new HashSet();
 
 	/** A message dialog shown while JMeter threads are stopping. */
 	private JDialog stoppingMessage;
 
+    public ReportMainFrame(){
+        log.warn("Constructor only intended for use in testing"); // $NON-NLS-1$
+    }
     /**
 	 * Create a new JMeter frame.
 	 * 



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org