Attachment 56935 Details for Bug 170536 – Error handling related fixes

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

Error handling related fixes

error-handling.patch (text/plain), 6.67 KB, created by Steffen Pingel

on 2007-01-15 16:10:01 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Pingel

Created: 2007-01-15 16:10:01 EST

Size: 6.67 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylar.tasks.core
>Index: src/org/eclipse/mylar/tasks/core/MylarStatus.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.tasks.core/src/org/eclipse/mylar/tasks/core/MylarStatus.java,v
>retrieving revision 1.2
>diff -u -r1.2 MylarStatus.java
>--- src/org/eclipse/mylar/tasks/core/MylarStatus.java	13 Jan 2007 20:39:51 -0000	1.2
>+++ src/org/eclipse/mylar/tasks/core/MylarStatus.java	15 Jan 2007 20:59:19 -0000
>@@ -20,7 +20,7 @@
> 
> 	private String errorMessage;
> 
>-	private String repsitoryUrl = "";
>+	private String repositoryUrl = "";
> 
> 	public MylarStatus(int severity, String pluginId, int code) {
> 		super(severity, pluginId, code, "MylarStatus", null);
>@@ -34,20 +34,20 @@
> 
> 	public MylarStatus(int severity, String pluginId, int code, String repositoryUrl, Throwable e) {
> 		super(severity, pluginId, code, "MylarStatus", e);
>-		this.repsitoryUrl = repositoryUrl;
>+		this.repositoryUrl = repositoryUrl;
> 		this.errorMessage = e.getMessage();
> 	}
> 
> 	public MylarStatus(int severity, String pluginId, int code, String repositoryUrl, String errorMessage) {
> 		super(severity, pluginId, code, "MylarStatus", null);
> 		this.errorMessage = errorMessage;
>-		this.repsitoryUrl = repositoryUrl;
>+		this.repositoryUrl = repositoryUrl;
> 	}
> 
> 	public MylarStatus(int severity, String pluginId, int code, String repositoryUrl, String errorMessage, Throwable e) {
> 		super(severity, pluginId, code, "MylarStatus", e);
> 		this.errorMessage = errorMessage;
>-		this.repsitoryUrl = repositoryUrl;
>+		this.repositoryUrl = repositoryUrl;
> 	}
> 
> 	/**
>@@ -58,7 +58,7 @@
> 		switch (getCode()) {
> 		case REPOSITORY_LOGIN_ERROR:
> 			return MylarMessages
>-					.bind(MylarMessages.repository_login_failure, this.getRepsitoryUrl(), this.errorMessage);
>+					.bind(MylarMessages.repository_login_failure, this.getRepositoryUrl(), this.errorMessage);
> 		case REPOSITORY_NOT_FOUND:
> 			return MylarMessages.bind(MylarMessages.repository_not_found, this.errorMessage);
> 		case REPOSITORY_ERROR:
>@@ -66,7 +66,7 @@
> 		case IO_ERROR:
> 			String string1 = getException().getClass().getSimpleName();
> 			String string2 = getException().getMessage();
>-			Object[] strings = { getRepsitoryUrl(), string1, string2 };
>+			Object[] strings = { getRepositoryUrl(), string1, string2 };
> 			return MylarMessages.bind(MylarMessages.io_error, strings);
> 		case INTERNAL_ERROR:
> 			return MylarMessages.bind(MylarMessages.internal_error, this.errorMessage);
>@@ -92,11 +92,11 @@
> 		return "Unknown";
> 	}
> 
>-	public String getRepsitoryUrl() {
>-		return repsitoryUrl;
>+	public String getRepositoryUrl() {
>+		return repositoryUrl;
> 	}
> 
>-	public void setRepsitoryUrl(String repsitoryUrl) {
>-		this.repsitoryUrl = repsitoryUrl;
>+	public void setRepositoryUrl(String repositoryUrl) {
>+		this.repositoryUrl = repositoryUrl;
> 	}
> }
>#P org.eclipse.mylar.tasks.ui
>Index: src/org/eclipse/mylar/tasks/ui/SynchronizeQueryJob.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.tasks.ui/src/org/eclipse/mylar/tasks/ui/SynchronizeQueryJob.java,v
>retrieving revision 1.29
>diff -u -r1.29 SynchronizeQueryJob.java
>--- src/org/eclipse/mylar/tasks/ui/SynchronizeQueryJob.java	8 Dec 2006 00:46:07 -0000	1.29
>+++ src/org/eclipse/mylar/tasks/ui/SynchronizeQueryJob.java	15 Jan 2007 20:59:21 -0000
>@@ -28,7 +28,9 @@
> import org.eclipse.mylar.tasks.core.AbstractQueryHit;
> import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
> import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
>+import org.eclipse.mylar.tasks.core.IMylarStatusConstants;
> import org.eclipse.mylar.tasks.core.ITaskDataHandler;
>+import org.eclipse.mylar.tasks.core.MylarStatus;
> import org.eclipse.mylar.tasks.core.QueryHitCollector;
> import org.eclipse.mylar.tasks.core.RepositoryTaskData;
> import org.eclipse.mylar.tasks.core.TaskList;
>@@ -81,14 +83,16 @@
> 			TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
> 					repositoryQuery.getRepositoryKind(), repositoryQuery.getRepositoryUrl());
> 			if (repository == null) {
>-				repositoryQuery.setStatus(new Status(Status.ERROR, TasksUiPlugin.PLUGIN_ID, IStatus.OK,
>-						"No task repository found: " + repositoryQuery.getRepositoryUrl(), null));
>+				repositoryQuery.setStatus(new MylarStatus(Status.ERROR, TasksUiPlugin.PLUGIN_ID,
>+						IMylarStatusConstants.REPOSITORY_NOT_FOUND, repositoryQuery.getRepositoryUrl()));
> 			} else {
> 
> 				QueryHitCollector collector = new QueryHitCollector(TasksUiPlugin.getTaskListManager().getTaskList());
> 				IStatus resultingStatus = connector.performQuery(repositoryQuery, repository, monitor, collector);
> 
>-				if (resultingStatus.getException() == null) {
>+				if (resultingStatus.getSeverity() == IStatus.CANCEL) {
>+					// do nothing
>+				} else if (resultingStatus.isOK()) {
> 					repositoryQuery.updateHits(collector.getHits(), taskList);
> 					Set<AbstractQueryHit> temp = hitsToSynch.get(repository);
> 					if (temp == null) {
>@@ -125,15 +129,15 @@
> 						// TasksUiPlugin.getSynchronizationManager().synchronizeChanged(connector,
> 						// repository);
> 					}
>+
>+					repositoryQuery.setLastRefreshTimeStamp(DateUtil.getFormattedDate(new Date(), "MMM d, H:mm:ss"));
> 				} else {
> 					repositoryQuery.setStatus(resultingStatus);
> 				}
> 			}
> 
> 			repositoryQuery.setCurrentlySynchronizing(false);
>-			if (repositoryQuery.getStatus() == null) {
>-				repositoryQuery.setLastRefreshTimeStamp(DateUtil.getFormattedDate(new Date(), "MMM d, H:mm:ss"));
>-			}
>+
> 			TasksUiPlugin.getTaskListManager().getTaskList().notifyContainerUpdated(repositoryQuery);
> 			monitor.worked(1);
> 		}
>Index: src/org/eclipse/mylar/tasks/ui/editors/AbstractRepositoryTaskEditor.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.tasks.ui/src/org/eclipse/mylar/tasks/ui/editors/AbstractRepositoryTaskEditor.java,v
>retrieving revision 1.13
>diff -u -r1.13 AbstractRepositoryTaskEditor.java
>--- src/org/eclipse/mylar/tasks/ui/editors/AbstractRepositoryTaskEditor.java	15 Jan 2007 18:45:10 -0000	1.13
>+++ src/org/eclipse/mylar/tasks/ui/editors/AbstractRepositoryTaskEditor.java	15 Jan 2007 20:59:22 -0000
>@@ -2494,7 +2494,7 @@
> 							throw new CoreException(
> 									new MylarStatus(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID,
> 											IMylarStatusConstants.INTERNAL_ERROR,
>-											"Task could not be created. No addition information was provided by the connector."));
>+											"Task could not be created. No additional information was provided by the connector."));
> 						}
> 					} else {
> 						modifiedTask = (AbstractRepositoryTask) TasksUiPlugin.getTaskListManager().getTaskList()

Actions: View

Attachments on bug 170536: 56935 | 56936 | 66042 | 66043