Author: jrthomerson
Date: Sat Apr 4 17:21:26 2009
New Revision: 761968
URL: http://svn.apache.org/viewvc?rev=761968&view=rev
Log:
WICKET-670
make debug bar appear red if one of the contributors registers an error on it
Added:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.html
- copied, changed from r761875,
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
- copied, changed from r761965,
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.java
Removed:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.java
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/IDebugBarContributor.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/VersionDebugContributor.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html?rev=761968&r1=761967&r2=761968&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html
Sat Apr 4 17:21:26 2009
@@ -15,8 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
-<html xmlns:wicket="http://wicket.apache.org";>
+<html xmlns="http://www.w3.org/1999/xhtml"; >
<head>
<title>DevUtilsPage.html</title>
</head>
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java?rev=761968&r1=761967&r2=761968&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.java
Sat Apr 4 17:21:26 2009
@@ -18,7 +18,7 @@
import org.apache.wicket.IPageMap;
import org.apache.wicket.PageParameters;
-import org.apache.wicket.devutils.debugbar.WicketDebugBar;
+import org.apache.wicket.devutils.debugbar.DebugBar;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
@@ -58,7 +58,7 @@
@Override
protected void onBeforeRender() {
super.onBeforeRender();
- add(new WicketDebugBar("debug"));
+ add(new DebugBar("debug"));
DevelopmentUtilitiesNotEnabledException.check();
}
}
Copied:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.html
(from r761875,
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.html)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.html?p2=wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.html&p1=wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.html&r1=761875&r2=761968&rev=761968&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.html
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.html
Sat Apr 4 17:21:26 2009
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -14,20 +15,17 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<?xml version="1.0" encoding="UTF-8"?>
<html xmlns="http://www.w3.org/1999/xhtml"; >
<head>
</head>
<body>
<wicket:panel>
- <div id="wicketDebugBar">
- <a id="wicketDebugBarCollapse"
onclick="wicketDebugBarCollapse();"><img wicket:id="logo" src="wicket.png"
/></a>
- <span id="wicketDebugBarContents">
- <span wicket:id="contributors"><span
wicket:id="contrib" class="contributor"></span></span>
- <a id="wicketDebugBarRemove"
onclick="wicketDebugBarRemove();"><img wicket:id="removeImg" src="remove.png"
/></a>
- </span>
- </div>
+ <a id="wicketDebugBarCollapse"
onclick="wicketDebugBarCollapse();"><img wicket:id="logo" src="wicket.png"
/></a>
+ <span id="wicketDebugBarContents">
+ <span wicket:id="contributors"><span
wicket:id="contrib" class="contributor"></span></span>
+ <a id="wicketDebugBarRemove"
onclick="wicketDebugBarRemove();"><img wicket:id="removeImg" src="remove.png"
/></a>
+ </span>
</wicket:panel>
</body>
Copied:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
(from r761965,
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.java)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java?p2=wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java&p1=wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.java&r1=761965&r2=761968&rev=761968&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/WicketDebugBar.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBar.java
Sat Apr 4 17:21:26 2009
@@ -20,6 +20,7 @@
import java.util.List;
import org.apache.wicket.Application;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.devutils.DevUtilsPanel;
@@ -28,12 +29,32 @@
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;
/**
+ * The debug bar is for use during development. It allows contributors to add
+ * useful functions or data, making them readily accessible to the
developer.<br />
+ * <br />
+ * To use it, simply add it to your base page so that all of your pages
+ * automatically have it.<br />
+ *
+ * <br />
+ * <code>
+ * Java:
+ * add(new DebugBar("debug"));
+ *
+ * HTML:
+ * <div wicket:id="debug"></div>
+ * </code>
+ *
+ * <br />
+ * You can also add your own information to the bar by creating a
+ * {...@link IDebugBarContributor} and registering it with the debug bar.
*
* @author Jeremy Thomerson <[email protected]>
+ * @see IDebugBarContributor
*/
-public class WicketDebugBar extends DevUtilsPanel {
+public class DebugBar extends DevUtilsPanel {
private static final MetaDataKey<List<IDebugBarContributor>>
CONTRIBS_META_KEY = new MetaDataKey<List<IDebugBarContributor>>() {
private static final long serialVersionUID = 1L;
@@ -45,20 +66,36 @@
private static final long serialVersionUID = 1L;
- public WicketDebugBar(String id) {
+ public DebugBar(String id) {
super(id);
-
add(CSSPackageResource.getHeaderContribution(WicketDebugBar.class,
+ setMarkupId("wicketDebugBar");
+ setOutputMarkupId(true);
+ add(new AttributeModifier("class", true,
+ new AbstractReadOnlyModel<String>() {
+ private static final long
serialVersionUID = 1L;
+
+ @Override
+ public String getObject() {
+ return "wicketDebugBar"
+ +
(DebugBar.this.hasErrorMessage() ? "Error"
+
: "");
+ }
+
+ }));
+ add(CSSPackageResource.getHeaderContribution(DebugBar.class,
"wicket-debugbar.css"));
- add(JavascriptPackageResource.getHeaderContribution(
- WicketDebugBar.class, "wicket-debugbar.js"));
- add(new Image("logo", new
ResourceReference(WicketDebugBar.class,
+
add(JavascriptPackageResource.getHeaderContribution(DebugBar.class,
+ "wicket-debugbar.js"));
+ add(new Image("logo", new ResourceReference(DebugBar.class,
"wicket.png")));
- add(new Image("removeImg", new
ResourceReference(WicketDebugBar.class,
+ add(new Image("removeImg", new ResourceReference(DebugBar.class,
"remove.png")));
List<IDebugBarContributor> contributors = getContributors();
if (contributors.isEmpty()) {
- // we do this so that if you have multiple applications
running in the same container,
- // each ends up registering its' own contributors
(wicket-examples for example)
+ // we do this so that if you have multiple applications
running in
+ // the same container,
+ // each ends up registering its' own contributors
(wicket-examples
+ // for example)
registerStandardContributors();
contributors = getContributors();
}
@@ -68,14 +105,15 @@
@Override
protected void
populateItem(ListItem<IDebugBarContributor> item) {
item.add(item.getModelObject().createComponent("contrib",
- WicketDebugBar.this));
+ DebugBar.this));
}
});
}
-
+
@Override
public boolean isVisible() {
- return
getApplication().getDebugSettings().isDevelopmentUtilitiesEnabled();
+ return getApplication().getDebugSettings()
+ .isDevelopmentUtilitiesEnabled();
}
/**
@@ -104,7 +142,7 @@
private static void registerStandardContributors() {
registerContributor(VersionDebugContributor.DEBUG_BAR_CONTRIB);
- registerContributor(InspectorDebugPanel.DEBUG_BAR_CONTRIB);
- registerContributor(SessionSizeDebugPanel.DEBUG_BAR_CONTRIB);
+ registerContributor(InspectorDebugPanel.DEBUG_BAR_CONTRIB);
+ registerContributor(SessionSizeDebugPanel.DEBUG_BAR_CONTRIB);
}
}
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/IDebugBarContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/IDebugBarContributor.java?rev=761968&r1=761967&r2=761968&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/IDebugBarContributor.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/IDebugBarContributor.java
Sat Apr 4 17:21:26 2009
@@ -22,6 +22,6 @@
public interface IDebugBarContributor extends Serializable {
- Component createComponent(String id, WicketDebugBar debugBar);
+ Component createComponent(String id, DebugBar debugBar);
}
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java?rev=761968&r1=761967&r2=761968&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
Sat Apr 4 17:21:26 2009
@@ -34,7 +34,7 @@
public static final IDebugBarContributor DEBUG_BAR_CONTRIB = new
IDebugBarContributor() {
private static final long serialVersionUID = 1L;
- public Component createComponent(String id, WicketDebugBar
debugBar) {
+ public Component createComponent(String id, DebugBar debugBar) {
return new InspectorDebugPanel(id);
}
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java?rev=761968&r1=761967&r2=761968&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
Sat Apr 4 17:21:26 2009
@@ -39,7 +39,7 @@
public static final IDebugBarContributor DEBUG_BAR_CONTRIB = new
IDebugBarContributor() {
private static final long serialVersionUID = 1L;
- public Component createComponent(String id, WicketDebugBar
debugBar) {
+ public Component createComponent(String id, DebugBar debugBar) {
return new SessionSizeDebugPanel(id);
}
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/VersionDebugContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/VersionDebugContributor.java?rev=761968&r1=761967&r2=761968&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/VersionDebugContributor.java
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/VersionDebugContributor.java
Sat Apr 4 17:21:26 2009
@@ -28,7 +28,7 @@
public static final IDebugBarContributor DEBUG_BAR_CONTRIB = new
VersionDebugContributor();
- public Component createComponent(String id, WicketDebugBar debugBar) {
+ public Component createComponent(String id, DebugBar debugBar) {
Label label = new Label(id, new AbstractReadOnlyModel<String>()
{
private static final long serialVersionUID = 1L;
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css?rev=761968&r1=761967&r2=761968&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.css
Sat Apr 4 17:21:26 2009
@@ -20,8 +20,6 @@
position: absolute;
right: 0;
top: 0;
- background-color: #DDDDDD;
- opacity: 0.8;
padding: 0px 10px 0px 5px;
}
#wicketDebugBar img {
@@ -44,4 +42,17 @@
padding: 0em 0.5em;
background-color: #AAA;
opacity: 0.8;
-}
\ No newline at end of file
+}
+/*
+ the color is put on the class rather than the ID
+ so that if there is an error, we can simply change
+ the class and it will use the error colors instead.
+*/
+.wicketDebugBarError {
+ background-color: red;
+ opacity: 0.8;
+}
+.wicketDebugBar {
+ background-color: #DDDDDD;
+ opacity: 0.8;
+}
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js?rev=761968&r1=761967&r2=761968&view=diff
==============================================================================
---
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js
(original)
+++
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/wicket-debugbar.js
Sat Apr 4 17:21:26 2009
@@ -26,4 +26,5 @@
var elem = document.getElementById(elemID);
var vis = elem.style.display != 'none';
elem.style.display = (vis ? 'none' : '');
-}
\ No newline at end of file
+}
+
Modified:
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java?rev=761968&r1=761967&r2=761968&view=diff
==============================================================================
---
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
(original)
+++
wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleHeader.java
Sat Apr 4 17:21:26 2009
@@ -18,7 +18,7 @@
import org.apache.wicket.PageMap;
import org.apache.wicket.RequestContext;
-import org.apache.wicket.devutils.debugbar.WicketDebugBar;
+import org.apache.wicket.devutils.debugbar.DebugBar;
import org.apache.wicket.devutils.inspector.InspectorBug;
import org.apache.wicket.examples.source.SourcesPage;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -61,7 +61,7 @@
};
add(hideInPortlet);
hideInPortlet.add(new InspectorBug("inspector", page));
- hideInPortlet.add(new WicketDebugBar("debug"));
+ hideInPortlet.add(new DebugBar("debug"));
add(new Label("exampleTitle", exampleTitle));
BookmarkablePageLink<Void> link = new
BookmarkablePageLink<Void>("sources",
SourcesPage.class,
SourcesPage.generatePageParameters(page));
