Author: mgrigorov
Date: Sun Mar 13 21:41:25 2011
New Revision: 1081224

URL: http://svn.apache.org/viewvc?rev=1081224&view=rev
Log:
WICKET-3422: Simplified visibility control of Enclosures in Ajax requests

Make 'childId' protected in Enclosure so that InlineEnclosure can reuse it. 
Otherwise they were having their own refs for the same -> waste some memory.


Modified:
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java?rev=1081224&r1=1081223&r2=1081224&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
 Sun Mar 13 21:41:25 2011
@@ -86,7 +86,7 @@ public class Enclosure extends WebMarkup
        private Component childComponent;
 
        /** Id of the child component that will control visibility of the 
enclosure */
-       private final CharSequence childId;
+       protected final CharSequence childId;
 
        private transient Map<Component, Boolean> changes;
 

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java?rev=1081224&r1=1081223&r2=1081224&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java
 Sun Mar 13 21:41:25 2011
@@ -49,9 +49,6 @@ public class InlineEnclosure extends Enc
 
        private static final Logger log = 
LoggerFactory.getLogger(InlineEnclosure.class);
 
-       /** Id of the child component that will control visibility of the 
enclosure */
-       private final CharSequence childId;
-
        /**
         * This transient child list is filled only at onComponentTagBody. 
Therefore it is not
         * necessarily accurate at any given time.
@@ -68,8 +65,6 @@ public class InlineEnclosure extends Enc
        public InlineEnclosure(final String id, final String childId)
        {
                super(id, childId);
-
-               this.childId = childId;
        }
 
        @Override


Reply via email to