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:27 UTC
[01/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
Repository: directory-fortress-commander
Updated Branches:
refs/heads/master 8ebaf94f9 -> b012c3091
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 0a46e31..fdc71e5 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
@@ -67,6 +68,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
+
/**
* Created with IntelliJ IDEA.
* User: kpmckinn
@@ -76,6 +78,8 @@ import java.util.ArrayList;
*/
public class UserDetailPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private AdminMgr adminMgr;
@SpringBean
@@ -84,6 +88,7 @@ public class UserDetailPanel extends FormComponentPanel
private Form editForm;
private Displayable display;
+
public UserDetailPanel( String id, Displayable display )
{
super( id );
@@ -99,6 +104,8 @@ public class UserDetailPanel extends FormComponentPanel
*/
public class UserDetailForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
// form constants:
private static final String OU = "ou";
private static final String ROLES = "roles";
@@ -162,6 +169,7 @@ public class UserDetailPanel extends FormComponentPanel
private TextField pwPolicyTF;
private TextField ouTF;
+
public UserDetailForm( String id, final IModel<User> model )
{
super( id, model );
@@ -175,12 +183,14 @@ public class UserDetailPanel extends FormComponentPanel
setOutputMarkupId( true );
}
+
private void addDetailFields( final IModel<User> model )
{
// Add the User page required attributes:
TextField userId = new TextField( GlobalIds.USER_ID );
add( userId );
- PasswordTextField pw = new PasswordTextField( GlobalIds.PSWD_FIELD, new PropertyModel<String>( this, GlobalIds.PSWD_FIELD ) );
+ PasswordTextField pw = new PasswordTextField( GlobalIds.PSWD_FIELD, new PropertyModel<String>( this,
+ GlobalIds.PSWD_FIELD ) );
pw.setRequired( false );
add( pw );
TextField description = new TextField( GlobalIds.DESCRIPTION );
@@ -214,8 +224,9 @@ public class UserDetailPanel extends FormComponentPanel
// Add the adminRole assignment values & temporal constraint panel:
adminRolesCB = new ComboBox<UserAdminRole>( ADMIN_ROLES, new PropertyModel<String>( this,
- ADMIN_ROLE_SELECTION ), model.getObject().getAdminRoles(), new ChoiceRenderer<UserAdminRole>( GlobalIds.NAME
- ) );
+ ADMIN_ROLE_SELECTION ), model.getObject().getAdminRoles(), new ChoiceRenderer<UserAdminRole>(
+ GlobalIds.NAME
+ ) );
adminRolesCB.setOutputMarkupId( true );
add( adminRolesCB );
adminRoleConstraintPanel = new ConstraintAdminRolePanel( ADMINROLECONSTRAINTPANEL,
@@ -249,7 +260,8 @@ public class UserDetailPanel extends FormComponentPanel
add( name );
// Address ComboBoxes and edit fields
- addressCB = new ComboBox<String>( GlobalIds.ADDRESSES, new PropertyModel<String>( this, ADDRESS_SELECTION ),
+ addressCB = new ComboBox<String>( GlobalIds.ADDRESSES,
+ new PropertyModel<String>( this, ADDRESS_SELECTION ),
model.getObject().getAddress().getAddresses() );
add( addressCB );
TextField city = new TextField( GlobalIds.ADDRESS_CITY );
@@ -298,10 +310,15 @@ public class UserDetailPanel extends FormComponentPanel
}
+
private void addButtons()
{
add( new SecureIndicatingAjaxButton( GlobalIds.ADD, GlobalIds.ADMIN_MGR, GlobalIds.ADD_USER )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -335,18 +352,25 @@ public class UserDetailPanel extends FormComponentPanel
}
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.info( "UserDetailPanel.add.onError" );
target.add();
}
+
+
@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 )
{
@@ -358,6 +382,10 @@ public class UserDetailPanel extends FormComponentPanel
} );
add( new SecureIndicatingAjaxButton( GlobalIds.COMMIT, GlobalIds.ADMIN_MGR, GlobalIds.UPDATE_USER )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -393,17 +421,24 @@ public class UserDetailPanel extends FormComponentPanel
}
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "UserDetailPanel.commit.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 )
{
@@ -415,6 +450,10 @@ public class UserDetailPanel extends FormComponentPanel
} );
add( new SecureIndicatingAjaxButton( GlobalIds.DELETE, GlobalIds.ADMIN_MGR, GlobalIds.DELETE_USER )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -436,17 +475,24 @@ public class UserDetailPanel extends FormComponentPanel
}
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "UserDetailPanel.delete.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 )
{
@@ -458,6 +504,10 @@ public class UserDetailPanel extends FormComponentPanel
} );
add( new AjaxSubmitLink( GlobalIds.CANCEL )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -466,17 +516,24 @@ public class UserDetailPanel extends FormComponentPanel
display.setMessage( msg );
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "UserDetailPanel.cancel.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 )
{
@@ -488,6 +545,10 @@ public class UserDetailPanel extends FormComponentPanel
} );
add( new AjaxSubmitLink( "save" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -502,17 +563,24 @@ public class UserDetailPanel extends FormComponentPanel
initAccordionLabels( user );
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "save.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 )
{
@@ -523,36 +591,41 @@ public class UserDetailPanel extends FormComponentPanel
}
} );
Label lockBtnLbl = new Label( "lockLabel", new PropertyModel<String>( this, "lockLabel" ) );
- SecureIndicatingAjaxButton lock = new SecureIndicatingAjaxButton( "lockbtn", GlobalIds.ADMIN_MGR, "lockUserAccount" )
+ SecureIndicatingAjaxButton lock = new SecureIndicatingAjaxButton( "lockbtn", GlobalIds.ADMIN_MGR,
+ "lockUserAccount" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
User user = ( User ) form.getModel().getObject();
-/*
- if ( pswdField != null )
- {
- user.setPassword( pswdField.toCharArray() );
- }
- else
- {
- user.setPassword( "".toCharArray() );
- }
-*/
+ /*
+ if ( pswdField != null )
+ {
+ user.setPassword( pswdField.toCharArray() );
+ }
+ else
+ {
+ user.setPassword( "".toCharArray() );
+ }
+ */
String msg = "User: " + user.getUserId();
try
{
- if(user.isLocked())
+ if ( user.isLocked() )
{
adminMgr.unlockUserAccount( user );
user.setLocked( false );
- msg+= " account has been unlocked";
+ msg += " account has been unlocked";
}
else
{
adminMgr.lockUserAccount( user );
user.setLocked( true );
- msg+= " account has been locked";
+ msg += " account has been locked";
display.setMessage( msg );
}
}
@@ -567,17 +640,24 @@ public class UserDetailPanel extends FormComponentPanel
initAccordionLabels( user );
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "ControlPanel.lock/unlock error" );
}
+
+
@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 )
{
@@ -591,6 +671,10 @@ public class UserDetailPanel extends FormComponentPanel
add( lock );
add( new SecureIndicatingAjaxButton( "resetbtn", GlobalIds.ADMIN_MGR, "resetPassword" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -608,7 +692,7 @@ public class UserDetailPanel extends FormComponentPanel
{
adminMgr.resetPassword( user, user.getPassword() );
user.setReset( true );
- msg+= " account has been reset";
+ msg += " account has been reset";
display.setMessage( msg );
}
catch ( org.apache.directory.fortress.core.SecurityException se )
@@ -621,17 +705,25 @@ public class UserDetailPanel extends FormComponentPanel
component = editForm;
initAccordionLabels( user );
}
+
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "ControlPanel.reset error" );
}
+
+
@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 )
{
@@ -640,24 +732,28 @@ public class UserDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
add( new SecureIndicatingAjaxButton( GlobalIds.ASSIGN, GlobalIds.ADMIN_MGR, GlobalIds.ASSIGN_USER )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
log.debug( ".onSubmit assign" );
-/*
- HttpServletRequest servletReq = ( HttpServletRequest ) getRequest().getContainerRequest();
- if ( servletReq.isUserInRole( "rbac_admin" ) )
- {
- log.debug( "User has RBAC_ADMIN" );
- }
- else
- {
- log.debug( "User NOT RBAC_ADMIN" );
- }
-*/
+ /*
+ HttpServletRequest servletReq = ( HttpServletRequest ) getRequest().getContainerRequest();
+ if ( servletReq.isUserInRole( "rbac_admin" ) )
+ {
+ log.debug( "User has RBAC_ADMIN" );
+ }
+ else
+ {
+ log.debug( "User NOT RBAC_ADMIN" );
+ }
+ */
User user = ( User ) form.getModel().getObject();
if ( assignRole( user, roleSelection ) )
@@ -672,17 +768,24 @@ public class UserDetailPanel extends FormComponentPanel
roleConstraint = new UserRole();
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "assign.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 )
{
@@ -694,6 +797,10 @@ public class UserDetailPanel extends FormComponentPanel
} );
add( new SecureIndicatingAjaxButton( "assignAdminRole", GlobalIds.DEL_ADMIN_MGR, GlobalIds.ASSIGN_USER )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -712,17 +819,24 @@ public class UserDetailPanel extends FormComponentPanel
adminRoleConstraint = new UserAdminRole();
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "assignAdminRole.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 )
{
@@ -734,6 +848,10 @@ public class UserDetailPanel extends FormComponentPanel
} );
add( new SecureIndicatingAjaxButton( GlobalIds.DEASSIGN, GlobalIds.ADMIN_MGR, GlobalIds.DEASSIGN_USER )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -753,17 +871,24 @@ public class UserDetailPanel extends FormComponentPanel
roleConstraint = new UserRole();
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "deassign.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 )
{
@@ -775,6 +900,10 @@ public class UserDetailPanel extends FormComponentPanel
} );
add( new SecureIndicatingAjaxButton( "deassignAdminRole", GlobalIds.DEL_ADMIN_MGR, GlobalIds.DEASSIGN_USER )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -795,17 +924,24 @@ public class UserDetailPanel extends FormComponentPanel
adminRoleConstraint = new UserAdminRole();
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "ControlPanel.deassignAdminRole.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 )
{
@@ -817,8 +953,10 @@ public class UserDetailPanel extends FormComponentPanel
} );
add( new AjaxButton( "address.delete" )
{
+ /** Default serialVersionUID */
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -847,12 +985,18 @@ public class UserDetailPanel extends FormComponentPanel
display.setMessage( msg );
log.debug( msg );
}
+
+
@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 )
{
@@ -866,6 +1010,7 @@ public class UserDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -894,12 +1039,18 @@ public class UserDetailPanel extends FormComponentPanel
display.setMessage( msg );
log.debug( msg );
}
+
+
@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 )
{
@@ -911,8 +1062,10 @@ public class UserDetailPanel extends FormComponentPanel
} );
add( new AjaxButton( "phones.delete" )
{
+ /** Default serialVersionUID */
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -941,12 +1094,18 @@ public class UserDetailPanel extends FormComponentPanel
display.setMessage( msg );
log.debug( msg );
}
+
+
@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 )
{
@@ -960,6 +1119,7 @@ public class UserDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -988,12 +1148,18 @@ public class UserDetailPanel extends FormComponentPanel
display.setMessage( msg );
log.debug( msg );
}
+
+
@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 )
{
@@ -1010,14 +1176,20 @@ public class UserDetailPanel extends FormComponentPanel
addOUSearchModal();
}
+
private void addRoleSearchModal()
{
final ModalWindow rolesModalWindow;
add( rolesModalWindow = new ModalWindow( "rolesmodal" ) );
- final RoleSearchModalPanel roleSearchModalPanel = new RoleSearchModalPanel( rolesModalWindow.getContentId(), rolesModalWindow, false );
+ final RoleSearchModalPanel roleSearchModalPanel = new RoleSearchModalPanel(
+ rolesModalWindow.getContentId(), rolesModalWindow, false );
rolesModalWindow.setContent( roleSearchModalPanel );
rolesModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -1035,6 +1207,7 @@ public class UserDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -1046,12 +1219,18 @@ public class UserDetailPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
rolesModalWindow.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 )
{
@@ -1068,14 +1247,20 @@ public class UserDetailPanel extends FormComponentPanel
rolesModalWindow.setCookieName( "role-assign-modal" );
}
+
private void addAdminRoleSearchModal()
{
final ModalWindow adminRolesModalWindow;
add( adminRolesModalWindow = new ModalWindow( "adminrolesmodal" ) );
- final RoleSearchModalPanel adminRoleSearchModalPanel = new RoleSearchModalPanel( adminRolesModalWindow.getContentId(), adminRolesModalWindow, true );
+ final RoleSearchModalPanel adminRoleSearchModalPanel = new RoleSearchModalPanel(
+ adminRolesModalWindow.getContentId(), adminRolesModalWindow, true );
adminRolesModalWindow.setContent( adminRoleSearchModalPanel );
adminRolesModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -1093,6 +1278,7 @@ public class UserDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -1104,12 +1290,18 @@ public class UserDetailPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
adminRolesModalWindow.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 )
{
@@ -1126,14 +1318,20 @@ public class UserDetailPanel extends FormComponentPanel
adminRolesModalWindow.setCookieName( "adminrole-assign-modal" );
}
+
private void addPolicySearchModal()
{
final ModalWindow policiesModalWindow;
add( policiesModalWindow = new ModalWindow( "policiesmodal" ) );
- final PwPolicySearchModalPanel policySearchModalPanel = new PwPolicySearchModalPanel( policiesModalWindow.getContentId(), policiesModalWindow );
+ final PwPolicySearchModalPanel policySearchModalPanel = new PwPolicySearchModalPanel(
+ policiesModalWindow.getContentId(), policiesModalWindow );
policiesModalWindow.setContent( policySearchModalPanel );
policiesModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -1151,6 +1349,7 @@ public class UserDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -1163,12 +1362,18 @@ public class UserDetailPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
policiesModalWindow.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 )
{
@@ -1185,14 +1390,20 @@ public class UserDetailPanel extends FormComponentPanel
policiesModalWindow.setCookieName( "policy-modal" );
}
+
private void addOUSearchModal()
{
final ModalWindow ousModalWindow;
add( ousModalWindow = new ModalWindow( "ousmodal" ) );
- final OUSearchModalPanel ouSearchModalPanel = new OUSearchModalPanel( ousModalWindow.getContentId(), ousModalWindow, true );
+ final OUSearchModalPanel ouSearchModalPanel = new OUSearchModalPanel( ousModalWindow.getContentId(),
+ ousModalWindow, true );
ousModalWindow.setContent( ouSearchModalPanel );
ousModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -1210,24 +1421,31 @@ public class UserDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
String msg = "clicked on OrgUnits search";
User user = ( User ) editForm.getModel().getObject();
msg += user.getOu() != null ? ": " + user.getOu() : "";
- ouSearchModalPanel.setSearchVal( user.getOu( ) );
+ ouSearchModalPanel.setSearchVal( user.getOu() );
display.setMessage( msg );
log.debug( msg );
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
ousModalWindow.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 )
{
@@ -1244,6 +1462,7 @@ public class UserDetailPanel extends FormComponentPanel
ousModalWindow.setCookieName( "userou-modal" );
}
+
private void info( ComboBox<String> comboBox )
{
String choice = comboBox.getModelObject();
@@ -1252,6 +1471,7 @@ public class UserDetailPanel extends FormComponentPanel
log.debug( msg );
}
+
private void clearDetailPanel()
{
setModelObject( new User() );
@@ -1271,7 +1491,8 @@ public class UserDetailPanel extends FormComponentPanel
mobilesCB = new ComboBox<String>( GlobalIds.MOBILES, new PropertyModel<String>( this, MOBILES_SELECTION ),
new ArrayList<String>() );
editForm.addOrReplace( mobilesCB );
- addressCB = new ComboBox<String>( GlobalIds.ADDRESSES, new PropertyModel<String>( this, ADDRESS_SELECTION ),
+ addressCB = new ComboBox<String>( GlobalIds.ADDRESSES,
+ new PropertyModel<String>( this, ADDRESS_SELECTION ),
new ArrayList<String>() );
editForm.addOrReplace( addressCB );
@@ -1280,7 +1501,8 @@ public class UserDetailPanel extends FormComponentPanel
rolesCB.setOutputMarkupId( true );
editForm.addOrReplace( rolesCB );
adminRolesCB = new ComboBox<UserAdminRole>( ADMIN_ROLES, new PropertyModel<String>( this,
- ADMIN_ROLE_SELECTION ), new ArrayList<UserAdminRole>(), new ChoiceRenderer<UserAdminRole>( GlobalIds.NAME ) );
+ ADMIN_ROLE_SELECTION ), new ArrayList<UserAdminRole>(), new ChoiceRenderer<UserAdminRole>(
+ GlobalIds.NAME ) );
adminRolesCB.setOutputMarkupId( true );
editForm.addOrReplace( adminRolesCB );
modelChanged();
@@ -1289,6 +1511,7 @@ public class UserDetailPanel extends FormComponentPanel
initAccordionLabels();
}
+
private void addLabels()
{
// Add the page labels:
@@ -1304,12 +1527,17 @@ public class UserDetailPanel extends FormComponentPanel
add( new Label( IMPORT_PHOTO_LABEL, new PropertyModel<String>( this, IMPORT_PHOTO_LABEL ) ) );
}
+
private void addPhoto()
{
this.defaultImage = readJpegFile( DEFAULT_JPG );
// Add the photograph controls:
add( new JpegImage( GlobalIds.JPEGPHOTO )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected byte[] getPhoto()
{
@@ -1325,6 +1553,10 @@ public class UserDetailPanel extends FormComponentPanel
} );
add( new JpegImage( GlobalIds.JPEGPHOTO + "2" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected byte[] getPhoto()
{
@@ -1342,6 +1574,7 @@ public class UserDetailPanel extends FormComponentPanel
add( upload );
}
+
private void updateEntityWithComboData( User user )
{
if ( VUtil.isNotNullOrEmpty( emailsSelection ) )
@@ -1362,6 +1595,7 @@ public class UserDetailPanel extends FormComponentPanel
}
}
+
private boolean assignRole( User user, String szRoleName )
{
boolean success = false;
@@ -1398,6 +1632,7 @@ public class UserDetailPanel extends FormComponentPanel
return success;
}
+
private boolean deassignRole( User user, UserRole userRole )
{
boolean success = false;
@@ -1419,6 +1654,7 @@ public class UserDetailPanel extends FormComponentPanel
return success;
}
+
private boolean assignAdminRole( User user, String szAdminRoleName )
{
boolean success = false;
@@ -1456,6 +1692,7 @@ public class UserDetailPanel extends FormComponentPanel
return success;
}
+
private boolean deassignAdminRole( User user, UserAdminRole userAdminRole )
{
boolean success = false;
@@ -1477,6 +1714,7 @@ public class UserDetailPanel extends FormComponentPanel
return success;
}
+
@Override
public void onEvent( final IEvent<?> event )
{
@@ -1485,7 +1723,7 @@ public class UserDetailPanel extends FormComponentPanel
clearDetailPanel();
SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
final User user = ( User ) modelEvent.getEntity();
- this.setModelObject(user);
+ this.setModelObject( user );
initAccordionLabels( user );
String msg = "User: " + user.getUserId() + " has been selected";
log.debug( msg );
@@ -1494,6 +1732,10 @@ public class UserDetailPanel extends FormComponentPanel
user.getRoles(), new ChoiceRenderer<UserRole>( GlobalIds.NAME ) );
AjaxFormComponentUpdatingBehavior roleAjaxUpdater = new AjaxFormComponentUpdatingBehavior( "onchange" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onUpdate( final AjaxRequestTarget target )
{
@@ -1525,6 +1767,10 @@ public class UserDetailPanel extends FormComponentPanel
AjaxFormComponentUpdatingBehavior adminRoleAjaxUpdater = new AjaxFormComponentUpdatingBehavior(
"onchange" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onUpdate( final AjaxRequestTarget target )
{
@@ -1558,10 +1804,12 @@ public class UserDetailPanel extends FormComponentPanel
phonesCB = new ComboBox<String>( GlobalIds.PHONES, new PropertyModel<String>( this, PHONES_SELECTION ),
user.getPhones() );
editForm.addOrReplace( phonesCB );
- mobilesCB = new ComboBox<String>( GlobalIds.MOBILES, new PropertyModel<String>( this, MOBILES_SELECTION ),
+ mobilesCB = new ComboBox<String>( GlobalIds.MOBILES,
+ new PropertyModel<String>( this, MOBILES_SELECTION ),
user.getMobiles() );
editForm.addOrReplace( mobilesCB );
- addressCB = new ComboBox<String>( GlobalIds.ADDRESSES, new PropertyModel<String>( this, ADDRESS_SELECTION ),
+ addressCB = new ComboBox<String>( GlobalIds.ADDRESSES, new PropertyModel<String>( this,
+ ADDRESS_SELECTION ),
user.getAddress().getAddresses() );
editForm.addOrReplace( addressCB );
roleConstraint = new UserRole();
@@ -1587,6 +1835,7 @@ public class UserDetailPanel extends FormComponentPanel
}
}
+
@Override
protected void onBeforeRender()
{
@@ -1602,6 +1851,7 @@ public class UserDetailPanel extends FormComponentPanel
super.onBeforeRender();
}
+
private void initAccordionLabels()
{
userDetailLabel = "User Detail";
@@ -1611,10 +1861,11 @@ public class UserDetailPanel extends FormComponentPanel
contactInformationLabel = "Contact Information";
}
+
private void initAccordionLabels( User user )
{
boolean isSet = false;
- if(user.isLocked())
+ if ( user.isLocked() )
{
lockLabel = "Unlock";
}
@@ -1684,13 +1935,14 @@ public class UserDetailPanel extends FormComponentPanel
}
}
String szName = user.getDisplayName();
- if(!VUtil.isNotNullOrEmpty( szName ))
+ if ( !VUtil.isNotNullOrEmpty( szName ) )
{
szName = user.getCn();
}
contactInformationLabel = "Contact Information for: " + szName;
}
+
private void initSelectionModels()
{
roleSelection = "";
@@ -1702,6 +1954,7 @@ public class UserDetailPanel extends FormComponentPanel
}
}
+
private byte[] readJpegFile( String fileName )
{
URL fUrl = UserDetailPanel.class.getClassLoader().getResource( fileName );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 f41e353..d80a2f7 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.inmethod.grid.IGridColumn;
import com.inmethod.grid.SizeUnit;
import com.inmethod.grid.column.PropertyColumn;
@@ -67,12 +68,15 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class UserListPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final Logger LOG = Logger.getLogger( UserListPanel.class.getName() );
private Form listForm;
private DefaultTreeModel treeModel;
@@ -110,6 +114,7 @@ public class UserListPanel extends FormComponentPanel
private static String OU_SEARCH_LABEL = "Search By User Organization";
private static String PERM_SEARCH_LABEL = "Search By Permission";
+
public UserListPanel( String id )
{
super( id );
@@ -124,11 +129,16 @@ public class UserListPanel extends FormComponentPanel
addButtons();
}
+
private void addRadioButtons()
{
radioGroup = new RadioGroup( "searchOptions", new PropertyModel( this, "selectedRadioButton" ) );
AjaxFormComponentUpdatingBehavior ajaxRadioUpdater = new AjaxFormChoiceComponentUpdatingBehavior()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onUpdate( final AjaxRequestTarget target )
{
@@ -159,6 +169,7 @@ public class UserListPanel extends FormComponentPanel
addPermSearchModal( permRb );
}
+
private void addSearchFields()
{
searchFields = new WebMarkupContainer( "searchfields" );
@@ -173,6 +184,10 @@ public class UserListPanel extends FormComponentPanel
f1Fld.setOutputMarkupId( true );
AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onUpdate( final AjaxRequestTarget target )
{
@@ -186,6 +201,10 @@ public class UserListPanel extends FormComponentPanel
f2Fld.setOutputMarkupId( true );
ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onUpdate( final AjaxRequestTarget target )
{
@@ -199,11 +218,16 @@ public class UserListPanel extends FormComponentPanel
userformsearchfields.add( searchFields );
}
+
private void addButtons()
{
userformsearchfields.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.REVIEW_MGR,
GlobalIds.FIND_USERS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -271,6 +295,7 @@ public class UserListPanel extends FormComponentPanel
target.add( grid );
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
@@ -280,24 +305,34 @@ public class UserListPanel extends FormComponentPanel
} );
userformsearchfields.add( new AjaxSubmitLink( GlobalIds.CLEAR )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
setResponsePage( new UserPage() );
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
LOG.warn( "UserListPanel.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 )
{
@@ -309,6 +344,7 @@ public class UserListPanel extends FormComponentPanel
} );
}
+
private void addRoleSearchModal( Radio roleRb )
{
final ModalWindow rolesModalWindow;
@@ -318,6 +354,10 @@ public class UserListPanel extends FormComponentPanel
rolesModalWindow.setContent( roleSearchModalPanel );
rolesModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -336,6 +376,10 @@ public class UserListPanel extends FormComponentPanel
roleRb.add( new SecureIndicatingAjaxLink( "roleAssignLinkLbl", GlobalIds.REVIEW_MGR, GlobalIds.FIND_ROLES )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public void onClick( AjaxRequestTarget target )
{
String msg = "clicked on roles search";
@@ -346,12 +390,17 @@ public class UserListPanel extends FormComponentPanel
rolesModalWindow.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 )
{
@@ -367,6 +416,7 @@ public class UserListPanel extends FormComponentPanel
rolesModalWindow.setCookieName( "role-assign-modal" );
}
+
private void addAdminRoleSearchModal( Radio adminRoleRb )
{
final ModalWindow adminRolesModalWindow;
@@ -376,6 +426,10 @@ public class UserListPanel extends FormComponentPanel
adminRolesModalWindow.setContent( adminRoleSearchModalPanel );
adminRolesModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -394,6 +448,10 @@ public class UserListPanel extends FormComponentPanel
adminRoleRb.add( new SecureIndicatingAjaxLink( "adminRoleAssignLinkLbl", GlobalIds.DEL_REVIEW_MGR,
GlobalIds.FIND_ROLES )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public void onClick( AjaxRequestTarget target )
{
String msg = "clicked on admin roles search";
@@ -405,12 +463,17 @@ public class UserListPanel extends FormComponentPanel
adminRolesModalWindow.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 )
{
@@ -426,6 +489,7 @@ public class UserListPanel extends FormComponentPanel
adminRolesModalWindow.setCookieName( "role-assign-modal" );
}
+
private void addOUSearchModal( Radio ouRb )
{
final ModalWindow ousModalWindow;
@@ -435,6 +499,10 @@ public class UserListPanel extends FormComponentPanel
ousModalWindow.setContent( ouSearchModalPanel );
ousModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -451,6 +519,10 @@ public class UserListPanel extends FormComponentPanel
} );
ouRb.add( new SecureIndicatingAjaxLink( "ouAssignLinkLbl", GlobalIds.DEL_REVIEW_MGR, "searchOU" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public void onClick( AjaxRequestTarget target )
{
String msg = "clicked on ou search";
@@ -460,12 +532,17 @@ public class UserListPanel extends FormComponentPanel
ousModalWindow.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 )
{
@@ -482,6 +559,7 @@ public class UserListPanel extends FormComponentPanel
ousModalWindow.setCookieName( "userou-modal" );
}
+
@Override
public void onEvent( IEvent event )
{
@@ -509,6 +587,7 @@ public class UserListPanel extends FormComponentPanel
}
}
+
private void addPermSearchModal( Radio permRb )
{
final ModalWindow permsModalWindow;
@@ -518,6 +597,10 @@ public class UserListPanel extends FormComponentPanel
permsModalWindow.setContent( permSearchModalPanel );
permsModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -535,6 +618,10 @@ public class UserListPanel extends FormComponentPanel
} );
permRb.add( new SecureIndicatingAjaxLink( "permLinkLbl", GlobalIds.REVIEW_MGR, GlobalIds.FIND_PERMISSIONS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public void onClick( AjaxRequestTarget target )
{
String msg = "clicked on perms search";
@@ -550,12 +637,17 @@ public class UserListPanel extends FormComponentPanel
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 )
{
@@ -571,6 +663,7 @@ public class UserListPanel extends FormComponentPanel
permsModalWindow.setCookieName( "perm-search-modal" );
}
+
private void removeSelectedItems( TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid )
{
Collection<IModel<DefaultMutableTreeNode>> selected = grid.getSelectedItems();
@@ -585,6 +678,7 @@ public class UserListPanel extends FormComponentPanel
}
}
+
private DefaultTreeModel createTreeModel( List<User> users )
{
DefaultTreeModel model;
@@ -607,16 +701,16 @@ public class UserListPanel extends FormComponentPanel
return model;
}
+
private void addGrid()
{
- List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode,
- String>> columns = new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
+ List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns = new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
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" ) );
-*/
+ /*
+ 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" );
ou.setInitialSize( 150 );
@@ -631,16 +725,16 @@ public class UserListPanel extends FormComponentPanel
String>( Model.of( "State" ), "userObject.Address.State" );
state.setInitialSize( 50 );
columns.add( state );
-/*
- PropertyColumn locked = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Lock"), "userObject.locked");
- locked.setInitialSize(40);
- columns.add(locked);
- PropertyColumn reset = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Reset"), "userObject.reset");
- reset.setInitialSize(40);
- columns.add(reset);
-*/
+ /*
+ PropertyColumn locked = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+ Model.of("Lock"), "userObject.locked");
+ locked.setInitialSize(40);
+ columns.add(locked);
+ PropertyColumn reset = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+ Model.of("Reset"), "userObject.reset");
+ reset.setInitialSize(40);
+ columns.add(reset);
+ */
PropertyColumn roles = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String,
String>( Model.of( "RBAC Role Assignments" ), "userObject.Roles" );
roles.setInitialSize( 400 );
@@ -654,6 +748,10 @@ public class UserListPanel extends FormComponentPanel
treeModel = createTreeModel( users );
grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "usertreegrid", treeModel, columns )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void selectItem( IModel itemModel, boolean selected )
{
@@ -688,6 +786,7 @@ public class UserListPanel extends FormComponentPanel
grid.setOutputMarkupId( true );
}
+
public void add( FortEntity entity )
{
if ( getDefaultModelObject() != null )
@@ -700,11 +799,13 @@ public class UserListPanel extends FormComponentPanel
}
}
+
public void prune()
{
removeSelectedItems( grid );
}
+
private void enableOuSearch()
{
f2Fld.setVisible( false );
@@ -713,6 +814,7 @@ public class UserListPanel extends FormComponentPanel
searchFieldsLabel = OU_SEARCH_LABEL;
}
+
private void enableAdminSearch()
{
f2Fld.setVisible( false );
@@ -721,6 +823,7 @@ public class UserListPanel extends FormComponentPanel
searchFieldsLabel = ADMIN_SEARCH_LABEL;
}
+
private void enableRoleSearch()
{
f2Fld.setVisible( false );
@@ -729,6 +832,7 @@ public class UserListPanel extends FormComponentPanel
searchFieldsLabel = ROLE_SEARCH_LABEL;
}
+
private void enableUserSearch()
{
f2Fld.setVisible( false );
@@ -737,6 +841,7 @@ public class UserListPanel extends FormComponentPanel
searchFieldsLabel = USER_SEARCH_LABEL;
}
+
private void enablePermSearch()
{
f2Fld.setVisible( true );
@@ -746,6 +851,7 @@ public class UserListPanel extends FormComponentPanel
searchFieldsLabel = PERM_SEARCH_LABEL;
}
+
private void processRadioButton( AjaxRequestTarget target )
{
LOG.debug( "RADIO Button: " + selectedRadioButton );
@@ -775,35 +881,43 @@ public class UserListPanel extends FormComponentPanel
class SearchFields implements Serializable
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private String field1;
private String field2;
private String field3;
+
String getField1()
{
return field1;
}
+
void setField1( String field1 )
{
this.field1 = field1;
}
+
String getField2()
{
return field2;
}
+
void setField2( String field2 )
{
this.field2 = field2;
}
+
String getField3()
{
return field3;
}
+
void setField3( String field3 )
{
this.field3 = field3;
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
index 514921e..ca85bc4 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import java.util.List;
import org.apache.log4j.Logger;
@@ -39,6 +40,7 @@ import org.apache.directory.fortress.web.GlobalUtils;
import org.apache.directory.fortress.core.ReviewMgr;
import org.apache.directory.fortress.core.rbac.User;
+
/**
*
* @author Shawn McKinney
@@ -46,17 +48,20 @@ import org.apache.directory.fortress.core.rbac.User;
*/
public class UserSearchModalPanel extends Panel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private ReviewMgr reviewMgr;
- private static final Logger LOG = Logger.getLogger(UserSearchModalPanel.class.getName());
+ private static final Logger LOG = Logger.getLogger( UserSearchModalPanel.class.getName() );
private ModalWindow window;
private User userSelection;
private String userSearchVal;
+
/**
* @param id
*/
- public UserSearchModalPanel( String id, ModalWindow window)
+ public UserSearchModalPanel( String id, ModalWindow window )
{
super( id );
// TODO: add later:
@@ -65,6 +70,7 @@ public class UserSearchModalPanel extends Panel
loadPanel();
}
+
public void loadPanel()
{
LoadableDetachableModel requests = getListViewModel();
@@ -73,10 +79,15 @@ public class UserSearchModalPanel extends Panel
add( new AjaxPagingNavigator( "usernavigator", policyView ) );
}
+
private PageableListView createListView( final LoadableDetachableModel requests )
{
final PageableListView listView = new PageableListView( "userdataview", requests, 10 )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void populateItem( final ListItem item )
{
@@ -85,8 +96,9 @@ public class UserSearchModalPanel extends Panel
{
private static final long serialVersionUID = 1L;
+
@Override
- public void onClick(AjaxRequestTarget target)
+ public void onClick( AjaxRequestTarget target )
{
userSelection = modelObject;
window.close( target );
@@ -99,6 +111,10 @@ public class UserSearchModalPanel extends Panel
item.add( new Label( GlobalIds.TITLE, new PropertyModel( item.getModel(), GlobalIds.TITLE ) ) );
item.add( new JpegImage( GlobalIds.JPEGPHOTO )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected byte[] getPhoto()
{
@@ -112,10 +128,15 @@ public class UserSearchModalPanel extends Panel
return listView;
}
+
private LoadableDetachableModel getListViewModel()
{
final LoadableDetachableModel ret = new LoadableDetachableModel()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected Object load()
{
@@ -123,7 +144,7 @@ public class UserSearchModalPanel extends Panel
try
{
userSelection = null;
- if(userSearchVal == null)
+ if ( userSearchVal == null )
userSearchVal = "";
users = reviewMgr.findUsers( new User( userSearchVal ) );
}
@@ -138,11 +159,13 @@ public class UserSearchModalPanel extends Panel
return ret;
}
+
public User getUserSelection()
{
return userSelection;
}
+
public void setSearchVal( String searchVal )
{
this.userSearchVal = searchVal;
[04/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 0344dda..bc77532 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
import org.apache.log4j.Logger;
@@ -54,6 +55,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
import java.util.ArrayList;
import java.util.List;
+
/**
* Created with IntelliJ IDEA.
* User: kpmckinn
@@ -63,10 +65,12 @@ import java.util.List;
*/
public class PermDetailPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private AdminMgr adminMgr;
private static final String ROLES_SELECTION = "rolesSelection";
- private static final Logger log = Logger.getLogger(PermDetailPanel.class.getName());
+ private static final Logger log = Logger.getLogger( PermDetailPanel.class.getName() );
private Form editForm;
private Displayable display;
private boolean isAdmin;
@@ -74,23 +78,28 @@ public class PermDetailPanel extends FormComponentPanel
@SpringBean
private DelAdminMgr delAdminMgr;
+
public Form getForm()
{
return this.editForm;
}
- public PermDetailPanel(String id, Displayable display, final boolean isAdmin)
+
+ public PermDetailPanel( String id, Displayable display, final boolean isAdmin )
{
- super(id);
+ super( id );
this.isAdmin = isAdmin;
this.adminMgr.setAdmin( GlobalUtils.getRbacSession( this ) );
- this.editForm = new PermDetailForm(GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<Permission>(new Permission()));
+ this.editForm = new PermDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<Permission>(
+ new Permission() ) );
this.display = display;
- add(editForm);
+ add( editForm );
}
public class PermDetailForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private ComboBox<String> rolesCB;
private Component component;
private String rolesSelection;
@@ -99,49 +108,61 @@ public class PermDetailPanel extends FormComponentPanel
private TextField objectTF;
- public PermDetailForm(String id, final IModel<Permission> model)
+ public PermDetailForm( String id, final IModel<Permission> model )
{
- super(id, model);
+ super( id, model );
add( new SecureIndicatingAjaxButton( GlobalIds.ADD, GlobalIds.ADMIN_MGR, "addPermission" )
{
+ /** 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(".onSubmit Add");
- Permission perm = (Permission)form.getModel().getObject();
+ log.debug( ".onSubmit Add" );
+ Permission perm = ( Permission ) form.getModel().getObject();
perm.setAdmin( isAdmin );
- updateEntityWithComboData(perm);
+ updateEntityWithComboData( perm );
try
{
- adminMgr.addPermission(perm);
+ adminMgr.addPermission( perm );
roles.add( rolesSelection );
rolesSelection = "";
component = editForm;
- SaveModelEvent.send(getPage(), this, perm, target, SaveModelEvent.Operations.ADD);
- String msg = "Perm objName: " + perm.getObjName() + " opName: " + perm.getOpName() + " has been added";
- display.setMessage(msg);
+ SaveModelEvent.send( getPage(), this, perm, target, SaveModelEvent.Operations.ADD );
+ String msg = "Perm objName: " + perm.getObjName() + " opName: " + perm.getOpName()
+ + " has been added";
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.info("PermDetailPanel.add.onError caught");
+ log.info( "PermDetailPanel.add.onError caught" );
target.add();
}
+
+
@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 )
{
@@ -150,60 +171,72 @@ public class PermDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
add( new SecureIndicatingAjaxButton( GlobalIds.COMMIT, GlobalIds.ADMIN_MGR, "updatePermission" )
{
+ /** 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(".onSubmit Commit");
- Permission perm = (Permission)form.getModel().getObject();
+ log.debug( ".onSubmit Commit" );
+ Permission perm = ( Permission ) form.getModel().getObject();
perm.setAdmin( isAdmin );
- updateEntityWithComboData(perm);
+ updateEntityWithComboData( perm );
try
{
- if(isAdmin )
+ if ( isAdmin )
{
- if(VUtil.isNotNullOrEmpty( rolesSelection ) )
+ if ( VUtil.isNotNullOrEmpty( rolesSelection ) )
{
- delAdminMgr.grantPermission( perm, new AdminRole(rolesSelection) );
+ delAdminMgr.grantPermission( perm, new AdminRole( rolesSelection ) );
}
else
{
- delAdminMgr.updatePermission(perm);
+ delAdminMgr.updatePermission( perm );
}
}
else
{
- adminMgr.updatePermission(perm);
+ adminMgr.updatePermission( perm );
}
roles.add( rolesSelection );
- String msg = "Perm objName: " + perm.getObjName() + " opName: " + perm.getOpName() + " has been updated";
- SaveModelEvent.send(getPage(), this, perm, target, SaveModelEvent.Operations.UPDATE);
+ String msg = "Perm objName: " + perm.getObjName() + " opName: " + perm.getOpName()
+ + " has been updated";
+ SaveModelEvent.send( getPage(), this, perm, target, SaveModelEvent.Operations.UPDATE );
rolesSelection = "";
component = editForm;
- display.setMessage(msg);
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("PermDetailPanel.commit.onError");
+ log.warn( "PermDetailPanel.commit.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 )
{
@@ -212,49 +245,62 @@ public class PermDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
add( new SecureIndicatingAjaxButton( GlobalIds.DELETE, GlobalIds.ADMIN_MGR, "deletePermission" )
{
+ /** 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(".onSubmit Delete");
- Permission perm = (Permission)form.getModel().getObject();
+ log.debug( ".onSubmit Delete" );
+ Permission perm = ( Permission ) form.getModel().getObject();
perm.setAdmin( isAdmin );
try
{
- adminMgr.deletePermission(perm);
+ adminMgr.deletePermission( perm );
form.setModelObject( new Permission() );
rolesSelection = "";
roles = new ArrayList<String>();
- rolesCB = new ComboBox<String>( "roles", new PropertyModel<String>( editForm, ROLES_SELECTION ),roles );
- editForm.addOrReplace(rolesCB);
+ rolesCB = new ComboBox<String>( "roles",
+ new PropertyModel<String>( editForm, ROLES_SELECTION ), roles );
+ editForm.addOrReplace( rolesCB );
modelChanged();
- String msg = "Perm objName: " + perm.getObjName() + " opName: " + perm.getOpName() + " has been deleted";
- SaveModelEvent.send(getPage(), this, perm, target, SaveModelEvent.Operations.DELETE);
+ String msg = "Perm objName: " + perm.getObjName() + " opName: " + perm.getOpName()
+ + " has been deleted";
+ SaveModelEvent.send( getPage(), this, perm, target, SaveModelEvent.Operations.DELETE );
component = editForm;
- display.setMessage(msg);
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("ControlPanel.delete.onError");
+ log.warn( "ControlPanel.delete.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 )
{
@@ -263,34 +309,46 @@ public class PermDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
- add(new AjaxSubmitLink(GlobalIds.CANCEL)
+ } );
+ add( new AjaxSubmitLink( GlobalIds.CANCEL )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
- protected void onSubmit(AjaxRequestTarget target, Form form)
+ protected void onSubmit( AjaxRequestTarget target, Form form )
{
- setModelObject(new Permission());
+ setModelObject( new Permission() );
modelChanged();
rolesSelection = "";
roles = new ArrayList<String>();
- rolesCB = new ComboBox<String>( "roles", new PropertyModel<String>( editForm, ROLES_SELECTION ),roles );
- editForm.addOrReplace(rolesCB);
+ rolesCB = new ComboBox<String>( "roles", new PropertyModel<String>( editForm, ROLES_SELECTION ),
+ roles );
+ editForm.addOrReplace( rolesCB );
String msg = "Perm cancelled input form";
component = editForm;
- display.setMessage(msg);
+ display.setMessage( msg );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("ControlPanel.cancel.onError");
+ log.warn( "ControlPanel.cancel.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 )
{
@@ -299,7 +357,7 @@ public class PermDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
objectTF = new TextField( GlobalIds.OBJ_NAME );
// making this required prevents the object modal from opening when field empty:
@@ -308,7 +366,7 @@ public class PermDetailPanel extends FormComponentPanel
add( objectTF );
addObjectSearchModal();
- if(isAdmin)
+ if ( isAdmin )
{
add( new Label( "permDetailLabel", "Administrative Permission Operation Detail" ) );
}
@@ -317,21 +375,22 @@ public class PermDetailPanel extends FormComponentPanel
add( new Label( "permDetailLabel", "RBAC Permission Operation Detail" ) );
}
- TextField opName = new TextField(GlobalIds.OP_NAME);
- add(opName);
- opName.setRequired(false);
+ TextField opName = new TextField( GlobalIds.OP_NAME );
+ add( opName );
+ opName.setRequired( false );
TextField objId = new TextField( GlobalIds.OBJECT_ID );
- add(objId);
- Label internalId = new Label("internalId");
- add(internalId);
+ add( objId );
+ Label internalId = new Label( "internalId" );
+ add( internalId );
rolesCB = new ComboBox<String>( "roles", new PropertyModel<String>( this, ROLES_SELECTION ), roles );
- add(rolesCB);
- setOutputMarkupId(true);
+ add( rolesCB );
+ setOutputMarkupId( true );
addRoleSearchModal();
add( new AjaxButton( "roles.delete" )
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -343,7 +402,7 @@ public class PermDetailPanel extends FormComponentPanel
if ( perm.getRoles() != null )
{
perm.getRoles().remove( rolesSelection );
- roles.remove( rolesSelection );
+ roles.remove( rolesSelection );
rolesSelection = "";
component = editForm;
msg += ", was removed from local, commit to persist changes on server";
@@ -360,12 +419,18 @@ public class PermDetailPanel extends FormComponentPanel
display.setMessage( msg );
log.debug( msg );
}
+
+
@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 )
{
@@ -377,14 +442,20 @@ public class PermDetailPanel extends FormComponentPanel
} );
}
+
private void addObjectSearchModal()
{
final ModalWindow objectsModalWindow;
add( objectsModalWindow = new ModalWindow( "objectsmodal" ) );
- final ObjectSearchModalPanel objectSearchModalPanel = new ObjectSearchModalPanel( objectsModalWindow.getContentId(), objectsModalWindow, isAdmin );
+ final ObjectSearchModalPanel objectSearchModalPanel = new ObjectSearchModalPanel(
+ objectsModalWindow.getContentId(), objectsModalWindow, isAdmin );
objectsModalWindow.setContent( objectSearchModalPanel );
objectsModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -402,6 +473,7 @@ public class PermDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -415,12 +487,18 @@ public class PermDetailPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
objectsModalWindow.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 )
{
@@ -432,7 +510,7 @@ public class PermDetailPanel extends FormComponentPanel
} );
String modalLabel;
- if(isAdmin)
+ if ( isAdmin )
{
modalLabel = "Admin Permission Object Selection Modal";
}
@@ -446,14 +524,20 @@ public class PermDetailPanel extends FormComponentPanel
objectsModalWindow.setCookieName( "objects-modal" );
}
+
private void addRoleSearchModal()
{
final ModalWindow rolesModalWindow;
add( rolesModalWindow = new ModalWindow( "permrolesmodal" ) );
- final RoleSearchModalPanel roleSearchModalPanel = new RoleSearchModalPanel( rolesModalWindow.getContentId(), rolesModalWindow, isAdmin );
+ final RoleSearchModalPanel roleSearchModalPanel = new RoleSearchModalPanel(
+ rolesModalWindow.getContentId(), rolesModalWindow, isAdmin );
rolesModalWindow.setContent( roleSearchModalPanel );
rolesModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -470,6 +554,7 @@ public class PermDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -481,12 +566,18 @@ public class PermDetailPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
rolesModalWindow.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 )
{
@@ -498,7 +589,7 @@ public class PermDetailPanel extends FormComponentPanel
} );
String modalLabel;
- if(isAdmin)
+ if ( isAdmin )
{
modalLabel = "Admin Role Selection Modal";
}
@@ -512,50 +603,53 @@ public class PermDetailPanel extends FormComponentPanel
rolesModalWindow.setCookieName( "role-assign-modal" );
}
- private void updateEntityWithComboData(Permission perm)
+
+ private void updateEntityWithComboData( Permission perm )
{
String szValue = rolesCB.getModelObject();
- if(VUtil.isNotNullOrEmpty(szValue))
+ if ( VUtil.isNotNullOrEmpty( szValue ) )
{
- perm.setRole(szValue);
+ perm.setRole( szValue );
}
}
+
@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();
- Permission perm = (Permission) modelEvent.getEntity();
- this.setModelObject(perm);
+ SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
+ Permission perm = ( Permission ) modelEvent.getEntity();
+ this.setModelObject( perm );
rolesSelection = "";
- if(VUtil.isNotNullOrEmpty(perm.getRoles()))
+ 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<String>( perm.getRoles() );
+ rolesCB = new ComboBox<String>( "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 );
+ rolesCB = new ComboBox<String>( "roles", new PropertyModel<String>( this, ROLES_SELECTION ), roles );
}
- editForm.addOrReplace(rolesCB);
- String msg = "Perm objName: " + perm.getObjName() + " opName: " + perm.getOpName() + " has been selected";
- log.debug(msg);
+ editForm.addOrReplace( rolesCB );
+ String msg = "Perm objName: " + perm.getObjName() + " opName: " + perm.getOpName()
+ + " has been selected";
+ log.debug( msg );
component = editForm;
}
- else if (event.getPayload() instanceof AjaxRequestTarget)
+ else if ( event.getPayload() instanceof AjaxRequestTarget )
{
- if (component != null)
+ if ( component != null )
{
- AjaxRequestTarget target = ((AjaxRequestTarget) event.getPayload());
- log.debug(".onEvent AjaxRequestTarget: " + target.toString());
- target.add(component);
+ AjaxRequestTarget target = ( ( AjaxRequestTarget ) event.getPayload() );
+ log.debug( ".onEvent AjaxRequestTarget: " + target.toString() );
+ target.add( component );
component = null;
}
- display.display((AjaxRequestTarget) event.getPayload());
+ display.display( ( AjaxRequestTarget ) event.getPayload() );
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 4ec43e2..70f2724 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.inmethod.grid.IGridColumn;
import com.inmethod.grid.SizeUnit;
import com.inmethod.grid.column.PropertyColumn;
@@ -57,6 +58,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+
/**
*
* @author Shawn McKinney
@@ -64,8 +66,10 @@ import java.util.List;
*/
public class PermListPanel extends FormComponentPanel
{
- private static final Logger log = Logger.getLogger(PermListPanel.class.getName());
- private Form listForm;
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = Logger.getLogger( PermListPanel.class.getName() );
+ private Form<?> listForm;
private DefaultTreeModel treeModel;
private DefaultMutableTreeNode node;
private TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid;
@@ -75,22 +79,25 @@ public class PermListPanel extends FormComponentPanel
private TextField permObjectFld;
private boolean isAdmin;
- public PermListPanel(String id, final boolean isAdmin)
+
+ public PermListPanel( String id, final boolean isAdmin )
{
- super(id);
+ super( id );
+
this.isAdmin = isAdmin;
- PermListModel permListModel = new PermListModel(new Permission("", ""), isAdmin, GlobalUtils.getRbacSession(
- this ));
- setDefaultModel(permListModel);
+ PermListModel permListModel = new PermListModel( new Permission( "", "" ),
+ isAdmin, GlobalUtils.getRbacSession( this ) );
+ setDefaultModel( permListModel );
List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
- PropertyColumn objName = new PropertyColumn(new Model("Object Name"), "userObject.ObjName");
+ PropertyColumn objName = new PropertyColumn( new Model( "Object Name" ), "userObject.ObjName" );
objName.setInitialSize( 250 );
- columns.add(objName);
- columns.add(new PropertyColumn(new Model("Object Id"), "userObject.ObjId"));
- columns.add(new PropertyColumn(new Model("Operation Name"), "userObject.OpName"));
+ columns.add( objName );
+ columns.add( new PropertyColumn( new Model( "Object Id" ), "userObject.ObjId" ) );
+ columns.add( new PropertyColumn( new Model( "Operation Name" ), "userObject.OpName" ) );
String roleAssignLabel;
- if(isAdmin)
+
+ if ( isAdmin )
{
roleAssignLabel = "Admin Role Assignments";
}
@@ -99,133 +106,179 @@ public class PermListPanel extends FormComponentPanel
roleAssignLabel = "RBAC Role Assignments";
}
- PropertyColumn roles = new PropertyColumn(new Model(roleAssignLabel), "userObject.Roles");
- roles.setInitialSize(500);
- columns.add(roles);
- PropertyColumn abstractPermName = new PropertyColumn(new Model("Abstract Perm Name"), "userObject.AbstractName");
+ PropertyColumn roles = new PropertyColumn( new Model( roleAssignLabel ), "userObject.Roles" );
+ roles.setInitialSize( 500 );
+ columns.add( roles );
+ PropertyColumn abstractPermName = new PropertyColumn( new Model( "Abstract Perm Name" ),
+ "userObject.AbstractName" );
abstractPermName.setInitialSize( 300 );
- columns.add(abstractPermName);
+ columns.add( abstractPermName );
- List<Permission> perms = (List<Permission>) getDefaultModel().getObject();
- treeModel = createTreeModel(perms);
- grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>("permtreegrid", treeModel, columns)
+ List<Permission> perms = ( List<Permission> ) getDefaultModel().getObject();
+ treeModel = createTreeModel( perms );
+
+ grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "permtreegrid", 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() )
{
- Permission perm = (Permission) node.getUserObject();
- log.debug("TreeGrid.addGrid.selectItem selected perm objNm: " + perm.getObjName() + " opNm: " + perm.getOpName());
- if (super.isItemSelected(itemModel))
+ Permission perm = ( Permission ) node.getUserObject();
+ log.debug( "TreeGrid.addGrid.selectItem selected perm objNm: " + perm.getObjName() + " opNm: "
+ + perm.getOpName() );
+
+ if ( super.isItemSelected( itemModel ) )
{
- log.debug("TreeGrid.addGrid.selectItem item is selected");
- super.selectItem(itemModel, false);
+ log.debug( "TreeGrid.addGrid.selectItem item is selected" );
+ super.selectItem( itemModel, false );
}
else
{
- super.selectItem(itemModel, true);
- SelectModelEvent.send(getPage(), this, perm);
+ super.selectItem( itemModel, true );
+ SelectModelEvent.send( getPage(), this, perm );
}
}
}
};
- 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());
- this.listForm = new Form("form");
- this.listForm.add(grid);
- grid.setOutputMarkupId(true);
- add(this.listForm);
- permObjectFld = new TextField("permObject", new PropertyModel<String>(this, "permObject"));
+ grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ listForm = new Form( "form" );
+ listForm.add( grid );
+ grid.setOutputMarkupId( true );
+ add( listForm );
+ permObjectFld = new TextField( "permObject", new PropertyModel<String>( this, "permObject" ) );
permObjectFld.setOutputMarkupId( true );
- AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior(GlobalIds.ONBLUR)
+
+ AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( permObjectFld );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( permObjectFld );
+ }
};
+
permObjectFld.add( ajaxUpdater );
- this.listForm.add(permObjectFld);
- TextField permOperationFld = new TextField("permOperation", new PropertyModel<String>(this, "permOperation"));
- this.listForm.add(permOperationFld);
+ this.listForm.add( permObjectFld );
+ TextField permOperationFld = new TextField( "permOperation", new PropertyModel<String>( this, "permOperation" ) );
+ this.listForm.add( permOperationFld );
addObjectSearchModal();
- this.listForm.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.REVIEW_MGR, GlobalIds.FIND_PERMISSIONS )
+ this.listForm.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.REVIEW_MGR,
+ GlobalIds.FIND_PERMISSIONS )
{
+ /** 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" );
info( "Searching Perms..." );
+
if ( !VUtil.isNotNullOrEmpty( permObject ) )
{
permObject = "";
}
+
if ( !VUtil.isNotNullOrEmpty( permOperation ) )
{
permOperation = "";
}
+
Permission srchPerm = new Permission( permObject, permOperation );
setDefaultModel( new PermListModel( srchPerm, isAdmin, GlobalUtils.getRbacSession( this ) ) );
treeModel.reload();
rootNode.removeAllChildren();
List<Permission> perms = ( List<Permission> ) getDefaultModelObject();
+
if ( VUtil.isNotNullOrEmpty( perms ) )
{
for ( Permission perm : perms )
+ {
rootNode.add( new DefaultMutableTreeNode( perm ) );
+ }
+
info( "Search returned " + perms.size() + " matching objects" );
}
else
{
info( "No matching objects found" );
}
+
target.add( grid );
}
+
@Override
- public void onError( AjaxRequestTarget target, Form form )
+ public void onError( AjaxRequestTarget target, Form<?> form )
{
log.warn( ".search.onError" );
target.add();
}
+
+
@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 )
{
return GlobalIds.WINDOW_LOCATION_REPLACE_COMMANDER_HOME_HTML;
}
};
+
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
} );
}
+
private void addObjectSearchModal()
{
final ModalWindow objectsModalWindow;
listForm.add( objectsModalWindow = new ModalWindow( "objectsearchmodal" ) );
- final ObjectSearchModalPanel objectSearchModalPanel = new ObjectSearchModalPanel( objectsModalWindow.getContentId(), objectsModalWindow, isAdmin );
+ final ObjectSearchModalPanel objectSearchModalPanel = new ObjectSearchModalPanel(
+ objectsModalWindow.getContentId(), objectsModalWindow, isAdmin );
objectsModalWindow.setContent( objectSearchModalPanel );
+
objectsModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
PermObj permObj = objectSearchModalPanel.getSelection();
+
if ( permObj != null )
{
permObject = permObj.getObjName();
@@ -236,6 +289,10 @@ public class PermListPanel extends FormComponentPanel
listForm.add( new SecureIndicatingAjaxLink( "objectAssignLinkLbl", GlobalIds.REVIEW_MGR, "findPermObjs" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public void onClick( AjaxRequestTarget target )
{
String msg = "clicked on object search";
@@ -246,24 +303,33 @@ public class PermListPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
objectsModalWindow.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 )
{
return GlobalIds.WINDOW_LOCATION_REPLACE_COMMANDER_HOME_HTML;
}
};
+
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
} );
String modalLabel;
- if(isAdmin)
+
+ if ( isAdmin )
{
modalLabel = "Admin Permission Object Search Modal";
}
@@ -271,23 +337,27 @@ public class PermListPanel extends FormComponentPanel
{
modalLabel = "RBAC Permission Object Search Modal";
}
+
objectsModalWindow.setTitle( modalLabel );
objectsModalWindow.setInitialWidth( 700 );
objectsModalWindow.setInitialHeight( 450 );
objectsModalWindow.setCookieName( "objects-modal" );
}
+
@Override
- public void onEvent(IEvent event)
+ public void onEvent( IEvent event )
{
- if (event.getPayload() instanceof SaveModelEvent)
+ if ( event.getPayload() instanceof SaveModelEvent )
{
- SaveModelEvent modelEvent = (SaveModelEvent) event.getPayload();
- switch(modelEvent.getOperation())
+ SaveModelEvent modelEvent = ( SaveModelEvent ) event.getPayload();
+
+ switch ( modelEvent.getOperation() )
{
case ADD:
- add(modelEvent.getEntity());
+ add( modelEvent.getEntity() );
break;
+
case UPDATE:
/*
grid.markItemDirty(itemThatHasChanged);
@@ -295,69 +365,90 @@ public class PermListPanel extends FormComponentPanel
*/
modelChanged();
break;
+
case DELETE:
prune();
break;
+
case SEARCH:
- setDefaultModel(new PermListModel((Permission) modelEvent.getEntity(), isAdmin, GlobalUtils.getRbacSession( this )));
+ setDefaultModel( new PermListModel( ( Permission ) modelEvent.getEntity(), isAdmin,
+ GlobalUtils.getRbacSession( this ) ) );
treeModel.reload();
rootNode.removeAllChildren();
- for (Permission perm : (List<Permission>) getDefaultModelObject())
- rootNode.add(new DefaultMutableTreeNode(perm));
+
+ for ( Permission perm : ( List<Permission> ) getDefaultModelObject() )
+ {
+ rootNode.add( new DefaultMutableTreeNode( perm ) );
+ }
+
break;
+
default:
break;
}
- AjaxRequestTarget target = ((SaveModelEvent) event.getPayload()).getAjaxRequestTarget();
- target.add(grid);
- log.debug(".onEvent SaveModelEvent: " + target.toString());
+
+ AjaxRequestTarget target = ( ( SaveModelEvent ) event.getPayload() ).getAjaxRequestTarget();
+ target.add( grid );
+ log.debug( ".onEvent SaveModelEvent: " + target.toString() );
}
}
- private void removeSelectedItems(TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid)
+
+ private void removeSelectedItems( TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid )
{
Collection<IModel<DefaultMutableTreeNode>> selected = grid.getSelectedItems();
- for (IModel<DefaultMutableTreeNode> model : selected)
+
+ for ( IModel<DefaultMutableTreeNode> model : selected )
{
DefaultMutableTreeNode node = model.getObject();
- treeModel.removeNodeFromParent(node);
- Permission perm = (Permission) node.getUserObject();
- log.debug(".removeSelectedItems perm objNm: " + perm.getObjName() + " opNm: " + perm.getOpName());
- List<Permission> perms = ((List<Permission>) getDefaultModel().getObject());
- perms.remove(perm);
+ treeModel.removeNodeFromParent( node );
+ Permission perm = ( Permission ) node.getUserObject();
+ log.debug( ".removeSelectedItems perm objNm: " + perm.getObjName() + " opNm: " + perm.getOpName() );
+ List<Permission> perms = ( ( List<Permission> ) getDefaultModel().getObject() );
+ perms.remove( perm );
}
}
- private DefaultTreeModel createTreeModel(List<Permission> perms)
+
+ private DefaultTreeModel createTreeModel( List<Permission> perms )
{
DefaultTreeModel model;
//Permission root = new Permission("Perms");
Permission root = new Permission();
- rootNode = new DefaultMutableTreeNode(root);
- model = new DefaultTreeModel(rootNode);
- if (perms == null)
- log.debug(".createTreeModel no Perms found");
+ rootNode = new DefaultMutableTreeNode( root );
+ model = new DefaultTreeModel( rootNode );
+
+ if ( perms == null )
+ {
+ log.debug( ".createTreeModel no Perms found" );
+ }
else
{
- log.debug(".createTreeModel Perms found:" + perms.size());
- for (Permission perm : perms)
- rootNode.add(new DefaultMutableTreeNode(perm));
+ log.debug( ".createTreeModel Perms found:" + perms.size() );
+
+ for ( Permission perm : perms )
+ {
+ rootNode.add( new DefaultMutableTreeNode( perm ) );
+ }
}
+
return model;
}
- public void add(FortEntity entity)
+
+ public void add( FortEntity entity )
{
- if (getDefaultModelObject() != null)
+ if ( getDefaultModelObject() != null )
{
- List<Permission> perms = ((List<Permission>) getDefaultModelObject());
- perms.add((Permission) entity);
- treeModel.insertNodeInto(new DefaultMutableTreeNode(entity), rootNode, perms.size());
+ List<Permission> perms = ( ( List<Permission> ) getDefaultModelObject() );
+ perms.add( ( Permission ) entity );
+ treeModel.insertNodeInto( new DefaultMutableTreeNode( entity ), rootNode, perms.size() );
}
}
+
public void prune()
{
- removeSelectedItems(grid);
+ removeSelectedItems( grid );
}
}
\ 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/PermSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java
index 3ce485a..9443535 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import java.util.List;
import org.apache.log4j.Logger;
@@ -38,6 +39,7 @@ import org.apache.directory.fortress.web.GlobalUtils;
import org.apache.directory.fortress.core.ReviewMgr;
import org.apache.directory.fortress.core.rbac.Permission;
+
/**
*
* @author Shawn McKinney
@@ -45,15 +47,18 @@ import org.apache.directory.fortress.core.rbac.Permission;
*/
public class PermSearchModalPanel extends Panel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private ReviewMgr reviewMgr;
- private static final Logger LOG = Logger.getLogger(PermSearchModalPanel.class.getName());
+ private static final Logger LOG = Logger.getLogger( PermSearchModalPanel.class.getName() );
private ModalWindow window;
private Permission permSelection;
private String objectSearchVal;
private String opSearchVal;
private boolean isAdmin;
+
/**
* @param id
*/
@@ -66,6 +71,7 @@ public class PermSearchModalPanel extends Panel
loadPanel();
}
+
public void loadPanel()
{
LoadableDetachableModel requests = getListViewModel();
@@ -74,10 +80,15 @@ public class PermSearchModalPanel extends Panel
add( new AjaxPagingNavigator( "navigator", ouView ) );
}
+
private PageableListView createListView( final LoadableDetachableModel requests )
{
final PageableListView listView = new PageableListView( "dataview", requests, 16 )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void populateItem( final ListItem item )
{
@@ -86,8 +97,9 @@ public class PermSearchModalPanel extends Panel
{
private static final long serialVersionUID = 1L;
+
@Override
- public void onClick(AjaxRequestTarget target)
+ public void onClick( AjaxRequestTarget target )
{
permSelection = modelObject;
window.close( target );
@@ -103,10 +115,15 @@ public class PermSearchModalPanel extends Panel
return listView;
}
+
private LoadableDetachableModel getListViewModel()
{
final LoadableDetachableModel ret = new LoadableDetachableModel()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected Object load()
{
@@ -114,7 +131,7 @@ public class PermSearchModalPanel extends Panel
try
{
permSelection = null;
- if(objectSearchVal == null)
+ if ( objectSearchVal == null )
objectSearchVal = "";
Permission permission = new Permission( objectSearchVal, "" );
@@ -132,16 +149,19 @@ public class PermSearchModalPanel extends Panel
return ret;
}
+
public void setAdmin( boolean admin )
{
isAdmin = admin;
}
+
public Permission getSelection()
{
return permSelection;
}
+
public void setSearchVal( String objectSearchVal )
{
this.objectSearchVal = objectSearchVal;
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 d98873d..3952d31 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.jquery.ui.form.spinner.Spinner;
import org.apache.log4j.Logger;
import org.apache.wicket.Component;
@@ -44,6 +45,7 @@ import org.apache.directory.fortress.web.SelectModelEvent;
import org.apache.directory.fortress.core.PwPolicyMgr;
import org.apache.directory.fortress.core.rbac.PwPolicy;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -51,71 +53,90 @@ import org.apache.directory.fortress.core.rbac.PwPolicy;
*/
public class PwPolicyDetailPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private PwPolicyMgr pwPolicyMgr;
- private static final Logger log = Logger.getLogger(PwPolicyDetailPanel.class.getName());
+ private static final Logger log = Logger.getLogger( PwPolicyDetailPanel.class.getName() );
private Form editForm;
private Displayable display;
+
public Form getForm()
{
return this.editForm;
}
- public PwPolicyDetailPanel(String id, Displayable display)
+
+ public PwPolicyDetailPanel( String id, Displayable display )
{
- super(id);
+ super( id );
this.pwPolicyMgr.setAdmin( GlobalUtils.getRbacSession( this ) );
- this.editForm = new PwPolicyDetailForm(GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<PwPolicy>(new PwPolicy()));
+ this.editForm = new PwPolicyDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<PwPolicy>(
+ new PwPolicy() ) );
this.display = display;
- add(editForm);
+ add( editForm );
}
public class PwPolicyDetailForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private Component component;
- public PwPolicyDetailForm(String id, final IModel<PwPolicy> model)
+
+ public PwPolicyDetailForm( String id, final IModel<PwPolicy> model )
{
- super(id, model);
+ super( id, model );
add( new SecureIndicatingAjaxButton( GlobalIds.ADD, GlobalIds.PWPOLICY_MGR, GlobalIds.ADD )
{
+ /** 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(".onSubmit Add");
- PwPolicy policy = (PwPolicy)form.getModel().getObject();
+ log.debug( ".onSubmit Add" );
+ PwPolicy policy = ( PwPolicy ) form.getModel().getObject();
try
{
- policy.setCheckQuality( (short)2 );
- pwPolicyMgr.add(policy);
- SaveModelEvent.send(getPage(), this, policy, target, SaveModelEvent.Operations.ADD);
+ policy.setCheckQuality( ( short ) 2 );
+ pwPolicyMgr.add( policy );
+ SaveModelEvent.send( getPage(), this, policy, target, SaveModelEvent.Operations.ADD );
component = editForm;
String msg = "Policy: " + policy.getName() + " has been added";
- display.setMessage(msg);
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.info("PwPolicyPanel.add.onError caught");
+ log.info( "PwPolicyPanel.add.onError caught" );
target.add();
}
+
+
@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 )
{
@@ -124,42 +145,53 @@ public class PwPolicyDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
add( new SecureIndicatingAjaxButton( GlobalIds.COMMIT, GlobalIds.PWPOLICY_MGR, "update" )
{
+ /** 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(".onSubmit Commit");
- PwPolicy policy = (PwPolicy)form.getModel().getObject();
+ log.debug( ".onSubmit Commit" );
+ PwPolicy policy = ( PwPolicy ) form.getModel().getObject();
try
{
- pwPolicyMgr.update(policy);
+ pwPolicyMgr.update( policy );
String msg = "Policy: " + policy.getName() + " has been updated";
- SaveModelEvent.send(getPage(), this, policy, target, SaveModelEvent.Operations.UPDATE);
+ SaveModelEvent.send( getPage(), this, policy, target, SaveModelEvent.Operations.UPDATE );
component = editForm;
- display.setMessage(msg);
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("PwPolicyPanel.update.onError");
+ log.warn( "PwPolicyPanel.update.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 )
{
@@ -168,45 +200,56 @@ public class PwPolicyDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
add( new SecureIndicatingAjaxButton( GlobalIds.DELETE, GlobalIds.PWPOLICY_MGR, GlobalIds.DELETE )
{
+ /** 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(".onSubmit Commit");
- PwPolicy role = (PwPolicy)form.getModel().getObject();
+ log.debug( ".onSubmit Commit" );
+ PwPolicy role = ( PwPolicy ) form.getModel().getObject();
try
{
- pwPolicyMgr.delete(role);
+ pwPolicyMgr.delete( role );
form.setModelObject( new PwPolicy() );
modelChanged();
String msg = "Role: " + role.getName() + " has been deleted";
- SaveModelEvent.send(getPage(), this, role, target, SaveModelEvent.Operations.DELETE);
+ SaveModelEvent.send( getPage(), this, role, target, SaveModelEvent.Operations.DELETE );
component = editForm;
- display.setMessage(msg);
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("PwPolicyPanel.commit.onError");
+ log.warn( "PwPolicyPanel.commit.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 )
{
@@ -215,30 +258,41 @@ public class PwPolicyDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
- add(new AjaxSubmitLink(GlobalIds.CANCEL)
+ } );
+ add( new AjaxSubmitLink( GlobalIds.CANCEL )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
- protected void onSubmit(AjaxRequestTarget target, Form form)
+ protected void onSubmit( AjaxRequestTarget target, Form form )
{
- setModelObject(new PwPolicy());
+ setModelObject( new PwPolicy() );
modelChanged();
component = editForm;
String msg = "Role cancelled input form";
- display.setMessage(msg);
+ display.setMessage( msg );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("ControlPanel.cancel.onError");
+ log.warn( "ControlPanel.cancel.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 )
{
@@ -247,67 +301,73 @@ public class PwPolicyDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
-
- add(new TextField("name").setRequired( true ));
-
- add(new TextField<Integer>("minAge").add(new RangeValidator<Integer>(0, Integer.MAX_VALUE)).setRequired( true ));
-
- add(new TextField<Long>("maxAge").add(new RangeValidator<Long>((long)0, Long.MAX_VALUE)).setRequired( true ));
- final Spinner<Integer> inHistorySP = new Spinner<Integer>("inHistory");
- inHistorySP.setRequired(false);
- inHistorySP.add(new RangeValidator<Short>((short)0, (short)100));
- add(inHistorySP);
-
- final Spinner<Integer> minLengthSP = new Spinner<Integer>("minLength");
- minLengthSP.setRequired(false);
- minLengthSP.add(new RangeValidator<Short>((short)0, (short)100));
- add(minLengthSP);
-
- add(new TextField<Long>("expireWarning").add(new RangeValidator<Long>((long)0, Long.MAX_VALUE)).setRequired( true ));
- final Spinner<Integer> graceLoginLimitSP = new Spinner<Integer>("graceLoginLimit");
- graceLoginLimitSP.setRequired(false);
- graceLoginLimitSP.add(new RangeValidator<Short>((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)).setRequired( true ));
- final Spinner<Integer> maxFailureSP = new Spinner<Integer>("maxFailure");
- maxFailureSP.setRequired(false);
- maxFailureSP.add(new RangeValidator<Short>((short)0, (short)100));
- add(maxFailureSP);
-
- add(new TextField<Short>("failureCountInterval").add(new RangeValidator<Short>((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 ));
- setOutputMarkupId(true);
+ } );
+
+ add( new TextField( "name" ).setRequired( true ) );
+
+ add( new TextField<Integer>( "minAge" ).add( new RangeValidator<Integer>( 0, Integer.MAX_VALUE ) )
+ .setRequired( true ) );
+
+ add( new TextField<Long>( "maxAge" ).add( new RangeValidator<Long>( ( long ) 0, Long.MAX_VALUE ) )
+ .setRequired( true ) );
+ final Spinner<Integer> inHistorySP = new Spinner<Integer>( "inHistory" );
+ inHistorySP.setRequired( false );
+ inHistorySP.add( new RangeValidator<Short>( ( short ) 0, ( short ) 100 ) );
+ add( inHistorySP );
+
+ final Spinner<Integer> minLengthSP = new Spinner<Integer>( "minLength" );
+ minLengthSP.setRequired( false );
+ minLengthSP.add( new RangeValidator<Short>( ( short ) 0, ( short ) 100 ) );
+ add( minLengthSP );
+
+ add( new TextField<Long>( "expireWarning" ).add( new RangeValidator<Long>( ( long ) 0, Long.MAX_VALUE ) )
+ .setRequired( true ) );
+ final Spinner<Integer> graceLoginLimitSP = new Spinner<Integer>( "graceLoginLimit" );
+ graceLoginLimitSP.setRequired( false );
+ graceLoginLimitSP.add( new RangeValidator<Short>( ( 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 ) )
+ .setRequired( true ) );
+ final Spinner<Integer> maxFailureSP = new Spinner<Integer>( "maxFailure" );
+ maxFailureSP.setRequired( false );
+ maxFailureSP.add( new RangeValidator<Short>( ( short ) 0, ( short ) 100 ) );
+ add( maxFailureSP );
+
+ add( new TextField<Short>( "failureCountInterval" ).add(
+ new RangeValidator<Short>( ( 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 ) );
+ 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();
- PwPolicy policy = (PwPolicy) modelEvent.getEntity();
- this.setModelObject(policy);
+ SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
+ PwPolicy policy = ( PwPolicy ) modelEvent.getEntity();
+ this.setModelObject( policy );
String msg = "Policy: " + policy.getName() + " has been selected";
- log.debug(".onEvent SelectModelEvent: " + policy.getName());
- display.setMessage(msg);
+ log.debug( ".onEvent SelectModelEvent: " + policy.getName() );
+ display.setMessage( msg );
component = editForm;
}
- 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());
- log.debug(".onEvent AjaxRequestTarget: " + target.toString());
- target.add(component);
+ AjaxRequestTarget target = ( ( AjaxRequestTarget ) event.getPayload() );
+ log.debug( ".onEvent AjaxRequestTarget: " + target.toString() );
+ target.add( component );
component = null;
}
- display.display((AjaxRequestTarget) event.getPayload());
+ display.display( ( AjaxRequestTarget ) event.getPayload() );
}
}
}
[09/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
Posted by el...@apache.org.
o Removed the warning caused by the missing serialVersionUID (FC-24)
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/39c304ec
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/39c304ec
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/39c304ec
Branch: refs/heads/master
Commit: 39c304ec5d2dab0c8d268c061ae3aa19e6f45f93
Parents: 709219c
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Fri Nov 21 14:07:13 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Nov 25 20:48:02 2014 +0100
----------------------------------------------------------------------
pom.xml | 1094 ++++++++++--------
.../fortress/web/FortressWebBasePage.java | 20 +-
.../directory/fortress/web/GroupPage.java | 44 +-
.../directory/fortress/web/LaunchPage.java | 13 +-
.../directory/fortress/web/LoginPage.java | 11 +-
.../directory/fortress/web/ObjectAdminPage.java | 44 +-
.../directory/fortress/web/ObjectPage.java | 44 +-
.../directory/fortress/web/OuPermPage.java | 48 +-
.../directory/fortress/web/OuUserPage.java | 46 +-
.../directory/fortress/web/PermAdminPage.java | 45 +-
.../apache/directory/fortress/web/PermPage.java | 45 +-
.../directory/fortress/web/PwPolicyPage.java | 48 +-
.../directory/fortress/web/RbacSession.java | 7 +
.../directory/fortress/web/RoleAdminPage.java | 29 +-
.../apache/directory/fortress/web/RolePage.java | 27 +-
.../directory/fortress/web/SdDynamicPage.java | 45 +-
.../directory/fortress/web/SdStaticPage.java | 44 +-
.../web/SecureBookmarkablePageLink.java | 15 +-
.../web/SecureIndicatingAjaxButton.java | 11 +-
.../fortress/web/SecureIndicatingAjaxLink.java | 11 +-
.../apache/directory/fortress/web/UserPage.java | 41 +-
.../web/panel/AuditAuthzDetailPanel.java | 61 +-
.../fortress/web/panel/AuditAuthzListPanel.java | 352 ++++--
.../web/panel/AuditBindDetailPanel.java | 59 +-
.../fortress/web/panel/AuditBindListPanel.java | 238 ++--
.../fortress/web/panel/AuditModDetailPanel.java | 20 +-
.../fortress/web/panel/AuditModListPanel.java | 280 +++--
.../web/panel/ConstraintAdminRolePanel.java | 101 +-
.../fortress/web/panel/ConstraintBasePanel.java | 410 ++++---
.../fortress/web/panel/ConstraintPanel.java | 103 +-
.../fortress/web/panel/ConstraintRolePanel.java | 101 +-
.../fortress/web/panel/GroupDetailPanel.java | 175 ++-
.../fortress/web/panel/GroupListPanel.java | 195 ++--
.../directory/fortress/web/panel/InfoPanel.java | 15 +
.../directory/fortress/web/panel/JpegImage.java | 22 +-
.../directory/fortress/web/panel/Member.java | 8 +
.../directory/fortress/web/panel/NavPanel.java | 207 +++-
.../fortress/web/panel/OUDetailPanel.java | 193 ++-
.../fortress/web/panel/OUListPanel.java | 35 +-
.../fortress/web/panel/OUSearchModalPanel.java | 29 +-
.../fortress/web/panel/ObjectDetailPanel.java | 69 +-
.../fortress/web/panel/ObjectListPanel.java | 214 ++--
.../web/panel/ObjectSearchModalPanel.java | 26 +-
.../fortress/web/panel/PermDetailPanel.java | 290 +++--
.../fortress/web/panel/PermListPanel.java | 265 +++--
.../web/panel/PermSearchModalPanel.java | 26 +-
.../fortress/web/panel/PwPolicyDetailPanel.java | 256 ++--
.../fortress/web/panel/PwPolicyListPanel.java | 277 +++--
.../web/panel/PwPolicySearchModalPanel.java | 30 +-
.../fortress/web/panel/RequestMod.java | 18 +-
.../web/panel/RoleAdminDetailPanel.java | 91 +-
.../fortress/web/panel/RoleDetailPanel.java | 327 ++++--
.../fortress/web/panel/RoleListPanel.java | 245 ++--
.../web/panel/RoleSearchModalPanel.java | 75 +-
.../fortress/web/panel/SDDetailPanel.java | 279 +++--
.../fortress/web/panel/SDListPanel.java | 279 +++--
.../web/panel/UserAuditDetailPanel.java | 17 +-
.../fortress/web/panel/UserDetailPanel.java | 339 +++++-
.../fortress/web/panel/UserListPanel.java | 146 ++-
.../web/panel/UserSearchModalPanel.java | 31 +-
60 files changed, 4994 insertions(+), 2642 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f790ece..91e438a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
@@ -18,531 +18,605 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.directory</groupId>
- <artifactId>fortress-web</artifactId>
- <packaging>war</packaging>
- <version>1.0-RC40-SNAPSHOT</version>
- <name>Apache Fortress Web</name>
- <url>http://directory.apache.org/foress/</url>
- <description>Fortress Web is an ANSI RBAC INCITS 359 compliant administrative UI</description>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.directory</groupId>
+ <artifactId>fortress-web</artifactId>
+ <packaging>war</packaging>
+ <version>1.0-RC40-SNAPSHOT</version>
+ <name>Apache Fortress Web</name>
+ <url>http://directory.apache.org/foress/</url>
+ <description>Fortress Web is an ANSI RBAC INCITS 359 compliant administrative UI</description>
- <licenses>
- <license>
- <name>Apache License 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>15</version>
+ </parent>
- <scm>
- <connection>scm:git:http://git-wip-us.apache.org/repos/asf/directory-fortress-web.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-web.git
- </developerConnection>
- <tag>HEAD</tag>
- </scm>
+ <licenses>
+ <license>
+ <name>Apache License 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
- <issueManagement>
- <system>jira</system>
- <url>https://issues.apache.org/jira/browse/DIRFORTRESS</url>
- </issueManagement>
+ <scm>
+ <connection>scm:git:http://git-wip-us.apache.org/repos/asf/directory-fortress-web.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/directory-fortress-web.git
+ </developerConnection>
+ <tag>HEAD</tag>
+ </scm>
- <mailingLists>
- <mailingList>
- <name>Apache Directory -- Fortress List</name>
- <post>fortress@directory.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/directory-fortress/</archive>
- </mailingList>
- </mailingLists>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://issues.apache.org/jira/browse/DIRFORTRESS</url>
+ </issueManagement>
- <!-- ====================================================== -->
- <!-- The list of current developers -->
- <!-- ====================================================== -->
- <developers>
- <developer>
- <id>smckinney</id>
- <name>Shawn McKinney</name>
- <email>smckinney@apache.org</email>
- </developer>
+ <mailingLists>
+ <mailingList>
+ <name>Apache Directory -- Fortress List</name>
+ <post>fortress@directory.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/directory-fortress/</archive>
+ </mailingList>
+ </mailingLists>
- <developer>
- <id>kmckinney</id>
- <name>Kevin McKinney</name>
- </developer>
- </developers>
+ <!-- ====================================================== -->
+ <!-- The list of current developers -->
+ <!-- ====================================================== -->
+ <developers>
+ <developer>
+ <id>smckinney</id>
+ <name>Shawn McKinney</name>
+ <email>smckinney@apache.org</email>
+ </developer>
- <properties>
- <title>${project.name} ${project.version}</title>
- <wicket.version>6.16.0</wicket.version>
- <wicket.jquery.version>6.16.0</wicket.jquery.version>
- <wicket.kendo-ui.version>6.14.0</wicket.kendo-ui.version>
- <version.log4j>1.2.17</version.log4j>
- <version.slf4j.log4j12>1.7.7</version.slf4j.log4j12>
- <spring.version>3.2.3.RELEASE</spring.version>
- <spring.security.version>3.1.4.RELEASE</spring.security.version>
- <javadoc.version>2.9.1</javadoc.version>
- <jetty.version>8.1.8.v20121106</jetty.version>
- <jetty.stopKey>stopJetty</jetty.stopKey>
- <jetty.stopPort>9081</jetty.stopPort>
- <jetty.port>9080</jetty.port>
- <skipTests>true</skipTests>
- </properties>
+ <developer>
+ <id>kmckinney</id>
+ <name>Kevin McKinney</name>
+ </developer>
- <dependencies>
- <!-- Fortress Realm pulls in Fortress Core for RBAC 'CRUD' & policy enforcement apis. -->
- <dependency>
- <groupId>org.apache.directory</groupId>
- <artifactId>fortress-realm-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${version.log4j}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${version.slf4j.log4j12}</version>
- </dependency>
+ <developer>
+ <id>elecharny</id>
+ <name>Emmanuel Lecharny</name>
+ <email>elecharny@apache.org</email>
+ </developer>
+ </developers>
- <!-- Servlet API DEPENDENCIES -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
+ <properties>
+ <title>${project.name} ${project.version}</title>
+ <wicket.version>6.16.0</wicket.version>
+ <wicket.jquery.version>6.16.0</wicket.jquery.version>
+ <wicket.kendo-ui.version>6.14.0</wicket.kendo-ui.version>
+ <version.log4j>1.2.17</version.log4j>
+ <version.slf4j.log4j12>1.7.7</version.slf4j.log4j12>
+ <spring.version>3.2.3.RELEASE</spring.version>
+ <spring.security.version>3.1.4.RELEASE</spring.security.version>
+ <javadoc.version>2.9.1</javadoc.version>
+ <jetty.version>8.1.8.v20121106</jetty.version>
+ <jetty.stopKey>stopJetty</jetty.stopKey>
+ <jetty.stopPort>9081</jetty.stopPort>
+ <jetty.port>9080</jetty.port>
+ <skipTests>true</skipTests>
+ </properties>
- <!-- JETTY used for embedded testing within intellij -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.25</version>
- </dependency>
- <!-- Wicket, Spring and other Web UI framework tools -->
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-guice</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-jmx</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-auth-roles</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-datetime</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-velocity</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-spring</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-devutils</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wicketstuff</groupId>
- <artifactId>wicketstuff-inmethod-grid</artifactId>
- <version>${wicket.jquery.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wicketstuff</groupId>
- <artifactId>wicketstuff-jwicket-ui-resize</artifactId>
- <version>${wicket.jquery.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-jquery-ui</artifactId>
- <version>${wicket.jquery.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.wicket-jquery-ui</groupId>
- <artifactId>wicket-kendo-ui</artifactId>
- <version>${wicket.kendo-ui.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-expression</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>${spring.security.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>com.uwyn</groupId>
- <artifactId>jhighlight</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.6.1</version>
- </dependency>
- <!-- ANT DEPENDENCIES FOR RUNNING ANT PLUG-IN FOR FORTRESS LOAD UTILITY -->
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.8.1</version>
- </dependency>
- <!-- JETTY DEPENDENCIES FOR TESTING -->
- <dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all-server</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
+ <dependencies>
+ <!-- Fortress Realm pulls in Fortress Core for RBAC 'CRUD' & policy enforcement apis. -->
+ <dependency>
+ <groupId>org.apache.directory</groupId>
+ <artifactId>fortress-realm-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${version.log4j}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${version.slf4j.log4j12}</version>
+ </dependency>
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- <version>2.36.0</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-common</artifactId>
- <version>2.0b1</version>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <version>1.0.2</version>
- </dependency>
- </dependencies>
+ <!-- Servlet API DEPENDENCIES -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
- <build>
- <finalName>${project.artifactId}-${version}</finalName>
- <resources>
- <!-- include all these to be able to view their source -->
- <resource>
- <filtering>false</filtering>
- <directory>${basedir}/src/main/java</directory>
- <includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
- <include>**/*.css</include>
- <include>**/*.jpg</include>
- <include>**/*.gif</include>
- <include>**/*.png</include>
- <include>**/*.txt</include>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>**/*.html</include>
- <include>**/*.js</include>
- <include>**/*.css</include>
- <include>**/*.jpg</include>
- <include>**/*.gif</include>
- <include>**/*.png</include>
- <include>**/*.txt</include>
- <include>**/*.xml</include>
- <include>**/*.properties</include>
- <include>**/*.vm</include>
- <include>**/*.tmpl</include>
- </includes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/webapp/login</directory>
- <includes>
- <include>**/*.html</include>
- </includes>
- </resource>
- </resources>
- <plugins>
+ <!-- JETTY used for embedded testing within intellij -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.25</version>
+ </dependency>
+
+ <!-- Wicket, Spring and other Web UI framework tools -->
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-guice</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-jmx</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-auth-roles</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-datetime</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-velocity</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-spring</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-devutils</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-inmethod-grid</artifactId>
+ <version>${wicket.jquery.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-jwicket-ui-resize</artifactId>
+ <version>${wicket.jquery.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.googlecode.wicket-jquery-ui</groupId>
+ <artifactId>wicket-jquery-ui</artifactId>
+ <version>${wicket.jquery.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.googlecode.wicket-jquery-ui</groupId>
+ <artifactId>wicket-kendo-ui</artifactId>
+ <version>${wicket.kendo-ui.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${spring.security.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>${spring.security.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>${spring.security.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.uwyn</groupId>
+ <artifactId>jhighlight</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+
+ <!-- ANT DEPENDENCIES FOR RUNNING ANT PLUG-IN FOR FORTRESS LOAD UTILITY -->
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+
+ <!-- JETTY DEPENDENCIES FOR TESTING -->
+ <dependency>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
+ <version>${jetty.version}</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- Assemble a commander distro archive -->
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>user_distribution</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/distsrc.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-java</artifactId>
+ <version>2.36.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-common</artifactId>
+ <version>2.0b1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ </dependencies>
- </executions>
- </plugin>
- <!-- Deploy the finished war -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>tomcat-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
- <configuration>
- <warFile>target/${project.artifactId}.war</warFile>
- <server>local-tomcat</server>
- <url>http://localhost:8080/manager/text</url>
- <!-- TODO: CHANGE ME ON NEXT RELEASE TO USE 'TEXT' on URL: <url>http://localhost:8080/manager/text</url>-->
- <path>/${project.artifactId}</path>
- <!-- Warning the tomcat manager creds here are for deploying into a demo environment only. -->
- <username>tcmanager</username>
- <password>m@nager123</password>
- </configuration>
- </plugin>
- <!-- Compile the commander source -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <!-- War the commander app -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.4</version>
- <!-- this is needed to pickup the context.xml in META-INF: -->
- <configuration>
- <warName>${project.artifactId}</warName>
- <archive>
- <manifest>
- <classpathPrefix>lib/</classpathPrefix>
- </manifest>
- </archive>
- <webResources>
- <resource>
- <!-- this is relative to the pom.xml directory -->
- <directory>${project.basedir}/src/main/resources
- </directory>
+ <build>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <resources>
+ <!-- include all these to be able to view their source -->
+ <resource>
+ <filtering>false</filtering>
+ <directory>${basedir}/src/main/java</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ <include>**/*.css</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.txt</include>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+
+ <resource>
+ <filtering>false</filtering>
+ <directory>${basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.js</include>
+ <include>**/*.css</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.txt</include>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ <include>**/*.vm</include>
+ <include>**/*.tmpl</include>
+ </includes>
+ </resource>
+
+ <resource>
+ <filtering>false</filtering>
+ <directory>src/main/webapp/login</directory>
+ <includes>
+ <include>**/*.html</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- project excludes -->
+ <exclude>**/jquery-ui.css</exclude>
+ <exclude>**/kendo.common.min.css</exclude>
+ <exclude>**/kendo.default.min.css</exclude>
+ <exclude>**/jquery-ui-1.10.2.custom.min.css</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/LICENSE.*</exclude>
+ <exclude>**/NOTICE-bin.txt</exclude>
+ <exclude>**/resources/**</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <!-- Javadoc archive -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- <configuration>
- <stylesheet>java</stylesheet>
- <bottom><small>Copyright &copy; 2011-2014 Joshua Tree Software, LLC. All Rights Reserved.
- Generated ${maven.build.timestamp}.</small></bottom>
- <overview>src/main/java/org/apache/directory/fortress/web/overview.html</overview>
- <version>true</version>
- <author>true</author>
- <doctitle>${title}</doctitle>
- <windowtitle>${title}</windowtitle>
- </configuration>
- </plugin>
- <!-- Source archive -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- Integration Test -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <!-- this works for embedded testing with Jetty -->
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${jetty.version}</version>
- <configuration>
- <scanIntervalSeconds>1</scanIntervalSeconds>
- <stopPort>9999</stopPort>
- <stopKey>foo</stopKey>
- <connectors>
- <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>8081</port>
- <maxIdleTime>3600000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <phase>test</phase>
- <configuration>
- <target name="fortress-load"
- unless="noload"
- description="Loads fortress web rbac policy into ldap">
- <echo message="############### Run Fortress Ant script to load demo policy ###############"/>
- <java
- classname="org.apache.tools.ant.launch.Launcher"
- fork="true"
- failonerror="true"
- dir="${basedir}"
- timeout="4000000"
- taskname="startAnt">
- <classpath>
- <pathelement location="./src/main/resources"/>
- <pathelement location="${org.apache.ant:ant-launcher:jar}"/>
- <pathelement location="${org.apache.ant:ant:jar}"/>
- <pathelement location="${org.apache.directory:fortress-core:jar}"/>
- <pathelement location="${org.openldap:accelerator-api:jar}"/>
- <pathelement location="${org.openldap:accelerator-impl:jar}"/>
- <pathelement location="${log4j:log4j:jar}"/>
- <pathelement location="${org.apache.directory.api:api-all:jar}"/>
- <pathelement location="${org.apache.mina:mina-core:jar}"/>
- <pathelement location="${org.jgrapht:jgrapht-jdk1.5:jar}"/>
- <pathelement location="${org.jasypt:jasypt:jar}"/>
- <pathelement location="${commons-configuration:commons-configuration:jar}"/>
- <pathelement location="${commons-lang:commons-lang:jar}"/>
- <pathelement location="${commons-collections:commons-collections:jar}"/>
- <pathelement location="${commons-logging:commons-logging:jar}"/>
- <pathelement location="${commons-io:commons-io:jar}"/>
- <pathelement location="${commons-pool:commons-pool:jar}"/>
- <pathelement location="${net.sf.ehcache:ehcache-core:jar}"/>
- <pathelement location="${org.slf4j:slf4j-api:jar}"/>
- <pathelement location="${org.slf4j:slf4j-log4j12:jar}"/>
- <pathelement location="${antlr:antlr:jar}"/>
- </classpath>
- <sysproperty key="version" value="${project.version}"/>
- <sysproperty key="tenant" value="HOME"/>
- <arg value="-buildfile"/>
- <arg file="./src/main/resources/FortressWebDemoUsers.xml"/>
- </java>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <!-- Assemble a commander distro archive -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>user_distribution</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/distsrc.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Deploy the finished war -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>tomcat-maven-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <warFile>target/${project.artifactId}.war</warFile>
+ <server>local-tomcat</server>
+ <url>http://localhost:8080/manager/text</url>
+ <!-- TODO: CHANGE ME ON NEXT RELEASE TO USE 'TEXT' on URL: <url>http://localhost:8080/manager/text</url>-->
+ <path>/${project.artifactId}</path>
+ <!-- Warning the tomcat manager creds here are for deploying into a demo environment only. -->
+ <username>tcmanager</username>
+ <password>m@nager123</password>
+ </configuration>
+ </plugin>
+
+ <!-- Compile the commander source -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
+
+ <!-- War the commander app -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ <!-- this is needed to pickup the context.xml in META-INF: -->
+ <configuration>
+ <warName>${project.artifactId}</warName>
+ <archive>
+ <manifest>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ </archive>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>${project.basedir}/src/main/resources
+ </directory>
+
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
+ <!-- Javadoc archive -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <stylesheet>java</stylesheet>
+ <bottom><small>Copyright &copy; 2011-2014 Joshua Tree Software, LLC. All Rights Reserved.
+ Generated ${maven.build.timestamp}.</small></bottom>
+ <overview>src/main/java/org/apache/directory/fortress/web/overview.html</overview>
+ <version>true</version>
+ <author>true</author>
+ <doctitle>${title}</doctitle>
+ <windowtitle>${title}</windowtitle>
+ </configuration>
+ </plugin>
+
+ <!-- Source archive -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Integration Test -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- this works for embedded testing with Jetty -->
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jetty.version}</version>
+ <configuration>
+ <scanIntervalSeconds>1</scanIntervalSeconds>
+ <stopPort>9999</stopPort>
+ <stopKey>foo</stopKey>
+ <connectors>
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>8081</port>
+ <maxIdleTime>3600000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <configuration>
+ <target name="fortress-load"
+ unless="noload"
+ description="Loads fortress web rbac policy into ldap">
+ <echo message="############### Run Fortress Ant script to load demo policy ###############"/>
+ <java
+ classname="org.apache.tools.ant.launch.Launcher"
+ fork="true"
+ failonerror="true"
+ dir="${basedir}"
+ timeout="4000000"
+ taskname="startAnt">
+ <classpath>
+ <pathelement location="./src/main/resources"/>
+ <pathelement location="${org.apache.ant:ant-launcher:jar}"/>
+ <pathelement location="${org.apache.ant:ant:jar}"/>
+ <pathelement location="${org.apache.directory:fortress-core:jar}"/>
+ <pathelement location="${org.openldap:accelerator-api:jar}"/>
+ <pathelement location="${org.openldap:accelerator-impl:jar}"/>
+ <pathelement location="${log4j:log4j:jar}"/>
+ <pathelement location="${org.apache.directory.api:api-all:jar}"/>
+ <pathelement location="${org.apache.mina:mina-core:jar}"/>
+ <pathelement location="${org.jgrapht:jgrapht-jdk1.5:jar}"/>
+ <pathelement location="${org.jasypt:jasypt:jar}"/>
+ <pathelement location="${commons-configuration:commons-configuration:jar}"/>
+ <pathelement location="${commons-lang:commons-lang:jar}"/>
+ <pathelement location="${commons-collections:commons-collections:jar}"/>
+ <pathelement location="${commons-logging:commons-logging:jar}"/>
+ <pathelement location="${commons-io:commons-io:jar}"/>
+ <pathelement location="${commons-pool:commons-pool:jar}"/>
+ <pathelement location="${net.sf.ehcache:ehcache-core:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-api:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-log4j12:jar}"/>
+ <pathelement location="${antlr:antlr:jar}"/>
+ </classpath>
+ <sysproperty key="version" value="${project.version}"/>
+ <sysproperty key="tenant" value="HOME"/>
+ <arg value="-buildfile"/>
+ <arg file="./src/main/resources/FortressWebDemoUsers.xml"/>
+ </java>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <profiles>
- <profile>
- <id>release-sign-artifacts</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>release-sign-artifacts</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
- <repositories>
- <repository>
- <id>maven2</id>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>maven2</id>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+ </repositories>
</project>
\ 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/FortressWebBasePage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java b/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
index 41a7744..792a45e 100644
--- a/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
+++ b/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.log4j.Logger;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
@@ -31,6 +32,7 @@ import org.apache.directory.fortress.core.rbac.Session;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
+
/**
* Base class for Commander Web. This class initializes Fortress RBAC context and so contains a synchronized block.
*
@@ -39,6 +41,8 @@ import java.security.Principal;
*/
public abstract class FortressWebBasePage extends WebPage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private AccessMgr accessMgr;
@SpringBean
@@ -46,6 +50,7 @@ public abstract class FortressWebBasePage extends WebPage
private static final String CLS_NM = FortressWebBasePage.class.getName();
private static final Logger LOG = Logger.getLogger( CLS_NM );
+
public FortressWebBasePage()
{
SecureBookmarkablePageLink usersLink = new SecureBookmarkablePageLink( GlobalIds.USERS_PAGE, UserPage.class,
@@ -121,6 +126,10 @@ public abstract class FortressWebBasePage extends WebPage
final Link actionLink = new Link( "logout" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClick()
{
@@ -137,18 +146,18 @@ public abstract class FortressWebBasePage extends WebPage
Principal principal = servletReq.getUserPrincipal();
// Is this a Java EE secured page && has the User successfully authenticated already?
boolean isSecured = principal != null;
- if( isSecured && !isLoggedIn( ) )
+ if ( isSecured && !isLoggedIn() )
{
String szPrincipal = principal.toString();
// Pull the RBAC session from the realm and assert into the Web app's session:
- Session realmSession = GlobalUtils.deserialize(szPrincipal, Session.class);
+ Session realmSession = GlobalUtils.deserialize( szPrincipal, Session.class );
// If this is null, app in container that cannot share rbac session with app, Must now create session manually:
- if(realmSession == null)
+ if ( realmSession == null )
{
realmSession = GlobalUtils.createRbacSession( accessMgr, principal.getName() );
}
- if(realmSession != null)
+ if ( realmSession != null )
{
synchronized ( ( RbacSession ) RbacSession.get() )
{
@@ -163,7 +172,8 @@ public abstract class FortressWebBasePage extends WebPage
}
}
- private boolean isLoggedIn( )
+
+ private boolean isLoggedIn()
{
boolean isLoggedIn = false;
if ( GlobalUtils.getRbacSession( this ) != null )
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/GroupPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/GroupPage.java b/src/main/java/org/apache/directory/fortress/web/GroupPage.java
index 835d7cd..247e14f 100644
--- a/src/main/java/org/apache/directory/fortress/web/GroupPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/GroupPage.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,46 +31,55 @@ import org.apache.directory.fortress.web.panel.GroupListPanel;
import org.apache.directory.fortress.web.panel.InfoPanel;
import org.apache.directory.fortress.web.panel.NavPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class GroupPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private String label = "LDAP Group Page";
- public GroupPage(PageParameters parameters)
+
+
+ public GroupPage( 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.GROUPLISTPANEL)
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
+ container.add( new AjaxLazyLoadPanel( GlobalIds.GROUPLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
return new GroupListPanel( id );
- }
- });
+ }
+ } );
// 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();
GroupDetailPanel groupDetail = new GroupDetailPanel( GlobalIds.GROUPDETAILPANEL, display );
- container.add(groupDetail);
+ container.add( groupDetail );
- 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/LaunchPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/LaunchPage.java b/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
index 44dc874..bbd50d6 100644
--- a/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/LaunchPage.java
@@ -25,20 +25,25 @@ import org.apache.wicket.markup.html.basic.Label;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class LaunchPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public LaunchPage()
{
- HttpServletRequest servletReq = (HttpServletRequest)getRequest().getContainerRequest();
+ HttpServletRequest servletReq = ( HttpServletRequest ) getRequest().getContainerRequest();
Principal principal = servletReq.getUserPrincipal();
- if(principal == null)
+ if ( principal == null )
{
- setResponsePage(LoginPage.class);
+ setResponsePage( LoginPage.class );
}
- add(new Label("label1", "Click on a link above for RBAC administration."));
+ add( new Label( "label1", "Click on a link above for RBAC administration." ) );
}
}
\ 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/LoginPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/LoginPage.java b/src/main/java/org/apache/directory/fortress/web/LoginPage.java
index d5c98a3..474d0de 100644
--- a/src/main/java/org/apache/directory/fortress/web/LoginPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/LoginPage.java
@@ -19,6 +19,7 @@
*/
package org.apache.directory.fortress.web;
+
import org.apache.log4j.Logger;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
@@ -32,14 +33,18 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import java.security.Principal;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public final class LoginPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final Logger LOG = Logger.getLogger( LoginPage.class.getName() );
+
public LoginPage()
{
LoginPageForm loginForm = new LoginPageForm( "loginFields" );
@@ -48,9 +53,12 @@ public final class LoginPage extends FortressWebBasePage
public class LoginPageForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private String pswdField;
private String userId;
+
public LoginPageForm( String id )
{
super( id );
@@ -69,6 +77,7 @@ public final class LoginPage extends FortressWebBasePage
add( pw );
}
+
@Override
protected void onSubmit()
{
@@ -88,7 +97,7 @@ public final class LoginPage extends FortressWebBasePage
{
String error = "Login form caught ServletException=" + se;
LOG.error( error );
- getRequestCycle().replaceAllRequestHandlers(new RedirectRequestHandler("/login/error.html"));
+ getRequestCycle().replaceAllRequestHandlers( new RedirectRequestHandler( "/login/error.html" ) );
}
}
else
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/ObjectAdminPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/ObjectAdminPage.java b/src/main/java/org/apache/directory/fortress/web/ObjectAdminPage.java
index a8e6bac..bc9c9d8 100644
--- a/src/main/java/org/apache/directory/fortress/web/ObjectAdminPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/ObjectAdminPage.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.ObjectDetailPanel;
import org.apache.directory.fortress.web.panel.ObjectListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class ObjectAdminPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isAdmin = true;
private String label = "Administrative Permission Object Page";
- public ObjectAdminPage(PageParameters parameters)
+
+
+ public ObjectAdminPage( 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.OBJECTLISTPANEL )
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
+ container.add( new AjaxLazyLoadPanel( GlobalIds.OBJECTLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
return new ObjectListPanel( id, isAdmin );
- }
- });
+ }
+ } );
// 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();
ObjectDetailPanel objectDetail = new ObjectDetailPanel( GlobalIds.OBJECTDETAILPANEL, display, isAdmin );
- container.add(objectDetail);
+ container.add( objectDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ 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/ObjectPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/ObjectPage.java b/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
index 63c3dde..8f124a5 100644
--- a/src/main/java/org/apache/directory/fortress/web/ObjectPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/ObjectPage.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.ObjectDetailPanel;
import org.apache.directory.fortress.web.panel.ObjectListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class ObjectPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isAdmin = false;
private String label = "RBAC Permission Object Page";
- public ObjectPage(PageParameters parameters)
+
+
+ public ObjectPage( 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.OBJECTLISTPANEL)
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
+ container.add( new AjaxLazyLoadPanel( GlobalIds.OBJECTLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
return new ObjectListPanel( id, isAdmin );
- }
- });
+ }
+ } );
// 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();
ObjectDetailPanel objectDetail = new ObjectDetailPanel( GlobalIds.OBJECTDETAILPANEL, display, isAdmin );
- container.add(objectDetail);
+ container.add( objectDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ 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/OuPermPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/OuPermPage.java b/src/main/java/org/apache/directory/fortress/web/OuPermPage.java
index b825b3b..b38b0eb 100644
--- a/src/main/java/org/apache/directory/fortress/web/OuPermPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/OuPermPage.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,46 +31,55 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.OUDetailPanel;
import org.apache.directory.fortress.web.panel.OUListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class OuPermPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isUser = false;
private String label = "Permission Organizational Unit Administration";
- public OuPermPage(PageParameters parameters)
+
+
+ public OuPermPage( 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.OULISTPANEL )
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new OUListPanel(id, isUser);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.OULISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new OUListPanel( id, isUser );
+ }
+ } );
// 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();
- OUDetailPanel ouDetail = new OUDetailPanel(GlobalIds.OUDETAILPANEL, display, isUser);
- container.add(ouDetail);
- container.add(navPanel);
- this.add(container);
+ OUDetailPanel ouDetail = new OUDetailPanel( GlobalIds.OUDETAILPANEL, display, isUser );
+ container.add( ouDetail );
+ 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/OuUserPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/OuUserPage.java b/src/main/java/org/apache/directory/fortress/web/OuUserPage.java
index 070de62..e374ad1 100644
--- a/src/main/java/org/apache/directory/fortress/web/OuUserPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/OuUserPage.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,46 +31,55 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.OUDetailPanel;
import org.apache.directory.fortress.web.panel.OUListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class OuUserPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isUser = true;
private String label = "User Organizational Unit Administration";
+
+
public OuUserPage( 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.OULISTPANEL)
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new OUListPanel(id, isUser);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.OULISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new OUListPanel( id, isUser );
+ }
+ } );
// 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();
- OUDetailPanel ouDetail = new OUDetailPanel( GlobalIds.OUDETAILPANEL, display, isUser);
- container.add(ouDetail);
- container.add(navPanel);
- this.add(container);
+ OUDetailPanel ouDetail = new OUDetailPanel( GlobalIds.OUDETAILPANEL, display, isUser );
+ container.add( ouDetail );
+ 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/PermAdminPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java b/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java
index 7adf213..379ad3e 100644
--- a/src/main/java/org/apache/directory/fortress/web/PermAdminPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/PermAdminPage.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.PermDetailPanel;
import org.apache.directory.fortress.web.panel.PermListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class PermAdminPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isAdmin = true;
private String label = "Administrative Permission Operation Page";
- public PermAdminPage(PageParameters parameters)
+
+ public PermAdminPage( 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.PERMLISTPANEL )
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new PermListPanel(id, isAdmin);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.PERMLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new PermListPanel( id, isAdmin );
+ }
+ } );
// 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();
PermDetailPanel permDetail = new PermDetailPanel( GlobalIds.PERMDETAILPANEL, display, isAdmin );
- container.add(permDetail);
+ container.add( permDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ 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/PermPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/PermPage.java b/src/main/java/org/apache/directory/fortress/web/PermPage.java
index c2e8bce..1a5dcf1 100644
--- a/src/main/java/org/apache/directory/fortress/web/PermPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/PermPage.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.PermDetailPanel;
import org.apache.directory.fortress.web.panel.PermListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
*/
public class PermPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isAdmin = false;
private String label = "RBAC Permission Operation Page";
- public PermPage(PageParameters parameters)
+
+ public PermPage( 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.PERMLISTPANEL)
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new PermListPanel(id, isAdmin);
- }
- });
+ container.add( new AjaxLazyLoadPanel( GlobalIds.PERMLISTPANEL )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new PermListPanel( id, isAdmin );
+ }
+ } );
// 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();
PermDetailPanel permDetail = new PermDetailPanel( GlobalIds.PERMDETAILPANEL, display, isAdmin );
- container.add(permDetail);
+ container.add( permDetail );
- container.add(navPanel);
- this.add(container);
+ container.add( navPanel );
+ 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/PwPolicyPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java b/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java
index fe5f243..abc6eeb 100644
--- a/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/PwPolicyPage.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,6 +30,7 @@ import org.apache.directory.fortress.web.panel.NavPanel;
import org.apache.directory.fortress.web.panel.PwPolicyDetailPanel;
import org.apache.directory.fortress.web.panel.PwPolicyListPanel;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -36,39 +38,47 @@ import org.apache.directory.fortress.web.panel.PwPolicyListPanel;
*/
public class PwPolicyPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public PwPolicyPage()
{
- add(new Label(GlobalIds.PAGE_HEADER, "Password Policy Administration"));
- WebMarkupContainer container = new WebMarkupContainer(GlobalIds.LAYOUT);
- FourWaySplitter splitter = new FourWaySplitter("72", "28");
- splitter.addBorderLayout(container);
+ add( new Label( GlobalIds.PAGE_HEADER, "Password Policy Administration" ) );
+ WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
+ FourWaySplitter splitter = new FourWaySplitter( "72", "28" );
+ 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("policylistpanel")
- {
- @Override
- public Component getLazyLoadComponent(String id)
- {
- return new PwPolicyListPanel(id);
- }
- });
+ container.add( new AjaxLazyLoadPanel( "policylistpanel" )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ public Component getLazyLoadComponent( String id )
+ {
+ return new PwPolicyListPanel( id );
+ }
+ } );
// 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();
- PwPolicyDetailPanel policyDetail = new PwPolicyDetailPanel("policydetailpanel", display);
- container.add(policyDetail);
+ PwPolicyDetailPanel policyDetail = new PwPolicyDetailPanel( "policydetailpanel", display );
+ container.add( policyDetail );
- 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/RbacSession.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/RbacSession.java b/src/main/java/org/apache/directory/fortress/web/RbacSession.java
index c3db301..ff213bb 100644
--- a/src/main/java/org/apache/directory/fortress/web/RbacSession.java
+++ b/src/main/java/org/apache/directory/fortress/web/RbacSession.java
@@ -36,9 +36,12 @@ import java.util.List;
*/
public class RbacSession extends WebSession
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private Session session;
private List<Permission> permissions;
+
/**
* Constructor. Note that {@link org.apache.wicket.request.cycle.RequestCycle} is not available until this
* constructor returns.
@@ -50,21 +53,25 @@ public class RbacSession extends WebSession
super( request );
}
+
public Session getRbacSession()
{
return session;
}
+
public void setSession( Session session )
{
this.session = session;
}
+
public List<Permission> getPermissions()
{
return permissions;
}
+
public void setPermissions( List<Permission> permissions )
{
this.permissions = permissions;
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java b/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java
index e957a63..5de569b 100644
--- a/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/RoleAdminPage.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,24 +32,28 @@ 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 RoleAdminPage extends FortressWebBasePage
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private boolean isAdmin = true;
private String label = "Admin Role Administration";
private static final Logger LOG = Logger.getLogger( RoleAdminPage.class.getName() );
+
/**
* @author Shawn McKinney
* @version $Rev$
* @param parameters
*/
- public RoleAdminPage(PageParameters parameters)
+ public RoleAdminPage( PageParameters parameters )
{
- String type = GlobalUtils.getPageType(parameters);
+ String type = GlobalUtils.getPageType( parameters );
add( new Label( GlobalIds.PAGE_HEADER, label ) );
WebMarkupContainer container = new WebMarkupContainer( GlobalIds.LAYOUT );
FourWaySplitter splitter = new FourWaySplitter();
@@ -61,14 +66,18 @@ public class RoleAdminPage 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 );
[03/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 005ae8a..45b87ae 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.inmethod.grid.IGridColumn;
import com.inmethod.grid.SizeUnit;
import com.inmethod.grid.column.PropertyColumn;
@@ -53,13 +54,16 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+
/**
* User: Shawn McKinney
* Date: 6/12/13
*/
public class PwPolicyListPanel extends FormComponentPanel
{
- private static final Logger log = Logger.getLogger(PwPolicyListPanel.class.getName());
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = Logger.getLogger( PwPolicyListPanel.class.getName() );
private Form listForm;
private DefaultTreeModel treeModel;
private DefaultMutableTreeNode node;
@@ -67,167 +71,185 @@ public class PwPolicyListPanel extends FormComponentPanel
private DefaultMutableTreeNode rootNode;
private String searchVal;
- public PwPolicyListPanel(String id)
+
+ public PwPolicyListPanel( String id )
{
- super(id);
- PwPolicyListModel policyListModel = new PwPolicyListModel(new PwPolicy(""), GlobalUtils.getRbacSession( this ) );
- setDefaultModel(policyListModel);
+ super( id );
+ PwPolicyListModel policyListModel = new PwPolicyListModel( new PwPolicy( "" ),
+ GlobalUtils.getRbacSession( this ) );
+ setDefaultModel( policyListModel );
List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
- columns.add(new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Policy Name"), "userObject.name"));
+ columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+ Model.of( "Policy Name" ), "userObject.name" ) );
PropertyColumn minAge = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Min Age"), "userObject.minAge");
- minAge.setInitialSize(60);
- columns.add(minAge);
+ Model.of( "Min Age" ), "userObject.minAge" );
+ minAge.setInitialSize( 60 );
+ columns.add( minAge );
PropertyColumn maxAge = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Max Age"), "userObject.maxAge");
- maxAge.setInitialSize(75);
- columns.add(maxAge);
+ Model.of( "Max Age" ), "userObject.maxAge" );
+ maxAge.setInitialSize( 75 );
+ columns.add( maxAge );
PropertyColumn inHistory = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("History"), "userObject.inHistory");
- inHistory.setInitialSize(50);
- columns.add(inHistory);
+ Model.of( "History" ), "userObject.inHistory" );
+ inHistory.setInitialSize( 50 );
+ columns.add( inHistory );
PropertyColumn minLength = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Min Len"), "userObject.minLength");
- minLength.setInitialSize(60);
- columns.add(minLength);
+ Model.of( "Min Len" ), "userObject.minLength" );
+ minLength.setInitialSize( 60 );
+ columns.add( minLength );
PropertyColumn expireWarning = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Expire Warning"), "userObject.expireWarning");
- expireWarning.setInitialSize(115);
- columns.add(expireWarning);
+ Model.of( "Expire Warning" ), "userObject.expireWarning" );
+ expireWarning.setInitialSize( 115 );
+ columns.add( expireWarning );
PropertyColumn graceLoginLimit = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Grace"), "userObject.graceLoginLimit");
- graceLoginLimit.setInitialSize(50);
- columns.add(graceLoginLimit);
+ Model.of( "Grace" ), "userObject.graceLoginLimit" );
+ graceLoginLimit.setInitialSize( 50 );
+ columns.add( graceLoginLimit );
PropertyColumn lockout = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Lockout"), "userObject.lockout");
- lockout.setInitialSize(60);
- columns.add(lockout);
+ Model.of( "Lockout" ), "userObject.lockout" );
+ lockout.setInitialSize( 60 );
+ columns.add( lockout );
PropertyColumn lockoutDuration = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Lockout Duration"), "userObject.lockoutDuration");
- lockoutDuration.setInitialSize(125);
- columns.add(lockoutDuration);
+ Model.of( "Lockout Duration" ), "userObject.lockoutDuration" );
+ lockoutDuration.setInitialSize( 125 );
+ columns.add( lockoutDuration );
PropertyColumn maxFailure = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Max Failure"), "userObject.maxFailure");
- maxFailure.setInitialSize(80);
- columns.add(maxFailure);
+ Model.of( "Max Failure" ), "userObject.maxFailure" );
+ maxFailure.setInitialSize( 80 );
+ columns.add( maxFailure );
PropertyColumn failureCountInterval = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Interval"), "userObject.failureCountInterval");
- failureCountInterval.setInitialSize(60);
- columns.add(failureCountInterval);
+ Model.of( "Interval" ), "userObject.failureCountInterval" );
+ failureCountInterval.setInitialSize( 60 );
+ columns.add( failureCountInterval );
PropertyColumn mustChange = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Must Change"), "userObject.mustChange");
- mustChange.setInitialSize(90);
- columns.add(mustChange);
+ Model.of( "Must Change" ), "userObject.mustChange" );
+ mustChange.setInitialSize( 90 );
+ columns.add( mustChange );
PropertyColumn allowUserChange = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Allow Change"), "userObject.allowUserChange");
- allowUserChange.setInitialSize(95);
- columns.add(allowUserChange);
+ Model.of( "Allow Change" ), "userObject.allowUserChange" );
+ allowUserChange.setInitialSize( 95 );
+ columns.add( allowUserChange );
PropertyColumn safeModify = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Safe Modify"), "userObject.safeModify");
- safeModify.setInitialSize(90);
- columns.add(safeModify);
+ Model.of( "Safe Modify" ), "userObject.safeModify" );
+ safeModify.setInitialSize( 90 );
+ columns.add( safeModify );
-/*
- PropertyColumn checkQuality = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Check Quality"), "userObject.checkQuality");
- checkQuality.setInitialSize(100);
- columns.add(checkQuality);
-*/
-
- List<PwPolicy> policies = (List<PwPolicy>) getDefaultModel().getObject();
- treeModel = createTreeModel(policies);
- grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>("policytreegrid", treeModel, columns)
+ /*
+ PropertyColumn checkQuality = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+ Model.of("Check Quality"), "userObject.checkQuality");
+ checkQuality.setInitialSize(100);
+ columns.add(checkQuality);
+ */
+
+ List<PwPolicy> policies = ( List<PwPolicy> ) getDefaultModel().getObject();
+ treeModel = createTreeModel( policies );
+ grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "policytreegrid", 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() )
{
- PwPolicy policy = (PwPolicy) node.getUserObject();
- log.debug("TreeGrid.addGrid.selectItem selected policy =" + policy.getName());
- if (super.isItemSelected(itemModel))
+ PwPolicy policy = ( PwPolicy ) node.getUserObject();
+ log.debug( "TreeGrid.addGrid.selectItem selected policy =" + policy.getName() );
+ if ( super.isItemSelected( itemModel ) )
{
- log.debug("TreeGrid.addGrid.selectItem item is selected");
- super.selectItem(itemModel, false);
+ log.debug( "TreeGrid.addGrid.selectItem item is selected" );
+ super.selectItem( itemModel, false );
}
else
{
- super.selectItem(itemModel, true);
- SelectModelEvent.send(getPage(), this, policy);
+ super.selectItem( itemModel, true );
+ SelectModelEvent.send( getPage(), this, policy );
}
}
}
};
- 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());
- this.listForm = new Form("form");
- this.listForm.add(grid);
- grid.setOutputMarkupId(true);
- TextField searchValFld = new TextField(GlobalIds.SEARCH_VAL, new PropertyModel<String>(this, GlobalIds.SEARCH_VAL));
- this.listForm.add(searchValFld);
-
- this.listForm.add(new AjaxSubmitLink(GlobalIds.SEARCH)
+ grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ this.listForm = new Form( "form" );
+ this.listForm.add( grid );
+ grid.setOutputMarkupId( true );
+ TextField searchValFld = new TextField( GlobalIds.SEARCH_VAL, new PropertyModel<String>( this,
+ GlobalIds.SEARCH_VAL ) );
+ this.listForm.add( searchValFld );
+
+ this.listForm.add( new AjaxSubmitLink( GlobalIds.SEARCH )
{
+ /** 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");
- info("Searching Policies...");
- if(!VUtil.isNotNullOrEmpty(searchVal))
+ log.debug( ".search onSubmit" );
+ info( "Searching Policies..." );
+ if ( !VUtil.isNotNullOrEmpty( searchVal ) )
{
searchVal = "";
}
- PwPolicy srchPolicy = new PwPolicy(searchVal);
- setDefaultModel(new PwPolicyListModel(srchPolicy, GlobalUtils.getRbacSession( this )));
+ PwPolicy srchPolicy = new PwPolicy( searchVal );
+ setDefaultModel( new PwPolicyListModel( srchPolicy, GlobalUtils.getRbacSession( this ) ) );
treeModel.reload();
rootNode.removeAllChildren();
- List<PwPolicy> policies = (List<PwPolicy>) getDefaultModelObject();
- if(VUtil.isNotNullOrEmpty(policies))
+ List<PwPolicy> policies = ( List<PwPolicy> ) getDefaultModelObject();
+ if ( VUtil.isNotNullOrEmpty( policies ) )
{
- for (PwPolicy policy : policies)
- rootNode.add(new DefaultMutableTreeNode(policy));
- info("Search returned " + policies.size() + " matching objects");
+ for ( PwPolicy policy : policies )
+ rootNode.add( new DefaultMutableTreeNode( policy ) );
+ info( "Search returned " + policies.size() + " matching objects" );
}
else
{
- info("No matching objects found");
+ info( "No matching objects found" );
}
- target.add(grid);
+ target.add( grid );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn(".search.onError");
+ log.warn( ".search.onError" );
target.add();
}
+
+
@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 )
{
@@ -236,20 +258,21 @@ public class PwPolicyListPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
- add(this.listForm);
+ } );
+ add( this.listForm );
}
+
@Override
- public void onEvent(IEvent event)
+ public void onEvent( IEvent event )
{
- if (event.getPayload() instanceof SaveModelEvent)
+ if ( event.getPayload() instanceof SaveModelEvent )
{
- SaveModelEvent modelEvent = (SaveModelEvent) event.getPayload();
- switch(modelEvent.getOperation())
+ SaveModelEvent modelEvent = ( SaveModelEvent ) event.getPayload();
+ switch ( modelEvent.getOperation() )
{
case ADD:
- add(modelEvent.getEntity());
+ add( modelEvent.getEntity() );
break;
case UPDATE:
modelChanged();
@@ -260,56 +283,60 @@ public class PwPolicyListPanel extends FormComponentPanel
default:
break;
}
- AjaxRequestTarget target = ((SaveModelEvent) event.getPayload()).getAjaxRequestTarget();
- target.add(grid);
- log.debug(".onEvent SaveModelEvent: " + target.toString());
+ AjaxRequestTarget target = ( ( SaveModelEvent ) event.getPayload() ).getAjaxRequestTarget();
+ target.add( grid );
+ log.debug( ".onEvent SaveModelEvent: " + target.toString() );
}
}
- private void removeSelectedItems(TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid)
+
+ private void removeSelectedItems( TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid )
{
Collection<IModel<DefaultMutableTreeNode>> selected = grid.getSelectedItems();
- for (IModel<DefaultMutableTreeNode> model : selected)
+ for ( IModel<DefaultMutableTreeNode> model : selected )
{
DefaultMutableTreeNode node = model.getObject();
- treeModel.removeNodeFromParent(node);
- PwPolicy policy = (PwPolicy) node.getUserObject();
- log.debug(".removeSelectedItems policy node: " + policy.getName());
- List<PwPolicy> policies = ((List<PwPolicy>) getDefaultModel().getObject());
- policies.remove(policy.getName());
+ treeModel.removeNodeFromParent( node );
+ PwPolicy policy = ( PwPolicy ) node.getUserObject();
+ log.debug( ".removeSelectedItems policy node: " + policy.getName() );
+ List<PwPolicy> policies = ( ( List<PwPolicy> ) getDefaultModel().getObject() );
+ policies.remove( policy.getName() );
}
}
- private DefaultTreeModel createTreeModel(List<PwPolicy> policies)
+
+ private DefaultTreeModel createTreeModel( List<PwPolicy> policies )
{
DefaultTreeModel model;
PwPolicy root = new PwPolicy();
//root.setName("Policies");
- rootNode = new DefaultMutableTreeNode(root);
- model = new DefaultTreeModel(rootNode);
- if (policies == null)
- log.debug("no Policies found");
+ rootNode = new DefaultMutableTreeNode( root );
+ model = new DefaultTreeModel( rootNode );
+ if ( policies == null )
+ log.debug( "no Policies found" );
else
{
- log.debug("Policies found:" + policies.size());
- for (PwPolicy policy : policies)
- rootNode.add(new DefaultMutableTreeNode(policy));
+ log.debug( "Policies found:" + policies.size() );
+ for ( PwPolicy policy : policies )
+ rootNode.add( new DefaultMutableTreeNode( policy ) );
}
return model;
}
- public void add(FortEntity entity)
+
+ public void add( FortEntity entity )
{
- if (getDefaultModelObject() != null)
+ if ( getDefaultModelObject() != null )
{
- List<PwPolicy> policies = ((List<PwPolicy>) getDefaultModelObject());
- policies.add((PwPolicy) entity);
- treeModel.insertNodeInto(new DefaultMutableTreeNode(entity), rootNode, policies.size());
+ List<PwPolicy> policies = ( ( List<PwPolicy> ) getDefaultModelObject() );
+ policies.add( ( PwPolicy ) entity );
+ treeModel.insertNodeInto( new DefaultMutableTreeNode( entity ), rootNode, policies.size() );
}
}
+
public void prune()
{
- removeSelectedItems(grid);
+ removeSelectedItems( grid );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java
index b442d7d..6512a16 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import java.util.List;
import org.apache.log4j.Logger;
@@ -37,6 +38,7 @@ import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.directory.fortress.core.PwPolicyMgr;
import org.apache.directory.fortress.core.rbac.PwPolicy;
+
/**
*
* @author Shawn McKinney
@@ -44,17 +46,20 @@ import org.apache.directory.fortress.core.rbac.PwPolicy;
*/
public class PwPolicySearchModalPanel extends Panel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private PwPolicyMgr pwPolicyMgr;
- private static final Logger LOG = Logger.getLogger(PwPolicySearchModalPanel.class.getName());
+ private static final Logger LOG = Logger.getLogger( PwPolicySearchModalPanel.class.getName() );
private ModalWindow window;
private PwPolicy policySelection;
private String policySearchVal;
+
/**
* @param id
*/
- public PwPolicySearchModalPanel( String id, ModalWindow window)
+ public PwPolicySearchModalPanel( String id, ModalWindow window )
{
super( id );
// TODO: add later:
@@ -63,6 +68,7 @@ public class PwPolicySearchModalPanel extends Panel
loadPanel();
}
+
public void loadPanel()
{
LoadableDetachableModel requests = getListViewModel();
@@ -71,10 +77,15 @@ public class PwPolicySearchModalPanel extends Panel
add( new AjaxPagingNavigator( "policynavigator", policyView ) );
}
+
private PageableListView createListView( final LoadableDetachableModel requests )
{
final PageableListView listView = new PageableListView( "policydataview", requests, 16 )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void populateItem( final ListItem item )
{
@@ -83,8 +94,9 @@ public class PwPolicySearchModalPanel extends Panel
{
private static final long serialVersionUID = 1L;
+
@Override
- public void onClick(AjaxRequestTarget target)
+ public void onClick( AjaxRequestTarget target )
{
policySelection = modelObject;
window.close( target );
@@ -101,7 +113,8 @@ public class PwPolicySearchModalPanel extends Panel
item.add( new Label( "lockout", new PropertyModel( item.getModel(), "lockout" ) ) );
item.add( new Label( "lockoutDuration", new PropertyModel( item.getModel(), "lockoutDuration" ) ) );
item.add( new Label( "maxFailure", new PropertyModel( item.getModel(), "maxFailure" ) ) );
- item.add( new Label( "failureCountInterval", new PropertyModel( item.getModel(), "failureCountInterval" ) ) );
+ item.add( new Label( "failureCountInterval",
+ new PropertyModel( item.getModel(), "failureCountInterval" ) ) );
item.add( new Label( "mustChange", new PropertyModel( item.getModel(), "mustChange" ) ) );
item.add( new Label( "allowUserChange", new PropertyModel( item.getModel(), "allowUserChange" ) ) );
item.add( new Label( "safeModify", new PropertyModel( item.getModel(), "safeModify" ) ) );
@@ -111,10 +124,15 @@ public class PwPolicySearchModalPanel extends Panel
return listView;
}
+
private LoadableDetachableModel getListViewModel()
{
final LoadableDetachableModel ret = new LoadableDetachableModel()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected Object load()
{
@@ -122,7 +140,7 @@ public class PwPolicySearchModalPanel extends Panel
try
{
policySelection = null;
- if(policySearchVal == null)
+ if ( policySearchVal == null )
policySearchVal = "";
policies = pwPolicyMgr.search( policySearchVal );
}
@@ -137,11 +155,13 @@ public class PwPolicySearchModalPanel extends Panel
return ret;
}
+
public PwPolicy getPolicySelection()
{
return policySelection;
}
+
public void setSearchVal( String searchVal )
{
this.policySearchVal = searchVal;
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/panel/RequestMod.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RequestMod.java b/src/main/java/org/apache/directory/fortress/web/panel/RequestMod.java
index bbaa729..aaeae8a 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RequestMod.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RequestMod.java
@@ -20,8 +20,10 @@
package org.apache.directory.fortress.web.panel;
+
import java.io.Serializable;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -29,6 +31,9 @@ import java.io.Serializable;
*/
class RequestMod implements Serializable
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
enum TYPE
{
ADD,
@@ -42,60 +47,70 @@ class RequestMod implements Serializable
private String name;
private String value;
+
RequestMod( int index, String name, String value )
{
- this.type = type;
this.index = index;
this.name = name;
this.value = value;
}
+
RequestMod( String name )
{
this.name = name;
}
+
public int getIndex()
{
return index;
}
+
public TYPE getType()
{
return type;
}
+
public void setType( TYPE type )
{
this.type = type;
}
+
public void setIndex( int index )
{
this.index = index;
}
+
public String getValue()
{
return value;
}
+
public void setValue( String value )
{
this.value = value;
}
+
public String getName()
{
return name;
}
+
public void setName( String name )
{
this.name = name;
}
+
@Override
public boolean equals( Object o )
{
@@ -118,6 +133,7 @@ class RequestMod implements Serializable
return true;
}
+
@Override
public int hashCode()
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 0669989..1703f96 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
import org.apache.log4j.Logger;
@@ -42,6 +43,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
import java.util.List;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -49,6 +51,8 @@ import java.util.List;
*/
public class RoleAdminDetailPanel extends Panel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final Logger LOG = Logger.getLogger( RoleAdminDetailPanel.class.getName() );
public static final String PERMOU_SELECTION = "permouSelection";
public static final String USEROU_SELECTION = "userouSelection";
@@ -62,6 +66,7 @@ public class RoleAdminDetailPanel extends Panel
private String userouSelection;
private String permouSelection;
+
public RoleAdminDetailPanel( String id, final IModel roleModel )
{
super( id, roleModel );
@@ -99,6 +104,7 @@ public class RoleAdminDetailPanel extends Panel
setOutputMarkupId( true );
}
+
private void addPermOUSearchModal()
{
final ModalWindow permousModalWindow;
@@ -108,6 +114,10 @@ public class RoleAdminDetailPanel extends Panel
permousModalWindow.setContent( permouSearchModalPanel );
permousModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -115,7 +125,7 @@ public class RoleAdminDetailPanel extends Panel
if ( ou != null )
{
permouSelection = ou.getName();
- AdminRole adminRole = (AdminRole)getDefaultModelObject();
+ AdminRole adminRole = ( AdminRole ) getDefaultModelObject();
adminRole.setOsP( permouSelection );
target.add( permouCB );
}
@@ -124,6 +134,10 @@ public class RoleAdminDetailPanel extends Panel
add( new AjaxButton( GlobalIds.PERMOU_SEARCH )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -135,12 +149,17 @@ public class RoleAdminDetailPanel extends Panel
permousModalWindow.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 )
{
@@ -158,6 +177,10 @@ public class RoleAdminDetailPanel extends Panel
add( new AjaxButton( "permou.delete" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -186,12 +209,17 @@ public class RoleAdminDetailPanel extends Panel
LOG.debug( msg );
}
+
@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 )
{
@@ -203,6 +231,7 @@ public class RoleAdminDetailPanel extends Panel
} );
}
+
private void addUserOUSearchModal()
{
final ModalWindow userousModalWindow;
@@ -212,6 +241,10 @@ public class RoleAdminDetailPanel extends Panel
userousModalWindow.setContent( userouSearchModalPanel );
userousModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -219,7 +252,7 @@ public class RoleAdminDetailPanel extends Panel
if ( ou != null )
{
userouSelection = ou.getName();
- AdminRole adminRole = (AdminRole)getDefaultModelObject();
+ AdminRole adminRole = ( AdminRole ) getDefaultModelObject();
adminRole.setOsU( userouSelection );
target.add( userouCB );
}
@@ -228,6 +261,10 @@ public class RoleAdminDetailPanel extends Panel
add( new AjaxButton( GlobalIds.USEROU_SEARCH )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -239,12 +276,17 @@ public class RoleAdminDetailPanel extends Panel
userousModalWindow.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 )
{
@@ -262,6 +304,10 @@ public class RoleAdminDetailPanel extends Panel
add( new AjaxButton( "userou.delete" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -290,12 +336,17 @@ public class RoleAdminDetailPanel extends Panel
LOG.debug( msg );
}
+
@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 )
{
@@ -307,14 +358,20 @@ public class RoleAdminDetailPanel extends Panel
} );
}
+
private void addBeginRoleSearchModal()
{
final ModalWindow beginRoleModalWindow;
add( beginRoleModalWindow = new ModalWindow( "beginrolesmodal" ) );
- final RoleSearchModalPanel beginRoleSearchModalPanel = new RoleSearchModalPanel( beginRoleModalWindow.getContentId(), beginRoleModalWindow, false );
+ final RoleSearchModalPanel beginRoleSearchModalPanel = new RoleSearchModalPanel(
+ beginRoleModalWindow.getContentId(), beginRoleModalWindow, false );
beginRoleModalWindow.setContent( beginRoleSearchModalPanel );
beginRoleModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -330,6 +387,10 @@ public class RoleAdminDetailPanel extends Panel
add( new AjaxButton( GlobalIds.BEGIN_RANGE_SEARCH )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -339,12 +400,17 @@ public class RoleAdminDetailPanel extends Panel
beginRoleModalWindow.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 )
{
@@ -361,14 +427,20 @@ public class RoleAdminDetailPanel extends Panel
beginRoleModalWindow.setCookieName( ROLE_ASSIGN_MODAL );
}
+
private void addEndRoleSearchModal()
{
final ModalWindow endRoleModalWindow;
add( endRoleModalWindow = new ModalWindow( "endrolesmodal" ) );
- final RoleSearchModalPanel endRoleSearchModalPanel = new RoleSearchModalPanel( endRoleModalWindow.getContentId(), endRoleModalWindow, false );
+ final RoleSearchModalPanel endRoleSearchModalPanel = new RoleSearchModalPanel(
+ endRoleModalWindow.getContentId(), endRoleModalWindow, false );
endRoleModalWindow.setContent( endRoleSearchModalPanel );
endRoleModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -384,6 +456,10 @@ public class RoleAdminDetailPanel extends Panel
add( new AjaxButton( GlobalIds.END_RANGE_SEARCH )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -394,12 +470,17 @@ public class RoleAdminDetailPanel extends Panel
endRoleModalWindow.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 )
{
@@ -416,6 +497,7 @@ public class RoleAdminDetailPanel extends Panel
endRoleModalWindow.setCookieName( ROLE_ASSIGN_MODAL );
}
+
/**
* This api is needed for this class {@link org.apache.directory.fortress.web.panel.RoleDetailPanel} to 'push' its model value into this panel's combo box.
*
@@ -429,6 +511,7 @@ public class RoleAdminDetailPanel extends Panel
addOrReplace( permouCB );
}
+
/**
* This api is needed for this class {@link org.apache.directory.fortress.web.panel.RoleDetailPanel} to 'push' its model value into this panel's combo box.
*
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 8b60a0b..2e4a72b 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
@@ -59,6 +60,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+
/**
* Created with IntelliJ IDEA.
* User: kpmckinn
@@ -68,45 +70,52 @@ import java.util.List;
*/
public class RoleDetailPanel extends Panel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private AdminMgr adminMgr;
@SpringBean
private DelAdminMgr delAdminMgr;
- private static final Logger log = Logger.getLogger(RoleDetailPanel.class.getName());
+ private static final Logger log = Logger.getLogger( RoleDetailPanel.class.getName() );
private static final String PARENTS_SELECTION = "parentsSelection";
private Form editForm;
private Displayable display;
private boolean isAdmin;
private String objName;
+
public Form getForm()
{
return this.editForm;
}
- public RoleDetailPanel(String id, Displayable display, final boolean isAdmin)
+
+ public RoleDetailPanel( String id, Displayable display, final boolean isAdmin )
{
- super(id);
+ super( id );
this.isAdmin = isAdmin;
this.adminMgr.setAdmin( GlobalUtils.getRbacSession( this ) );
this.delAdminMgr.setAdmin( GlobalUtils.getRbacSession( this ) );
- if(isAdmin)
+ if ( isAdmin )
{
this.objName = GlobalIds.DEL_ADMIN_MGR;
- this.editForm = new RoleDetailForm(GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<AdminRole>(new AdminRole()));
+ this.editForm = new RoleDetailForm( GlobalIds.EDIT_FIELDS, new CompoundPropertyModel<AdminRole>(
+ 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<Role>( new Role() ) );
}
this.display = display;
- add(editForm);
+ add( editForm );
}
public class RoleDetailForm<T extends Serializable> extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final String TEMPORAL_CONSTRAINTS_LABEL = "temporalConstraintsLabel";
private String temporalConstraintsLabel = "Temporal Constraints";
private ConstraintPanel constraintPanel;
@@ -118,10 +127,11 @@ public class RoleDetailPanel extends Panel
private UserRole parentConstraint = new UserRole();
private RoleAdminDetailPanel auxPanel;
- public RoleDetailForm(String id, final IModel<T> model)
+
+ public RoleDetailForm( String id, final IModel<T> model )
{
- super(id, model);
- if(isAdmin)
+ super( id, model );
+ if ( isAdmin )
{
auxPanel = new RoleAdminDetailPanel( GlobalIds.ROLEAUXPANEL, model );
add( auxPanel );
@@ -131,71 +141,84 @@ public class RoleDetailPanel extends Panel
add( new WebMarkupContainer( GlobalIds.ROLEAUXPANEL ) );
}
- this.add(new JQueryBehavior("#accordion", "accordion"));
- constraintPanel = new ConstraintPanel("constraintpanel", model);
- add(constraintPanel);
+ this.add( new JQueryBehavior( "#accordion", "accordion" ) );
+ constraintPanel = new ConstraintPanel( "constraintpanel", model );
+ add( constraintPanel );
add( new Label( TEMPORAL_CONSTRAINTS_LABEL, new PropertyModel<String>( this,
TEMPORAL_CONSTRAINTS_LABEL ) ) );
- TextField name = new TextField("name");
- add(name);
- TextField description = new TextField(GlobalIds.DESCRIPTION);
- description.setRequired(false);
- add(description);
- Label iid = new Label("id");
- add(iid);
- parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ), parents );
- add(parentsCB);
+ TextField name = new TextField( "name" );
+ add( name );
+ TextField description = new TextField( GlobalIds.DESCRIPTION );
+ description.setRequired( false );
+ add( description );
+ Label iid = new Label( "id" );
+ add( iid );
+ parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),
+ parents );
+ add( parentsCB );
add( new SecureIndicatingAjaxButton( GlobalIds.ADD, objName, GlobalIds.ADD_ROLE )
{
+ /** 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(".onSubmit Add");
- T role = (T)form.getModel().getObject();
- updateEntityWithComboData((Role)role);
+ log.debug( ".onSubmit Add" );
+ T role = ( T ) form.getModel().getObject();
+ updateEntityWithComboData( ( Role ) role );
try
{
String szRoleName;
- if(isAdmin)
+ if ( isAdmin )
{
- delAdminMgr.addRole((AdminRole)role);
- szRoleName = ((AdminRole)role).getName();
+ delAdminMgr.addRole( ( AdminRole ) role );
+ szRoleName = ( ( AdminRole ) role ).getName();
}
else
{
- adminMgr.addRole((Role)role);
- szRoleName = ((Role)role).getName();
+ adminMgr.addRole( ( Role ) role );
+ szRoleName = ( ( Role ) role ).getName();
}
parentsSelection = "";
parents.add( parentsSelection );
- SaveModelEvent.send(getPage(), this, ( FortEntity )role, target, SaveModelEvent.Operations.ADD);
+ SaveModelEvent.send( getPage(), this, ( FortEntity ) role, target,
+ SaveModelEvent.Operations.ADD );
component = editForm;
String msg = "Role: " + szRoleName + " has been added";
- display.setMessage(msg);
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.info("RoleDetailPanel.add.onError caught");
+ log.info( "RoleDetailPanel.add.onError caught" );
target.add();
}
+
+
@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 )
{
@@ -204,54 +227,66 @@ public class RoleDetailPanel extends Panel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
add( new SecureIndicatingAjaxButton( GlobalIds.COMMIT, objName, GlobalIds.UPDATE_ROLE )
{
+ /** 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(".onSubmit Commit");
- T role = (T)form.getModel().getObject();
- updateEntityWithComboData((Role)role);
+ log.debug( ".onSubmit Commit" );
+ T role = ( T ) form.getModel().getObject();
+ updateEntityWithComboData( ( Role ) role );
try
{
String szRoleName;
- if(isAdmin)
+ if ( isAdmin )
{
- delAdminMgr.updateRole((AdminRole)role);
- szRoleName = ((AdminRole)role).getName();
+ delAdminMgr.updateRole( ( AdminRole ) role );
+ szRoleName = ( ( AdminRole ) role ).getName();
}
else
{
- adminMgr.updateRole((Role)role);
- szRoleName = ((Role)role).getName();
+ adminMgr.updateRole( ( Role ) role );
+ szRoleName = ( ( Role ) role ).getName();
}
String msg = "Role: " + szRoleName + " has been updated";
- SaveModelEvent.send(getPage(), this, ( FortEntity )role, target, SaveModelEvent.Operations.UPDATE);
+ SaveModelEvent.send( getPage(), this, ( FortEntity ) role, target,
+ SaveModelEvent.Operations.UPDATE );
parentsSelection = "";
component = editForm;
- display.setMessage(msg);
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("RoleDetailPanel.update.onError");
+ log.warn( "RoleDetailPanel.update.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 )
{
@@ -260,59 +295,72 @@ public class RoleDetailPanel extends Panel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
add( new SecureIndicatingAjaxButton( GlobalIds.DELETE, objName, GlobalIds.DELETE_ROLE )
{
+ /** 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(".onSubmit Delete");
- T role = (T)form.getModel().getObject();
+ log.debug( ".onSubmit Delete" );
+ T role = ( T ) form.getModel().getObject();
try
{
String szRoleName;
- if(isAdmin)
+ if ( isAdmin )
{
- delAdminMgr.deleteRole((AdminRole)role);
- szRoleName = ((AdminRole)role).getName();
+ delAdminMgr.deleteRole( ( AdminRole ) role );
+ szRoleName = ( ( AdminRole ) role ).getName();
form.setModelObject( new AdminRole() );
}
else
{
- adminMgr.deleteRole((Role)role);
- szRoleName = ((Role)role).getName();
+ adminMgr.deleteRole( ( Role ) role );
+ szRoleName = ( ( Role ) role ).getName();
form.setModelObject( new Role() );
}
parentsSelection = "";
parents = new ArrayList<String>();
- parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( form, PARENTS_SELECTION ),parents );
+ parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( form,
+ PARENTS_SELECTION ), parents );
editForm.addOrReplace( parentsCB );
modelChanged();
String msg = "Role: " + szRoleName + " has been deleted";
- SaveModelEvent.send(getPage(), this, ( FortEntity )role, target, SaveModelEvent.Operations.DELETE);
+ SaveModelEvent.send( getPage(), this, ( FortEntity ) role, target,
+ SaveModelEvent.Operations.DELETE );
component = editForm;
- display.setMessage(msg);
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("RoleDetailPanel.delete.onError");
+ log.warn( "RoleDetailPanel.delete.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 )
{
@@ -321,41 +369,53 @@ public class RoleDetailPanel extends Panel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
- add(new AjaxSubmitLink(GlobalIds.CANCEL)
+ } );
+ add( new AjaxSubmitLink( GlobalIds.CANCEL )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
- protected void onSubmit(AjaxRequestTarget target, Form form)
+ protected void onSubmit( AjaxRequestTarget target, Form form )
{
- if(isAdmin)
+ if ( isAdmin )
{
- setModelObject(new AdminRole());
+ setModelObject( new AdminRole() );
}
else
{
- setModelObject(new Role());
+ setModelObject( new Role() );
}
parentsSelection = "";
parents = new ArrayList<String>();
- parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( form, PARENTS_SELECTION ),parents );
+ parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( form,
+ PARENTS_SELECTION ), parents );
modelChanged();
editForm.addOrReplace( parentsCB );
component = editForm;
String msg = "Role cancelled input form";
- display.setMessage(msg);
+ display.setMessage( msg );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("RoleDetailPanel.cancel.onError");
+ log.warn( "RoleDetailPanel.cancel.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 )
{
@@ -364,9 +424,9 @@ public class RoleDetailPanel extends Panel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
- if(isAdmin)
+ if ( isAdmin )
{
add( new Label( "roleDetailLabel", "Admin Role Detail" ) );
}
@@ -379,6 +439,7 @@ public class RoleDetailPanel extends Panel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -390,7 +451,7 @@ public class RoleDetailPanel extends Panel
if ( role.getParents() != null )
{
role.getParents().remove( parentsSelection );
- parents.remove( parentsSelection );
+ parents.remove( parentsSelection );
parentsSelection = "";
component = editForm;
msg += ", was removed from local, commit to persist changes on server";
@@ -407,12 +468,18 @@ public class RoleDetailPanel extends Panel
display.setMessage( msg );
log.debug( msg );
}
+
+
@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 )
{
@@ -422,26 +489,33 @@ public class RoleDetailPanel extends Panel
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
} );
- setOutputMarkupId(true);
+ setOutputMarkupId( true );
}
- private void updateEntityWithComboData(Role role)
+
+ private void updateEntityWithComboData( Role role )
{
- if(VUtil.isNotNullOrEmpty(parentsSelection))
+ if ( VUtil.isNotNullOrEmpty( parentsSelection ) )
{
role.setParent( parentsSelection );
parents.add( parentsSelection );
}
}
+
private void addRoleSearchModal()
{
final ModalWindow rolesModalWindow;
add( rolesModalWindow = new ModalWindow( "parentrolesmodal" ) );
- final RoleSearchModalPanel roleSearchModalPanel = new RoleSearchModalPanel( rolesModalWindow.getContentId(), rolesModalWindow, isAdmin );
+ final RoleSearchModalPanel roleSearchModalPanel = new RoleSearchModalPanel(
+ rolesModalWindow.getContentId(), rolesModalWindow, isAdmin );
rolesModalWindow.setContent( roleSearchModalPanel );
rolesModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -449,7 +523,7 @@ public class RoleDetailPanel extends Panel
if ( parentConstraint != null )
{
parentsSelection = parentConstraint.getName();
- Role role = (Role)getDefaultModelObject();
+ Role role = ( Role ) getDefaultModelObject();
role.setParent( parentsSelection );
target.add( parentsCB );
component = editForm;
@@ -461,6 +535,7 @@ public class RoleDetailPanel extends Panel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -472,12 +547,18 @@ public class RoleDetailPanel extends Panel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
rolesModalWindow.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 )
{
@@ -489,7 +570,7 @@ public class RoleDetailPanel extends Panel
} );
String modalLabel;
- if(isAdmin)
+ if ( isAdmin )
{
modalLabel = "Admin Role Selection Modal";
}
@@ -503,81 +584,85 @@ public class RoleDetailPanel extends Panel
rolesModalWindow.setCookieName( "role-assign-modal" );
}
+
@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();
- T role = (T) modelEvent.getEntity();
+ SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
+ T role = ( T ) modelEvent.getEntity();
this.setModelObject( role );
parentsSelection = "";
- if(VUtil.isNotNullOrEmpty(((Role)role).getParents()))
+ if ( VUtil.isNotNullOrEmpty( ( ( Role ) role ).getParents() ) )
{
- parents = new ArrayList<String>(((Role)role).getParents());
- parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),parents );
+ parents = new ArrayList<String>( ( ( Role ) role ).getParents() );
+ parentsCB = new ComboBox<String>( 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_SELECTION ),parents );
+ parentsCB = new ComboBox<String>( GlobalIds.PARENTS, new PropertyModel<String>( this,
+ PARENTS_SELECTION ), parents );
}
- editForm.addOrReplace(parentsCB);
- String msg = "Role: " + ((Role)role).getName() + " has been selected";
- log.debug(msg);
- display.setMessage(msg);
+ editForm.addOrReplace( parentsCB );
+ String msg = "Role: " + ( ( Role ) role ).getName() + " has been selected";
+ log.debug( msg );
+ display.setMessage( msg );
component = editForm;
}
- 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());
- log.debug(".onEvent AjaxRequestTarget: " + target.toString());
- target.add(component);
+ AjaxRequestTarget target = ( ( AjaxRequestTarget ) event.getPayload() );
+ log.debug( ".onEvent AjaxRequestTarget: " + target.toString() );
+ target.add( component );
component = null;
}
- display.display((AjaxRequestTarget) event.getPayload());
+ display.display( ( AjaxRequestTarget ) event.getPayload() );
}
}
+
@Override
protected void onBeforeRender()
{
- if(getModel() != null)
+ if ( getModel() != null )
{
// push the 'changed' model down into the constraint panel:
- constraintPanel.setDefaultModel(getModel());
- if(isAdmin)
+ constraintPanel.setDefaultModel( getModel() );
+ if ( isAdmin )
{
// push the 'changed' model down into the admin role detail panel:
auxPanel.setDefaultModel( getModel() );
- AdminRole role = (AdminRole)getModel().getObject();
- if(role != null)
+ AdminRole role = ( AdminRole ) getModel().getObject();
+ if ( role != null )
{
- if(role.getOsP() != null)
+ if ( role.getOsP() != null )
{
- auxPanel.setPermous( new ArrayList<String>(role.getOsP() ) );
+ auxPanel.setPermous( new ArrayList<String>( role.getOsP() ) );
}
else
{
- auxPanel.setPermous( new ArrayList<String>( ) );
+ auxPanel.setPermous( new ArrayList<String>() );
}
- if(role.getOsU() != null)
+ if ( role.getOsU() != null )
{
- auxPanel.setUserous( new ArrayList<String>(role.getOsU() ) );
+ auxPanel.setUserous( new ArrayList<String>( role.getOsU() ) );
}
else
{
- auxPanel.setUserous( new ArrayList<String>( ) );
+ auxPanel.setUserous( new ArrayList<String>() );
}
}
}
}
else
{
- log.info(".onBeforeRender null model object");
+ log.info( ".onBeforeRender null model object" );
}
super.onBeforeRender();
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 5b53e82..401ba67 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.inmethod.grid.IGridColumn;
import com.inmethod.grid.SizeUnit;
import com.inmethod.grid.column.PropertyColumn;
@@ -55,6 +56,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+
/**
*
* @author Shawn McKinney
@@ -62,7 +64,9 @@ import java.util.List;
*/
public class RoleListPanel<T extends Serializable> extends FormComponentPanel
{
- private static final Logger log = Logger.getLogger(RoleListPanel.class.getName());
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = Logger.getLogger( RoleListPanel.class.getName() );
private Form listForm;
private DefaultTreeModel treeModel;
private DefaultMutableTreeNode node;
@@ -71,141 +75,158 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
private String searchVal;
private boolean isAdmin;
- public RoleListPanel(String id, final boolean isAdmin)
+
+ public RoleListPanel( String id, final boolean isAdmin )
{
- super(id);
+ super( id );
this.isAdmin = isAdmin;
- RoleListModel roleListModel = new RoleListModel(createRole(""), isAdmin, GlobalUtils.getRbacSession( this ));
- setDefaultModel(roleListModel);
+ RoleListModel roleListModel = new RoleListModel( createRole( "" ), isAdmin, GlobalUtils.getRbacSession( this ) );
+ setDefaultModel( roleListModel );
List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
- columns.add(new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Name"), "userObject.name"));
+ columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+ Model.of( "Name" ), "userObject.name" ) );
PropertyColumn description = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Description"), "userObject.Description");
- description.setInitialSize(300);
- columns.add(description);
+ Model.of( "Description" ), "userObject.Description" );
+ description.setInitialSize( 300 );
+ columns.add( description );
PropertyColumn beginDate = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Begin Date"), "userObject.BeginDate");
- beginDate.setInitialSize(80);
- columns.add(beginDate);
+ Model.of( "Begin Date" ), "userObject.BeginDate" );
+ beginDate.setInitialSize( 80 );
+ columns.add( beginDate );
PropertyColumn endDate = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("End Date"), "userObject.EndDate");
- endDate.setInitialSize(80);
- columns.add(endDate);
+ Model.of( "End Date" ), "userObject.EndDate" );
+ endDate.setInitialSize( 80 );
+ columns.add( endDate );
PropertyColumn beginLockDate = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Begin Lock Dt"), "userObject.BeginLockDate");
- beginLockDate.setInitialSize(80);
- columns.add(beginLockDate);
+ Model.of( "Begin Lock Dt" ), "userObject.BeginLockDate" );
+ beginLockDate.setInitialSize( 80 );
+ columns.add( beginLockDate );
PropertyColumn endLockDate = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("End Lock Dt"), "userObject.EndLockDate");
- endLockDate.setInitialSize(80);
- columns.add(endLockDate);
+ Model.of( "End Lock Dt" ), "userObject.EndLockDate" );
+ endLockDate.setInitialSize( 80 );
+ columns.add( endLockDate );
PropertyColumn beginTime = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Begin Tm"), "userObject.BeginTime");
- beginTime.setInitialSize(70);
- columns.add(beginTime);
+ Model.of( "Begin Tm" ), "userObject.BeginTime" );
+ beginTime.setInitialSize( 70 );
+ columns.add( beginTime );
PropertyColumn endTime = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("End Tm"), "userObject.EndTime");
- endTime.setInitialSize(70);
- columns.add(endTime);
+ Model.of( "End Tm" ), "userObject.EndTime" );
+ endTime.setInitialSize( 70 );
+ columns.add( endTime );
PropertyColumn dayMask = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("DayMask"), "userObject.DayMask");
- dayMask.setInitialSize(80);
- columns.add(dayMask);
+ Model.of( "DayMask" ), "userObject.DayMask" );
+ dayMask.setInitialSize( 80 );
+ columns.add( dayMask );
PropertyColumn parents = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Parents"), "userObject.parents");
- parents.setInitialSize(250);
- columns.add(parents);
+ Model.of( "Parents" ), "userObject.parents" );
+ parents.setInitialSize( 250 );
+ columns.add( parents );
- List<T> roles = (List<T>)getDefaultModel().getObject();
- treeModel = createTreeModel(roles);
- grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>("roletreegrid", treeModel, columns)
+ List<T> roles = ( List<T> ) getDefaultModel().getObject();
+ treeModel = createTreeModel( roles );
+ grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "roletreegrid", 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() )
{
- T role = (T)node.getUserObject();
- if (super.isItemSelected(itemModel))
+ T role = ( T ) node.getUserObject();
+ if ( super.isItemSelected( itemModel ) )
{
- log.debug("TreeGrid.addGrid.selectItem item is selected");
- super.selectItem(itemModel, false);
+ log.debug( "TreeGrid.addGrid.selectItem item is selected" );
+ super.selectItem( itemModel, false );
}
else
{
- super.selectItem(itemModel, true);
- SelectModelEvent.send(getPage(), this, (FortEntity)role);
+ super.selectItem( itemModel, true );
+ SelectModelEvent.send( getPage(), this, ( FortEntity ) role );
}
}
}
};
- 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());
- this.listForm = new Form("form");
- this.listForm.add(grid);
- grid.setOutputMarkupId(true);
- TextField searchValFld = new TextField(GlobalIds.SEARCH_VAL, new PropertyModel<String>(this, GlobalIds.SEARCH_VAL));
- this.listForm.add(searchValFld);
+ grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ this.listForm = new Form( "form" );
+ this.listForm.add( grid );
+ grid.setOutputMarkupId( true );
+ TextField searchValFld = new TextField( GlobalIds.SEARCH_VAL, new PropertyModel<String>( this,
+ GlobalIds.SEARCH_VAL ) );
+ this.listForm.add( searchValFld );
this.listForm.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.REVIEW_MGR, "findRoles" )
{
+ /** 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");
- info("Searching Roles...");
- if(!VUtil.isNotNullOrEmpty(searchVal))
+ log.debug( ".search onSubmit" );
+ info( "Searching Roles..." );
+ if ( !VUtil.isNotNullOrEmpty( searchVal ) )
{
searchVal = "";
}
-
- Role srchRole = createRole(searchVal);
- setDefaultModel(new RoleListModel(srchRole, isAdmin, GlobalUtils.getRbacSession( this )));
+
+ Role srchRole = createRole( searchVal );
+ setDefaultModel( new RoleListModel( srchRole, isAdmin, GlobalUtils.getRbacSession( this ) ) );
treeModel.reload();
rootNode.removeAllChildren();
- List<Role> roles = (List<Role>) getDefaultModelObject();
- if(VUtil.isNotNullOrEmpty(roles))
+ List<Role> roles = ( List<Role> ) getDefaultModelObject();
+ if ( VUtil.isNotNullOrEmpty( roles ) )
{
- for (T role : (List<T>)roles)
- rootNode.add(new DefaultMutableTreeNode(role));
- info("Search returned " + roles.size() + " matching objects");
+ for ( T role : ( List<T> ) roles )
+ rootNode.add( new DefaultMutableTreeNode( role ) );
+ info( "Search returned " + roles.size() + " matching objects" );
}
else
{
- info("No matching objects found");
+ info( "No matching objects found" );
}
- target.add(grid);
+ target.add( grid );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn(".search.onError");
+ log.warn( ".search.onError" );
target.add();
}
+
+
@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 )
{
@@ -214,20 +235,21 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
- add(this.listForm);
+ } );
+ add( this.listForm );
}
+
@Override
- public void onEvent(IEvent event)
+ public void onEvent( IEvent event )
{
- if (event.getPayload() instanceof SaveModelEvent)
+ if ( event.getPayload() instanceof SaveModelEvent )
{
- SaveModelEvent modelEvent = (SaveModelEvent) event.getPayload();
- switch(modelEvent.getOperation())
+ SaveModelEvent modelEvent = ( SaveModelEvent ) event.getPayload();
+ switch ( modelEvent.getOperation() )
{
case ADD:
- add(modelEvent.getEntity());
+ add( modelEvent.getEntity() );
break;
case UPDATE:
modelChanged();
@@ -238,72 +260,77 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
default:
break;
}
- AjaxRequestTarget target = ((SaveModelEvent) event.getPayload()).getAjaxRequestTarget();
- target.add(grid);
- log.debug(".onEvent SaveModelEvent: " + target.toString());
+ AjaxRequestTarget target = ( ( SaveModelEvent ) event.getPayload() ).getAjaxRequestTarget();
+ target.add( grid );
+ log.debug( ".onEvent SaveModelEvent: " + target.toString() );
}
}
- public void add(FortEntity entity)
+
+ public void add( FortEntity entity )
{
- if (getDefaultModelObject() != null)
+ if ( getDefaultModelObject() != null )
{
- List<Role> roles = ((List<Role>) getDefaultModelObject());
- roles.add((Role) entity);
- treeModel.insertNodeInto(new DefaultMutableTreeNode(entity), rootNode, roles.size());
+ List<Role> roles = ( ( List<Role> ) getDefaultModelObject() );
+ roles.add( ( Role ) entity );
+ treeModel.insertNodeInto( new DefaultMutableTreeNode( entity ), rootNode, roles.size() );
}
}
+
public void prune()
{
- removeSelectedItems(grid);
+ removeSelectedItems( grid );
}
- private void removeSelectedItems(TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid)
+
+ private void removeSelectedItems( TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid )
{
Collection<IModel<DefaultMutableTreeNode>> selected = grid.getSelectedItems();
- for (IModel<DefaultMutableTreeNode> model : selected)
+ for ( IModel<DefaultMutableTreeNode> model : selected )
{
DefaultMutableTreeNode node = model.getObject();
- treeModel.removeNodeFromParent(node);
- Role role = (Role) node.getUserObject();
- log.debug(".removeSelectedItems role node: " + role.getName());
- List<Role> roles = ((List<Role>) getDefaultModel().getObject());
- roles.remove(role.getName());
+ treeModel.removeNodeFromParent( node );
+ Role role = ( Role ) node.getUserObject();
+ log.debug( ".removeSelectedItems role node: " + role.getName() );
+ List<Role> roles = ( ( List<Role> ) getDefaultModel().getObject() );
+ roles.remove( role.getName() );
}
}
- private DefaultTreeModel createTreeModel(List<T> roles)
+
+ private DefaultTreeModel createTreeModel( List<T> roles )
{
DefaultTreeModel model;
Role root = new Role();
//root.setName("Roles");
- rootNode = new DefaultMutableTreeNode(root);
- model = new DefaultTreeModel(rootNode);
- if (roles == null)
- log.debug("no Roles found");
+ rootNode = new DefaultMutableTreeNode( root );
+ model = new DefaultTreeModel( rootNode );
+ if ( roles == null )
+ log.debug( "no Roles found" );
else
{
- log.debug("Roles found:" + roles.size());
- for (T role : roles)
- rootNode.add(new DefaultMutableTreeNode(role));
+ log.debug( "Roles found:" + roles.size() );
+ for ( T role : roles )
+ rootNode.add( new DefaultMutableTreeNode( role ) );
}
return model;
}
- private Role createRole(String name)
+
+ private Role createRole( String name )
{
Role role;
-
+
if ( isAdmin )
{
- role = new AdminRole(name);
+ role = new AdminRole( name );
}
else
{
- role = new Role(name);
+ role = new Role( name );
}
-
+
return role;
}
}
\ No newline at end of file
[07/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 4d0bc0b..939c8e0 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
@@ -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 AuditModListPanel extends FormComponentPanel
{
- private static final Logger LOG = Logger.getLogger(AuditModListPanel.class.getName());
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+ private static final Logger LOG = Logger.getLogger( AuditModListPanel.class.getName() );
private Form listForm;
private DefaultTreeModel treeModel;
private DefaultMutableTreeNode node;
@@ -86,132 +90,166 @@ public class AuditModListPanel extends FormComponentPanel
private Permission permission;
private IModel<SerializableList<Mod>> pageModel;
- public AuditModListPanel(String id, UserAudit userAudit )
+
+ public AuditModListPanel( String id, UserAudit userAudit )
{
- super(id);
+ super( id );
init( userAudit );
}
+
private void init( UserAudit userAudit )
{
- pageModel = new AuditModListModel(userAudit, GlobalUtils.getRbacSession( this ) );
- setDefaultModel(pageModel);
+ pageModel = new AuditModListModel( userAudit, GlobalUtils.getRbacSession( this ) );
+ setDefaultModel( pageModel );
createAndLoadGrid();
this.listForm = new Form( "modform" );
- this.listForm.addOrReplace(grid);
+ this.listForm.addOrReplace( grid );
this.listForm.setModel( new CompoundPropertyModel<UserAudit>( userAudit ) );
addFormFields();
addButtons();
- add(this.listForm);
+ add( this.listForm );
}
+
private void addFormFields()
{
- 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 = 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 );
- opFld = new TextField(GlobalIds.OP_NAME);
+ opFld = new TextField( GlobalIds.OP_NAME );
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 );
addPermSearchModal();
// 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, "searchAdminMods" )
+ this.listForm.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.AUDIT_MGR, "searchAdminMods" )
{
+ /** 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 AuditModPage( 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 )
{
@@ -220,26 +258,37 @@ public class AuditModListPanel 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 AuditModPage( new UserAudit() ) );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- LOG.warn("AuditModListPanel.clear.onError");
+ LOG.warn( "AuditModListPanel.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 )
{
@@ -248,71 +297,82 @@ public class AuditModListPanel 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 reqAttr = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("LDAP Operation"), "userObject.reqType");
- reqAttr.setInitialSize(150);
- columns.add(reqAttr);
+ Model.of( "LDAP Operation" ), "userObject.reqType" );
+ reqAttr.setInitialSize( 150 );
+ columns.add( reqAttr );
PropertyColumn reqAttrsOnly = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Target Location"), "userObject.reqDN");
- reqAttrsOnly.setInitialSize(500);
- columns.add(reqAttrsOnly);
+ Model.of( "Target Location" ), "userObject.reqDN" );
+ reqAttrsOnly.setInitialSize( 500 );
+ columns.add( reqAttrsOnly );
- List<Mod> mods = (List<Mod>) getDefaultModel().getObject();
- treeModel = createTreeModel(mods);
- grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>("modtreegrid", treeModel, columns)
+ List<Mod> mods = ( List<Mod> ) getDefaultModel().getObject();
+ treeModel = createTreeModel( mods );
+ grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "modtreegrid", 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() )
{
- Mod mod = (Mod) node.getUserObject();
+ Mod mod = ( Mod ) node.getUserObject();
LOG.debug( "TreeGrid.addGrid.selectItem selected mod =" + mod.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, mod);
+ super.selectItem( itemModel, true );
+ SelectModelEvent.send( getPage(), this, mod );
}
}
}
};
- 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 )
{
@@ -320,7 +380,7 @@ public class AuditModListPanel 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() );
userAudit.setInternalUserId( userSelection.getInternalId() );
target.add( userFld );
@@ -329,9 +389,13 @@ public class AuditModListPanel 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() );
@@ -339,12 +403,18 @@ public class AuditModListPanel 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 )
{
@@ -360,21 +430,27 @@ public class AuditModListPanel extends FormComponentPanel
usersModalWindow.setCookieName( "user-search-modal" );
}
+
private void addPermSearchModal()
{
final ModalWindow permsModalWindow;
listForm.add( permsModalWindow = new ModalWindow( "permsearchmodal" ) );
- final PermSearchModalPanel permSearchModalPanel = new PermSearchModalPanel( permsModalWindow.getContentId(), permsModalWindow, true );
+ final PermSearchModalPanel permSearchModalPanel = new PermSearchModalPanel( permsModalWindow.getContentId(),
+ permsModalWindow, true );
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() );
@@ -386,9 +462,13 @@ public class AuditModListPanel 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.getOpName() );
@@ -397,12 +477,18 @@ public class AuditModListPanel 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 )
{
@@ -418,44 +504,46 @@ public class AuditModListPanel extends FormComponentPanel
permsModalWindow.setCookieName( "perm-search-modal" );
}
- private DefaultTreeModel createTreeModel(List<Mod> mods)
+
+ private DefaultTreeModel createTreeModel( List<Mod> mods )
{
DefaultTreeModel model;
Mod root = new Mod();
//root.setReqAuthzID( "Modifications" );
- rootNode = new DefaultMutableTreeNode(root);
- model = new DefaultTreeModel(rootNode);
- if (mods == null)
- LOG.debug("no Modifications found");
+ rootNode = new DefaultMutableTreeNode( root );
+ model = new DefaultTreeModel( rootNode );
+ if ( mods == null )
+ LOG.debug( "no Modifications found" );
else
{
- LOG.debug("AuthZ found:" + mods.size());
- info("Loading " + mods.size() + " objects into list panel");
+ LOG.debug( "AuthZ found:" + mods.size() );
+ info( "Loading " + mods.size() + " objects into list panel" );
loadTree( mods );
}
return model;
}
- private void loadTree(List<Mod> mods)
+
+ private void loadTree( List<Mod> mods )
{
- for (Mod mod : mods)
+ for ( Mod mod : mods )
{
Date start = null;
try
{
start = AttrHelper.decodeGeneralizedTime( mod.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 );
mod.setReqStart( formattedDate );
}
- rootNode.add(new DefaultMutableTreeNode(mod));
+ rootNode.add( new DefaultMutableTreeNode( mod ) );
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/panel/ConstraintAdminRolePanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ConstraintAdminRolePanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ConstraintAdminRolePanel.java
index a637922..1533950 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ConstraintAdminRolePanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ConstraintAdminRolePanel.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.kendo.ui.form.datetime.DatePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.TimePicker;
import org.apache.wicket.model.IModel;
@@ -29,6 +30,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
import java.util.Date;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -36,6 +38,8 @@ import java.util.Date;
*/
public class ConstraintAdminRolePanel extends ConstraintBasePanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final String BEGIN_TIME_RC = GlobalIds.BEGIN_TIME_ARC;
private static final String END_TIME_RC = GlobalIds.END_TIME_ARC;
private static final String BEGIN_DATE_RC = GlobalIds.BEGIN_DATE_ARC;
@@ -43,6 +47,7 @@ public class ConstraintAdminRolePanel extends ConstraintBasePanel
private static final String BEGIN_LOCK_DATE_RC = GlobalIds.BEGIN_LOCK_DATE_ARC;
private static final String END_LOCK_DATE_RC = GlobalIds.END_LOCK_DATE_ARC;
+
/**
* Constructor requires model to be passed in.
*
@@ -51,100 +56,124 @@ public class ConstraintAdminRolePanel extends ConstraintBasePanel
*/
public ConstraintAdminRolePanel( String id, final IModel constraint )
{
- super(id, constraint);
- beginTimeTP = new TimePicker( BEGIN_TIME_RC, new PropertyModel<Date>(this, BEGIN_TIME ))
+ super( id, constraint );
+ beginTimeTP = new TimePicker( BEGIN_TIME_RC, new PropertyModel<Date>( this, BEGIN_TIME ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- beginTime = renderTime(beginTime, constraint.getBeginTime());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ beginTime = renderTime( beginTime, constraint.getBeginTime() );
}
}
};
- add(beginTimeTP);
+ add( beginTimeTP );
- endTimeTP = new TimePicker( END_TIME_RC, new PropertyModel<Date>(this, END_TIME ))
+ endTimeTP = new TimePicker( END_TIME_RC, new PropertyModel<Date>( this, END_TIME ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- endTime = renderTime(endTime, constraint.getEndTime());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ endTime = renderTime( endTime, constraint.getEndTime() );
}
}
};
- add(endTimeTP);
- endTimeTP.setRequired(false);
+ add( endTimeTP );
+ endTimeTP.setRequired( false );
- beginDateDP = new DatePicker( BEGIN_DATE_RC, new PropertyModel<Date>(this, BEGIN_DATE ))
+ beginDateDP = new DatePicker( BEGIN_DATE_RC, new PropertyModel<Date>( this, BEGIN_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- beginDate = renderDate(beginDate, constraint.getBeginDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ beginDate = renderDate( beginDate, constraint.getBeginDate() );
}
}
};
- beginDateDP.setRequired(false);
- add(beginDateDP);
+ beginDateDP.setRequired( false );
+ add( beginDateDP );
- endDateDP = new DatePicker( END_DATE_RC, new PropertyModel<Date>(this, END_DATE ))
+ endDateDP = new DatePicker( END_DATE_RC, new PropertyModel<Date>( this, END_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- endDate = renderDate(endDate, constraint.getEndDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ endDate = renderDate( endDate, constraint.getEndDate() );
}
}
};
- endDateDP.setRequired(false);
- add(endDateDP);
+ endDateDP.setRequired( false );
+ add( endDateDP );
- beginLockDateDP = new DatePicker( BEGIN_LOCK_DATE_RC, new PropertyModel<Date>(this, BEGIN_LOCK_DATE ))
+ beginLockDateDP = new DatePicker( BEGIN_LOCK_DATE_RC, new PropertyModel<Date>( this, BEGIN_LOCK_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- beginLockDate = renderDate(beginLockDate, constraint.getBeginLockDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ beginLockDate = renderDate( beginLockDate, constraint.getBeginLockDate() );
}
}
};
- beginLockDateDP.setRequired(false);
- add(beginLockDateDP);
+ beginLockDateDP.setRequired( false );
+ add( beginLockDateDP );
- endLockDateDP = new DatePicker( END_LOCK_DATE_RC, new PropertyModel<Date>(this, END_LOCK_DATE ))
+ endLockDateDP = new DatePicker( END_LOCK_DATE_RC, new PropertyModel<Date>( this, END_LOCK_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- endLockDate = renderDate(endLockDate, constraint.getEndLockDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ endLockDate = renderDate( endLockDate, constraint.getEndLockDate() );
}
}
};
- endLockDateDP.setRequired(false);
- add(endLockDateDP);
+ endLockDateDP.setRequired( false );
+ add( endLockDateDP );
}
}
\ 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/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 1e0f6f7..06ab604 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.jquery.ui.form.spinner.Spinner;
import com.googlecode.wicket.kendo.ui.form.datetime.DatePicker;
@@ -34,6 +35,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
import java.util.Calendar;
import java.util.Date;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -41,8 +43,10 @@ import java.util.Date;
*/
public class ConstraintBasePanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final String CLS_NM = ConstraintPanel.class.getName();
- private static final Logger log = Logger.getLogger(CLS_NM);
+ private static final Logger log = Logger.getLogger( CLS_NM );
protected static final String TIMEOUT = "timeout";
protected static final String SUNDAY = "sunday";
@@ -103,156 +107,185 @@ public class ConstraintBasePanel extends FormComponentPanel
protected Boolean saturday = false;
- public ConstraintBasePanel(String id, final IModel constraint)
+ public ConstraintBasePanel( String id, final IModel constraint )
{
- super(id, constraint);
- final Spinner<Integer> timeout = new Spinner<Integer>(TIMEOUT);
- timeout.setRequired(false);
- add(timeout);
-
- // Add the dayMask's day of week CheckBoxes:
- sundayCB = new CheckBox(SUNDAY, new PropertyModel<Boolean>(this, SUNDAY))
- {
- @Override
- protected void onBeforeRender()
- {
- if (this.getParent().getDefaultModelObject() != null)
- {
- super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- setSunday(isDayOfWeek(constraint, DAY1));
- }
- }
- };
- add(sundayCB);
- mondayCB = new CheckBox("monday", new PropertyModel<Boolean>(this, MONDAY))
- {
- @Override
- protected void onBeforeRender()
- {
- if (this.getParent().getDefaultModelObject() != null)
- {
- super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- setMonday(isDayOfWeek(constraint, DAY2));
- }
- }
- };
- add(mondayCB);
- tuesdayCB = new CheckBox(TUESDAY, new PropertyModel<Boolean>(this, TUESDAY))
- {
- @Override
- protected void onBeforeRender()
- {
- if (this.getParent().getDefaultModelObject() != null)
- {
- super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- setTuesday(isDayOfWeek(constraint, DAY3));
- }
- }
- };
- add(tuesdayCB);
- wednesdayCB = new CheckBox(WEDNESDAY, new PropertyModel<Boolean>(this, WEDNESDAY))
- {
- @Override
- protected void onBeforeRender()
- {
- if (this.getParent().getDefaultModelObject() != null)
- {
- super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- setWednesday(isDayOfWeek(constraint, DAY4));
- }
- }
- };
- add(wednesdayCB);
- thursdayCB = new CheckBox(THURSDAY, new PropertyModel<Boolean>(this, THURSDAY))
- {
- @Override
- protected void onBeforeRender()
- {
- if (this.getParent().getDefaultModelObject() != null)
- {
- super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- setThursday(isDayOfWeek(constraint, DAY5));
- }
- }
- };
- add(thursdayCB);
- fridayCB = new CheckBox(FRIDAY, new PropertyModel<Boolean>(this, FRIDAY))
- {
- @Override
- protected void onBeforeRender()
- {
- if (this.getParent().getDefaultModelObject() != null)
- {
- super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- setFriday(isDayOfWeek(constraint, DAY6));
- }
- }
- };
- add(fridayCB);
- saturdayCB = new CheckBox(SATURDAY, new PropertyModel<Boolean>(this, SATURDAY))
- {
- @Override
- protected void onBeforeRender()
- {
- if (this.getParent().getDefaultModelObject() != null)
- {
- super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- setSaturday(isDayOfWeek(constraint, DAY7));
- }
- }
- };
- add(saturdayCB);
+ super( id, constraint );
+ final Spinner<Integer> timeout = new Spinner<Integer>( TIMEOUT );
+ timeout.setRequired( false );
+ add( timeout );
+
+ // Add the dayMask's day of week CheckBoxes:
+ sundayCB = new CheckBox( SUNDAY, new PropertyModel<Boolean>( this, SUNDAY ) )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onBeforeRender()
+ {
+ if ( this.getParent().getDefaultModelObject() != null )
+ {
+ super.onBeforeRender();
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ setSunday( isDayOfWeek( constraint, DAY1 ) );
+ }
+ }
+ };
+ add( sundayCB );
+ mondayCB = new CheckBox( "monday", new PropertyModel<Boolean>( this, MONDAY ) )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onBeforeRender()
+ {
+ if ( this.getParent().getDefaultModelObject() != null )
+ {
+ super.onBeforeRender();
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ setMonday( isDayOfWeek( constraint, DAY2 ) );
+ }
+ }
+ };
+ add( mondayCB );
+ tuesdayCB = new CheckBox( TUESDAY, new PropertyModel<Boolean>( this, TUESDAY ) )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onBeforeRender()
+ {
+ if ( this.getParent().getDefaultModelObject() != null )
+ {
+ super.onBeforeRender();
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ setTuesday( isDayOfWeek( constraint, DAY3 ) );
+ }
+ }
+ };
+ add( tuesdayCB );
+ wednesdayCB = new CheckBox( WEDNESDAY, new PropertyModel<Boolean>( this, WEDNESDAY ) )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onBeforeRender()
+ {
+ if ( this.getParent().getDefaultModelObject() != null )
+ {
+ super.onBeforeRender();
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ setWednesday( isDayOfWeek( constraint, DAY4 ) );
+ }
+ }
+ };
+ add( wednesdayCB );
+ thursdayCB = new CheckBox( THURSDAY, new PropertyModel<Boolean>( this, THURSDAY ) )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onBeforeRender()
+ {
+ if ( this.getParent().getDefaultModelObject() != null )
+ {
+ super.onBeforeRender();
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ setThursday( isDayOfWeek( constraint, DAY5 ) );
+ }
+ }
+ };
+ add( thursdayCB );
+ fridayCB = new CheckBox( FRIDAY, new PropertyModel<Boolean>( this, FRIDAY ) )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onBeforeRender()
+ {
+ if ( this.getParent().getDefaultModelObject() != null )
+ {
+ super.onBeforeRender();
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ setFriday( isDayOfWeek( constraint, DAY6 ) );
+ }
+ }
+ };
+ add( fridayCB );
+ saturdayCB = new CheckBox( SATURDAY, new PropertyModel<Boolean>( this, SATURDAY ) )
+ {
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onBeforeRender()
+ {
+ if ( this.getParent().getDefaultModelObject() != null )
+ {
+ super.onBeforeRender();
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ setSaturday( isDayOfWeek( constraint, DAY7 ) );
+ }
+ }
+ };
+ add( saturdayCB );
}
+
/**
* This method is used to convert from the panel component model to the domain model:
*/
@Override
protected void convertInput()
{
- Constraint constraint = (Constraint) getDefaultModelObject();
- if(constraint != null)
+ Constraint constraint = ( Constraint ) getDefaultModelObject();
+ if ( constraint != null )
{
- constraint.setBeginTime(convertTime(beginTimeTP));
- constraint.setEndTime(convertTime(endTimeTP));
- constraint.setBeginDate(convertDate(beginDateDP));
- constraint.setEndDate(convertDate(endDateDP));
- constraint.setBeginLockDate(convertDate(beginLockDateDP));
- constraint.setEndLockDate(convertDate(endLockDateDP));
-
- setSunday(sundayCB.getConvertedInput());
- setMonday(mondayCB.getConvertedInput());
- setTuesday(tuesdayCB.getConvertedInput());
- setWednesday(wednesdayCB.getConvertedInput());
- setThursday(thursdayCB.getConvertedInput());
- setFriday(fridayCB.getConvertedInput());
- setSaturday(saturdayCB.getConvertedInput());
+ constraint.setBeginTime( convertTime( beginTimeTP ) );
+ constraint.setEndTime( convertTime( endTimeTP ) );
+ constraint.setBeginDate( convertDate( beginDateDP ) );
+ constraint.setEndDate( convertDate( endDateDP ) );
+ constraint.setBeginLockDate( convertDate( beginLockDateDP ) );
+ constraint.setEndLockDate( convertDate( endLockDateDP ) );
+
+ setSunday( sundayCB.getConvertedInput() );
+ setMonday( mondayCB.getConvertedInput() );
+ setTuesday( tuesdayCB.getConvertedInput() );
+ setWednesday( wednesdayCB.getConvertedInput() );
+ setThursday( thursdayCB.getConvertedInput() );
+ setFriday( fridayCB.getConvertedInput() );
+ setSaturday( saturdayCB.getConvertedInput() );
String szDayMask = "";
- if(sunday)
+ if ( sunday )
szDayMask += DAY1;
- if(monday)
+ if ( monday )
szDayMask += DAY2;
- if(tuesday)
+ if ( tuesday )
szDayMask += DAY3;
- if(wednesday)
+ if ( wednesday )
szDayMask += DAY4;
- if(thursday)
+ if ( thursday )
szDayMask += DAY5;
- if(friday)
+ if ( friday )
szDayMask += DAY6;
- if(saturday)
+ if ( saturday )
szDayMask += DAY7;
- constraint.setDayMask(szDayMask);
- setConvertedInput(constraint);
+ constraint.setDayMask( szDayMask );
+ setConvertedInput( constraint );
}
else
{
@@ -260,82 +293,87 @@ public class ConstraintBasePanel extends FormComponentPanel
}
}
- protected boolean isDayOfWeek(Constraint constraint, String szDay)
+
+ protected boolean isDayOfWeek( Constraint constraint, String szDay )
{
boolean isSet = false;
- if(constraint != null && constraint.getDayMask() != null && (constraint.getDayMask().contains(szDay) || constraint.getDayMask().equals("all")))
+ if ( constraint != null && constraint.getDayMask() != null
+ && ( constraint.getDayMask().contains( szDay ) || constraint.getDayMask().equals( "all" ) ) )
{
isSet = true;
}
return isSet;
}
- protected String convertTime(TimePicker time)
+
+ protected String convertTime( TimePicker time )
{
String szTime = null;
- if (time != null)
+ if ( time != null )
{
Date localDate = time.getConvertedInput();
- if (localDate != null)
+ if ( localDate != null )
{
Calendar calendar = Calendar.getInstance();
- calendar.setTime(localDate);
- log.debug("localDate=" + localDate.toString());
- if (calendar.get(Calendar.HOUR_OF_DAY) < 10)
- szTime = "0" + calendar.get(Calendar.HOUR_OF_DAY);
+ calendar.setTime( localDate );
+ log.debug( "localDate=" + localDate.toString() );
+ if ( calendar.get( Calendar.HOUR_OF_DAY ) < 10 )
+ szTime = "0" + calendar.get( Calendar.HOUR_OF_DAY );
else
- szTime = "" + calendar.get(Calendar.HOUR_OF_DAY);
- if (calendar.get(Calendar.MINUTE) < 10)
- szTime += "0" + calendar.get(Calendar.MINUTE);
+ szTime = "" + calendar.get( Calendar.HOUR_OF_DAY );
+ if ( calendar.get( Calendar.MINUTE ) < 10 )
+ szTime += "0" + calendar.get( Calendar.MINUTE );
else
- szTime += "" + calendar.get(Calendar.MINUTE);
+ szTime += "" + calendar.get( Calendar.MINUTE );
}
}
return szTime;
}
- protected String convertDate(DatePicker date)
+
+ protected String convertDate( DatePicker date )
{
String szDate = null;
- if (date != null)
+ if ( date != null )
{
Date localDate = date.getConvertedInput();
- if (localDate != null)
+ if ( localDate != null )
{
Calendar calendar = Calendar.getInstance();
- calendar.setTime(localDate);
- log.debug("localDate=" + localDate.toString());
- szDate = "" + calendar.get(Calendar.YEAR);
+ calendar.setTime( localDate );
+ log.debug( "localDate=" + localDate.toString() );
+ szDate = "" + calendar.get( Calendar.YEAR );
- if ((calendar.get(Calendar.MONTH) + 1) < 10)
- szDate += "0" + (calendar.get(Calendar.MONTH) + 1);
+ if ( ( calendar.get( Calendar.MONTH ) + 1 ) < 10 )
+ szDate += "0" + ( calendar.get( Calendar.MONTH ) + 1 );
else
- szDate += "" + (calendar.get(Calendar.MONTH) + 1);
- if (calendar.get(Calendar.DAY_OF_MONTH) < 10)
- szDate += "0" + calendar.get(Calendar.DAY_OF_MONTH);
+ szDate += "" + ( calendar.get( Calendar.MONTH ) + 1 );
+ if ( calendar.get( Calendar.DAY_OF_MONTH ) < 10 )
+ szDate += "0" + calendar.get( Calendar.DAY_OF_MONTH );
else
- szDate += "" + calendar.get(Calendar.DAY_OF_MONTH);
+ szDate += "" + calendar.get( Calendar.DAY_OF_MONTH );
}
}
return szDate;
}
- protected Date renderTime(Date date, String szTime)
+
+ protected Date renderTime( Date date, String szTime )
{
- if (szTime != null && !szTime.equalsIgnoreCase("0000"))
+ if ( szTime != null && !szTime.equalsIgnoreCase( "0000" ) )
{
Calendar calendar = Calendar.getInstance();
try
{
- int hours = new Integer(szTime.substring(0, 2));
- int minutes = new Integer(szTime.substring(2, 4));
- calendar.set(0, 0, 0, hours, minutes);
+ int hours = new Integer( szTime.substring( 0, 2 ) );
+ int minutes = new Integer( szTime.substring( 2, 4 ) );
+ calendar.set( 0, 0, 0, hours, minutes );
date = calendar.getTime();
}
- catch(StringIndexOutOfBoundsException e)
+ catch ( StringIndexOutOfBoundsException e )
{
String warning = CLS_NM + ".renderTime bad time: " + szTime;
- log.warn(warning);
+ log.warn( warning );
//warn(warning);
}
}
@@ -346,23 +384,24 @@ public class ConstraintBasePanel extends FormComponentPanel
return date;
}
- protected Date renderDate(Date date, String szDate)
+
+ protected Date renderDate( Date date, String szDate )
{
- if (szDate != null && !szDate.equalsIgnoreCase("none"))
+ if ( szDate != null && !szDate.equalsIgnoreCase( "none" ) )
{
Calendar calendar = Calendar.getInstance();
try
{
- int years = new Integer(szDate.substring(0, 4));
- int months = new Integer(szDate.substring(4, 6));
- int days = new Integer(szDate.substring(6, 8));
- calendar.set(years, months, days, 0, 0);
+ int years = new Integer( szDate.substring( 0, 4 ) );
+ int months = new Integer( szDate.substring( 4, 6 ) );
+ int days = new Integer( szDate.substring( 6, 8 ) );
+ calendar.set( years, months, days, 0, 0 );
date = calendar.getTime();
}
- catch(StringIndexOutOfBoundsException e)
+ catch ( StringIndexOutOfBoundsException e )
{
String warning = CLS_NM + ".renderDate bad date: " + szDate;
- log.warn(warning);
+ log.warn( warning );
//warn(warning);
}
}
@@ -372,72 +411,87 @@ public class ConstraintBasePanel extends FormComponentPanel
}
return date;
}
+
+
protected Boolean getSunday()
{
return sunday;
}
- protected void setSunday(Boolean sunday)
+
+ protected void setSunday( Boolean sunday )
{
this.sunday = sunday;
}
+
protected Boolean getMonday()
{
return monday;
}
- protected void setMonday(Boolean monday)
+
+ protected void setMonday( Boolean monday )
{
this.monday = monday;
}
+
protected Boolean getTuesday()
{
return tuesday;
}
- protected void setTuesday(Boolean tuesday)
+
+ protected void setTuesday( Boolean tuesday )
{
this.tuesday = tuesday;
}
+
protected Boolean getWednesday()
{
return wednesday;
}
- protected void setWednesday(Boolean wednesday)
+
+ protected void setWednesday( Boolean wednesday )
{
this.wednesday = wednesday;
}
+
protected Boolean getThursday()
{
return thursday;
}
- protected void setThursday(Boolean thursday)
+
+ protected void setThursday( Boolean thursday )
{
this.thursday = thursday;
}
+
protected Boolean getFriday()
{
return friday;
}
- protected void setFriday(Boolean friday)
+
+ protected void setFriday( Boolean friday )
{
this.friday = friday;
}
+
protected Boolean getSaturday()
{
return saturday;
}
- protected void setSaturday(Boolean saturday)
+
+ protected void setSaturday( Boolean saturday )
{
this.saturday = saturday;
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/panel/ConstraintPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ConstraintPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ConstraintPanel.java
index 4cc2e36..7ddee00 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ConstraintPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ConstraintPanel.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.kendo.ui.form.datetime.DatePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.TimePicker;
import org.apache.wicket.model.IModel;
@@ -28,6 +29,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
import java.util.Date;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -35,6 +37,8 @@ import java.util.Date;
*/
public class ConstraintPanel extends ConstraintBasePanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final String BEGIN_TIME_P = "beginTimeP";
private static final String END_TIME_P = "endTimeP";
private static final String BEGIN_DATE_P = "beginDateP";
@@ -42,108 +46,133 @@ public class ConstraintPanel extends ConstraintBasePanel
private static final String BEGIN_LOCK_DATE_P = "beginLockDateP";
private static final String END_LOCK_DATE_P = "endLockDateP";
+
/**
* Constructor requires model to be passed in.
*
* @param id
* @param constraint
*/
- public ConstraintPanel(String id, final IModel constraint)
+ public ConstraintPanel( String id, final IModel constraint )
{
- super(id, constraint);
- beginTimeTP = new TimePicker(BEGIN_TIME_P, new PropertyModel<Date>(this, BEGIN_TIME))
+ super( id, constraint );
+ beginTimeTP = new TimePicker( BEGIN_TIME_P, new PropertyModel<Date>( this, BEGIN_TIME ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- beginTime = renderTime(beginTime, constraint.getBeginTime());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ beginTime = renderTime( beginTime, constraint.getBeginTime() );
}
}
};
- add(beginTimeTP);
+ add( beginTimeTP );
- endTimeTP = new TimePicker(END_TIME_P, new PropertyModel<Date>(this, END_TIME))
+ endTimeTP = new TimePicker( END_TIME_P, new PropertyModel<Date>( this, END_TIME ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- endTime = renderTime(endTime, constraint.getEndTime());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ endTime = renderTime( endTime, constraint.getEndTime() );
}
}
};
- add(endTimeTP);
- endTimeTP.setRequired(false);
+ add( endTimeTP );
+ endTimeTP.setRequired( false );
- beginDateDP = new DatePicker(BEGIN_DATE_P, new PropertyModel<Date>(this, BEGIN_DATE))
+ beginDateDP = new DatePicker( BEGIN_DATE_P, new PropertyModel<Date>( this, BEGIN_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- beginDate = renderDate(beginDate, constraint.getBeginDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ beginDate = renderDate( beginDate, constraint.getBeginDate() );
}
}
};
- beginDateDP.setRequired(false);
- add(beginDateDP);
+ beginDateDP.setRequired( false );
+ add( beginDateDP );
- endDateDP = new DatePicker(END_DATE_P, new PropertyModel<Date>(this, END_DATE))
+ endDateDP = new DatePicker( END_DATE_P, new PropertyModel<Date>( this, END_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- endDate = renderDate(endDate, constraint.getEndDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ endDate = renderDate( endDate, constraint.getEndDate() );
}
}
};
- endDateDP.setRequired(false);
- add(endDateDP);
+ endDateDP.setRequired( false );
+ add( endDateDP );
- beginLockDateDP = new DatePicker(BEGIN_LOCK_DATE_P, new PropertyModel<Date>(this, BEGIN_LOCK_DATE))
+ beginLockDateDP = new DatePicker( BEGIN_LOCK_DATE_P, new PropertyModel<Date>( this, BEGIN_LOCK_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- beginLockDate = renderDate(beginLockDate, constraint.getBeginLockDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ beginLockDate = renderDate( beginLockDate, constraint.getBeginLockDate() );
}
}
};
- beginLockDateDP.setRequired(false);
- add(beginLockDateDP);
+ beginLockDateDP.setRequired( false );
+ add( beginLockDateDP );
- endLockDateDP = new DatePicker(END_LOCK_DATE_P, new PropertyModel<Date>(this, END_LOCK_DATE))
+ endLockDateDP = new DatePicker( END_LOCK_DATE_P, new PropertyModel<Date>( this, END_LOCK_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- endLockDate = renderDate(endLockDate, constraint.getEndLockDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ endLockDate = renderDate( endLockDate, constraint.getEndLockDate() );
}
}
};
- endLockDateDP.setRequired(false);
- add(endLockDateDP);
+ endLockDateDP.setRequired( false );
+ add( endLockDateDP );
}
}
\ 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/ConstraintRolePanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ConstraintRolePanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ConstraintRolePanel.java
index b76a57b..bf37b50 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ConstraintRolePanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ConstraintRolePanel.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.kendo.ui.form.datetime.DatePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.TimePicker;
import org.apache.wicket.model.IModel;
@@ -28,6 +29,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
import java.util.Date;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -35,6 +37,8 @@ import java.util.Date;
*/
public class ConstraintRolePanel extends ConstraintBasePanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final String BEGIN_TIME_RC = "beginTimeRC";
private static final String END_TIME_RC = "endTimeRC";
private static final String BEGIN_DATE_RC = "beginDateRC";
@@ -42,6 +46,7 @@ public class ConstraintRolePanel extends ConstraintBasePanel
private static final String BEGIN_LOCK_DATE_RC = "beginLockDateRC";
private static final String END_LOCK_DATE_RC = "endLockDateRC";
+
/**
* Constructor requires model to be passed in.
*
@@ -50,100 +55,124 @@ public class ConstraintRolePanel extends ConstraintBasePanel
*/
public ConstraintRolePanel( String id, final IModel constraint )
{
- super(id, constraint);
- beginTimeTP = new TimePicker( BEGIN_TIME_RC, new PropertyModel<Date>(this, BEGIN_TIME ))
+ super( id, constraint );
+ beginTimeTP = new TimePicker( BEGIN_TIME_RC, new PropertyModel<Date>( this, BEGIN_TIME ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- beginTime = renderTime(beginTime, constraint.getBeginTime());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ beginTime = renderTime( beginTime, constraint.getBeginTime() );
}
}
};
- add(beginTimeTP);
+ add( beginTimeTP );
- endTimeTP = new TimePicker( END_TIME_RC, new PropertyModel<Date>(this, END_TIME ))
+ endTimeTP = new TimePicker( END_TIME_RC, new PropertyModel<Date>( this, END_TIME ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- endTime = renderTime(endTime, constraint.getEndTime());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ endTime = renderTime( endTime, constraint.getEndTime() );
}
}
};
- add(endTimeTP);
- endTimeTP.setRequired(false);
+ add( endTimeTP );
+ endTimeTP.setRequired( false );
- beginDateDP = new DatePicker( BEGIN_DATE_RC, new PropertyModel<Date>(this, BEGIN_DATE ))
+ beginDateDP = new DatePicker( BEGIN_DATE_RC, new PropertyModel<Date>( this, BEGIN_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- beginDate = renderDate(beginDate, constraint.getBeginDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ beginDate = renderDate( beginDate, constraint.getBeginDate() );
}
}
};
- beginDateDP.setRequired(false);
- add(beginDateDP);
+ beginDateDP.setRequired( false );
+ add( beginDateDP );
- endDateDP = new DatePicker( END_DATE_RC, new PropertyModel<Date>(this, END_DATE ))
+ endDateDP = new DatePicker( END_DATE_RC, new PropertyModel<Date>( this, END_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- endDate = renderDate(endDate, constraint.getEndDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ endDate = renderDate( endDate, constraint.getEndDate() );
}
}
};
- endDateDP.setRequired(false);
- add(endDateDP);
+ endDateDP.setRequired( false );
+ add( endDateDP );
- beginLockDateDP = new DatePicker( BEGIN_LOCK_DATE_RC, new PropertyModel<Date>(this, BEGIN_LOCK_DATE ))
+ beginLockDateDP = new DatePicker( BEGIN_LOCK_DATE_RC, new PropertyModel<Date>( this, BEGIN_LOCK_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- beginLockDate = renderDate(beginLockDate, constraint.getBeginLockDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ beginLockDate = renderDate( beginLockDate, constraint.getBeginLockDate() );
}
}
};
- beginLockDateDP.setRequired(false);
- add(beginLockDateDP);
+ beginLockDateDP.setRequired( false );
+ add( beginLockDateDP );
- endLockDateDP = new DatePicker( END_LOCK_DATE_RC, new PropertyModel<Date>(this, END_LOCK_DATE ))
+ endLockDateDP = new DatePicker( END_LOCK_DATE_RC, new PropertyModel<Date>( this, END_LOCK_DATE ) )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onBeforeRender()
{
- if (this.getParent().getDefaultModelObject() != null)
+ if ( this.getParent().getDefaultModelObject() != null )
{
super.onBeforeRender();
- Constraint constraint = (Constraint) this.getParent().getDefaultModelObject();
- endLockDate = renderDate(endLockDate, constraint.getEndLockDate());
+ Constraint constraint = ( Constraint ) this.getParent().getDefaultModelObject();
+ endLockDate = renderDate( endLockDate, constraint.getEndLockDate() );
}
}
};
- endLockDateDP.setRequired(false);
- add(endLockDateDP);
+ endLockDateDP.setRequired( false );
+ add( endLockDateDP );
}
}
\ No newline at end of file
[02/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 ad85a0f..f24e391 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import java.util.ArrayList;
import java.util.List;
@@ -44,6 +45,7 @@ import org.apache.directory.fortress.core.rbac.UserRole;
import org.apache.directory.fortress.core.util.time.CUtil;
import org.apache.directory.fortress.core.util.time.Constraint;
+
/**
*
* @author Shawn McKinney
@@ -51,21 +53,25 @@ import org.apache.directory.fortress.core.util.time.Constraint;
*/
public class RoleSearchModalPanel extends Panel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private ReviewMgr reviewMgr;
@SpringBean
private DelReviewMgr delReviewMgr;
- private static final Logger LOG = Logger.getLogger(RoleSearchModalPanel.class.getName());
+ private static final Logger LOG = Logger.getLogger( RoleSearchModalPanel.class.getName() );
private ModalWindow window;
private Constraint roleSelection;
private String roleSearchVal;
private boolean isAdmin;
private boolean isParentSearch;
+
+
/**
* @param id
*/
- public RoleSearchModalPanel( String id, ModalWindow window, boolean isAdmin)
+ public RoleSearchModalPanel( String id, ModalWindow window, boolean isAdmin )
{
super( id );
this.window = window;
@@ -74,6 +80,7 @@ public class RoleSearchModalPanel extends Panel
loadPanel();
}
+
public void loadPanel()
{
LoadableDetachableModel requests = getListViewModel();
@@ -82,10 +89,15 @@ public class RoleSearchModalPanel extends Panel
add( new AjaxPagingNavigator( "navigator", roleView ) );
}
+
private PageableListView createListView( final LoadableDetachableModel requests )
{
final PageableListView listView = new PageableListView( "dataview", requests, 16 )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void populateItem( final ListItem item )
{
@@ -94,8 +106,9 @@ public class RoleSearchModalPanel extends Panel
{
private static final long serialVersionUID = 1L;
+
@Override
- public void onClick(AjaxRequestTarget target)
+ public void onClick( AjaxRequestTarget target )
{
roleSelection = modelObject;
window.close( target );
@@ -115,10 +128,15 @@ public class RoleSearchModalPanel extends Panel
return listView;
}
+
private LoadableDetachableModel getListViewModel()
{
final LoadableDetachableModel ret = new LoadableDetachableModel()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected Object load()
{
@@ -126,24 +144,24 @@ public class RoleSearchModalPanel extends Panel
try
{
roleSelection = null;
- if(roleSearchVal == null)
+ if ( roleSearchVal == null )
roleSearchVal = "";
- if(isParentSearch)
- {
- Role childRole = reviewMgr.readRole( new Role(roleSearchVal) );
- if(childRole != null)
- {
- List<Role> parentRoles = new ArrayList<Role>();
- for(String role : childRole.getParents() )
- {
- Role parent = reviewMgr.readRole( new Role(role) );
- parentRoles.add( parent );
- }
- roles = parentRoles;
- }
- }
- else if(isAdmin)
+ if ( isParentSearch )
+ {
+ Role childRole = reviewMgr.readRole( new Role( roleSearchVal ) );
+ if ( childRole != null )
+ {
+ List<Role> parentRoles = new ArrayList<Role>();
+ for ( String role : childRole.getParents() )
+ {
+ Role parent = reviewMgr.readRole( new Role( role ) );
+ parentRoles.add( parent );
+ }
+ roles = parentRoles;
+ }
+ }
+ else if ( isAdmin )
{
roles = delReviewMgr.findRoles( roleSearchVal );
}
@@ -162,48 +180,55 @@ public class RoleSearchModalPanel extends Panel
return ret;
}
+
public UserRole getRoleSelection()
{
- UserRole userRoleSelection = new UserRole( );
- if(this.roleSelection != null)
+ UserRole userRoleSelection = new UserRole();
+ if ( this.roleSelection != null )
{
userRoleSelection.setName( this.roleSelection.getName() );
- CUtil.copy(this.roleSelection, userRoleSelection);
+ CUtil.copy( this.roleSelection, userRoleSelection );
}
return userRoleSelection;
}
+
public UserAdminRole getAdminRoleSelection()
{
- UserAdminRole userRoleSelection = new UserAdminRole( );
- if(this.roleSelection != null)
+ UserAdminRole userRoleSelection = new UserAdminRole();
+ if ( this.roleSelection != null )
{
userRoleSelection.setName( this.roleSelection.getName() );
- CUtil.copy(this.roleSelection, userRoleSelection);
+ CUtil.copy( this.roleSelection, userRoleSelection );
}
return userRoleSelection;
}
+
public void setRoleSearchVal( String roleSearchVal )
{
this.roleSearchVal = roleSearchVal;
}
+
public boolean isAdmin()
{
return isAdmin;
}
+
public void setAdmin( boolean admin )
{
isAdmin = admin;
}
+
public boolean isParentSearch()
{
return isParentSearch;
}
+
public void setParentSearch( boolean parentSearch )
{
isParentSearch = parentSearch;
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 568ff6c..0a406f7 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.jquery.ui.form.spinner.Spinner;
import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
@@ -52,6 +53,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
import java.util.ArrayList;
import java.util.List;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -59,31 +61,37 @@ import java.util.List;
*/
public class SDDetailPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private AdminMgr adminMgr;
private static final String MEMBERS_SELECTION = "membersSelection";
- private static final Logger log = Logger.getLogger(SDDetailPanel.class.getName());
+ private static final Logger log = Logger.getLogger( SDDetailPanel.class.getName() );
private Form editForm;
private Displayable display;
private boolean isStatic;
+
public Form getForm()
{
return this.editForm;
}
- public SDDetailPanel(String id, Displayable display, boolean isStatic)
+
+ public SDDetailPanel( String id, Displayable display, boolean isStatic )
{
- super(id);
+ super( id );
this.adminMgr.setAdmin( GlobalUtils.getRbacSession( 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<SDSet>( new SDSet() ) );
this.display = display;
- add(editForm);
+ add( editForm );
}
public class SDDetailForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private String internalId;
private ComboBox<String> membersCB;
private String membersSelection;
@@ -91,13 +99,14 @@ public class SDDetailPanel extends FormComponentPanel
private List<String> members = new ArrayList<String>();
private UserRole roleConstraint = new UserRole();
- public SDDetailForm(String id, final IModel<SDSet> model)
+
+ public SDDetailForm( String id, final IModel<SDSet> model )
{
- super(id, model);
+ super( id, model );
String opNameAdd;
String opNameUpdate;
String opNameDelete;
- if(isStatic)
+ if ( isStatic )
{
opNameAdd = "createSsdSet";
opNameUpdate = "updateSsdSet";
@@ -112,48 +121,59 @@ public class SDDetailPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.ADD, GlobalIds.ADMIN_MGR, opNameAdd )
{
+ /** 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(".onSubmit Add");
- SDSet sdSet = (SDSet)form.getModel().getObject();
- updateEntityWithComboData(sdSet);
+ log.debug( ".onSubmit Add" );
+ SDSet sdSet = ( SDSet ) form.getModel().getObject();
+ updateEntityWithComboData( sdSet );
try
{
- if(isStatic)
+ if ( isStatic )
{
- adminMgr.createSsdSet(sdSet);
+ adminMgr.createSsdSet( sdSet );
}
else
{
- adminMgr.createDsdSet(sdSet);
+ adminMgr.createDsdSet( sdSet );
}
- SaveModelEvent.send(getPage(), this, sdSet, target, SaveModelEvent.Operations.ADD);
+ SaveModelEvent.send( getPage(), this, sdSet, target, SaveModelEvent.Operations.ADD );
component = editForm;
String msg = "SDSet: " + sdSet.getName() + " has been added";
- display.setMessage(msg);
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.info("SDDetailPanel.add.onError");
+ log.info( "SDDetailPanel.add.onError" );
target.add();
}
+
+
@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 )
{
@@ -162,47 +182,58 @@ public class SDDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
add( new SecureIndicatingAjaxButton( GlobalIds.COMMIT, GlobalIds.ADMIN_MGR, opNameUpdate )
{
+ /** 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(".onSubmit Commit");
- SDSet sdSet = (SDSet)form.getModel().getObject();
+ log.debug( ".onSubmit Commit" );
+ SDSet sdSet = ( SDSet ) form.getModel().getObject();
try
{
- updateEntityWithComboData(sdSet);
- if(isStatic)
- adminMgr.updateSsdSet(sdSet);
+ updateEntityWithComboData( sdSet );
+ if ( isStatic )
+ adminMgr.updateSsdSet( sdSet );
else
- adminMgr.updateDsdSet(sdSet);
+ adminMgr.updateDsdSet( sdSet );
String msg = "SDSet: " + sdSet.getName() + " has been updated";
- SaveModelEvent.send(getPage(), this, sdSet, target, SaveModelEvent.Operations.UPDATE);
+ SaveModelEvent.send( getPage(), this, sdSet, target, SaveModelEvent.Operations.UPDATE );
component = editForm;
- display.setMessage(msg);
+ display.setMessage( msg );
membersSelection = "";
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("SDDetailPanel.commmit.onError");
+ log.warn( "SDDetailPanel.commmit.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 )
{
@@ -211,60 +242,72 @@ public class SDDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
add( new SecureIndicatingAjaxButton( GlobalIds.DELETE, GlobalIds.ADMIN_MGR, opNameDelete )
{
+ /** 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(".onSubmit Delete");
- SDSet sdSet = (SDSet)form.getModel().getObject();
+ log.debug( ".onSubmit Delete" );
+ SDSet sdSet = ( SDSet ) form.getModel().getObject();
try
{
SDSet newSdSet = new SDSet();
- if(isStatic)
+ if ( isStatic )
{
- adminMgr.deleteSsdSet(sdSet);
- newSdSet.setType(SDSet.SDType.STATIC);
+ adminMgr.deleteSsdSet( sdSet );
+ newSdSet.setType( SDSet.SDType.STATIC );
}
else
{
- adminMgr.deleteDsdSet(sdSet);
- newSdSet.setType(SDSet.SDType.DYNAMIC);
+ adminMgr.deleteDsdSet( sdSet );
+ newSdSet.setType( SDSet.SDType.DYNAMIC );
}
form.setModelObject( newSdSet );
modelChanged();
String msg = "SDSet: " + sdSet.getName() + " has been deleted";
membersSelection = "";
members = new ArrayList<String>();
- membersCB = new ComboBox<String>( "members", new PropertyModel<String>( editForm, MEMBERS_SELECTION ),members );
+ membersCB = new ComboBox<String>( "members", new PropertyModel<String>( editForm,
+ MEMBERS_SELECTION ), members );
editForm.addOrReplace( membersCB );
component = editForm;
- SaveModelEvent.send(getPage(), this, sdSet, target, SaveModelEvent.Operations.DELETE);
- display.setMessage(msg);
+ SaveModelEvent.send( getPage(), this, sdSet, target, SaveModelEvent.Operations.DELETE );
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("SDDetailPanel.delete.onError");
+ log.warn( "SDDetailPanel.delete.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 )
{
@@ -273,39 +316,51 @@ public class SDDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
- add(new AjaxSubmitLink(GlobalIds.CANCEL)
+ add( new AjaxSubmitLink( GlobalIds.CANCEL )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
- protected void onSubmit(AjaxRequestTarget target, Form form)
+ protected void onSubmit( AjaxRequestTarget target, Form form )
{
SDSet sdSet = new SDSet();
- if(isStatic)
- sdSet.setType(SDSet.SDType.STATIC);
+ if ( isStatic )
+ sdSet.setType( SDSet.SDType.STATIC );
else
- sdSet.setType(SDSet.SDType.DYNAMIC);
- setModelObject(sdSet);
+ sdSet.setType( SDSet.SDType.DYNAMIC );
+ setModelObject( sdSet );
membersSelection = "";
members = new ArrayList<String>();
- membersCB = new ComboBox<String>( "members", new PropertyModel<String>( form, MEMBERS_SELECTION ),members );
+ membersCB = new ComboBox<String>( "members", new PropertyModel<String>( form, MEMBERS_SELECTION ),
+ members );
editForm.addOrReplace( membersCB );
component = editForm;
String msg = "SDSet cancelled input form";
- display.setMessage(msg);
+ display.setMessage( msg );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn("SDDetailPanel.cancel.onError");
+ log.warn( "SDDetailPanel.cancel.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 )
{
@@ -314,9 +369,9 @@ public class SDDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
- if(isStatic)
+ if ( isStatic )
{
add( new Label( "sdAssignmentsLabel", "Static Separation of Duties Detail" ) );
}
@@ -325,23 +380,24 @@ public class SDDetailPanel extends FormComponentPanel
add( new Label( "sdAssignmentsLabel", "Dynamic Separation of Duties Detail" ) );
}
- TextField name = new TextField("name");
- add(name);
- TextField description = new TextField("description");
- description.setRequired(false);
- add(description);
- add(new Spinner<Integer>("cardinality"));
- Label iid = new Label("id");
- add(iid);
+ TextField name = new TextField( "name" );
+ add( name );
+ TextField description = new TextField( "description" );
+ description.setRequired( false );
+ add( description );
+ 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.setOutputMarkupId(true);
- add(membersCB);
+ membersCB.setOutputMarkupId( true );
+ add( membersCB );
addRoleSearchModal();
add( new AjaxButton( "members.delete" )
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -353,7 +409,7 @@ public class SDDetailPanel extends FormComponentPanel
if ( sdSet.getMembers() != null )
{
sdSet.getMembers().remove( membersSelection );
- members.remove( membersSelection );
+ members.remove( membersSelection );
membersSelection = "";
component = editForm;
msg += ", was removed from local, commit to persist changes on server";
@@ -370,12 +426,18 @@ public class SDDetailPanel extends FormComponentPanel
display.setMessage( msg );
log.debug( msg );
}
+
+
@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 )
{
@@ -387,14 +449,20 @@ public class SDDetailPanel extends FormComponentPanel
} );
}
+
private void addRoleSearchModal()
{
final ModalWindow rolesModalWindow;
add( rolesModalWindow = new ModalWindow( "rolesmodal" ) );
- final RoleSearchModalPanel roleSearchModalPanel = new RoleSearchModalPanel( rolesModalWindow.getContentId(), rolesModalWindow, false );
+ final RoleSearchModalPanel roleSearchModalPanel = new RoleSearchModalPanel(
+ rolesModalWindow.getContentId(), rolesModalWindow, false );
rolesModalWindow.setContent( roleSearchModalPanel );
rolesModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -412,6 +480,7 @@ public class SDDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -423,12 +492,18 @@ public class SDDetailPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
rolesModalWindow.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 )
{
@@ -445,51 +520,55 @@ public class SDDetailPanel extends FormComponentPanel
rolesModalWindow.setCookieName( "role-assign-modal" );
}
- private void updateEntityWithComboData(SDSet sdSet)
+
+ private void updateEntityWithComboData( SDSet sdSet )
{
- if(VUtil.isNotNullOrEmpty(membersSelection))
+ if ( VUtil.isNotNullOrEmpty( membersSelection ) )
{
- sdSet.setMember(membersSelection);
+ sdSet.setMember( membersSelection );
members.add( membersSelection );
}
}
+
@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();
- SDSet sdSet = (SDSet) modelEvent.getEntity();
- this.setModelObject(sdSet);
- if(VUtil.isNotNullOrEmpty(sdSet.getMembers()))
+ SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
+ SDSet sdSet = ( SDSet ) modelEvent.getEntity();
+ 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 );
+ members = new ArrayList<String>( sdSet.getMembers() );
+ membersCB = new ComboBox<String>( "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 );
+ membersCB = new ComboBox<String>( "members", new PropertyModel<String>( this, MEMBERS_SELECTION ),
+ members );
}
- editForm.addOrReplace(membersCB);
+ editForm.addOrReplace( membersCB );
String msg = "SDSet: " + sdSet.getName() + " has been selected";
- log.debug(msg);
- display.setMessage(msg);
+ log.debug( msg );
+ display.setMessage( msg );
component = editForm;
}
- 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());
- log.debug(".onEvent AjaxRequestTarget: " + target.toString());
- target.add(component);
+ AjaxRequestTarget target = ( ( AjaxRequestTarget ) event.getPayload() );
+ log.debug( ".onEvent AjaxRequestTarget: " + target.toString() );
+ target.add( component );
component = null;
}
- display.display((AjaxRequestTarget) event.getPayload());
+ display.display( ( AjaxRequestTarget ) event.getPayload() );
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 e1ef2ab..5b89c47 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.inmethod.grid.IGridColumn;
import com.inmethod.grid.SizeUnit;
import com.inmethod.grid.column.PropertyColumn;
@@ -59,6 +60,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+
/**
*
* @author Shawn McKinney
@@ -66,7 +68,9 @@ import java.util.List;
*/
public class SDListPanel extends FormComponentPanel
{
- private static final Logger log = Logger.getLogger(SDListPanel.class.getName());
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = Logger.getLogger( SDListPanel.class.getName() );
private Form listForm;
private DefaultTreeModel treeModel;
private DefaultMutableTreeNode node;
@@ -81,166 +85,186 @@ public class SDListPanel extends FormComponentPanel
private static final char NAMES = 'N';
private static final char ROLES = 'R';
- public SDListPanel(String id, final boolean isStatic)
+
+ public SDListPanel( String id, final boolean isStatic )
{
- super(id);
+ super( id );
SDSet sdSet = new SDSet();
- sdSet.setName("");
- if(isStatic)
+ sdSet.setName( "" );
+ if ( isStatic )
{
- sdSet.setType(SDSet.SDType.STATIC);
+ sdSet.setType( SDSet.SDType.STATIC );
searchLabel = "SSD Name";
opName = "ssdRoleSets";
}
else
{
- sdSet.setType(SDSet.SDType.DYNAMIC);
+ sdSet.setType( SDSet.SDType.DYNAMIC );
searchLabel = "DSD Name";
opName = "dsdRoleSets";
}
- SDListModel sdListModel = new SDListModel(sdSet, GlobalUtils.getRbacSession( this ));
- setDefaultModel(sdListModel);
+ SDListModel sdListModel = new SDListModel( sdSet, GlobalUtils.getRbacSession( this ) );
+ setDefaultModel( sdListModel );
List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
- columns.add(new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of(searchLabel), "userObject.name"));
+ columns.add( new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
+ Model.of( searchLabel ), "userObject.name" ) );
PropertyColumn description = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Description"), "userObject.Description");
+ Model.of( "Description" ), "userObject.Description" );
- description.setInitialSize(300);
- columns.add(description);
+ description.setInitialSize( 300 );
+ columns.add( description );
PropertyColumn cardinality = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Cardinality"), "userObject.Cardinality");
- cardinality.setInitialSize(100);
- columns.add(cardinality);
+ Model.of( "Cardinality" ), "userObject.Cardinality" );
+ cardinality.setInitialSize( 100 );
+ columns.add( cardinality );
PropertyColumn members = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Members"), "userObject.members");
- members.setInitialSize(600);
- columns.add(members);
+ Model.of( "Members" ), "userObject.members" );
+ members.setInitialSize( 600 );
+ columns.add( members );
- List<SDSet> sdSets = (List<SDSet>) getDefaultModel().getObject();
- treeModel = createTreeModel(sdSets);
- grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>("sdtreegrid", treeModel, columns)
+ List<SDSet> sdSets = ( List<SDSet> ) getDefaultModel().getObject();
+ treeModel = createTreeModel( sdSets );
+ grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "sdtreegrid", 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() )
{
- SDSet sdSet = (SDSet) node.getUserObject();
- log.debug("TreeGrid.addGrid.selectItem selected sdSet =" + sdSet.getName());
- if (super.isItemSelected(itemModel))
+ SDSet sdSet = ( SDSet ) node.getUserObject();
+ log.debug( "TreeGrid.addGrid.selectItem selected sdSet =" + sdSet.getName() );
+ if ( super.isItemSelected( itemModel ) )
{
- log.debug("TreeGrid.addGrid.selectItem item is selected");
- super.selectItem(itemModel, false);
+ log.debug( "TreeGrid.addGrid.selectItem item is selected" );
+ super.selectItem( itemModel, false );
}
else
{
- super.selectItem(itemModel, true);
- SelectModelEvent.send(getPage(), this, sdSet);
+ super.selectItem( itemModel, true );
+ SelectModelEvent.send( getPage(), this, sdSet );
}
}
}
};
- 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());
- this.listForm = new Form("form");
- this.listForm.add(grid);
- grid.setOutputMarkupId(true);
-
- radioGroup = new RadioGroup("searchOptions", new PropertyModel(this, "selectedRadioButton"));
- add(radioGroup);
- Radio nameRb = new Radio("nameRb", new Model(new Character(NAMES)));
- radioGroup.add(nameRb);
- Radio roleRb = new Radio("roleRb", new Model(new Character(ROLES)));
- radioGroup.add(roleRb);
- addRoleSearchModal(roleRb);
+ grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ this.listForm = new Form( "form" );
+ this.listForm.add( grid );
+ grid.setOutputMarkupId( true );
+
+ radioGroup = new RadioGroup( "searchOptions", new PropertyModel( this, "selectedRadioButton" ) );
+ add( radioGroup );
+ Radio nameRb = new Radio( "nameRb", new Model( new Character( NAMES ) ) );
+ radioGroup.add( nameRb );
+ Radio roleRb = new Radio( "roleRb", new Model( new Character( ROLES ) ) );
+ radioGroup.add( roleRb );
+ addRoleSearchModal( roleRb );
radioGroup.setOutputMarkupId( true );
radioGroup.setRenderBodyOnly( false );
- searchValFld = new TextField(GlobalIds.SEARCH_VAL, new PropertyModel<String>(this, GlobalIds.SEARCH_VAL));
+ searchValFld = new TextField( GlobalIds.SEARCH_VAL, new PropertyModel<String>( this, GlobalIds.SEARCH_VAL ) );
searchValFld.setOutputMarkupId( true );
- AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior(GlobalIds.ONBLUR)
+ AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( searchValFld );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( searchValFld );
+ }
};
- searchValFld.add(ajaxUpdater);
+ searchValFld.add( ajaxUpdater );
radioGroup.add( searchValFld );
- this.listForm.add(radioGroup);
+ this.listForm.add( radioGroup );
selectedRadioButton = NAMES;
this.listForm.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.REVIEW_MGR, opName )
{
+ /** 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");
- info("Searching SDSets...");
- if(!VUtil.isNotNullOrEmpty(searchVal))
+ log.debug( ".search onSubmit" );
+ info( "Searching SDSets..." );
+ if ( !VUtil.isNotNullOrEmpty( searchVal ) )
{
searchVal = "";
}
final SDSet srchSd = new SDSet();
- if(isStatic)
+ if ( isStatic )
{
- srchSd.setType(SDSet.SDType.STATIC);
+ srchSd.setType( SDSet.SDType.STATIC );
}
else
{
- srchSd.setType(SDSet.SDType.DYNAMIC);
+ srchSd.setType( SDSet.SDType.DYNAMIC );
}
- switch(selectedRadioButton)
+ switch ( selectedRadioButton )
{
case NAMES:
- log.debug(".onSubmit NAMES RB selected");
- srchSd.setName(searchVal);
+ log.debug( ".onSubmit NAMES RB selected" );
+ srchSd.setName( searchVal );
break;
case ROLES:
- log.debug(".onSubmit ROLES RB selected");
- srchSd.setMember(searchVal);
+ log.debug( ".onSubmit ROLES RB selected" );
+ srchSd.setMember( searchVal );
break;
}
- setDefaultModel(new SDListModel(srchSd, GlobalUtils.getRbacSession( this )));
+ setDefaultModel( new SDListModel( srchSd, GlobalUtils.getRbacSession( this ) ) );
treeModel.reload();
rootNode.removeAllChildren();
- List<SDSet> sdSets = (List<SDSet>) getDefaultModelObject();
- if(VUtil.isNotNullOrEmpty(sdSets))
+ List<SDSet> sdSets = ( List<SDSet> ) getDefaultModelObject();
+ if ( VUtil.isNotNullOrEmpty( sdSets ) )
{
- for (SDSet sdSet : sdSets)
- rootNode.add(new DefaultMutableTreeNode(sdSet));
- info("Search returned " + sdSets.size() + " matching objects");
+ for ( SDSet sdSet : sdSets )
+ rootNode.add( new DefaultMutableTreeNode( sdSet ) );
+ info( "Search returned " + sdSets.size() + " matching objects" );
}
else
{
- info("No matching objects found");
+ info( "No matching objects found" );
}
- target.add(grid);
+ target.add( grid );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.warn(".search.onError");
+ log.warn( ".search.onError" );
target.add();
}
+
+
@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 )
{
@@ -249,25 +273,31 @@ public class SDListPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
- add(this.listForm);
+ } );
+ add( this.listForm );
}
- private void addRoleSearchModal(Radio roleRb)
+
+ private void addRoleSearchModal( Radio roleRb )
{
final ModalWindow rolesModalWindow;
listForm.add( rolesModalWindow = new ModalWindow( "rolesearchmodal" ) );
- final RoleSearchModalPanel roleSearchModalPanel = new RoleSearchModalPanel( rolesModalWindow.getContentId(), rolesModalWindow, false );
+ final RoleSearchModalPanel roleSearchModalPanel = new RoleSearchModalPanel( rolesModalWindow.getContentId(),
+ rolesModalWindow, false );
rolesModalWindow.setContent( roleSearchModalPanel );
rolesModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
UserRole roleConstraint = roleSearchModalPanel.getRoleSelection();
if ( roleConstraint != null )
{
- log.debug( "modal selected:" + roleConstraint.getName());
+ log.debug( "modal selected:" + roleConstraint.getName() );
searchVal = roleConstraint.getName();
selectedRadioButton = ROLES;
target.add( radioGroup );
@@ -277,7 +307,11 @@ public class SDListPanel extends FormComponentPanel
roleRb.add( new SecureIndicatingAjaxLink( "roleAssignLinkLbl", GlobalIds.REVIEW_MGR, "findRoles" )
{
- public void onClick(AjaxRequestTarget target)
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ public void onClick( AjaxRequestTarget target )
{
String msg = "clicked on roles search";
msg += "roleSelection: " + searchVal;
@@ -286,12 +320,18 @@ public class SDListPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
rolesModalWindow.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 )
{
@@ -300,7 +340,7 @@ public class SDListPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
rolesModalWindow.setTitle( "RBAC Role Search Modal" );
rolesModalWindow.setInitialWidth( 700 );
@@ -308,16 +348,17 @@ public class SDListPanel extends FormComponentPanel
rolesModalWindow.setCookieName( "role-assign-modal" );
}
+
@Override
- public void onEvent(IEvent event)
+ public void onEvent( IEvent event )
{
- if (event.getPayload() instanceof SaveModelEvent)
+ if ( event.getPayload() instanceof SaveModelEvent )
{
- SaveModelEvent modelEvent = (SaveModelEvent) event.getPayload();
- switch(modelEvent.getOperation())
+ SaveModelEvent modelEvent = ( SaveModelEvent ) event.getPayload();
+ switch ( modelEvent.getOperation() )
{
case ADD:
- add(modelEvent.getEntity());
+ add( modelEvent.getEntity() );
break;
case UPDATE:
modelChanged();
@@ -328,56 +369,60 @@ public class SDListPanel extends FormComponentPanel
default:
break;
}
- AjaxRequestTarget target = ((SaveModelEvent) event.getPayload()).getAjaxRequestTarget();
- target.add(grid);
- log.debug(".onEvent SaveModelEvent: " + target.toString());
+ AjaxRequestTarget target = ( ( SaveModelEvent ) event.getPayload() ).getAjaxRequestTarget();
+ target.add( grid );
+ log.debug( ".onEvent SaveModelEvent: " + target.toString() );
}
}
- private void removeSelectedItems(TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid)
+
+ private void removeSelectedItems( TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid )
{
Collection<IModel<DefaultMutableTreeNode>> selected = grid.getSelectedItems();
- for (IModel<DefaultMutableTreeNode> model : selected)
+ for ( IModel<DefaultMutableTreeNode> model : selected )
{
DefaultMutableTreeNode node = model.getObject();
- treeModel.removeNodeFromParent(node);
- SDSet sdSet = (SDSet) node.getUserObject();
- log.debug(".removeSelectedItems sdset node: " + sdSet.getName());
- List<SDSet> sdSets = ((List<SDSet>) getDefaultModel().getObject());
- sdSets.remove(sdSet.getName());
+ treeModel.removeNodeFromParent( node );
+ SDSet sdSet = ( SDSet ) node.getUserObject();
+ log.debug( ".removeSelectedItems sdset node: " + sdSet.getName() );
+ List<SDSet> sdSets = ( ( List<SDSet> ) getDefaultModel().getObject() );
+ sdSets.remove( sdSet.getName() );
}
}
- private DefaultTreeModel createTreeModel(List<SDSet> sdSets)
+
+ private DefaultTreeModel createTreeModel( List<SDSet> sdSets )
{
DefaultTreeModel model;
SDSet root = new SDSet();
//root.setName(searchLabel);
- rootNode = new DefaultMutableTreeNode(root);
- model = new DefaultTreeModel(rootNode);
- if (sdSets == null)
- log.debug("no SDSets found");
+ rootNode = new DefaultMutableTreeNode( root );
+ model = new DefaultTreeModel( rootNode );
+ if ( sdSets == null )
+ log.debug( "no SDSets found" );
else
{
- log.debug("SDSets found:" + sdSets.size());
- for (SDSet sdSet : sdSets)
- rootNode.add(new DefaultMutableTreeNode(sdSet));
+ log.debug( "SDSets found:" + sdSets.size() );
+ for ( SDSet sdSet : sdSets )
+ rootNode.add( new DefaultMutableTreeNode( sdSet ) );
}
return model;
}
- public void add(FortEntity entity)
+
+ public void add( FortEntity entity )
{
- if (getDefaultModelObject() != null)
+ if ( getDefaultModelObject() != null )
{
- List<SDSet> sdSets = ((List<SDSet>) getDefaultModelObject());
- sdSets.add((SDSet) entity);
- treeModel.insertNodeInto(new DefaultMutableTreeNode(entity), rootNode, sdSets.size());
+ List<SDSet> sdSets = ( ( List<SDSet> ) getDefaultModelObject() );
+ sdSets.add( ( SDSet ) entity );
+ treeModel.insertNodeInto( new DefaultMutableTreeNode( entity ), rootNode, sdSets.size() );
}
}
+
public void prune()
{
- removeSelectedItems(grid);
+ removeSelectedItems( grid );
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/panel/UserAuditDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserAuditDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserAuditDetailPanel.java
index cdedb84..b88b301 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserAuditDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserAuditDetailPanel.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import org.apache.log4j.Logger;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.FormComponentPanel;
@@ -27,6 +28,7 @@ import org.apache.wicket.model.IModel;
import org.apache.directory.fortress.web.GlobalIds;
import org.apache.directory.fortress.core.rbac.User;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -34,11 +36,14 @@ import org.apache.directory.fortress.core.rbac.User;
*/
public class UserAuditDetailPanel extends FormComponentPanel
{
- private static final Logger LOG = Logger.getLogger(UserAuditDetailPanel.class.getName());
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+ private static final Logger LOG = Logger.getLogger( UserAuditDetailPanel.class.getName() );
+
- public UserAuditDetailPanel(String id, final IModel userModel)
+ public UserAuditDetailPanel( String id, final IModel userModel )
{
- super(id, userModel);
+ super( id, userModel );
add( new Label( GlobalIds.USER_ID ) );
add( new Label( GlobalIds.DESCRIPTION ) );
add( new Label( GlobalIds.NAME ) );
@@ -50,10 +55,14 @@ public class UserAuditDetailPanel extends FormComponentPanel
add( new Label( GlobalIds.ADDRESS_COUNTRY ) );
add( new JpegImage( GlobalIds.JPEGPHOTO )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected byte[] getPhoto()
{
- User user = (User)getModelObject();
+ User user = ( User ) getModelObject();
return user.getJpegPhoto();
}
} );
[05/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 1988e5f..6cd1916 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
import org.apache.log4j.Logger;
@@ -50,6 +51,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
import java.util.ArrayList;
import java.util.List;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -57,35 +59,41 @@ import java.util.List;
*/
public class OUDetailPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private DelAdminMgr delAdminMgr;
- private static final Logger log = Logger.getLogger(OUDetailPanel.class.getName());
+ private static final Logger log = Logger.getLogger( OUDetailPanel.class.getName() );
private Form editForm;
private Displayable display;
private boolean isUser;
+
public Form getForm()
{
return this.editForm;
}
- public OUDetailPanel(String id, Displayable display, boolean isUser)
+
+ public OUDetailPanel( String id, Displayable display, boolean isUser )
{
- super(id);
+ super( id );
this.delAdminMgr.setAdmin( GlobalUtils.getRbacSession( this ) );
this.isUser = isUser;
OrgUnit ou = new OrgUnit();
- if(isUser)
+ if ( isUser )
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<OrgUnit>( ou ) );
this.display = display;
- add(editForm);
+ add( editForm );
}
public class OUDetailForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final String PARENTS = "parents";
private static final String PARENTS_SELECTION = "parentsSelection";
private String internalId;
@@ -95,52 +103,64 @@ public class OUDetailPanel extends FormComponentPanel
private List<String> parents = new ArrayList<String>();
private OrgUnit parent = new OrgUnit();
- public OUDetailForm(String id, final IModel<OrgUnit> model)
+
+ public OUDetailForm( String id, final IModel<OrgUnit> model )
{
- super(id, model);
+ super( id, model );
- if(isUser)
+ if ( isUser )
parent.setType( OrgUnit.Type.USER );
else
parent.setType( OrgUnit.Type.PERM );
add( new SecureIndicatingAjaxButton( GlobalIds.ADD, GlobalIds.DEL_ADMIN_MGR, "addOU" )
{
+ /** 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(".onSubmit Add");
- OrgUnit orgUnit = (OrgUnit)form.getModel().getObject();
- updateEntityWithComboData(orgUnit);
+ log.debug( ".onSubmit Add" );
+ OrgUnit orgUnit = ( OrgUnit ) form.getModel().getObject();
+ updateEntityWithComboData( orgUnit );
try
{
delAdminMgr.add( orgUnit );
- SaveModelEvent.send(getPage(), this, orgUnit, target, SaveModelEvent.Operations.ADD);
+ SaveModelEvent.send( getPage(), this, orgUnit, target, SaveModelEvent.Operations.ADD );
component = editForm;
String msg = "OrgUnit: " + orgUnit.getName() + " has been added";
- display.setMessage(msg);
+ display.setMessage( msg );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = ".onSubmit caught SecurityException=" + se;
- log.error(error);
- display.setMessage(error);
+ log.error( error );
+ display.setMessage( error );
display.display();
}
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
- log.info("OUDetailPanel.add.onError caught");
+ log.info( "OUDetailPanel.add.onError caught" );
target.add();
}
+
+
@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 )
{
@@ -149,9 +169,13 @@ public class OUDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
add( new SecureIndicatingAjaxButton( GlobalIds.COMMIT, GlobalIds.DEL_ADMIN_MGR, "updateOU" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -176,18 +200,24 @@ public class OUDetailPanel extends FormComponentPanel
}
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "OUDetailPanel.update.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 )
{
@@ -199,6 +229,10 @@ public class OUDetailPanel extends FormComponentPanel
} );
add( new SecureIndicatingAjaxButton( GlobalIds.DELETE, GlobalIds.DEL_ADMIN_MGR, "deleteOU" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -238,18 +272,24 @@ public class OUDetailPanel extends FormComponentPanel
}
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "OUDetailPanel.delete.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 )
{
@@ -259,38 +299,50 @@ public class OUDetailPanel extends FormComponentPanel
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
} );
- add(new AjaxSubmitLink(GlobalIds.CANCEL)
+ add( new AjaxSubmitLink( GlobalIds.CANCEL )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
- protected void onSubmit(AjaxRequestTarget target, Form form)
+ protected void onSubmit( AjaxRequestTarget target, Form form )
{
OrgUnit ou = new OrgUnit();
- if(isUser)
+ if ( isUser )
ou.setType( OrgUnit.Type.USER );
else
ou.setType( OrgUnit.Type.PERM );
- setModelObject(ou);
+ setModelObject( ou );
parentsSelection = "";
parents = new ArrayList<String>();
- parentsCB = new ComboBox<String>( PARENTS, new PropertyModel<String>( form, PARENTS_SELECTION ),parents );
+ parentsCB = new ComboBox<String>( PARENTS, new PropertyModel<String>( form, PARENTS_SELECTION ),
+ parents );
editForm.addOrReplace( parentsCB );
component = editForm;
String msg = "OU Detail cancelled input form";
- display.setMessage(msg);
+ display.setMessage( msg );
}
+
@Override
- public void onError(AjaxRequestTarget target, Form form)
+ public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "OUDetailPanel.cancel.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 )
{
@@ -299,9 +351,9 @@ public class OUDetailPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
- if(isUser)
+ if ( isUser )
{
add( new Label( "ouAssignmentsLabel", "User Organizational Detail" ) );
}
@@ -310,22 +362,23 @@ public class OUDetailPanel extends FormComponentPanel
add( new Label( "ouAssignmentsLabel", "Permission Organizational Detail" ) );
}
- TextField name = new TextField("name");
+ TextField name = new TextField( "name" );
add( name );
- TextField description = new TextField("description");
- description.setRequired(false);
- add(description);
- Label iid = new Label("id");
- add(iid);
+ TextField description = new TextField( "description" );
+ description.setRequired( false );
+ add( description );
+ Label iid = new Label( "id" );
+ add( iid );
parentsCB = new ComboBox<String>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ), parents );
- add(parentsCB);
- setOutputMarkupId(true);
+ add( parentsCB );
+ setOutputMarkupId( true );
addParentSearchModal();
add( new AjaxButton( "parents.delete" )
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -358,12 +411,17 @@ public class OUDetailPanel extends FormComponentPanel
log.debug( msg );
}
+
@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 )
{
@@ -375,14 +433,20 @@ public class OUDetailPanel extends FormComponentPanel
} );
}
+
private void addParentSearchModal()
{
final ModalWindow parentsModalWindow;
add( parentsModalWindow = new ModalWindow( "ouparentsmodal" ) );
- final OUSearchModalPanel parentSearchModalPanel = new OUSearchModalPanel( parentsModalWindow.getContentId(), parentsModalWindow, isUser );
+ final OUSearchModalPanel parentSearchModalPanel = new OUSearchModalPanel(
+ parentsModalWindow.getContentId(), parentsModalWindow, isUser );
parentsModalWindow.setContent( parentSearchModalPanel );
parentsModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -399,6 +463,7 @@ public class OUDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -410,12 +475,18 @@ public class OUDetailPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
parentsModalWindow.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 )
{
@@ -432,51 +503,55 @@ public class OUDetailPanel extends FormComponentPanel
parentsModalWindow.setCookieName( "parent-assign-modal" );
}
- private void updateEntityWithComboData(OrgUnit orgUnit)
+
+ private void updateEntityWithComboData( OrgUnit orgUnit )
{
- if(VUtil.isNotNullOrEmpty(parentsSelection))
+ if ( VUtil.isNotNullOrEmpty( parentsSelection ) )
{
orgUnit.setParent( parentsSelection );
parents.add( parentsSelection );
}
}
+
@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();
- OrgUnit orgUnit = (OrgUnit) modelEvent.getEntity();
- this.setModelObject(orgUnit);
- if(VUtil.isNotNullOrEmpty(orgUnit.getParents()))
+ SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
+ OrgUnit orgUnit = ( OrgUnit ) modelEvent.getEntity();
+ 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 );
+ parents = new ArrayList<String>( orgUnit.getParents() );
+ parentsCB = new ComboBox<String>( 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 );
+ parentsCB = new ComboBox<String>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),
+ parents );
}
- editForm.addOrReplace(parentsCB);
+ editForm.addOrReplace( parentsCB );
String msg = "OrgUnit: " + orgUnit.getName() + " has been selected";
- log.debug(".onEvent SelectModelEvent: " + orgUnit.getName());
- display.setMessage(msg);
+ log.debug( ".onEvent SelectModelEvent: " + orgUnit.getName() );
+ display.setMessage( msg );
component = editForm;
}
- 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());
- log.debug(".onEvent AjaxRequestTarget: " + target.toString());
- target.add(component);
+ AjaxRequestTarget target = ( ( AjaxRequestTarget ) event.getPayload() );
+ log.debug( ".onEvent AjaxRequestTarget: " + target.toString() );
+ target.add( component );
component = null;
}
- display.display((AjaxRequestTarget) event.getPayload());
+ display.display( ( AjaxRequestTarget ) event.getPayload() );
}
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 c620a71..c3a6039 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.inmethod.grid.IGridColumn;
import com.inmethod.grid.SizeUnit;
import com.inmethod.grid.column.PropertyColumn;
@@ -53,6 +54,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+
/**
*
* @author Shawn McKinney
@@ -60,6 +62,8 @@ import java.util.List;
*/
public class OUListPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final Logger log = Logger.getLogger( OUListPanel.class.getName() );
private Form listForm;
private DefaultTreeModel treeModel;
@@ -69,6 +73,7 @@ public class OUListPanel extends FormComponentPanel
private String searchVal;
private String searchLabel;
+
public OUListPanel( String id, final boolean isUser )
{
super( id );
@@ -87,10 +92,9 @@ public class OUListPanel extends FormComponentPanel
OUListModel ouListModel = new OUListModel( orgUnit, GlobalUtils.getRbacSession( this ) );
setDefaultModel( ouListModel );
- List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode,
- String>> columns = new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
+ 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" );
+ String>( Model.of( searchLabel ), "userObject.name" );
name.setInitialSize( 400 );
columns.add( name );
@@ -109,11 +113,15 @@ public class OUListPanel extends FormComponentPanel
treeModel = createTreeModel( orgUnits );
grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "outreegrid", treeModel, columns )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void selectItem( IModel itemModel, boolean selected )
{
node = ( DefaultMutableTreeNode ) itemModel.getObject();
- if(!node.isRoot())
+ if ( !node.isRoot() )
{
OrgUnit orgUnit1 = ( OrgUnit ) node.getUserObject();
log.debug( "TreeGrid.addGrid.selectItem selected sdSet =" + orgUnit1.getName() );
@@ -140,12 +148,17 @@ public class OUListPanel extends FormComponentPanel
this.listForm = new Form( "form" );
this.listForm.add( grid );
grid.setOutputMarkupId( true );
- TextField searchValFld = new TextField( GlobalIds.SEARCH_VAL, new PropertyModel<String>( this, GlobalIds.SEARCH_VAL ) );
+ TextField searchValFld = new TextField( GlobalIds.SEARCH_VAL, new PropertyModel<String>( this,
+ GlobalIds.SEARCH_VAL ) );
this.listForm.add( searchValFld );
//this.listForm.add( new AjaxSubmitLink( "search" )
this.listForm.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.DEL_REVIEW_MGR, "searchOU" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -184,18 +197,25 @@ public class OUListPanel extends FormComponentPanel
target.add( grid );
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( ".search.onError" );
target.add();
}
+
+
@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 )
{
@@ -208,6 +228,7 @@ public class OUListPanel extends FormComponentPanel
add( this.listForm );
}
+
@Override
public void onEvent( IEvent event )
{
@@ -234,6 +255,7 @@ public class OUListPanel extends FormComponentPanel
}
}
+
private void removeSelectedItems( TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid )
{
Collection<IModel<DefaultMutableTreeNode>> selected = grid.getSelectedItems();
@@ -248,6 +270,7 @@ public class OUListPanel extends FormComponentPanel
}
}
+
private DefaultTreeModel createTreeModel( List<OrgUnit> orgUnits )
{
DefaultTreeModel model;
@@ -270,6 +293,7 @@ public class OUListPanel extends FormComponentPanel
return model;
}
+
public void add( FortEntity entity )
{
if ( getDefaultModelObject() != null )
@@ -280,6 +304,7 @@ public class OUListPanel extends FormComponentPanel
}
}
+
public void prune()
{
removeSelectedItems( grid );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
index 3395a46..a0192e4 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import java.util.List;
import org.apache.log4j.Logger;
@@ -38,6 +39,7 @@ import org.apache.directory.fortress.web.GlobalUtils;
import org.apache.directory.fortress.core.DelReviewMgr;
import org.apache.directory.fortress.core.rbac.OrgUnit;
+
/**
*
* @author Shawn McKinney
@@ -45,18 +47,21 @@ import org.apache.directory.fortress.core.rbac.OrgUnit;
*/
public class OUSearchModalPanel extends Panel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private DelReviewMgr delReviewMgr;
- private static final Logger LOG = Logger.getLogger(OUSearchModalPanel.class.getName());
+ private static final Logger LOG = Logger.getLogger( OUSearchModalPanel.class.getName() );
private ModalWindow window;
private OrgUnit ouSelection;
private String ouSearchVal;
private boolean isUser;
+
/**
* @param id
*/
- public OUSearchModalPanel( String id, ModalWindow window, boolean isUser)
+ public OUSearchModalPanel( String id, ModalWindow window, boolean isUser )
{
super( id );
this.delReviewMgr.setAdmin( GlobalUtils.getRbacSession( this ) );
@@ -65,6 +70,7 @@ public class OUSearchModalPanel extends Panel
loadPanel();
}
+
public void loadPanel()
{
LoadableDetachableModel requests = getListViewModel();
@@ -73,10 +79,15 @@ public class OUSearchModalPanel extends Panel
add( new AjaxPagingNavigator( "navigator", ouView ) );
}
+
private PageableListView createListView( final LoadableDetachableModel requests )
{
final PageableListView listView = new PageableListView( "dataview", requests, 16 )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void populateItem( final ListItem item )
{
@@ -85,8 +96,9 @@ public class OUSearchModalPanel extends Panel
{
private static final long serialVersionUID = 1L;
+
@Override
- public void onClick(AjaxRequestTarget target)
+ public void onClick( AjaxRequestTarget target )
{
ouSelection = modelObject;
window.close( target );
@@ -99,10 +111,15 @@ public class OUSearchModalPanel extends Panel
return listView;
}
+
private LoadableDetachableModel getListViewModel()
{
final LoadableDetachableModel ret = new LoadableDetachableModel()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected Object load()
{
@@ -110,9 +127,9 @@ public class OUSearchModalPanel extends Panel
try
{
ouSelection = null;
- if(ouSearchVal == null)
+ if ( ouSearchVal == null )
ouSearchVal = "";
- if(isUser)
+ if ( isUser )
ous = delReviewMgr.search( OrgUnit.Type.USER, ouSearchVal );
else
ous = delReviewMgr.search( OrgUnit.Type.PERM, ouSearchVal );
@@ -128,11 +145,13 @@ public class OUSearchModalPanel extends Panel
return ret;
}
+
public OrgUnit getSelection()
{
return ouSelection;
}
+
public void setSearchVal( String ouSearchVal )
{
this.ouSearchVal = ouSearchVal;
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 9549c19..ef64363 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
import org.apache.log4j.Logger;
import org.apache.wicket.Component;
@@ -53,6 +54,8 @@ import org.apache.directory.fortress.core.rbac.PermObj;
*/
public class ObjectDetailPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private AdminMgr adminMgr;
private static final Logger log = Logger.getLogger( ObjectDetailPanel.class.getName() );
@@ -61,16 +64,18 @@ public class ObjectDetailPanel extends FormComponentPanel
private boolean isAdmin;
private String objName;
+
public Form getForm()
{
return this.editForm;
}
+
public ObjectDetailPanel( String id, Displayable display, boolean isAdmin )
{
super( id );
this.isAdmin = isAdmin;
- if(isAdmin)
+ if ( isAdmin )
objName = GlobalIds.DEL_ADMIN_MGR;
else
objName = GlobalIds.ADMIN_MGR;
@@ -83,14 +88,21 @@ public class ObjectDetailPanel extends FormComponentPanel
public class ObjectDetailForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private Component component;
private TextField ouTF;
+
public ObjectDetailForm( String id, final IModel<PermObj> model )
{
super( id, model );
add( new SecureIndicatingAjaxButton( GlobalIds.ADD, GlobalIds.ADMIN_MGR, "addPermObj" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -114,18 +126,25 @@ public class ObjectDetailPanel extends FormComponentPanel
}
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.info( "ObjectDetailPanel.add.onError caught" );
target.add();
}
+
+
@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 )
{
@@ -137,6 +156,10 @@ public class ObjectDetailPanel extends FormComponentPanel
} );
add( new SecureIndicatingAjaxButton( GlobalIds.COMMIT, GlobalIds.ADMIN_MGR, "updatePermObj" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -160,17 +183,24 @@ public class ObjectDetailPanel extends FormComponentPanel
}
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "ObjectDetailPanel.commit.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 )
{
@@ -182,6 +212,10 @@ public class ObjectDetailPanel extends FormComponentPanel
} );
add( new SecureIndicatingAjaxButton( GlobalIds.DELETE, GlobalIds.ADMIN_MGR, "deletePermObj" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -207,17 +241,24 @@ public class ObjectDetailPanel extends FormComponentPanel
}
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "ObjectDetailPanel.delete.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 )
{
@@ -229,6 +270,10 @@ public class ObjectDetailPanel extends FormComponentPanel
} );
add( new AjaxSubmitLink( GlobalIds.CANCEL )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -239,17 +284,24 @@ public class ObjectDetailPanel extends FormComponentPanel
display.setMessage( msg );
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "ObjectDetailPanel.cancel.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 )
{
@@ -260,7 +312,7 @@ public class ObjectDetailPanel extends FormComponentPanel
}
} );
- if(isAdmin)
+ if ( isAdmin )
{
add( new Label( "objAssignmentsLabel", "Administrative Permission Object Detail" ) );
}
@@ -298,6 +350,10 @@ public class ObjectDetailPanel extends FormComponentPanel
ousModalWindow.setContent( ouSearchModalPanel );
ousModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -315,6 +371,7 @@ public class ObjectDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -327,12 +384,18 @@ public class ObjectDetailPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
ousModalWindow.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 )
{
@@ -357,7 +420,7 @@ public class ObjectDetailPanel extends FormComponentPanel
{
SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
PermObj permObj = ( PermObj ) modelEvent.getEntity();
- this.setModelObject(permObj);
+ this.setModelObject( permObj );
String msg = "PermObject Name: " + permObj.getObjName() + " has been selected";
log.debug( msg );
component = editForm;
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 96f75e1..51255fb 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.inmethod.grid.IGridColumn;
import com.inmethod.grid.SizeUnit;
import com.inmethod.grid.column.PropertyColumn;
@@ -59,6 +60,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+
/**
*
* @author Shawn McKinney
@@ -66,7 +68,9 @@ import java.util.List;
*/
public class ObjectListPanel extends FormComponentPanel
{
- private static final Logger log = Logger.getLogger(ObjectListPanel.class.getName());
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = Logger.getLogger( ObjectListPanel.class.getName() );
private Form listForm;
private DefaultTreeModel treeModel;
private DefaultMutableTreeNode node;
@@ -80,40 +84,50 @@ public class ObjectListPanel extends FormComponentPanel
private static final char OUS = 'O';
private boolean isAdmin;
- public ObjectListPanel(String id, final boolean isAdmin)
+
+ public ObjectListPanel( String id, final boolean isAdmin )
{
super( id );
this.isAdmin = isAdmin;
- ObjectListModel objectListModel = new ObjectListModel( new PermObj( "" ), isAdmin, GlobalUtils.getRbacSession( this ) );
- setDefaultModel(objectListModel);
+ ObjectListModel objectListModel = new ObjectListModel( new PermObj( "" ), isAdmin,
+ GlobalUtils.getRbacSession( this ) );
+ setDefaultModel( objectListModel );
addGrid();
- radioGroup = new RadioGroup("searchOptions", new PropertyModel(this, "selectedRadioButton"));
+ radioGroup = new RadioGroup( "searchOptions", new PropertyModel( this, "selectedRadioButton" ) );
add( radioGroup );
- Radio objectRb = new Radio("objectRb", new Model(new Character(NAMES)));
- radioGroup.add(objectRb);
- Radio ouRb = new Radio("ouRb", new Model(new Character(OUS)));
- radioGroup.add(ouRb);
- addOUSearchModal(ouRb);
+ Radio objectRb = new Radio( "objectRb", new Model( new Character( NAMES ) ) );
+ radioGroup.add( objectRb );
+ Radio ouRb = new Radio( "ouRb", new Model( new Character( OUS ) ) );
+ radioGroup.add( ouRb );
+ addOUSearchModal( ouRb );
radioGroup.setOutputMarkupId( true );
radioGroup.setRenderBodyOnly( false );
- searchValFld = new TextField(GlobalIds.SEARCH_VAL, new PropertyModel<String>(this, GlobalIds.SEARCH_VAL));
+ searchValFld = new TextField( GlobalIds.SEARCH_VAL, new PropertyModel<String>( this, GlobalIds.SEARCH_VAL ) );
searchValFld.setOutputMarkupId( true );
- AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior(GlobalIds.ONBLUR)
+ AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( searchValFld );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( searchValFld );
+ }
};
- searchValFld.add(ajaxUpdater);
+ searchValFld.add( ajaxUpdater );
radioGroup.add( searchValFld );
- this.listForm.add(radioGroup);
+ this.listForm.add( radioGroup );
selectedRadioButton = NAMES;
this.listForm.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.REVIEW_MGR, "findPermObjs" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -153,18 +167,25 @@ public class ObjectListPanel extends FormComponentPanel
target.add( grid );
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( ".search.onError" );
target.add();
}
+
+
@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 )
{
@@ -176,16 +197,17 @@ public class ObjectListPanel extends FormComponentPanel
} );
}
+
@Override
- public void onEvent(IEvent event)
+ public void onEvent( IEvent event )
{
- if (event.getPayload() instanceof SaveModelEvent)
+ if ( event.getPayload() instanceof SaveModelEvent )
{
- SaveModelEvent modelEvent = (SaveModelEvent) event.getPayload();
- switch (modelEvent.getOperation())
+ SaveModelEvent modelEvent = ( SaveModelEvent ) event.getPayload();
+ switch ( modelEvent.getOperation() )
{
case ADD:
- add(modelEvent.getEntity());
+ add( modelEvent.getEntity() );
break;
case UPDATE:
modelChanged();
@@ -197,114 +219,126 @@ public class ObjectListPanel extends FormComponentPanel
log.error( "onEvent caught invalid operation" );
break;
}
- AjaxRequestTarget target = ((SaveModelEvent) event.getPayload()).getAjaxRequestTarget();
- log.debug(".onEvent AJAX - ObjectListPanel - SaveModelEvent: " + target.toString());
+ AjaxRequestTarget target = ( ( SaveModelEvent ) event.getPayload() ).getAjaxRequestTarget();
+ log.debug( ".onEvent AJAX - ObjectListPanel - SaveModelEvent: " + target.toString() );
}
}
- private void removeSelectedItems(TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid)
+
+ private void removeSelectedItems( TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid )
{
Collection<IModel<DefaultMutableTreeNode>> selected = grid.getSelectedItems();
- for (IModel<DefaultMutableTreeNode> model : selected)
+ for ( IModel<DefaultMutableTreeNode> model : selected )
{
DefaultMutableTreeNode node = model.getObject();
- treeModel.removeNodeFromParent(node);
- PermObj permObj = (PermObj) node.getUserObject();
- log.debug(".removeSelectedItems user node: " + permObj.getObjName());
- List<PermObj> permObjs = ((List<PermObj>) getDefaultModel().getObject());
- permObjs.remove(permObj.getObjName());
+ treeModel.removeNodeFromParent( node );
+ PermObj permObj = ( PermObj ) node.getUserObject();
+ log.debug( ".removeSelectedItems user node: " + permObj.getObjName() );
+ List<PermObj> permObjs = ( ( List<PermObj> ) getDefaultModel().getObject() );
+ permObjs.remove( permObj.getObjName() );
}
}
- private DefaultTreeModel createTreeModel(List<PermObj> permObjs)
+
+ private DefaultTreeModel createTreeModel( List<PermObj> permObjs )
{
DefaultTreeModel model;
- PermObj rootObject = new PermObj( );
+ PermObj rootObject = new PermObj();
//rootObject.setObjName( "Permission Objects" );
- rootNode = new DefaultMutableTreeNode(rootObject);
- model = new DefaultTreeModel(rootNode);
- if (permObjs == null)
- log.debug("no Permission Objects found");
+ rootNode = new DefaultMutableTreeNode( rootObject );
+ model = new DefaultTreeModel( rootNode );
+ if ( permObjs == null )
+ log.debug( "no Permission Objects found" );
else
{
- log.debug(".createTreeModel Permission Objects found:" + permObjs.size());
- for (PermObj permObj : permObjs)
- rootNode.add(new DefaultMutableTreeNode(permObj));
+ log.debug( ".createTreeModel Permission Objects found:" + permObjs.size() );
+ for ( PermObj permObj : permObjs )
+ rootNode.add( new DefaultMutableTreeNode( permObj ) );
}
return model;
}
+
private void addGrid()
{
List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
-
PropertyColumn objName = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Object Name"), "userObject.ObjName");
+ Model.of( "Object Name" ), "userObject.ObjName" );
objName.setInitialSize( 300 );
- columns.add(objName);
+ columns.add( objName );
PropertyColumn ou = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Perm Organization"), "userObject.Ou");
- ou.setInitialSize(200);
- columns.add(ou);
+ Model.of( "Perm Organization" ), "userObject.Ou" );
+ ou.setInitialSize( 200 );
+ columns.add( ou );
PropertyColumn description = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Description"), "userObject.Description");
+ Model.of( "Description" ), "userObject.Description" );
description.setInitialSize( 500 );
- columns.add(description);
+ columns.add( description );
- PropertyColumn type = new PropertyColumn(new Model("Type"), "userObject.Type");
+ PropertyColumn type = new PropertyColumn( new Model( "Type" ), "userObject.Type" );
type.setInitialSize( 200 );
- columns.add(type);
+ columns.add( type );
- List<PermObj> permObjs = (List<PermObj>) getDefaultModel().getObject();
- treeModel = createTreeModel(permObjs);
- grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>("objecttreegrid", treeModel, columns)
+ List<PermObj> permObjs = ( List<PermObj> ) getDefaultModel().getObject();
+ treeModel = createTreeModel( permObjs );
+ grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "objecttreegrid", 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() )
{
- PermObj permObj = (PermObj) node.getUserObject();
- log.debug("TreeGrid.addGrid.selectItem selected permission object =" + permObj.getObjName());
- if (super.isItemSelected(itemModel))
+ PermObj permObj = ( PermObj ) node.getUserObject();
+ log.debug( "TreeGrid.addGrid.selectItem selected permission object =" + permObj.getObjName() );
+ if ( super.isItemSelected( itemModel ) )
{
- log.debug("TreeGrid.addGrid.selectItem item is selected");
- super.selectItem(itemModel, false);
+ log.debug( "TreeGrid.addGrid.selectItem item is selected" );
+ super.selectItem( itemModel, false );
}
else
{
- super.selectItem(itemModel, true);
- SelectModelEvent.send(getPage(), this, permObj);
+ super.selectItem( itemModel, true );
+ SelectModelEvent.send( getPage(), this, permObj );
}
}
}
};
- 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());
- this.listForm = new Form("objectlistform");
- this.listForm.add(grid);
- add(this.listForm);
- grid.setOutputMarkupId(true);
+ grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ this.listForm = new Form( "objectlistform" );
+ this.listForm.add( grid );
+ add( this.listForm );
+ grid.setOutputMarkupId( true );
}
- private void addOUSearchModal(Radio ouRb)
+
+ private void addOUSearchModal( Radio ouRb )
{
final ModalWindow ousModalWindow;
listForm.add( ousModalWindow = new ModalWindow( "ousearchmodal" ) );
- final OUSearchModalPanel ouSearchModalPanel = new OUSearchModalPanel( ousModalWindow.getContentId(), ousModalWindow, false );
+ final OUSearchModalPanel ouSearchModalPanel = new OUSearchModalPanel( ousModalWindow.getContentId(),
+ ousModalWindow, false );
ousModalWindow.setContent( ouSearchModalPanel );
ousModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -320,7 +354,11 @@ public class ObjectListPanel extends FormComponentPanel
ouRb.add( new SecureIndicatingAjaxLink( "ouAssignLinkLbl", GlobalIds.DEL_REVIEW_MGR, "searchOU" )
{
- public void onClick(AjaxRequestTarget target)
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ public void onClick( AjaxRequestTarget target )
{
String msg = "clicked on ou search";
msg += "ouSelection: " + searchVal;
@@ -329,12 +367,18 @@ public class ObjectListPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
ousModalWindow.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 )
{
@@ -343,7 +387,7 @@ public class ObjectListPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
ousModalWindow.setTitle( "Permission Object Organizational Unit Search Modal" );
ousModalWindow.setInitialWidth( 450 );
@@ -351,19 +395,21 @@ public class ObjectListPanel extends FormComponentPanel
ousModalWindow.setCookieName( "permou-modal" );
}
- public void add(FortEntity entity)
+
+ public void add( FortEntity entity )
{
- if (getDefaultModelObject() != null)
+ if ( getDefaultModelObject() != null )
{
- List<PermObj> permObjs = ((List<PermObj>) getDefaultModelObject());
+ List<PermObj> permObjs = ( ( List<PermObj> ) getDefaultModelObject() );
permObjs.add( ( PermObj ) entity );
- treeModel.insertNodeInto(new DefaultMutableTreeNode(entity), rootNode, 0);
+ treeModel.insertNodeInto( new DefaultMutableTreeNode( entity ), rootNode, 0 );
//treeModel.insertNodeInto(new DefaultMutableTreeNode(entity), rootNode, permObjs.size());
}
}
+
public void prune()
{
- removeSelectedItems(grid);
+ removeSelectedItems( grid );
}
}
\ 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/ObjectSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java
index d52001b..99c64dc 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import java.util.List;
import org.apache.log4j.Logger;
@@ -38,6 +39,7 @@ import org.apache.directory.fortress.web.GlobalUtils;
import org.apache.directory.fortress.core.ReviewMgr;
import org.apache.directory.fortress.core.rbac.PermObj;
+
/**
*
* @author Shawn McKinney
@@ -45,14 +47,17 @@ import org.apache.directory.fortress.core.rbac.PermObj;
*/
public class ObjectSearchModalPanel extends Panel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private ReviewMgr reviewMgr;
- private static final Logger LOG = Logger.getLogger(ObjectSearchModalPanel.class.getName());
+ private static final Logger LOG = Logger.getLogger( ObjectSearchModalPanel.class.getName() );
private ModalWindow window;
private PermObj objectSelection;
private String objectSearchVal;
private boolean isAdmin;
+
/**
* @param id
*/
@@ -64,6 +69,7 @@ public class ObjectSearchModalPanel extends Panel
loadPanel();
}
+
public void loadPanel()
{
LoadableDetachableModel requests = getListViewModel();
@@ -72,10 +78,15 @@ public class ObjectSearchModalPanel extends Panel
add( new AjaxPagingNavigator( "navigator", ouView ) );
}
+
private PageableListView createListView( final LoadableDetachableModel requests )
{
final PageableListView listView = new PageableListView( "dataview", requests, 16 )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void populateItem( final ListItem item )
{
@@ -84,8 +95,9 @@ public class ObjectSearchModalPanel extends Panel
{
private static final long serialVersionUID = 1L;
+
@Override
- public void onClick(AjaxRequestTarget target)
+ public void onClick( AjaxRequestTarget target )
{
objectSelection = modelObject;
window.close( target );
@@ -100,10 +112,15 @@ public class ObjectSearchModalPanel extends Panel
return listView;
}
+
private LoadableDetachableModel getListViewModel()
{
final LoadableDetachableModel ret = new LoadableDetachableModel()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected Object load()
{
@@ -111,7 +128,7 @@ public class ObjectSearchModalPanel extends Panel
try
{
objectSelection = null;
- if(objectSearchVal == null)
+ if ( objectSearchVal == null )
objectSearchVal = "";
PermObj permObj = new PermObj( objectSearchVal );
@@ -129,16 +146,19 @@ public class ObjectSearchModalPanel extends Panel
return ret;
}
+
public void setAdmin( boolean admin )
{
isAdmin = admin;
}
+
public PermObj getSelection()
{
return objectSelection;
}
+
public void setSearchVal( String objectSearchVal )
{
this.objectSearchVal = objectSearchVal;
[06/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
Posted by el...@apache.org.
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 8d9a5f6..e9ebde9 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
@@ -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.ColumnButton;
import com.googlecode.wicket.kendo.ui.datatable.DataTable;
@@ -66,6 +67,8 @@ import java.util.List;
*/
public class GroupDetailPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
@SpringBean
private GroupMgr groupMgr;
private static final Logger log = Logger.getLogger( GroupDetailPanel.class.getName() );
@@ -73,11 +76,13 @@ public class GroupDetailPanel extends FormComponentPanel
private Displayable display;
public static final int ROWS = 5;
+
public Form getForm()
{
return this.editForm;
}
+
public GroupDetailPanel( String id, Displayable display )
{
super( id );
@@ -91,6 +96,8 @@ public class GroupDetailPanel extends FormComponentPanel
public class GroupDetailForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private Component component;
private DataTable<Member> table;
private List<IColumn> columns;
@@ -100,6 +107,7 @@ public class GroupDetailPanel extends FormComponentPanel
private ComboBox<String> memberPropsCB;
private String memberPropsSelection;
+
public GroupDetailForm( String id, final IModel<Group> model )
{
super( id, model );
@@ -108,6 +116,7 @@ public class GroupDetailPanel extends FormComponentPanel
setOutputMarkupId( true );
}
+
private void addGroupDetailFields()
{
add( new Label( "groupAssignmentsLabel", "Group Detail" ) );
@@ -120,7 +129,8 @@ public class GroupDetailPanel extends FormComponentPanel
description.setRequired( false );
add( description );
protocol.setRequired( true );
- memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>( this, "memberPropsSelection" ), new ArrayList<String>() );
+ memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>( this,
+ "memberPropsSelection" ), new ArrayList<String>() );
memberPropsCB.setOutputMarkupId( true );
add( memberPropsCB );
@@ -132,8 +142,8 @@ public class GroupDetailPanel extends FormComponentPanel
// DataTable //
columns = newColumnList();
options = new Options();
- options.set("selectable", Options.asString("single"));
- options.set("scrollable", "{ virtual: true }"); //infinite scroll
+ options.set( "selectable", Options.asString( "single" ) );
+ 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 );
@@ -141,17 +151,22 @@ public class GroupDetailPanel extends FormComponentPanel
add( table );
}
+
private void addGroupButtons()
{
add( new SecureIndicatingAjaxButton( GlobalIds.ADD, GlobalIds.GROUP_MGR, "add" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
log.debug( ".onSubmit Add" );
Group group = ( Group ) form.getModel().getObject();
String msg = null;
- if(!VUtil.isNotNullOrEmpty( memberAssign ) && !VUtil.isNotNullOrEmpty( group.getMembers() ))
+ if ( !VUtil.isNotNullOrEmpty( memberAssign ) && !VUtil.isNotNullOrEmpty( group.getMembers() ) )
{
msg = "Group name: " + group.getName() + " cannot be added without a member";
}
@@ -159,7 +174,7 @@ public class GroupDetailPanel extends FormComponentPanel
{
try
{
- if(VUtil.isNotNullOrEmpty( memberAssign ))
+ if ( VUtil.isNotNullOrEmpty( memberAssign ) )
{
group.setMember( memberAssign );
}
@@ -179,18 +194,25 @@ public class GroupDetailPanel extends FormComponentPanel
display.setMessage( msg );
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.info( "GroupDetailPanel.add.onError caught" );
target.add();
}
+
+
@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 )
{
@@ -202,6 +224,10 @@ public class GroupDetailPanel extends FormComponentPanel
} );
add( new SecureIndicatingAjaxButton( GlobalIds.COMMIT, GlobalIds.GROUP_MGR, "update" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -223,17 +249,24 @@ public class GroupDetailPanel extends FormComponentPanel
}
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "GroupDetailPanel.commit.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 )
{
@@ -245,6 +278,10 @@ public class GroupDetailPanel extends FormComponentPanel
} );
add( new SecureIndicatingAjaxButton( GlobalIds.DELETE, GlobalIds.GROUP_MGR, "delete" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -264,17 +301,24 @@ public class GroupDetailPanel extends FormComponentPanel
}
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "GroupDetailPanel.delete.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 )
{
@@ -286,23 +330,34 @@ public class GroupDetailPanel extends FormComponentPanel
} );
add( new AjaxSubmitLink( GlobalIds.CANCEL )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
clearDetailFields( "Group cancelled input form", target, form );
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "GroupDetailPanel.cancel.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 )
{
@@ -317,6 +372,7 @@ public class GroupDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -329,17 +385,19 @@ public class GroupDetailPanel extends FormComponentPanel
if ( idx != -1 )
{
String key = memberPropsSelection.substring( 0, idx );
- String val = memberPropsSelection.substring( idx + 1);
+ String val = memberPropsSelection.substring( idx + 1 );
try
{
Group newGroup = groupMgr.add( group, key, val );
group.setProperties( newGroup.getProperties() );
- memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>( form, "memberPropsSelection" ), group.getPropList() );
+ memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>( form,
+ "memberPropsSelection" ), group.getPropList() );
form.addOrReplace( memberPropsCB );
}
- catch( org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
- String error = "Failed add property: " + memberPropsSelection + ", SecurityException=" + se;
+ String error = "Failed add property: " + memberPropsSelection + ", SecurityException="
+ + se;
log.warn( error );
display.setMessage( error );
}
@@ -355,12 +413,18 @@ public class GroupDetailPanel extends FormComponentPanel
display.setMessage( msg );
log.debug( msg );
}
+
+
@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 )
{
@@ -375,6 +439,7 @@ public class GroupDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -389,17 +454,19 @@ public class GroupDetailPanel extends FormComponentPanel
if ( idx != -1 )
{
String key = memberPropsSelection.substring( 0, idx );
- String val = memberPropsSelection.substring( idx + 1);
+ String val = memberPropsSelection.substring( idx + 1 );
try
{
Group newGroup = groupMgr.delete( group, key, val );
group.setProperties( newGroup.getProperties() );
- memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>( form, "memberPropsSelection" ), group.getPropList() );
+ memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>(
+ form, "memberPropsSelection" ), group.getPropList() );
form.addOrReplace( memberPropsCB );
}
- catch( org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
- String error = "Failed delete property: " + memberPropsSelection + ", SecurityException=" + se;
+ String error = "Failed delete property: " + memberPropsSelection
+ + ", SecurityException=" + se;
log.warn( error );
display.setMessage( error );
}
@@ -420,12 +487,18 @@ public class GroupDetailPanel extends FormComponentPanel
display.setMessage( msg );
log.debug( msg );
}
+
+
@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 )
{
@@ -440,11 +513,12 @@ public class GroupDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
Group group = ( Group ) form.getModel().getObject();
- if( VUtil.isNotNullOrEmpty( memberAssign ) )
+ if ( VUtil.isNotNullOrEmpty( memberAssign ) )
{
try
{
@@ -453,14 +527,15 @@ public class GroupDetailPanel extends FormComponentPanel
Group newGroup = groupMgr.assign( group, userId );
group.setMembers( newGroup.getMembers() );
- String msg = "Group: " + group.getName() + ", member: " + memberAssign + ", has been assigned";
+ String msg = "Group: " + group.getName() + ", member: " + memberAssign
+ + ", has been assigned";
memberAssign = "";
form.add( memberAssignTF );
addMemberTable( group );
display.setMessage( msg );
log.debug( msg );
}
- catch( org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = "Failed assign user: " + memberAssign + ", SecurityException=" + se;
log.warn( error );
@@ -469,18 +544,25 @@ public class GroupDetailPanel extends FormComponentPanel
}
else
{
- String msg = "Group: " + group.getName() + ", assign op ignored, no value entered for assignment";
+ String msg = "Group: " + group.getName()
+ + ", assign op ignored, no value entered for assignment";
display.setMessage( msg );
log.debug( msg );
}
component = editForm;
}
+
+
@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 )
{
@@ -492,10 +574,12 @@ public class GroupDetailPanel extends FormComponentPanel
} );
}
+
private void clearDetailFields( String msg, AjaxRequestTarget target, Form form )
{
setModelObject( new Group() );
- memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>( form, "memberPropsSelection" ), new ArrayList<String>() );
+ memberPropsCB = new ComboBox<String>( "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 );
@@ -505,25 +589,29 @@ public class GroupDetailPanel extends FormComponentPanel
display.setMessage( msg );
}
+
private List<IColumn> newColumnList()
{
List<IColumn> columns = new ArrayList<IColumn>();
columns.add( new PropertyColumn( "#", "index", 30 ) );
columns.add( new PropertyColumn( "User DN", "userDn", 150 ) );
- columns.add(new CommandsColumn("", 100) {
+ columns.add( new CommandsColumn( "", 100 )
+ {
private static final long serialVersionUID = 1L;
+
@Override
public List<ColumnButton> newButtons()
{
return Arrays.asList( new ColumnButton( "remove", "userDn" ) );
}
- });
+ } );
return columns;
}
+
private IDataProvider<Member> createDataProvider( List<String> members )
{
ListDataProvider<Member> results;
@@ -531,7 +619,7 @@ public class GroupDetailPanel extends FormComponentPanel
{
int ctr = 0;
List<Member> tableMembers = new ArrayList<Member>();
- for(String member : members)
+ for ( String member : members )
{
Member tableMember = new Member();
tableMember.setUserDn( member );
@@ -547,14 +635,20 @@ public class GroupDetailPanel extends FormComponentPanel
return results;
}
+
private void addUserSearchModal()
{
final ModalWindow membersModalWindow;
add( membersModalWindow = new ModalWindow( "membersmodal" ) );
- final UserSearchModalPanel memberSearchModalPanel = new UserSearchModalPanel( membersModalWindow.getContentId(), membersModalWindow );
+ final UserSearchModalPanel memberSearchModalPanel = new UserSearchModalPanel(
+ membersModalWindow.getContentId(), membersModalWindow );
membersModalWindow.setContent( memberSearchModalPanel );
membersModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -571,6 +665,7 @@ public class GroupDetailPanel extends FormComponentPanel
{
private static final long serialVersionUID = 1L;
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
@@ -578,20 +673,25 @@ public class GroupDetailPanel extends FormComponentPanel
msg += memberAssign != null ? ": " + memberAssign : "";
display.setMessage( msg );
log.debug( msg );
- if(VUtil.isNotNullOrEmpty( memberAssign ))
+ if ( VUtil.isNotNullOrEmpty( memberAssign ) )
{
- memberSearchModalPanel.setSearchVal(memberAssign);
+ memberSearchModalPanel.setSearchVal( memberAssign );
}
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
membersModalWindow.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 )
{
@@ -608,6 +708,7 @@ public class GroupDetailPanel extends FormComponentPanel
membersModalWindow.setCookieName( "members-modal" );
}
+
@Override
public void onEvent( final IEvent<?> event )
{
@@ -615,12 +716,13 @@ public class GroupDetailPanel extends FormComponentPanel
{
SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
final Group group = ( Group ) modelEvent.getEntity();
- this.setModelObject(group);
+ this.setModelObject( group );
memberPropsSelection = "";
- if(VUtil.isNotNullOrEmpty(group.getProperties()))
+ if ( VUtil.isNotNullOrEmpty( group.getProperties() ) )
{
- memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>( this, "memberPropsSelection" ), group.getPropList() );
- editForm.addOrReplace(memberPropsCB);
+ memberPropsCB = new ComboBox<String>( "memberProps", new PropertyModel<String>( this,
+ "memberPropsSelection" ), group.getPropList() );
+ editForm.addOrReplace( memberPropsCB );
}
addMemberTable( group );
String msg = "Group Name: " + group.getName() + " has been selected";
@@ -632,7 +734,7 @@ public class GroupDetailPanel extends FormComponentPanel
{
if ( component != null )
{
- AjaxRequestTarget target = ( ( AjaxRequestTarget ) event.getPayload() );
+ AjaxRequestTarget target = ( ( AjaxRequestTarget ) event.getPayload() );
log.debug( ".onEvent AjaxRequestTarget: " + target.toString() );
target.add( component );
component = null;
@@ -642,18 +744,23 @@ public class GroupDetailPanel extends FormComponentPanel
}
}
+
private void addMemberTable( final Group group )
{
table = new DataTable<Member>( "memberstable", columns, createDataProvider( group.getMembers() ), ROWS,
options )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
/**
* Triggered when a column button is clicked.
*/
@Override
- public void onClick(AjaxRequestTarget target, ColumnButton button, String value)
+ public void onClick( AjaxRequestTarget target, ColumnButton button, String value )
{
- if( VUtil.isNotNullOrEmpty( value ) )
+ if ( VUtil.isNotNullOrEmpty( value ) )
{
try
{
@@ -666,7 +773,7 @@ public class GroupDetailPanel extends FormComponentPanel
display.setMessage( msg );
log.debug( msg );
}
- catch( org.apache.directory.fortress.core.SecurityException se)
+ catch ( org.apache.directory.fortress.core.SecurityException se )
{
String error = "Failed deassign user: " + value + ", SecurityException=" + se;
log.warn( error );
@@ -679,21 +786,25 @@ public class GroupDetailPanel extends FormComponentPanel
addOrReplace( table );
}
+
public String getMemberAssign()
{
return memberAssign;
}
+
public void setMemberAssign( String memberAssign )
{
this.memberAssign = memberAssign;
}
+
public String getMemberPropsSelection()
{
return memberPropsSelection;
}
+
public void setMemberPropsSelection( String memberPropsSelection )
{
this.memberPropsSelection = memberPropsSelection;
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/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 148a163..4c31e57 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
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import com.inmethod.grid.IGridColumn;
import com.inmethod.grid.SizeUnit;
import com.inmethod.grid.column.PropertyColumn;
@@ -59,6 +60,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+
/**
*
* @author Shawn McKinney
@@ -66,7 +68,9 @@ import java.util.List;
*/
public class GroupListPanel extends FormComponentPanel
{
- private static final Logger log = Logger.getLogger(GroupListPanel.class.getName());
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = Logger.getLogger( GroupListPanel.class.getName() );
private Form listForm;
private DefaultTreeModel treeModel;
private DefaultMutableTreeNode node;
@@ -79,39 +83,48 @@ public class GroupListPanel extends FormComponentPanel
private static final char NAMES = 'N';
private static final char MEMBERS = 'M';
- public GroupListPanel(String id)
+
+ public GroupListPanel( String id )
{
super( id );
GroupListModel groupListModel = new GroupListModel( new Group( "" ), GlobalUtils.getRbacSession( this ) );
- setDefaultModel(groupListModel);
+ setDefaultModel( groupListModel );
addGrid();
- radioGroup = new RadioGroup("searchOptions", new PropertyModel(this, "selectedRadioButton"));
+ radioGroup = new RadioGroup( "searchOptions", new PropertyModel( this, "selectedRadioButton" ) );
add( radioGroup );
- Radio groupRb = new Radio("groupRb", new Model(new Character(NAMES)));
- radioGroup.add(groupRb);
- Radio memberRb = new Radio("memberRb", new Model(new Character(MEMBERS)));
- radioGroup.add(memberRb);
+ Radio groupRb = new Radio( "groupRb", new Model( new Character( NAMES ) ) );
+ radioGroup.add( groupRb );
+ Radio memberRb = new Radio( "memberRb", new Model( new Character( MEMBERS ) ) );
+ radioGroup.add( memberRb );
addMemberSearchModal( memberRb );
radioGroup.setOutputMarkupId( true );
radioGroup.setRenderBodyOnly( false );
- searchValFld = new TextField(GlobalIds.SEARCH_VAL, new PropertyModel<String>(this, GlobalIds.SEARCH_VAL));
+ searchValFld = new TextField( GlobalIds.SEARCH_VAL, new PropertyModel<String>( this, GlobalIds.SEARCH_VAL ) );
searchValFld.setOutputMarkupId( true );
- AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior(GlobalIds.ONBLUR)
+ AjaxFormComponentUpdatingBehavior ajaxUpdater = new AjaxFormComponentUpdatingBehavior( GlobalIds.ONBLUR )
{
- @Override
- protected void onUpdate(final AjaxRequestTarget target)
- {
- target.add( searchValFld );
- }
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ @Override
+ protected void onUpdate( final AjaxRequestTarget target )
+ {
+ target.add( searchValFld );
+ }
};
- searchValFld.add(ajaxUpdater);
+ searchValFld.add( ajaxUpdater );
radioGroup.add( searchValFld );
- this.listForm.add(radioGroup);
+ this.listForm.add( radioGroup );
selectedRadioButton = NAMES;
this.listForm.add( new SecureIndicatingAjaxButton( GlobalIds.SEARCH, GlobalIds.GROUP_MGR, "find" )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
protected void onSubmit( AjaxRequestTarget target, Form form )
{
@@ -150,18 +163,25 @@ public class GroupListPanel extends FormComponentPanel
target.add( grid );
}
+
@Override
public void onError( AjaxRequestTarget target, Form form )
{
log.warn( ".search.onError" );
target.add();
}
+
+
@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 )
{
@@ -173,16 +193,17 @@ public class GroupListPanel extends FormComponentPanel
} );
}
+
@Override
- public void onEvent(IEvent event)
+ public void onEvent( IEvent event )
{
- if (event.getPayload() instanceof SaveModelEvent)
+ if ( event.getPayload() instanceof SaveModelEvent )
{
- SaveModelEvent modelEvent = (SaveModelEvent) event.getPayload();
- switch (modelEvent.getOperation())
+ SaveModelEvent modelEvent = ( SaveModelEvent ) event.getPayload();
+ switch ( modelEvent.getOperation() )
{
case ADD:
- add(modelEvent.getEntity());
+ add( modelEvent.getEntity() );
break;
case UPDATE:
//modelEvent.
@@ -195,108 +216,120 @@ public class GroupListPanel extends FormComponentPanel
log.error( "onEvent caught invalid operation" );
break;
}
- AjaxRequestTarget target = ((SaveModelEvent) event.getPayload()).getAjaxRequestTarget();
- log.debug(".onEvent AJAX - GroupListPanel - SaveModelEvent: " + target.toString());
+ AjaxRequestTarget target = ( ( SaveModelEvent ) event.getPayload() ).getAjaxRequestTarget();
+ log.debug( ".onEvent AJAX - GroupListPanel - SaveModelEvent: " + target.toString() );
}
}
- private void removeSelectedItems(TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid)
+
+ private void removeSelectedItems( TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String> grid )
{
Collection<IModel<DefaultMutableTreeNode>> selected = grid.getSelectedItems();
- for (IModel<DefaultMutableTreeNode> model : selected)
+ for ( IModel<DefaultMutableTreeNode> model : selected )
{
DefaultMutableTreeNode node = model.getObject();
- treeModel.removeNodeFromParent(node);
- Group group = (Group) node.getUserObject();
- log.debug(".removeSelectedItems user node: " + group.getName());
+ treeModel.removeNodeFromParent( node );
+ Group group = ( Group ) node.getUserObject();
+ log.debug( ".removeSelectedItems user node: " + group.getName() );
//List<Group> groups = ((List<Group>) getDefaultModel().getObject());
//groups.remove(group.getName());
}
}
- private DefaultTreeModel createTreeModel(List<Group> groups)
+
+ private DefaultTreeModel createTreeModel( List<Group> groups )
{
DefaultTreeModel model;
- Group rootObject = new Group( );
- rootNode = new DefaultMutableTreeNode(rootObject);
- model = new DefaultTreeModel(rootNode);
- if (groups == null)
- log.debug("no Groups found");
+ Group rootObject = new Group();
+ rootNode = new DefaultMutableTreeNode( rootObject );
+ model = new DefaultTreeModel( rootNode );
+ if ( groups == null )
+ log.debug( "no Groups found" );
else
{
- log.debug(".createTreeModel Groups found:" + groups.size());
- for (Group group : groups)
- rootNode.add(new DefaultMutableTreeNode(group));
+ log.debug( ".createTreeModel Groups found:" + groups.size() );
+ for ( Group group : groups )
+ rootNode.add( new DefaultMutableTreeNode( group ) );
}
return model;
}
+
private void addGrid()
{
List<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>> columns =
new ArrayList<IGridColumn<DefaultTreeModel, DefaultMutableTreeNode, String>>();
-
PropertyColumn groupName = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Group Name"), "userObject.Name");
+ Model.of( "Group Name" ), "userObject.Name" );
groupName.setInitialSize( 400 );
- columns.add(groupName);
+ columns.add( groupName );
PropertyColumn description = new PropertyColumn<DefaultTreeModel, DefaultMutableTreeNode, String, String>(
- Model.of("Description"), "userObject.Description");
+ Model.of( "Description" ), "userObject.Description" );
description.setInitialSize( 400 );
- columns.add(description);
+ columns.add( description );
- PropertyColumn protocol = new PropertyColumn(new Model("Protocol"), "userObject.Protocol");
+ PropertyColumn protocol = new PropertyColumn( new Model( "Protocol" ), "userObject.Protocol" );
protocol.setInitialSize( 400 );
- columns.add(protocol);
+ columns.add( protocol );
- List<Group> groups = (List<Group>) getDefaultModel().getObject();
- treeModel = createTreeModel(groups);
- grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>("grouptreegrid", treeModel, columns)
+ List<Group> groups = ( List<Group> ) getDefaultModel().getObject();
+ treeModel = createTreeModel( groups );
+ grid = new TreeGrid<DefaultTreeModel, DefaultMutableTreeNode, String>( "grouptreegrid", 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() )
{
- Group group = (Group) node.getUserObject();
- log.debug("TreeGrid.addGrid.selectItem selected group =" + group.getName());
- if (super.isItemSelected(itemModel))
+ Group group = ( Group ) node.getUserObject();
+ log.debug( "TreeGrid.addGrid.selectItem selected group =" + group.getName() );
+ if ( super.isItemSelected( itemModel ) )
{
- log.debug("TreeGrid.addGrid.selectItem item is selected");
- super.selectItem(itemModel, false);
+ log.debug( "TreeGrid.addGrid.selectItem item is selected" );
+ super.selectItem( itemModel, false );
}
else
{
- super.selectItem(itemModel, true);
- SelectModelEvent.send(getPage(), this, group);
+ super.selectItem( itemModel, true );
+ SelectModelEvent.send( getPage(), this, group );
}
}
}
};
- 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());
- this.listForm = new Form("grouplistform");
- this.listForm.add(grid);
- add(this.listForm);
- grid.setOutputMarkupId(true);
+ grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ this.listForm = new Form( "grouplistform" );
+ this.listForm.add( grid );
+ add( this.listForm );
+ grid.setOutputMarkupId( true );
}
+
private void addMemberSearchModal( Radio memberRb )
{
final ModalWindow memberModalWindow;
listForm.add( memberModalWindow = new ModalWindow( "membersearchmodal" ) );
- final UserSearchModalPanel userSearchModalPanel = new UserSearchModalPanel( memberModalWindow.getContentId(), memberModalWindow );
+ final UserSearchModalPanel userSearchModalPanel = new UserSearchModalPanel( memberModalWindow.getContentId(),
+ memberModalWindow );
memberModalWindow.setContent( userSearchModalPanel );
memberModalWindow.setWindowClosedCallback( new ModalWindow.WindowClosedCallback()
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onClose( AjaxRequestTarget target )
{
@@ -312,7 +345,11 @@ public class GroupListPanel extends FormComponentPanel
memberRb.add( new SecureIndicatingAjaxLink( "memberAssignLinkLbl", GlobalIds.REVIEW_MGR, "findUsers" )
{
- public void onClick(AjaxRequestTarget target)
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ public void onClick( AjaxRequestTarget target )
{
String msg = "clicked on ou search";
msg += "memberSelection: " + searchVal;
@@ -321,12 +358,18 @@ public class GroupListPanel extends FormComponentPanel
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
memberModalWindow.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 )
{
@@ -335,7 +378,7 @@ public class GroupListPanel extends FormComponentPanel
};
attributes.getAjaxCallListeners().add( ajaxCallListener );
}
- });
+ } );
memberModalWindow.setTitle( "Member Search Modal" );
memberModalWindow.setInitialWidth( 450 );
@@ -343,18 +386,20 @@ public class GroupListPanel extends FormComponentPanel
memberModalWindow.setCookieName( "member-modal" );
}
- public void add(FortEntity entity)
+
+ public void add( FortEntity entity )
{
- if (getDefaultModelObject() != null)
+ if ( getDefaultModelObject() != null )
{
//List<Group> groups = ((List<Group>) getDefaultModelObject());
//groups.add( ( Group ) entity );
- treeModel.insertNodeInto(new DefaultMutableTreeNode(entity), rootNode, 0);
+ treeModel.insertNodeInto( new DefaultMutableTreeNode( entity ), rootNode, 0 );
}
}
+
public void prune()
{
- removeSelectedItems(grid);
+ removeSelectedItems( grid );
}
}
\ 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/InfoPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/InfoPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/InfoPanel.java
index 741b380..1ac9b3f 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/InfoPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/InfoPanel.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import org.apache.log4j.Logger;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
@@ -36,27 +37,33 @@ import org.apache.wicket.markup.html.basic.Label;
*/
public class InfoPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private static final String CLS_NM = InfoPanel.class.getName();
private static final Logger log = Logger.getLogger( CLS_NM );
private Form infoForm;
+
public Displayable getDisplay()
{
return ( Displayable ) this.infoForm;
}
+
public InfoPanel( String id )
{
super( id );
init( "ready to accept input" );
}
+
public InfoPanel( String id, String msg )
{
super( id );
init( msg );
}
+
private void init( String msg )
{
this.infoForm = new InfoForm( "infoFields", msg );
@@ -66,22 +73,27 @@ public class InfoPanel extends FormComponentPanel
public class InfoForm extends Form implements Displayable
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private Label infoTextField;
private FeedbackPanel feedbackPanel;
private String infoField;
+
@Override
public void onError()
{
log.debug( "InfoPanel.onError" );
}
+
@Override
public void onSubmit()
{
log.debug( "InfoPanel.onSubmit message: " + infoField );
}
+
public InfoForm( String id, final String message )
{
super( id );
@@ -95,12 +107,14 @@ public class InfoPanel extends FormComponentPanel
add( feedbackPanel );
}
+
@Override
public void setMessage( String message )
{
infoField = message;
}
+
@Override
public void display()
{
@@ -109,6 +123,7 @@ public class InfoPanel extends FormComponentPanel
add( feedbackPanel );
}
+
@Override
public void display( AjaxRequestTarget target )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/panel/JpegImage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/JpegImage.java b/src/main/java/org/apache/directory/fortress/web/panel/JpegImage.java
index a039d85..c5b59df 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/JpegImage.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/JpegImage.java
@@ -20,10 +20,12 @@
package org.apache.directory.fortress.web.panel;
+
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.request.resource.DynamicImageResource;
import org.apache.wicket.request.resource.IResource;
+
/**
*
* @author Shawn McKinney
@@ -31,16 +33,26 @@ import org.apache.wicket.request.resource.IResource;
*/
public abstract class JpegImage extends Image
{
- public JpegImage(String id)
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ public JpegImage( String id )
{
- super(id);
- setImageResource(new DynamicImageResource()
+ super( id );
+ setImageResource( new DynamicImageResource()
{
- protected byte[] getImageData(IResource.Attributes attributes)
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
+ protected byte[] getImageData( IResource.Attributes attributes )
{
return getPhoto();
}
- });
+ } );
}
+
+
protected abstract byte[] getPhoto();
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/panel/Member.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/Member.java b/src/main/java/org/apache/directory/fortress/web/panel/Member.java
index 8564f42..1d33ebe 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/Member.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/Member.java
@@ -20,8 +20,10 @@
package org.apache.directory.fortress.web.panel;
+
import java.io.Serializable;
+
/**
* Created with IntelliJ IDEA.
* User: smckinn
@@ -31,24 +33,30 @@ import java.io.Serializable;
*/
public class Member implements Serializable
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
private String userDn;
private int index;
+
public String getUserDn()
{
return userDn;
}
+
public void setUserDn( String userDn )
{
this.userDn = userDn;
}
+
public int getIndex()
{
return index;
}
+
public void setIndex( int index )
{
this.index = index;
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/panel/NavPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/NavPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/NavPanel.java
index 95c7621..57ba55d 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/NavPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/NavPanel.java
@@ -20,6 +20,7 @@
package org.apache.directory.fortress.web.panel;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
@@ -46,6 +47,7 @@ import org.apache.directory.fortress.web.SdStaticPage;
import org.apache.directory.fortress.web.SecureIndicatingAjaxButton;
import org.apache.directory.fortress.web.UserPage;
+
/**
* @author Shawn McKinney
* @version $Rev$
@@ -53,6 +55,9 @@ import org.apache.directory.fortress.web.UserPage;
*/
public class NavPanel extends FormComponentPanel
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
public NavPanel( String id )
{
@@ -63,23 +68,36 @@ public class NavPanel extends FormComponentPanel
public class NavForm extends Form
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
public NavForm( String id )
{
super( id );
add( new SecureIndicatingAjaxButton( GlobalIds.USERS_PAGE, GlobalIds.ROLE_USERS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( UserPage.class );
}
+
@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 )
{
@@ -92,18 +110,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.ROLES_PAGE, GlobalIds.ROLE_ROLES )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( RolePage.class );
}
+
@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 )
{
@@ -119,18 +146,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.POBJS_PAGE, GlobalIds.ROLE_PERMOBJS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( ObjectPage.class, parameters );
}
+
@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 )
{
@@ -145,18 +181,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.PERMS_PAGE, GlobalIds.ROLE_PERMS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( PermPage.class );
}
+
@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 )
{
@@ -171,18 +216,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.PWPOLICIES_PAGE, GlobalIds.ROLE_POLICIES )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( PwPolicyPage.class );
}
+
@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 )
{
@@ -197,18 +251,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.SSDS_PAGE, GlobalIds.ROLE_SSDS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( SdStaticPage.class );
}
+
@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 )
{
@@ -223,18 +286,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.DSDS_PAGE, GlobalIds.ROLE_DSDS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( SdDynamicPage.class );
}
+
@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 )
{
@@ -249,18 +321,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.USEROUS_PAGE, GlobalIds.ROLE_USEROUS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( OuUserPage.class );
}
+
@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,18 +356,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.PERMOUS_PAGE, GlobalIds.ROLE_PERMOUS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( OuPermPage.class );
}
+
@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 )
{
@@ -301,18 +391,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.ADMROLES_PAGE, GlobalIds.ROLE_ADMINROLES )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( RoleAdminPage.class );
}
+
@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 )
{
@@ -327,18 +426,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.ADMPOBJS_PAGE, GlobalIds.ROLE_ADMINOBJS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( ObjectAdminPage.class );
}
+
@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 )
{
@@ -353,18 +461,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.ADMPERMS_PAGE, GlobalIds.ROLE_ADMINPERMS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( PermAdminPage.class );
}
+
@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 )
{
@@ -379,18 +496,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.GROUP_PAGE, GlobalIds.ROLE_GROUPS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( GroupPage.class );
}
+
@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 )
{
@@ -405,18 +531,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.AUDIT_BINDS_PAGE, GlobalIds.ROLE_AUDIT_BINDS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( AuditBindPage.class );
}
+
@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 )
{
@@ -431,18 +566,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.AUDIT_AUTHZS_PAGE, GlobalIds.ROLE_AUDIT_AUTHZS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( AuditAuthzPage.class );
}
+
@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 )
{
@@ -457,18 +601,27 @@ public class NavPanel extends FormComponentPanel
add( new SecureIndicatingAjaxButton( GlobalIds.AUDIT_MODS_PAGE, GlobalIds.ROLE_AUDIT_MODS )
{
+ /** Default serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+
@Override
public void onSubmit( AjaxRequestTarget target, Form<?> form )
{
setResponsePage( AuditModPage.class );
}
+
@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 )
{
@@ -482,44 +635,44 @@ public class NavPanel extends FormComponentPanel
);
//@Authorizable
- /*
- add( new SecureIndicatingAjaxButton( "test", GlobalIds.ADMIN_MGR, "test")
+ /*
+ add( new SecureIndicatingAjaxButton( "test", GlobalIds.ADMIN_MGR, "test")
+ {
+ @Override
+ public void onSubmit( AjaxRequestTarget target, Form<?> form )
+ {
+ // sleep for 5 seconds to show off the busy indicator
+ try
+ {
+ Thread.sleep( 5000 );
+ }
+ catch ( InterruptedException e )
+ {
+ // noop
+ }
+ }
+ }.setPosition( IndicatingAjaxButton.Position.RIGHT));
+ */
+ /*
+ add( new SecureIndicatingAjaxButton("test" )
{
- @Override
- public void onSubmit( AjaxRequestTarget target, Form<?> form )
+ @Override public void onSubmit ( AjaxRequestTarget target, Form < ?>form)
{
// sleep for 5 seconds to show off the busy indicator
try
{
- Thread.sleep( 5000 );
+ TestAuthorization testSecurity = new TestAuthorization();
+ boolean result = testSecurity.checkAccess( GlobalUtils.getRbacSession( this ), "foo", "fighters" );
+ Thread.sleep( 1000 );
}
catch ( InterruptedException e )
{
// noop
}
}
- }.setPosition( IndicatingAjaxButton.Position.RIGHT));
- */
- /*
- add( new SecureIndicatingAjaxButton("test" )
- {
- @Override public void onSubmit ( AjaxRequestTarget target, Form < ?>form)
- {
- // sleep for 5 seconds to show off the busy indicator
- try
- {
- TestAuthorization testSecurity = new TestAuthorization();
- boolean result = testSecurity.checkAccess( GlobalUtils.getRbacSession( this ), "foo", "fighters" );
- Thread.sleep( 1000 );
- }
- catch ( InterruptedException e )
- {
- // noop
- }
- }
- }.setPosition( IndicatingAjaxButton.Position.RIGHT )
- );
- */
+ }.setPosition( IndicatingAjaxButton.Position.RIGHT )
+ );
+ */
}
}
}
\ No newline at end of file
[10/10] directory-fortress-commander git commit: Merge branch
'master' of
https://git-wip-us.apache.org/repos/asf/directory-fortress-commander
Posted by el...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-fortress-commander
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/b012c309
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/b012c309
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/b012c309
Branch: refs/heads/master
Commit: b012c3091698a5498c514535cec202a83e6ab09a
Parents: 39c304e 8ebaf94
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Tue Nov 25 20:50:16 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Tue Nov 25 20:50:16 2014 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
Posted by el...@apache.org.
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>();