Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 60878 invoked from network); 27 Jan 2008 19:38:41 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Jan 2008 19:38:41 -0000 Received: (qmail 22058 invoked by uid 500); 27 Jan 2008 19:38:32 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 22006 invoked by uid 500); 27 Jan 2008 19:38:32 -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 21995 invoked by uid 99); 27 Jan 2008 19:38:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 27 Jan 2008 11:38:32 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Sun, 27 Jan 2008 19:38:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E3BEB1A9832; Sun, 27 Jan 2008 11:38:16 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r615634 - in /directory/studio/trunk: studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/ studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/ studio-ldapbrow... Date: Sun, 27 Jan 2008 19:38:11 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080127193816.E3BEB1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Sun Jan 27 11:38:09 2008 New Revision: 615634 URL: http://svn.apache.org/viewvc?rev=615634&view=rev Log: Fixed option "time limit", before the value's unit was milliseconds, now it is seconds. Also added a tooltip to count limit and time limit option. Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/LimitWidget.java directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchJob.java directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/LimitWidget.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/LimitWidget.java?rev=615634&r1=615633&r2=615634&view=diff ============================================================================== --- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/LimitWidget.java (original) +++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/search/LimitWidget.java Sun Jan 27 11:38:09 2008 @@ -102,8 +102,14 @@ limitGroup.setLayout( gl ); // Count limit + String countLimitToolTipText = "A size limit that restricts the maximum number of entries to be " + + "returned as a result of the search. A value of zero in this field " + + "indicates that no client-requested size limit restrictions are in " + + "effect for the search. Note: Servers may also enforce a maximum number of entries to return."; countLimitLabel = BaseWidgetUtils.createLabel( limitGroup, "&Count Limit:", 1 ); + countLimitLabel.setToolTipText( countLimitToolTipText ); countLimitText = BaseWidgetUtils.createText( limitGroup, "", 1 ); + countLimitText.setToolTipText( countLimitToolTipText ); countLimitText.addVerifyListener( new VerifyListener() { public void verifyText( VerifyEvent e ) @@ -123,8 +129,14 @@ } ); // Time limit - timeLimitLabel = BaseWidgetUtils.createLabel( limitGroup, "&Time Limit:", 1 ); + String timeLimitToolTipText = "A time limit that restricts the maximum time (in seconds) allowed for " + + "a search. A value of zero in this field indicates that no client-" + + "requested time limit restrictions are in effect for the search. " + + "Note: Servers may also enforce a maximum time limit for the search."; + timeLimitLabel = BaseWidgetUtils.createLabel( limitGroup, "&Time Limit (s):", 1 ); + timeLimitLabel.setToolTipText( timeLimitToolTipText ); timeLimitText = BaseWidgetUtils.createText( limitGroup, "", 1 ); + timeLimitText.setToolTipText( timeLimitToolTipText ); timeLimitText.addVerifyListener( new VerifyListener() { public void verifyText( VerifyEvent e ) Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java?rev=615634&r1=615633&r2=615634&view=diff ============================================================================== --- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java (original) +++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionIO.java Sun Jan 27 11:38:09 2008 @@ -32,7 +32,6 @@ import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.studio.connection.core.Connection; -import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod; import org.apache.directory.studio.connection.core.io.ConnectionIOException; import org.apache.directory.studio.ldapbrowser.core.model.BookmarkParameter; import org.apache.directory.studio.ldapbrowser.core.model.IBookmark; Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchJob.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchJob.java?rev=615634&r1=615633&r2=615634&view=diff ============================================================================== --- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchJob.java (original) +++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchJob.java Sun Jan 27 11:38:09 2008 @@ -300,7 +300,12 @@ } controls.setReturningAttributes( parameter.getReturningAttributes() ); controls.setCountLimit( parameter.getCountLimit() ); - controls.setTimeLimit( parameter.getTimeLimit() ); + int timeLimit = parameter.getTimeLimit() * 1000; + if ( timeLimit > 1 ) + { + timeLimit--; + } + controls.setTimeLimit( timeLimit ); String filter = parameter.getFilter(); AliasDereferencingMethod aliasesDereferencingMethod = parameter.getAliasesDereferencingMethod(); ReferralHandlingMethod referralsHandlingMethod = parameter.getReferralsHandlingMethod(); Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java?rev=615634&r1=615633&r2=615634&view=diff ============================================================================== --- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java (original) +++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java Sun Jan 27 11:38:09 2008 @@ -276,7 +276,7 @@ /** - * Gets the time limit in milliseconds, 0 means no limit. + * Gets the time limit in seconds, 0 means no limit. * * @return the time limit */ @@ -284,7 +284,7 @@ /** - * Sets the time limit in milliseconds, 0 means no limit. + * Sets the time limit in seconds, 0 means no limit. * * Calling this method causes firing a search update event. * Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java?rev=615634&r1=615633&r2=615634&view=diff ============================================================================== --- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java (original) +++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java Sun Jan 27 11:38:09 2008 @@ -59,7 +59,7 @@ /** The search scope. */ private SearchScope scope; - /** The time limit in milliseconds, 0 means no limit. */ + /** The time limit in seconds, 0 means no limit. */ private int timeLimit; /** The count limit, 0 means no limit. */ @@ -323,7 +323,7 @@ /** - * Gets the time limit in milliseconds, 0 means no limit. + * Gets the time limit in seconds, 0 means no limit. * * @return the time limit */ @@ -334,7 +334,7 @@ /** - * Sets the time limit in milliseconds, 0 means no limit. + * Sets the time limit in seconds, 0 means no limit. * * @param timeLimit the time limit */ Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java?rev=615634&r1=615633&r2=615634&view=diff ============================================================================== --- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java (original) +++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/Search.java Sun Jan 27 11:38:09 2008 @@ -128,7 +128,7 @@ * @param countLimit * the count limit, 0 indicates no limit * @param timeLimit - * the time limit in ms, 0 indicates no limit + * the time limit in seconds, 0 indicates no limit * @param aliasesDereferencingMethod * the aliases dereferencing method * @param referralsHandlingMethod