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:31 UTC
[05/10] directory-fortress-commander git commit: o Removed the
warning caused by the missing serialVersionUID (FC-24)
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/39c304ec/src/main/java/org/apache/directory/fortress/web/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;