You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/08/26 02:22:23 UTC
svn commit: r989411 - in
/wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils:
debugbar/InspectorDebugPanel.java debugbar/StandardDebugPanel.java
inspector/InspectorBug.java inspector/InspectorPage.java
Author: ivaynberg
Date: Thu Aug 26 00:22:23 2010
New Revision: 989411
URL: http://svn.apache.org/viewvc?rev=989411&view=rev
Log:
WICKET-2010
Modified:
wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java
wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
Modified: wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java?rev=989411&r1=989410&r2=989411&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java Thu Aug 26 00:22:23 2010
@@ -18,6 +18,7 @@ package org.apache.wicket.devutils.debug
import org.apache.wicket.Component;
import org.apache.wicket.Page;
+import org.apache.wicket.PageParameters;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.devutils.inspector.InspectorPage;
import org.apache.wicket.model.IModel;
@@ -59,4 +60,13 @@ public class InspectorDebugPanel extends
return new Model<String>("Inspector");
}
+ @Override
+ protected PageParameters getLinkPageParameters() {
+ PageParameters params = new PageParameters();
+ params.put("pageMap", getPage().getPageMap().getName());
+ params.put("pageId", getPage().getId());
+ params.put("version", getPage().getVersions()-1);
+ return params;
+ }
+
}
Modified: wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java?rev=989411&r1=989410&r2=989411&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java Thu Aug 26 00:22:23 2010
@@ -17,6 +17,7 @@
package org.apache.wicket.devutils.debugbar;
import org.apache.wicket.Page;
+import org.apache.wicket.PageParameters;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.devutils.DevUtilsPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -37,6 +38,11 @@ public abstract class StandardDebugPanel
public StandardDebugPanel(String id) {
super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
BookmarkablePageLink<Void> link = createLink("link");
add(link);
ResourceReference img = getImageResourceReference();
@@ -49,7 +55,7 @@ public abstract class StandardDebugPanel
}
protected BookmarkablePageLink<Void> createLink(String id) {
- return new BookmarkablePageLink<Void>(id, getLinkPageClass());
+ return new BookmarkablePageLink<Void>(id, getLinkPageClass(), getLinkPageParameters());
}
protected abstract IModel<String> getDataModel();
@@ -57,5 +63,9 @@ public abstract class StandardDebugPanel
protected abstract ResourceReference getImageResourceReference();
protected abstract Class<? extends Page> getLinkPageClass();
+
+ protected PageParameters getLinkPageParameters() {
+ return new PageParameters();
+ }
}
Modified: wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java?rev=989411&r1=989410&r2=989411&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorBug.java Thu Aug 26 00:22:23 2010
@@ -46,6 +46,7 @@ public final class InspectorBug extends
super(id);
PageParameters parameters = new PageParameters();
parameters.put("pageId", page.getId());
+ parameters.put("version", page.getVersions()-1);
Link<?> link = new BookmarkablePageLink<Void>("link", InspectorPage.class, parameters);
link.add(new Image("bug"));
add(link);
Modified: wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java?rev=989411&r1=989410&r2=989411&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java Thu Aug 26 00:22:23 2010
@@ -17,6 +17,7 @@
package org.apache.wicket.devutils.inspector;
import org.apache.wicket.Application;
+import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
import org.apache.wicket.ResourceReference;
import org.apache.wicket.Session;
@@ -27,54 +28,51 @@ import org.apache.wicket.markup.html.ima
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.session.pagemap.IPageMapEntry;
import org.apache.wicket.util.string.StringValueConversionException;
+import org.apache.wicket.util.string.Strings;
/**
- * A page that shows interesting attributes of the Wicket environment, including the current session
- * and the component tree for the current page.
+ * 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 InspectorPage extends DevUtilsPage
-{
- private static final long serialVersionUID = 1L;
+public final class InspectorPage extends DevUtilsPage {
+ private static final long serialVersionUID = 1L;
- /**
- * Constructor.
- *
- * @param parameters
- * The page id of any page to be analyzed
- */
- public InspectorPage(final PageParameters parameters)
- {
- add(new ApplicationView("application", Application.get()));
- add(new SessionView("session", Session.get()));
- IPageMapEntry entry = null;
- try
- {
- entry = Session.get().pageMapForName(
- parameters.getString("pageMap").equals("") ? null : parameters
- .getString("pageMap"), false).getEntry(parameters.getInt("pageId"));
- }
- catch (StringValueConversionException e)
- {
- // Ignore
- }
- catch (NullPointerException e)
- {
- // Ignore
- }
- add(new PageView("page", entry == null ? null : entry.getPage()));
- add(new Image("bug", new ResourceReference(InspectorPage.class, "bug.png")));
- add(new BookmarkablePageLink<Void>("allsessions", LiveSessionsPage.class));
- add(new Label("wicketVersion", getApplication().getFrameworkSettings().getVersion()));
- }
+ /**
+ * Constructor.
+ *
+ * @param parameters
+ * The page id of any page to be analyzed
+ */
+ public InspectorPage(final PageParameters parameters) {
+ add(new ApplicationView("application", Application.get()));
+ add(new SessionView("session", Session.get()));
+ Page page=null;
+ try {
+ int pageId = parameters.getInt("pageId");
+ int version=parameters.getInt("version");
- /**
- * @see org.apache.wicket.Component#isVersioned()
- */
- @Override
- public boolean isVersioned()
- {
- return false;
- }
+ page=Session.get().getPage(pageId, version);
+ } catch (StringValueConversionException e) {
+ // Ignore
+ } catch (NullPointerException e) {
+ // Ignore
+ }
+ add(new PageView("page", page));
+ add(new Image("bug", new ResourceReference(InspectorPage.class,
+ "bug.png")));
+ add(new BookmarkablePageLink<Void>("allsessions",
+ LiveSessionsPage.class));
+ add(new Label("wicketVersion", getApplication().getFrameworkSettings()
+ .getVersion()));
+ }
+
+ /**
+ * @see org.apache.wicket.Component#isVersioned()
+ */
+ @Override
+ public boolean isVersioned() {
+ return false;
+ }
}