Attachment 21175 Details for Bug 95100 – Patch against org.eclipse.ui.workbench

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch against org.eclipse.ui.workbench

Workbench-95100.patch (text/plain), 4.10 KB, created by Kim Horne

on 2005-05-15 11:40:07 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Horne

Created: 2005-05-15 11:40:07 EDT

Size: 4.10 KB

patch

obsolete

>Index: Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java,v
>retrieving revision 1.42
>diff -u -r1.42 NewWizardNewPage.java
>--- Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java	10 May 2005 14:02:29 -0000	1.42
>+++ Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardNewPage.java	15 May 2005 15:39:09 -0000
>@@ -65,8 +65,7 @@
>  * New wizard selection tab that allows the user to select a registered 'New'
>  * wizard to be launched.
>  */
>-class NewWizardNewPage implements ISelectionChangedListener,
>-        IDoubleClickListener {
>+class NewWizardNewPage implements ISelectionChangedListener {
> 
>     // id constants
>     private static final String DIALOG_SETTING_SECTION_NAME = "NewWizardSelectionPage."; //$NON-NLS-1$
>@@ -323,7 +322,6 @@
>         viewer.setLabelProvider(new WorkbenchLabelProvider());
>         viewer.setSorter(NewWizardCollectionSorter.INSTANCE);
>         viewer.addSelectionChangedListener(this);
>-        viewer.addDoubleClickListener(this);
> 
>         ArrayList inputArray = new ArrayList();
> 
>@@ -362,14 +360,16 @@
>              * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
>              */
>             public void doubleClick(DoubleClickEvent event) {
>-                IStructuredSelection s = (IStructuredSelection) event
>-                        .getSelection();
>-                Object element = s.getFirstElement();
>+            	    IStructuredSelection s = (IStructuredSelection) event
>+						.getSelection();
>+				selectionChanged(new SelectionChangedEvent(event.getViewer(), s));
>+				
>+				Object element = s.getFirstElement();
>                 if (viewer.isExpandable(element)) {
>                     viewer.setExpandedState(element, !viewer
>                             .getExpandedState(element));
>                 } else if (element instanceof WorkbenchWizardElement) {
>-                    page.advanceToNextPage();
>+                    page.advanceToNextPageOrFinish();
>                 }
>             }
>         });
>@@ -480,16 +480,6 @@
>     }
> 
>     /**
>-     * A wizard in the wizard viewer has been double clicked. Treat it as a
>-     * selection.
>-     */
>-    public void doubleClick(DoubleClickEvent event) {
>-        selectionChanged(new SelectionChangedEvent(event.getViewer(), event
>-                .getViewer().getSelection()));
>-        page.advanceToNextPage();
>-    }
>-
>-    /**
>      * Expands the wizard categories in this page's category viewer that were
>      * expanded last time this page was used. If a category that was previously
>      * expanded no longer exists then it is ignored.
>Index: Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardSelectionPage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardSelectionPage.java,v
>retrieving revision 1.19
>diff -u -r1.19 NewWizardSelectionPage.java
>--- Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardSelectionPage.java	10 May 2005 14:02:29 -0000	1.19
>+++ Eclipse UI/org/eclipse/ui/internal/dialogs/NewWizardSelectionPage.java	15 May 2005 15:39:09 -0000
>@@ -12,6 +12,7 @@
> 
> import org.eclipse.jface.dialogs.IDialogSettings;
> import org.eclipse.jface.viewers.IStructuredSelection;
>+import org.eclipse.jface.wizard.WizardDialog;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
> import org.eclipse.ui.IWorkbench;
>@@ -65,8 +66,13 @@
>     /**
>      * Makes the next page visible.
>      */
>-    public void advanceToNextPage() {
>-        getContainer().showPage(getNextPage());
>+    public void advanceToNextPageOrFinish() {
>+    		if (canFlipToNextPage())
>+    			getContainer().showPage(getNextPage());
>+    		else if (canFinishEarly()) {
>+    			if (getWizard().performFinish()) //the following is bad - we need methods on IWizardContainer to accomplish this
>+    				((WizardDialog)getContainer()).close();
>+    		}
>     }
> 
>     /** (non-Javadoc)

Actions: View | Diff

Attachments on bug 95100: 21175