This is an automated email from the ASF dual-hosted git repository.

dashorst pushed a commit to branch archive/wicket-1.1.x
in repository https://gitbox.apache.org/repos/asf/wicket.git

commit f9295748edcc419121ea47cb405770009de10c70
Author: Igor Vaynberg <[email protected]>
AuthorDate: Wed Jan 25 16:38:18 2006 +0000

    clarified property model javadoc
    
    
    git-svn-id: 
https://svn.apache.org/repos/asf/incubator/wicket/branches/WICKET_1_1@458819 
13f79535-47bb-0310-9956-ffa450edef68
---
 wicket/src/java/wicket/model/PropertyModel.java | 36 ++++++++++++-------------
 wicket/xdocs/changes.xml                        |  1 +
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/wicket/src/java/wicket/model/PropertyModel.java 
b/wicket/src/java/wicket/model/PropertyModel.java
index c7a76459c3..9ed07d20ec 100644
--- a/wicket/src/java/wicket/model/PropertyModel.java
+++ b/wicket/src/java/wicket/model/PropertyModel.java
@@ -1,6 +1,6 @@
 /*
- * $Id$
- * $Revision$ $Date$
+ * $Id$ $Revision:
+ * 1.47 $ $Date$
  * 
  * 
==============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -46,9 +46,9 @@ import wicket.Component;
  * given person object like this:
  * 
  * <pre>
- *                 Person person = getSomePerson();
- *                 ...
- *                 add(new Label(&quot;myLabel&quot;, person, 
&quot;name&quot;);
+ *                  Person person = getSomePerson();
+ *                  ...
+ *                  add(new Label(&quot;myLabel&quot;, person, 
&quot;name&quot;);
  * </pre>
  * 
  * Where 'myLabel' is the name of the component, and 'name' is the Ognl
@@ -60,7 +60,7 @@ import wicket.Component;
  * updates the name property of a person like this:
  * 
  * <pre>
- *                 add(new TextField(&quot;myTextField&quot;, person, 
&quot;name&quot;);
+ *                  add(new TextField(&quot;myTextField&quot;, person, 
&quot;name&quot;);
  * </pre>
  * 
  * </p>
@@ -92,19 +92,19 @@ public class PropertyModel extends AbstractPropertyModel
 
        /**
         * If this is set, this type is used for conversion instead of the type 
that
-        * is figured out by Ognl. This can be especially useful for when you 
have
-        * a generic property (like Serializable myProp) that you want to be
-        * converted to a narrower type (e.g. an Integer). Ognl sees an 
incomming
-        * string being compatible with the target property, and will then 
bypass
-        * the converter. Hence, to force myProp being converted to and from an
-        * integer, propertyType should be set to Integer.
+        * is figured out by Ognl. This can be especially useful for when you 
have a
+        * generic property (like Serializable myProp) that you want to be 
converted
+        * to a narrower type (e.g. an Integer). Ognl sees an incomming string 
being
+        * compatible with the target property, and will then bypass the 
converter.
+        * Hence, to force myProp being converted to and from an integer,
+        * propertyType should be set to Integer.
         */
        private final Class propertyType;
 
        /**
-        * Construct with an IModel object and a Ognl expression that works on 
the
-        * given model. Additional formatting will be used depending on the
-        * configuration setting.
+        * Construct with a wrapped(IModel) object or an unwrapped (non-IModel)
+        * object and a Ognl expression that works on the given model. 
Additional
+        * formatting will be used depending on the configuration setting.
         * 
         * @param modelObject
         *            The model object, which may or may not implement IModel
@@ -117,9 +117,9 @@ public class PropertyModel extends AbstractPropertyModel
        }
 
        /**
-        * Construct with an IModel object and a Ognl expression that works on 
the
-        * given model. Additional formatting will be used depending on the
-        * configuration setting.
+        * Construct with a wrapped(IModel) object or an unwrapped (non-IModel)
+        * object and a Ognl expression that works on the given model. 
Additional
+        * formatting will be used depending on the configuration setting.
         * 
         * @param modelObject
         *            The model object, which may or may not implement IModel
diff --git a/wicket/xdocs/changes.xml b/wicket/xdocs/changes.xml
index a90d845ba2..6f9974395c 100644
--- a/wicket/xdocs/changes.xml
+++ b/wicket/xdocs/changes.xml
@@ -11,6 +11,7 @@
     <release version="1.2-alpha1" date="tbd" description="Wicket CVS HEAD 
development">
     </release>
     <release version="1.1.1" date="tbd" description="Wicket 1.1.1">
+      <action type="update" dev="Igor Vaynberg" due-to="Frank 
Silbermann">clarified PropertyModel javadoc</action>
       <action type="update" dev="Igor Vaynberg">Added check and better 
exception when servlet's init param is missing</action>
       <action type="update" dev="Igor Vaynberg" issue="1345198">Added label 
tags for generated input tags in CheckBoxMultipleChoice and RadioChoice</action>
       <action type="fix" dev="Juergen Donnerstag">Fixed autolink NPE 
problem</action>

Reply via email to