[4/5] struts git commit: WW-4210 Updates JavaDocs

[lukaszlenart]

WW-4210 Updates JavaDocs


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/a5845257
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/a5845257
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/a5845257

Branch: refs/heads/master
Commit: a58452571c90314f8ed56301133a2a7f7ad1c67b
Parents: ec24124
Author: Lukasz Lenart <lukaszlen...@apache.org>
Authored: Thu Apr 20 08:34:55 2017 +0200
Committer: Lukasz Lenart <lukaszlen...@apache.org>
Committed: Thu Apr 20 08:34:55 2017 +0200

----------------------------------------------------------------------
 .../conversion/annotations/TypeConversion.java    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/a5845257/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
 
b/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
index db57573..609936c 100644
--- 
a/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
+++ 
b/core/src/main/java/com/opensymphony/xwork2/conversion/annotations/TypeConversion.java
@@ -79,11 +79,17 @@ import java.lang.annotation.Target;
  * </tr>
  * <tr>
  * <td>converter</td>
- * <td>either this or value</td>
+ * <td>DEPRECATED: either this or value</td>
  * <td>&nbsp;</td>
  * <td>The class name of the TypeConverter to be used as converter.</td>
  * </tr>
  * <tr>
+ * <td>converterClass</td>
+ * <td>either this or value</td>
+ * <td>&nbsp;</td>
+ * <td>The class of the TypeConverter to be used as converter. 
XWorkBasicConverter by default.</td>
+ * </tr>
+ * <tr>
  * <td>value</td>
  * <td>either converter or this</td>
  * <td>&nbsp;</td>
@@ -108,27 +114,27 @@ import java.lang.annotation.Target;
  *
  *   private HashMap keyValues = null;
  *
- *   &#64;TypeConversion(type = ConversionType.APPLICATION, converter = 
"com.opensymphony.xwork2.util.XWorkBasicConverter")
+ *   &#64;TypeConversion(type = ConversionType.APPLICATION)
  *   public void setConvertInt( String convertInt ) {
  *       this.convertInt = convertInt;
  *   }
  *
- *   &#64;TypeConversion(converter = 
"com.opensymphony.xwork2.util.XWorkBasicConverter")
+ *   &#64;TypeConversion(converterClass = XWorkBasicConverter.class)
  *   public void setConvertDouble( String convertDouble ) {
  *       this.convertDouble = convertDouble;
  *   }
  *
- *   &#64;TypeConversion(rule = ConversionRule.COLLECTION, converter = 
"java.util.String")
+ *   &#64;TypeConversion(rule = ConversionRule.COLLECTION, converterClass = 
String.class)
  *   public void setUsers( List users ) {
  *       this.users = users;
  *   }
  *
- *   &#64;TypeConversion(rule = ConversionRule.MAP, converter = 
"java.math.BigInteger")
+ *   &#64;TypeConversion(rule = ConversionRule.MAP, converterClass = 
BigInteger.class)
  *   public void setKeyValues( HashMap keyValues ) {
  *       this.keyValues = keyValues;
  *   }
  *
- *   &#64;TypeConversion(type = ConversionType.APPLICATION, property = 
"java.util.Date", converter = 
"com.opensymphony.xwork2.util.XWorkBasicConverter")
+ *   &#64;TypeConversion(type = ConversionType.APPLICATION, property = 
"java.util.Date", converterClass = XWorkBasicConverter.class)
  *   public String execute() throws Exception {
  *       return SUCCESS;
  *   }