You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2009/03/12 22:06:44 UTC

svn commit: r753016 - /directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java

Author: seelmann
Date: Thu Mar 12 21:06:44 2009
New Revision: 753016

URL: http://svn.apache.org/viewvc?rev=753016&view=rev
Log:
Fix for DIRSTUDIO-472: check if parent composite is disposed

Modified:
    directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java

Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java?rev=753016&r1=753015&r2=753016&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java Thu Mar 12 21:06:44 2009
@@ -374,20 +374,21 @@
             quickSearchValueCombo.setEnabled( enabled );
             quickSearchScopeButton.setEnabled( enabled );
             quickSearchRunButton.setEnabled( enabled && !"".equals( quickSearchAttributeCombo.getText() ) );
-        }
-        if ( !enabled )
-        {
-            quickSearchAttributeCombo.setToolTipText( null );
-            quickSearchOperatorCombo.setToolTipText( null );
-            quickSearchValueCombo.setToolTipText( null );
-            parent.setToolTipText( Messages.getString( "BrowserQuickSearchWidget.DisabledToolTipText" ) ); //$NON-NLS-1$
-        }
-        else
-        {
-            quickSearchAttributeCombo.setToolTipText( Messages.getString( "BrowserQuickSearchWidget.SearchAttribute" ) ); //$NON-NLS-1$
-            quickSearchOperatorCombo.setToolTipText( Messages.getString( "BrowserQuickSearchWidget.SearchOperator" ) ); //$NON-NLS-1$
-            quickSearchValueCombo.setToolTipText( Messages.getString( "BrowserQuickSearchWidget.SearchValue" ) ); //$NON-NLS-1$
-            parent.setToolTipText( null );
+
+            if ( !enabled )
+            {
+                quickSearchAttributeCombo.setToolTipText( null );
+                quickSearchOperatorCombo.setToolTipText( null );
+                quickSearchValueCombo.setToolTipText( null );
+                parent.setToolTipText( Messages.getString( "BrowserQuickSearchWidget.DisabledToolTipText" ) ); //$NON-NLS-1$
+            }
+            else
+            {
+                quickSearchAttributeCombo.setToolTipText( Messages.getString( "BrowserQuickSearchWidget.SearchAttribute" ) ); //$NON-NLS-1$
+                quickSearchOperatorCombo.setToolTipText( Messages.getString( "BrowserQuickSearchWidget.SearchOperator" ) ); //$NON-NLS-1$
+                quickSearchValueCombo.setToolTipText( Messages.getString( "BrowserQuickSearchWidget.SearchValue" ) ); //$NON-NLS-1$
+                parent.setToolTipText( null );
+            }
         }
     }
 
@@ -428,7 +429,7 @@
      */
     public void setInput( IBrowserConnection connection )
     {
-        if ( quickSearchAttributeCombo != null && quickSearchAttributePP != null )
+        if ( innerComposite != null && !innerComposite.isDisposed() )
         {
             String[] atdNames;
             if ( connection != null )