From 4e1eceac723251dbd55313eb4835da0856869328 Mon Sep 17 00:00:00 2001 From: Andrew Niefer Date: Thu, 10 Jun 2004 19:07:25 +0000 Subject: [PATCH] more changes for bug 57121 - disable search button if no search for is selected. --- .../cdt/internal/ui/search/CSearchPage.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java index 93b0a4abe5e..54bb5228a45 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchPage.java @@ -165,7 +165,9 @@ public class CSearchPage extends DialogPage implements ISearchPage, ICSearchCons else fCElement= null; handleAllElements( event ); - setLimitTo( getSearchFor() ); + List searchFor = getSearchFor(); + getContainer().setPerformActionEnabled( searchFor.size() != 0 ); + setLimitTo( searchFor ); updateCaseSensitiveCheckbox(); } }; @@ -349,6 +351,12 @@ public class CSearchPage extends DialogPage implements ISearchPage, ICSearchCons for( int i = 0; i < fLimitTo.length; i++ ) fLimitTo[ i ].setEnabled( set.contains( fLimitToValues[ i ] ) ); + + if( !fLimitTo[ LIMIT_TO_DEFINITIONS ].isEnabled() && fLimitTo[LIMIT_TO_DEFINITIONS].getSelection() ){ + fLimitTo[ LIMIT_TO_DEFINITIONS ].setSelection( false ); + fLimitTo[ LIMIT_TO_ALL ].setSelection( true ); + } + } private Control createSearchFor(Composite parent) { @@ -368,7 +376,7 @@ public class CSearchPage extends DialogPage implements ISearchPage, ICSearchCons return result; } - private List getSearchFor() { + protected List getSearchFor() { List search = new LinkedList( ); // boolean all = fSearchFor[ fSearchFor.length - 1 ].getSelection(); @@ -659,6 +667,8 @@ public class CSearchPage extends DialogPage implements ISearchPage, ICSearchCons private Button[] fLimitTo; + private final static int LIMIT_TO_ALL = 3; + private final static int LIMIT_TO_DEFINITIONS = 1; private LimitTo[] fLimitToValues = { DECLARATIONS, DEFINITIONS, REFERENCES, ALL_OCCURRENCES }; private String[] fLimitToText= { CSearchMessages.getString("CSearchPage.limitTo.declarations"), //$NON-NLS-1$