You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/12/17 15:01:40 UTC
svn commit: r1422934 - in /syncope/trunk/console/src:
main/java/org/apache/syncope/console/commons/
main/java/org/apache/syncope/console/pages/
main/java/org/apache/syncope/console/pages/panels/
main/java/org/apache/syncope/console/wicket/markup/html/t...
Author: ilgrosso
Date: Mon Dec 17 14:01:38 2012
New Revision: 1422934
URL: http://svn.apache.org/viewvc?rev=1422934&view=rev
Log:
Removing usage of deprecated classes + Selenium tests adaptation
Added:
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansion.java (with props)
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansionModel.java (with props)
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRoleProvider.java (with props)
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/RoleTreeBuilder.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRolePanel.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/RoleTreeBuilder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/RoleTreeBuilder.java?rev=1422934&r1=1422933&r2=1422934&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/RoleTreeBuilder.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/commons/RoleTreeBuilder.java Mon Dec 17 14:01:38 2012
@@ -26,19 +26,18 @@ import java.util.List;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeModel;
-import org.springframework.beans.factory.annotation.Autowired;
import org.apache.syncope.client.to.RoleTO;
import org.apache.syncope.console.rest.RoleRestClient;
+import org.springframework.beans.factory.annotation.Autowired;
public class RoleTreeBuilder {
@Autowired
private RoleRestClient restClient;
- private RoleTOComparator comparator = new RoleTOComparator();
+ private final RoleTOComparator comparator = new RoleTOComparator();
private List<RoleTO> getChildRoles(final long parentRoleId, final List<RoleTO> roles) {
-
List<RoleTO> result = new ArrayList<RoleTO>();
for (RoleTO role : roles) {
if (role.getParent() == parentRoleId) {
@@ -51,7 +50,6 @@ public class RoleTreeBuilder {
}
private void populateSubtree(final DefaultMutableTreeNode subRoot, final List<RoleTO> roles) {
-
RoleTO role = (RoleTO) subRoot.getUserObject();
DefaultMutableTreeNode child;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.java?rev=1422934&r1=1422933&r2=1422934&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleOwnerSelectModalPage.java Mon Dec 17 14:01:38 2012
@@ -23,14 +23,21 @@ import org.apache.syncope.client.to.Role
import org.apache.syncope.console.commons.CloseOnESCBehavior;
import org.apache.syncope.console.commons.RoleTreeBuilder;
import org.apache.syncope.console.pages.panels.RoleDetailsPanel;
+import org.apache.syncope.console.wicket.markup.html.tree.DefaultMutableTreeNodeExpansion;
+import org.apache.syncope.console.wicket.markup.html.tree.DefaultMutableTreeNodeExpansionModel;
+import org.apache.syncope.console.wicket.markup.html.tree.TreeRoleProvider;
+import org.apache.wicket.Component;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.extensions.markup.html.tree.BaseTree;
-import org.apache.wicket.extensions.markup.html.tree.LinkTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.DefaultNestedTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.content.Folder;
+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.WindowsTheme;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.spring.injection.annot.SpringBean;
public class RoleOwnerSelectModalPage extends BaseModalPage {
@@ -40,29 +47,53 @@ public class RoleOwnerSelectModalPage ex
@SpringBean
private RoleTreeBuilder roleTreeBuilder;
- public RoleOwnerSelectModalPage(final PageReference pageRef, final ModalWindow window) {
+ private final NestedTree<DefaultMutableTreeNode> tree;
+ public RoleOwnerSelectModalPage(final PageReference pageRef, final ModalWindow window) {
super();
- BaseTree tree = new LinkTree("treeTable", roleTreeBuilder.build()) {
+ final ITreeProvider<DefaultMutableTreeNode> treeProvider = new TreeRoleProvider(roleTreeBuilder, true);
+ final DefaultMutableTreeNodeExpansionModel treeModel = new DefaultMutableTreeNodeExpansionModel();
- private static final long serialVersionUID = -5514696922119256101L;
+ tree = new DefaultNestedTree<DefaultMutableTreeNode>("treeTable", treeProvider, treeModel) {
- @Override
- protected IModel getNodeTextModel(final IModel model) {
- return new PropertyModel(model, "userObject.displayName");
- }
+ private static final long serialVersionUID = 7137658050662575546L;
@Override
- protected void onNodeLinkClicked(final Object node, final BaseTree tree, final AjaxRequestTarget target) {
- final RoleTO roleTO = (RoleTO) ((DefaultMutableTreeNode) node).getUserObject();
-
- send(pageRef.getPage(), Broadcast.BREADTH, new RoleDetailsPanel.RoleOwnerSelectPayload(roleTO.getId()));
- window.close(target);
+ protected Component newContentComponent(final String id, final IModel<DefaultMutableTreeNode> node) {
+ final DefaultMutableTreeNode treeNode = node.getObject();
+ final RoleTO roleTO = (RoleTO) treeNode.getUserObject();
+
+ return new Folder<DefaultMutableTreeNode>(id, RoleOwnerSelectModalPage.this.tree, node) {
+
+ private static final long serialVersionUID = 9046323319920426493L;
+
+ @Override
+ protected boolean isClickable() {
+ return true;
+ }
+
+ @Override
+ protected IModel<?> newLabelModel(final IModel<DefaultMutableTreeNode> model) {
+ return new Model<String>(roleTO.getDisplayName());
+ }
+
+ @Override
+ protected void onClick(final AjaxRequestTarget target) {
+ super.onClick(target);
+
+ send(pageRef.getPage(), Broadcast.BREADTH,
+ new RoleDetailsPanel.RoleOwnerSelectPayload(roleTO.getId()));
+ window.close(target);
+ }
+ };
}
};
+ tree.add(new WindowsTheme());
tree.setOutputMarkupId(true);
- tree.getTreeState().expandAll();
+
+ DefaultMutableTreeNodeExpansion.get().expandAll();
+
this.add(tree);
add(new CloseOnESCBehavior(window));
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java?rev=1422934&r1=1422933&r2=1422934&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java Mon Dec 17 14:01:38 2012
@@ -34,12 +34,12 @@ public class Roles extends BasePage {
private static final long serialVersionUID = -2147758241610831969L;
- private ModalWindow createRoleWin = null;
-
private static final int WIN_HEIGHT = 500;
private static final int WIN_WIDTH = 750;
+ private final ModalWindow createRoleWin;
+
private final WebMarkupContainer container;
public Roles(final PageParameters parameters) {
@@ -62,11 +62,12 @@ public class Roles extends BasePage {
final RoleSummaryPanel nodePanel = new RoleSummaryPanel("summaryPanel", createRoleWin,
Roles.this.getPageReference());
-
+
nodePanel.setOutputMarkupId(true);
container.add(nodePanel);
createRoleWin.setWindowClosedCallback(new ModalWindow.WindowClosedCallback() {
+
private static final long serialVersionUID = 8804221891699487139L;
@Override
@@ -99,27 +100,23 @@ public class Roles extends BasePage {
final RoleSummaryPanel nodePanel = new RoleSummaryPanel("summaryPanel", createRoleWin,
Roles.this.getPageReference(), update.getSelectedNodeId());
-
+
container.addOrReplace(nodePanel);
- update.getTarget().add(this);
+ update.getTarget().add(this);
}
}
public static class TreeNodeClickUpdate {
- private AjaxRequestTarget target;
+ private final AjaxRequestTarget target;
private Long selectedNodeId;
public TreeNodeClickUpdate(final AjaxRequestTarget target, final Long selectedNodeId) {
-
this.target = target;
this.selectedNodeId = selectedNodeId;
}
- /**
- * @return ajax request target
- */
public AjaxRequestTarget getTarget() {
return target;
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java?rev=1422934&r1=1422933&r2=1422934&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java Mon Dec 17 14:01:38 2012
@@ -27,13 +27,20 @@ import org.apache.syncope.console.common
import org.apache.syncope.console.pages.MembershipModalPage;
import org.apache.syncope.console.pages.UserModalPage;
import org.apache.syncope.console.wicket.ajax.markup.html.IndicatingDeleteOnConfirmAjaxLink;
+import org.apache.syncope.console.wicket.markup.html.tree.DefaultMutableTreeNodeExpansion;
+import org.apache.syncope.console.wicket.markup.html.tree.DefaultMutableTreeNodeExpansionModel;
+import org.apache.syncope.console.wicket.markup.html.tree.TreeRoleProvider;
+import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
-import org.apache.wicket.extensions.markup.html.tree.BaseTree;
-import org.apache.wicket.extensions.markup.html.tree.LinkTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.DefaultNestedTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.content.Folder;
+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.WindowsTheme;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
@@ -53,7 +60,9 @@ public class MembershipsPanel extends Pa
private ListView<MembershipTO> membershipsView;
- private UserTO userTO = null;
+ private final UserTO userTO;
+
+ private final NestedTree<DefaultMutableTreeNode> tree;
public MembershipsPanel(final String id, final UserTO userTO, final boolean templateMode) {
super(id);
@@ -68,54 +77,73 @@ public class MembershipsPanel extends Pa
membershipWin.setCookieName("create-membership-modal");
add(membershipWin);
- BaseTree tree = new LinkTree("treeTable", roleTreeBuilder.build()) {
+ final ITreeProvider<DefaultMutableTreeNode> treeProvider = new TreeRoleProvider(roleTreeBuilder, true);
+ final DefaultMutableTreeNodeExpansionModel treeModel = new DefaultMutableTreeNodeExpansionModel();
- private static final long serialVersionUID = -5514696922119256101L;
+ tree = new DefaultNestedTree<DefaultMutableTreeNode>("treeTable", treeProvider, treeModel) {
- @Override
- protected IModel getNodeTextModel(final IModel model) {
- return new PropertyModel(model, "userObject.displayName");
- }
+ private static final long serialVersionUID = 7137658050662575546L;
@Override
- protected void onNodeLinkClicked(final Object node, final BaseTree tree, final AjaxRequestTarget target) {
+ protected Component newContentComponent(final String id, final IModel<DefaultMutableTreeNode> node) {
+ final DefaultMutableTreeNode treeNode = node.getObject();
+ final RoleTO roleTO = (RoleTO) treeNode.getUserObject();
- final RoleTO roleTO = (RoleTO) ((DefaultMutableTreeNode) node).getUserObject();
+ return new Folder<DefaultMutableTreeNode>(id, MembershipsPanel.this.tree, node) {
- membershipWin.setPageCreator(new ModalWindow.PageCreator() {
+ private static final long serialVersionUID = 9046323319920426493L;
- private static final long serialVersionUID = 7661763358801821185L;
+ @Override
+ protected boolean isClickable() {
+ return true;
+ }
- private MembershipTO membershipTO;
+ @Override
+ protected IModel<?> newLabelModel(final IModel<DefaultMutableTreeNode> model) {
+ return new Model<String>(roleTO.getDisplayName());
+ }
@Override
- public Page createPage() {
+ protected void onClick(final AjaxRequestTarget target) {
+ super.onClick(target);
- for (MembershipTO memberTO : membershipsView.getList()) {
- if (memberTO.getRoleId() == roleTO.getId()) {
- return new MembershipModalPage(getPage().getPageReference(),
- membershipWin, memberTO, templateMode);
- }
- }
- membershipTO = new MembershipTO();
- membershipTO.setRoleId(roleTO.getId());
- membershipTO.setRoleName(roleTO.getName());
+ membershipWin.setPageCreator(new ModalWindow.PageCreator() {
- return new MembershipModalPage(getPage().getPageReference(), membershipWin, membershipTO,
- templateMode);
+ private static final long serialVersionUID = 7661763358801821185L;
+
+ private MembershipTO membershipTO;
+
+ @Override
+ public Page createPage() {
+
+ for (MembershipTO memberTO : membershipsView.getList()) {
+ if (memberTO.getRoleId() == roleTO.getId()) {
+ return new MembershipModalPage(getPage().getPageReference(),
+ membershipWin, memberTO, templateMode);
+ }
+ }
+ membershipTO = new MembershipTO();
+ membershipTO.setRoleId(roleTO.getId());
+ membershipTO.setRoleName(roleTO.getName());
+
+ return new MembershipModalPage(getPage().getPageReference(), membershipWin,
+ membershipTO, templateMode);
+ }
+ });
+ membershipWin.show(target);
}
- });
- membershipWin.show(target);
+ };
}
};
-
+ tree.add(new WindowsTheme());
tree.setOutputMarkupId(true);
- tree.getTreeState().expandAll();
- add(tree);
+ DefaultMutableTreeNodeExpansion.get().expandAll();
+
+ this.add(tree);
- membershipsView = new ListView<MembershipTO>("memberships", new PropertyModel<List<? extends MembershipTO>>(
- userTO, "memberships")) {
+ membershipsView = new ListView<MembershipTO>("memberships",
+ new PropertyModel<List<? extends MembershipTO>>(userTO, "memberships")) {
private static final long serialVersionUID = 9101744072914090143L;
Added: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansion.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansion.java?rev=1422934&view=auto
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansion.java (added)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansion.java Mon Dec 17 14:01:38 2012
@@ -0,0 +1,154 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.console.wicket.markup.html.tree;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import javax.swing.tree.DefaultMutableTreeNode;
+import org.apache.syncope.client.to.RoleTO;
+import org.apache.wicket.MetaDataKey;
+import org.apache.wicket.Session;
+
+public class DefaultMutableTreeNodeExpansion implements Set<DefaultMutableTreeNode>, Serializable {
+
+ private static final long serialVersionUID = -2864060875425661224L;
+
+ private static MetaDataKey<DefaultMutableTreeNodeExpansion> KEY =
+ new MetaDataKey<DefaultMutableTreeNodeExpansion>() {
+
+ private static final long serialVersionUID = 3109256773218160485L;
+
+ };
+
+ private Set<Long> ids = new HashSet<Long>();
+
+ private boolean inverse;
+
+ public void expandAll() {
+ ids.clear();
+
+ inverse = true;
+ }
+
+ public void collapseAll() {
+ ids.clear();
+
+ inverse = false;
+ }
+
+ @Override
+ public boolean add(final DefaultMutableTreeNode node) {
+ RoleTO roleTO = (RoleTO) node.getUserObject();
+ if (inverse) {
+ return ids.remove(roleTO.getId());
+ } else {
+ return ids.add(roleTO.getId());
+ }
+ }
+
+ @Override
+ public boolean remove(final Object object) {
+ DefaultMutableTreeNode node = (DefaultMutableTreeNode) object;
+ RoleTO roleTO = (RoleTO) node.getUserObject();
+ if (inverse) {
+ return ids.add(roleTO.getId());
+ } else {
+ return ids.remove(roleTO.getId());
+ }
+ }
+
+ @Override
+ public boolean contains(final Object object) {
+ DefaultMutableTreeNode node = (DefaultMutableTreeNode) object;
+ RoleTO roleTO = (RoleTO) node.getUserObject();
+ if (inverse) {
+ return !ids.contains(roleTO.getId());
+ } else {
+ return ids.contains(roleTO.getId());
+ }
+ }
+
+ @Override
+ public void clear() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public int size() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean isEmpty() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public <A> A[] toArray(final A[] a) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Iterator<DefaultMutableTreeNode> iterator() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public Object[] toArray() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean containsAll(Collection<?> c) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean addAll(Collection<? extends DefaultMutableTreeNode> c) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean retainAll(Collection<?> c) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean removeAll(Collection<?> c) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Get the expansion for the session.
+ *
+ * @return expansion
+ */
+ public static DefaultMutableTreeNodeExpansion get() {
+ DefaultMutableTreeNodeExpansion expansion = Session.get().getMetaData(KEY);
+ if (expansion == null) {
+ expansion = new DefaultMutableTreeNodeExpansion();
+
+ Session.get().setMetaData(KEY, expansion);
+ }
+ return expansion;
+ }
+}
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansion.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansion.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansion.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansionModel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansionModel.java?rev=1422934&view=auto
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansionModel.java (added)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansionModel.java Mon Dec 17 14:01:38 2012
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.console.wicket.markup.html.tree;
+
+import java.util.Set;
+import javax.swing.tree.DefaultMutableTreeNode;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+
+public class DefaultMutableTreeNodeExpansionModel
+ extends AbstractReadOnlyModel<Set<DefaultMutableTreeNode>> {
+
+ private static final long serialVersionUID = -3407581132184748054L;
+
+ @Override
+ public Set<DefaultMutableTreeNode> getObject() {
+ return DefaultMutableTreeNodeExpansion.get();
+ }
+}
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansionModel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansionModel.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/DefaultMutableTreeNodeExpansionModel.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRolePanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRolePanel.java?rev=1422934&r1=1422933&r2=1422934&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRolePanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRolePanel.java Mon Dec 17 14:01:38 2012
@@ -18,22 +18,25 @@
*/
package org.apache.syncope.console.wicket.markup.html.tree;
-
import javax.swing.tree.DefaultMutableTreeNode;
import org.apache.syncope.client.to.RoleTO;
import org.apache.syncope.console.commons.RoleTreeBuilder;
import org.apache.syncope.console.commons.XMLRolesReader;
import org.apache.syncope.console.pages.Roles.TreeNodeClickUpdate;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
-import org.apache.wicket.extensions.markup.html.tree.BaseTree;
-import org.apache.wicket.extensions.markup.html.tree.LinkTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.DefaultNestedTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.content.Folder;
+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.WindowsTheme;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.spring.injection.annot.SpringBean;
public class TreeRolePanel extends Panel {
@@ -48,7 +51,7 @@ public class TreeRolePanel extends Panel
final WebMarkupContainer treeContainer;
- private BaseTree tree;
+ private NestedTree<DefaultMutableTreeNode> tree;
public TreeRolePanel(final String id) {
super(id);
@@ -60,32 +63,47 @@ public class TreeRolePanel extends Panel
}
private void updateTree() {
+ final ITreeProvider<DefaultMutableTreeNode> treeProvider = new TreeRoleProvider(roleTreeBuilder, true);
+ final DefaultMutableTreeNodeExpansionModel treeModel = new DefaultMutableTreeNodeExpansionModel();
- tree = new LinkTree("treeTable", roleTreeBuilder.build()) {
-
- private static final long serialVersionUID = -5514696922119256101L;
+ tree = new DefaultNestedTree<DefaultMutableTreeNode>("treeTable", treeProvider, treeModel) {
- @Override
- protected IModel getNodeTextModel(final IModel model) {
- return new PropertyModel(model, "userObject.displayName");
- }
+ private static final long serialVersionUID = 7137658050662575546L;
@Override
- protected void onNodeLinkClicked(
- final Object node, final BaseTree baseTree, final AjaxRequestTarget target) {
-
- DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) node;
- RoleTO unitObject = (RoleTO) treeNode.getUserObject();
-
- send(getPage(), Broadcast.BREADTH, new TreeNodeClickUpdate(target, unitObject.getId()));
-
+ protected Component newContentComponent(final String id, final IModel<DefaultMutableTreeNode> node) {
+ final DefaultMutableTreeNode treeNode = node.getObject();
+ final RoleTO roleTO = (RoleTO) treeNode.getUserObject();
+
+ return new Folder<DefaultMutableTreeNode>(id, TreeRolePanel.this.tree, node) {
+
+ private static final long serialVersionUID = 9046323319920426493L;
+
+ @Override
+ protected boolean isClickable() {
+ return true;
+ }
+
+ @Override
+ protected IModel<?> newLabelModel(final IModel<DefaultMutableTreeNode> model) {
+ return new Model<String>(roleTO.getDisplayName());
+ }
+
+ @Override
+ protected void onClick(final AjaxRequestTarget target) {
+ super.onClick(target);
+
+ send(getPage(), Broadcast.BREADTH, new TreeNodeClickUpdate(target, roleTO.getId()));
+ }
+ };
}
};
+ tree.add(new WindowsTheme());
+ tree.setOutputMarkupId(true);
- MetaDataRoleAuthorizationStrategy.authorize(tree, ENABLE, xmlRolesReader.getAllAllowedRoles("Roles", "read"));
+ DefaultMutableTreeNodeExpansion.get().expandAll();
- tree.setOutputMarkupId(true);
- tree.getTreeState().expandAll();
+ MetaDataRoleAuthorizationStrategy.authorize(tree, ENABLE, xmlRolesReader.getAllAllowedRoles("Roles", "read"));
treeContainer.addOrReplace(tree);
}
@@ -95,11 +113,8 @@ public class TreeRolePanel extends Panel
super.onEvent(event);
if (event.getPayload() instanceof TreeNodeClickUpdate) {
-
final TreeNodeClickUpdate update = (TreeNodeClickUpdate) event.getPayload();
-
updateTree();
-
update.getTarget().add(treeContainer);
}
}
Added: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRoleProvider.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRoleProvider.java?rev=1422934&view=auto
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRoleProvider.java (added)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRoleProvider.java Mon Dec 17 14:01:38 2012
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.console.wicket.markup.html.tree;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import org.apache.syncope.console.commons.RoleTreeBuilder;
+import org.apache.wicket.extensions.markup.html.repeater.util.TreeModelProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+public class TreeRoleProvider extends TreeModelProvider<DefaultMutableTreeNode> {
+
+ private static final long serialVersionUID = -7741964777100892335L;
+
+ public TreeRoleProvider(final RoleTreeBuilder roleTreeBuilder) {
+ this(roleTreeBuilder, false);
+ }
+
+ public TreeRoleProvider(final RoleTreeBuilder roleTreeBuilder, final boolean rootVisible) {
+ super(roleTreeBuilder.build(), rootVisible);
+ }
+
+ @Override
+ public IModel<DefaultMutableTreeNode> model(final DefaultMutableTreeNode treeNode) {
+ return new Model<DefaultMutableTreeNode>(treeNode);
+ }
+}
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRoleProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRoleProvider.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/tree/TreeRoleProvider.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java?rev=1422934&r1=1422933&r2=1422934&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java Mon Dec 17 14:01:38 2012
@@ -28,7 +28,7 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/table/tbody/tr/td[2]/table/tbody/tr/td[2]/a");
+ selenium.click("//div[3]/span/div/div/div/div/div/span/a");
selenium.waitForCondition("selenium.isElementPresent(\"//div[3]/span[2]/span/div/p/span/span/a\");", "30000");
@@ -46,7 +46,7 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/table[3]/tbody/tr/td[4]/table/tbody/tr/td[2]/a");
+ selenium.click("//div[3]/span/div/div/div/div/div[2]/div/div/span/a");
selenium.waitForCondition("selenium.isElementPresent("
+ "\"//div[3]/span[2]/span/span/div/p/span[2]/span/a\");", "30000");
@@ -75,7 +75,7 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/table[3]/tbody/tr/td[4]/table/tbody/tr/td[2]/a");
+ selenium.click("//div[3]/span/div/div/div/div/div[2]/div/div/span/a");
selenium.waitForCondition("selenium.isElementPresent("
+ "\"//div[3]/span[2]/span/span/div/p/span[2]/span/a[2]\");", "30000");
@@ -104,7 +104,7 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/table[3]/tbody/tr/td[4]/table/tbody/tr/td[2]/a");
+ selenium.click("//div[3]/span/div/div/div/div/div[2]/div/div/span/a");
selenium.waitForCondition("selenium.isElementPresent(\"//div/form/div[2]/ul/li[7]/a\");", "30000");
@@ -120,18 +120,19 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/table[2]/tbody/tr/td[3]/table/tbody/tr/td[2]/a");
+ selenium.click("//div[3]/span/div/div/div/div/div[2]/div/div/span/a");
- selenium.waitForCondition("selenium.isElementPresent(\"//div/form/div[2]/ul/li[7]/a\");", "50000");
+ selenium.waitForCondition("selenium.isElementPresent("
+ + "\"//div[3]/span[2]/span/span/div/form/div[2]/ul/li[8]/a\");", "30000");
- selenium.click("//div/form/div[2]/ul/li[7]/a");
+ selenium.click("//div[3]/span[2]/span/span/div/form/div[2]/ul/li[8]/a");
selenium.click("//input[@name=\"userListContainer:search\"]");
selenium.waitForCondition("selenium.isElementPresent(\"//table/tbody/tr/td[4]/div/span[7]/a\");", "30000");
selenium.click("//table/tbody/tr/td[4]/div/span[7]/a");
-
+
selenium.waitForCondition("selenium.isElementPresent("
+ "\"//form/div[2]/div/span/div/div/div[contains(text(),'Username')]\");", "30000");
@@ -145,9 +146,10 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/table[2]/tbody/tr/td[3]/table/tbody/tr/td[2]/a");
+ selenium.click("//div[3]/span/div/div/div/div/div[2]/div/div/span/a");
- selenium.waitForCondition("selenium.isElementPresent(\"//div/form/div[2]/ul/li[7]/a\");", "30000");
+ selenium.waitForCondition("selenium.isElementPresent("
+ + "\"//div[3]/span[2]/span/span/div/form/div[2]/ul/li[8]/a\");", "30000");
selenium.click("//div/form/div[2]/ul/li[7]/a");
@@ -166,7 +168,7 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/table[12]/tbody/tr/td[5]/table/tbody/tr/td[2]/a");
+ selenium.click("//div[3]/span/div/div/div/div/div[2]/div[2]/div[2]/div/div[2]/div[3]/div/span[2]/a/span");
selenium.waitForCondition("selenium.isElementPresent(\"//div/p/span[2]/span/a[3]\");", "30000");