Cleanup commented code, fix the remaining overrides.
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 655d16b..84386d0 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
@@ -365,14 +365,12 @@
@Override
protected void onSubmit( AjaxRequestTarget target )
- //protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
String msg = "clicked on members.delete";
if ( StringUtils.isNotEmpty( parentsSelection ) )
{
msg += " selection:" + parentsSelection;
OrgUnit orgUnit = ( OrgUnit ) getForm().getModel().getObject();
- //OrgUnit orgUnit = ( OrgUnit ) form.getModel().getObject();
if ( orgUnit.getParents() != null )
{
orgUnit.getParents().remove( parentsSelection );
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 28e9e31..479c463 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
@@ -189,7 +189,6 @@
@Override
protected void onSubmit( AjaxRequestTarget target )
- //protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
log.debug( ".search onSubmit" );
info( "Searching Perms..." );
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 a499b31..e13fdf7 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
@@ -140,7 +140,6 @@
@Override
protected void onSubmit( AjaxRequestTarget target )
-// protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
String msg = "clicked on permission OU search";
msg += permouSelection != null ? ": " + permouSelection : "";
@@ -184,14 +183,12 @@
@Override
protected void onSubmit( AjaxRequestTarget target )
- //protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
String msg = "clicked on permous.delete";
if ( StringUtils.isNotEmpty( permouSelection ) )
{
msg += " selection:" + permouSelection;
AdminRole adminRole = ( AdminRole ) getForm().getModel().getObject();
- //AdminRole adminRole = ( AdminRole ) form.getModel().getObject();
if ( adminRole.getOsPSet() != null )
{
adminRole.getOsPSet().remove( permouSelection );
@@ -270,7 +267,6 @@
@Override
protected void onSubmit( AjaxRequestTarget target )
- //protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
String msg = "clicked on user OU search";
msg += userouSelection != null ? ": " + userouSelection : "";
@@ -314,14 +310,12 @@
@Override
protected void onSubmit( AjaxRequestTarget target )
- //protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
String msg = "clicked on userous.delete";
if ( StringUtils.isNotEmpty( userouSelection ) )
{
msg += " selection:" + userouSelection;
AdminRole adminRole = ( AdminRole ) getForm().getModel().getObject();
- //AdminRole adminRole = ( AdminRole ) form.getModel().getObject();
if ( adminRole.getOsUSet() != null )
{
adminRole.getOsUSet().remove( userouSelection );
@@ -399,10 +393,8 @@
@Override
protected void onSubmit( AjaxRequestTarget target )
- //protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
AdminRole adminRole = ( AdminRole ) getForm().getModel().getObject();
- //AdminRole adminRole = ( AdminRole ) form.getModel().getObject();
beginRoleSearchModalPanel.setRoleSearchVal( adminRole.getBeginRange() );
target.prependJavaScript( GlobalIds.WICKET_WINDOW_UNLOAD_CONFIRMATION_FALSE );
beginRoleModalWindow.show( target );
@@ -470,7 +462,6 @@
@Override
protected void onSubmit( AjaxRequestTarget target )
- //protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
AdminRole adminRole = ( AdminRole ) getForm().getModel().getObject();
endRoleSearchModalPanel.setRoleSearchVal( adminRole.getBeginRange() );
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 710ac28..cbb641e 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
@@ -160,11 +160,11 @@
private static final long serialVersionUID = 1L;
- //@Override
- protected void onSubmit( AjaxRequestTarget target, Form form )
+ @Override
+ protected void onSubmit( AjaxRequestTarget target )
{
log.debug( ".onSubmit Add" );
- T role = ( T ) form.getModel().getObject();
+ T role = ( T ) getForm().getModel().getObject();
updateEntityWithComboData( ( Role ) role );
try
{
@@ -199,7 +199,6 @@
@Override
- //public void onError( AjaxRequestTarget target, Form form )
public void onError( AjaxRequestTarget target )
{
log.info( "RoleDetailPanel.add.onError caught" );
@@ -234,11 +233,9 @@
@Override
protected void onSubmit( AjaxRequestTarget target )
- //protected void onSubmit( AjaxRequestTarget target, Form form )
{
log.debug( ".onSubmit Commit" );
- //T role = ( T ) form.getModel().getObject();
- T role = ( T ) this.getModel().getObject();
+ T role = ( T ) getForm().getModel().getObject();
updateEntityWithComboData( ( Role ) role );
try
{
@@ -272,7 +269,6 @@
@Override
public void onError( AjaxRequestTarget target )
- //public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "RoleDetailPanel.update.onError" );
}
@@ -303,11 +299,11 @@
private static final long serialVersionUID = 1L;
- //@Override
- protected void onSubmit( AjaxRequestTarget target, Form form )
+ @Override
+ protected void onSubmit( AjaxRequestTarget target )
{
log.debug( ".onSubmit Delete" );
- T role = ( T ) form.getModel().getObject();
+ T role = ( T ) getForm().getModel().getObject();
try
{
String szRoleName;
@@ -340,7 +336,6 @@
@Override
public void onError( AjaxRequestTarget target )
- //public void onError( AjaxRequestTarget target, Form form )
{
log.warn( "RoleDetailPanel.delete.onError" );
}
@@ -370,8 +365,8 @@
/** Default serialVersionUID */
private static final long serialVersionUID = 1L;
- //@Override
- protected void onSubmit( AjaxRequestTarget target, Form form )
+ @Override
+ protected void onSubmit( AjaxRequestTarget target )
{
clearDetailFields();
component = editForm;
@@ -380,8 +375,8 @@
}
- //@Override
- public void onError( AjaxRequestTarget target, Form form )
+ @Override
+ public void onError( AjaxRequestTarget target )
{
log.warn( "RoleDetailPanel.cancel.onError" );
}
@@ -423,14 +418,12 @@
@Override
protected void onSubmit( AjaxRequestTarget target )
- //protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
String msg = "clicked on roles.delete";
if ( StringUtils.isNotEmpty( parentsSelection ) )
{
msg += " selection:" + parentsSelection;
- Role role = ( Role ) model.getObject();
- //Role role = ( Role ) form.getModel().getObject();
+ Role role = ( Role ) getForm().getModel().getObject();
if ( role.getParents() != null )
{
role.getParents().remove( parentsSelection );
@@ -520,7 +513,6 @@
@Override
protected void onSubmit( AjaxRequestTarget target )
- //protected void onSubmit( AjaxRequestTarget target, Form<?> form )
{
String msg = "clicked on parent roles search";
msg += parentsSelection != null ? ": " + parentsSelection : "";
diff --git a/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java b/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
index f75a704..7bb33b2 100644
--- a/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
+++ b/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
@@ -158,7 +158,7 @@
if ( !skipFirstHalf )
{
- users();
+ //users();
roles();
pobjs();
perms();
