directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-commander git commit: FC-105 - Replace with <>
Date Fri, 29 May 2015 01:30:47 GMT
Repository: directory-fortress-commander
Updated Branches:
  refs/heads/master fe719b1bb -> fa8e0470f


FC-105 - Replace with <>


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/fa8e0470
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/fa8e0470
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/fa8e0470

Branch: refs/heads/master
Commit: fa8e0470f917e4b7dbb8e1ae31ba4c385864b276
Parents: fe719b1
Author: Shawn McKinney <smckinney@apache.org>
Authored: Thu May 28 20:30:39 2015 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Thu May 28 20:30:39 2015 -0500

----------------------------------------------------------------------
 .../directory/fortress/web/ContextMenuPage.java |  4 +--
 .../directory/fortress/web/ErrorPage.java       |  8 ++---
 .../directory/fortress/web/SdDynamicPage.java   |  1 -
 .../fortress/web/model/AuditAuthzListModel.java |  4 +--
 .../web/panel/AuditAuthzDetailPanel.java        |  6 ++--
 .../fortress/web/panel/AuditAuthzListPanel.java | 16 ++++-----
 .../web/panel/AuditBindDetailPanel.java         |  6 ++--
 .../fortress/web/panel/AuditBindListPanel.java  |  2 ++
 .../fortress/web/panel/AuditModDetailPanel.java | 18 +++++-----
 .../fortress/web/panel/AuditModListPanel.java   | 10 +++---
 .../fortress/web/panel/ConstraintBasePanel.java |  2 +-
 .../fortress/web/panel/GroupDetailPanel.java    | 20 +++++------
 .../fortress/web/panel/GroupListPanel.java      |  6 ++--
 .../fortress/web/panel/OUDetailPanel.java       | 22 ++++++------
 .../fortress/web/panel/OUListPanel.java         | 11 +++---
 .../fortress/web/panel/ObjectDetailPanel.java   |  2 +-
 .../fortress/web/panel/ObjectListPanel.java     |  8 ++---
 .../fortress/web/panel/PermDetailPanel.java     | 18 +++++-----
 .../fortress/web/panel/PermListPanel.java       |  2 +-
 .../fortress/web/panel/PwPolicyDetailPanel.java | 28 +++++++--------
 .../fortress/web/panel/PwPolicyListPanel.java   |  3 +-
 .../web/panel/RoleAdminDetailPanel.java         |  8 ++---
 .../fortress/web/panel/RoleDetailPanel.java     | 24 ++++++-------
 .../fortress/web/panel/RoleListPanel.java       | 22 ++++++------
 .../web/panel/RoleSearchModalPanel.java         |  2 +-
 .../fortress/web/panel/SDDetailPanel.java       | 18 +++++-----
 .../fortress/web/panel/SDListPanel.java         | 10 +++---
 .../fortress/web/panel/UserDetailPanel.java     | 38 ++++++++++----------
 .../fortress/web/panel/UserListPanel.java       | 14 +++-----
 29 files changed, 164 insertions(+), 169 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/ContextMenuPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/ContextMenuPage.java b/src/main/java/org/apache/directory/fortress/web/ContextMenuPage.java
index 03b5f69..a7dcd33 100644
--- a/src/main/java/org/apache/directory/fortress/web/ContextMenuPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/ContextMenuPage.java
@@ -82,7 +82,7 @@ public class ContextMenuPage extends FortressWebBasePage
 
     private List<IMenuItem> newMenuList()
     {
-        List<IMenuItem> list = new ArrayList<IMenuItem>();
+        List<IMenuItem> list = new ArrayList<>();
 
         list.add( new MenuItem( "Item with icon", JQueryIcon.FLAG ) );
         list.add( new MenuItem( "Change the title" )
@@ -116,7 +116,7 @@ public class ContextMenuPage extends FortressWebBasePage
 
     private List<IMenuItem> newSubMenuList()
     {
-        List<IMenuItem> list = new ArrayList<IMenuItem>();
+        List<IMenuItem> list = new ArrayList<>();
 
         list.add( new MenuItem( "Sub-menu #1" ) );
         list.add( new MenuItem( "Sub-menu #2" ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/ErrorPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/ErrorPage.java b/src/main/java/org/apache/directory/fortress/web/ErrorPage.java
index 99e611a..5af54ae 100644
--- a/src/main/java/org/apache/directory/fortress/web/ErrorPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/ErrorPage.java
@@ -36,16 +36,16 @@ public class ErrorPage extends FortressWebBasePage
 
     public ErrorPage( Exception e )
     {
-        add( new Label( "title", new Model<String>( "Runtime Exception Occurred" ) ) );
-        add( new Label( "message", new Model<String>( e.getLocalizedMessage() ) ) );
+        add( new Label( "title", new Model<>( "Runtime Exception Occurred" ) ) );
+        add( new Label( "message", new Model<>( e.getLocalizedMessage() ) ) );
         add( new BookmarkablePageLink( "homePage", getApplication().getHomePage() ) );
     }
 
     @Deprecated
     public ErrorPage( final PageParameters parameters )
     {
-        add( new Label( "title", new Model<String>( parameters.get( "title" ).toString() ) ) );
-        add( new Label( "message", new Model<String>( parameters.get( "message" ).toString() ) ) );
+        add( new Label( "title", new Model<>( parameters.get( "title" ).toString() ) ) );
+        add( new Label( "message", new Model<>( parameters.get( "message" ).toString() ) ) );
         add( new BookmarkablePageLink( "homePage", getApplication().getHomePage() ) );
     }
 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java b/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java
index 1c09e82..60266e1 100644
--- a/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java
@@ -42,7 +42,6 @@ public class SdDynamicPage extends FortressWebBasePage
     /** Default serialVersionUID */
     private static final long serialVersionUID = 1L;
     private boolean isStatic = false;
-    ;
 
 
     public SdDynamicPage( PageParameters parameters )

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/model/AuditAuthzListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/AuditAuthzListModel.java b/src/main/java/org/apache/directory/fortress/web/model/AuditAuthzListModel.java
index bd73b66..2f4094b 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/AuditAuthzListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/AuditAuthzListModel.java
@@ -109,7 +109,7 @@ public class AuditAuthzListModel extends Model<SerializableList<AuthZ>>
 
         {
             LOG.debug( ".getObject null" );
-            authZs = new SerializableList<AuthZ>( new ArrayList<AuthZ>() );
+            authZs = new SerializableList<>( new ArrayList<AuthZ>() );
         }
         else
         {
@@ -129,7 +129,7 @@ public class AuditAuthzListModel extends Model<SerializableList<AuthZ>>
                 userAudit.setDn( permission.getDn() );
             }
             
-            authZs = new SerializableList<AuthZ>( getList( userAudit ) );
+            authZs = new SerializableList<>( getList( userAudit ) );
             userAudit.setDn( "" );
         }
         

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzDetailPanel.java
index 65f8d63..01e3938 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzDetailPanel.java
@@ -70,7 +70,7 @@ public class AuditAuthzDetailPanel extends FormComponentPanel
         super( id );
         this.auditMgr.setAdmin( SecUtils.getSession( this ) );
         this.reviewMgr.setAdmin( SecUtils.getSession( this ) );
-        this.detailForm = new AuditAuthzDetailForm( GlobalIds.DETAIL_FIELDS, new CompoundPropertyModel<AuthZ>(
+        this.detailForm = new AuditAuthzDetailForm( GlobalIds.DETAIL_FIELDS, new CompoundPropertyModel<>(
             new AuthZ() ) );
         this.display = display;
         add( detailForm );
@@ -91,7 +91,7 @@ public class AuditAuthzDetailPanel extends FormComponentPanel
             add( new Label( GlobalIds.REQ_ATTR ) );
             add( new Label( GlobalIds.REQ_ATTRS_ONLY ) );
             add( new Label( GlobalIds.REQ_DEREF_ALIASES ) );
-            userPanel = new UserAuditDetailPanel( GlobalIds.USERAUDITDETAILPANEL, new CompoundPropertyModel<User>(
+            userPanel = new UserAuditDetailPanel( GlobalIds.USERAUDITDETAILPANEL, new CompoundPropertyModel<>(
                 new User() ) );
             add( userPanel );
             setOutputMarkupId( true );
@@ -144,7 +144,7 @@ public class AuditAuthzDetailPanel extends FormComponentPanel
                 {
                     user = new User();
                 }
-                IModel<User> userModel = new CompoundPropertyModel<User>( user );
+                IModel<User> userModel = new CompoundPropertyModel<>( user );
                 userPanel.setDefaultModel( userModel );
             }
             else

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
index c5ec460..57a99d2 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
@@ -99,7 +99,7 @@ public class AuditAuthzListPanel extends FormComponentPanel
         createAndLoadGrid();
         this.listForm = new Form( "authzform" );
         this.listForm.addOrReplace( grid );
-        this.listForm.setModel( new CompoundPropertyModel<UserAudit>( userAudit ) );
+        this.listForm.setModel( new CompoundPropertyModel<>( userAudit ) );
         addEditFields();
         addButtons();
         add( this.listForm );
@@ -338,33 +338,33 @@ public class AuditAuthzListPanel extends FormComponentPanel
     private void createAndLoadGrid()
     {
         List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
-            new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
-        PropertyColumn reqStart = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+            new ArrayList<>();
+        PropertyColumn reqStart = new PropertyColumn<>(
             Model.of( "Timestamp" ), "userObject.reqStart" );
         reqStart.setInitialSize( 200 );
         columns.add( reqStart );
 
-        PropertyColumn requAuthzId = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn requAuthzId = new PropertyColumn<>(
             Model.of( "User ID" ), "userObject.reqAuthzID" );
         requAuthzId.setInitialSize( 200 );
         columns.add( requAuthzId );
 
-        PropertyColumn reqAttr = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn reqAttr = new PropertyColumn<>(
             Model.of( "Object Name" ), "userObject.reqAttr" );
         reqAttr.setInitialSize( 300 );
         columns.add( reqAttr );
 
-        PropertyColumn reqDerefAliases = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn reqDerefAliases = new PropertyColumn<>(
             Model.of( "Object ID" ), "userObject.reqDerefAliases" );
         reqDerefAliases.setInitialSize( 100 );
         columns.add( reqDerefAliases );
 
-        PropertyColumn reqAttrsOnly = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn reqAttrsOnly = new PropertyColumn<>(
             Model.of( "Operation" ), "userObject.reqAttrsOnly" );
         reqAttrsOnly.setInitialSize( 120 );
         columns.add( reqAttrsOnly );
 
-        PropertyColumn reqResult = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn reqResult = new PropertyColumn<>(
             Model.of( "Result" ), "userObject.reqResult" );
         reqResult.setInitialSize( 80 );
         columns.add( reqResult );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/AuditBindDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditBindDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditBindDetailPanel.java
index 73b1df4..a45856b 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditBindDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditBindDetailPanel.java
@@ -71,7 +71,7 @@ public class AuditBindDetailPanel extends FormComponentPanel
         this.auditMgr.setAdmin( SecUtils.getSession( this ) );
         this.reviewMgr.setAdmin( SecUtils.getSession( this ) );
         this.detailForm = new AuditBindDetailForm( GlobalIds.DETAIL_FIELDS,
-            new CompoundPropertyModel<Bind>( new Bind() ) );
+            new CompoundPropertyModel<>( new Bind() ) );
         this.display = display;
         add( detailForm );
     }
@@ -89,7 +89,7 @@ public class AuditBindDetailPanel extends FormComponentPanel
             add( new Label( GlobalIds.REQ_DN ) );
             add( new Label( GlobalIds.REQ_RESULT ) );
             add( new Label( GlobalIds.REQ_START ) );
-            userPanel = new UserAuditDetailPanel( GlobalIds.USERAUDITDETAILPANEL, new CompoundPropertyModel<User>(
+            userPanel = new UserAuditDetailPanel( GlobalIds.USERAUDITDETAILPANEL, new CompoundPropertyModel<>(
                 new User() ) );
             add( userPanel );
             setOutputMarkupId( true );
@@ -141,7 +141,7 @@ public class AuditBindDetailPanel extends FormComponentPanel
                 {
                     user = new User();
                 }
-                IModel<User> userModel = new CompoundPropertyModel<User>( user );
+                IModel<User> userModel = new CompoundPropertyModel<>( user );
                 userPanel.setDefaultModel( userModel );
             }
             else

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/AuditBindListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditBindListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditBindListPanel.java
index 046c212..63b48bf 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditBindListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditBindListPanel.java
@@ -91,6 +91,7 @@ public class AuditBindListPanel extends FormComponentPanel
     }
 
 
+    @SuppressWarnings( "Convert2Diamond" )
     private void init( UserAudit userAudit )
     {
         IModel<SerializableList<Bind>> pageModel = new AuditBindListModel( userAudit, SecUtils.getSession( this ) );
@@ -274,6 +275,7 @@ public class AuditBindListPanel extends FormComponentPanel
     }
 
 
+    @SuppressWarnings( "Convert2Diamond" )
     private void createAndLoadGrid()
     {
         List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
index b26efd7..0f4a5c6 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
@@ -83,7 +83,7 @@ public class AuditModDetailPanel extends FormComponentPanel
         super( id );
         this.auditMgr.setAdmin( SecUtils.getSession( this ) );
         this.reviewMgr.setAdmin( SecUtils.getSession( this ) );
-        this.detailForm = new AuditAuthzDetailForm( GlobalIds.DETAIL_FIELDS, new CompoundPropertyModel<Mod>( new Mod() ) );
+        this.detailForm = new AuditAuthzDetailForm( GlobalIds.DETAIL_FIELDS, new CompoundPropertyModel<>( new Mod() ) );
         this.display = display;
         add( detailForm );
     }
@@ -115,13 +115,13 @@ public class AuditModDetailPanel extends FormComponentPanel
             options.set( "pageable", "{ pageSizes: [ 5, 10, 15, 20 ] }" );
             //table2 = new DataTable("modstable", columns, createDataProvider( null ), ROWS, options);
 
-            table = new DataTable<RequestMod>( "modstable", columns, createDataProvider( null ), ROWS, options );
+            table = new DataTable<>( "modstable", columns, createDataProvider( null ), ROWS, options );
             table.setOutputMarkupId( true );
             add( table );
             add( new Label( "reqType" ) );
             add( new Label( GlobalIds.REQ_DN ) );
             add( new Label( GlobalIds.REQ_START ) );
-            userPanel = new UserAuditDetailPanel( GlobalIds.USERAUDITDETAILPANEL, new CompoundPropertyModel<User>(
+            userPanel = new UserAuditDetailPanel( GlobalIds.USERAUDITDETAILPANEL, new CompoundPropertyModel<>(
                 new User()
                 ) );
             add( userPanel );
@@ -140,7 +140,7 @@ public class AuditModDetailPanel extends FormComponentPanel
                 String msg = "Mod: " + mod.getReqAuthzID() + " has been selected";
                 LOG.debug( ".onEvent SelectModelEvent: " + mod.getReqAuthzID() );
                 List<RequestMod> modifications = parseRequestMods( mod.getReqMod() );
-                table = new DataTable<RequestMod>( "modstable", columns, createDataProvider( modifications ), ROWS,
+                table = new DataTable<>( "modstable", columns, createDataProvider( modifications ), ROWS,
                     options );
                 User user = null;
                 // necessary to push the 'changed' model down into the aggregated panel:
@@ -169,7 +169,7 @@ public class AuditModDetailPanel extends FormComponentPanel
                 {
                     user = new User();
                 }
-                IModel<User> userModel = new CompoundPropertyModel<User>( user );
+                IModel<User> userModel = new CompoundPropertyModel<>( user );
                 userPanel.setDefaultModel( userModel );
 
                 addOrReplace( table );
@@ -193,7 +193,7 @@ public class AuditModDetailPanel extends FormComponentPanel
 
         private List<RequestMod> parseRequestMods( List<String> mods )
         {
-            List<RequestMod> results = new ArrayList<RequestMod>();
+            List<RequestMod> results = new ArrayList<>();
             if ( VUtil.isNotNullOrEmpty( mods ) )
             {
                 Mod mod = ( Mod ) detailForm.getModelObject();
@@ -245,11 +245,11 @@ public class AuditModDetailPanel extends FormComponentPanel
         ListDataProvider<RequestMod> results;
         if ( VUtil.isNotNullOrEmpty( mods ) )
         {
-            results = new ListDataProvider<RequestMod>( mods );
+            results = new ListDataProvider<>( mods );
         }
         else
         {
-            results = new ListDataProvider<RequestMod>( new ArrayList<RequestMod>() );
+            results = new ListDataProvider<>( new ArrayList<RequestMod>() );
         }
         return results;
     }
@@ -257,7 +257,7 @@ public class AuditModDetailPanel extends FormComponentPanel
 
     private List<IColumn> newColumnList()
     {
-        List<IColumn> columns = new ArrayList<IColumn>();
+        List<IColumn> columns = new ArrayList<>();
         columns.add( new PropertyColumn( "#", "index", 30 ) );
         columns.add( new PropertyColumn( "Op", "type", 50 ) );
         columns.add( new PropertyColumn( "Name", "name", 80 ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/AuditModListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditModListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditModListPanel.java
index c7c93ca..23c9c01 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditModListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditModListPanel.java
@@ -101,7 +101,7 @@ public class AuditModListPanel extends FormComponentPanel
         createAndLoadGrid();
         this.listForm = new Form( "modform" );
         this.listForm.addOrReplace( grid );
-        this.listForm.setModel( new CompoundPropertyModel<UserAudit>( userAudit ) );
+        this.listForm.setModel( new CompoundPropertyModel<>( userAudit ) );
         addFormFields();
         addButtons();
         add( this.listForm );
@@ -300,17 +300,17 @@ public class AuditModListPanel extends FormComponentPanel
     private void createAndLoadGrid()
     {
         List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
-            new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
-        PropertyColumn reqStart = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+            new ArrayList<>();
+        PropertyColumn reqStart = new PropertyColumn<>(
             Model.of( "Timestamp" ), "userObject.reqStart" );
         reqStart.setInitialSize( 200 );
         columns.add( reqStart );
-        PropertyColumn reqAttr = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn reqAttr = new PropertyColumn<>(
             Model.of( "LDAP Operation" ), "userObject.reqType" );
         reqAttr.setInitialSize( 150 );
         columns.add( reqAttr );
 
-        PropertyColumn reqAttrsOnly = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn reqAttrsOnly = new PropertyColumn<>(
             Model.of( "Target Location" ), "userObject.reqDN" );
         reqAttrsOnly.setInitialSize( 500 );
         columns.add( reqAttrsOnly );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/ConstraintBasePanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ConstraintBasePanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ConstraintBasePanel.java
index 61ac7ec..4fbc757 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ConstraintBasePanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ConstraintBasePanel.java
@@ -110,7 +110,7 @@ public class ConstraintBasePanel extends FormComponentPanel
     public ConstraintBasePanel( String id, final IModel constraint )
     {
         super( id, constraint );
-        final Spinner<Integer> timeout = new Spinner<Integer>( TIMEOUT );
+        final Spinner<Integer> timeout = new Spinner<>( TIMEOUT );
         timeout.setRequired( false );
         add( timeout );
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
index 49c2197..856f3d7 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
@@ -92,7 +92,7 @@ public class GroupDetailPanel extends FormComponentPanel
         super( id );
 
         this.groupMgr.setAdmin( SecUtils.getSession( this ) );
-        this.editForm = new GroupDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<Group>( new Group() ) );
+        this.editForm = new GroupDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<>( new Group() ) );
         editForm.setOutputMarkupId( true );
         this.display = display;
         add( editForm );
@@ -133,7 +133,7 @@ public class GroupDetailPanel extends FormComponentPanel
             description.setRequired( false );
             add( description );
             protocol.setRequired( true );
-            memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>( this,
+            memberPropsCB = new ComboBox<>( "memberProps", new PropertyModel<String>( this,
                 "memberPropsSelection" ), new ArrayList<String>() );
             memberPropsCB.setOutputMarkupId( true );
             add( memberPropsCB );
@@ -150,7 +150,7 @@ public class GroupDetailPanel extends FormComponentPanel
             options.set( "scrollable", "{ virtual: true }" ); //infinite scroll
             options.set( "height", 300 );
             options.set( "pageable", "{ pageSizes: [ 5, 10, 15, 20 ] }" );
-            table = new DataTable<Member>( "memberstable", columns, createDataProvider( null ), ROWS, options );
+            table = new DataTable<>( "memberstable", columns, createDataProvider( null ), ROWS, options );
             table.setOutputMarkupId( true );
             add( table );
         }
@@ -463,7 +463,7 @@ public class GroupDetailPanel extends FormComponentPanel
                                 {
                                     Group newGroup = groupMgr.delete( group, key, val );
                                     group.setProperties( newGroup.getProperties() );
-                                    memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>(
+                                    memberPropsCB = new ComboBox<>( "memberProps", new PropertyModel<String>(
                                         form, "memberPropsSelection" ), group.getPropList() );
                                     form.addOrReplace( memberPropsCB );
                                 }
@@ -653,11 +653,11 @@ public class GroupDetailPanel extends FormComponentPanel
         {
             setModelObject( new Group() );
             memberAssign = "";
-            memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>( form,
+            memberPropsCB = new ComboBox<>( "memberProps", new PropertyModel<String>( form,
                 "memberPropsSelection" ), new ArrayList<String>() );
             editForm.addOrReplace( memberPropsCB );
             table.refresh( target );
-            table = new DataTable<Member>( "memberstable", columns, createDataProvider( null ), ROWS, options );
+            table = new DataTable<>( "memberstable", columns, createDataProvider( null ), ROWS, options );
             editForm.addOrReplace( table );
             modelChanged();
             component = editForm;
@@ -667,7 +667,7 @@ public class GroupDetailPanel extends FormComponentPanel
 
         private List<IColumn> newColumnList()
         {
-            List<IColumn> columns = new ArrayList<IColumn>();
+            List<IColumn> columns = new ArrayList<>();
             columns.add( new PropertyColumn( "#", "index", 30 ) );
             columns.add( new PropertyColumn( "User DN", "userDn", 150 ) );
             columns.add( new CommandsColumn( "", 100 )
@@ -710,11 +710,11 @@ public class GroupDetailPanel extends FormComponentPanel
                     tableMember.setIndex( ++ctr );
                     tableMembers.add( tableMember );
                 }
-                results = new ListDataProvider<Member>( tableMembers );
+                results = new ListDataProvider<>( tableMembers );
             }
             else
             {
-                results = new ListDataProvider<Member>( new ArrayList<Member>() );
+                results = new ListDataProvider<>( new ArrayList<Member>() );
             }
             return results;
         }
@@ -804,7 +804,7 @@ public class GroupDetailPanel extends FormComponentPanel
                 memberPropsSelection = "";
                 if ( VUtil.isNotNullOrEmpty( group.getProperties() ) )
                 {
-                    memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>( this,
+                    memberPropsCB = new ComboBox<>( "memberProps", new PropertyModel<String>( this,
                         "memberPropsSelection" ), group.getPropList() );
                     editForm.addOrReplace( memberPropsCB );
                 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
index 9c89e62..42d5b37 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
@@ -255,14 +255,14 @@ public class GroupListPanel extends FormComponentPanel
     private void addGrid()
     {
         List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
-            new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
+            new ArrayList<>();
 
-        PropertyColumn groupName = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn groupName = new PropertyColumn<>(
             Model.of( "Group Name" ), "userObject.Name" );
         groupName.setInitialSize( 250 );
         columns.add( groupName );
 
-        PropertyColumn description = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn description = new PropertyColumn<>(
             Model.of( "Description" ), "userObject.Description" );
         description.setInitialSize( 300 );
         columns.add( description );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
index 2da7d3d..9141064 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
@@ -85,7 +85,7 @@ public class OUDetailPanel extends FormComponentPanel
             ou.setType( OrgUnit.Type.USER );
         else
             ou.setType( OrgUnit.Type.PERM );
-        this.editForm = new OUDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<OrgUnit>( ou ) );
+        this.editForm = new OUDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<>( ou ) );
         this.display = display;
         add( editForm );
     }
@@ -100,7 +100,7 @@ public class OUDetailPanel extends FormComponentPanel
         private ComboBox<String> parentsCB;
         private String parentsSelection;
         private Component component;
-        private List<String> parents = new ArrayList<String>();
+        private List<String> parents = new ArrayList<>();
         private OrgUnit parent = new OrgUnit();
         private TextField nameTF;
         private SecureIndicatingAjaxButton addPB;
@@ -344,7 +344,7 @@ public class OUDetailPanel extends FormComponentPanel
             add( description );
             Label iid = new Label( "id" );
             add( iid );
-            parentsCB = new ComboBox<String>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ), parents );
+            parentsCB = new ComboBox<>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ), parents );
             add( parentsCB );
             setOutputMarkupId( true );
             addParentSearchModal();
@@ -367,8 +367,8 @@ public class OUDetailPanel extends FormComponentPanel
                             orgUnit.getParents().remove( parentsSelection );
                             parents.remove( parentsSelection );
                             parentsSelection = "";
-                            parents = new ArrayList<String>();
-                            parentsCB = new ComboBox<String>( PARENTS, new PropertyModel<String>( this,
+                            parents = new ArrayList<>();
+                            parentsCB = new ComboBox<>( PARENTS, new PropertyModel<String>( this,
                                 PARENTS_SELECTION ), parents );
                             component = editForm;
                             msg += ", was removed from local, commit to persist changes on server";
@@ -499,14 +499,14 @@ public class OUDetailPanel extends FormComponentPanel
                 this.setModelObject( orgUnit );
                 if ( VUtil.isNotNullOrEmpty( orgUnit.getParents() ) )
                 {
-                    parents = new ArrayList<String>( orgUnit.getParents() );
-                    parentsCB = new ComboBox<String>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),
+                    parents = new ArrayList<>( orgUnit.getParents() );
+                    parentsCB = new ComboBox<>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),
                         parents );
                 }
                 else
                 {
-                    parents = new ArrayList<String>();
-                    parentsCB = new ComboBox<String>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),
+                    parents = new ArrayList<>();
+                    parentsCB = new ComboBox<>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),
                         parents );
                 }
                 nameTF.setEnabled( false );
@@ -542,8 +542,8 @@ public class OUDetailPanel extends FormComponentPanel
 
             setModelObject( ou );
             parentsSelection = "";
-            parents = new ArrayList<String>();
-            parentsCB = new ComboBox<String>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),
+            parents = new ArrayList<>();
+            parentsCB = new ComboBox<>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),
                 parents );
             nameTF.setEnabled( true );
             addPB.setEnabled( true );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
index 346712f..1b24f31 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
@@ -89,20 +89,17 @@ public class OUListPanel extends FormComponentPanel
 
         OUListModel ouListModel = new OUListModel( orgUnit, SecUtils.getSession( this ) );
         setDefaultModel( ouListModel );
-        List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns = new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
-        PropertyColumn name = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
-            String>( Model.of( searchLabel ), "userObject.name" );
+        List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns = new ArrayList<>();
+        PropertyColumn name = new PropertyColumn<>( Model.of( searchLabel ), "userObject.name" );
         name.setInitialSize( 400 );
         columns.add( name );
 
-        PropertyColumn description = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
-            String>( Model.of( "Description" ), "userObject.Description" );
+        PropertyColumn description = new PropertyColumn<>( Model.of( "Description" ), "userObject.Description" );
 
         description.setInitialSize( 400 );
         columns.add( description );
 
-        PropertyColumn parents = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
-            String>( Model.of( "Parents" ), "userObject.parents" );
+        PropertyColumn parents = new PropertyColumn<>( Model.of( "Parents" ), "userObject.parents" );
         parents.setInitialSize( 400 );
         columns.add( parents );
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/ObjectDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ObjectDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ObjectDetailPanel.java
index 1fac856..eb8af0e 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ObjectDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ObjectDetailPanel.java
@@ -83,7 +83,7 @@ public class ObjectDetailPanel extends FormComponentPanel
             objName = GlobalIds.ADMIN_MGR;
 
         this.adminMgr.setAdmin( SecUtils.getSession( this ) );
-        this.editForm = new ObjectDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<PermObj>( new PermObj() ) );
+        this.editForm = new ObjectDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<>( new PermObj() ) );
         this.display = display;
         add( editForm );
     }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
index b20eb3f..38dddd4 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
@@ -257,19 +257,19 @@ public class ObjectListPanel extends FormComponentPanel
     private void addGrid()
     {
         List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
-            new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
+            new ArrayList<>();
 
-        PropertyColumn objName = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn objName = new PropertyColumn<>(
             Model.of( "Object Name" ), "userObject.ObjName" );
         objName.setInitialSize( 300 );
         columns.add( objName );
 
-        PropertyColumn ou = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn ou = new PropertyColumn<>(
             Model.of( "Perm Organization" ), "userObject.Ou" );
         ou.setInitialSize( 200 );
         columns.add( ou );
 
-        PropertyColumn description = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn description = new PropertyColumn<>(
             Model.of( "Description" ), "userObject.Description" );
         description.setInitialSize( 500 );
         columns.add( description );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
index 5fdc4cf..cc50ba6 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
@@ -90,7 +90,7 @@ public class PermDetailPanel extends FormComponentPanel
         super( id );
         this.isAdmin = isAdmin;
         this.adminMgr.setAdmin( SecUtils.getSession( this ) );
-        this.editForm = new PermDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<Permission>(
+        this.editForm = new PermDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<>(
             new Permission() ) );
         this.display = display;
         add( editForm );
@@ -103,7 +103,7 @@ public class PermDetailPanel extends FormComponentPanel
         private ComboBox<String> rolesCB;
         private Component component;
         private String rolesSelection;
-        private List<String> roles = new ArrayList<String>();
+        private List<String> roles = new ArrayList<>();
         private UserRole roleConstraint = new UserRole();
         private TextField objectTF;
         private TextField opNameTF;
@@ -376,7 +376,7 @@ public class PermDetailPanel extends FormComponentPanel
             add( description );
             Label internalId = new Label( "internalId" );
             add( internalId );
-            rolesCB = new ComboBox<String>( "roles", new PropertyModel<String>( this, ROLES_SELECTION ), roles );
+            rolesCB = new ComboBox<>( "roles", new PropertyModel<String>( this, ROLES_SELECTION ), roles );
             add( rolesCB );
             setOutputMarkupId( true );
             addRoleSearchModal();
@@ -619,13 +619,13 @@ public class PermDetailPanel extends FormComponentPanel
                 rolesSelection = "";
                 if ( VUtil.isNotNullOrEmpty( perm.getRoles() ) )
                 {
-                    roles = new ArrayList<String>( perm.getRoles() );
-                    rolesCB = new ComboBox<String>( "roles", new PropertyModel<String>( this, ROLES_SELECTION ), roles );
+                    roles = new ArrayList<>( perm.getRoles() );
+                    rolesCB = new ComboBox<>( "roles", new PropertyModel<String>( this, ROLES_SELECTION ), roles );
                 }
                 else
                 {
-                    roles = new ArrayList<String>();
-                    rolesCB = new ComboBox<String>( "roles", new PropertyModel<String>( this, ROLES_SELECTION ), roles );
+                    roles = new ArrayList<>();
+                    rolesCB = new ComboBox<>( "roles", new PropertyModel<String>( this, ROLES_SELECTION ), roles );
                 }
                 editForm.addOrReplace( rolesCB );
                 objectTF.setEnabled( false );
@@ -656,8 +656,8 @@ public class PermDetailPanel extends FormComponentPanel
         {
             this.setModelObject( new Permission() );
             rolesSelection = "";
-            roles = new ArrayList<String>();
-            rolesCB = new ComboBox<String>( "roles", new PropertyModel<String>( editForm, ROLES_SELECTION ), roles );
+            roles = new ArrayList<>();
+            rolesCB = new ComboBox<>( "roles", new PropertyModel<String>( editForm, ROLES_SELECTION ), roles );
             editForm.addOrReplace( rolesCB );
             addPB.setEnabled( true );
             objectTF.setEnabled( true );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
index 9931ea9..c0efb3c 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
@@ -87,7 +87,7 @@ public class PermListPanel extends FormComponentPanel
             isAdmin, SecUtils.getSession( this ) );
         setDefaultModel( permListModel );
         List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
-            new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
+            new ArrayList<>();
         PropertyColumn objName = new PropertyColumn( new Model( "Object Name" ), "userObject.ObjName" );
         objName.setInitialSize( 350 );
         columns.add( objName );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyDetailPanel.java
index 63b1596..7ffc2e3 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyDetailPanel.java
@@ -72,7 +72,7 @@ public class PwPolicyDetailPanel extends FormComponentPanel
     {
         super( id );
         this.pwPolicyMgr.setAdmin( SecUtils.getSession( this ) );
-        this.editForm = new PwPolicyDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<PwPolicy>(
+        this.editForm = new PwPolicyDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<>(
             new PwPolicy() ) );
         this.display = display;
         add( editForm );
@@ -305,38 +305,38 @@ public class PwPolicyDetailPanel extends FormComponentPanel
 
             add( new TextField( "name" ).setRequired( true ) );
 
-            add( new TextField<Integer>( "minAge" ).add( new RangeValidator<Integer>( 0, Integer.MAX_VALUE ) )
+            add( new TextField<Integer>( "minAge" ).add( new RangeValidator<>( 0, Integer.MAX_VALUE ) )
                 .setRequired( true ) );
 
-            add( new TextField<Long>( "maxAge" ).add( new RangeValidator<Long>( ( long ) 0, Long.MAX_VALUE ) )
+            add( new TextField<Long>( "maxAge" ).add( new RangeValidator<>( ( long ) 0, Long.MAX_VALUE ) )
                 .setRequired( true ) );
-            final Spinner<Integer> inHistorySP = new Spinner<Integer>( "inHistory" );
+            final Spinner<Integer> inHistorySP = new Spinner<>( "inHistory" );
             inHistorySP.setRequired( false );
-            inHistorySP.add( new RangeValidator<Short>( ( short ) 0, ( short ) 100 ) );
+            inHistorySP.add( new RangeValidator<>( ( short ) 0, ( short ) 100 ) );
             add( inHistorySP );
 
-            final Spinner<Integer> minLengthSP = new Spinner<Integer>( "minLength" );
+            final Spinner<Integer> minLengthSP = new Spinner<>( "minLength" );
             minLengthSP.setRequired( false );
-            minLengthSP.add( new RangeValidator<Short>( ( short ) 0, ( short ) 100 ) );
+            minLengthSP.add( new RangeValidator<>( ( short ) 0, ( short ) 100 ) );
             add( minLengthSP );
 
-            add( new TextField<Long>( "expireWarning" ).add( new RangeValidator<Long>( ( long ) 0, Long.MAX_VALUE ) )
+            add( new TextField<Long>( "expireWarning" ).add( new RangeValidator<>( ( long ) 0, Long.MAX_VALUE ) )
                 .setRequired( true ) );
-            final Spinner<Integer> graceLoginLimitSP = new Spinner<Integer>( "graceLoginLimit" );
+            final Spinner<Integer> graceLoginLimitSP = new Spinner<>( "graceLoginLimit" );
             graceLoginLimitSP.setRequired( false );
-            graceLoginLimitSP.add( new RangeValidator<Short>( ( short ) 0, ( short ) 100 ) );
+            graceLoginLimitSP.add( new RangeValidator<>( ( short ) 0, ( short ) 100 ) );
             add( graceLoginLimitSP );
 
             add( new CheckBox( "lockout" ).setRequired( true ) );
-            add( new TextField<Integer>( "lockoutDuration" ).add( new RangeValidator<Integer>( 0, Integer.MAX_VALUE ) )
+            add( new TextField<Integer>( "lockoutDuration" ).add( new RangeValidator<>( 0, Integer.MAX_VALUE ) )
                 .setRequired( true ) );
-            final Spinner<Integer> maxFailureSP = new Spinner<Integer>( "maxFailure" );
+            final Spinner<Integer> maxFailureSP = new Spinner<>( "maxFailure" );
             maxFailureSP.setRequired( false );
-            maxFailureSP.add( new RangeValidator<Short>( ( short ) 0, ( short ) 100 ) );
+            maxFailureSP.add( new RangeValidator<>( ( short ) 0, ( short ) 100 ) );
             add( maxFailureSP );
 
             add( new TextField<Short>( "failureCountInterval" ).add(
-                new RangeValidator<Short>( ( short ) 0, Short.MAX_VALUE ) ).setRequired( true ) );
+                new RangeValidator<>( ( short ) 0, Short.MAX_VALUE ) ).setRequired( true ) );
             add( new CheckBox( "mustChange" ).setRequired( true ) );
             add( new CheckBox( "allowUserChange" ).setRequired( true ) );
             add( new CheckBox( "safeModify" ).setRequired( true ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
index 990d46d..a8f5770 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
@@ -69,6 +69,7 @@ public class PwPolicyListPanel extends FormComponentPanel
     private String searchVal;
 
 
+    @SuppressWarnings( "Convert2Diamond" )
     public PwPolicyListPanel( String id )
     {
         super( id );
@@ -187,7 +188,7 @@ public class PwPolicyListPanel extends FormComponentPanel
         grid.setClickRowToDeselect( false );
         grid.setSelectToEdit( false );
         // expand the root node
-        grid.getTreeState().expandAll();;
+        grid.getTreeState().expandAll();
         Form listForm = new Form( "form" );
         listForm.add( grid );
         grid.setOutputMarkupId( true );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/RoleAdminDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleAdminDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleAdminDetailPanel.java
index 69bffc7..fab0cb1 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleAdminDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleAdminDetailPanel.java
@@ -71,12 +71,12 @@ public class RoleAdminDetailPanel extends Panel
     {
         super( id, roleModel );
 
-        permouCB = new ComboBox<String>( GlobalIds.OS_P, new PropertyModel<String>( this, PERMOU_SELECTION ), permous );
+        permouCB = new ComboBox<>( GlobalIds.OS_P, new PropertyModel<String>( this, PERMOU_SELECTION ), permous );
         permouCB.setOutputMarkupId( true );
         add( permouCB );
         addPermOUSearchModal();
 
-        userouCB = new ComboBox<String>( GlobalIds.OS_U, new PropertyModel<String>( this, USEROU_SELECTION ), userous );
+        userouCB = new ComboBox<>( GlobalIds.OS_U, new PropertyModel<String>( this, USEROU_SELECTION ), userous );
         userouCB.setOutputMarkupId( true );
         add( userouCB );
         addUserOUSearchModal();
@@ -506,7 +506,7 @@ public class RoleAdminDetailPanel extends Panel
     void setPermous( List<String> permous )
     {
         this.permous = permous;
-        permouCB = new ComboBox<String>( GlobalIds.OS_P, new PropertyModel<String>( this, PERMOU_SELECTION ), permous );
+        permouCB = new ComboBox<>( GlobalIds.OS_P, new PropertyModel<String>( this, PERMOU_SELECTION ), permous );
         permouSelection = "";
         addOrReplace( permouCB );
     }
@@ -520,7 +520,7 @@ public class RoleAdminDetailPanel extends Panel
     void setUserous( List<String> userous )
     {
         this.userous = userous;
-        userouCB = new ComboBox<String>( GlobalIds.OS_U, new PropertyModel<String>( this, USEROU_SELECTION ), userous );
+        userouCB = new ComboBox<>( GlobalIds.OS_U, new PropertyModel<String>( this, USEROU_SELECTION ), userous );
         userouSelection = "";
         addOrReplace( userouCB );
     }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
index 3505812..f8d1a99 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
@@ -94,13 +94,13 @@ public class RoleDetailPanel extends Panel
         if ( isAdmin )
         {
             this.objName = GlobalIds.DEL_ADMIN_MGR;
-            this.editForm = new RoleDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<AdminRole>(
+            this.editForm = new RoleDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<>(
                 new AdminRole() ) );
         }
         else
         {
             this.objName = GlobalIds.ADMIN_MGR;
-            this.editForm = new RoleDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<Role>( new Role() ) );
+            this.editForm = new RoleDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<>( new Role() ) );
         }
 
         this.display = display;
@@ -118,7 +118,7 @@ public class RoleDetailPanel extends Panel
         private ComboBox<String> parentsCB;
         private Component component;
         private String parentsSelection;
-        private List<String> parents = new ArrayList<String>();
+        private List<String> parents = new ArrayList<>();
         private UserRole parentConstraint = new UserRole();
         private RoleAdminDetailPanel auxPanel;
         private TextField nameTF;
@@ -149,7 +149,7 @@ public class RoleDetailPanel extends Panel
             add( description );
             Label iid = new Label( "id" );
             add( iid );
-            parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),
+            parentsCB = new ComboBox<>( GlobalIds.PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),
                 parents );
             add( parentsCB );
 
@@ -569,14 +569,14 @@ public class RoleDetailPanel extends Panel
                 parentsSelection = "";
                 if ( VUtil.isNotNullOrEmpty( ( ( Role ) role ).getParents() ) )
                 {
-                    parents = new ArrayList<String>( ( ( Role ) role ).getParents() );
-                    parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( this,
+                    parents = new ArrayList<>( ( ( Role ) role ).getParents() );
+                    parentsCB = new ComboBox<>( GlobalIds.PARENTS, new PropertyModel<String>( this,
                         PARENTS_SELECTION ), parents );
                 }
                 else
                 {
-                    parents = new ArrayList<String>();
-                    parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( this,
+                    parents = new ArrayList<>();
+                    parentsCB = new ComboBox<>( GlobalIds.PARENTS, new PropertyModel<String>( this,
                         PARENTS_SELECTION ), parents );
                 }
                 nameTF.setEnabled( false );
@@ -617,7 +617,7 @@ public class RoleDetailPanel extends Panel
                     {
                         if ( role.getOsP() != null )
                         {
-                            auxPanel.setPermous( new ArrayList<String>( role.getOsP() ) );
+                            auxPanel.setPermous( new ArrayList<>( role.getOsP() ) );
                         }
                         else
                         {
@@ -625,7 +625,7 @@ public class RoleDetailPanel extends Panel
                         }
                         if ( role.getOsU() != null )
                         {
-                            auxPanel.setUserous( new ArrayList<String>( role.getOsU() ) );
+                            auxPanel.setUserous( new ArrayList<>( role.getOsU() ) );
                         }
                         else
                         {
@@ -652,8 +652,8 @@ public class RoleDetailPanel extends Panel
                 setModelObject( new Role() );
             }
             parentsSelection = "";
-            parents = new ArrayList<String>();
-            parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( this,
+            parents = new ArrayList<>();
+            parentsCB = new ComboBox<>( GlobalIds.PARENTS, new PropertyModel<String>( this,
                 PARENTS_SELECTION ), parents );
             modelChanged();
             nameTF.setEnabled( true );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
index 5b5fca3..d63ece7 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
@@ -80,51 +80,51 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
         RoleListModel roleListModel = new RoleListModel( createRole( "" ), isAdmin, SecUtils.getSession( this ) );
         setDefaultModel( roleListModel );
         List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
-            new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
+            new ArrayList<>();
         columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
             Model.of( "Name" ), "userObject.name" ) );
 
-        PropertyColumn description = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn description = new PropertyColumn<>(
             Model.of( "Description" ), "userObject.Description" );
         description.setInitialSize( 300 );
         columns.add( description );
 
-        PropertyColumn beginDate = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn beginDate = new PropertyColumn<>(
             Model.of( "Begin Date" ), "userObject.BeginDate" );
         beginDate.setInitialSize( 80 );
         columns.add( beginDate );
 
-        PropertyColumn endDate = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn endDate = new PropertyColumn<>(
             Model.of( "End Date" ), "userObject.EndDate" );
         endDate.setInitialSize( 80 );
         columns.add( endDate );
 
-        PropertyColumn beginLockDate = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn beginLockDate = new PropertyColumn<>(
             Model.of( "Begin Lock Dt" ), "userObject.BeginLockDate" );
         beginLockDate.setInitialSize( 80 );
         columns.add( beginLockDate );
 
-        PropertyColumn endLockDate = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn endLockDate = new PropertyColumn<>(
             Model.of( "End Lock Dt" ), "userObject.EndLockDate" );
         endLockDate.setInitialSize( 80 );
         columns.add( endLockDate );
 
-        PropertyColumn beginTime = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn beginTime = new PropertyColumn<>(
             Model.of( "Begin Tm" ), "userObject.BeginTime" );
         beginTime.setInitialSize( 70 );
         columns.add( beginTime );
 
-        PropertyColumn endTime = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn endTime = new PropertyColumn<>(
             Model.of( "End Tm" ), "userObject.EndTime" );
         endTime.setInitialSize( 70 );
         columns.add( endTime );
 
-        PropertyColumn dayMask = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn dayMask = new PropertyColumn<>(
             Model.of( "DayMask" ), "userObject.DayMask" );
         dayMask.setInitialSize( 80 );
         columns.add( dayMask );
 
-        PropertyColumn parents = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn parents = new PropertyColumn<>(
             Model.of( "Parents" ), "userObject.parents" );
         parents.setInitialSize( 250 );
         columns.add( parents );
@@ -163,7 +163,7 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
         grid.setClickRowToDeselect( false );
         grid.setSelectToEdit( false );
         // expand the root node
-        grid.getTreeState().expandAll();;
+        grid.getTreeState().expandAll();
         Form listForm = new Form( "form" );
         listForm.add( grid );
         grid.setOutputMarkupId( true );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
index e8eeb68..6447713 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
@@ -155,7 +155,7 @@ public class RoleSearchModalPanel extends Panel
                         Role childRole = reviewMgr.readRole( new Role( roleSearchVal ) );
                         if ( childRole != null )
                         {
-                            List<Role> parentRoles = new ArrayList<Role>();
+                            List<Role> parentRoles = new ArrayList<>();
                             for ( String role : childRole.getParents() )
                             {
                                 Role parent = reviewMgr.readRole( new Role( role ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
index 8489311..de5a96a 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
@@ -83,7 +83,7 @@ public class SDDetailPanel extends FormComponentPanel
         super( id );
         this.adminMgr.setAdmin( SecUtils.getSession( this ) );
         this.isStatic = isStatic;
-        this.editForm = new SDDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<SDSet>( new SDSet() ) );
+        this.editForm = new SDDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<>( new SDSet() ) );
         this.display = display;
         add( editForm );
     }
@@ -96,7 +96,7 @@ public class SDDetailPanel extends FormComponentPanel
         private ComboBox<String> membersCB;
         private String membersSelection;
         private Component component;
-        private List<String> members = new ArrayList<String>();
+        private List<String> members = new ArrayList<>();
         private UserRole roleConstraint = new UserRole();
         private TextField nameTF;
         private SecureIndicatingAjaxButton addPB;
@@ -370,7 +370,7 @@ public class SDDetailPanel extends FormComponentPanel
             add( new Spinner<Integer>( "cardinality" ) );
             Label iid = new Label( "id" );
             add( iid );
-            membersCB = new ComboBox<String>( "members", new PropertyModel<String>( this, MEMBERS_SELECTION ), members );
+            membersCB = new ComboBox<>( "members", new PropertyModel<String>( this, MEMBERS_SELECTION ), members );
             membersCB.setOutputMarkupId( true );
             add( membersCB );
             addRoleSearchModal();
@@ -523,14 +523,14 @@ public class SDDetailPanel extends FormComponentPanel
                 this.setModelObject( sdSet );
                 if ( VUtil.isNotNullOrEmpty( sdSet.getMembers() ) )
                 {
-                    members = new ArrayList<String>( sdSet.getMembers() );
-                    membersCB = new ComboBox<String>( "members", new PropertyModel<String>( this, MEMBERS_SELECTION ),
+                    members = new ArrayList<>( sdSet.getMembers() );
+                    membersCB = new ComboBox<>( "members", new PropertyModel<String>( this, MEMBERS_SELECTION ),
                         members );
                 }
                 else
                 {
-                    members = new ArrayList<String>();
-                    membersCB = new ComboBox<String>( "members", new PropertyModel<String>( this, MEMBERS_SELECTION ),
+                    members = new ArrayList<>();
+                    membersCB = new ComboBox<>( "members", new PropertyModel<String>( this, MEMBERS_SELECTION ),
                         members );
                 }
                 nameTF.setEnabled( false );
@@ -565,8 +565,8 @@ public class SDDetailPanel extends FormComponentPanel
                 sdSet.setType( SDSet.SDType.DYNAMIC );
             setModelObject( sdSet );
             membersSelection = "";
-            members = new ArrayList<String>();
-            membersCB = new ComboBox<String>( "members", new PropertyModel<String>( this, MEMBERS_SELECTION ),
+            members = new ArrayList<>();
+            membersCB = new ComboBox<>( "members", new PropertyModel<String>( this, MEMBERS_SELECTION ),
                 members );
             nameTF.setEnabled( true );
             addPB.setEnabled( true );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
index d3e1e5d..38dae3f 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
@@ -104,22 +104,22 @@ public class SDListPanel extends FormComponentPanel
         SDListModel sdListModel = new SDListModel( sdSet, SecUtils.getSession( this ) );
         setDefaultModel( sdListModel );
         List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
-            new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
+            new ArrayList<>();
         columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
             Model.of( searchLabel ), "userObject.name" ) );
 
-        PropertyColumn description = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn description = new PropertyColumn<>(
             Model.of( "Description" ), "userObject.Description" );
 
         description.setInitialSize( 300 );
         columns.add( description );
 
-        PropertyColumn cardinality = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn cardinality = new PropertyColumn<>(
             Model.of( "Cardinality" ), "userObject.Cardinality" );
         cardinality.setInitialSize( 100 );
         columns.add( cardinality );
 
-        PropertyColumn members = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+        PropertyColumn members = new PropertyColumn<>(
             Model.of( "Members" ), "userObject.members" );
         members.setInitialSize( 600 );
         columns.add( members );
@@ -159,7 +159,7 @@ public class SDListPanel extends FormComponentPanel
         grid.setClickRowToDeselect( false );
         grid.setSelectToEdit( false );
         // expand the root node
-        grid.getTreeState().expandAll();;
+        grid.getTreeState().expandAll();
         this.listForm = new Form( "form" );
         this.listForm.add( grid );
         grid.setOutputMarkupId( true );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
index 6057494..e4c3079 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
@@ -89,7 +89,7 @@ public class UserDetailPanel extends FormComponentPanel
     public UserDetailPanel( String id, Displayable display )
     {
         super( id );
-        this.editForm = new UserDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<User>( new User() ) );
+        this.editForm = new UserDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<>( new User() ) );
         this.display = display;
         this.adminMgr.setAdmin( SecUtils.getSession( this ) );
         this.delAdminMgr.setAdmin( SecUtils.getSession( this ) );
@@ -212,7 +212,7 @@ public class UserDetailPanel extends FormComponentPanel
             add( pwPolicyTF );
 
             // Add the role assignment values & temporal constraint panel:
-            rolesCB = new ComboBox<UserRole>( ROLES, new PropertyModel<String>( this, ROLE_SELECTION ),
+            rolesCB = new ComboBox<>( ROLES, new PropertyModel<String>( this, ROLE_SELECTION ),
                 model.getObject().getRoles(), new ChoiceRenderer<UserRole>( GlobalIds.NAME ) );
             rolesCB.setOutputMarkupId( true );
             add( rolesCB );
@@ -222,7 +222,7 @@ public class UserDetailPanel extends FormComponentPanel
             add( roleConstraintPanel );
 
             // Add the adminRole assignment values & temporal constraint panel:
-            adminRolesCB = new ComboBox<UserAdminRole>( ADMIN_ROLES, new PropertyModel<String>( this,
+            adminRolesCB = new ComboBox<>( ADMIN_ROLES, new PropertyModel<String>( this,
                 ADMIN_ROLE_SELECTION ), model.getObject().getAdminRoles(), new ChoiceRenderer<UserAdminRole>(
                 GlobalIds.NAME
                 ) );
@@ -244,13 +244,13 @@ public class UserDetailPanel extends FormComponentPanel
             // TODO: add email validator:
             //add(new TextField("email").add( EmailAddressValidator.getInstance()));
 
-            emailsCB = new ComboBox<String>( GlobalIds.EMAILS, new PropertyModel<String>( this, EMAILS_SELECTION ),
+            emailsCB = new ComboBox<>( GlobalIds.EMAILS, new PropertyModel<String>( this, EMAILS_SELECTION ),
                 model.getObject().getEmails() );
             add( emailsCB );
-            phonesCB = new ComboBox<String>( GlobalIds.PHONES, new PropertyModel<String>( this, PHONES_SELECTION ),
+            phonesCB = new ComboBox<>( GlobalIds.PHONES, new PropertyModel<String>( this, PHONES_SELECTION ),
                 model.getObject().getPhones() );
             add( phonesCB );
-            mobilesCB = new ComboBox<String>( GlobalIds.MOBILES, new PropertyModel<String>( this, MOBILES_SELECTION ),
+            mobilesCB = new ComboBox<>( GlobalIds.MOBILES, new PropertyModel<String>( this, MOBILES_SELECTION ),
                 model.getObject().getMobiles() );
             add( mobilesCB );
             // TODO: name not mapped correctly in fortress so can't be used here:
@@ -259,7 +259,7 @@ public class UserDetailPanel extends FormComponentPanel
             add( name );
 
             // Address ComboBoxes and edit fields
-            addressCB = new ComboBox<String>( GlobalIds.ADDRESSES,
+            addressCB = new ComboBox<>( GlobalIds.ADDRESSES,
                 new PropertyModel<String>( this, ADDRESS_SELECTION ),
                 model.getObject().getAddress().getAddresses() );
             add( addressCB );
@@ -1485,25 +1485,25 @@ public class UserDetailPanel extends FormComponentPanel
             userIdTF.setEnabled( true );
             addPB.setEnabled( true );
 
-            emailsCB = new ComboBox<String>( GlobalIds.EMAILS, new PropertyModel<String>( this, EMAILS_SELECTION ),
+            emailsCB = new ComboBox<>( GlobalIds.EMAILS, new PropertyModel<String>( this, EMAILS_SELECTION ),
                 new ArrayList<String>() );
             editForm.addOrReplace( emailsCB );
-            phonesCB = new ComboBox<String>( GlobalIds.PHONES, new PropertyModel<String>( this, PHONES_SELECTION ),
+            phonesCB = new ComboBox<>( GlobalIds.PHONES, new PropertyModel<String>( this, PHONES_SELECTION ),
                 new ArrayList<String>() );
             editForm.addOrReplace( phonesCB );
-            mobilesCB = new ComboBox<String>( GlobalIds.MOBILES, new PropertyModel<String>( this, MOBILES_SELECTION ),
+            mobilesCB = new ComboBox<>( GlobalIds.MOBILES, new PropertyModel<String>( this, MOBILES_SELECTION ),
                 new ArrayList<String>() );
             editForm.addOrReplace( mobilesCB );
-            addressCB = new ComboBox<String>( GlobalIds.ADDRESSES,
+            addressCB = new ComboBox<>( GlobalIds.ADDRESSES,
                 new PropertyModel<String>( this, ADDRESS_SELECTION ),
                 new ArrayList<String>() );
 
             editForm.addOrReplace( addressCB );
-            rolesCB = new ComboBox<UserRole>( ROLES, new PropertyModel<String>( this, ROLE_SELECTION ),
+            rolesCB = new ComboBox<>( ROLES, new PropertyModel<String>( this, ROLE_SELECTION ),
                 new ArrayList<UserRole>(), new ChoiceRenderer<UserRole>( GlobalIds.NAME ) );
             rolesCB.setOutputMarkupId( true );
             editForm.addOrReplace( rolesCB );
-            adminRolesCB = new ComboBox<UserAdminRole>( ADMIN_ROLES, new PropertyModel<String>( this,
+            adminRolesCB = new ComboBox<>( ADMIN_ROLES, new PropertyModel<String>( this,
                 ADMIN_ROLE_SELECTION ), new ArrayList<UserAdminRole>(), new ChoiceRenderer<UserAdminRole>(
                 GlobalIds.NAME ) );
             adminRolesCB.setOutputMarkupId( true );
@@ -1733,7 +1733,7 @@ public class UserDetailPanel extends FormComponentPanel
                 display.setMessage( msg );
                 userIdTF.setEnabled( false );
                 addPB.setEnabled( false );
-                rolesCB = new ComboBox<UserRole>( ROLES, new PropertyModel<String>( this, ROLE_SELECTION ),
+                rolesCB = new ComboBox<>( ROLES, new PropertyModel<String>( this, ROLE_SELECTION ),
                     user.getRoles(), new ChoiceRenderer<UserRole>( GlobalIds.NAME ) );
                 AjaxFormComponentUpdatingBehavior roleAjaxUpdater = new AjaxFormComponentUpdatingBehavior( "onchange" )
                 {
@@ -1767,7 +1767,7 @@ public class UserDetailPanel extends FormComponentPanel
                 this.rolesCB.add( roleAjaxUpdater );
                 this.rolesCB.setOutputMarkupId( true );
                 editForm.addOrReplace( rolesCB );
-                adminRolesCB = new ComboBox<UserAdminRole>( ADMIN_ROLES, new PropertyModel<String>( this,
+                adminRolesCB = new ComboBox<>( ADMIN_ROLES, new PropertyModel<String>( this,
                     ADMIN_ROLE_SELECTION ), user.getAdminRoles(), new ChoiceRenderer<UserAdminRole>( GlobalIds.NAME ) );
                 AjaxFormComponentUpdatingBehavior adminRoleAjaxUpdater = new AjaxFormComponentUpdatingBehavior(
                     "onchange" )
@@ -1803,17 +1803,17 @@ public class UserDetailPanel extends FormComponentPanel
                 this.adminRolesCB.add( adminRoleAjaxUpdater );
                 this.adminRolesCB.setOutputMarkupId( true );
                 editForm.addOrReplace( adminRolesCB );
-                emailsCB = new ComboBox<String>( GlobalIds.EMAILS, new PropertyModel<String>( this, EMAILS_SELECTION ),
+                emailsCB = new ComboBox<>( GlobalIds.EMAILS, new PropertyModel<String>( this, EMAILS_SELECTION ),
                     user.getEmails() );
                 editForm.addOrReplace( emailsCB );
-                phonesCB = new ComboBox<String>( GlobalIds.PHONES, new PropertyModel<String>( this, PHONES_SELECTION ),
+                phonesCB = new ComboBox<>( GlobalIds.PHONES, new PropertyModel<String>( this, PHONES_SELECTION ),
                     user.getPhones() );
                 editForm.addOrReplace( phonesCB );
-                mobilesCB = new ComboBox<String>( GlobalIds.MOBILES,
+                mobilesCB = new ComboBox<>( GlobalIds.MOBILES,
                     new PropertyModel<String>( this, MOBILES_SELECTION ),
                     user.getMobiles() );
                 editForm.addOrReplace( mobilesCB );
-                addressCB = new ComboBox<String>( GlobalIds.ADDRESSES, new PropertyModel<String>( this,
+                addressCB = new ComboBox<>( GlobalIds.ADDRESSES, new PropertyModel<String>( this,
                     ADDRESS_SELECTION ),
                     user.getAddress().getAddresses() );
                 editForm.addOrReplace( addressCB );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa8e0470/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
index 89b9166..4c0e3ff 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
@@ -692,15 +692,14 @@ public class UserListPanel extends FormComponentPanel
 
     private void addGrid()
     {
-        List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns = new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
+        List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns = new ArrayList<>();
         columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
             String>( Model.of( "UserId" ), "userObject.UserId" ) );
         /*
                 columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
                     String>( Model.of( "Name" ), "userObject.Name" ) );
         */
-        PropertyColumn ou = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
-            String>( Model.of( "User Organization" ), "userObject.Ou" );
+        PropertyColumn ou = new PropertyColumn<>( Model.of( "User Organization" ), "userObject.Ou" );
         ou.setInitialSize( 150 );
         columns.add( ou );
         columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
@@ -709,8 +708,7 @@ public class UserListPanel extends FormComponentPanel
             String>( Model.of( "Address" ), "userObject.Address.Addresses" ) );
         columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
             String>( Model.of( "City" ), "userObject.Address.City" ) );
-        PropertyColumn state = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
-            String>( Model.of( "State" ), "userObject.Address.State" );
+        PropertyColumn state = new PropertyColumn<>( Model.of( "State" ), "userObject.Address.State" );
         state.setInitialSize( 50 );
         columns.add( state );
         /*
@@ -723,12 +721,10 @@ public class UserListPanel extends FormComponentPanel
                 reset.setInitialSize(40);
                 columns.add(reset);
         */
-        PropertyColumn roles = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
-            String>( Model.of( "RBAC Role Assignments" ), "userObject.Roles" );
+        PropertyColumn roles = new PropertyColumn<>( Model.of( "RBAC Role Assignments" ), "userObject.Roles" );
         roles.setInitialSize( 400 );
         columns.add( roles );
-        PropertyColumn adminRoles = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
-            String>( Model.of( "Admin Role Assignments" ), "userObject.AdminRoles" );
+        PropertyColumn adminRoles = new PropertyColumn<>( Model.of( "Admin Role Assignments" ), "userObject.AdminRoles" );
         adminRoles.setInitialSize( 400 );
         columns.add( adminRoles );
 


Mime
View raw message