Bug 332978 - [Help] Scope Selection in Help View should be more like Webapp - patch for item 3v20110404

1 files changed, 13 insertions, 1 deletions

diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java
index 3bf648f7a..ddf8b260c 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ScopeSetDialog.java
@@ -275,7 +275,17 @@ public class ScopeSetDialog extends TrayDialog  {
     
 	private void enableTable() {
 		if (viewer != null) {
-		    viewer.getTable().setEnabled(showSelectedRadio.getSelection());
+		    boolean showSelected = showSelectedRadio.getSelection();
+			viewer.getTable().setEnabled(showSelected);
+		    viewer.refresh();
+		    // Ensure that a scope is selected unless there are no 
+		    // user defined scopes
+		    if (showSelected && viewer.getSelection().isEmpty()) {
+		    	Object firstElement = viewer.getElementAt(0);
+		    	if ( firstElement != null ) {
+		    		viewer.setSelection(new StructuredSelection(firstElement));
+		    	}
+		    }
 		}
 	}
     
@@ -347,6 +357,7 @@ public class ScopeSetDialog extends TrayDialog  {
 		switch (buttonId) {
 		case NEW_ID:
 			doNew();
+			doEdit();
 			break;
 		case EDIT_ID:
 			doEdit();
@@ -369,6 +380,7 @@ public class ScopeSetDialog extends TrayDialog  {
 			scheduleOperation(new AddOperation(newSet));
 			sets.add(newSet);
 			viewer.refresh();
+			viewer.setSelection(new StructuredSelection(newSet));
 			updateButtons();
 		}
 	}