svn commit: r823814 - in /wicket/trunk: wicket-examples/src/main/java/org/apache/wicket/examples/compref/ wicket-examples/src/main/java/org/apache/wicket/examples/forminput/ wicket/src/main/java/org/apache/wicket/markup/html/border/

[jdonnerstag]

Author: jdonnerstag
Date: Sat Oct 10 08:13:06 2009
New Revision: 823814

URL: http://svn.apache.org/viewvc?rev=823814&view=rev
Log:
small changes to new Border

Modified:
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.java
    
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.java?rev=823814&r1=823813&r2=823814&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/compref/BorderPage.java
 Sat Oct 10 08:13:06 2009
@@ -32,10 +32,10 @@
         */
        public BorderPage()
        {
-               Label label = new Label("label", "I am the label");
                MyBorder border = new MyBorder("border");
-               border.add(label);
                add(border);
+
+               border.add(new Label("label", "I am the label"));
        }
 
        /**
@@ -54,7 +54,5 @@
                        + 
"        add(border);\n"
                        + "    }";
                add(new ExplainPanel(html, code));
-
        }
-
 }
\ No newline at end of file

Modified: 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java?rev=823814&r1=823813&r2=823814&view=diff
==============================================================================
--- 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
 (original)
+++ 
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
 Sat Oct 10 08:13:06 2009
@@ -103,8 +103,7 @@
                        // display the multiply result
                        Label multiplyLabel = new Label("multiplyLabel", new 
PropertyModel<Integer>(
                                getDefaultModel(), "multiply"));
-                       // just for fun, add a border so that our result will 
be displayed
-                       // as '[ x ]'
+                       // just for fun, add a border so that our result will 
be displayed as '[ x ]'
                        multiplyLabel.add(new BeforeAndAfterBorder());
                        add(multiplyLabel);
                        RadioChoice<String> rc = new 
RadioChoice<String>("numberRadioChoice", NUMBERS).setSuffix("");

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java?rev=823814&r1=823813&r2=823814&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
 Sat Oct 10 08:13:06 2009
@@ -148,7 +148,7 @@
        static final String BODY_ID = "_body";
 
        /** The body component associated with <wicket:body> */
-       private final MarkupContainer body;
+       private final BorderBodyContainer body;
 
        /**
         * only required during render phase. The markup stream associated with 
<span
@@ -187,7 +187,7 @@
        /**
         * @return The border body container
         */
-       public final MarkupContainer getBodyContainer()
+       public final BorderBodyContainer getBodyContainer()
        {
                return body;
        }
@@ -198,7 +198,7 @@
         * @param id
         * @return A new instance
         */
-       MarkupContainer newBorderBodyContainer(final String id)
+       BorderBodyContainer newBorderBodyContainer(final String id)
        {
                return new BorderBodyContainer(id);
        }