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 2014/03/06 09:33:28 UTC
[11/19] git commit: Make inner classes static where possible
Make inner classes static where possible
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d84c3371
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d84c3371
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d84c3371
Branch: refs/heads/master
Commit: d84c3371f682b1999c81677091a906b92605d837
Parents: e48853d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:11:04 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:11:04 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/devutils/inspector/EnhancedPageView.java | 2 +-
.../wicket/extensions/requestlogger/JsonRequestLogger.java | 4 ++--
.../main/java/org/apache/wicket/guice/GuiceInjectorHolder.java | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d84c3371/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
index 6398ce6..0687f75 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
@@ -361,7 +361,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
* Tree node representing either a <code>Page</code>, a <code>Component</code> or a
* <code>Behavior</code>
*/
- private class TreeNode
+ private static class TreeNode
{
public IClusterable node;
public TreeNode parent;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d84c3371/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java
index 3188794..5e3ce4a 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/requestlogger/JsonRequestLogger.java
@@ -57,7 +57,7 @@ public class JsonRequestLogger extends AbstractRequestLogger
* Specify that the 'default' filter should be used for serialization. This filter will prevent
* jackson from serializing the request handlers.
*/
- private final class FilteredIntrospector extends JacksonAnnotationIntrospector
+ private static final class FilteredIntrospector extends JacksonAnnotationIntrospector
{
@Override
public Object findFilterId(AnnotatedClass ac)
@@ -69,7 +69,7 @@ public class JsonRequestLogger extends AbstractRequestLogger
/**
* A simple tuple for request and session.
*/
- private final class RequestSessionTuple implements Serializable
+ private static final class RequestSessionTuple implements Serializable
{
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/wicket/blob/d84c3371/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
----------------------------------------------------------------------
diff --git a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
index 1f9d2e3..a7c3873 100644
--- a/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
+++ b/wicket-guice/src/main/java/org/apache/wicket/guice/GuiceInjectorHolder.java
@@ -34,11 +34,9 @@ public class GuiceInjectorHolder implements IClusterable
/**
* Metadata key used to store Injector holder in application's metadata
*/
- public static MetaDataKey<GuiceInjectorHolder> INJECTOR_KEY = new MetaDataKey<GuiceInjectorHolder>()
+ public static final MetaDataKey<GuiceInjectorHolder> INJECTOR_KEY = new MetaDataKey<GuiceInjectorHolder>()
{
-
private static final long serialVersionUID = 1L;
-
};
private final Injector injector;