Attachment #154469 for bug #236169

Lines 10-16 Export-Package: org.eclipse.compare, Link Here

(-)a/plugins/org.eclipse.compare/META-INF/MANIFEST.MF (-1 / +1 lines)
10	org.eclipse.compare.contentmergeviewer,	10	org.eclipse.compare.contentmergeviewer,
11	org.eclipse.compare.internal;x-internal:=true,	11	org.eclipse.compare.internal;x-internal:=true,
12	org.eclipse.compare.internal.merge;x-internal:=true,	12	org.eclipse.compare.internal.merge;x-internal:=true,
13	org.eclipse.compare.internal.patch;x-internal:=true,	13	org.eclipse.compare.internal.patch;x-friends:="org.eclipse.team.ui",
14	org.eclipse.compare.patch,	14	org.eclipse.compare.patch,
15	org.eclipse.compare.structuremergeviewer	15	org.eclipse.compare.structuremergeviewer
16	Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",	16	Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",

Lines 71-77 import org.eclipse.ui.views.navigator.ResourceComparator; Link Here

(-)a/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java (-3 / +6 lines)
71		71
72	import com.ibm.icu.text.MessageFormat;	72	import com.ibm.icu.text.MessageFormat;
73		73
74	/* package */ class InputPatchPage extends WizardPage {	74	public class InputPatchPage extends WizardPage {
75		75
76	// constants	76	// constants
77	protected static final int SIZING_TEXT_FIELD_WIDTH= 250;	77	protected static final int SIZING_TEXT_FIELD_WIDTH= 250;
Lines 124-130 import com.ibm.icu.text.MessageFormat; Link Here
124	}	124	}
125	}	125	}
126		126
127	InputPatchPage(PatchWizard pw) {	127	public InputPatchPage(PatchWizard pw) {
128	super(INPUTPATCHPAGE_NAME, PatchMessages.InputPatchPage_title, null);	128	super(INPUTPATCHPAGE_NAME, PatchMessages.InputPatchPage_title, null);
129	fPatchWizard= pw;	129	fPatchWizard= pw;
130	setMessage(PatchMessages.InputPatchPage_message);	130	setMessage(PatchMessages.InputPatchPage_message);
Lines 206-212 import com.ibm.icu.text.MessageFormat; Link Here
206	// all of the projects that make up the patch and continue on to final preview page	206	// all of the projects that make up the patch and continue on to final preview page
207	// else go on to target selection page	207	// else go on to target selection page
208	if (patcher.isWorkspacePatch()) {	208	if (patcher.isWorkspacePatch()) {
209	return fPatchWizard.getPage(PreviewPatchPage2.PREVIEWPATCHPAGE_NAME);	209	// skip 'Patch Target' page
		210	IWizardPage page = super.getNextPage();
		211	if (page.getName().equals(PatchTargetPage.PATCHTARGETPAGE_NAME))
		212	return page.getNextPage();
210	}	213	}
211		214
212	return super.getNextPage();	215	return super.getNextPage();

Lines 12-29 package org.eclipse.compare.internal.patch; Link Here

(-)a/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java (-4 / +17 lines)
12		12
13	import org.eclipse.compare.internal.ICompareContextIds;	13	import org.eclipse.compare.internal.ICompareContextIds;
14	import org.eclipse.compare.internal.Utilities;	14	import org.eclipse.compare.internal.Utilities;
15	import org.eclipse.core.resources.*;	15	import org.eclipse.core.resources.IFile;
		16	import org.eclipse.core.resources.IResource;
		17	import org.eclipse.core.resources.IWorkspaceRoot;
		18	import org.eclipse.core.resources.ResourcesPlugin;
16	import org.eclipse.core.runtime.IPath;	19	import org.eclipse.core.runtime.IPath;
17	import org.eclipse.core.runtime.Path;	20	import org.eclipse.core.runtime.Path;
18	import org.eclipse.jface.dialogs.Dialog;	21	import org.eclipse.jface.dialogs.Dialog;
19	import org.eclipse.jface.dialogs.MessageDialog;	22	import org.eclipse.jface.dialogs.MessageDialog;
20	import org.eclipse.jface.viewers.*;	23	import org.eclipse.jface.viewers.DoubleClickEvent;
		24	import org.eclipse.jface.viewers.IDoubleClickListener;
		25	import org.eclipse.jface.viewers.ISelectionChangedListener;
		26	import org.eclipse.jface.viewers.SelectionChangedEvent;
		27	import org.eclipse.jface.viewers.StructuredSelection;
		28	import org.eclipse.jface.viewers.TreeViewer;
21	import org.eclipse.jface.wizard.IWizardPage;	29	import org.eclipse.jface.wizard.IWizardPage;
22	import org.eclipse.jface.wizard.WizardPage;	30	import org.eclipse.jface.wizard.WizardPage;
23	import org.eclipse.swt.SWT;	31	import org.eclipse.swt.SWT;
24	import org.eclipse.swt.layout.GridData;	32	import org.eclipse.swt.layout.GridData;
25	import org.eclipse.swt.layout.GridLayout;	33	import org.eclipse.swt.layout.GridLayout;
26	import org.eclipse.swt.widgets.*;	34	import org.eclipse.swt.widgets.Button;
		35	import org.eclipse.swt.widgets.Composite;
		36	import org.eclipse.swt.widgets.Event;
		37	import org.eclipse.swt.widgets.Listener;
		38	import org.eclipse.swt.widgets.Text;
		39	import org.eclipse.swt.widgets.Tree;
27	import org.eclipse.ui.PlatformUI;	40	import org.eclipse.ui.PlatformUI;
28	import org.eclipse.ui.model.WorkbenchContentProvider;	41	import org.eclipse.ui.model.WorkbenchContentProvider;
29	import org.eclipse.ui.model.WorkbenchLabelProvider;	42	import org.eclipse.ui.model.WorkbenchLabelProvider;
Lines 48-54 public class PatchTargetPage extends WizardPage { Link Here
48		61
49	protected final static String PATCHTARGETPAGE_NAME = "PatchTargetPage"; //$NON-NLS-1$	62	protected final static String PATCHTARGETPAGE_NAME = "PatchTargetPage"; //$NON-NLS-1$
50		63
51	PatchTargetPage(WorkspacePatcher patcher) {	64	public PatchTargetPage(WorkspacePatcher patcher) {
52	super(PATCHTARGETPAGE_NAME, PatchMessages.PatchTargetPage_title, null);	65	super(PATCHTARGETPAGE_NAME, PatchMessages.PatchTargetPage_title, null);
53	setMessage(PatchMessages.PatchTargetPage_message);	66	setMessage(PatchMessages.PatchTargetPage_message);
54	fPatcher = patcher;	67	fPatcher = patcher;





	private boolean fHasNewDialogSettings;
	
	protected InputPatchPage fPatchWizardPage;
	protected PatchTargetPage fPatchTargetPage;
	protected PreviewPatchPage2 fPreviewPage2;
	
	private final WorkspacePatcher fPatcher;
	

		}
	}

	protected WorkspacePatcher getPatcher() {
		return fPatcher;
	}

	protected IStorage getPatch() {
		return patch;
	}

	IResource getTarget() {
		return fPatcher.getTarget();
	}
	
	
	/* (non-Javadoc)
	 * Method declared on IWizard.
	 */

Return to bug 236169

Lines 40-48 public class PatchWizard extends Wizard { Link Here

(-)a/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java (-6 / +9 lines)
40		40
41	private boolean fHasNewDialogSettings;	41	private boolean fHasNewDialogSettings;
42		42
43	private InputPatchPage fPatchWizardPage;	43	protected InputPatchPage fPatchWizardPage;
44	private PatchTargetPage fPatchTargetPage;	44	protected PatchTargetPage fPatchTargetPage;
45	private PreviewPatchPage2 fPreviewPage2;	45	protected PreviewPatchPage2 fPreviewPage2;
46		46
47	private final WorkspacePatcher fPatcher;	47	private final WorkspacePatcher fPatcher;
48		48
Lines 86-100 public class PatchWizard extends Wizard { Link Here
86	}	86	}
87	}	87	}
88		88
89	WorkspacePatcher getPatcher() {	89	protected WorkspacePatcher getPatcher() {
90	return fPatcher;	90	return fPatcher;
91	}	91	}
92		92
		93	protected IStorage getPatch() {
		94	return patch;
		95	}
		96
93	IResource getTarget() {	97	IResource getTarget() {
94	return fPatcher.getTarget();	98	return fPatcher.getTarget();
95	}	99	}
96		100
97
98	/* (non-Javadoc)	101	/* (non-Javadoc)
99	* Method declared on IWizard.	102	* Method declared on IWizard.
100	*/	103	*/