You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ld...@apache.org on 2011/12/28 11:31:17 UTC
svn commit: r1225156 - in /karaf/webconsole/trunk/core/src:
main/java/org/apache/karaf/webconsole/core/
main/java/org/apache/karaf/webconsole/core/brand/
main/java/org/apache/karaf/webconsole/core/table/
test/java/org/apache/karaf/webconsole/core/
Author: ldywicki
Date: Wed Dec 28 10:31:17 2011
New Revision: 1225156
URL: http://svn.apache.org/viewvc?rev=1225156&view=rev
Log:
Added support for overriding elements added in BasePage
Signed-off-by: Lukasz Dywicki <lu...@code-house.org>
Added:
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/SortablePropertyColumnExt.java
- copied, changed from r1214515, karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java
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/BrandProvider.java
karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/DefaultBrandProvider.java
karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/BasePageTest.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=1225156&r1=1225155&r2=1225156&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 Wed Dec 28 10:31:17 2011
@@ -64,4 +64,11 @@ public class BasePage extends WebPage {
add(behavior);
}
}
+
+ @Override
+ protected void onBeforeRender() {
+ super.onBeforeRender();
+
+ brandProvider.modify(this);
+ }
}
Modified: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java?rev=1225156&r1=1225155&r2=1225156&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java Wed Dec 28 10:31:17 2011
@@ -18,6 +18,7 @@ package org.apache.karaf.webconsole.core
import java.util.List;
+import org.apache.wicket.Page;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.markup.html.image.Image;
@@ -27,4 +28,5 @@ public interface BrandProvider {
List<IBehavior> getBehaviors();
+ void modify(Page page);
}
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=1225156&r1=1225155&r2=1225156&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 Wed Dec 28 10:31:17 2011
@@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.karaf.webconsole.core.BasePage;
+import org.apache.wicket.Page;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.behavior.SimpleAttributeModifier;
@@ -41,4 +42,8 @@ public class DefaultBrandProvider implem
return Collections.emptyList();
}
+ public void modify(Page page) {
+ // we don't modify page by default
+ }
+
}
Copied: karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/SortablePropertyColumnExt.java (from r1214515, karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java)
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/SortablePropertyColumnExt.java?p2=karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/SortablePropertyColumnExt.java&p1=karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java&r1=1214515&r2=1225156&rev=1225156&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/brand/BrandProvider.java (original)
+++ karaf/webconsole/trunk/core/src/main/java/org/apache/karaf/webconsole/core/table/SortablePropertyColumnExt.java Wed Dec 28 10:31:17 2011
@@ -14,17 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.webconsole.core.brand;
+package org.apache.karaf.webconsole.core.table;
-import java.util.List;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
+import org.apache.wicket.model.Model;
-import org.apache.wicket.behavior.IBehavior;
-import org.apache.wicket.markup.html.image.Image;
+public class SortablePropertyColumnExt<T> extends PropertyColumn<T> {
-public interface BrandProvider {
+ public SortablePropertyColumnExt(String label, String property) {
+ super(Model.of(label), property, property);
+ }
- Image getHeaderImage(String imageId);
-
- List<IBehavior> getBehaviors();
+ public SortablePropertyColumnExt(String property) {
+ this(property, property);
+ }
}
Modified: karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/BasePageTest.java
URL: http://svn.apache.org/viewvc/karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/BasePageTest.java?rev=1225156&r1=1225155&r2=1225156&view=diff
==============================================================================
--- karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/BasePageTest.java (original)
+++ karaf/webconsole/trunk/core/src/test/java/org/apache/karaf/webconsole/core/BasePageTest.java Wed Dec 28 10:31:17 2011
@@ -29,6 +29,7 @@ import java.util.Map;
import org.apache.karaf.webconsole.core.brand.BrandProvider;
import org.apache.karaf.webconsole.core.brand.DefaultBrandProvider;
+import org.apache.wicket.Page;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.util.tester.WicketTester;
@@ -55,6 +56,7 @@ public class BasePageTest extends WebCon
}
});
expect(brandProvider.getBehaviors()).andReturn(Collections.<IBehavior>emptyList());
+ brandProvider.modify(anyObject(Page.class));
replay(brandProvider);