Avoid Exception construction in utility method

Exceptions should not be constructed in utility
methods since this will result in wrong strack
trace information.

Change-Id:	I92d1c5d86e41374829e436580cfc6b74b1d2eec1
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>

5 files changed, 10 insertions, 6 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
index d06b33d23c..da6ec02d92 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
@@ -99,17 +99,16 @@ public class Activator extends AbstractUIPlugin {
 	}
 
 	/**
-	 * Instantiate an error exception.
+	 * Instantiate an error status.
 	 *
 	 * @param message
 	 *            description of the error
 	 * @param thr
 	 *            cause of the error or null
-	 * @return an initialized {@link CoreException}
+	 * @return an initialized error status
 	 */
-	public static CoreException error(final String message, final Throwable thr) {
-		return new CoreException(new Status(IStatus.ERROR, getPluginId(), 0,
-				message, thr));
+	public static IStatus error(final String message, final Throwable thr) {
+		return new Status(IStatus.ERROR, getPluginId(), 0, message, thr);
 	}
 
 	/**
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitQuickDiffProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitQuickDiffProvider.java
index f694b4dcf8..66d822763c 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitQuickDiffProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitQuickDiffProvider.java
@@ -77,6 +77,7 @@ public class GitQuickDiffProvider implements IQuickDiffReferenceProvider {
 			try {
 				document = GitDocument.create(resource);
 			} catch (IOException e) {
+				// TODO throw an exception or log this?
 				Activator.error(UIText.QuickDiff_failedLoading, e);
 			}
 			return document;
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitMessageViewer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitMessageViewer.java
index 40bed0acae..f3b0ad0e11 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitMessageViewer.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitMessageViewer.java
@@ -290,7 +290,9 @@ class CommitMessageViewer extends TextViewer implements ISelectionChangedListene
 					outputDiff(d, diff);
 			}
 		} catch (IOException e) {
-			Activator.error(NLS.bind(UIText.CommitMessageViewer_errorGettingFileDifference,
+			// TODO throw an exception or log this?
+			Activator.error(NLS.bind(
+					UIText.CommitMessageViewer_errorGettingFileDifference,
 					commit.getId()), e);
 		}
 	}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffContentProvider.java
index 0e037226aa..da646853e7 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffContentProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiffContentProvider.java
@@ -37,6 +37,7 @@ class FileDiffContentProvider implements IStructuredContentProvider {
 			try {
 				diff = FileDiff.compute(walk, commit);
 			} catch (IOException err) {
+				// TODO throw an exception or log this?
 				Activator.error(NLS.bind(UIText.FileDiffContentProvider_errorGettingDifference,
 						commit.getId()), err);
 			}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java
index 9491ab0865..2d0307f0a8 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitHistoryPage.java
@@ -401,6 +401,7 @@ public class GitHistoryPage extends HistoryPage implements RepositoryListener {
 				right = new EditableRevision(nextFile);
 			}
 		} catch (IOException e) {
+			// TODO throw an exception or log this?
 			Activator.error(NLS.bind(UIText.GitHistoryPage_errorLookingUpPath,
 					gitPath, commit.getId()), e);
 		}