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/05/18 00:58:38 UTC
cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui ProxyControlGui.java
sebb 2005/05/17 15:58:38
Modified: src/protocol/java/org/apache/jmeter/protocol/java/sampler
JavaSampler.java
src/jorphan/org/apache/jorphan/reflect Functor.java
src/core/org/apache/jmeter/gui/tree JMeterCellRenderer.java
src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui
ProxyControlGui.java
Log:
Rename parameters to avoid hiding class fields
Revision Changes Path
1.21 +3 -3 jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java
Index: JavaSampler.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSampler.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JavaSampler.java 10 Feb 2004 00:46:44 -0000 1.20
+++ JavaSampler.java 17 May 2005 22:58:38 -0000 1.21
@@ -299,7 +299,7 @@
* Return SampleResult with data on error.
* @see JavaSamplerClient#runTest()
*/
- public SampleResult runTest(JavaSamplerContext context)
+ public SampleResult runTest(JavaSamplerContext p_context)
{
log.debug(whoAmI() + "\trunTest");
Thread.yield();
1.4 +17 -17 jakarta-jmeter/src/jorphan/org/apache/jorphan/reflect/Functor.java
Index: Functor.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/reflect/Functor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Functor.java 28 May 2004 21:09:13 -0000 1.3
+++ Functor.java 17 May 2005 22:58:38 -0000 1.4
@@ -107,52 +107,52 @@
}
}
- public Object invoke(Object invokee)
+ public Object invoke(Object p_invokee)
{
- this.invokee = invokee;
+ this.invokee = p_invokee;
return invoke();
}
- public Object invoke(Object[] args)
+ public Object invoke(Object[] p_args)
{
- this.args = args;
+ this.args = p_args;
return invoke();
}
- public Object invoke(Object invokee, Object[] args)
+ public Object invoke(Object p_invokee, Object[] p_args)
{
- this.args = args;
- this.invokee = invokee;
+ this.args = p_args;
+ this.invokee = p_invokee;
return invoke();
}
- private Method createMethod(Class[] types)
+ private Method createMethod(Class[] p_types)
{
- log.debug("Trying to functorize invokee: " + invokee.getClass().getName() + " method: " + methodName + " types: " + Arrays.asList(types));
+ log.debug("Trying to functorize invokee: " + invokee.getClass().getName() + " method: " + methodName + " types: " + Arrays.asList(p_types));
if (methodToInvoke == null)
{
try
{
- methodToInvoke = invokee.getClass().getMethod(methodName, types);
+ methodToInvoke = invokee.getClass().getMethod(methodName, p_types);
}
catch (Exception e)
{
- for (int i = 0; i < types.length; i++)
+ for (int i = 0; i < p_types.length; i++)
{
- Class primitive = getPrimitive(types[i]);
+ Class primitive = getPrimitive(p_types[i]);
if(primitive != null)
{
- methodToInvoke = createMethod(getNewArray(i,primitive,types));
+ methodToInvoke = createMethod(getNewArray(i,primitive,p_types));
if(methodToInvoke != null) return methodToInvoke;
}
- Class[] interfaces = types[i].getInterfaces();
+ Class[] interfaces = p_types[i].getInterfaces();
for (int j = 0; j < interfaces.length; j++)
{
- methodToInvoke = createMethod(getNewArray(i, interfaces[j], types));
+ methodToInvoke = createMethod(getNewArray(i, interfaces[j], p_types));
if (methodToInvoke != null) { return methodToInvoke; }
}
- Class parent = types[i].getSuperclass();
- methodToInvoke = createMethod(getNewArray(i, parent, types));
+ Class parent = p_types[i].getSuperclass();
+ methodToInvoke = createMethod(getNewArray(i, parent, p_types));
if (methodToInvoke != null) { return methodToInvoke; }
}
}
1.7 +4 -4 jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
Index: JMeterCellRenderer.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/tree/JMeterCellRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JMeterCellRenderer.java 13 Feb 2004 02:21:36 -0000 1.6
+++ JMeterCellRenderer.java 17 May 2005 22:58:38 -0000 1.7
@@ -40,7 +40,7 @@
boolean expanded,
boolean leaf,
int row,
- boolean hasFocus)
+ boolean p_hasFocus)
{
super.getTreeCellRendererComponent(
tree,
@@ -49,7 +49,7 @@
expanded,
leaf,
row,
- hasFocus);
+ p_hasFocus);
this.setEnabled(((JMeterTreeNode)value).isEnabled());
ImageIcon ic = ((JMeterTreeNode)value).getIcon();
if (ic != null)
1.43 +8 -8 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
Index: ProxyControlGui.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ProxyControlGui.java 10 Dec 2004 21:32:52 -0000 1.42
+++ ProxyControlGui.java 17 May 2005 22:58:38 -0000 1.43
@@ -193,9 +193,9 @@
element.setExcludeList(excludeList);
}
- private List getDataList(PowerTableModel model, String colName)
+ private List getDataList(PowerTableModel p_model, String colName)
{
- String[] dataArray = model.getData().getColumn(colName);
+ String[] dataArray = p_model.getData().getColumn(colName);
List list = new LinkedList();
for (int i = 0; i < dataArray.length; i++)
{
@@ -232,14 +232,14 @@
repaint();
}
- private void populateTable(PowerTableModel model, PropertyIterator iter)
+ private void populateTable(PowerTableModel p_model, PropertyIterator iter)
{
- model.clearData();
+ p_model.clearData();
while (iter.hasNext())
{
- model.addRow(new Object[] { iter.next().getStringValue()});
+ p_model.addRow(new Object[] { iter.next().getStringValue()});
}
- model.fireTableDataChanged();
+ p_model.fireTableDataChanged();
}
public void focusLost(FocusEvent e)
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org