directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-commander git commit: FC-135 - Rename ambigous getter and setters names on User and UserAdminRole
Date Sat, 09 Jan 2016 00:15:34 GMT
Repository: directory-fortress-commander
Updated Branches:
  refs/heads/master fb2a9b2f9 -> fffa3a700


FC-135 - Rename ambigous getter and setters names on User and UserAdminRole


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/fffa3a70
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/fffa3a70
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/fffa3a70

Branch: refs/heads/master
Commit: fffa3a7003cedc31c038d0bc964f6015cdda8a59
Parents: fb2a9b2
Author: Shawn McKinney <smckinney@apache.org>
Authored: Fri Jan 8 18:15:32 2016 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Fri Jan 8 18:15:32 2016 -0600

----------------------------------------------------------------------
 .../directory/fortress/web/panel/RoleAdminDetailPanel.java   | 8 ++++----
 .../apache/directory/fortress/web/panel/RoleDetailPanel.java | 8 ++++----
 .../apache/directory/fortress/web/panel/UserListPanel.java   | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fffa3a70/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 ca8aed6..903c6ff 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
@@ -189,9 +189,9 @@ public class RoleAdminDetailPanel extends Panel
                 {
                     msg += " selection:" + permouSelection;
                     AdminRole adminRole = ( AdminRole ) form.getModel().getObject();
-                    if ( adminRole.getOsP() != null )
+                    if ( adminRole.getOsPSet() != null )
                     {
-                        adminRole.getOsP().remove( permouSelection );
+                        adminRole.getOsPSet().remove( permouSelection );
                         permous.remove( permouSelection );
                         permouSelection = "";
                         target.add( permouCB );
@@ -316,9 +316,9 @@ public class RoleAdminDetailPanel extends Panel
                 {
                     msg += " selection:" + userouSelection;
                     AdminRole adminRole = ( AdminRole ) form.getModel().getObject();
-                    if ( adminRole.getOsU() != null )
+                    if ( adminRole.getOsUSet() != null )
                     {
-                        adminRole.getOsU().remove( userouSelection );
+                        adminRole.getOsUSet().remove( userouSelection );
                         userous.remove( userouSelection );
                         userouSelection = "";
                         target.add( userouCB );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fffa3a70/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 66bf256..010f611 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
@@ -616,17 +616,17 @@ public class RoleDetailPanel extends Panel
                     AdminRole role = ( AdminRole ) getModel().getObject();
                     if ( role != null )
                     {
-                        if ( role.getOsP() != null )
+                        if ( role.getOsPSet() != null )
                         {
-                            auxPanel.setPermous( new ArrayList<>( role.getOsP() ) );
+                            auxPanel.setPermous( new ArrayList<>( role.getOsPSet()
) );
                         }
                         else
                         {
                             auxPanel.setPermous( new ArrayList<String>() );
                         }
-                        if ( role.getOsU() != null )
+                        if ( role.getOsUSet() != null )
                         {
-                            auxPanel.setUserous( new ArrayList<>( role.getOsU() ) );
+                            auxPanel.setUserous( new ArrayList<>( role.getOsUSet()
) );
                         }
                         else
                         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fffa3a70/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 88afb71..47b1945 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
@@ -248,12 +248,12 @@ public class UserListPanel extends FormComponentPanel
                     else if ( selectedRadioButton.equals( ROLES ) )
                     {
                         LOG.debug( ".onSubmit ROLES RB selected" );
-                        srchUser.setRole( searchVal );
+                        srchUser.setRoleName( searchVal );
                     }
                     else if ( selectedRadioButton.equals( ADMIN_ROLES ) )
                     {
                         LOG.debug( ".onSubmit ADMIN ROLES RB selected" );
-                        srchUser.setAdminRole( searchVal );
+                        srchUser.setAdminRoleName( searchVal );
                     }
                     else if ( selectedRadioButton.equals( OUS ) )
                     {


Mime
View raw message