[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2353] trunk/org.rubypeople.rdt.ui/src/org/ rubypeople/rdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java

[<caw...@us...>]

Revision: 2353
          http://svn.sourceforge.net/rubyeclipse/?rev=2353&view=rev
Author:   cawilliams
Date:     2007-04-20 16:27:42 -0700 (Fri, 20 Apr 2007)

Log Message:
-----------
remove button that shouldn't be there

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java	2007-04-20 22:54:48 UTC (rev 2352)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java	2007-04-20 23:27:42 UTC (rev 2353)
@@ -74,17 +74,15 @@
 	
 	private Control fSWTControl;
 
-	private final int IDX_ADDFOL= 0;
-	private final int IDX_ADDEXT= 1;
-	private final int IDX_EDIT= 3;
-	private final int IDX_REMOVE= 4;
+	private final int IDX_ADDEXT= 0;
+	private final int IDX_EDIT= 2;
+	private final int IDX_REMOVE= 3;
 		
 	public LibrariesWorkbookPage(CheckedListDialogField classPathList, IWorkbenchPreferenceContainer pageContainer) {
 		fClassPathList= classPathList;
 		fSWTControl= null;
 		
 		String[] buttonLabels= new String[] { 
-			NewWizardMessages.LibrariesWorkbookPage_libraries_addclassfolder_button, 
 			NewWizardMessages.LibrariesWorkbookPage_libraries_addextjar_button, 
 			/* */ null,  
 			NewWizardMessages.LibrariesWorkbookPage_libraries_edit_button, 
@@ -200,10 +198,7 @@
 	
 	private void libaryPageCustomButtonPressed(DialogField field, int index) {
 		CPListElement[] libentries= null;
-		switch (index) {
-		case IDX_ADDFOL: /* add (internal) folder */
-			libentries= openScriptFolderDialog(null);
-			break;			
+		switch (index) {	
 		case IDX_ADDEXT: /* add external folder */
 			libentries= openExtFolderDialog(null);
 			break;
@@ -226,9 +221,6 @@
 					elementsToAdd.add(curr);
 				}
 			}
-			if (!elementsToAdd.isEmpty() && (index == IDX_ADDFOL)) {
-				askForAddingExclusionPatternsDialog(elementsToAdd);
-			}
 			
 			fLibrariesList.addElements(elementsToAdd);
 			fLibrariesList.postSetSelection(new StructuredSelection(libentries));
@@ -262,17 +254,6 @@
 		fLibrariesList.postSetSelection(new StructuredSelection(element));
 	}
 	
-	private void askForAddingExclusionPatternsDialog(List newEntries) {
-		HashSet modified= new HashSet();
-		List existing= fClassPathList.getElements();
-		fixNestingConflicts((CPListElement[])newEntries.toArray(new CPListElement[newEntries.size()]), (CPListElement[])existing.toArray(new CPListElement[existing.size()]), modified);
-		if (!modified.isEmpty()) {
-			String title= NewWizardMessages.LibrariesWorkbookPage_exclusion_added_title; 
-			String message= NewWizardMessages.LibrariesWorkbookPage_exclusion_added_message; 
-			MessageDialog.openInformation(getShell(), title, message);
-		}
-	}
-	
 	protected void libaryPageDoubleClicked(TreeListDialogField field) {
 		List selection= fLibrariesList.getSelectedElements();
 		if (canEdit(selection)) {
@@ -424,9 +405,6 @@
 		List selElements= fLibrariesList.getSelectedElements();
 		fLibrariesList.enableButton(IDX_EDIT, canEdit(selElements));
 		fLibrariesList.enableButton(IDX_REMOVE, canRemove(selElements));
-		
-		boolean noAttributes= containsOnlyTopLevelEntries(selElements);
-		fLibrariesList.enableButton(IDX_ADDFOL, noAttributes);
 	}
 	
 	private boolean canEdit(List selElements) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.