Java 7 diamonds for wicket-auth-roles
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cf2c3af7 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cf2c3af7 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cf2c3af7 Branch: refs/heads/master Commit: cf2c3af7348dd9e8726656d66e77cccb27a5d47c Parents: 6510f10 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Jun 21 15:01:16 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Jun 21 15:47:38 2013 +0200 ---------------------------------------------------------------------- .../wicket/authroles/authentication/panel/SignInPanel.java | 4 ++-- .../strategies/role/metadata/ActionPermissions.java | 2 +- .../strategies/role/metadata/InstantiationPermissions.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/cf2c3af7/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java index 14a3e18..78ee0a1 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authentication/panel/SignInPanel.java @@ -284,10 +284,10 @@ public class SignInPanel extends Panel { super(id); - setModel(new CompoundPropertyModel<SignInPanel>(SignInPanel.this)); + setModel(new CompoundPropertyModel<>(SignInPanel.this)); // Attach textfields for username and password - add(new TextField<String>("username")); + add(new TextField<>("username")); add(new PasswordTextField("password")); // MarkupContainer row for remember me checkbox http://git-wip-us.apache.org/repos/asf/wicket/blob/cf2c3af7/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissions.java ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissions.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissions.java index 6393b1e..45fabb1 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissions.java +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/ActionPermissions.java @@ -37,7 +37,7 @@ public final class ActionPermissions implements IClusterable private static final long serialVersionUID = 1L; /** Map from an action to a set of role strings */ - private final Map<Action, Roles> rolesForAction = new HashMap<Action, Roles>(); + private final Map<Action, Roles> rolesForAction = new HashMap<>(); /** * Gives permission for the given roles to perform the given action http://git-wip-us.apache.org/repos/asf/wicket/blob/cf2c3af7/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissions.java ---------------------------------------------------------------------- diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissions.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissions.java index 47c2082..d449090 100644 --- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissions.java +++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissions.java @@ -39,7 +39,7 @@ public class InstantiationPermissions implements IClusterable private static final long serialVersionUID = 1L; /** Holds roles objects for component classes */ - private final Map<Class<? extends Component>, Roles> rolesForComponentClass = new HashMap<Class<? extends Component>, Roles>(); + private final Map<Class<? extends Component>, Roles> rolesForComponentClass = new HashMap<>(); /** * Gives the given role permission to instantiate the given class.
