Return-Path: X-Original-To: apmail-syncope-commits-archive@www.apache.org Delivered-To: apmail-syncope-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7AA07CF2D for ; Mon, 3 Jun 2013 18:36:39 +0000 (UTC) Received: (qmail 14268 invoked by uid 500); 3 Jun 2013 18:36:39 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 14245 invoked by uid 500); 3 Jun 2013 18:36:39 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 14238 invoked by uid 99); 3 Jun 2013 18:36:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jun 2013 18:36:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Jun 2013 18:36:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6A1BE2388ABB; Mon, 3 Jun 2013 18:36:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1489099 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchPanel.java console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java Date: Mon, 03 Jun 2013 18:36:18 -0000 To: commits@syncope.apache.org From: massi@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130603183618.6A1BE2388ABB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: massi Date: Mon Jun 3 18:36:17 2013 New Revision: 1489099 URL: http://svn.apache.org/r1489099 Log: Three constructors but only one used Modified: syncope/trunk/ (props changed) syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchPanel.java syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java Propchange: syncope/trunk/ ------------------------------------------------------------------------------ Merged /syncope/branches/1_1_X:r1489091-1489097 Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchPanel.java?rev=1489099&r1=1489098&r2=1489099&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchPanel.java Mon Jun 3 18:36:17 2013 @@ -21,7 +21,6 @@ package org.apache.syncope.console.pages import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.syncope.common.search.NodeCond; import org.apache.syncope.common.types.AttributableType; import org.apache.syncope.console.commons.SearchCondWrapper; import org.apache.wicket.model.LoadableDetachableModel; @@ -31,15 +30,7 @@ public class RoleSearchPanel extends Abs private static final long serialVersionUID = 5757183539269316263L; public RoleSearchPanel(final String id) { - this(id, null, true); - } - - public RoleSearchPanel(final String id, final NodeCond initCond) { - this(id, initCond, true); - } - - public RoleSearchPanel(final String id, final NodeCond initCond, final boolean required) { - super(id, AttributableType.ROLE, initCond, required); + super(id, AttributableType.ROLE, null, true); } @Override @@ -52,7 +43,7 @@ public class RoleSearchPanel extends Abs @Override protected List load() { - List result = new ArrayList(); + final List result = new ArrayList(); result.add(SearchCondWrapper.FilterType.ATTRIBUTE); result.add(SearchCondWrapper.FilterType.ENTITLEMENT); result.add(SearchCondWrapper.FilterType.RESOURCE); Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java?rev=1489099&r1=1489098&r2=1489099&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSummaryPanel.java Mon Jun 3 18:36:17 2013 @@ -54,7 +54,7 @@ public class RoleSummaryPanel extends Pa public static class Builder implements Serializable { - private static final long serialVersionUID = 8150440254654306070L; + private static final long serialVersionUID = 4164563358509351832L; private String id;