Author: sebb
Date: Thu Dec 10 00:08:07 2009
New Revision: 889028
URL: http://svn.apache.org/viewvc?rev=889028&view=rev
Log:
Javadoc fixes
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java?rev=889028&r1=889027&r2=889028&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
Thu Dec 10 00:08:07 2009
@@ -38,23 +38,13 @@
return "$Revision$"; // $NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
- */
+ /** {...@inheritdoc} */
@SuppressWarnings("unchecked") // superclass does not use types
public boolean canConvert(Class arg0) {
return arg0.equals(BooleanProperty.class);
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
- * com.thoughtworks.xstream.io.HierarchicalStreamWriter,
- * com.thoughtworks.xstream.converters.MarshallingContext)
- */
+ /** {...@inheritdoc} */
public void marshal(Object obj, HierarchicalStreamWriter writer,
MarshallingContext arg2) {
BooleanProperty prop = (BooleanProperty) obj;
writer.addAttribute(ATT_NAME, ConversionHelp.encode(prop.getName()));
@@ -62,12 +52,7 @@
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
- * com.thoughtworks.xstream.converters.UnmarshallingContext)
- */
+ /** {...@inheritdoc} */
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext arg1) {
BooleanProperty prop = new
BooleanProperty(ConversionHelp.decode(reader.getAttribute(ATT_NAME)),
Boolean.valueOf(
reader.getValue()).booleanValue());
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java?rev=889028&r1=889027&r2=889028&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
Thu Dec 10 00:08:07 2009
@@ -178,16 +178,39 @@
return propertyToAttribute.containsKey(name);
}
- public static void saveSpecialProperties(TestElement el,
HierarchicalStreamWriter writer) {
- saveClass(el,writer,TestElement.GUI_CLASS);
- saveClass(el,writer,TestElement.TEST_CLASS);
- saveItem(el,writer,TestElement.NAME,true);
- saveItem(el,writer,TestElement.ENABLED,false);
+ /**
+ * Save the special properties:
+ * <ul>
+ * <li>TestElement.GUI_CLASS</li>
+ * <li>TestElement.TEST_CLASS</li>
+ * <li>TestElement.NAME</li>
+ * <li>TestElement.ENABLED</li>
+ * </ul>
+ * @param testElement
+ * @param writer
+ */
+ public static void saveSpecialProperties(TestElement testElement,
HierarchicalStreamWriter writer) {
+ saveClass(testElement,writer,TestElement.GUI_CLASS);
+ saveClass(testElement,writer,TestElement.TEST_CLASS);
+ saveItem(testElement,writer,TestElement.NAME,true);
+ saveItem(testElement,writer,TestElement.ENABLED,false);
}
- public static void restoreSpecialProperties(TestElement el,
HierarchicalStreamReader reader) {
- restoreClass(el,reader,TestElement.GUI_CLASS);
- restoreClass(el,reader,TestElement.TEST_CLASS);
- restoreItem(el,reader,TestElement.NAME,true);
- restoreItem(el,reader,TestElement.ENABLED,false);
+
+ /**
+ * Restore the special properties:
+ * <ul>
+ * <li>TestElement.GUI_CLASS</li>
+ * <li>TestElement.TEST_CLASS</li>
+ * <li>TestElement.NAME</li>
+ * <li>TestElement.ENABLED</li>
+ * </ul>
+ * @param testElement
+ * @param reader
+ */
+ public static void restoreSpecialProperties(TestElement testElement,
HierarchicalStreamReader reader) {
+ restoreClass(testElement,reader,TestElement.GUI_CLASS);
+ restoreClass(testElement,reader,TestElement.TEST_CLASS);
+ restoreItem(testElement,reader,TestElement.NAME,true);
+ restoreItem(testElement,reader,TestElement.ENABLED,false);
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java?rev=889028&r1=889027&r2=889028&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
Thu Dec 10 00:08:07 2009
@@ -39,24 +39,14 @@
return "$Revision$"; //$NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
- */
+ /** {...@inheritdoc} */
@SuppressWarnings("unchecked") // superclass does not use types
@Override
public boolean canConvert(Class arg0) {
return HashTree.class.isAssignableFrom(arg0);
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
- * com.thoughtworks.xstream.io.HierarchicalStreamWriter,
- * com.thoughtworks.xstream.converters.MarshallingContext)
- */
+ /** {...@inheritdoc} */
@Override
public void marshal(Object arg0, HierarchicalStreamWriter writer,
MarshallingContext context) {
HashTree tree = (HashTree) arg0;
@@ -69,12 +59,7 @@
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
- * com.thoughtworks.xstream.converters.UnmarshallingContext)
- */
+ /** {...@inheritdoc} */
@Override
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
boolean isKey = true;
@@ -96,9 +81,6 @@
return tree;
}
- /**
- * @param arg0
- */
public HashTreeConverter(Mapper arg0) {
super(arg0);
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java?rev=889028&r1=889027&r2=889028&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
Thu Dec 10 00:08:07 2009
@@ -38,35 +38,20 @@
return "$Revision$"; // $NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
- */
+ /** {...@inheritdoc} */
@SuppressWarnings("unchecked") // superclass does not use types
public boolean canConvert(Class arg0) {
return arg0.equals(IntegerProperty.class);
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
- * com.thoughtworks.xstream.io.HierarchicalStreamWriter,
- * com.thoughtworks.xstream.converters.MarshallingContext)
- */
+ /** {...@inheritdoc} */
public void marshal(Object obj, HierarchicalStreamWriter writer,
MarshallingContext arg2) {
IntegerProperty prop = (IntegerProperty) obj;
writer.addAttribute(ATT_NAME, ConversionHelp.encode(prop.getName()));
writer.setValue(prop.getStringValue());
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
- * com.thoughtworks.xstream.converters.UnmarshallingContext)
- */
+ /** {...@inheritdoc} */
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext arg1) {
IntegerProperty prop = new
IntegerProperty(ConversionHelp.decode(reader.getAttribute(ATT_NAME)), Integer
.parseInt(reader.getValue()));
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java?rev=889028&r1=889027&r2=889028&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
Thu Dec 10 00:08:07 2009
@@ -38,35 +38,20 @@
return "$Revision$"; // $NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
- */
+ /** {...@inheritdoc} */
@SuppressWarnings("unchecked") // superclass does not use types
public boolean canConvert(Class arg0) {
return arg0.equals(LongProperty.class);
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
- * com.thoughtworks.xstream.io.HierarchicalStreamWriter,
- * com.thoughtworks.xstream.converters.MarshallingContext)
- */
+ /** {...@inheritdoc} */
public void marshal(Object obj, HierarchicalStreamWriter writer,
MarshallingContext arg2) {
LongProperty prop = (LongProperty) obj;
writer.addAttribute(ATT_NAME, ConversionHelp.encode(prop.getName()));
writer.setValue(prop.getStringValue());
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
- * com.thoughtworks.xstream.converters.UnmarshallingContext)
- */
+ /** {...@inheritdoc} */
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext arg1) {
LongProperty prop = new
LongProperty(ConversionHelp.decode(reader.getAttribute(ATT_NAME)),
Long.parseLong(reader
.getValue()));
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java?rev=889028&r1=889027&r2=889028&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
Thu Dec 10 00:08:07 2009
@@ -43,24 +43,14 @@
return "$Revision$"; //$NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
- */
+ /** {...@inheritdoc} */
@Override
@SuppressWarnings("unchecked") // superclass does not use types
public boolean canConvert(Class arg0) {
return arg0.equals(CollectionProperty.class) ||
arg0.equals(MapProperty.class);
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
- * com.thoughtworks.xstream.io.HierarchicalStreamWriter,
- * com.thoughtworks.xstream.converters.MarshallingContext)
- */
+ /** {...@inheritdoc} */
@Override
public void marshal(Object arg0, HierarchicalStreamWriter writer,
MarshallingContext context) {
MultiProperty prop = (MultiProperty) arg0;
@@ -72,12 +62,7 @@
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
- * com.thoughtworks.xstream.converters.UnmarshallingContext)
- */
+ /** {...@inheritdoc} */
@Override
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
MultiProperty prop = (MultiProperty)
createCollection(context.getRequiredType());
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java?rev=889028&r1=889027&r2=889028&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
Thu Dec 10 00:08:07 2009
@@ -72,6 +72,7 @@
super(wrapped);
}
+ /** {...@inheritdoc} */
@Override
public boolean shouldSerializeMember(
@SuppressWarnings("unchecked") // superclass does not use types
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java?rev=889028&r1=889027&r2=889028&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java
Thu Dec 10 00:08:07 2009
@@ -38,35 +38,20 @@
return "$Revision$"; // $NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
- */
+ /** {...@inheritdoc} */
@SuppressWarnings("unchecked") // superclass does not use types
public boolean canConvert(Class 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)
- */
+ /** {...@inheritdoc} */
public void marshal(Object obj, HierarchicalStreamWriter writer,
MarshallingContext arg2) {
StringProperty prop = (StringProperty) obj;
writer.addAttribute(ATT_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)
- */
+ /** {...@inheritdoc} */
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext arg1) {
StringProperty prop = new
StringProperty(ConversionHelp.decode(reader.getAttribute(ATT_NAME)),
ConversionHelp
.decode(reader.getValue()));
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java?rev=889028&r1=889027&r2=889028&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
Thu Dec 10 00:08:07 2009
@@ -47,24 +47,14 @@
return "$Revision$"; //$NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
- */
+ /** {...@inheritdoc} */
@Override
@SuppressWarnings("unchecked") // superclass does not use types
public boolean canConvert(Class arg0) {
return TestElement.class.isAssignableFrom(arg0);
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
- * com.thoughtworks.xstream.io.HierarchicalStreamWriter,
- * com.thoughtworks.xstream.converters.MarshallingContext)
- */
+ /** {...@inheritdoc} */
@Override
public void marshal(Object arg0, HierarchicalStreamWriter writer,
MarshallingContext context) {
TestElement el = (TestElement) arg0;
@@ -89,12 +79,7 @@
}
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
- * com.thoughtworks.xstream.converters.UnmarshallingContext)
- */
+ /** {...@inheritdoc} */
@Override
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
String classAttribute = reader.getAttribute(ConversionHelp.ATT_CLASS);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java?rev=889028&r1=889027&r2=889028&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
Thu Dec 10 00:08:07 2009
@@ -50,24 +50,14 @@
return "$Revision$"; // $NON-NLS-1$
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
- */
+ /** {...@inheritdoc} */
@Override
@SuppressWarnings("unchecked") // superclass does not use types
public boolean canConvert(Class arg0) {
return arg0.equals(TestElementProperty.class);
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
- * com.thoughtworks.xstream.io.HierarchicalStreamWriter,
- * com.thoughtworks.xstream.converters.MarshallingContext)
- */
+ /** {...@inheritdoc} */
@Override
public void marshal(Object arg0, HierarchicalStreamWriter writer,
MarshallingContext context) {
TestElementProperty prop = (TestElementProperty) arg0;
@@ -110,12 +100,7 @@
*
name="Header.value">Mozilla%2F4.0+%28compatible%3B+MSIE+5.5%3B+Windows+98%29</stringProp>
* <stringProp name="Header.name">User-Agent</stringProp> </elementProp>
*/
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
- * com.thoughtworks.xstream.converters.UnmarshallingContext)
- */
+ /** {...@inheritdoc} */
@Override
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
try {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java?rev=889028&r1=889027&r2=889028&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
Thu Dec 10 00:08:07 2009
@@ -57,24 +57,14 @@
super(arg0);
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
- */
+ /** {...@inheritdoc} */
@SuppressWarnings("unchecked") // superclass does not use types
@Override
public boolean canConvert(Class arg0) {
return arg0.equals(TestResultWrapper.class);
}
- /*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
- * com.thoughtworks.xstream.io.HierarchicalStreamWriter,
- * com.thoughtworks.xstream.converters.MarshallingContext)
- */
+ /** {...@inheritdoc} */
@Override
public void marshal(Object arg0, HierarchicalStreamWriter arg1,
MarshallingContext arg2) {
// Not used, as the <testResult> element is generated by the
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
