sebb 2005/07/07 17:15:01
Modified: src/core/org/apache/jmeter/save/converters
TestElementConverter.java
src/core/org/apache/jmeter/save ScriptWrapperConverter.java
Log:
Fix some deprecations introduced in xstream 1.1.1
Revision Changes Path
1.3 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
Index: TestElementConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestElementConverter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestElementConverter.java 21 Jun 2004 23:37:40 -0000 1.2
+++ TestElementConverter.java 8 Jul 2005 00:15:01 -0000 1.3
@@ -71,12 +71,12 @@
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context)
{
- String classAttribute = reader.getAttribute(classAttributeIdentifier);
+ String classAttribute = reader.getAttribute("class");
Class type;
if (classAttribute == null) {
- type = classMapper.lookupType(reader.getNodeName());
+ type = mapper().realClass(reader.getNodeName());
} else {
- type = classMapper.lookupType(classAttribute);
+ type = mapper().realClass(classAttribute);
}
try
{
1.4 +4 -4
jakarta-jmeter/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
Index: ScriptWrapperConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ScriptWrapperConverter.java 20 Sep 2004 23:08:40 -0000 1.3
+++ ScriptWrapperConverter.java 8 Jul 2005 00:15:01 -0000 1.4
@@ -61,7 +61,7 @@
ScriptWrapper wrap = (ScriptWrapper)arg0;
writer.addAttribute("version",SaveService.version);
writer.addAttribute("properties",SaveService.propertiesVersion);
- writer.startNode(classMapper.lookupName(wrap.testPlan.getClass()));
+
writer.startNode(classMapper.serializedClass(wrap.testPlan.getClass()));
context.convertAnother(wrap.testPlan);
writer.endNode();
}
@@ -84,9 +84,9 @@
String classAttribute = reader.getAttribute("class");
Class type;
if (classAttribute == null) {
- type = classMapper.lookupType(reader.getNodeName());
+ type = classMapper.realClass(reader.getNodeName());
} else {
- type = classMapper.lookupType(classAttribute);
+ type = classMapper.realClass(classAttribute);
}
return type;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
