You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2012/01/17 10:57:43 UTC
svn commit: r1232374 - in
/jmeter/trunk/src/core/org/apache/jmeter/save/converters:
BooleanPropertyConverter.java IntegerPropertyConverter.java
LongPropertyConverter.java MultiPropertyConverter.java
StringPropertyConverter.java
Author: sebb
Date: Tue Jan 17 09:57:43 2012
New Revision: 1232374
URL: http://svn.apache.org/viewvc?rev=1232374&view=rev
Log:
Use standard constant for name attribute
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java?rev=1232374&r1=1232373&r2=1232374&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java Tue Jan 17 09:57:43 2012
@@ -28,8 +28,6 @@ import com.thoughtworks.xstream.io.Hiera
public class BooleanPropertyConverter implements Converter {
- private static final String ATT_NAME = "name"; // $NON-NLS-1$
-
/**
* Returns the converter version; used to check for possible
* incompatibilities
@@ -46,14 +44,14 @@ public class BooleanPropertyConverter im
/** {@inheritDoc} */
public void marshal(Object obj, HierarchicalStreamWriter writer, MarshallingContext arg2) {
BooleanProperty prop = (BooleanProperty) obj;
- writer.addAttribute(ATT_NAME, ConversionHelp.encode(prop.getName()));
+ writer.addAttribute(ConversionHelp.ATT_NAME, ConversionHelp.encode(prop.getName()));
writer.setValue(prop.getStringValue());
}
/** {@inheritDoc} */
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext arg1) {
- BooleanProperty prop = new BooleanProperty(ConversionHelp.decode(reader.getAttribute(ATT_NAME)), Boolean.valueOf(
+ BooleanProperty prop = new BooleanProperty(ConversionHelp.decode(reader.getAttribute(ConversionHelp.ATT_NAME)), Boolean.valueOf(
reader.getValue()).booleanValue());
return prop;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java?rev=1232374&r1=1232373&r2=1232374&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java Tue Jan 17 09:57:43 2012
@@ -28,8 +28,6 @@ import com.thoughtworks.xstream.io.Hiera
public class IntegerPropertyConverter implements Converter {
- private static final String ATT_NAME = "name"; // $NON-NLS-1$
-
/**
* Returns the converter version; used to check for possible
* incompatibilities
@@ -46,13 +44,13 @@ public class IntegerPropertyConverter im
/** {@inheritDoc} */
public void marshal(Object obj, HierarchicalStreamWriter writer, MarshallingContext arg2) {
IntegerProperty prop = (IntegerProperty) obj;
- writer.addAttribute(ATT_NAME, ConversionHelp.encode(prop.getName()));
+ writer.addAttribute(ConversionHelp.ATT_NAME, ConversionHelp.encode(prop.getName()));
writer.setValue(prop.getStringValue());
}
/** {@inheritDoc} */
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext arg1) {
- IntegerProperty prop = new IntegerProperty(ConversionHelp.decode(reader.getAttribute(ATT_NAME)), Integer
+ IntegerProperty prop = new IntegerProperty(ConversionHelp.decode(reader.getAttribute(ConversionHelp.ATT_NAME)), Integer
.parseInt(reader.getValue()));
return prop;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java?rev=1232374&r1=1232373&r2=1232374&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java Tue Jan 17 09:57:43 2012
@@ -28,8 +28,6 @@ import com.thoughtworks.xstream.io.Hiera
public class LongPropertyConverter implements Converter {
- private static final String ATT_NAME = "name"; // $NON-NLS-1$
-
/**
* Returns the converter version; used to check for possible
* incompatibilities
@@ -46,13 +44,13 @@ public class LongPropertyConverter imple
/** {@inheritDoc} */
public void marshal(Object obj, HierarchicalStreamWriter writer, MarshallingContext arg2) {
LongProperty prop = (LongProperty) obj;
- writer.addAttribute(ATT_NAME, ConversionHelp.encode(prop.getName()));
+ writer.addAttribute(ConversionHelp.ATT_NAME, ConversionHelp.encode(prop.getName()));
writer.setValue(prop.getStringValue());
}
/** {@inheritDoc} */
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext arg1) {
- LongProperty prop = new LongProperty(ConversionHelp.decode(reader.getAttribute(ATT_NAME)), Long.parseLong(reader
+ LongProperty prop = new LongProperty(ConversionHelp.decode(reader.getAttribute(ConversionHelp.ATT_NAME)), Long.parseLong(reader
.getValue()));
return prop;
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java?rev=1232374&r1=1232373&r2=1232374&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java Tue Jan 17 09:57:43 2012
@@ -33,8 +33,6 @@ import com.thoughtworks.xstream.io.Hiera
public class MultiPropertyConverter extends AbstractCollectionConverter {
- private static final String ATT_NAME = "name"; //$NON-NLS-1$
-
/**
* Returns the converter version; used to check for possible
* incompatibilities
@@ -53,7 +51,7 @@ public class MultiPropertyConverter exte
@Override
public void marshal(Object arg0, HierarchicalStreamWriter writer, MarshallingContext context) {
MultiProperty prop = (MultiProperty) arg0;
- writer.addAttribute(ATT_NAME, ConversionHelp.encode(prop.getName()));
+ writer.addAttribute(ConversionHelp.ATT_NAME, ConversionHelp.encode(prop.getName()));
PropertyIterator iter = prop.iterator();
while (iter.hasNext()) {
writeItem(iter.next(), context, writer);
@@ -65,7 +63,7 @@ public class MultiPropertyConverter exte
@Override
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
MultiProperty prop = (MultiProperty) createCollection(context.getRequiredType());
- prop.setName(ConversionHelp.decode(reader.getAttribute(ATT_NAME)));
+ prop.setName(ConversionHelp.decode(reader.getAttribute(ConversionHelp.ATT_NAME)));
while (reader.hasMoreChildren()) {
reader.moveDown();
JMeterProperty subProp = (JMeterProperty) readItem(reader, context, prop);
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java?rev=1232374&r1=1232373&r2=1232374&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java Tue Jan 17 09:57:43 2012
@@ -28,8 +28,6 @@ import com.thoughtworks.xstream.io.Hiera
public class StringPropertyConverter implements Converter {
- private static final String ATT_NAME = "name"; // $NON-NLS-1$
-
/**
* Returns the converter version; used to check for possible
* incompatibilities
@@ -46,13 +44,13 @@ public class StringPropertyConverter imp
/** {@inheritDoc} */
public void marshal(Object obj, HierarchicalStreamWriter writer, MarshallingContext arg2) {
StringProperty prop = (StringProperty) obj;
- writer.addAttribute(ATT_NAME, ConversionHelp.encode(prop.getName()));
+ writer.addAttribute(ConversionHelp.ATT_NAME, ConversionHelp.encode(prop.getName()));
writer.setValue(ConversionHelp.encode(prop.getStringValue()));
}
/** {@inheritDoc} */
public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext arg1) {
- StringProperty prop = new StringProperty(ConversionHelp.decode(reader.getAttribute(ATT_NAME)), ConversionHelp
+ StringProperty prop = new StringProperty(ConversionHelp.decode(reader.getAttribute(ConversionHelp.ATT_NAME)), ConversionHelp
.decode(reader.getValue()));
return prop;
}