Attachment 42482 Details for Bug 143354 – A patch for the Apply Patch Wizard - in unified diff format

[patch] A patch for the Apply Patch Wizard - in unified diff format

ApplyPatch.patch (text/plain), 2.55 KB, created by Bogdan Gheorghe

on 2006-05-24 15:43:54 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bogdan Gheorghe

Created: 2006-05-24 15:43:54 EDT

Size: 2.55 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java,v
>retrieving revision 1.34
>diff -u -r1.34 PreviewPatchPage.java
>--- compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java	25 Apr 2006 22:03:15 -0000	1.34
>+++ compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java	24 May 2006 19:44:08 -0000
>@@ -42,7 +42,6 @@
> import org.eclipse.jface.viewers.DecoratingLabelProvider;
> import org.eclipse.jface.viewers.DoubleClickEvent;
> import org.eclipse.jface.viewers.ICheckStateListener;
>-import org.eclipse.jface.viewers.ICheckable;
> import org.eclipse.jface.viewers.IDoubleClickListener;
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.jface.viewers.ISelectionChangedListener;
>@@ -335,41 +334,7 @@
> 		fTreeViewer.setSorter(new WorkbenchViewerSorter());
> 		fTreeViewer.addCheckStateListener(new ICheckStateListener() {
> 			public void checkStateChanged(CheckStateChangedEvent event) {
>-				Object obj = event.getElement();
>-				ICheckable checked = event.getCheckable();
>-				DiffProject proj = null;
>-				if (obj instanceof DiffProject){
>-					proj = (DiffProject) obj;
>-					// Check to see if any of the Diffs contained by the DiffProject
>-					// have their diff problems set
>-					Object[] diffs = proj.getChildren(null);
>-					for (int i= 0; i<diffs.length; i++) {
>-					if (((Diff) diffs[i]).containsProblems()){
>-						checked.setChecked(obj, false);
>-							break;
>-						}
>-					}
>-				} else if (obj instanceof Diff){
>-					proj = ((Diff) obj).getProject();
>-					// If Diff has any diff problems set, at least one hunk underneath 
>-					// does not match - so don't allow entire tree to be checked
>-					if (((Diff) obj).containsProblems()){
>-						checked.setChecked(obj, false);
>-					}
>-				} else if (obj instanceof Hunk){
>-					Diff diff = (Diff) ((Hunk) obj).getParent(null);
>-					proj = diff.getProject();
>-					// Check to see if this hunk has any problems OR
>-					// if its parent has any problems
>-					if( diff.getDiffProblem() ||
>-						((Hunk) obj).getHunkProblem()){
>-						checked.setChecked(obj, false);
>-					}
>-				}
>-				if (proj!= null &&
>-				   !proj.getProject().exists()){
>-					checked.setChecked(obj, false);
>-				}
>+				fTreeViewer.setSubtreeChecked(event.getElement(),event.getChecked());
> 				updateEnablements();
> 			}
> 		});

Actions: View | Diff

Attachments on bug 143354: 42358 | 42482