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 2006/03/24 22:42:32 UTC

svn commit: r388650 - in /jakarta/jmeter/branches/rel-2-1/src: components/org/apache/jmeter/sampler/ components/org/apache/jmeter/sampler/gui/ components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/gui/util/ core/org/apache/jmeter/samplers/ c...

Author: sebb
Date: Fri Mar 24 13:42:26 2006
New Revision: 388650

URL: http://svn.apache.org/viewcvs?rev=388650&view=rev
Log:
Rename local vars to avoid hiding others

Modified:
    jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/sampler/TestAction.java
    jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
    jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/AxisGraph.java
    jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/LineGraph.java
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/FileListPanel.java
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/keystore/DefaultKeyStore.java
    jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
    jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
    jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/LineChart.java

Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/sampler/TestAction.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/sampler/TestAction.java?rev=388650&r1=388649&r2=388650&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/sampler/TestAction.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/sampler/TestAction.java Fri Mar 24 13:42:26 2006
@@ -25,10 +25,9 @@
 import org.apache.jmeter.threads.JMeterThread;
 
 /**
- * @author Administrator
+ * Dummy Sampler used to pause or stop a thread or the test;
+ * intended for use in Conditional Controllers.
  * 
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
  */
 public class TestAction extends AbstractSampler {
 	// Actions
@@ -112,7 +111,7 @@
 		// res.setResponseData(response.toString().getBytes());
 		// res.sampleEnd();
 		// return res;
-		return null;
+		return null; // This means no sample is saved
 	}
 
 	public void setTarget(int target) {
@@ -137,9 +136,5 @@
 
 	public int getDuration() {
 		return getPropertyAsInt(DURATION);
-	}
-
-	private String getTitle() {
-		return this.getName();
 	}
 }

Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java?rev=388650&r1=388649&r2=388650&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/sampler/gui/TestActionGui.java Fri Mar 24 13:42:26 2006
@@ -198,7 +198,7 @@
 			public void focusGained(FocusEvent e) {
 			}
 		});
-		durationPanel.add(new JLabel("Duration"));
+		durationPanel.add(new JLabel(durationLabel));
 		durationPanel.add(durationField);
 		add(durationPanel);
 	}

Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/AxisGraph.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/AxisGraph.java?rev=388650&r1=388649&r2=388650&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/AxisGraph.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/AxisGraph.java Fri Mar 24 13:42:26 2006
@@ -1,4 +1,3 @@
-// $Header$
 /*
  * Copyright 2005 The Apache Software Foundation.
  * 
@@ -27,6 +26,8 @@
 
 import javax.swing.JPanel;
 
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
 import org.jCharts.axisChart.AxisChart;
 import org.jCharts.axisChart.customRenderers.axisValue.renderers.ValueLabelPosition;
 import org.jCharts.axisChart.customRenderers.axisValue.renderers.ValueLabelRenderer;
@@ -48,6 +49,8 @@
  */
 public class AxisGraph extends JPanel {
 
+    private static final Logger log = LoggingManager.getLoggerForClass();
+    
     protected double[][] data = null;
     protected String title, xAxisTitle, yAxisTitle, yAxisLabel;
     protected String[] xAxisLabels;
@@ -116,31 +119,31 @@
         }
     }
 
-    private double findMax(double data[][]) {
+    private double findMax(double _data[][]) {
         double max = 0;
-        max = data[0][0];
-        for (int i = 0; i < data.length; i++) {
-            for (int j = 0; j < data[i].length; j++) {
-                if (data[i][j] > max) {
-                    max = data[i][j];
+        max = _data[0][0];
+        for (int i = 0; i < _data.length; i++) {
+            for (int j = 0; j < _data[i].length; j++) {
+                if (_data[i][j] > max) {
+                    max = _data[i][j];
                 }
             }
         }
         return max;
     }
     
-    private void drawSample(String title, String[] xAxisLabels, String xAxisTitle,
-            String yAxisTitle, double[][] data, int width, int height, Graphics g) {
-        double max = findMax(data);
+    private void drawSample(String _title, String[] _xAxisLabels, String _xAxisTitle,
+            String _yAxisTitle, double[][] _data, int _width, int _height, Graphics g) {
+        double max = findMax(_data);
         try {
-            if (width == 0) {
-                width = 450;
+            if (_width == 0) {
+                _width = 450;
             }
-            if (height == 0) {
-                height = 250;
+            if (_height == 0) {
+                _height = 250;
             }
-            this.setPreferredSize(new Dimension(width,height));
-            DataSeries dataSeries = new DataSeries( xAxisLabels, xAxisTitle, yAxisTitle, title );
+            this.setPreferredSize(new Dimension(_width,_height));
+            DataSeries dataSeries = new DataSeries( _xAxisLabels, _xAxisTitle, _yAxisTitle, _title );
             
             String[] legendLabels= { yAxisLabel };
             Paint[] paints= new Paint[] { Color.yellow };
@@ -151,7 +154,7 @@
             barChartProperties.addPostRenderEventListener(valueLabelRenderer);
             AxisChartDataSet axisChartDataSet =
                 new AxisChartDataSet(
-                        data, legendLabels, paints, ChartType.BAR, barChartProperties );
+                        _data, legendLabels, paints, ChartType.BAR, barChartProperties );
             dataSeries.addIAxisPlotDataSet( axisChartDataSet );
 
             ChartProperties chartProperties= new ChartProperties();
@@ -166,8 +169,7 @@
                 yaxis.setNumItems((int) (topValue / 500)+1);
                 yaxis.setShowGridLines(1);
             } catch (PropertyException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
+                log.warn("",e);
             }
             
             AxisProperties axisProperties= new AxisProperties(xaxis, yaxis);
@@ -175,7 +177,7 @@
             LegendProperties legendProperties= new LegendProperties();
             AxisChart axisChart = new AxisChart( 
                     dataSeries, chartProperties, axisProperties, 
-                    legendProperties, width, height );
+                    legendProperties, _width, _height );
             axisChart.setGraphics2D((Graphics2D) g);
             axisChart.render();
         } catch (Exception e) {

Modified: jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/LineGraph.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/LineGraph.java?rev=388650&r1=388649&r2=388650&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/LineGraph.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/components/org/apache/jmeter/visualizers/LineGraph.java Fri Mar 24 13:42:26 2006
@@ -1,4 +1,3 @@
-// $Header$
 /*
  * Copyright 2005 The Apache Software Foundation.
  * 
@@ -133,23 +132,23 @@
         }
     }
     
-    private void drawSample(String title, String[] xAxisLabels, String xAxisTitle,
-            String yAxisTitle, double[][] data, int width, int height, Graphics g) {
+    private void drawSample(String _title, String[] _xAxisLabels, String _xAxisTitle,
+            String _yAxisTitle, double[][] _data, int _width, int _height, Graphics g) {
         try {
-            if (width == 0) {
-                width = 450;
+            if (_width == 0) {
+                _width = 450;
             }
-            if (height == 0) {
-                height = 250;
+            if (_height == 0) {
+                _height = 250;
             }
-            this.setPreferredSize(new Dimension(width,height));
-            DataSeries dataSeries = new DataSeries( xAxisLabels, xAxisTitle, yAxisTitle, title );
+            this.setPreferredSize(new Dimension(_width,_height));
+            DataSeries dataSeries = new DataSeries( _xAxisLabels, _xAxisTitle, _yAxisTitle, _title );
             String[] legendLabels= yAxisLabel;
-            Paint[] paints = this.createPaint(data.length);
-            Shape[] shapes = createShapes(data.length);
-            Stroke[] lstrokes = createStrokes(data.length);
+            Paint[] paints = this.createPaint(_data.length);
+            Shape[] shapes = createShapes(_data.length);
+            Stroke[] lstrokes = createStrokes(_data.length);
             LineChartProperties lineChartProperties= new LineChartProperties(lstrokes,shapes);
-            AxisChartDataSet axisChartDataSet= new AxisChartDataSet( data, 
+            AxisChartDataSet axisChartDataSet= new AxisChartDataSet( _data, 
                     legendLabels, 
                     paints, 
                     ChartType.LINE, 
@@ -167,7 +166,7 @@
             LegendProperties legendProperties = new LegendProperties();
             AxisChart axisChart = new AxisChart( 
                     dataSeries, chartProperties, axisProperties, 
-                    legendProperties, width, height );
+                    legendProperties, _width, _height );
             axisChart.setGraphics2D((Graphics2D) g);
             axisChart.render();
         } catch (Exception e) {

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/FileListPanel.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/FileListPanel.java?rev=388650&r1=388649&r2=388650&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/FileListPanel.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/gui/util/FileListPanel.java Fri Mar 24 13:42:26 2006
@@ -1,4 +1,3 @@
-// $Header$
 /*
  * Copyright 2002-2004 The Apache Software Foundation.
  *
@@ -158,11 +157,11 @@
     }
     
     public String[] getFiles() {
-        String[] files = new String[tableModel.getRowCount()];
-        for (int idx=0; idx < files.length; idx++) {
-            files[idx] = (String)tableModel.getValueAt(idx,0);
+        String[] _files = new String[tableModel.getRowCount()];
+        for (int idx=0; idx < _files.length; idx++) {
+            _files[idx] = (String)tableModel.getValueAt(idx,0);
         }
-        return files;
+        return _files;
     }
     
     protected void deleteFile() {

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java?rev=388650&r1=388649&r2=388650&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java Fri Mar 24 13:42:26 2006
@@ -42,10 +42,10 @@
 	private static final String XML = "xml"; // $NON_NLS-1$
 
 	/** Indicates that the results file should be in CSV format. * */
-	private static final String CSV = "csv"; // $NON_NLS-1$
+	//NOTUSED private static final String CSV = "csv"; // $NON_NLS-1$
 
 	/** Indicates that the results should be stored in a database. * */
-	private static final String DATABASE = "db"; // $NON_NLS-1$
+	//NOTUSED private static final String DATABASE = "db"; // $NON_NLS-1$
 
 	/** A properties file indicator for true. * */
 	private static final String TRUE = "true"; // $NON_NLS-1$
@@ -163,37 +163,37 @@
 	// ---------------------------------------------------------------------
 
     //TODO - these do not appear to be used
-	public final static String PRESERVE = "preserve"; // $NON_NLS-1$
-
-	public final static String XML_SPACE = "xml:space"; // $NON_NLS-1$
-
-	public static final String ASSERTION_RESULT_TAG_NAME = "assertionResult"; // $NON_NLS-1$
-
-	public static final String BINARY = "binary"; // $NON_NLS-1$
-
-	public static final String DATA_TYPE = "dataType"; // $NON_NLS-1$
-
-	public static final String ERROR = "error"; // $NON_NLS-1$
-
-	public static final String FAILURE = "failure"; // $NON_NLS-1$
-
-	public static final String FAILURE_MESSAGE = "failureMessage"; // $NON_NLS-1$
-
-	public static final String LABEL = "label"; // $NON_NLS-1$
-
-	public static final String RESPONSE_CODE = "responseCode"; // $NON_NLS-1$
-
-	public static final String RESPONSE_MESSAGE = "responseMessage"; // $NON_NLS-1$
-
-	public static final String SAMPLE_RESULT_TAG_NAME = "sampleResult"; // $NON_NLS-1$
-
-	public static final String SUCCESSFUL = "success"; // $NON_NLS-1$
-
-	public static final String THREAD_NAME = "threadName"; // $NON_NLS-1$
-
-	public static final String TIME = "time"; // $NON_NLS-1$
-
-	public static final String TIME_STAMP = "timeStamp"; // $NON_NLS-1$
+//	public final static String PRESERVE = "preserve"; // $NON_NLS-1$
+//
+//	public final static String XML_SPACE = "xml:space"; // $NON_NLS-1$
+//
+//	public static final String ASSERTION_RESULT_TAG_NAME = "assertionResult"; // $NON_NLS-1$
+//
+//	public static final String BINARY = "binary"; // $NON_NLS-1$
+//
+//	public static final String DATA_TYPE = "dataType"; // $NON_NLS-1$
+//
+//	public static final String ERROR = "error"; // $NON_NLS-1$
+//
+//	public static final String FAILURE = "failure"; // $NON_NLS-1$
+//
+//	public static final String FAILURE_MESSAGE = "failureMessage"; // $NON_NLS-1$
+//
+//	public static final String LABEL = "label"; // $NON_NLS-1$
+//
+//	public static final String RESPONSE_CODE = "responseCode"; // $NON_NLS-1$
+//
+//	public static final String RESPONSE_MESSAGE = "responseMessage"; // $NON_NLS-1$
+//
+//	public static final String SAMPLE_RESULT_TAG_NAME = "sampleResult"; // $NON_NLS-1$
+//
+//	public static final String SUCCESSFUL = "success"; // $NON_NLS-1$
+//
+//	public static final String THREAD_NAME = "threadName"; // $NON_NLS-1$
+//
+//	public static final String TIME = "time"; // $NON_NLS-1$
+//
+//	public static final String TIME_STAMP = "timeStamp"; // $NON_NLS-1$
 
 	// Initialise values from properties
 	private boolean time = _time, latency = _latency, timestamp = _timestamp, success = _success, label = _label,

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java?rev=388650&r1=388649&r2=388650&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testbeans/gui/WrapperEditor.java Fri Mar 24 13:42:26 2006
@@ -105,40 +105,40 @@
 		initialize(typeEditor, guiEditor, acceptsNull, acceptsExpressions, acceptsOther, defaultValue);
 	}
 
-	private void initialize(PropertyEditor typeEditor, PropertyEditor guiEditor, boolean acceptsNull,
-			boolean acceptsExpressions, boolean acceptsOther, Object defaultValue) {
-		this.typeEditor = typeEditor;
-		this.guiEditor = guiEditor;
-		this.acceptsNull = acceptsNull;
-		this.acceptsExpressions = acceptsExpressions;
-		this.acceptsOther = acceptsOther;
+	private void initialize(PropertyEditor _typeEditor, PropertyEditor _guiEditor, boolean _acceptsNull,
+			boolean _acceptsExpressions, boolean _acceptsOther, Object defaultValue) {
+		this.typeEditor = _typeEditor;
+		this.guiEditor = _guiEditor;
+		this.acceptsNull = _acceptsNull;
+		this.acceptsExpressions = _acceptsExpressions;
+		this.acceptsOther = _acceptsOther;
 
 		setValue(defaultValue);
 		lastValidValue = getAsText();
 
-		if (guiEditor instanceof ComboStringEditor) {
-			String[] tags = ((ComboStringEditor) guiEditor).getTags();
+		if (_guiEditor instanceof ComboStringEditor) {
+			String[] tags = ((ComboStringEditor) _guiEditor).getTags();
 
 			// Provide an initial edit value if necessary -- this is an
 			// heuristic that tries to provide the most convenient
 			// initial edit value:
 
 			String v;
-			if (!acceptsOther)
+			if (!_acceptsOther)
 				v = "${}";
 			else if (isValidValue(""))
 				v = "";
-			else if (acceptsExpressions)
+			else if (_acceptsExpressions)
 				v = "${}";
 			else if (tags != null && tags.length > 0)
 				v = tags[0];
 			else
 				v = getAsText();
 
-			((ComboStringEditor) guiEditor).setInitialEditValue(v);
+			((ComboStringEditor) _guiEditor).setInitialEditValue(v);
 		}
 
-		guiEditor.addPropertyChangeListener(this);
+		_guiEditor.addPropertyChangeListener(this);
 	}
 
 	public boolean supportsCustomEditor() {

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/keystore/DefaultKeyStore.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/keystore/DefaultKeyStore.java?rev=388650&r1=388649&r2=388650&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/keystore/DefaultKeyStore.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/util/keystore/DefaultKeyStore.java Fri Mar 24 13:42:26 2006
@@ -1,4 +1,3 @@
-// $Header$
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
  *
@@ -46,34 +45,34 @@
 
 	public void load(InputStream is, String pword) throws Exception {
 		store.load(is, pword.toCharArray());
-		PrivateKey key = null;
-		X509Certificate[] certChain = null;
+		PrivateKey _key = null;
+		X509Certificate[] _certChain = null;
 
 		Enumeration aliases = store.aliases();
 		while (aliases.hasMoreElements()) {
 			this.alias = (String) aliases.nextElement();
 			if (store.isKeyEntry(alias)) {
-				key = (PrivateKey) store.getKey(alias, pword.toCharArray());
+				_key = (PrivateKey) store.getKey(alias, pword.toCharArray());
 				Certificate[] chain = store.getCertificateChain(alias);
-				certChain = new X509Certificate[chain.length];
+				_certChain = new X509Certificate[chain.length];
 
 				for (int i = 0; i < chain.length; i++) {
-					certChain[i] = (X509Certificate) chain[i];
+					_certChain[i] = (X509Certificate) chain[i];
 				}
 
 				break;
 			}
 		}
 
-		if (null == key) {
+		if (null == _key) {
 			throw new Exception("No key found");
 		}
-		if (null == certChain) {
+		if (null == _certChain) {
 			throw new Exception("No certificate chain found");
 		}
 
-		this.key = key;
-		this.certChain = certChain;
+		this.key = _key;
+		this.certChain = _certChain;
 	}
 
 	public final X509Certificate[] getCertificateChain() {

Modified: jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java?rev=388650&r1=388649&r2=388650&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java Fri Mar 24 13:42:26 2006
@@ -1,4 +1,3 @@
-// $Header$
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
  *
@@ -113,8 +112,8 @@
 	 * @param daemonPort
 	 *            the port to listen on
 	 */
-	public void configureProxy(int daemonPort) {
-		this.daemonPort = daemonPort;
+	public void configureProxy(int _daemonPort) {
+		this.daemonPort = _daemonPort;
 		log.info("Proxy: OK");
 	}
 

Modified: jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=388650&r1=388649&r2=388650&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Fri Mar 24 13:42:26 2006
@@ -1,4 +1,3 @@
-// $Header$
 /*
  * Copyright 2001-2004 The Apache Software Foundation.
  *
@@ -83,10 +82,10 @@
 	 * @param target
 	 *            the ProxyControl which will receive the generated sampler
 	 */
-	void configure(Socket clientSocket, ProxyControl target) {
-		this.target = target;
-		this.clientSocket = clientSocket;
-		this.captureHttpHeaders = target.getCaptureHttpHeaders();
+	void configure(Socket _clientSocket, ProxyControl _target) {
+		this.target = _target;
+		this.clientSocket = _clientSocket;
+		this.captureHttpHeaders = _target.getCaptureHttpHeaders();
 	}
 
 	/**

Modified: jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/LineChart.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/LineChart.java?rev=388650&r1=388649&r2=388650&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/LineChart.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/reports/org/apache/jmeter/testelement/LineChart.java Fri Mar 24 13:42:26 2006
@@ -1,4 +1,3 @@
-//$Header$
 /*
  * Copyright 2005 The Apache Software Foundation.
  *
@@ -100,13 +99,13 @@
         panel.setXAxisTitle(this.getFormattedXAxis());
         panel.setYAxisTitle(this.getYAxis());
         // we should make this configurable eventually
-        int width = getWidth();
-        int height = getHeight();
-        panel.setPreferredSize(new Dimension(width,height));
-        panel.setSize(new Dimension(width,height));
-        panel.setWidth(width);
-        panel.setHeight(width);
-        setBufferedImage(new BufferedImage(width,height,BufferedImage.TYPE_INT_RGB));
+        int _width = getWidth();
+        int _height = getHeight();
+        panel.setPreferredSize(new Dimension(_width,_height));
+        panel.setSize(new Dimension(_width,_height));
+        panel.setWidth(_width);
+        panel.setHeight(_width);
+        setBufferedImage(new BufferedImage(_width,_height,BufferedImage.TYPE_INT_RGB));
         panel.paintComponent(this.getBufferedImage().createGraphics());
         return panel;
     }



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