click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r929429 - in /click/trunk/click: documentation/docs/ documentation/dtds/ documentation/xdocs/src/docbook/click/ framework/src/org/apache/click/service/
Date Wed, 31 Mar 2010 08:10:55 GMT
Author: sabob
Date: Wed Mar 31 08:10:55 2010
New Revision: 929429

URL: http://svn.apache.org/viewvc?rev=929429&view=rev
Log:
removed "public" autobinding mode

Modified:
    click/trunk/click/documentation/docs/click-dtd.html
    click/trunk/click/documentation/dtds/click-2.2.dtd
    click/trunk/click/documentation/xdocs/src/docbook/click/chapter-configuration.xml
    click/trunk/click/framework/src/org/apache/click/service/ConfigService.java
    click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java

Modified: click/trunk/click/documentation/docs/click-dtd.html
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/docs/click-dtd.html?rev=929429&r1=929428&r2=929429&view=diff
==============================================================================
--- click/trunk/click/documentation/docs/click-dtd.html (original)
+++ click/trunk/click/documentation/docs/click-dtd.html Wed Mar 31 08:10:55 2010
@@ -56,7 +56,7 @@ Click application XML descriptor Documen
   &lt;!ELEMENT <span class="red">pages</span> (<span class="blue">page</span>*,
<span class="blue">excludes</span>*)&gt;
     &lt;!ATTLIST <span class="red">pages</span> <span class="blue">package</span>
CDATA #IMPLIED&gt;
     &lt;!ATTLIST <span class="red">pages</span> <span class="blue">automapping</span>
(true|false) "<span class="green">true</span>"&gt;
-    &lt;!ATTLIST <span class="red">pages</span> <span class="blue">autobinding</span>
(default|annotation|public|none) "<span class="green">default</span>"&gt;
+    &lt;!ATTLIST <span class="red">pages</span> <span class="blue">autobinding</span>
(default|annotation|none) "<span class="green">default</span>"&gt;
 
     &lt;!-- Page definition. --&gt;
     &lt;!ELEMENT <span class="red">page</span> (<span class="blue">header</span>*)&gt;

Modified: click/trunk/click/documentation/dtds/click-2.2.dtd
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/dtds/click-2.2.dtd?rev=929429&r1=929428&r2=929429&view=diff
==============================================================================
--- click/trunk/click/documentation/dtds/click-2.2.dtd (original)
+++ click/trunk/click/documentation/dtds/click-2.2.dtd Wed Mar 31 08:10:55 2010
@@ -39,7 +39,7 @@
   <!ELEMENT pages (page*, excludes*)>
     <!ATTLIST pages package CDATA #IMPLIED>
     <!ATTLIST pages automapping (true|false) "true">
-    <!ATTLIST pages autobinding (default|annotation|public|none) "default">
+    <!ATTLIST pages autobinding (default|annotation|none) "default">
 
     <!-- Page definition. -->
     <!ELEMENT page (header*)>

Modified: click/trunk/click/documentation/xdocs/src/docbook/click/chapter-configuration.xml
URL: http://svn.apache.org/viewvc/click/trunk/click/documentation/xdocs/src/docbook/click/chapter-configuration.xml?rev=929429&r1=929428&r2=929429&view=diff
==============================================================================
--- click/trunk/click/documentation/xdocs/src/docbook/click/chapter-configuration.xml (original)
+++ click/trunk/click/documentation/xdocs/src/docbook/click/chapter-configuration.xml Wed
Mar 31 08:10:55 2010
@@ -293,7 +293,7 @@
       <literallayout>&lt;!ELEMENT <varname>pages</varname> (<symbol>page</symbol>*)&gt;
    &lt;!ATTLIST pages <varname>package</varname> CDATA #IMPLIED&gt;
    &lt;!ATTLIST pages <varname>automapping</varname> (true|false) "true"&gt;
-   &lt;!ATTLIST pages <varname>autobinding</varname> (default|annotation|public|none)
"default"&gt;</literallayout>
+   &lt;!ATTLIST pages <varname>autobinding</varname> (default|annotation|none)
"default"&gt;</literallayout>
 
       <para>The pages element can specify a default <varname>package</varname>
name
       which is prepended to the classname of any pages defined.
@@ -548,23 +548,23 @@ change-password.htm  =&gt;  <token>Chang
 
 }</programlisting>
 
-        <para>In the example above the <varname>employeeForm</varname>
and
-        <varname>myTable</varname> controls were not added to the page. Also
note
-        that Form and Table do not have their names defined.
+        <para>Note in the above example that the <varname>employeeForm</varname>
+        and <varname>myTable</varname> controls were not added to the page. Also
+        note that Form and Table do not have their names defined.
         </para>
 
-        <para>When autobinding is enabled, ClickServlet will create a new Page and
-        add the public controls to the page. In the example above the
+        <para>When autobinding is enabled, ClickServlet will create a new Page
+        and add the public controls to the page. Following the example above the
         <varname>employeeForm</varname> and <varname>myTable</varname>
will be
-        added to the page, as if you had invoked,
+        added to the page, similar to calling
         <methodname>addControl(employeeForm)</methodname> and
         <methodname>addControl(myTable)</methodname>.
         </para>
 
-        <para>The control's names were not defined so ClickServlet will set their
-        names to the value of their field/variable name. In this case the Form
-        name will be set to <varname>employeeForm</varname> while the Table name
-        will set to <varname>myTable</varname>.
+        <para>Furthermore, the control names were not defined so ClickServlet
+        will set their names to the value of their field/variable name. In this
+        case the Form name will be set to <varname>employeeForm</varname> while
+        the Table name will set to <varname>myTable</varname>.
         </para>
 
         <para>The above example is thus a shorthand way of writing the following:

Modified: click/trunk/click/framework/src/org/apache/click/service/ConfigService.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/service/ConfigService.java?rev=929429&r1=929428&r2=929429&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/service/ConfigService.java (original)
+++ click/trunk/click/framework/src/org/apache/click/service/ConfigService.java Wed Mar 31
08:10:55 2010
@@ -119,7 +119,7 @@ public interface ConfigService {
     public static final String NOT_FOUND_PATH = "/click/not-found.htm";
 
     /** The page auto binding mode. */
-    public enum AutoBinding { DEFAULT, PUBLIC, ANNOTATION, NONE };
+    public enum AutoBinding { DEFAULT, ANNOTATION, NONE };
 
     /**
      * The servlet context attribute name. The ClickServlet stores the

Modified: click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java?rev=929429&r1=929428&r2=929429&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java (original)
+++ click/trunk/click/framework/src/org/apache/click/service/XmlConfigService.java Wed Mar
31 08:10:55 2010
@@ -975,7 +975,7 @@ public class XmlConfigService implements
                     autobinding = AutoBinding.ANNOTATION;
 
                 } else if ("public".equalsIgnoreCase(autobindingStr)) {
-                    autobinding = AutoBinding.PUBLIC;
+                    autobinding = AutoBinding.DEFAULT;
 
                 } else if ("none".equalsIgnoreCase(autobindingStr)) {
                     autobinding = AutoBinding.NONE;
@@ -1782,9 +1782,6 @@ public class XmlConfigService implements
 
             return fieldArray;
 
-        } else if (mode == AutoBinding.PUBLIC) {
-            return pageClass.getFields();
-
         } else if (mode == AutoBinding.ANNOTATION) {
 
             Map<String, Field> fieldMap = getAnnotatedBindableFields(pageClass);



Mime
View raw message