[Rubyeclipse-commit] org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search RubySearchPage.java,1.4,1.5 RubySearchQuery.java,1.4,1.5

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29199/src/org/rubypeople/rdt/internal/ui/search

Modified Files:
	RubySearchPage.java RubySearchQuery.java 
Log Message:
"Hide" warnings by commenting out even more of the stolen Java code.

Index: RubySearchQuery.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchQuery.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RubySearchQuery.java	19 Nov 2005 20:23:21 -0000	1.4
--- RubySearchQuery.java	20 Nov 2005 18:09:30 -0000	1.5
***************
*** 32,41 ****
  
  	private String fSearchString;
! 	private SearchScope fScope;
  	private RubySearchResult fResult;
  	private int fSymbolType ;
  
  	public RubySearchQuery(SearchScope scope, String searchString, int symbolType) {
! 		fScope = scope;
  		fSearchString = searchString;
  		fSymbolType = symbolType ;
--- 32,41 ----
  
  	private String fSearchString;
! //	private SearchScope fScope;
  	private RubySearchResult fResult;
  	private int fSymbolType ;
  
  	public RubySearchQuery(SearchScope scope, String searchString, int symbolType) {
! //		fScope = scope;
  		fSearchString = searchString;
  		fSymbolType = symbolType ;

Index: RubySearchPage.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/search/RubySearchPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RubySearchPage.java	13 Nov 2005 13:05:16 -0000	1.4
--- RubySearchPage.java	20 Nov 2005 18:09:30 -0000	1.5
***************
*** 159,176 ****
  	}
  
! 	private static final int HISTORY_SIZE = 12;
  
  	// Dialog store id constants
! 	private final static String PAGE_NAME = "JavaSearchPage"; //$NON-NLS-1$
! 	private final static String STORE_CASE_SENSITIVE = "CASE_SENSITIVE"; //$NON-NLS-1$
! 	private final static String STORE_HISTORY = "HISTORY"; //$NON-NLS-1$
! 	private final static String STORE_HISTORY_SIZE = "HISTORY_SIZE"; //$NON-NLS-1$
  
  	private final List fPreviousSearchPatterns;
  
! 	private SearchPatternData fInitialData;
  	private boolean fFirstTime = true;
! 	private IDialogSettings fDialogSettings;
! 	private boolean fIsCaseSensitive;
  
  	private Combo fPattern;
--- 159,176 ----
  	}
  
! //	private static final int HISTORY_SIZE = 12;
  
  	// Dialog store id constants
! //	private final static String PAGE_NAME = "JavaSearchPage"; //$NON-NLS-1$
! //	private final static String STORE_CASE_SENSITIVE = "CASE_SENSITIVE"; //$NON-NLS-1$
! //	private final static String STORE_HISTORY = "HISTORY"; //$NON-NLS-1$
! //	private final static String STORE_HISTORY_SIZE = "HISTORY_SIZE"; //$NON-NLS-1$
  
  	private final List fPreviousSearchPatterns;
  
! //	private SearchPatternData fInitialData;
  	private boolean fFirstTime = true;
! //	private IDialogSettings fDialogSettings;
! //	private boolean fIsCaseSensitive;
  
  	private Combo fPattern;
***************
*** 178,193 ****
  	private Button fCaseSensitive;
  
! 	private Button[] fLimitTo;
! 	private String[] fLimitToText = { "declarations" //$NON-NLS-1$
  	/*
  	 * SearchMessages.SearchPage_limitTo_declarations,
  	 * SearchMessages.SearchPage_limitTo_implementors,
  	 * SearchMessages.SearchPage_limitTo_references,
  	 * SearchMessages.SearchPage_limitTo_allOccurrences
! 	 */};
  
! 	private Button fSearchJRE;
! 	private static final int INDEX_REFERENCES = 2;
! 	private static final int INDEX_ALL = 3;
  	private SearchForManager searchForManager = new SearchForManager();
  
--- 178,194 ----
  	private Button fCaseSensitive;
  
! //	private Button[] fLimitTo;
  	/*
+ //	private String[] fLimitToText = { "declarations" //$NON-NLS-1$
  	 * SearchMessages.SearchPage_limitTo_declarations,
  	 * SearchMessages.SearchPage_limitTo_implementors,
  	 * SearchMessages.SearchPage_limitTo_references,
  	 * SearchMessages.SearchPage_limitTo_allOccurrences
!     };
!     */
  
! //	private Button fSearchJRE;
! //	private static final int INDEX_REFERENCES = 2;
! //	private static final int INDEX_ALL = 3;
  	private SearchForManager searchForManager = new SearchForManager();
  
***************
*** 239,244 ****
  	}
  
- 	private void setLimitTo(int searchFor, int limitTo) {
  	/*
  	 * if (!(searchFor == TYPE || searchFor == INTERFACE) && limitTo ==
  	 * IMPLEMENTORS) { limitTo= REFERENCES; }
--- 240,245 ----
  	}
  
  	/*
+ 	private void setLimitTo(int searchFor, int limitTo) {
  	 * if (!(searchFor == TYPE || searchFor == INTERFACE) && limitTo ==
  	 * IMPLEMENTORS) { limitTo= REFERENCES; }
***************
*** 256,261 ****
  	 * fLimitTo[READ_ACCESSES].setEnabled(searchFor == FIELD);
  	 * fLimitTo[WRITE_ACCESSES].setEnabled(searchFor == FIELD);
- 	 */
  	}
  
  	private String[] getPreviousSearchPatterns() {
--- 257,262 ----
  	 * fLimitTo[READ_ACCESSES].setEnabled(searchFor == FIELD);
  	 * fLimitTo[WRITE_ACCESSES].setEnabled(searchFor == FIELD);
  	}
+ 	*/
  
  	private String[] getPreviousSearchPatterns() {
***************
*** 418,422 ****
  
  			public void widgetSelected(SelectionEvent e) {
! 				fIsCaseSensitive = fCaseSensitive.getSelection();
  			}
  		});
--- 419,423 ----
  
  			public void widgetSelected(SelectionEvent e) {
! //				fIsCaseSensitive = fCaseSensitive.getSelection();
  			}
  		});
***************
*** 426,436 ****
  	}
  
! 	private boolean isValidSearchPattern() {
! 		if (getPattern().length() == 0) { return false; }
! 		// TODO
! 		return true;
! 		// return SearchPattern.createPattern(getPattern(), getSearchFor(),
! 		// getLimitTo(), SearchPattern.R_EXACT_MATCH) != null;
! 	}
  
  	/*
--- 427,437 ----
  	}
  
! //	private boolean isValidSearchPattern() {
! //		if (getPattern().length() == 0) { return false; }
! //		// TODO
! //		return true;
! //		// return SearchPattern.createPattern(getPattern(), getSearchFor(),
! //		// getLimitTo(), SearchPattern.R_EXACT_MATCH) != null;
! //	}
  
  	/*