This is an automated email from the ASF dual-hosted git repository. svenmeier pushed a commit to branch WICKET-6563 in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 2f89600dc6bfec6c36698b0cb422b3b43e18d296 Author: Sven Meier <[email protected]> AuthorDate: Thu Jan 17 00:12:40 2019 +0100 WICKET-6563 applied review comments --- .../apache/wicket/pageStore/disk/NestedFolders.java | 6 +++--- .../devutils/debugbar/InspectorDebugPanel.java | 20 ++------------------ .../wicket/devutils/diskstore/PageStorePage.html | 10 ++++++---- .../wicket/devutils/diskstore/PageStorePage.java | 9 +++++++-- .../main/java/org/apache/wicket/util/file/Files.java | 14 ++++++++++++++ 5 files changed, 32 insertions(+), 27 deletions(-) diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java index a47b414..6fe5954 100644 --- a/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java +++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/disk/NestedFolders.java @@ -114,9 +114,9 @@ public class NestedFolders Set<File> files = new HashSet<>(); if (base.exists()) { - for (File low : base.listFiles()) { - for (File high: low.listFiles()) { - for (File file : high.listFiles()) { + for (File low : Files.list(base)) { + for (File high: Files.list(low)) { + for (File file : Files.list(high)) { files.add(file); } } diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java index 4de5cd4..33a0705 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java @@ -18,13 +18,12 @@ package org.apache.wicket.devutils.debugbar; import org.apache.wicket.Component; import org.apache.wicket.Page; -import org.apache.wicket.core.util.lang.WicketObjects; import org.apache.wicket.devutils.inspector.InspectorPage; import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; -import org.apache.wicket.util.lang.Bytes; /** * A panel that adds a link to the inspector to the debug bar. @@ -74,22 +73,7 @@ public class InspectorDebugPanel extends StandardDebugPanel @Override protected IModel<String> getDataModel() { - return new IModel<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; - } - }; + return new Model<>("Inspector"); } @Override diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/PageStorePage.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/PageStorePage.html index bf62ef7..32e202f 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/PageStorePage.html +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/PageStorePage.html @@ -23,9 +23,11 @@ </head> <body> - - <div wicket:id="persisted"></div> - + <wicket:extend> + <h1><img border="0" wicket:id="bug" src="bug.png"/> Wicket Persisted pages Inspector</h1> + <a href="javascript:history.go(-1)">Go Back</a> + + <div wicket:id="persisted"></div> + </wicket:extend> </body> - </html> \ No newline at end of file diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/PageStorePage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/PageStorePage.java index 6a0d6c7..d1e285c 100644 --- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/PageStorePage.java +++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/PageStorePage.java @@ -17,17 +17,20 @@ package org.apache.wicket.devutils.diskstore; import org.apache.wicket.Session; +import org.apache.wicket.devutils.DevUtilsPage; import org.apache.wicket.devutils.diskstore.browser.PersistedPanel; -import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.devutils.inspector.InspectorPage; +import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.pageStore.DelegatingPageStore; import org.apache.wicket.pageStore.IPageStore; import org.apache.wicket.pageStore.IPersistentPageStore; import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.request.resource.PackageResourceReference; /** * A page that shows the attributes (id, name, size) of the pages stored in the data stores. */ -public class PageStorePage extends WebPage +public class PageStorePage extends DevUtilsPage { /** @@ -40,6 +43,8 @@ public class PageStorePage extends WebPage { super(parameters); + add(new Image("bug", new PackageResourceReference(InspectorPage.class, "bug.png"))); + add(new PersistedPanel("persisted", PageStorePage::getPersistentPageStore)); } diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java b/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java index ca61c6f..8091dd8 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java @@ -461,4 +461,18 @@ public class Files logger.error("Failed to create directory: " + folder); return false; } + + /** + * List all files inside the given file. + * + * @param file directory + * @return files, never {@code null} + */ + public static File[] list(File file) { + File[] files = file.listFiles(); + if (files == null) { + files = new File[0]; + } + return files; + } }
