Attachment 22533 Details for Bug 98707 – Creates public access for launching the ApplyPatch functionality.

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

[patch] Creates public access for launching the ApplyPatch functionality.

create-public-ApplyPatch-access.patch (text/plain), 15.12 KB, created by Jeff Pound

on 2005-06-07 13:40:59 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Pound

Created: 2005-06-07 13:40:59 EDT

Size: 15.12 KB

patch

obsolete

>Index: plugin.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/plugin.xml,v
>retrieving revision 1.57
>diff -u -r1.57 plugin.xml
>--- plugin.xml	9 May 2005 16:20:33 -0000	1.57
>+++ plugin.xml	7 Jun 2005 17:01:57 -0000
>@@ -195,7 +195,7 @@
>          <action
>                label="%CompareWithPatchAction.label"
>                tooltip="%CompareWithPatchAction.tooltip"
>-               class="org.eclipse.compare.internal.patch.CompareWithPatchAction"
>+               class="org.eclipse.compare.CompareWithPatchAction"
>                menubarPath="team.main/group1"
>                enablesFor="1"
>                id="compareWithPatch">
>Index: compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java
>===================================================================
>RCS file: compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java
>diff -N compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java
>--- compare/org/eclipse/compare/internal/patch/CompareWithPatchAction.java	14 Apr 2005 13:53:03 -0000	1.17
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,154 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2000, 2004 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
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *     IBM Corporation - initial API and implementation
>- *******************************************************************************/
>-package org.eclipse.compare.internal.patch;
>-
>-import java.lang.reflect.InvocationTargetException;
>-import java.util.Arrays;
>-
>-import org.eclipse.swt.SWT;
>-import org.eclipse.swt.events.SelectionAdapter;
>-import org.eclipse.swt.events.SelectionEvent;
>-import org.eclipse.swt.graphics.Image;
>-import org.eclipse.swt.widgets.Button;
>-import org.eclipse.swt.widgets.Composite;
>-import org.eclipse.swt.widgets.Control;
>-import org.eclipse.swt.widgets.Shell;
>-
>-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
>-import org.eclipse.jface.operation.IRunnableWithProgress;
>-import org.eclipse.jface.util.Assert;
>-import org.eclipse.jface.viewers.*;
>-import org.eclipse.jface.window.Window;
>-import org.eclipse.jface.wizard.IWizard;
>-import org.eclipse.jface.wizard.WizardDialog;
>-
>-import org.eclipse.core.resources.*;
>-import org.eclipse.core.runtime.*;
>-
>-import org.eclipse.ui.IEditorPart;
>-
>-import org.eclipse.compare.internal.*;
>-
>-
>-public class CompareWithPatchAction extends BaseCompareAction {
>-
>-	static class PatchWizardDialog extends WizardDialog {
>-	
>-		PatchWizardDialog(Shell parent, IWizard wizard) {
>-			super(parent, wizard);
>-			
>-			setShellStyle(getShellStyle() | SWT.RESIZE);
>-			setMinimumPageSize(700, 500);
>-		}
>-	}
>-	
>-	protected boolean isEnabled(ISelection selection) {
>-		return Utilities.getResources(selection).length == 1;
>-	}
>-		
>-	/* (non-Javadoc)
>-	 * @see org.eclipse.compare.internal.BaseCompareAction#run(org.eclipse.jface.viewers.ISelection)
>-	 */
>-	protected void run(ISelection selection) {
>-		PatchWizard wizard= new PatchWizard(selection);
>-		
>-		if (areAllEditorsSaved()) {
>-			PatchWizardDialog dialog= new PatchWizardDialog(CompareUIPlugin.getShell(), wizard);
>-			dialog.open();
>-		}
>-	}
>-
>-	private boolean areAllEditorsSaved(){
>-		if (CompareUIPlugin.getDirtyEditors().length == 0)
>-			return true;
>-		if (! saveAllDirtyEditors())
>-			return false;
>-		Shell shell= CompareUIPlugin.getShell();
>-		try {
>-			// Save isn't cancelable.
>-			IWorkspace workspace= ResourcesPlugin.getWorkspace();
>-			IWorkspaceDescription description= workspace.getDescription();
>-			boolean autoBuild= description.isAutoBuilding();
>-			description.setAutoBuilding(false);
>-			workspace.setDescription(description);
>-			try {
>-				new ProgressMonitorDialog(shell).run(false, false, createRunnable());
>-			} finally {
>-				description.setAutoBuilding(autoBuild);
>-				workspace.setDescription(description);
>-			}
>-			return true;
>-		} catch (InvocationTargetException e) {
>-			ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception);  
>-			return false;
>-		} catch (CoreException e) {
>-			ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception);  
>-			return false;			
>-		} catch (InterruptedException e) {
>-			Assert.isTrue(false); // Can't happen. Operation isn't cancelable.
>-			return false;
>-		}
>-	}
>-
>-	private IRunnableWithProgress createRunnable() {
>-		return new IRunnableWithProgress() {
>-			public void run(IProgressMonitor pm) {
>-				IEditorPart[] editorsToSave= CompareUIPlugin.getDirtyEditors();
>-				pm.beginTask(PatchMessages.PatchAction_SavingDirtyEditorsTask, editorsToSave.length); 
>-				for (int i= 0; i < editorsToSave.length; i++) {
>-					editorsToSave[i].doSave(new SubProgressMonitor(pm, 1));
>-					pm.worked(1);
>-				}
>-				pm.done();
>-			}
>-		};
>-	}
>-
>-	private boolean saveAllDirtyEditors() {
>-		if (ComparePreferencePage.getSaveAllEditors()) //must save everything
>-			return true;
>-		ListDialog dialog= new ListDialog(CompareUIPlugin.getShell()) {
>-			protected Control createDialogArea(Composite parent) {
>-				Composite result= (Composite) super.createDialogArea(parent);
>-				final Button check= new Button(result, SWT.CHECK);
>-				check.setText(PatchMessages.PatchAction_AlwaysSaveQuestion); 
>-				check.setSelection(ComparePreferencePage.getSaveAllEditors());
>-				check.addSelectionListener(
>-					new SelectionAdapter() {
>-						public void widgetSelected(SelectionEvent e) {
>-							ComparePreferencePage.setSaveAllEditors(check.getSelection());
>-						}
>-					}
>-				);
>-				applyDialogFont(result);
>-				return result;
>-			}
>-		};
>-		dialog.setTitle(PatchMessages.PatchAction_SaveAllQuestion); 
>-		dialog.setAddCancelButton(true);
>-		dialog.setLabelProvider(createDialogLabelProvider());
>-		dialog.setMessage(PatchMessages.PatchAction_SaveAllDescription); 
>-		dialog.setContentProvider(new ListContentProvider());
>-		dialog.setInput(Arrays.asList(CompareUIPlugin.getDirtyEditors()));
>-		return dialog.open() == Window.OK;
>-	}
>-
>-	private ILabelProvider createDialogLabelProvider() {
>-		return new LabelProvider() {
>-			public Image getImage(Object element) {
>-				return ((IEditorPart) element).getTitleImage();
>-			}
>-			public String getText(Object element) {
>-				return ((IEditorPart) element).getTitle();
>-			}
>-		};
>-	}
>-}
>Index: compare/org/eclipse/compare/internal/patch/InputPatchPage.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java,v
>retrieving revision 1.26
>diff -u -r1.26 InputPatchPage.java
>--- compare/org/eclipse/compare/internal/patch/InputPatchPage.java	6 May 2005 19:03:14 -0000	1.26
>+++ compare/org/eclipse/compare/internal/patch/InputPatchPage.java	7 Jun 2005 17:01:57 -0000
>@@ -214,6 +214,7 @@
> 		//gd.horizontalIndent= 8;
> 		gd.widthHint= SIZING_TEXT_FIELD_WIDTH;
> 		fPatchFileNameField.setLayoutData(gd);
>+		fPatchFileNameField.setText(fPatchWizard.getPatchPath());
> 		
> 		fPatchFileBrowseButton= new Button(fPatchFileGroup, SWT.PUSH);
> 		fPatchFileBrowseButton.setText(PatchMessages.InputPatchPage_ChooseFileButton_text); 
>@@ -269,8 +270,11 @@
> 		
> 		PatchWizard pw= (PatchWizard) getWizard();
> 		IResource target= pw.getTarget();
>-		IWorkspace workspace= target.getWorkspace();
>-		IWorkspaceRoot root= workspace.getRoot();
>+		IWorkspaceRoot root = null;
>+		if (target != null) {
>+			IWorkspace workspace= target.getWorkspace();
>+			root= workspace.getRoot();
>+		}
> 		
> 		Tree tree= new Tree(parent, SWT.BORDER);
> 		GridData gd= new GridData(GridData.FILL_BOTH);
>Index: compare/org/eclipse/compare/internal/patch/PatchWizard.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java,v
>retrieving revision 1.22
>diff -u -r1.22 PatchWizard.java
>--- compare/org/eclipse/compare/internal/patch/PatchWizard.java	14 Apr 2005 13:53:03 -0000	1.22
>+++ compare/org/eclipse/compare/internal/patch/PatchWizard.java	7 Jun 2005 17:01:57 -0000
>@@ -25,7 +25,7 @@
> import org.eclipse.compare.internal.*;
> 
> 
>-/* package */ class PatchWizard extends Wizard {
>+/* package */ public class PatchWizard extends Wizard {
> 	
> 	// dialog store id constants
> 	private final static String DIALOG_SETTINGS_KEY= "PatchWizard"; //$NON-NLS-1$
>@@ -36,12 +36,12 @@
> 	
> 	private Patcher fPatcher;
> 	private IResource fTarget;
>-
>+	private String fPatchPath;
> 		
> 	/*
> 	 * Creates a wizard for applying a patch file to the workspace.
> 	 */
>-	/* package */ PatchWizard(ISelection selection) {
>+	/* package */ public PatchWizard(ISelection selection) {
> 		
> 		setDefaultPageImageDescriptor(CompareUIPlugin.getImageDescriptor("wizban/applypatch_wizban.gif"));	//$NON-NLS-1$
> 		setWindowTitle(PatchMessages.PatchWizard_title); 
>@@ -131,5 +131,13 @@
> 		
> 		return true;
> 	}
>+
>+	public String getPatchPath() {
>+		return fPatchPath;
>+	}
>+
>+	public void setPatchPath(String patchPath) {
>+		fPatchPath = patchPath;
>+	}
> }
> 
>Index: compare/org/eclipse/compare/CompareWithPatchAction.java
>===================================================================
>RCS file: compare/org/eclipse/compare/CompareWithPatchAction.java
>diff -N compare/org/eclipse/compare/CompareWithPatchAction.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ compare/org/eclipse/compare/CompareWithPatchAction.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,162 @@
>+/*******************************************************************************
>+ * Copyright (c) 2000, 2004 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.compare;
>+
>+import java.lang.reflect.InvocationTargetException;
>+import java.util.Arrays;
>+
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.SelectionAdapter;
>+import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.graphics.Image;
>+import org.eclipse.swt.widgets.Button;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Control;
>+import org.eclipse.swt.widgets.Shell;
>+
>+import org.eclipse.jface.dialogs.ProgressMonitorDialog;
>+import org.eclipse.jface.operation.IRunnableWithProgress;
>+import org.eclipse.jface.util.Assert;
>+import org.eclipse.jface.viewers.*;
>+import org.eclipse.jface.window.Window;
>+import org.eclipse.jface.wizard.IWizard;
>+import org.eclipse.jface.wizard.WizardDialog;
>+
>+import org.eclipse.core.resources.*;
>+import org.eclipse.core.runtime.*;
>+
>+import org.eclipse.ui.IEditorPart;
>+
>+import org.eclipse.compare.internal.*;
>+import org.eclipse.compare.internal.patch.PatchMessages;
>+import org.eclipse.compare.internal.patch.PatchWizard;
>+
>+
>+public class CompareWithPatchAction extends BaseCompareAction {
>+
>+	private String patchPath = ""; //$NON-NLS-1$
>+	
>+	static class PatchWizardDialog extends WizardDialog {
>+	
>+		PatchWizardDialog(Shell parent, IWizard wizard) {
>+			super(parent, wizard);
>+			
>+			setShellStyle(getShellStyle() | SWT.RESIZE);
>+			setMinimumPageSize(700, 500);
>+		}
>+	}
>+	
>+	protected boolean isEnabled(ISelection selection) {
>+		return Utilities.getResources(selection).length == 1;
>+	}
>+		
>+	/* (non-Javadoc)
>+	 * @see org.eclipse.compare.internal.BaseCompareAction#run(org.eclipse.jface.viewers.ISelection)
>+	 */
>+	protected void run(ISelection selection) {
>+		PatchWizard wizard= new PatchWizard(selection);
>+		wizard.setPatchPath(patchPath);
>+		if (areAllEditorsSaved()) {
>+			PatchWizardDialog dialog= new PatchWizardDialog(CompareUIPlugin.getShell(), wizard);
>+			dialog.open();
>+		}
>+	}
>+
>+	private boolean areAllEditorsSaved(){
>+		if (CompareUIPlugin.getDirtyEditors().length == 0)
>+			return true;
>+		if (! saveAllDirtyEditors())
>+			return false;
>+		Shell shell= CompareUIPlugin.getShell();
>+		try {
>+			// Save isn't cancelable.
>+			IWorkspace workspace= ResourcesPlugin.getWorkspace();
>+			IWorkspaceDescription description= workspace.getDescription();
>+			boolean autoBuild= description.isAutoBuilding();
>+			description.setAutoBuilding(false);
>+			workspace.setDescription(description);
>+			try {
>+				new ProgressMonitorDialog(shell).run(false, false, createRunnable());
>+			} finally {
>+				description.setAutoBuilding(autoBuild);
>+				workspace.setDescription(description);
>+			}
>+			return true;
>+		} catch (InvocationTargetException e) {
>+			ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception);  
>+			return false;
>+		} catch (CoreException e) {
>+			ExceptionHandler.handle(e, shell, PatchMessages.PatchAction_ExceptionTitle, PatchMessages.PatchAction_Exception);  
>+			return false;			
>+		} catch (InterruptedException e) {
>+			Assert.isTrue(false); // Can't happen. Operation isn't cancelable.
>+			return false;
>+		}
>+	}
>+
>+	private IRunnableWithProgress createRunnable() {
>+		return new IRunnableWithProgress() {
>+			public void run(IProgressMonitor pm) {
>+				IEditorPart[] editorsToSave= CompareUIPlugin.getDirtyEditors();
>+				pm.beginTask(PatchMessages.PatchAction_SavingDirtyEditorsTask, editorsToSave.length); 
>+				for (int i= 0; i < editorsToSave.length; i++) {
>+					editorsToSave[i].doSave(new SubProgressMonitor(pm, 1));
>+					pm.worked(1);
>+				}
>+				pm.done();
>+			}
>+		};
>+	}
>+
>+	private boolean saveAllDirtyEditors() {
>+		if (ComparePreferencePage.getSaveAllEditors()) //must save everything
>+			return true;
>+		ListDialog dialog= new ListDialog(CompareUIPlugin.getShell()) {
>+			protected Control createDialogArea(Composite parent) {
>+				Composite result= (Composite) super.createDialogArea(parent);
>+				final Button check= new Button(result, SWT.CHECK);
>+				check.setText(PatchMessages.PatchAction_AlwaysSaveQuestion); 
>+				check.setSelection(ComparePreferencePage.getSaveAllEditors());
>+				check.addSelectionListener(
>+					new SelectionAdapter() {
>+						public void widgetSelected(SelectionEvent e) {
>+							ComparePreferencePage.setSaveAllEditors(check.getSelection());
>+						}
>+					}
>+				);
>+				applyDialogFont(result);
>+				return result;
>+			}
>+		};
>+		dialog.setTitle(PatchMessages.PatchAction_SaveAllQuestion); 
>+		dialog.setAddCancelButton(true);
>+		dialog.setLabelProvider(createDialogLabelProvider());
>+		dialog.setMessage(PatchMessages.PatchAction_SaveAllDescription); 
>+		dialog.setContentProvider(new ListContentProvider());
>+		dialog.setInput(Arrays.asList(CompareUIPlugin.getDirtyEditors()));
>+		return dialog.open() == Window.OK;
>+	}
>+
>+	private ILabelProvider createDialogLabelProvider() {
>+		return new LabelProvider() {
>+			public Image getImage(Object element) {
>+				return ((IEditorPart) element).getTitleImage();
>+			}
>+			public String getText(Object element) {
>+				return ((IEditorPart) element).getTitle();
>+			}
>+		};
>+	}
>+
>+	public void setPatchPath(String patchPath) {
>+		this.patchPath = patchPath;
>+	}
>+}

Actions: View | Diff

Attachments on bug 98707: 22533 | 22548 | 22638 | 34624