You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/02/17 23:51:30 UTC
directory-fortress-commander git commit: FC-70 - remove dummy object
from web lists
Repository: directory-fortress-commander
Updated Branches:
refs/heads/master c147d3580 -> ad9418312
FC-70 - remove dummy object from web lists
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/ad941831
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/ad941831
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/ad941831
Branch: refs/heads/master
Commit: ad9418312fa869203eb392eb69a91c1c1583a183
Parents: c147d35
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Feb 17 16:51:15 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Feb 17 16:51:15 2015 -0600
----------------------------------------------------------------------
.../fortress/web/panel/AuditAuthzListPanel.java | 6 ++----
.../directory/fortress/web/panel/AuditBindListPanel.java | 6 ++----
.../directory/fortress/web/panel/AuditModListPanel.java | 6 ++----
.../directory/fortress/web/panel/GroupListPanel.java | 5 ++---
.../apache/directory/fortress/web/panel/OUListPanel.java | 6 ++----
.../directory/fortress/web/panel/ObjectListPanel.java | 6 ++----
.../directory/fortress/web/panel/PermListPanel.java | 6 ++----
.../directory/fortress/web/panel/PwPolicyListPanel.java | 6 ++----
.../directory/fortress/web/panel/RoleListPanel.java | 6 ++----
.../apache/directory/fortress/web/panel/SDListPanel.java | 6 ++----
.../directory/fortress/web/panel/UserListPanel.java | 11 +++++------
11 files changed, 25 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/ad941831/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 fa7b545..0750dbf 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
@@ -408,7 +408,7 @@ public class AuditAuthzListPanel extends FormComponentPanel
grid.setClickRowToDeselect( false );
grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.getTreeState().expandAll();;
grid.setOutputMarkupId( true );
}
@@ -567,9 +567,7 @@ public class AuditAuthzListPanel extends FormComponentPanel
private DefaultTreeModel createTreeModel( List<AuthZ> authZs )
{
DefaultTreeModel model;
- AuthZ root = new AuthZ();
- //root.setReqStart( "Authorizations" );
- rootNode = new DefaultMutableTreeNode( root );
+ rootNode = new DefaultMutableTreeNode( null );
model = new DefaultTreeModel( rootNode );
if ( authZs == null )
LOG.debug( "no Authorizations found" );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/ad941831/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 38b159b..757b346 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
@@ -332,7 +332,7 @@ public class AuditBindListPanel extends FormComponentPanel
grid.setClickRowToDeselect( false );
grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.getTreeState().expandAll();;
grid.setOutputMarkupId( true );
}
@@ -410,9 +410,7 @@ public class AuditBindListPanel extends FormComponentPanel
private DefaultTreeModel createTreeModel( List<Bind> binds )
{
DefaultTreeModel model;
- Bind root = new Bind();
- //root.setReqAuthzID( "Authentications" );
- rootNode = new DefaultMutableTreeNode( root );
+ rootNode = new DefaultMutableTreeNode( null );
model = new DefaultTreeModel( rootNode );
if ( binds == null )
LOG.debug( "no Authentications found" );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/ad941831/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 edb5d96..5085d3a 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
@@ -355,7 +355,7 @@ public class AuditModListPanel extends FormComponentPanel
grid.setClickRowToDeselect( false );
grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.getTreeState().expandAll();;
grid.setOutputMarkupId( true );
}
@@ -508,9 +508,7 @@ public class AuditModListPanel extends FormComponentPanel
private DefaultTreeModel createTreeModel( List<Mod> mods )
{
DefaultTreeModel model;
- Mod root = new Mod();
- //root.setReqAuthzID( "Modifications" );
- rootNode = new DefaultMutableTreeNode( root );
+ rootNode = new DefaultMutableTreeNode( null );
model = new DefaultTreeModel( rootNode );
if ( mods == null )
LOG.debug( "no Modifications found" );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/ad941831/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 913ce6a..6ec1bd7 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
@@ -240,8 +240,7 @@ public class GroupListPanel extends FormComponentPanel
private DefaultTreeModel createTreeModel( List<Group> groups )
{
DefaultTreeModel model;
- Group rootObject = new Group();
- rootNode = new DefaultMutableTreeNode( rootObject );
+ rootNode = new DefaultMutableTreeNode( null );
model = new DefaultTreeModel( rootNode );
if ( groups == null )
log.debug( "no Groups found" );
@@ -309,7 +308,7 @@ public class GroupListPanel extends FormComponentPanel
grid.setClickRowToDeselect( false );
grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.getTreeState().expandAll();;
this.listForm = new Form( "grouplistform" );
this.listForm.add( grid );
add( this.listForm );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/ad941831/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 8cacdc8..4a07cab 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
@@ -144,7 +144,7 @@ public class OUListPanel extends FormComponentPanel
grid.setClickRowToDeselect( false );
grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.getTreeState().expandAll();;
this.listForm = new Form( "form" );
this.listForm.add( grid );
grid.setOutputMarkupId( true );
@@ -274,9 +274,7 @@ public class OUListPanel extends FormComponentPanel
private DefaultTreeModel createTreeModel( List<OrgUnit> orgUnits )
{
DefaultTreeModel model;
- OrgUnit root = new OrgUnit();
- //root.setName( searchLabel );
- rootNode = new DefaultMutableTreeNode( root );
+ rootNode = new DefaultMutableTreeNode( null );
model = new DefaultTreeModel( rootNode );
if ( orgUnits == null )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/ad941831/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 17b98b0..49a3c0d 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
@@ -243,9 +243,7 @@ public class ObjectListPanel extends FormComponentPanel
private DefaultTreeModel createTreeModel( List<PermObj> permObjs )
{
DefaultTreeModel model;
- PermObj rootObject = new PermObj();
- //rootObject.setObjName( "Permission Objects" );
- rootNode = new DefaultMutableTreeNode( rootObject );
+ rootNode = new DefaultMutableTreeNode( null );
model = new DefaultTreeModel( rootNode );
if ( permObjs == null )
log.debug( "no Permission Objects found" );
@@ -318,7 +316,7 @@ public class ObjectListPanel extends FormComponentPanel
grid.setClickRowToDeselect( false );
grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.getTreeState().expandAll();;
this.listForm = new Form( "objectlistform" );
this.listForm.add( grid );
add( this.listForm );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/ad941831/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 2abba99..993fff6 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
@@ -154,7 +154,7 @@ public class PermListPanel extends FormComponentPanel
grid.setClickRowToDeselect( false );
grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.getTreeState().expandAll();;
listForm = new Form( "form" );
listForm.add( grid );
grid.setOutputMarkupId( true );
@@ -413,9 +413,7 @@ public class PermListPanel extends FormComponentPanel
private DefaultTreeModel createTreeModel( List<Permission> perms )
{
DefaultTreeModel model;
- //Permission root = new Permission("Perms");
- Permission root = new Permission();
- rootNode = new DefaultMutableTreeNode( root );
+ rootNode = new DefaultMutableTreeNode( null );
model = new DefaultTreeModel( rootNode );
if ( perms == null )
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/ad941831/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 839e868..f560fe1 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
@@ -190,7 +190,7 @@ public class PwPolicyListPanel extends FormComponentPanel
grid.setClickRowToDeselect( false );
grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.getTreeState().expandAll();;
this.listForm = new Form( "form" );
this.listForm.add( grid );
grid.setOutputMarkupId( true );
@@ -308,9 +308,7 @@ public class PwPolicyListPanel extends FormComponentPanel
private DefaultTreeModel createTreeModel( List<PwPolicy> policies )
{
DefaultTreeModel model;
- PwPolicy root = new PwPolicy();
- //root.setName("Policies");
- rootNode = new DefaultMutableTreeNode( root );
+ rootNode = new DefaultMutableTreeNode( null );
model = new DefaultTreeModel( rootNode );
if ( policies == null )
log.debug( "no Policies found" );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/ad941831/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 b506564..99a87f7 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
@@ -166,7 +166,7 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
grid.setClickRowToDeselect( false );
grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.getTreeState().expandAll();;
this.listForm = new Form( "form" );
this.listForm.add( grid );
grid.setOutputMarkupId( true );
@@ -302,9 +302,7 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
private DefaultTreeModel createTreeModel( List<T> roles )
{
DefaultTreeModel model;
- Role root = new Role();
- //root.setName("Roles");
- rootNode = new DefaultMutableTreeNode( root );
+ rootNode = new DefaultMutableTreeNode( null );
model = new DefaultTreeModel( rootNode );
if ( roles == null )
log.debug( "no Roles found" );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/ad941831/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 03e5321..e25af17 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
@@ -161,7 +161,7 @@ public class SDListPanel extends FormComponentPanel
grid.setClickRowToDeselect( false );
grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ grid.getTreeState().expandAll();;
this.listForm = new Form( "form" );
this.listForm.add( grid );
grid.setOutputMarkupId( true );
@@ -394,9 +394,7 @@ public class SDListPanel extends FormComponentPanel
private DefaultTreeModel createTreeModel( List<SDSet> sdSets )
{
DefaultTreeModel model;
- SDSet root = new SDSet();
- //root.setName(searchLabel);
- rootNode = new DefaultMutableTreeNode( root );
+ rootNode = new DefaultMutableTreeNode( null );
model = new DefaultTreeModel( rootNode );
if ( sdSets == null )
log.debug( "no SDSets found" );
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/ad941831/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 d147f51..44bfa75 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
@@ -681,10 +681,8 @@ public class UserListPanel extends FormComponentPanel
private DefaultTreeModel createTreeModel( List<User> users )
{
- DefaultTreeModel model;
- User rootUser = new User();
- rootUser.setAddress( null );
- rootNode = new DefaultMutableTreeNode( rootUser );
+ DefaultTreeModel model = null;
+ rootNode = new DefaultMutableTreeNode( null );
model = new DefaultTreeModel( rootNode );
if ( users == null )
{
@@ -695,7 +693,7 @@ public class UserListPanel extends FormComponentPanel
LOG.debug( ".createTreeModel Users found:" + users.size() );
for ( User user : users )
{
- rootNode.add( new DefaultMutableTreeNode( user ) );
+ rootNode.add( new DefaultMutableTreeNode( user ) );
}
}
return model;
@@ -779,7 +777,8 @@ public class UserListPanel extends FormComponentPanel
grid.setClickRowToDeselect( false );
grid.setSelectToEdit( false );
// expand the root node
- grid.getTreeState().expandNode( ( TreeNode ) treeModel.getRoot() );
+ //grid.getTreeState().expandAll();;
+ grid.getTreeState().expandAll();
this.listForm = new Form( "userlistform" );
this.listForm.add( grid );
add( this.listForm );