svn commit: r1226435 - in /karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core: BasePage.java brand/DefaultBrandProvider.java

[ldywicki]

Author: ldywicki
Date: Mon Jan  2 14:29:48 2012
New Revision: 1226435

URL: http://svn.apache.org/viewvc?rev=1226435&view=rev
Log:
Call BrandProvider earlier. This change lets given brand provider to add new 
components or use visitors to modify component structure. Overriding is still 
possible through addOrReplace method

Signed-off-by: Lukasz Dywicki <l...@code-house.org>

Modified:
    
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
    
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java?rev=1226435&r1=1226434&r2=1226435&view=diff
==============================================================================
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/BasePage.java
 Mon Jan  2 14:29:48 2012
@@ -66,9 +66,10 @@ public class BasePage extends WebPage {
     }
 
     @Override
-    protected void onBeforeRender() {
-        super.onBeforeRender();
-
+    protected void onConfigure() {
         brandProvider.modify(this);
+
+        super.onConfigure();
     }
+
 }

Modified: 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
URL: 
http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java?rev=1226435&r1=1226434&r2=1226435&view=diff
==============================================================================
--- 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 (original)
+++ 
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
 Mon Jan  2 14:29:48 2012
@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.karaf.webconsole.core.BasePage;
+import org.apache.karaf.webconsole.core.behavior.FormalizeBehavior;
 import org.apache.wicket.Page;
 import org.apache.wicket.ResourceReference;
 import org.apache.wicket.behavior.IBehavior;
@@ -43,7 +44,7 @@ public class DefaultBrandProvider implem
     }
 
     public void modify(Page page) {
-        // we don't modify page by default
+        page.add(new FormalizeBehavior());
     }
 
 }