From a171be5fa2de58cc0def99e1bf010aaf21d47f79 Mon Sep 17 00:00:00 2001 From: Bertrand Guay-Paquet Date: Thu, 16 Aug 2012 15:58:19 -0400 Subject: [PATCH] Cleanup devutils pages and panels --- .../wicket/protocol/http/IRequestLogger.java | 4 +- .../apache/wicket/devutils/DevUtilsPage.html | 54 ++++++++++++++++++- .../devutils/inspector/ApplicationView.html | 26 +++------ .../devutils/inspector/InspectorBug.html | 24 --------- .../devutils/inspector/InspectorBug.java | 53 ------------------ .../devutils/inspector/InspectorPage.html | 15 +----- .../devutils/inspector/LiveSessionsPage.html | 19 ++----- .../inspector/RenderPerformanceListener.java | 2 + .../devutils/inspector/RequestsPage.html | 31 ++++------- .../devutils/inspector/SessionView.html | 18 ++----- 10 files changed, 83 insertions(+), 163 deletions(-) delete mode 100644 wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.html delete mode 100644 wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.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 88e91f84e86..6039ba97a0e 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.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 long getSessionSize() } /** - * @return Returns the total time this session has spent. + * @return Returns the total time this session has spent in ms. */ public long getTotalTimeTaken() { 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 cc44f85ab4e..da7add2ff5d 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 @@ --> - DevUtilsPage.html +DevUtilsPage.html + +Requests Page
- + +
+
\ No newline at end of file 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 6b249d2f4ad..acb641cc01b 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. --> -

Application

    - Name: 9999
    - Resource Poll Frequency: 9999
    - Component Use Check: 9999
    - Buffer Response: 9999
    - Version Pages: 9999
    - Compress Whitespace: 9999
    - Strip Comments: 9999
    - Strip Wicket Tags: 9999
    +
  • Name: 9999
    • +
  • Resource Poll Frequency: 9999
    • +
  • Component Use Check: 9999
    • +
  • Buffer Response: 9999
    • +
  • Version Pages: 9999
    • +
  • Compress Whitespace: 9999
    • +
  • Strip Comments: 9999
    • +
  • Strip Wicket Tags: 9999
 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 aae2fad968d..00000000000 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - 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 6790252719d..00000000000 --- 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("link", InspectorPage.class, parameters); - link.add(new NonCachingImage("bug")); - add(link); - } -} 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 36797fe6f8a..d90d067ddb8 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 @@ - Inspector Bug -

-

Wicket Inspector (Wicket Version: 1.2)

+

Wicket Inspector (Wicket Version: 1.2)

Go Back
All Sessions Application view here Session view here Page view here -

-
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 258f57340a6..f7adf7ad0f2 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 @@ --> - + Live Sessions Page + -

-

Wicket Sessions Inspector

+

Wicket Sessions Inspector

Go Back Application view here @@ -50,7 +41,7 @@

Session Information @@ -62,8 +53,6 @@

Session Information -
-

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 b658ab72907..f4fed539e3e 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 @@ protected boolean accepts(final Component component) */ private static class RenderMeasuringBehavior extends Behavior { + private static final long serialVersionUID = 1L; + @Override public void beforeRender(final Component component) { 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 de497a05be1..7b3e6e72734 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 @@ --> - + Requests Page + -

-

Wicket Sessions Inspector

+

Wicket Sessions Inspector

Go Back

Session

    - Id: 9999
    - Session Size: none
    - Session Info:
    - Start Date:
    - Last Request Time:
    - Number of Requests:
    - Total Time Taken:
    +
  • Id: 9999
    • +
  • Session Size: none
    • +
  • Session Info:
    • +
  • Start Date:
    • +
  • Last Request Time:
    • +
  • Number of Requests:
    • +
  • Total Time Taken:

Request Information

@@ -68,8 +59,6 @@

Request Information

-
-

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 df0afb71b7f..7a8e3087537 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. --> -

Session

    - Id: 9999
    - Locale: en_US
    - Style: none
    - Session Size: none
    +
  • Id: 9999
    • +
  • Locale: en_US
    • +
  • Style: : none
    • +
  • Session Size: none