Attachment 128762 Details for Bug 267003 – Patch_v2

[patch] Patch_v2

Patch_v2.txt (text/plain), 1.66 KB, created by Kacper Zdanowicz

on 2009-03-13 14:28:37 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kacper Zdanowicz

Created: 2009-03-13 14:28:37 EDT

Size: 1.66 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/internal/GenerateDiffFileWizard.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Attic/GenerateDiffFileWizard.java,v
>retrieving revision 1.1.2.4
>diff -u -r1.1.2.4 GenerateDiffFileWizard.java
>--- compare/org/eclipse/compare/internal/GenerateDiffFileWizard.java	4 Mar 2009 11:40:49 -0000	1.1.2.4
>+++ compare/org/eclipse/compare/internal/GenerateDiffFileWizard.java	13 Mar 2009 17:49:50 -0000
>@@ -1214,9 +1214,9 @@
> 				super.setVisible(visible);
> 				if (!initialized && visible) {
> 					if (directionSelectionPage.isRightToLeft()) {
>-						unified_customRelativeText.setText(leftPath);
>-					} else {
> 						unified_customRelativeText.setText(rightPath);
>+					} else {
>+						unified_customRelativeText.setText(leftPath);
> 					}
> 					targetFileEdited = true;
> 				}
>@@ -1372,18 +1372,19 @@
> 	private void generateDiffFile(File file) {
> 		String toPath, oldPath = null;
> 		if (targetFileEdited) {
>-			toPath = optionsPage.getPath();
>+			oldPath = optionsPage.getPath();
> 		} else {
> 			if(directionSelectionPage.isRightToLeft()){
>-				toPath = this.rightPath;
>+				oldPath = this.rightPath;
> 			} else {
>-				toPath = this.leftPath;
>+				oldPath = this.leftPath;
> 			}
> 		}
>+
> 		if(directionSelectionPage.isRightToLeft()){
>-			oldPath = this.leftPath;
>+			toPath = this.leftPath;
> 		} else {
>-			oldPath = this.rightPath;
>+			toPath = this.rightPath;
> 		}
> 
> 		UnifiedDiffFormatter formatter = new UnifiedDiffFormatter(merger,

Actions: View | Diff

Attachments on bug 267003: 128566 | 128762