Attachment 165144 Details for Bug 195729 – patch

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

[patch] patch

cvs-import-xpress.patch (text/plain), 6.95 KB, created by Darin Wright

on 2010-04-16 16:21:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2010-04-16 16:21:05 EDT

Size: 6.95 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/wizards/imports/CVSBundleImportPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/CVSBundleImportPage.java,v
>retrieving revision 1.4
>diff -u -r1.4 CVSBundleImportPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/imports/CVSBundleImportPage.java	2 Mar 2010 16:56:09 -0000	1.4
>+++ src/org/eclipse/pde/internal/ui/wizards/imports/CVSBundleImportPage.java	16 Apr 2010 20:20:30 -0000
>@@ -10,31 +10,19 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.wizards.imports;
> 
>-import org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage;
>-
>-import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
>-
> import org.eclipse.jface.dialogs.IDialogSettings;
>-import org.eclipse.jface.viewers.ArrayContentProvider;
>-import org.eclipse.jface.viewers.ILabelProvider;
>-import org.eclipse.jface.viewers.StyledCellLabelProvider;
>-import org.eclipse.jface.viewers.StyledString;
>-import org.eclipse.jface.viewers.TableViewer;
>-import org.eclipse.jface.viewers.ViewerCell;
>-import org.eclipse.jface.viewers.ViewerComparator;
>+import org.eclipse.jface.viewers.*;
> import org.eclipse.jface.wizard.WizardPage;
> import org.eclipse.pde.internal.core.importing.CvsBundleImportDescription;
>+import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
> import org.eclipse.pde.internal.ui.SWTFactory;
>+import org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage;
> import org.eclipse.swt.SWT;
>-import org.eclipse.swt.events.SelectionAdapter;
>-import org.eclipse.swt.events.SelectionEvent;
>-import org.eclipse.swt.events.SelectionListener;
>+import org.eclipse.swt.events.*;
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.layout.GridData;
>-import org.eclipse.swt.widgets.Button;
>-import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.swt.widgets.Table;
>+import org.eclipse.swt.widgets.*;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.ide.IDE;
> 
>@@ -161,8 +149,9 @@
> 		useHead.setSelection(head);
> 		versions.setSelection(!head);
> 
>-		// fill viewer
>-		bundlesViewer.setInput(descriptions);
>+		if (descriptions != null) {
>+			bundlesViewer.setInput(descriptions);
>+		}
> 	}
> 
> 	/* (non-Javadoc)
>@@ -215,6 +204,10 @@
> 	 */
> 	public void setSelection(BundleImportDescription[] descriptions) {
> 		this.descriptions = descriptions;
>+		// fill viewer
>+		if (bundlesViewer != null) {
>+			bundlesViewer.setInput(descriptions);
>+		}
> 	}
> 
> }
>Index: src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java,v
>retrieving revision 1.59
>diff -u -r1.59 PluginImportWizard.java
>--- src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java	16 Apr 2010 19:59:06 -0000	1.59
>+++ src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java	16 Apr 2010 20:20:30 -0000
>@@ -97,7 +97,7 @@
> 
> 		}
> 		if (page1.getImportType() == PluginImportOperation.IMPORT_FROM_REPOSITORY) {
>-			if (getContainer().getCurrentPage() == page3) {
>+			if (getContainer().getCurrentPage() instanceof BaseImportWizardSecondPage) {
> 				// ensure to set the models to import when finished is pressed without advancing to the repository pages
> 				page1.configureBundleImportPages(models);
> 			}
>@@ -182,7 +182,7 @@
> 			}
> 			return page2;
> 		}
>-		if (page.equals(page3)) {
>+		if (page.equals(page2) || page.equals(page3)) {
> 			return page1.getNextPage(page);
> 		}
> 		return null;
>@@ -210,7 +210,7 @@
> 	 * @see org.eclipse.jface.dialogs.IPageChangingListener#handlePageChanging(org.eclipse.jface.dialogs.PageChangingEvent)
> 	 */
> 	public void handlePageChanging(PageChangingEvent event) {
>-		if (event.getCurrentPage() == page3 && event.getTargetPage() instanceof IBundeImportWizardPage) {
>+		if (event.getCurrentPage() instanceof BaseImportWizardSecondPage && event.getTargetPage() instanceof IBundeImportWizardPage) {
> 			IPluginModelBase[] models = getModelsToImport();
> 			page1.configureBundleImportPages(models);
> 		}
>Index: src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java,v
>retrieving revision 1.77
>diff -u -r1.77 PluginImportWizardFirstPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java	16 Apr 2010 19:59:06 -0000	1.77
>+++ src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java	16 Apr 2010 20:20:30 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2009 IBM Corporation and others.
>+ * Copyright (c) 2003, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -135,29 +135,6 @@
> 		Group importChoices = SWTFactory.createGroup(container, PDEUIMessages.ImportWizard_FirstPage_importGroup, 1, 1, GridData.FILL_HORIZONTAL);
> 		scanButton = SWTFactory.createRadioButton(importChoices, PDEUIMessages.ImportWizard_FirstPage_scanAll);
> 		importButton = SWTFactory.createRadioButton(importChoices, PDEUIMessages.ImportWizard_FirstPage_importPrereqs);
>-		SelectionAdapter adapter = new SelectionAdapter() {
>-			public void widgetSelected(SelectionEvent e) {
>-				updateRepositoryOption();
>-			}
>-		};
>-		scanButton.addSelectionListener(adapter);
>-		importButton.addSelectionListener(adapter);
>-	}
>-
>-	/**
>-	 * For now, disable repository import when not scanning.
>-	 * TODO: this should be supported in the future.
>-	 */
>-	private void updateRepositoryOption() {
>-		if (importButton.getSelection()) {
>-			repositoryButton.setEnabled(false);
>-			if (repositoryButton.getSelection()) {
>-				repositoryButton.setSelection(false);
>-				binaryButton.setSelection(true);
>-			}
>-		} else {
>-			repositoryButton.setEnabled(true);
>-		}
> 	}
> 
> 	/**
>@@ -218,7 +195,6 @@
> 		}
> 		scanButton.setSelection(scan);
> 		importButton.setSelection(!scan);
>-		updateRepositoryOption();
> 
> 	}
> 
>@@ -765,7 +741,7 @@
> 				return (IWizardPage) nextPages.get(index + 1);
> 			}
> 		}
>-		if (page instanceof PluginImportWizardDetailedPage) {
>+		if (page instanceof PluginImportWizardDetailedPage || page instanceof PluginImportWizardExpressPage) {
> 			return (IWizardPage) nextPages.get(0);
> 		}
> 		return null;

Actions: View | Diff

Attachments on bug 195729: 73261 | 160522 | 160533 | 160644 | 160671 | 165142 | 165144