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 2011/03/31 17:12:15 UTC

svn commit: r1087334 - in /wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils: debugbar/ inspector/

Author: mgrigorov
Date: Thu Mar 31 15:12:14 2011
New Revision: 1087334

URL: http://svn.apache.org/viewvc?rev=1087334&view=rev
Log:
WICKET-3582 SessionTotalSizeModel in devutils has no meaning in 1.5

Remove SessionTotalSizeModel and introduce PageSizeDebugPanel.


Added:
    wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java
Removed:
    wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionTotalSizeModel.java
Modified:
    wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.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/inspector/SessionView.java

Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java?rev=1087334&r1=1087333&r2=1087334&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java (original)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/DebugBarInitializer.java Thu Mar 31 15:12:14 2011
@@ -35,6 +35,7 @@ public class DebugBarInitializer impleme
 		DebugBar.registerContributor(VersionDebugContributor.DEBUG_BAR_CONTRIB, application);
 		DebugBar.registerContributor(InspectorDebugPanel.DEBUG_BAR_CONTRIB, application);
 		DebugBar.registerContributor(SessionSizeDebugPanel.DEBUG_BAR_CONTRIB, application);
+		DebugBar.registerContributor(PageSizeDebugPanel.DEBUG_BAR_CONTRIB, application);
 	}
 
 	@Override

Added: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java?rev=1087334&view=auto
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java (added)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/PageSizeDebugPanel.java Thu Mar 31 15:12:14 2011
@@ -0,0 +1,104 @@
+/*
+ * 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.debugbar;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.Page;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.resource.PackageResourceReference;
+import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.util.lang.Bytes;
+import org.apache.wicket.util.lang.WicketObjects;
+
+/**
+ * A panel for the debug bar that shows the size of the currently shown page.
+ * <p>
+ * <strong>Note</strong>: this size includes the size of the debug bar itself too!
+ */
+public class PageSizeDebugPanel extends StandardDebugPanel
+{
+	private static final long serialVersionUID = 1L;
+
+	/** */
+	public static final IDebugBarContributor DEBUG_BAR_CONTRIB = new IDebugBarContributor()
+	{
+		private static final long serialVersionUID = 1L;
+
+		public Component createComponent(final String id, final DebugBar debugBar)
+		{
+			return new PageSizeDebugPanel(id);
+		}
+
+	};
+
+	/**
+	 * Construct.
+	 * 
+	 * @param id
+	 */
+	public PageSizeDebugPanel(final String id)
+	{
+		super(id);
+	}
+
+	@Override
+	protected Class<? extends Page> getLinkPageClass()
+	{
+		// not used
+		return WebPage.class;
+	}
+
+	// Disable the link because there is no page with more detailed information
+	@Override
+	protected BookmarkablePageLink<Void> createLink(final String id)
+	{
+		BookmarkablePageLink<Void> bookmarkablePageLink = super.createLink(id);
+		bookmarkablePageLink.setEnabled(false);
+		return bookmarkablePageLink;
+	}
+
+	@Override
+	protected ResourceReference getImageResourceReference()
+	{
+		// TODO: need better image for this:
+		return new PackageResourceReference(SessionSizeDebugPanel.class, "harddrive.png");
+	}
+
+	@Override
+	protected IModel<String> getDataModel()
+	{
+		return new AbstractReadOnlyModel<String>()
+		{
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public String getObject()
+			{
+				Page enclosingPage = getPage();
+				long pageSize = WicketObjects.sizeof(enclosingPage);
+				Bytes pageSizeInBytes = (pageSize > -1 ? Bytes.bytes(pageSize) : null);
+				String pageSizeAsString = pageSizeInBytes != null ? pageSizeInBytes.toString()
+					: "unknown";
+
+				return "Page: " + pageSizeAsString;
+			}
+		};
+	}
+}

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=1087334&r1=1087333&r2=1087334&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 Thu Mar 31 15:12:14 2011
@@ -21,7 +21,6 @@ import org.apache.wicket.Page;
 import org.apache.wicket.Session;
 import org.apache.wicket.devutils.inspector.LiveSessionsPage;
 import org.apache.wicket.devutils.inspector.SessionSizeModel;
-import org.apache.wicket.devutils.inspector.SessionTotalSizeModel;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.request.resource.PackageResourceReference;
@@ -81,7 +80,6 @@ public class SessionSizeDebugPanel exten
 			private static final long serialVersionUID = 1L;
 
 			private final IModel<Bytes> size = new SessionSizeModel(Session.get());
-			private final IModel<Bytes> totalSize = new SessionTotalSizeModel(Session.get());
 
 			@Override
 			public String getObject()
@@ -90,11 +88,7 @@ public class SessionSizeDebugPanel exten
 				String sessionSizeAsString = sessionSizeInBytes != null
 					? sessionSizeInBytes.toString() : "unknown";
 
-				Bytes totalSizeInBytes = totalSize.getObject();
-				String totalSizeAsString = totalSizeInBytes != null ? totalSizeInBytes.toString()
-					: "unknown";
-
-				return sessionSizeAsString + " / " + totalSizeAsString;
+				return "Session: " + sessionSizeAsString;
 			}
 
 			@Override
@@ -102,7 +96,6 @@ public class SessionSizeDebugPanel exten
 			{
 				super.detach();
 				size.detach();
-				totalSize.detach();
 			}
 		};
 	}

Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java?rev=1087334&r1=1087333&r2=1087334&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java (original)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionView.java Thu Mar 31 15:12:14 2011
@@ -47,7 +47,6 @@ public final class SessionView extends D
 		add(new Label("locale", session.getLocale().toString()));
 		add(new Label("style", session.getStyle() == null ? "[None]" : session.getStyle()));
 		add(new Label("size", new SessionSizeModel(session)));
-		add(new Label("totalSize", new SessionTotalSizeModel(session)));
 	}
 
 }