Attachment 193916 Details for Bug 343658 – Display information in the error dialog

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

[patch] Display information in the error dialog

patch_319661_handling_empty.txt (text/plain), 4.76 KB, created by Malgorzata Janczarska

on 2011-04-22 11:05:07 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Malgorzata Janczarska

Created: 2011-04-22 11:05:07 EDT

Size: 4.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.cvs.ui
>Index: src/org/eclipse/team/internal/ccvs/ui/operations/ClipboardDiffOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ClipboardDiffOperation.java,v
>retrieving revision 1.4
>diff -u -r1.4 ClipboardDiffOperation.java
>--- src/org/eclipse/team/internal/ccvs/ui/operations/ClipboardDiffOperation.java	22 May 2007 20:19:56 -0000	1.4
>+++ src/org/eclipse/team/internal/ccvs/ui/operations/ClipboardDiffOperation.java	22 Apr 2011 09:51:56 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2011 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
>@@ -35,7 +35,7 @@
> 	    super.execute(monitor);
> 	    
> 	    if (os.size() == 0 ||
>-	    	(!patchHasContents && !patchHasNewFiles)) {
>+	    	(!patchHasContents && !patchHasNewFiles && !emptyDiffReported)) {
>             reportEmptyDiff();
>         } else {
>             copyToClipboard(os);
>Index: src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java,v
>retrieving revision 1.21
>diff -u -r1.21 DiffOperation.java
>--- src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java	21 Apr 2011 13:03:23 -0000	1.21
>+++ src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java	22 Apr 2011 09:51:58 -0000
>@@ -17,6 +17,7 @@
> import org.eclipse.core.resources.*;
> import org.eclipse.core.resources.mapping.ResourceMapping;
> import org.eclipse.core.runtime.*;
>+import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.jface.dialogs.IDialogConstants;
> import org.eclipse.jface.dialogs.MessageDialog;
>@@ -44,9 +45,11 @@
> 	protected IPath patchRoot;
> 	protected boolean patchHasContents;
> 	protected boolean patchHasNewFiles;
>+	protected boolean emptyDiffReported;
> 	
> 	/* see bug 116427 */
> 	private Object destination = null;
>+
> 	
> 	/* see bug 159894 */
> 	private class CustomizableEOLPrintStream extends PrintStream{
>@@ -127,6 +130,7 @@
> 		this.patchRoot=patchRoot;
> 		this.patchHasContents=false;
> 		this.patchHasNewFiles=false;
>+		this.emptyDiffReported=false;
> 		this.destination = destination;
> 	}
> 	
>@@ -326,6 +330,12 @@
> 		if (toShow.size() > 0) {
> 			String msg = may ? CVSUIMessages.DiffOperation_ThePatchMayNotContainAllTheChanges
> 					: CVSUIMessages.DiffOperation_ThePatchDoesNotContainAllTheChanges;
>+
>+			if (!patchHasNewFiles && !patchHasContents) {
>+				toShow.add(new Status(IStatus.ERROR, CVSProviderPlugin.ID,
>+						CVSUIMessages.GenerateCVSDiff_noDiffsFoundMsg));
>+				emptyDiffReported = true;
>+			}
> 			status = new MultiStatus(CVSProviderPlugin.ID,
> 					CVSStatus.SERVER_ERROR,
> 					(IStatus[]) toShow.toArray(new IStatus[0]), CVSUIMessages.DiffOperation_ErrorsOccurredWhileCreatingThePatch, null);
>@@ -531,6 +541,7 @@
>         			CVSUIMessages.GenerateCVSDiff_noDiffsFoundMsg); 
>         	}
>         }, CVSUIPlugin.PERFORM_SYNC_EXEC);
>+        emptyDiffReported=true;
> 	 }
> 	
> 	protected ICVSFolder getLocalRoot(CVSTeamProvider provider) throws CVSException {
>Index: src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java,v
>retrieving revision 1.5
>diff -u -r1.5 FileDiffOperation.java
>--- src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java	21 Mar 2007 15:56:44 -0000	1.5
>+++ src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java	22 Apr 2011 09:51:58 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2007 IBM Corporation and others.
>+ * Copyright (c) 2005, 2011 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
>@@ -47,7 +47,7 @@
> 		}	
> 		
> 		if (this.isMultiPatch &&
>-			(!patchHasContents && !patchHasNewFiles)){
>+			(!patchHasContents && !patchHasNewFiles && !emptyDiffReported)){
> 			tempFile.delete();
> 			reportEmptyDiff();
> 			return;

Actions: View | Diff

Attachments on bug 343658: 193916 | 212572 | 212573