Hi, This pull request removes InspectorBug class completely. Is it not needed anymore ? Bertrand's commit message is not very detailed ... :-/
On Fri, Aug 17, 2012 at 1:27 AM, <[email protected]> wrote: > Updated Branches: > refs/heads/master 2c7f5c858 -> 0f1e4ac21 > > > pull request #18 by berniegp, Cleanup devutils pages and panels > > > Project: http://git-wip-us.apache.org/repos/asf/wicket/repo > Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0f1e4ac2 > Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0f1e4ac2 > Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0f1e4ac2 > > Branch: refs/heads/master > Commit: 0f1e4ac21c00e70a09bbc8b48966a4c3b936dc3e > Parents: 2c7f5c8 > Author: Sven <sven@mithril.(none)> > Authored: Fri Aug 17 00:26:26 2012 +0200 > Committer: Sven <sven@mithril.(none)> > Committed: Fri Aug 17 00:26:26 2012 +0200 > > ---------------------------------------------------------------------- > .../wicket/protocol/http/IRequestLogger.java | 4 +- > .../org/apache/wicket/devutils/DevUtilsPage.html | 54 ++++++++++++++- > .../wicket/devutils/inspector/ApplicationView.html | 26 ++----- > .../wicket/devutils/inspector/InspectorBug.html | 24 ------- > .../wicket/devutils/inspector/InspectorBug.java | 53 -------------- > .../wicket/devutils/inspector/InspectorPage.html | 15 +---- > .../devutils/inspector/LiveSessionsPage.html | 19 +---- > .../inspector/RenderPerformanceListener.java | 2 + > .../wicket/devutils/inspector/RequestsPage.html | 31 +++------ > .../wicket/devutils/inspector/SessionView.html | 18 +---- > 10 files changed, 83 insertions(+), 163 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/wicket/blob/0f1e4ac2/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java > ---------------------------------------------------------------------- > diff --git > a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java > > b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java > index 88e91f8..6039ba9 100644 > --- > a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java > +++ > b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java > @@ -20,12 +20,12 @@ import java.util.ArrayList; > import java.util.Date; > import java.util.List; > > -import org.apache.wicket.util.io.IClusterable; > import org.apache.wicket.request.ILogData; > import org.apache.wicket.request.ILoggableRequestHandler; > import org.apache.wicket.request.IRequestHandler; > import org.apache.wicket.request.handler.logger.NoLogData; > import org.apache.wicket.session.ISessionStore; > +import org.apache.wicket.util.io.IClusterable; > import org.apache.wicket.util.string.Strings; > > /** > @@ -220,7 +220,7 @@ public interface IRequestLogger > } > > /** > - * @return Returns the total time this session has spent. > + * @return Returns the total time this session has spent in > ms. > */ > public long getTotalTimeTaken() > { > > http://git-wip-us.apache.org/repos/asf/wicket/blob/0f1e4ac2/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html > ---------------------------------------------------------------------- > diff --git > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html > index cc44f85..da7add2 100644 > --- > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html > +++ > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html > @@ -17,10 +17,60 @@ > --> > <html xmlns="http://www.w3.org/1999/xhtml"; > xmlns:wicket="http://wicket.apache.org";> > <head> > - <title>DevUtilsPage.html</title> > +<title>DevUtilsPage.html</title> > +<style type="text/css"> > +body { > + margin-left: 2em; > + font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans'; > + font-size: 9pt; > + line-height: 1.8em; > +} > + > +h1,h2,h3,h4,h5,h6,h7,h8 { > + color: #E9601A; > + font-size: -1; > +} > + > +pre,table,td { > + font-family: 'MS Trebuchet', 'Verdana', Arial, Helvetica; > + font-size: 10pt; > + line-height: 1.2em; > +} > + > +h2 { > + font-size: 1.2em; > +} > + > +pre,table,td { > + font-family: 'MS Trebuchet', 'Verdana', Arial, Helvetica; > + font-size: 10pt; > + line-height: 1.2em; > +} > + > +pre { > + border: 1px solid #ddd; > + margin-left: 2em; > +} > + > +h1 img { > + vertical-align: middle; > +} > + > +.resource { > + color: blue; > +} > + > +.tablestyle { > + margin-left: 2em; > + border: 1px solid #bbb; > +} > +</style> > +<title>Requests Page</title> > </head> > <body> > <div wicket:id="debug" /> > - <wicket:child /> > + <wicket:child /> > + <br /> > + <br /> > </body> > </html> > \ No newline at end of file > > http://git-wip-us.apache.org/repos/asf/wicket/blob/0f1e4ac2/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.html > ---------------------------------------------------------------------- > diff --git > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.html > > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.html > index 6b249d2..acb641c 100644 > --- > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.html > +++ > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/ApplicationView.html > @@ -16,28 +16,18 @@ > limitations under the License. > --> > <html xmlns:wicket="http://wicket.apache.org";> > -<style type="text/css"> > -body {margin-left : 2em;font-family: 'Lucida Sans', 'Helvetica', > 'Sans-serif', 'sans';font-size: 9pt;line-height: 1.8em;} > -h1,h2,h3,h4,h5,h6,h7,h8 {color: #E9601A;font-size : -1;} > -pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica; > font-size : 10pt; line-height:1.2em;} > -h2 {font-size : 1.2em;} > -pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica; > font-size : 10pt; line-height:1.2em;} > -pre { border : 1px solid #ddd; margin-left : 2em; } > -.resource { color : blue; } > -.tablestyle { margin-left : 2em; border : 1px solid #bbb; } > -</style> > <body> > <wicket:panel> > <h2>Application</h2> > <ul> > - Name: <span > wicket:id="name">9999</span><br/> > - Resource Poll Frequency: <span > wicket:id="resourcePollFrequency">9999</span><br/> > - Component Use Check: <span > wicket:id="componentUseCheck">9999</span><br/> > - Buffer Response: <span > wicket:id="bufferResponse">9999</span><br/> > - Version Pages: <span > wicket:id="versionPages">9999</span><br/> > - Compress Whitespace: <span > wicket:id="compressWhitespace">9999</span><br/> > - Strip Comments: <span > wicket:id="stripComments">9999</span><br/> > - Strip Wicket Tags: <span > wicket:id="stripWicketTags">9999</span><br/> > + <li>Name: <span wicket:id="name">9999</span></li> > + <li>Resource Poll Frequency: <span > wicket:id="resourcePollFrequency">9999</span></li> > + <li>Component Use Check: <span > wicket:id="componentUseCheck">9999</span></li> > + <li>Buffer Response: <span > wicket:id="bufferResponse">9999</span></li> > + <li>Version Pages: <span > wicket:id="versionPages">9999</span></li> > + <li>Compress Whitespace: <span > wicket:id="compressWhitespace">9999</span></li> > + <li>Strip Comments: <span > wicket:id="stripComments">9999</span></li> > + <li>Strip Wicket Tags: <span > wicket:id="stripWicketTags">9999</span></li> > </ul> > </wicket:panel> > </body> > > http://git-wip-us.apache.org/repos/asf/wicket/blob/0f1e4ac2/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.html > ---------------------------------------------------------------------- > diff --git > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.html > > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.html > deleted file mode 100644 > index aae2fad..0000000 > --- > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.html > +++ /dev/null > @@ -1,24 +0,0 @@ > -<?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 > - this work for additional information regarding copyright ownership. > - The ASF licenses this file to You under the Apache License, Version 2.0 > - (the "License"); you may not use this file except in compliance with > - the License. You may obtain a copy of the License at > - > - http://www.apache.org/licenses/LICENSE-2.0 > - > - Unless required by applicable law or agreed to in writing, software > - distributed under the License is distributed on an "AS IS" BASIS, > - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > - See the License for the specific language governing permissions and > - limitations under the License. > ---> > -<html xmlns:wicket="http://wicket.apache.org";> > -<body> > - <wicket:panel> > - <a href="#" wicket:id="link"><img valign="center" border="0" > wicket:id="bug" src="bug.png"/></a> > - </wicket:panel> > -</body> > -</html> > > http://git-wip-us.apache.org/repos/asf/wicket/blob/0f1e4ac2/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java > ---------------------------------------------------------------------- > diff --git > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java > > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java > deleted file mode 100644 > index 6790252..0000000 > --- > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java > +++ /dev/null > @@ -1,53 +0,0 @@ > -/* > - * Licensed to the Apache Software Foundation (ASF) under one or more > - * contributor license agreements. See the NOTICE file distributed with > - * this work for additional information regarding copyright ownership. > - * The ASF licenses this file to You under the Apache License, Version 2.0 > - * (the "License"); you may not use this file except in compliance with > - * the License. You may obtain a copy of the License at > - * > - * http://www.apache.org/licenses/LICENSE-2.0 > - * > - * Unless required by applicable law or agreed to in writing, software > - * distributed under the License is distributed on an "AS IS" BASIS, > - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > - * See the License for the specific language governing permissions and > - * limitations under the License. > - */ > -package org.apache.wicket.devutils.inspector; > - > -import org.apache.wicket.devutils.DevUtilsPanel; > -import org.apache.wicket.markup.html.WebPage; > -import org.apache.wicket.markup.html.image.NonCachingImage; > -import org.apache.wicket.markup.html.link.BookmarkablePageLink; > -import org.apache.wicket.markup.html.link.Link; > -import org.apache.wicket.request.mapper.parameter.PageParameters; > - > -/** > - * A page that shows interesting attributes of the Wicket environment, > including the current session > - * and the component tree for the current page. > - * > - * @author Jonathan Locke > - */ > -public final class InspectorBug extends DevUtilsPanel > -{ > - private static final long serialVersionUID = 1L; > - > - /** > - * Constructor > - * > - * @param id > - * Component id > - * @param page > - * Page to inspect > - */ > - public InspectorBug(final String id, final WebPage page) > - { > - super(id); > - PageParameters parameters = new PageParameters(); > - parameters.add("pageId", page.getId()); > - Link<?> link = new BookmarkablePageLink<Void>("link", > InspectorPage.class, parameters); > - link.add(new NonCachingImage("bug")); > - add(link); > - } > -} > > http://git-wip-us.apache.org/repos/asf/wicket/blob/0f1e4ac2/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html > ---------------------------------------------------------------------- > diff --git > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html > > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html > index 36797fe..d90d067 100644 > --- > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html > +++ > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.html > @@ -18,30 +18,17 @@ > <html xmlns:wicket="http://wicket.apache.org";> > <head> > <wicket:head> > -<style type="text/css"> > -body {margin-left : 2em;font-family: 'Lucida Sans', 'Helvetica', > 'Sans-serif', 'sans';font-size: 9pt;line-height: 1.8em;} > -h1,h2,h3,h4,h5,h6,h7,h8 {color: #E9601A;font-size : -1;} > -pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica; > font-size : 10pt; line-height:1.2em;} > -h2 {font-size : 1.2em;} > -pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica; > font-size : 10pt; line-height:1.2em;} > -pre { border : 1px solid #ddd; margin-left : 2em; } > -.resource { color : blue; } > -.tablestyle { margin-left : 2em; border : 1px solid #bbb; } > -</style> > <title>Inspector Bug</title> > </wicket:head> > </head> > <body> > <wicket:extend> > - <p> > - <h1><img valign="center" border="0" wicket:id="bug" src="bug.png"/> Wicket > Inspector (Wicket Version: <span wicket:id="wicketVersion">1.2</span>)</h1> > + <h1><img border="0" wicket:id="bug" src="bug.png"/> Wicket Inspector > (Wicket Version: <span wicket:id="wicketVersion">1.2</span>)</h1> > <a href="javascript:history.go(-1)">Go Back</a><br/> > <a wicket:id="allsessions" href="#">All Sessions</a> > <span wicket:id="application">Application view here</span> > <span wicket:id="session">Session view here</span> > <span wicket:id="page">Page view here</span> > - </p> > - <br/> > </wicket:extend> > </body> > </html> > > http://git-wip-us.apache.org/repos/asf/wicket/blob/0f1e4ac2/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html > ---------------------------------------------------------------------- > diff --git > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html > > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html > index 258f573..f7adf7a 100644 > --- > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html > +++ > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html > @@ -17,22 +17,13 @@ > --> > <html xmlns:wicket="http://wicket.apache.org";> > <head> > -<style type="text/css"> > -body {margin-left : 2em;font-family: 'Lucida Sans', 'Helvetica', > 'Sans-serif', 'sans';font-size: 9pt;line-height: 1.8em;} > -h1,h2,h3,h4,h5,h6,h7,h8 {color: #E9601A;font-size : -1;} > -pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica; > font-size : 10pt; line-height:1.2em;} > -h2 {font-size : 1.2em;} > -pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica; > font-size : 10pt; line-height:1.2em;} > -pre { border : 1px solid #ddd; margin-left : 2em; } > -.resource { color : blue; } > -.tablestyle { margin-left : 2em; border : 1px solid #bbb; } > -</style> > +<wicket:head> > <title>Live Sessions Page</title> > +</wicket:head> > </head> > <body> > <wicket:extend> > - <p> > - <h1><img valign="center" border="0" wicket:id="bug" src="bug.png"/> Wicket > Sessions Inspector</h1> > + <h1><img border="0" wicket:id="bug" src="bug.png"/> Wicket Sessions > Inspector</h1> > <a href="javascript:history.go(-1)">Go Back</a> > > <span wicket:id="application">Application view here</span> > @@ -50,7 +41,7 @@ pre { border : 1px solid #ddd; margin-left : 2em; } > <th>Session Id</th> > <th>Last Request Time</th> > <th>Request Count</th> > - <th>Total Request Time (s)</th> > + <th>Total Request Time (ms)</th> > <th>Session size (B)</th> > </tr> > <tr wicket:id="sessions"> > @@ -62,8 +53,6 @@ pre { border : 1px solid #ddd; margin-left : 2em; } > </tr> > </table> > <span wicket:id="navigator"/> > - <br/> > - </p> > </wicket:extend> > </body> > </html> > > http://git-wip-us.apache.org/repos/asf/wicket/blob/0f1e4ac2/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RenderPerformanceListener.java > ---------------------------------------------------------------------- > diff --git > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RenderPerformanceListener.java > > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RenderPerformanceListener.java > index b658ab7..f4fed53 100644 > --- > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RenderPerformanceListener.java > +++ > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RenderPerformanceListener.java > @@ -74,6 +74,8 @@ public class RenderPerformanceListener implements > IComponentInstantiationListene > */ > private static class RenderMeasuringBehavior extends Behavior > { > + private static final long serialVersionUID = 1L; > + > @Override > public void beforeRender(final Component component) > { > > http://git-wip-us.apache.org/repos/asf/wicket/blob/0f1e4ac2/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html > ---------------------------------------------------------------------- > diff --git > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html > > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html > index de497a0..7b3e6e7 100644 > --- > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html > +++ > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html > @@ -17,33 +17,24 @@ > --> > <html xmlns:wicket="http://wicket.apache.org";> > <head> > -<style type="text/css"> > -body {margin-left : 2em;font-family: 'Lucida Sans', 'Helvetica', > 'Sans-serif', 'sans';font-size: 9pt;line-height: 1.8em;} > -h1,h2,h3,h4,h5,h6,h7,h8 {color: #E9601A;font-size : -1;} > -pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica; > font-size : 10pt; line-height:1.2em;} > -h2 {font-size : 1.2em;} > -pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica; > font-size : 10pt; line-height:1.2em;} > -pre { border : 1px solid #ddd; margin-left : 2em; } > -.resource { color : blue; } > -.tablestyle { margin-left : 2em; border : 1px solid #bbb; } > -</style> > +<wicket:head> > <title>Requests Page</title> > +</wicket:head> > </head> > <body> > <wicket:extend> > - <p> > - <h1><img valign="center" border="0" wicket:id="bug" src="bug.png"/> Wicket > Sessions Inspector</h1> > + <h1><img border="0" wicket:id="bug" src="bug.png"/> Wicket Sessions > Inspector</h1> > <a href="javascript:history.go(-1)">Go Back</a> > > <h2>Session</h2> > <ul> > - Id: <span wicket:id="id">9999</span><br/> > - Session Size: <span wicket:id="size">none</span><br/> > - Session Info: <span wicket:id="sessionInfo"></span><br/> > - Start Date: <span wicket:id="startDate"></span><br/> > - Last Request Time: <span wicket:id="lastRequestTime"></span><br/> > - Number of Requests: <span wicket:id="numberOfRequests"></span><br/> > - Total Time Taken: <span wicket:id="totalTimeTaken"></span><br/> > + <li>Id: <span wicket:id="id">9999</span></li> > + <li>Session Size: <span wicket:id="size">none</span></li> > + <li>Session Info: <span wicket:id="sessionInfo"></span></li> > + <li>Start Date: <span wicket:id="startDate"></span></li> > + <li>Last Request Time: <span > wicket:id="lastRequestTime"></span></li> > + <li>Number of Requests: <span > wicket:id="numberOfRequests"></span></li> > + <li>Total Time Taken: <span > wicket:id="totalTimeTaken"></span></li> > </ul> > > <h2>Request Information</h2> > @@ -68,8 +59,6 @@ pre { border : 1px solid #ddd; margin-left : 2em; } > </tr> > </table> > <span wicket:id="navigator"/> > - <br/> > - </p> > </wicket:extend> > </body> > </html> > > http://git-wip-us.apache.org/repos/asf/wicket/blob/0f1e4ac2/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html > ---------------------------------------------------------------------- > diff --git > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html > > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html > index df0afb7..7a8e308 100644 > --- > a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html > +++ > b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.html > @@ -16,24 +16,14 @@ > limitations under the License. > --> > <html xmlns:wicket="http://wicket.apache.org";> > -<style type="text/css"> > -body {margin-left : 2em;font-family: 'Lucida Sans', 'Helvetica', > 'Sans-serif', 'sans';font-size: 9pt;line-height: 1.8em;} > -h1,h2,h3,h4,h5,h6,h7,h8 {color: #E9601A;font-size : -1;} > -pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica; > font-size : 10pt; line-height:1.2em;} > -h2 {font-size : 1.2em;} > -pre, table, td { font-family : 'MS Trebuchet', 'Verdana', Arial, Helvetica; > font-size : 10pt; line-height:1.2em;} > -pre { border : 1px solid #ddd; margin-left : 2em; } > -.resource { color : blue; } > -.tablestyle { margin-left : 2em; border : 1px solid #bbb; } > -</style> > <body> > <wicket:panel> > <h2>Session</h2> > <ul> > - Id: <span wicket:id="id">9999</span><br/> > - Locale: <span wicket:id="locale">en_US</span><br/> > - Style: <span wicket:id="style">none</span><br/> > - Session Size: <span wicket:id="size">none</span><br/> > + <li>Id: <span wicket:id="id">9999</span></li> > + <li>Locale: <span wicket:id="locale">en_US</span></li> > + <li>Style: : <span wicket:id="style">none</span></li> > + <li>Session Size: <span wicket:id="size">none</span></li> > </ul> > </wicket:panel> > </body> > -- Martin Grigorov jWeekend Training, Consulting, Development http://jWeekend.com
