Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 84483 invoked from network); 4 Apr 2007 14:06:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Apr 2007 14:06:42 -0000 Received: (qmail 67986 invoked by uid 500); 4 Apr 2007 14:06:43 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 67950 invoked by uid 500); 4 Apr 2007 14:06:43 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 67930 invoked by uid 99); 4 Apr 2007 14:06:43 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2007 07:06:43 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Apr 2007 07:06:36 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 882BE1A9838; Wed, 4 Apr 2007 07:06:15 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r525515 - /directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/SubtreeValueEditor.java Date: Wed, 04 Apr 2007 14:06:15 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070404140615.882BE1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Wed Apr 4 07:06:14 2007 New Revision: 525515 URL: http://svn.apache.org/viewvc?view=rev&rev=525515 Log: Fixed a bug that prevented the Subtree Dialog to open when adding a new Subtree Specification. Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/SubtreeValueEditor.java Modified: directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/SubtreeValueEditor.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/SubtreeValueEditor.java?view=diff&rev=525515&r1=525514&r2=525515 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/SubtreeValueEditor.java (original) +++ directory/ldapstudio/trunk/ldapstudio-aciitemeditor/src/main/java/org/apache/directory/ldapstudio/aciitemeditor/SubtreeValueEditor.java Wed Apr 4 07:06:14 2007 @@ -34,6 +34,7 @@ import org.apache.directory.ldapstudio.browser.ui.widgets.BaseWidgetUtils; import org.apache.directory.ldapstudio.browser.ui.widgets.search.EntryWidget; import org.apache.directory.shared.ldap.name.LdapDN; +import org.apache.directory.shared.ldap.subtree.BaseSubtreeSpecification; import org.apache.directory.shared.ldap.subtree.SubtreeSpecification; import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationParser; import org.eclipse.jface.dialogs.Dialog; @@ -79,7 +80,9 @@ SubtreeSpecificationValueWrapper wrapper = ( SubtreeSpecificationValueWrapper ) value; SubtreeSpecificationDialog dialog = new SubtreeSpecificationDialog( shell, wrapper.connection, wrapper.subtreeSpecification ); - if ( dialog.open() == TextDialog.OK ) + if ( dialog.open() == TextDialog.OK + && ( ( dialog.getBase() != null && !"".equals( dialog.getBase() ) ) || dialog.getMinimum() != 0 + || dialog.getMaximum() != 0 || !dialog.getExclusions().isEmpty() ) ) { String base = dialog.getBase(); int minimum = dialog.getMinimum(); @@ -90,7 +93,7 @@ sb.append( "{" ); // Adding base - if ( base != null ) + if ( base != null && !"".equals( base ) ) { sb.append( " base \"" + base + "\"," ); } @@ -157,6 +160,10 @@ if ( subtreeSpecification != null ) { return new SubtreeSpecificationValueWrapper( connection, subtreeSpecification ); + } + else + { + return new SubtreeSpecificationValueWrapper( connection, new BaseSubtreeSpecification() ); } } catch ( ParseException e1 )