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/04/05 22:22:10 UTC
svn commit: r391780 - in
/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property:
BooleanProperty.java CollectionProperty.java MapProperty.java
StringProperty.java TestElementProperty.java
Author: sebb
Date: Wed Apr 5 13:22:08 2006
New Revision: 391780
URL: http://svn.apache.org/viewcvs?rev=391780&view=rev
Log:
Tidy up
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/MapProperty.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/StringProperty.java
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java?rev=391780&r1=391779&r2=391780&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java Wed Apr 5 13:22:08 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
@@ -25,9 +24,9 @@
* @version $Revision$
*/
public class BooleanProperty extends AbstractProperty {
- boolean value; // TODO: should these be private?
+ private boolean value;
- transient boolean savedValue;
+ private transient boolean savedValue;
public BooleanProperty(String name, boolean v) {
super(name);
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java?rev=391780&r1=391779&r2=391780&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java Wed Apr 5 13:22:08 2006
@@ -27,7 +27,7 @@
* @version $Revision$
*/
public class CollectionProperty extends MultiProperty {
- protected Collection value;
+ private Collection value;
transient private Collection savedValue;
@@ -78,9 +78,8 @@
public JMeterProperty get(int row) {
if (value instanceof List) {
return (JMeterProperty) ((List) value).get(row);
- } else {
- return null;
}
+ return null;
}
public void remove(int index) {
@@ -177,9 +176,8 @@
protected Class getPropertyType() {
if (value.size() > 0) {
return value.iterator().next().getClass();
- } else {
- return NullProperty.class;
}
+ return NullProperty.class;
}
/*
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/MapProperty.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/MapProperty.java?rev=391780&r1=391779&r2=391780&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/MapProperty.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/MapProperty.java Wed Apr 5 13:22:08 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
@@ -26,9 +25,9 @@
* @version $Revision$
*/
public class MapProperty extends MultiProperty {
- Map value;
+ private Map value;
- transient Map savedValue = null;
+ private transient Map savedValue = null;
public MapProperty(String name, Map value) {
super(name);
@@ -73,9 +72,8 @@
protected Class getPropertyType() {
if (value.size() > 0) {
return valueIterator().next().getClass();
- } else {
- return NullProperty.class;
}
+ return NullProperty.class;
}
/**
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/StringProperty.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/StringProperty.java?rev=391780&r1=391779&r2=391780&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/StringProperty.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/StringProperty.java Wed Apr 5 13:22:08 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2003-2004 The Apache Software Foundation.
*
@@ -24,9 +23,9 @@
* @version $Revision$
*/
public class StringProperty extends AbstractProperty {
- String value;
+ private String value;
- transient String savedValue;
+ private transient String savedValue;
public StringProperty(String name, String value) {
super(name);
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java?rev=391780&r1=391779&r2=391780&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java Wed Apr 5 13:22:08 2006
@@ -1,4 +1,3 @@
-// $Header$
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
@@ -24,9 +23,9 @@
* @version $Revision$
*/
public class TestElementProperty extends MultiProperty {
- TestElement value;
+ private TestElement value;
- transient TestElement savedValue = null;
+ private transient TestElement savedValue = null;
public TestElementProperty(String name, TestElement value) {
super(name);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org