mstover1 2004/07/27 07:38:19
Modified: src/core/org/apache/jmeter/save/converters
BooleanPropertyConverter.java
IntegerPropertyConverter.java
LongPropertyConverter.java
MultiPropertyConverter.java
StringPropertyConverter.java
TestElementPropertyConverter.java
Added: src/core/org/apache/jmeter/save/converters
ConversionHelp.java
Log:
url encoding strings saved in .jmx file
Revision Changes Path
1.4 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
Index: BooleanPropertyConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BooleanPropertyConverter.java 21 Jun 2004 23:37:40 -0000 1.3
+++ BooleanPropertyConverter.java 27 Jul 2004 14:38:18 -0000 1.4
@@ -52,7 +52,7 @@
MarshallingContext arg2)
{
BooleanProperty prop = (BooleanProperty)obj;
- writer.addAttribute("name",prop.getName());
+ writer.addAttribute("name",ConversionHelp.encode(prop.getName()));
writer.setValue(prop.getStringValue());
}
@@ -63,7 +63,7 @@
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext arg1)
{
- BooleanProperty prop = new
BooleanProperty(reader.getAttribute("name"),Boolean.valueOf(reader.getValue()).booleanValue());
+ BooleanProperty prop = new
BooleanProperty(ConversionHelp.decode(reader.getAttribute("name")),Boolean.valueOf(reader.getValue()).booleanValue());
return prop;
}
}
1.3 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
Index: IntegerPropertyConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IntegerPropertyConverter.java 21 Jun 2004 23:37:40 -0000 1.2
+++ IntegerPropertyConverter.java 27 Jul 2004 14:38:18 -0000 1.3
@@ -51,7 +51,7 @@
MarshallingContext arg2)
{
IntegerProperty prop = (IntegerProperty)obj;
- writer.addAttribute("name",prop.getName());
+ writer.addAttribute("name",ConversionHelp.encode(prop.getName()));
writer.setValue(prop.getStringValue());
}
@@ -61,7 +61,7 @@
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext arg1)
{
- IntegerProperty prop = new
IntegerProperty(reader.getAttribute("name"),Integer.parseInt(reader.getValue()));
+ IntegerProperty prop = new
IntegerProperty(ConversionHelp.decode(reader.getAttribute("name")),Integer.parseInt(reader.getValue()));
return prop;
}
}
1.3 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
Index: LongPropertyConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LongPropertyConverter.java 21 Jun 2004 23:37:40 -0000 1.2
+++ LongPropertyConverter.java 27 Jul 2004 14:38:18 -0000 1.3
@@ -52,7 +52,7 @@
MarshallingContext arg2)
{
LongProperty prop = (LongProperty)obj;
- writer.addAttribute("name",prop.getName());
+ writer.addAttribute("name",ConversionHelp.encode(prop.getName()));
writer.setValue(prop.getStringValue());
}
@@ -62,7 +62,7 @@
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext arg1)
{
- LongProperty prop = new
LongProperty(reader.getAttribute("name"),Long.parseLong(reader.getValue()));
+ LongProperty prop = new
LongProperty(ConversionHelp.decode(reader.getAttribute("name")),Long.parseLong(reader.getValue()));
return prop;
}
}
1.3 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
Index: MultiPropertyConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultiPropertyConverter.java 21 Jun 2004 23:37:40 -0000 1.2
+++ MultiPropertyConverter.java 27 Jul 2004 14:38:18 -0000 1.3
@@ -57,7 +57,7 @@
MarshallingContext context)
{
MultiProperty prop = (MultiProperty)arg0;
- writer.addAttribute("name",prop.getName());
+ writer.addAttribute("name",ConversionHelp.encode(prop.getName()));
PropertyIterator iter = prop.iterator();
while(iter.hasNext())
{
@@ -73,7 +73,7 @@
UnmarshallingContext context)
{
MultiProperty prop =
(MultiProperty)createCollection(context.getRequiredType());
- prop.setName(reader.getAttribute("name"));
+ prop.setName(ConversionHelp.decode(reader.getAttribute("name")));
while (reader.hasMoreChildren()) {
reader.moveDown();
JMeterProperty subProp = (JMeterProperty)readItem(reader, context, prop);
1.5 +36 -34
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java
Index: StringPropertyConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringPropertyConverter.java 27 Jul 2004 14:19:40 -0000 1.4
+++ StringPropertyConverter.java 27 Jul 2004 14:38:18 -0000 1.5
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
-*/
+ */
package org.apache.jmeter.save.converters;
@@ -33,58 +33,60 @@
/**
* @author mstover
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
+ *
+ * To change the template for this generated type comment go to Window -
+ * Preferences - Java - Code Generation - Code and Comments
*/
public class StringPropertyConverter implements Converter
{
- transient private static final Logger log = LoggingManager.getLoggerForClass();
+ transient private static final Logger log = LoggingManager
+ .getLoggerForClass();
- /** Returns the converter version; used to check for possible incompatibilities
*/
- public static String getVersion(){ return "$Revision$";}
+ /**
+ * Returns the converter version; used to check for possible
+ * incompatibilities
+ */
+ public static String getVersion()
+ {
+ return "$Revision$";
+ }
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
*/
public boolean canConvert(Class arg0)
{
- return StringProperty.class.equals(arg0);
+ return StringProperty.class.equals(arg0);
}
- /* (non-Javadoc)
- * @see com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
com.thoughtworks.xstream.io.HierarchicalStreamWriter,
com.thoughtworks.xstream.converters.MarshallingContext)
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
+ * com.thoughtworks.xstream.io.HierarchicalStreamWriter,
+ * com.thoughtworks.xstream.converters.MarshallingContext)
*/
public void marshal(Object obj, HierarchicalStreamWriter writer,
MarshallingContext arg2)
{
- StringProperty prop = (StringProperty)obj;
- try
- {
- writer.addAttribute("name",URLEncoder.encode(prop.getName(),"UTF-8"));
- }
- catch (UnsupportedEncodingException e)
- {
- log.warn("System doesn't support utf-8",e);
- }
- writer.setValue(prop.getStringValue());
+ StringProperty prop = (StringProperty) obj;
+ writer.addAttribute("name", ConversionHelp.encode(prop.getName()));
+ writer.setValue(ConversionHelp.encode(prop.getStringValue()));
}
- /* (non-Javadoc)
- * @see
com.thoughtworks.xstream.converters.Converter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
com.thoughtworks.xstream.converters.UnmarshallingContext)
+ /*
+ * (non-Javadoc)
+ *
+ * @see
com.thoughtworks.xstream.converters.Converter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
+ * com.thoughtworks.xstream.converters.UnmarshallingContext)
*/
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext arg1)
{
- try
- {
- StringProperty prop = new
StringProperty(URLDecoder.decode(reader.getAttribute("name"),"UTF-8"),reader.getValue());
- return prop;
- }
- catch (UnsupportedEncodingException e)
- {
- log.warn("System doesn't support utf-8",e);
- return null;
- }
+ StringProperty prop = new StringProperty(ConversionHelp.decode(reader
+ .getAttribute("name")), ConversionHelp.decode(reader.getValue()));
+ return prop;
}
-}
+}
\ No newline at end of file
1.3 +2 -2
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
Index: TestElementPropertyConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestElementPropertyConverter.java 21 Jun 2004 23:37:40 -0000 1.2
+++ TestElementPropertyConverter.java 27 Jul 2004 14:38:18 -0000 1.3
@@ -66,7 +66,7 @@
MarshallingContext context)
{
TestElementProperty prop = (TestElementProperty) arg0;
- writer.addAttribute("name", prop.getName());
+ writer.addAttribute("name", ConversionHelp.encode(prop.getName()));
writer.addAttribute("elementType", prop.getObjectValue().getClass()
.getName());
PropertyIterator iter = prop.iterator();
@@ -89,7 +89,7 @@
{
TestElementProperty prop = (TestElementProperty) createCollection(context
.getRequiredType());
- prop.setName(reader.getAttribute("name"));
+ prop.setName(ConversionHelp.decode(reader.getAttribute("name")));
prop.setObjectValue((TestElement) Class.forName(
reader.getAttribute("elementType")).newInstance());
while (reader.hasMoreChildren())
1.1
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
Index: ConversionHelp.java
===================================================================
/*
* Created on Jul 27, 2004
*
* To change the template for this generated file go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
package org.apache.jmeter.save.converters;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
/**
* @author mstover
*
* To change the template for this generated type comment go to
* Window - Preferences - Java - Code Generation - Code and Comments
*/
public class ConversionHelp
{
private static final String CHAR_SET = "UTF-8";
transient private static final Logger log = LoggingManager.getLoggerForClass();
public static String encode(String p)
{
try
{
String p1 = URLEncoder.encode(p,CHAR_SET);
return p1;
}
catch (Exception e)
{
log.warn("System doesn't support utf-8",e);
return p;
}
}
public static String decode(String p)
{
try
{
return URLDecoder.decode(p,CHAR_SET);
}
catch (Exception e)
{
log.warn("System doesn't support utf-8",e);
return p;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
