You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/10/29 13:44:59 UTC
git commit: WICKET-5388 Allow DebugBar contributors to be removed
Updated Branches:
refs/heads/wicket-6.x 176a9fd4b -> 0a7007774
WICKET-5388 Allow DebugBar contributors to be removed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0a700777
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0a700777
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0a700777
Branch: refs/heads/wicket-6.x
Commit: 0a70077741db3407d23604dca0d69b353395119e
Parents: 176a9fd
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Oct 29 14:44:14 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Oct 29 14:44:14 2013 +0200
----------------------------------------------------------------------
.../wicket/devutils/debugbar/DebugBar.java | 25 ++++++++++----------
1 file changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0a700777/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
index e79fd4e..c839d64 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
@@ -32,8 +32,10 @@ import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.util.lang.Args;
/**
* The debug bar is for use during development. It allows contributors to add useful functions or
@@ -125,7 +127,7 @@ public class DebugBar extends DevUtilsPanel
section.add(AttributeModifier.append("style", "display:none").setSeparator(";"));
}
- List<IDebugBarContributor> contributors = getContributors();
+ List<IDebugBarContributor> contributors = getContributors(getApplication());
section.add(new ListView<IDebugBarContributor>("contributors", contributors)
{
@@ -163,7 +165,7 @@ public class DebugBar extends DevUtilsPanel
@Override
public void renderHead(final IHeaderResponse response)
{
- response.render(CssHeaderItem.forReference(new PackageResourceReference(DebugBar.class,
+ response.render(CssHeaderItem.forReference(new CssResourceReference(DebugBar.class,
"wicket-debugbar.css")));
response.render(JavaScriptHeaderItem.forReference(new JavaScriptResourceReference(
DebugBar.class, "wicket-debugbar.js")));
@@ -192,24 +194,23 @@ public class DebugBar extends DevUtilsPanel
public static void registerContributor(final IDebugBarContributor contrib,
final Application application)
{
- if (contrib == null)
- {
- throw new IllegalArgumentException("contrib can not be null");
- }
+ Args.notNull(contrib, "contrib");
List<IDebugBarContributor> contributors = getContributors(application);
contributors.add(contrib);
- application.setMetaData(CONTRIBS_META_KEY, contributors);
+ setContributors(contributors, application);
}
- private static List<IDebugBarContributor> getContributors()
+ public static List<IDebugBarContributor> getContributors(final Application application)
{
- return getContributors(Application.get());
+ List<IDebugBarContributor> list = application.getMetaData(CONTRIBS_META_KEY);
+ return list == null ? new ArrayList<IDebugBarContributor>() : list;
}
- private static List<IDebugBarContributor> getContributors(final Application application)
+ public static void setContributors(List<IDebugBarContributor> contributors, Application application)
{
- List<IDebugBarContributor> list = application.getMetaData(CONTRIBS_META_KEY);
- return list == null ? new ArrayList<IDebugBarContributor>() : list;
+ Args.notNull(application, "application");
+
+ application.setMetaData(CONTRIBS_META_KEY, contributors);
}
}