Attachment 196071 Details for Bug 168333 – see comment #6

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

[patch] see comment #6

Timing_and_Estimation_Plugin.mylyn_trac_core.patch (text/plain), 6.51 KB, created by Roland Hautz

on 2011-05-19 01:29:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Hautz

Created: 2011-05-19 01:29:10 EDT

Size: 6.51 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.trac.core
>Index: src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.trac.core /src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java,v
>retrieving revision 1.9
>diff -u -r1.9 AbstractTracClient.java
>--- src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java 22 Jun 2009 02:00:53 -0000 1.9
>+++ src/org/eclipse/mylyn/internal/trac/core/client/AbstractTracClient.java 4 Jul 2009 22:49:40 -0000
>@@ -37,6 +37,7 @@
> import org.eclipse.mylyn.internal.trac.core.model.TracTicketStatus;
> import org.eclipse.mylyn.internal.trac.core.model.TracTicketType;
> import org.eclipse.mylyn.internal.trac.core.model.TracVersion;
>+import org.eclipse.mylyn.tasks.core.ITask;
> 
> /**
> * @author Steffen Pingel
>@@ -232,4 +233,9 @@
> return null;
> }
> 
>+	public void activateTask(ITask task) {
>+	}
>+
>+	public void deactivateTask() {
>+	}
> }
>Index: src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.trac.core /src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java,v
>retrieving revision 1.20
>diff -u -r1.20 TracXmlRpcClient.java
>--- src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcClient.java 22 Jun 2009 02:00:53 -0000 1.20
>+++ src/org/eclipse/mylyn/internal/trac/core/client/TracXmlRpcCl ient.java 4 Jul 2009 22:49:40 -0000
>@@ -80,6 +80,7 @@
> import org.eclipse.mylyn.internal.trac.core.util.TracHttpClientTransportFactory.TracHttpException;
> import org.eclipse.mylyn.internal.trac.core.util.TracUtil;
> import org.eclipse.mylyn.internal.trac.core.util.TracXmlRpcClientRequest;
>+import org.eclipse.mylyn.tasks.core.ITask;
> import org.eclipse.osgi.util.NLS;
> 
> /**
>@@ -1146,4 +1147,21 @@
> call(monitor, "ticket.delete", ticketId); //$NON-NLS-1$
> }
> 
>+ @Override
>+ public void activateTask(ITask task) {
>+ 	try {
>+ 		call(null, "worklog.startWork", Integer.parseInt(task.getTaskId()));
>+ 	} catch (TracException e) {
>+ 		throw new RuntimeException(e);
>+ 	}
>+ }
>+
>+ @Override
>+ public void deactivateTask() {
>+ 	try {
>+ 		call(null, "worklog.stopWork", "", 0);
>+ 	} catch (TracException e) {
>+ 		throw new RuntimeException(e);
>+ 	}
>+ }
> }
> \ No newline at end of file
>Index: src/org/eclipse/mylyn/internal/trac/core/client/ITracClient.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.trac.core /src/org/eclipse/mylyn/internal/trac/core/client/ITracClient.java,v
>retrieving revision 1.10
>diff -u -r1.10 ITracClient.java
>--- src/org/eclipse/mylyn/internal/trac/core/client/ITracClient.java 20 Jun 2009 07:32:02 -0000 1.10
>+++ src/org/eclipse/mylyn/internal/trac/core/client/ITracClient.java 4 Jul 2009 22:49:40 -0000
>@@ -29,6 +29,7 @@
> import org.eclipse.mylyn.internal.trac.core.model.TracTicketStatus;
> import org.eclipse.mylyn.internal.trac.core.model.TracTicketType;
> import org.eclipse.mylyn.internal.trac.core.model.TracVersion;
>+import org.eclipse.mylyn.tasks.core.ITask;
> 
> /**
> * Defines the requirements for classes that provide remote access to Trac repositories.
>@@ -209,4 +210,7 @@
> 
> 	List<TracComment> getComments(int id, IProgressMonitor monitor) throws TracException;
>  
>+ public void activateTask(ITask task);
>+
>+ public void deactivateTask();
> }
>Index: src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.trac.core /src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java,v
>retrieving revision 1.73
>diff -u -r1.73 TracTaskDataHandler.java
>--- src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java 2 Jul 2009 06:52:44 -0000 1.73
>+++ src/org/eclipse/mylyn/internal/trac/core/TracTaskDataHandler.java 4 Jul 2009 22:49:40 -0000
>@@ -660,4 +660,31 @@
> }
> }
> 
>+ public void activateTask(TaskRepository repository, ITask task) {
>+	if (repository == null) {
>+	return;
>+ }
>+
>+ ITracClient server = connector.getClientManager().getTracClient(repository);
>+
>+ if (server == null) {
>+ 	return;
>+ }
>+
>+ server.activateTask(task);
>+ }
>+
>+ public void deactivateTask(TaskRepository repository) {
>+	if (repository == null) {
>+	return;
>+ }
>+
>+ ITracClient server = connector.getClientManager().getTracClient(repository);
>+
>+ if (server == null) {
>+	return;
>+ }
>+
>+ server.deactivateTask();
>+ }
> }
>Index:
>src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.trac.core /src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java,v
>retrieving revision 1.106
>diff -u -r1.106 TracRepositoryConnector.java
>--- src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java 14 Jun 2009 23:38:26 -0000 1.106
>+++ src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java 4 Jul 2009 22:49:39 -0000
>@@ -31,6 +31,7 @@
> import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
> import org.eclipse.mylyn.commons.net.AuthenticationType;
> import org.eclipse.mylyn.commons.net.Policy;
>+import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
> import org.eclipse.mylyn.internal.trac.core.client.AbstractWikiHandler;
> import org.eclipse.mylyn.internal.trac.core.client.ITracClient;
> import org.eclipse.mylyn.internal.trac.core.client.ITracClient.Version;
>@@ -652,6 +653,18 @@
> 				task.setCompletionDate(null);
> 			}
> 		}
>+
>+ if (task instanceof AbstractTask) {
>+	Map<String, TaskAttribute> attributes = taskData.getRoot().getAttributes();
>+
>+	if (attributes.get("totalhours") != null) {
>+		AbstractTask atask = (AbstractTask) task;
>+		float totalHours = Float.parseFloat(attributes.get("totalhours").getValue());
>+
>+		atask.setTotalTimeHours(totalHours);
>+	}
>+ }
>+
>  		task.setUrl(taskRepository.getRepositoryUrl() + ITracClient.TICKET_URL + taskData.getTaskId()); 
>   		if (!taskData.isPartial()) {
> 			task.setAttribute(TASK_KEY_SUPPORTS_SUBTASKS, Boolean.toString(taskDataHandler.supportsSubtasks(taskData)));
>@@ -696,4 +709,13 @@
>			throw new CoreException(TracCorePlugin.toStatus(e, repository));
>		}
>	} 
>+ @Override
>+ public void activateTask(TaskRepository repository, ITask task) {
>+ taskDataHandler.activateTask(repository, task);
>+ }
>+
>+ @Override
>+ public void deactivateTask(TaskRepository repository) {
>+ taskDataHandler.deactivateTask(repository);
>+ }
> }

Actions: View | Diff

Attachments on bug 168333: 196069 | 196070 | 196071