Martin Mucha has uploaded a new change for review. Change subject: core: refactor: Thou shalt not copy paste. ......................................................................
core: refactor: Thou shalt not copy paste. Change-Id: I4b92b6b7f45886a1222ecb08ca895e5b7acb7076 Signed-off-by: Martin Mucha <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java 1 file changed, 36 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/29900/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java index 099ce38..273b59e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/roles_ui/RoleTreeView.java @@ -14,32 +14,21 @@ public static ArrayList<SelectionTreeNodeModel> getRoleTreeView(boolean isReadOnly, boolean isAdmin) { RoleNode tree = initTreeView(); ArrayList<SelectionTreeNodeModel> roleTreeView = new ArrayList<SelectionTreeNodeModel>(); - SelectionTreeNodeModel firstNode = null, secondNode = null, thirdNode = null; + SelectionTreeNodeModel firstNode; + SelectionTreeNodeModel secondNode; + SelectionTreeNodeModel thirdNode; for (RoleNode first : tree.getLeafRoles()) { - firstNode = new SelectionTreeNodeModel(); - firstNode.setTitle(first.getName()); - firstNode.setDescription(first.getName()); - firstNode.setIsChangable(!isReadOnly); + firstNode = createSelectionTreeNodeModel(isReadOnly, first); for (RoleNode second : first.getLeafRoles()) { - secondNode = new SelectionTreeNodeModel(); - secondNode.setTitle(second.getName()); - secondNode.setDescription(second.getName()); - secondNode.setIsChangable(!isReadOnly); + secondNode = createSelectionTreeNodeModel(isReadOnly, second); secondNode.setTooltip(second.getTooltip()); + for (RoleNode third : second.getLeafRoles()) { - thirdNode = new SelectionTreeNodeModel(); - thirdNode.setTitle(third.getName()); - thirdNode.setDescription(third.getDesc()); - thirdNode.setIsSelectedNotificationPrevent(true); - // thirdNode.IsSelected = - // attachedActions.Contains((VdcActionType) Enum.Parse(typeof (VdcActionType), name)); //TODO: - // suppose to be action group - thirdNode.setIsChangable(!isReadOnly); - thirdNode.setIsSelectedNullable(false); - thirdNode.setTooltip(third.getTooltip()); - if (isAdmin || ActionGroup.valueOf(thirdNode.getTitle()).getRoleType() == RoleType.USER) { + thirdNode = createLeafSelectionTreeNodeModel(isReadOnly, third); + + if (isAdmin || isUser(thirdNode)) { secondNode.getChildren().add(thirdNode); } } @@ -55,6 +44,33 @@ return roleTreeView; } + protected static SelectionTreeNodeModel createLeafSelectionTreeNodeModel(boolean isReadOnly, RoleNode third) { + SelectionTreeNodeModel thirdNode; + thirdNode = createSelectionTreeNodeModel(isReadOnly, third); + thirdNode.setIsSelectedNotificationPrevent(true); + + // thirdNode.IsSelected = + // attachedActions.Contains((VdcActionType) Enum.Parse(typeof (VdcActionType), name)); //TODO: + // suppose to be action group + + thirdNode.setIsSelectedNullable(false); + thirdNode.setTooltip(third.getTooltip()); + return thirdNode; + } + + protected static boolean isUser(SelectionTreeNodeModel thirdNode) { + return ActionGroup.valueOf(thirdNode.getTitle()).getRoleType() == RoleType.USER; + } + + protected static SelectionTreeNodeModel createSelectionTreeNodeModel(boolean isReadOnly, RoleNode roleNode) { + SelectionTreeNodeModel nodeModel; + nodeModel = new SelectionTreeNodeModel(); + nodeModel.setTitle(roleNode.getName()); + nodeModel.setDescription(roleNode.getName()); + nodeModel.setIsChangable(!isReadOnly); + return nodeModel; + } + private static RoleNode categoryNode(String name, RoleNode... leaves) { return new RoleNode(name, leaves); } -- To view, visit http://gerrit.ovirt.org/29900 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b92b6b7f45886a1222ecb08ca895e5b7acb7076 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
