You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/11/25 20:56:34 UTC
[08/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/RolePage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/RolePage.java b/src/main/java/org/apache/directory/fortress/web/RolePage.java
index ff24e7d..68efb61 100644
--- a/src/main/java/org/apache/directory/fortress/web/RolePage.java
+++ b/src/main/java/org/apache/directory/fortress/web/RolePage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.log4j.Logger;
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
@@ -31,17 +32,21 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.RoleDetailPanel;
import org.apache.directory.fortress.web.panel.RoleListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class RolePage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isAdmin = false;
private String label = "RBAC Role Administration";
private static final Logger LOG = Logger.getLogger( RolePage.class.getName() );
- public RolePage(PageParameters parameters)
+
+ public RolePage( PageParameters parameters )
{
add( new Label( GlobalIds.PAGE_HEADER, label ) );
WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
@@ -55,14 +60,18 @@ public class RolePage extends FortressWebBasePage
NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel(GlobalIds.ROLELISTPANEL)
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new RoleListPanel(id, isAdmin);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.ROLELISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new RoleListPanel( id, isAdmin );
+ }
+ } );
// 3. Info Panel:
InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 e69e64a..9323fbb 100644
--- a/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/SdDynamicPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -30,48 +31,56 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.SDDetailPanel;
import org.apache.directory.fortress.web.panel.SDListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class SdDynamicPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isStatic = false;
private String label = "Dynamic Separation of Duties Administration";;
+
public SdDynamicPage( PageParameters parameters )
{
- add(new Label(GlobalIds.PAGE_HEADER, label));
- WebMarkupContainer container = new WebMarkupContainer(GlobalIds.LAYOUT);
+ add( new Label( GlobalIds.PAGE_HEADER, label ) );
+ WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
- splitter.addBorderLayout(container);
+ splitter.addBorderLayout( container );
// Add the four necessary panels for Commander Page: 1. Nav,, 2. List, 3. Info, 4. Detail
// Nav and Info are generic and work across all entities, the others are specific to this entity type.
// 1. Nav Panel:
- NavPanel navPanel = new NavPanel(GlobalIds.NAVPANEL);
+ NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel( GlobalIds.SDLISTPANEL )
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new SDListPanel(id, isStatic);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.SDLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new SDListPanel( id, isStatic );
+ }
+ } );
// 3. Info Panel:
- InfoPanel infoPanel = new InfoPanel(GlobalIds.INFOPANEL);
- container.add(infoPanel);
+ InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
+ container.add( infoPanel );
// 4. Detail Panel:
Displayable display = infoPanel.getDisplay();
- SDDetailPanel sdDetail = new SDDetailPanel( GlobalIds.SDDETAILPANEL, display, isStatic);
- container.add(sdDetail);
+ SDDetailPanel sdDetail = new SDDetailPanel( GlobalIds.SDDETAILPANEL, display, isStatic );
+ container.add( sdDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ this.add( container );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/SdStaticPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SdStaticPage.java b/src/main/java/org/apache/directory/fortress/web/SdStaticPage.java
index e6d9233..33b7ad0 100644
--- a/src/main/java/org/apache/directory/fortress/web/SdStaticPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/SdStaticPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -30,47 +31,56 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.SDDetailPanel;
import org.apache.directory.fortress.web.panel.SDListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class SdStaticPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isStatic = true;
private String label = "Static Separation of Duties Administration";
+
+
public SdStaticPage( PageParameters parameters )
{
- add(new Label(GlobalIds.PAGE_HEADER, label));
+ add( new Label( GlobalIds.PAGE_HEADER, label ) );
WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
- splitter.addBorderLayout(container);
+ splitter.addBorderLayout( container );
// Add the four necessary panels for Commander Page: 1. Nav,, 2. List, 3. Info, 4. Detail
// Nav and Info are generic and work across all entities, the others are specific to this entity type.
// 1. Nav Panel:
- NavPanel navPanel = new NavPanel(GlobalIds.NAVPANEL);
+ NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel(GlobalIds.SDLISTPANEL)
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new SDListPanel(id, isStatic);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.SDLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new SDListPanel( id, isStatic );
+ }
+ } );
// 3. Info Panel:
- InfoPanel infoPanel = new InfoPanel(GlobalIds.INFOPANEL);
- container.add(infoPanel);
+ InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
+ container.add( infoPanel );
// 4. Detail Panel:
Displayable display = infoPanel.getDisplay();
- SDDetailPanel sdDetail = new SDDetailPanel(GlobalIds.SDDETAILPANEL, display, isStatic);
- container.add(sdDetail);
+ SDDetailPanel sdDetail = new SDDetailPanel( GlobalIds.SDDETAILPANEL, display, isStatic );
+ container.add( sdDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ this.add( container );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/SecureBookmarkablePageLink.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SecureBookmarkablePageLink.java b/src/main/java/org/apache/directory/fortress/web/SecureBookmarkablePageLink.java
index 2aff832..00edf4d 100644
--- a/src/main/java/org/apache/directory/fortress/web/SecureBookmarkablePageLink.java
+++ b/src/main/java/org/apache/directory/fortress/web/SecureBookmarkablePageLink.java
@@ -19,12 +19,14 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import javax.servlet.http.HttpServletRequest;
+
/**
* ...
*
@@ -33,24 +35,31 @@ import javax.servlet.http.HttpServletRequest;
*/
public class SecureBookmarkablePageLink extends BookmarkablePageLink
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public <C extends Page> SecureBookmarkablePageLink( String id, Class<C> pageClass, String roleName )
{
super( id, pageClass );
- if(!isAuthorized( roleName ))
+ if ( !isAuthorized( roleName ) )
{
setVisible( false );
}
}
- public <C extends Page> SecureBookmarkablePageLink( String id, Class<C> pageClass, PageParameters parameters, String roleName )
+
+ public <C extends Page> SecureBookmarkablePageLink( String id, Class<C> pageClass, PageParameters parameters,
+ String roleName )
{
super( id, pageClass, parameters );
- if(!isAuthorized( roleName ))
+ if ( !isAuthorized( roleName ) )
{
setVisible( false );
}
}
+
private boolean isAuthorized( String roleName )
{
HttpServletRequest servletReq = ( HttpServletRequest ) getRequest().getContainerRequest();
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxButton.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxButton.java b/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxButton.java
index ff27a61..650420b 100644
--- a/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxButton.java
+++ b/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxButton.java
@@ -19,11 +19,13 @@
*/
package org.apache.directory.fortress.web;
+
import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton;
import org.apache.directory.fortress.core.rbac.Permission;
import javax.servlet.http.HttpServletRequest;
+
/**
* ...
*
@@ -33,18 +35,23 @@ import javax.servlet.http.HttpServletRequest;
@Authorizable
public class SecureIndicatingAjaxButton extends IndicatingAjaxButton
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public SecureIndicatingAjaxButton( String id, String objName, String opName )
{
super( id );
- if(!GlobalUtils.isFound( new Permission(objName, opName), this ))
+ if ( !GlobalUtils.isFound( new Permission( objName, opName ), this ) )
setVisible( false );
}
+
public SecureIndicatingAjaxButton( String id, String roleName )
{
super( id );
HttpServletRequest servletReq = ( HttpServletRequest ) getRequest().getContainerRequest();
- if( ! GlobalUtils.isAuthorized( roleName, servletReq ) )
+ if ( !GlobalUtils.isAuthorized( roleName, servletReq ) )
setVisible( false );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxLink.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxLink.java b/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxLink.java
index fd75ef6..9cc6aeb 100644
--- a/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxLink.java
+++ b/src/main/java/org/apache/directory/fortress/web/SecureIndicatingAjaxLink.java
@@ -19,10 +19,12 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.directory.fortress.core.rbac.Permission;
+
/**
* ...
*
@@ -31,13 +33,18 @@ import org.apache.directory.fortress.core.rbac.Permission;
*/
public class SecureIndicatingAjaxLink extends IndicatingAjaxLink
{
- public SecureIndicatingAjaxLink( String id, String objName, String opName )
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ public SecureIndicatingAjaxLink( String id, String objName, String opName )
{
super( id );
- if(!GlobalUtils.isFound( new Permission(objName, opName), this ))
+ if ( !GlobalUtils.isFound( new Permission( objName, opName ), this ) )
setEnabled( false );
}
+
@Override
public void onClick( AjaxRequestTarget target )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/UserPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/UserPage.java b/src/main/java/org/apache/directory/fortress/web/UserPage.java
index 8bb5157..20f1e56 100644
--- a/src/main/java/org/apache/directory/fortress/web/UserPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/UserPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.wicket.Component;
import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -29,46 +30,54 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.UserDetailPanel;
import org.apache.directory.fortress.web.panel.UserListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class UserPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public UserPage()
{
- add(new Label(GlobalIds.PAGE_HEADER, "User Administration"));
- WebMarkupContainer container = new WebMarkupContainer(GlobalIds.LAYOUT);
+ add( new Label( GlobalIds.PAGE_HEADER, "User Administration" ) );
+ WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
- splitter.addBorderLayout(container);
+ splitter.addBorderLayout( container );
// Add the four necessary panels for Commander Page: 1. Nav,, 2. List, 3. Info, 4. Detail.
// Nav and info are generic and work across all entities, the others are specific to this entity type.
// 1. Nav Panel:
- NavPanel navPanel = new NavPanel(GlobalIds.NAVPANEL);
- container.add(navPanel);
+ NavPanel navPanel = new NavPanel( GlobalIds.NAVPANEL );
+ container.add( navPanel );
// 2. List Panel:
- container.add(new AjaxLazyLoadPanel("userlistpanel")
+ container.add( new AjaxLazyLoadPanel( "userlistpanel" )
{
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new UserListPanel(id);
- }
- });
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new UserListPanel( id );
+ }
+ } );
// 3. Info Panel:
InfoPanel infoPanel = new InfoPanel( GlobalIds.INFOPANEL );
Displayable display = infoPanel.getDisplay();
- container.add(infoPanel);
+ container.add( infoPanel );
// 4. Detail Panel:
- UserDetailPanel userDetail = new UserDetailPanel("userdetailpanel", display );
- container.add(userDetail);
+ UserDetailPanel userDetail = new UserDetailPanel( "userdetailpanel", display );
+ container.add( userDetail );
- this.add(container);
+ this.add( container );
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 fc00627..25fa721 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import org.apache.directory.fortress.web.GlobalUtils;
import org.apache.directory.fortress.web.SelectModelEvent;
import org.apache.log4j.Logger;
@@ -38,6 +39,7 @@ import org.apache.directory.fortress.core.rbac.AuthZ;
import org.apache.directory.fortress.core.rbac.User;
import org.apache.directory.fortress.core.util.attr.VUtil;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -45,76 +47,87 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
*/
public class AuditAuthzDetailPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private AuditMgr auditMgr;
@SpringBean
private ReviewMgr reviewMgr;
- private static final Logger LOG = Logger.getLogger(AuditAuthzDetailPanel.class.getName());
+ private static final Logger LOG = Logger.getLogger( AuditAuthzDetailPanel.class.getName() );
private Form detailForm;
private Displayable display;
private UserAuditDetailPanel userPanel;
+
public Form getForm()
{
return this.detailForm;
}
+
public AuditAuthzDetailPanel( String id, Displayable display )
{
- super(id);
+ super( id );
this.auditMgr.setAdmin( GlobalUtils.getRbacSession( this ) );
this.reviewMgr.setAdmin( GlobalUtils.getRbacSession( this ) );
- this.detailForm = new AuditAuthzDetailForm(GlobalIds.DETAIL_FIELDS, new CompoundPropertyModel<AuthZ>(new AuthZ()));
+ this.detailForm = new AuditAuthzDetailForm( GlobalIds.DETAIL_FIELDS, new CompoundPropertyModel<AuthZ>(
+ new AuthZ() ) );
this.display = display;
add( detailForm );
}
public class AuditAuthzDetailForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private Component component;
- public AuditAuthzDetailForm(String id, final IModel<AuthZ> model)
+
+ public AuditAuthzDetailForm( String id, final IModel<AuthZ> model )
{
- super(id, model);
+ super( id, model );
add( new Label( GlobalIds.REQ_RESULT ) );
- add( new Label( GlobalIds.REQ_START ) );
+ add( new Label( GlobalIds.REQ_START ) );
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>(new User()) );
+ userPanel = new UserAuditDetailPanel( GlobalIds.USERAUDITDETAILPANEL, new CompoundPropertyModel<User>(
+ new User() ) );
add( userPanel );
setOutputMarkupId( true );
}
+
@Override
- public void onEvent(final IEvent<?> event)
+ public void onEvent( final IEvent<?> event )
{
- if (event.getPayload() instanceof SelectModelEvent )
+ if ( event.getPayload() instanceof SelectModelEvent )
{
- SelectModelEvent modelEvent = (SelectModelEvent) event.getPayload();
- AuthZ authZ = (AuthZ) modelEvent.getEntity();
- this.setModelObject(authZ);
+ SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
+ AuthZ authZ = ( AuthZ ) modelEvent.getEntity();
+ this.setModelObject( authZ );
String msg = "AuthZ: " + authZ.getReqAuthzID() + " has been selected";
LOG.debug( ".onEvent SelectModelEvent: " + authZ.getReqAuthzID() );
- GlobalUtils.getAuthZPerm(authZ.getReqDN() );
- display.setMessage(msg);
+ GlobalUtils.getAuthZPerm( authZ.getReqDN() );
+ display.setMessage( msg );
component = detailForm;
}
- else if (event.getPayload() instanceof AjaxRequestTarget)
+ else if ( event.getPayload() instanceof AjaxRequestTarget )
{
// only add the form to ajax target if something has changed...
- if (component != null)
+ if ( component != null )
{
- AjaxRequestTarget target = ((AjaxRequestTarget) event.getPayload());
+ AjaxRequestTarget target = ( ( AjaxRequestTarget ) event.getPayload() );
LOG.debug( ".onEvent AjaxRequestTarget: " + target.toString() );
- target.add(component);
+ target.add( component );
component = null;
}
- display.display((AjaxRequestTarget) event.getPayload());
+ display.display( ( AjaxRequestTarget ) event.getPayload() );
}
}
+
@Override
protected void onBeforeRender()
{
@@ -122,16 +135,16 @@ public class AuditAuthzDetailPanel extends FormComponentPanel
{
User user = null;
// necessary to push the 'changed' model down into the aggregated panel:
- AuthZ authZ = (AuthZ)detailForm.getModelObject();
- if( VUtil.isNotNullOrEmpty( authZ.getReqAuthzID() ))
+ AuthZ authZ = ( AuthZ ) detailForm.getModelObject();
+ if ( VUtil.isNotNullOrEmpty( authZ.getReqAuthzID() ) )
{
- user = GlobalUtils.getUser(reviewMgr, authZ.getReqAuthzID());
+ user = GlobalUtils.getUser( reviewMgr, authZ.getReqAuthzID() );
}
- if(user == null)
+ if ( user == null )
{
user = new User();
}
- IModel<User> userModel = new CompoundPropertyModel<User>(user);
+ IModel<User> userModel = new CompoundPropertyModel<User>( user );
userPanel.setDefaultModel( userModel );
}
else
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 0588ab1..9df91c2 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.kendo.ui.form.datetime.DatePicker;
import com.inmethod.grid.IGridColumn;
import com.inmethod.grid.SizeUnit;
@@ -63,6 +64,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -70,7 +72,9 @@ import java.util.List;
*/
public class AuditAuthzListPanel extends FormComponentPanel
{
- private static final Logger LOG = Logger.getLogger(AuditAuthzListPanel.class.getName());
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+ private static final Logger LOG = Logger.getLogger( AuditAuthzListPanel.class.getName() );
private Form listForm;
private DefaultTreeModel treeModel;
private DefaultMutableTreeNode node;
@@ -83,50 +87,61 @@ public class AuditAuthzListPanel extends FormComponentPanel
protected DatePicker endDateDP;
private Permission permission;
- public AuditAuthzListPanel(String id, UserAudit userAudit )
+
+ public AuditAuthzListPanel( String id, UserAudit userAudit )
{
- super(id);
+ super( id );
init( userAudit );
}
+
private void init( UserAudit userAudit )
{
- AuditAuthzListModel pageModel = new AuditAuthzListModel(userAudit, GlobalUtils.getRbacSession( this ) );
- setDefaultModel(pageModel);
+ AuditAuthzListModel pageModel = new AuditAuthzListModel( userAudit, GlobalUtils.getRbacSession( this ) );
+ setDefaultModel( pageModel );
createAndLoadGrid();
- this.listForm = new Form("authzform");
- this.listForm.addOrReplace(grid);
+ this.listForm = new Form( "authzform" );
+ this.listForm.addOrReplace( grid );
this.listForm.setModel( new CompoundPropertyModel<UserAudit>( userAudit ) );
addEditFields();
addButtons();
- add(this.listForm);
+ add( this.listForm );
}
+
private void addEditFields()
{
- userFld = new TextField(GlobalIds.USER_ID);
+ userFld = new TextField( GlobalIds.USER_ID );
userFld.setOutputMarkupId( true );
AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( userFld );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( userFld );
+ }
};
userFld.add( ajaxUpdater );
- this.listForm.add(userFld);
+ this.listForm.add( userFld );
addUserSearchModal();
objFld = new TextField( GlobalIds.OBJ_NAME );
objFld.setOutputMarkupId( true );
ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( objFld );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( objFld );
+ }
};
objFld.add( ajaxUpdater );
this.listForm.add( objFld );
@@ -135,11 +150,15 @@ public class AuditAuthzListPanel extends FormComponentPanel
opFld.setOutputMarkupId( true );
ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( opFld );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( opFld );
+ }
};
opFld.add( ajaxUpdater );
this.listForm.add( opFld );
@@ -148,11 +167,15 @@ public class AuditAuthzListPanel extends FormComponentPanel
isAdminCB.setOutputMarkupId( true );
ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( isAdminCB );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( isAdminCB );
+ }
};
isAdminCB.add( ajaxUpdater );
isAdminCB.setRequired( false );
@@ -163,11 +186,15 @@ public class AuditAuthzListPanel extends FormComponentPanel
failedOnlyCB.setOutputMarkupId( true );
ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( failedOnlyCB );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( failedOnlyCB );
+ }
};
failedOnlyCB.add( ajaxUpdater );
failedOnlyCB.setRequired( false );
@@ -177,68 +204,89 @@ public class AuditAuthzListPanel extends FormComponentPanel
failedOnlyCB.setEnabled( false );
// Begin Date
- beginDateDP = new DatePicker(GlobalIds.BEGIN_DATE);
+ beginDateDP = new DatePicker( GlobalIds.BEGIN_DATE );
beginDateDP.setOutputMarkupId( true );
ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( beginDateDP );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( beginDateDP );
+ }
};
beginDateDP.add( ajaxUpdater );
beginDateDP.setRequired( false );
this.listForm.add( beginDateDP );
// End Date
- endDateDP = new DatePicker(GlobalIds.END_DATE);
+ endDateDP = new DatePicker( GlobalIds.END_DATE );
endDateDP.setOutputMarkupId( true );
ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( endDateDP );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( endDateDP );
+ }
};
endDateDP.add( ajaxUpdater );
endDateDP.setRequired( false );
this.listForm.add( endDateDP );
}
+
private void addButtons()
{
- this.listForm.add(new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.AUDIT_MGR, GlobalIds.GET_USER_AUTHZS )
+ this.listForm.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.AUDIT_MGR,
+ GlobalIds.GET_USER_AUTHZS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
- protected void onSubmit(AjaxRequestTarget target, Form form)
+ protected void onSubmit( AjaxRequestTarget target, Form form )
{
LOG.debug( ".search onSubmit" );
- UserAudit userAudit = (UserAudit)listForm.getModelObject();
- if(!VUtil.isNotNullOrEmpty(userAudit.getUserId()))
+ UserAudit userAudit = ( UserAudit ) listForm.getModelObject();
+ if ( !VUtil.isNotNullOrEmpty( userAudit.getUserId() ) )
{
userAudit.setUserId( "" );
}
- if(permission != null)
+ if ( permission != null )
{
userAudit.setDn( permission.getDn() );
}
setResponsePage( new AuditAuthzPage( userAudit ) );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
LOG.warn( ".search.onError" );
throw new RuntimeException( "error submitting form" );
}
+
+
@Override
protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
{
super.updateAjaxAttributes( attributes );
AjaxCallListener ajaxCallListener = new AjaxCallListener()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public CharSequence getFailureHandler( Component component )
{
@@ -247,26 +295,37 @@ public class AuditAuthzListPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
- this.listForm.add(new AjaxSubmitLink(GlobalIds.CLEAR)
+ } );
+ this.listForm.add( new AjaxSubmitLink( GlobalIds.CLEAR )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
- protected void onSubmit(AjaxRequestTarget target, Form form)
+ protected void onSubmit( AjaxRequestTarget target, Form form )
{
setResponsePage( new AuditAuthzPage( new UserAudit() ) );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- LOG.warn("AuditAuthzListPanel.clear.onError");
+ LOG.warn( "AuditAuthzListPanel.clear.onError" );
}
+
+
@Override
protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
{
super.updateAjaxAttributes( attributes );
AjaxCallListener ajaxCallListener = new AjaxCallListener()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public CharSequence getFailureHandler( Component component )
{
@@ -275,87 +334,98 @@ public class AuditAuthzListPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
}
+
private void createAndLoadGrid()
{
List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
PropertyColumn reqStart = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Timestamp"), "userObject.reqStart");
- reqStart.setInitialSize(200);
- columns.add(reqStart);
+ Model.of( "Timestamp" ), "userObject.reqStart" );
+ reqStart.setInitialSize( 200 );
+ columns.add( reqStart );
PropertyColumn requAuthzId = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("User ID"), "userObject.reqAuthzID");
- requAuthzId.setInitialSize(200);
- columns.add(requAuthzId);
+ Model.of( "User ID" ), "userObject.reqAuthzID" );
+ requAuthzId.setInitialSize( 200 );
+ columns.add( requAuthzId );
PropertyColumn reqAttr = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Object Name"), "userObject.reqAttr");
- reqAttr.setInitialSize(300);
- columns.add(reqAttr);
+ Model.of( "Object Name" ), "userObject.reqAttr" );
+ reqAttr.setInitialSize( 300 );
+ columns.add( reqAttr );
PropertyColumn reqDerefAliases = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Object ID"), "userObject.reqDerefAliases");
- reqDerefAliases.setInitialSize(100);
- columns.add(reqDerefAliases);
+ Model.of( "Object ID" ), "userObject.reqDerefAliases" );
+ reqDerefAliases.setInitialSize( 100 );
+ columns.add( reqDerefAliases );
PropertyColumn reqAttrsOnly = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Operation"), "userObject.reqAttrsOnly");
- reqAttrsOnly.setInitialSize(120);
- columns.add(reqAttrsOnly);
+ Model.of( "Operation" ), "userObject.reqAttrsOnly" );
+ reqAttrsOnly.setInitialSize( 120 );
+ columns.add( reqAttrsOnly );
PropertyColumn reqResult = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Result"), "userObject.reqResult");
- reqResult.setInitialSize(80);
- columns.add(reqResult);
+ Model.of( "Result" ), "userObject.reqResult" );
+ reqResult.setInitialSize( 80 );
+ columns.add( reqResult );
- List<AuthZ> authZs = (List<AuthZ>) getDefaultModel().getObject();
- treeModel = createTreeModel(authZs);
- grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>("authztreegrid", treeModel, columns)
+ List<AuthZ> authZs = ( List<AuthZ> ) getDefaultModel().getObject();
+ treeModel = createTreeModel( authZs );
+ grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "authztreegrid", treeModel, columns )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
- public void selectItem(IModel itemModel, boolean selected)
+ public void selectItem( IModel itemModel, boolean selected )
{
- node = (DefaultMutableTreeNode) itemModel.getObject();
- if(!node.isRoot())
+ node = ( DefaultMutableTreeNode ) itemModel.getObject();
+ if ( !node.isRoot() )
{
- AuthZ authZ = (AuthZ) node.getUserObject();
+ AuthZ authZ = ( AuthZ ) node.getUserObject();
LOG.debug( "TreeGrid.addGrid.selectItem selected authZ =" + authZ.getReqAuthzID() );
- if (super.isItemSelected(itemModel))
+ if ( super.isItemSelected( itemModel ) )
{
LOG.debug( "TreeGrid.addGrid.selectItem item is selected" );
- super.selectItem(itemModel, false);
+ super.selectItem( itemModel, false );
}
else
{
- super.selectItem(itemModel, true);
- SelectModelEvent.send(getPage(), this, authZ);
+ super.selectItem( itemModel, true );
+ SelectModelEvent.send( getPage(), this, authZ );
}
}
}
};
- grid.setContentHeight(50, SizeUnit.EM);
- grid.setAllowSelectMultiple(false);
- grid.setClickRowToSelect(true);
- grid.setClickRowToDeselect(false);
- grid.setSelectToEdit(false);
+ grid.setContentHeight( 50, SizeUnit.EM );
+ grid.setAllowSelectMultiple( false );
+ grid.setClickRowToSelect( true );
+ grid.setClickRowToDeselect( false );
+ grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode((TreeNode) treeModel.getRoot());
- grid.setOutputMarkupId(true);
+ grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.setOutputMarkupId( true );
}
+
private void addUserSearchModal()
{
final ModalWindow usersModalWindow;
listForm.add( usersModalWindow = new ModalWindow( "usersearchmodal" ) );
- final UserSearchModalPanel userSearchModalPanel = new UserSearchModalPanel( usersModalWindow.getContentId(), usersModalWindow );
+ final UserSearchModalPanel userSearchModalPanel = new UserSearchModalPanel( usersModalWindow.getContentId(),
+ usersModalWindow );
usersModalWindow.setContent( userSearchModalPanel );
usersModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -363,7 +433,7 @@ public class AuditAuthzListPanel extends FormComponentPanel
if ( userSelection != null )
{
LOG.debug( "modal selected:" + userSelection.getUserId() );
- UserAudit userAudit = (UserAudit)listForm.getModelObject();
+ UserAudit userAudit = ( UserAudit ) listForm.getModelObject();
userAudit.setUserId( userSelection.getUserId() );
target.add( userFld );
}
@@ -371,9 +441,13 @@ public class AuditAuthzListPanel extends FormComponentPanel
} );
listForm.add( new SecureIndicatingAjaxLink( "userAssignLinkLbl", GlobalIds.REVIEW_MGR, GlobalIds.FIND_USERS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public void onClick( AjaxRequestTarget target )
{
- UserAudit userAudit = (UserAudit)listForm.getModelObject();
+ UserAudit userAudit = ( UserAudit ) listForm.getModelObject();
String msg = "clicked on users search";
msg += "userSelection: " + userAudit.getUserId();
userSearchModalPanel.setSearchVal( userAudit.getUserId() );
@@ -381,12 +455,18 @@ public class AuditAuthzListPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
usersModalWindow.show( target );
}
+
+
@Override
protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
{
super.updateAjaxAttributes( attributes );
AjaxCallListener ajaxCallListener = new AjaxCallListener()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public CharSequence getFailureHandler( Component component )
{
@@ -402,22 +482,28 @@ public class AuditAuthzListPanel extends FormComponentPanel
usersModalWindow.setCookieName( "user-search-modal" );
}
+
private void addPermSearchModal()
{
final ModalWindow permsModalWindow;
- UserAudit userAudit = (UserAudit)listForm.getModelObject();
+ UserAudit userAudit = ( UserAudit ) listForm.getModelObject();
listForm.add( permsModalWindow = new ModalWindow( "permsearchmodal" ) );
- final PermSearchModalPanel permSearchModalPanel = new PermSearchModalPanel( permsModalWindow.getContentId(), permsModalWindow, userAudit.isAdmin() );
+ final PermSearchModalPanel permSearchModalPanel = new PermSearchModalPanel( permsModalWindow.getContentId(),
+ permsModalWindow, userAudit.isAdmin() );
permsModalWindow.setContent( permSearchModalPanel );
permsModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
Permission permSelection = permSearchModalPanel.getSelection();
if ( permSelection != null )
{
- UserAudit userAudit = (UserAudit)listForm.getModelObject();
+ UserAudit userAudit = ( UserAudit ) listForm.getModelObject();
LOG.debug( "modal selected:" + permSelection.getAbstractName() );
permission = permSelection;
userAudit.setObjName( permSelection.getObjName() );
@@ -429,9 +515,13 @@ public class AuditAuthzListPanel extends FormComponentPanel
} );
listForm.add( new SecureIndicatingAjaxLink( "permLinkLbl", GlobalIds.REVIEW_MGR, GlobalIds.FIND_PERMISSIONS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public void onClick( AjaxRequestTarget target )
{
- UserAudit userAudit = (UserAudit)listForm.getModelObject();
+ UserAudit userAudit = ( UserAudit ) listForm.getModelObject();
String msg = "clicked on perms search";
msg += "permSelection: " + permission;
permSearchModalPanel.setSearchVal( userAudit.getObjName() );
@@ -440,12 +530,18 @@ public class AuditAuthzListPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
permsModalWindow.show( target );
}
+
+
@Override
protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
{
super.updateAjaxAttributes( attributes );
AjaxCallListener ajaxCallListener = new AjaxCallListener()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public CharSequence getFailureHandler( Component component )
{
@@ -456,7 +552,7 @@ public class AuditAuthzListPanel extends FormComponentPanel
}
} );
String title;
- if(userAudit.isAdmin())
+ if ( userAudit.isAdmin() )
title = "Admin Permission Search Modal";
else
title = "RBAC Permission Search Modal";
@@ -467,58 +563,60 @@ public class AuditAuthzListPanel extends FormComponentPanel
permsModalWindow.setCookieName( "perm-search-modal" );
}
- private DefaultTreeModel createTreeModel(List<AuthZ> authZs)
+
+ private DefaultTreeModel createTreeModel( List<AuthZ> authZs )
{
DefaultTreeModel model;
AuthZ root = new AuthZ();
//root.setReqStart( "Authorizations" );
- rootNode = new DefaultMutableTreeNode(root);
- model = new DefaultTreeModel(rootNode);
- if (authZs == null)
- LOG.debug("no Authorizations found");
+ rootNode = new DefaultMutableTreeNode( root );
+ model = new DefaultTreeModel( rootNode );
+ if ( authZs == null )
+ LOG.debug( "no Authorizations found" );
else
{
- LOG.debug("AuthZ found:" + authZs.size());
- info("Loading " + authZs.size() + " objects into list panel");
+ LOG.debug( "AuthZ found:" + authZs.size() );
+ info( "Loading " + authZs.size() + " objects into list panel" );
loadTree( authZs );
}
return model;
}
- private void loadTree(List<AuthZ> authZs)
+
+ private void loadTree( List<AuthZ> authZs )
{
- for (AuthZ authZ : authZs)
+ for ( AuthZ authZ : authZs )
{
Date start = null;
try
{
start = AttrHelper.decodeGeneralizedTime( authZ.getReqStart() );
}
- catch (ParseException pe)
+ catch ( ParseException pe )
{
LOG.warn( "ParseException=" + pe.getMessage() );
}
- if(start != null)
+ if ( start != null )
{
SimpleDateFormat formatter = new SimpleDateFormat( GlobalIds.AUDIT_TIMESTAMP_FORMAT );
- String formattedDate = formatter.format(start);
+ String formattedDate = formatter.format( start );
authZ.setReqStart( formattedDate );
}
authZ.setReqResult( GlobalIds.FAILURE );
-/*
- TODO: On RC40 - Replace above line with the following:
- if(VUtil.isNotNullOrEmpty( authZ.getReqAssertion() ) && (authZ.getReqAssertion().equals( org.apache.directory.fortress.core.GlobalIds.AUTH_Z_FAILED_VALUE ) ) )
- {
- authZ.setReqResult( GlobalIds.FAILURE );
- }
- else
- {
- authZ.setReqResult( GlobalIds.SUCCESS );
- }
-*/
+ /*
+ TODO: On RC40 - Replace above line with the following:
+ if(VUtil.isNotNullOrEmpty( authZ.getReqAssertion() ) && (authZ.getReqAssertion().equals( org.apache.directory.fortress.core.GlobalIds.AUTH_Z_FAILED_VALUE ) ) )
+ {
+ authZ.setReqResult( GlobalIds.FAILURE );
+ }
+ else
+ {
+ authZ.setReqResult( GlobalIds.SUCCESS );
+ }
+ */
authZ.setReqAuthzID( GlobalUtils.getAuthZId( authZ.getReqAuthzID() ) );
GlobalUtils.mapAuthZPerm( authZ );
- rootNode.add(new DefaultMutableTreeNode(authZ));
+ rootNode.add( new DefaultMutableTreeNode( authZ ) );
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 1ad04d9..edd2efb 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import org.apache.directory.fortress.web.GlobalUtils;
import org.apache.directory.fortress.web.SelectModelEvent;
import org.apache.log4j.Logger;
@@ -38,6 +39,7 @@ import org.apache.directory.fortress.core.rbac.Bind;
import org.apache.directory.fortress.core.rbac.User;
import org.apache.directory.fortress.core.util.attr.VUtil;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -45,73 +47,84 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
*/
public class AuditBindDetailPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private AuditMgr auditMgr;
@SpringBean
private ReviewMgr reviewMgr;
- private static final Logger LOG = Logger.getLogger(AuditBindDetailPanel.class.getName());
+ private static final Logger LOG = Logger.getLogger( AuditBindDetailPanel.class.getName() );
private Form detailForm;
private Displayable display;
private UserAuditDetailPanel userPanel;
+
public Form getForm()
{
return this.detailForm;
}
+
public AuditBindDetailPanel( String id, Displayable display )
{
- super(id);
+ super( id );
this.auditMgr.setAdmin( GlobalUtils.getRbacSession( this ) );
this.reviewMgr.setAdmin( GlobalUtils.getRbacSession( this ) );
- this.detailForm = new AuditBindDetailForm( GlobalIds.DETAIL_FIELDS, new CompoundPropertyModel<Bind>(new Bind()));
+ this.detailForm = new AuditBindDetailForm( GlobalIds.DETAIL_FIELDS,
+ new CompoundPropertyModel<Bind>( new Bind() ) );
this.display = display;
add( detailForm );
}
public class AuditBindDetailForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private Component component;
- public AuditBindDetailForm(String id, final IModel<Bind> model)
+
+ public AuditBindDetailForm( String id, final IModel<Bind> model )
{
- super(id, model);
+ super( id, model );
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>(new User()) );
+ add( new Label( GlobalIds.REQ_START ) );
+ userPanel = new UserAuditDetailPanel( GlobalIds.USERAUDITDETAILPANEL, new CompoundPropertyModel<User>(
+ new User() ) );
add( userPanel );
setOutputMarkupId( true );
}
+
@Override
- public void onEvent(final IEvent<?> event)
+ public void onEvent( final IEvent<?> event )
{
- if (event.getPayload() instanceof SelectModelEvent )
+ if ( event.getPayload() instanceof SelectModelEvent )
{
- SelectModelEvent modelEvent = (SelectModelEvent) event.getPayload();
- Bind bind = (Bind) modelEvent.getEntity();
- this.setModelObject(bind);
+ SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
+ Bind bind = ( Bind ) modelEvent.getEntity();
+ this.setModelObject( bind );
String msg = "Bind: " + bind.getReqDN() + " has been selected";
LOG.debug( ".onEvent SelectModelEvent: " + bind.getReqDN() );
- display.setMessage(msg);
+ display.setMessage( msg );
component = detailForm;
}
- else if (event.getPayload() instanceof AjaxRequestTarget)
+ else if ( event.getPayload() instanceof AjaxRequestTarget )
{
// only add the form to ajax target if something has changed...
- if (component != null)
+ if ( component != null )
{
- AjaxRequestTarget target = ((AjaxRequestTarget) event.getPayload());
+ AjaxRequestTarget target = ( ( AjaxRequestTarget ) event.getPayload() );
LOG.debug( ".onEvent AjaxRequestTarget: " + target.toString() );
- target.add(component);
+ target.add( component );
component = null;
}
- display.display((AjaxRequestTarget) event.getPayload());
+ display.display( ( AjaxRequestTarget ) event.getPayload() );
}
}
+
@Override
protected void onBeforeRender()
{
@@ -119,16 +132,16 @@ public class AuditBindDetailPanel extends FormComponentPanel
{
User user = null;
// necessary to push the 'changed' model down into the aggregated panel:
- Bind bind = (Bind)detailForm.getModelObject();
- if( VUtil.isNotNullOrEmpty( bind.getReqDN() ))
+ Bind bind = ( Bind ) detailForm.getModelObject();
+ if ( VUtil.isNotNullOrEmpty( bind.getReqDN() ) )
{
- user = GlobalUtils.getUser(reviewMgr, bind.getReqDN());
+ user = GlobalUtils.getUser( reviewMgr, bind.getReqDN() );
}
- if(user == null)
+ if ( user == null )
{
user = new User();
}
- IModel<User> userModel = new CompoundPropertyModel<User>(user);
+ IModel<User> userModel = new CompoundPropertyModel<User>( user );
userPanel.setDefaultModel( userModel );
}
else
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 cd3edbe..5295be9 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.kendo.ui.form.datetime.DatePicker;
import com.inmethod.grid.IGridColumn;
import com.inmethod.grid.SizeUnit;
@@ -65,6 +66,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -72,7 +74,9 @@ import java.util.List;
*/
public class AuditBindListPanel extends FormComponentPanel
{
- private static final Logger LOG = Logger.getLogger(AuditBindListPanel.class.getName());
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+ private static final Logger LOG = Logger.getLogger( AuditBindListPanel.class.getName() );
private Form listForm;
private DefaultTreeModel treeModel;
private DefaultMutableTreeNode node;
@@ -83,114 +87,146 @@ public class AuditBindListPanel extends FormComponentPanel
protected DatePicker endDateDP;
private IModel<SerializableList<Bind>> pageModel;
- public AuditBindListPanel(String id, UserAudit userAudit )
+
+ public AuditBindListPanel( String id, UserAudit userAudit )
{
super( id );
init( userAudit );
}
+
private void init( UserAudit userAudit )
{
- pageModel = new AuditBindListModel(userAudit, GlobalUtils.getRbacSession( this ) );
- setDefaultModel(pageModel);
+ pageModel = new AuditBindListModel( userAudit, GlobalUtils.getRbacSession( this ) );
+ setDefaultModel( pageModel );
createAndLoadGrid();
- this.listForm = new Form("bindform");
- this.listForm.addOrReplace(grid);
+ this.listForm = new Form( "bindform" );
+ this.listForm.addOrReplace( grid );
this.listForm.setModel( new CompoundPropertyModel<UserAudit>( userAudit ) );
addEditFields();
addButtons();
- add(this.listForm);
+ add( this.listForm );
}
+
private void addEditFields()
{
- userFld = new TextField(GlobalIds.USER_ID);
+ userFld = new TextField( GlobalIds.USER_ID );
userFld.setOutputMarkupId( true );
AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( userFld );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( userFld );
+ }
};
userFld.add( ajaxUpdater );
- this.listForm.add(userFld);
+ this.listForm.add( userFld );
addUserSearchModal();
final CheckBox failedOnlyCB = new CheckBox( GlobalIds.FAILED_ONLY );
failedOnlyCB.setOutputMarkupId( true );
ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( failedOnlyCB );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( failedOnlyCB );
+ }
};
failedOnlyCB.add( ajaxUpdater );
failedOnlyCB.setRequired( false );
this.listForm.add( failedOnlyCB );
// Begin Date
- beginDateDP = new DatePicker(GlobalIds.BEGIN_DATE);
+ beginDateDP = new DatePicker( GlobalIds.BEGIN_DATE );
beginDateDP.setOutputMarkupId( true );
ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( beginDateDP );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( beginDateDP );
+ }
};
beginDateDP.add( ajaxUpdater );
beginDateDP.setRequired( false );
this.listForm.add( beginDateDP );
// End Date
- endDateDP = new DatePicker(GlobalIds.END_DATE);
+ endDateDP = new DatePicker( GlobalIds.END_DATE );
endDateDP.setOutputMarkupId( true );
ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( endDateDP );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( endDateDP );
+ }
};
endDateDP.add( ajaxUpdater );
endDateDP.setRequired( false );
this.listForm.add( endDateDP );
}
+
private void addButtons()
{
- this.listForm.add(new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.AUDIT_MGR, GlobalIds.GET_USER_BINDS )
+ this.listForm.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.AUDIT_MGR,
+ GlobalIds.GET_USER_BINDS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
- protected void onSubmit(AjaxRequestTarget target, Form form)
+ protected void onSubmit( AjaxRequestTarget target, Form form )
{
LOG.debug( ".search onSubmit" );
- UserAudit userAudit = (UserAudit)listForm.getModelObject();
- if(!VUtil.isNotNullOrEmpty(userAudit.getUserId()))
+ UserAudit userAudit = ( UserAudit ) listForm.getModelObject();
+ if ( !VUtil.isNotNullOrEmpty( userAudit.getUserId() ) )
{
userAudit.setUserId( "" );
}
setResponsePage( new AuditBindPage( userAudit ) );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
LOG.warn( ".search.onError" );
throw new RuntimeException( "error submitting form" );
}
+
+
@Override
protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
{
super.updateAjaxAttributes( attributes );
AjaxCallListener ajaxCallListener = new AjaxCallListener()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public CharSequence getFailureHandler( Component component )
{
@@ -199,26 +235,37 @@ public class AuditBindListPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
- this.listForm.add(new AjaxSubmitLink(GlobalIds.CLEAR)
+ } );
+ this.listForm.add( new AjaxSubmitLink( GlobalIds.CLEAR )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
- protected void onSubmit(AjaxRequestTarget target, Form form)
+ protected void onSubmit( AjaxRequestTarget target, Form form )
{
setResponsePage( new AuditBindPage( new UserAudit() ) );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- LOG.warn("AuditBindListPanel.clear.onError");
+ LOG.warn( "AuditBindListPanel.clear.onError" );
}
+
+
@Override
protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
{
super.updateAjaxAttributes( attributes );
AjaxCallListener ajaxCallListener = new AjaxCallListener()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public CharSequence getFailureHandler( Component component )
{
@@ -227,71 +274,82 @@ public class AuditBindListPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
}
+
private void createAndLoadGrid()
{
List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
PropertyColumn reqStart = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Timestamp"), "userObject.reqStart");
- reqStart.setInitialSize(200);
- columns.add(reqStart);
+ Model.of( "Timestamp" ), "userObject.reqStart" );
+ reqStart.setInitialSize( 200 );
+ columns.add( reqStart );
PropertyColumn requAuthzId = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("User ID"), "userObject.reqDN");
- requAuthzId.setInitialSize(200);
- columns.add(requAuthzId);
+ Model.of( "User ID" ), "userObject.reqDN" );
+ requAuthzId.setInitialSize( 200 );
+ columns.add( requAuthzId );
PropertyColumn reqResult = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Result"), "userObject.reqResult");
- reqResult.setInitialSize(80);
- columns.add(reqResult);
+ Model.of( "Result" ), "userObject.reqResult" );
+ reqResult.setInitialSize( 80 );
+ columns.add( reqResult );
- List<Bind> binds = (List<Bind>) getDefaultModel().getObject();
- treeModel = createTreeModel(binds);
- grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>("bindtreegrid", treeModel, columns)
+ List<Bind> binds = ( List<Bind> ) getDefaultModel().getObject();
+ treeModel = createTreeModel( binds );
+ grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "bindtreegrid", treeModel, columns )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
- public void selectItem(IModel itemModel, boolean selected)
+ public void selectItem( IModel itemModel, boolean selected )
{
- node = (DefaultMutableTreeNode) itemModel.getObject();
- if(!node.isRoot())
+ node = ( DefaultMutableTreeNode ) itemModel.getObject();
+ if ( !node.isRoot() )
{
- Bind bind = (Bind) node.getUserObject();
+ Bind bind = ( Bind ) node.getUserObject();
LOG.debug( "TreeGrid.addGrid.selectItem selected bind =" + bind.getReqDN() );
- if (super.isItemSelected(itemModel))
+ if ( super.isItemSelected( itemModel ) )
{
LOG.debug( "TreeGrid.addGrid.selectItem item is selected" );
- super.selectItem(itemModel, false);
+ super.selectItem( itemModel, false );
}
else
{
- super.selectItem(itemModel, true);
- SelectModelEvent.send(getPage(), this, bind);
+ super.selectItem( itemModel, true );
+ SelectModelEvent.send( getPage(), this, bind );
}
}
}
};
- grid.setContentHeight(50, SizeUnit.EM);
- grid.setAllowSelectMultiple(false);
- grid.setClickRowToSelect(true);
- grid.setClickRowToDeselect(false);
- grid.setSelectToEdit(false);
+ grid.setContentHeight( 50, SizeUnit.EM );
+ grid.setAllowSelectMultiple( false );
+ grid.setClickRowToSelect( true );
+ grid.setClickRowToDeselect( false );
+ grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode((TreeNode) treeModel.getRoot());
- grid.setOutputMarkupId(true);
+ grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.setOutputMarkupId( true );
}
+
private void addUserSearchModal()
{
final ModalWindow usersModalWindow;
listForm.add( usersModalWindow = new ModalWindow( "usersearchmodal" ) );
- final UserSearchModalPanel userSearchModalPanel = new UserSearchModalPanel( usersModalWindow.getContentId(), usersModalWindow );
+ final UserSearchModalPanel userSearchModalPanel = new UserSearchModalPanel( usersModalWindow.getContentId(),
+ usersModalWindow );
usersModalWindow.setContent( userSearchModalPanel );
usersModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -307,6 +365,10 @@ public class AuditBindListPanel extends FormComponentPanel
} );
listForm.add( new SecureIndicatingAjaxLink( "userAssignLinkLbl", GlobalIds.REVIEW_MGR, GlobalIds.FIND_USERS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public void onClick( AjaxRequestTarget target )
{
UserAudit userAudit = ( UserAudit ) listForm.getModelObject();
@@ -317,12 +379,18 @@ public class AuditBindListPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
usersModalWindow.show( target );
}
+
+
@Override
protected void updateAjaxAttributes( AjaxRequestAttributes attributes )
{
super.updateAjaxAttributes( attributes );
AjaxCallListener ajaxCallListener = new AjaxCallListener()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public CharSequence getFailureHandler( Component component )
{
@@ -338,44 +406,46 @@ public class AuditBindListPanel extends FormComponentPanel
usersModalWindow.setCookieName( "user-search-modal" );
}
- private DefaultTreeModel createTreeModel(List<Bind> binds)
+
+ private DefaultTreeModel createTreeModel( List<Bind> binds )
{
DefaultTreeModel model;
Bind root = new Bind();
//root.setReqAuthzID( "Authentications" );
- rootNode = new DefaultMutableTreeNode(root);
- model = new DefaultTreeModel(rootNode);
- if (binds == null)
- LOG.debug("no Authentications found");
+ rootNode = new DefaultMutableTreeNode( root );
+ model = new DefaultTreeModel( rootNode );
+ if ( binds == null )
+ LOG.debug( "no Authentications found" );
else
{
- LOG.debug("Binds found:" + binds.size());
- info("Loading " + binds.size() + " objects into list panel");
+ LOG.debug( "Binds found:" + binds.size() );
+ info( "Loading " + binds.size() + " objects into list panel" );
loadTree( binds );
}
return model;
}
- private void loadTree(List<Bind> binds)
+
+ private void loadTree( List<Bind> binds )
{
- for (Bind bind : binds)
+ for ( Bind bind : binds )
{
Date start = null;
try
{
start = AttrHelper.decodeGeneralizedTime( bind.getReqStart() );
}
- catch (ParseException pe)
+ catch ( ParseException pe )
{
LOG.warn( "ParseException=" + pe.getMessage() );
}
- if(start != null)
+ if ( start != null )
{
SimpleDateFormat formatter = new SimpleDateFormat( GlobalIds.AUDIT_TIMESTAMP_FORMAT );
- String formattedDate = formatter.format(start);
+ String formattedDate = formatter.format( start );
bind.setReqStart( formattedDate );
}
- if(bind.getReqResult().equals( GlobalIds.BIND_SUCCESS_CODE ))
+ if ( bind.getReqResult().equals( GlobalIds.BIND_SUCCESS_CODE ) )
{
bind.setReqResult( GlobalIds.SUCCESS );
}
@@ -384,7 +454,7 @@ public class AuditBindListPanel extends FormComponentPanel
bind.setReqResult( GlobalIds.FAILURE );
}
bind.setReqDN( GlobalUtils.getAuthZId( bind.getReqDN() ) );
- rootNode.add(new DefaultMutableTreeNode(bind));
+ rootNode.add( new DefaultMutableTreeNode( bind ) );
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 da1de81..fea2b17 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.kendo.ui.datatable.DataTable;
import com.googlecode.wicket.kendo.ui.datatable.column.IColumn;
@@ -49,6 +50,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
import java.util.ArrayList;
import java.util.List;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -56,6 +58,8 @@ import java.util.List;
*/
public class AuditModDetailPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
public static final int MOD_OFFSET = 3;
public static final int ROWS = 5;
@SpringBean
@@ -67,11 +71,13 @@ public class AuditModDetailPanel extends FormComponentPanel
private Displayable display;
private UserAuditDetailPanel userPanel;
+
public Form getForm()
{
return this.detailForm;
}
+
public AuditModDetailPanel( String id, Displayable display )
{
super( id );
@@ -84,6 +90,8 @@ public class AuditModDetailPanel extends FormComponentPanel
public class AuditAuthzDetailForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private Component component;
private String ftModifier;
private String ftModCode;
@@ -94,6 +102,7 @@ public class AuditModDetailPanel extends FormComponentPanel
private List<IColumn> columns;
private Options options;
+
public AuditAuthzDetailForm( String id, final IModel<Mod> model )
{
super( id, model );
@@ -112,12 +121,14 @@ public class AuditModDetailPanel extends FormComponentPanel
add( new Label( "reqType" ) );
add( new Label( GlobalIds.REQ_DN ) );
add( new Label( GlobalIds.REQ_START ) );
- userPanel = new UserAuditDetailPanel( GlobalIds.USERAUDITDETAILPANEL, new CompoundPropertyModel<User>( new User()
- ) );
+ userPanel = new UserAuditDetailPanel( GlobalIds.USERAUDITDETAILPANEL, new CompoundPropertyModel<User>(
+ new User()
+ ) );
add( userPanel );
setOutputMarkupId( true );
}
+
@Override
public void onEvent( final IEvent<?> event )
{
@@ -125,7 +136,7 @@ public class AuditModDetailPanel extends FormComponentPanel
{
SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
Mod mod = ( Mod ) modelEvent.getEntity();
- this.setModelObject(mod);
+ this.setModelObject( mod );
String msg = "Mod: " + mod.getReqAuthzID() + " has been selected";
LOG.debug( ".onEvent SelectModelEvent: " + mod.getReqAuthzID() );
List<RequestMod> modifications = parseRequestMods( mod.getReqMod() );
@@ -179,6 +190,7 @@ public class AuditModDetailPanel extends FormComponentPanel
}
}
+
private List<RequestMod> parseRequestMods( List<String> mods )
{
List<RequestMod> results = new ArrayList<RequestMod>();
@@ -227,6 +239,7 @@ public class AuditModDetailPanel extends FormComponentPanel
}
}
+
private IDataProvider<RequestMod> createDataProvider( List<RequestMod> mods )
{
ListDataProvider<RequestMod> results;
@@ -241,6 +254,7 @@ public class AuditModDetailPanel extends FormComponentPanel
return results;
}
+
private List<IColumn> newColumnList()
{
List<IColumn> columns = new ArrayList<IColumn>();