Attachment 36852 Details for Bug 124919 – Sorry, try this patch instead.

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

[patch] Sorry, try this patch instead.

patch124919-2.txt (text/plain), 4.27 KB, created by Robert Elves

on 2006-03-23 17:12:54 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Elves

Created: 2006-03-23 17:12:54 EST

Size: 4.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylar.tasklist.tests
>Index: src/org/eclipse/mylar/tasklist/tests/TaskActivityViewTest.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.tasklist.tests/src/org/eclipse/mylar/tasklist/tests/TaskActivityViewTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 TaskActivityViewTest.java
>--- src/org/eclipse/mylar/tasklist/tests/TaskActivityViewTest.java	13 Mar 2006 03:08:03 -0000	1.2
>+++ src/org/eclipse/mylar/tasklist/tests/TaskActivityViewTest.java	23 Mar 2006 22:11:12 -0000
>@@ -102,9 +102,11 @@
> 		DateRangeContainer thisWeekActivity = MylarTaskListPlugin.getTaskListManager().getActivityThisWeek();
> 		assertNotNull(thisWeekActivity);
> 		assertEquals(0, thisWeekActivity.getChildren().size());
>-
>+		assertEquals(0, thisWeekActivity.getTotalElapsed());
> 		Calendar thisWeekCalendarStart = GregorianCalendar.getInstance();
>+		thisWeekCalendarStart.setTime(thisWeekActivity.getStart().getTime());
> 		Calendar thisWeekCalendarStop = GregorianCalendar.getInstance();
>+		thisWeekCalendarStop.setTime(thisWeekActivity.getStart().getTime());
> 		thisWeekCalendarStop.add(Calendar.MILLISECOND, 2);
> 		assertTrue(thisWeekActivity.includes(thisWeekCalendarStart));
> 
>#P org.eclipse.mylar.core
>Index: src/org/eclipse/mylar/internal/core/MylarContextManager.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.core/src/org/eclipse/mylar/internal/core/MylarContextManager.java,v
>retrieving revision 1.11
>diff -u -r1.11 MylarContextManager.java
>--- src/org/eclipse/mylar/internal/core/MylarContextManager.java	16 Mar 2006 05:20:25 -0000	1.11
>+++ src/org/eclipse/mylar/internal/core/MylarContextManager.java	23 Mar 2006 22:11:13 -0000
>@@ -107,16 +107,17 @@
> 
> 	private static ScalingFactors scalingFactors = new ScalingFactors();
> 
>-	private class ActivityListener implements ITimerThreadListener, IInteractionEventListener {
>+	private class ActivityListener implements ITimerThreadListener, IInteractionEventListener, IMylarContextListener {
> 
> 		private TimerThread timer;
>-
>+		private int sleepPeriod = 60000;
> 		private boolean isStalled;
> 
> 		public ActivityListener(int millis) {
> 			timer = new TimerThread(millis);
> 			timer.addListener(this);
> 			timer.start();
>+			sleepPeriod = millis;
> 			MylarPlugin.getDefault().addInteractionListener(this);
> 		}
> 
>@@ -155,11 +156,65 @@
> 
> 		public void setTimeout(int millis) {
> 			timer.kill();
>-
>+			sleepPeriod = millis;
> 			timer = new TimerThread(millis);
> 			timer.addListener(this);
> 			timer.start();
> 		}
>+
>+		public void contextActivated(IMylarContext context) {
>+			interactionObserved(null);
>+			timer.kill();
>+			timer = new TimerThread(sleepPeriod);
>+			timer.addListener(this);
>+			timer.start();
>+			
>+		}
>+
>+		public void contextDeactivated(IMylarContext context) {
>+			interactionObserved(null);
>+			timer.kill();
>+		}
>+
>+		public void presentationSettingsChanging(UpdateKind kind) {
>+			// ignore
>+			
>+		}
>+
>+		public void presentationSettingsChanged(UpdateKind kind) {
>+			// ignore
>+			
>+		}
>+
>+		public void interestChanged(IMylarElement element) {
>+			// ignore
>+			
>+		}
>+
>+		public void interestChanged(List<IMylarElement> elements) {
>+			// ignore
>+			
>+		}
>+
>+		public void nodeDeleted(IMylarElement element) {
>+			// ignore
>+			
>+		}
>+
>+		public void landmarkAdded(IMylarElement element) {
>+			// ignore
>+			
>+		}
>+
>+		public void landmarkRemoved(IMylarElement element) {
>+			// ignore
>+			
>+		}
>+
>+		public void edgesChanged(IMylarElement element) {
>+			// ignore
>+			
>+		}
> 	}
> 
> 	public MylarContextManager() {
>@@ -176,6 +231,7 @@
> 		}
> 
> 		activityListener = new ActivityListener(INACTIVITY_TIMEOUT_MILLIS);// INACTIVITY_TIMEOUT_MILLIS);
>+		this.addListener(activityListener);
> 		activityListener.startObserving();
> 	}
> 
>@@ -487,7 +543,7 @@
> 	public void contextDeactivated(String handleIdentifier) {
> 		try {
> 			IMylarContext context = currentContext.getContextMap().get(handleIdentifier);
>-			if (context != null) {
>+			if (context != null) {			
> 				saveContext(handleIdentifier);
> 				currentContext.getContextMap().remove(handleIdentifier);
>

Actions: View | Diff

Attachments on bug 124919: 36782 | 36852