Attachment 84311 Details for Bug 99059 – Patch #3

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

[patch] Patch #3

patch_99059_20071203.txt (text/plain), 2.88 KB, created by Tomasz Zarna

on 2007-12-03 08:39:13 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2007-12-03 08:39:13 EST

Size: 2.88 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.cvs.ui
>Index: src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java,v
>retrieving revision 1.211
>diff -u -r1.211 CVSUIPlugin.java
>--- src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java	11 Sep 2007 18:03:39 -0000	1.211
>+++ src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java	3 Dec 2007 13:35:16 -0000
>@@ -343,11 +343,36 @@
> 	}
> 	
> 	// flags to tailor error reporting
>+	/**
>+	 * Use this flag if you are calling openError from a none UI thread. The
>+	 * flag is checked in openDialog method.
>+	 */
> 	public static final int PERFORM_SYNC_EXEC = 1;
>+	/**
>+	 * Use this flag to log all TeamExceptions and its descendants.
>+	 */
> 	public static final int LOG_TEAM_EXCEPTIONS = 2;
>-	public static final int LOG_CORE_EXCEPTIONS = 4;
>+	/**
>+	 * Use this flag to log all CoreExceptions excluding TeamExceptions and its
>+	 * descendants.
>+	 */
>+	public static final int LOG_NONTEAM_CORE_EXCEPTIONS = 4;
>+	/**
>+	 * Use this flag to log an exception other than CoreException (e.g.
>+	 * IOException).
>+	 */
> 	public static final int LOG_OTHER_EXCEPTIONS = 8;
>-	public static final int LOG_NONTEAM_EXCEPTIONS = LOG_CORE_EXCEPTIONS | LOG_OTHER_EXCEPTIONS;
>+	/**
>+	 * Use this flag to log all CoreExceptions.
>+	 */
>+	public static final int LOG_CORE_EXCEPTIONS = LOG_TEAM_EXCEPTIONS
>+			| LOG_NONTEAM_CORE_EXCEPTIONS;
>+	/**
>+	 * Use this flag to log all exceptions different than TeamException and its
>+	 * descendant.
>+	 */
>+	public static final int LOG_NONTEAM_EXCEPTIONS = LOG_NONTEAM_CORE_EXCEPTIONS
>+			| LOG_OTHER_EXCEPTIONS;
> 	
> 	/**
> 	 * Convenience method for showing an error dialog 
>@@ -385,17 +410,17 @@
> 		// Determine the status to be displayed (and possibly logged)
> 		IStatus status = null;
> 		boolean log = false;
>-		if (exception instanceof CoreException) {
>-			status = ((CoreException)exception).getStatus();
>-			log = ((flags & LOG_CORE_EXCEPTIONS) > 0);
>-		} else if (exception instanceof TeamException) {
>+		if (exception instanceof TeamException) {
> 			status = ((TeamException)exception).getStatus();
>-			log = ((flags & LOG_TEAM_EXCEPTIONS) > 0);
>+			log = (flags & LOG_TEAM_EXCEPTIONS) > 0;
>+		} else if (exception instanceof CoreException) {
>+			status = ((CoreException)exception).getStatus();
>+			log = (flags & LOG_NONTEAM_CORE_EXCEPTIONS) > 0;
> 		} else if (exception instanceof InterruptedException) {
> 			return new CVSStatus(IStatus.OK, CVSUIMessages.ok); 
> 		} else if (exception != null) {
> 			status = new CVSStatus(IStatus.ERROR, CVSUIMessages.internal, exception); 
>-			log = ((flags & LOG_OTHER_EXCEPTIONS) > 0);
>+			log = (flags & LOG_OTHER_EXCEPTIONS) > 0;
> 			if (title == null) title = CVSUIMessages.internal; 
> 		}
>

Actions: View | Diff

Attachments on bug 99059: 83860 | 83982 | 84311