Attachment 128566 Details for Bug 267003 – Patch v1

[patch] Patch v1

patch_local_history.txt (text/plain), 1.67 KB, created by Krzysztof Pog這dzi雟ki

on 2009-03-12 10:39:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Pog這dzi雟ki

Created: 2009-03-12 10:39:39 EDT

Size: 1.67 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	12 Mar 2009 00:13:40 -0000
>@@ -1182,8 +1182,8 @@
> 		this.merger = merger;
> 		this.leftDoc = merger.getDocument(MergeViewerContentProvider.LEFT_CONTRIBUTOR);
> 		this.rightDoc = merger.getDocument(MergeViewerContentProvider.RIGHT_CONTRIBUTOR);
>-		this.leftPath = merger.getCompareConfiguration().getLeftLabel(leftDoc);
>-		this.rightPath = merger.getCompareConfiguration().getRightLabel(rightDoc);
>+		this.leftPath = preparePath(merger.getCompareConfiguration().getLeftLabel(leftDoc));
>+		this.rightPath = preparePath(merger.getCompareConfiguration().getRightLabel(rightDoc));
> 		this.rightToLeft = rightToLeft;
> 	}
> 
>@@ -1453,6 +1453,18 @@
> 	public LocationPage getLocationPage() {
> 		return locationPage;
> 	}
>+	
>+	private String preparePath(String old_path){
>+		String s=old_path;
>+		if(old_path.indexOf("Local")>-1){
>+			String [] tym = old_path.split(" ");
>+			if (tym[0].equals("Local:"))
>+				return tym[1];
>+			if (tym[1].equals("history:"))
>+				return "Local: "+tym[2];
>+		}
>+		return s;
>+	}
> 
> 	/**
> 	 * The class maintain proper selection of radio button within the group:

Actions: View | Diff

Attachments on bug 267003: 128566 | 128762