Attachment #36782 for bug #124919

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





	private static ScalingFactors scalingFactors = new ScalingFactors();

	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);
		}



		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() {

		}

		activityListener = new ActivityListener(INACTIVITY_TIMEOUT_MILLIS);// INACTIVITY_TIMEOUT_MILLIS);
		this.addListener(activityListener);
		activityListener.startObserving();
	}


	public void contextDeactivated(String handleIdentifier) {
		try {
			IMylarContext context = currentContext.getContextMap().get(handleIdentifier);
			if (context != null) {			
				saveContext(handleIdentifier);
				currentContext.getContextMap().remove(handleIdentifier);


Lines 40-48 Link Here

(-)src/org/eclipse/mylar/provisional/tasklist/TaskListManager.java (-5 / +42 lines)
40	* TODO: clean-up	40	* TODO: clean-up
41	*	41	*
42	* @author Mik Kersten	42	* @author Mik Kersten
		43	* @author Rob Elves (task activity)
43	*/	44	*/
44	public class TaskListManager {	45	public class TaskListManager {
45		46
		47	// TODO: get these two fields from preferences
		48	private static final int START_DAY = Calendar.MONDAY;
		49
		50	private static final int START_HOUR = 9;
		51
46	private static final int NUM_WEEKS_PREVIOUS = -1;	52	private static final int NUM_WEEKS_PREVIOUS = -1;
47		53
48	private static final int NUM_WEEKS_NEXT = 1;	54	private static final int NUM_WEEKS_NEXT = 1;
Lines 167-174 Link Here
167	this.taskListFile = file;	173	this.taskListFile = file;
168	this.taskListWriter = taskListWriter;	174	this.taskListWriter = taskListWriter;
169	this.nextLocalTaskId = startId;	175	this.nextLocalTaskId = startId;
170		176	// setupCalendarRanges();
171	setupCalendarRanges();
172	MylarPlugin.getContextManager().addActivityMetaContextListener(CONTEXT_LISTENER);	177	MylarPlugin.getContextManager().addActivityMetaContextListener(CONTEXT_LISTENER);
173	}	178	}
174		179
Lines 203-209 Link Here
203	private void parseFutureReminders() {	208	private void parseFutureReminders() {
204	activityFuture.clear();	209	activityFuture.clear();
205	activityNextWeek.clear();	210	activityNextWeek.clear();
		211	HashSet<ITask> toRemove = new HashSet<ITask>();
		212	toRemove.addAll(activityThisWeek.getChildren());
		213	for (ITask activity : toRemove) {
		214	DateRangeActivityDelegate delegate = (DateRangeActivityDelegate) activity;
		215	Calendar calendar = GregorianCalendar.getInstance();
		216	calendar.setTime(delegate.getReminderDate());
		217	if (!activityThisWeek.includes(calendar) && delegate.getActivity() == 0) {
		218	activityThisWeek.remove(delegate);
		219	}
		220	}
206	GregorianCalendar tempCalendar = new GregorianCalendar();	221	GregorianCalendar tempCalendar = new GregorianCalendar();
		222	tempCalendar.setFirstDayOfWeek(START_DAY);
207	for (ITask task : tasksWithReminders) {	223	for (ITask task : tasksWithReminders) {
208	if (task.getReminderDate() != null) {	224	if (task.getReminderDate() != null) {
209	tempCalendar.setTime(task.getReminderDate());	225	tempCalendar.setTime(task.getReminderDate());
Lines 234-239 Link Here
234	.getTask(event.getStructureHandle());	250	.getTask(event.getStructureHandle());
235	if (currentTask != null) {	251	if (currentTask != null) {
236	GregorianCalendar calendar = new GregorianCalendar();	252	GregorianCalendar calendar = new GregorianCalendar();
		253	calendar.setFirstDayOfWeek(START_DAY);
237	calendar.setTime(event.getDate());	254	calendar.setTime(event.getDate());
238	currentTaskStart = calendar;	255	currentTaskStart = calendar;
239	currentHandle = event.getStructureHandle();	256	currentHandle = event.getStructureHandle();
Lines 246-251 Link Here
246	if (!event.getStructureHandle().equals(MylarContextManager.ACTIVITY_HANDLE)	263	if (!event.getStructureHandle().equals(MylarContextManager.ACTIVITY_HANDLE)
247	&& currentHandle.equals(event.getStructureHandle())) {	264	&& currentHandle.equals(event.getStructureHandle())) {
248	GregorianCalendar calendarEnd = new GregorianCalendar();	265	GregorianCalendar calendarEnd = new GregorianCalendar();
		266	calendarEnd.setFirstDayOfWeek(START_DAY);
249	calendarEnd.setTime(event.getDate());	267	calendarEnd.setTime(event.getDate());
250	calendarEnd.getTime();	268	calendarEnd.getTime();
251	currentTaskEnd = calendarEnd;	269	currentTaskEnd = calendarEnd;
Lines 305-323 Link Here
305	private void setupCalendarRanges() {	323	private void setupCalendarRanges() {
306		324
307	GregorianCalendar currentBegin = new GregorianCalendar();	325	GregorianCalendar currentBegin = new GregorianCalendar();
		326	currentBegin.setFirstDayOfWeek(START_DAY);
308	Date startTime = new Date();	327	Date startTime = new Date();
309	currentBegin.setTime(startTime);	328	currentBegin.setTime(startTime);
310	snapToStartOfWeek(currentBegin);	329	snapToStartOfWeek(currentBegin);
311	GregorianCalendar currentEnd = new GregorianCalendar();	330	GregorianCalendar currentEnd = new GregorianCalendar();
		331	currentEnd.setFirstDayOfWeek(START_DAY);
312	snapToEndOfWeek(currentEnd);	332	snapToEndOfWeek(currentEnd);
313	activityThisWeek = new DateRangeContainer(currentBegin, currentEnd, DESCRIPTION_THIS_WEEK, taskList);	333	activityThisWeek = new DateRangeContainer(currentBegin, currentEnd, DESCRIPTION_THIS_WEEK, taskList);
314	dateRangeContainers.add(activityThisWeek);	334	dateRangeContainers.add(activityThisWeek);
315		335
316	GregorianCalendar previousStart = new GregorianCalendar();	336	GregorianCalendar previousStart = new GregorianCalendar();
		337	previousStart.setFirstDayOfWeek(START_DAY);
317	previousStart.setTime(new Date());	338	previousStart.setTime(new Date());
318	previousStart.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_PREVIOUS);	339	previousStart.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_PREVIOUS);
319	snapToStartOfWeek(previousStart);	340	snapToStartOfWeek(previousStart);
320	GregorianCalendar previousEnd = new GregorianCalendar();	341	GregorianCalendar previousEnd = new GregorianCalendar();
		342	previousEnd.setFirstDayOfWeek(START_DAY);
321	previousEnd.setTime(new Date());	343	previousEnd.setTime(new Date());
322	previousEnd.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_PREVIOUS);	344	previousEnd.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_PREVIOUS);
323	snapToEndOfWeek(previousEnd);	345	snapToEndOfWeek(previousEnd);
Lines 326-335 Link Here
326	dateRangeContainers.add(activityPreviousWeek);	348	dateRangeContainers.add(activityPreviousWeek);
327		349
328	GregorianCalendar nextStart = new GregorianCalendar();	350	GregorianCalendar nextStart = new GregorianCalendar();
		351	nextStart.setFirstDayOfWeek(START_DAY);
329	nextStart.setTime(new Date());	352	nextStart.setTime(new Date());
330	nextStart.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_NEXT);	353	nextStart.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_NEXT);
331	snapToStartOfWeek(nextStart);	354	snapToStartOfWeek(nextStart);
332	GregorianCalendar nextEnd = new GregorianCalendar();	355	GregorianCalendar nextEnd = new GregorianCalendar();
		356	nextEnd.setFirstDayOfWeek(START_DAY);
333	nextEnd.setTime(new Date());	357	nextEnd.setTime(new Date());
334	nextEnd.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_NEXT);	358	nextEnd.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_NEXT);
335	snapToEndOfWeek(nextEnd);	359	snapToEndOfWeek(nextEnd);
Lines 338-347 Link Here
338	dateRangeContainers.add(activityNextWeek);	362	dateRangeContainers.add(activityNextWeek);
339		363
340	GregorianCalendar futureStart = new GregorianCalendar();	364	GregorianCalendar futureStart = new GregorianCalendar();
		365	futureStart.setFirstDayOfWeek(START_DAY);
341	futureStart.setTime(new Date());	366	futureStart.setTime(new Date());
342	futureStart.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_FUTURE_START);	367	futureStart.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_FUTURE_START);
343	snapToStartOfWeek(futureStart);	368	snapToStartOfWeek(futureStart);
344	GregorianCalendar futureEnd = new GregorianCalendar();	369	GregorianCalendar futureEnd = new GregorianCalendar();
		370	futureEnd.setFirstDayOfWeek(START_DAY);
345	futureEnd.setTime(new Date());	371	futureEnd.setTime(new Date());
346	futureEnd.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_FUTURE_END);	372	futureEnd.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_FUTURE_END);
347	snapToEndOfWeek(futureEnd);	373	snapToEndOfWeek(futureEnd);
Lines 350-359 Link Here
350	dateRangeContainers.add(activityFuture);	376	dateRangeContainers.add(activityFuture);
351		377
352	GregorianCalendar pastStart = new GregorianCalendar();	378	GregorianCalendar pastStart = new GregorianCalendar();
		379	pastStart.setFirstDayOfWeek(START_DAY);
353	pastStart.setTime(new Date());	380	pastStart.setTime(new Date());
354	pastStart.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_PAST_START);	381	pastStart.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_PAST_START);
355	snapToStartOfWeek(pastStart);	382	snapToStartOfWeek(pastStart);
356	GregorianCalendar pastEnd = new GregorianCalendar();	383	GregorianCalendar pastEnd = new GregorianCalendar();
		384	pastEnd.setFirstDayOfWeek(START_DAY);
357	pastEnd.setTime(new Date());	385	pastEnd.setTime(new Date());
358	pastEnd.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_PAST_END);	386	pastEnd.add(Calendar.WEEK_OF_YEAR, NUM_WEEKS_PAST_END);
359	snapToEndOfWeek(pastEnd);	387	snapToEndOfWeek(pastEnd);
Lines 363-369 Link Here
363		391
364	private void snapToStartOfWeek(GregorianCalendar cal) {	392	private void snapToStartOfWeek(GregorianCalendar cal) {
365	cal.getTime();	393	cal.getTime();
366	cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);	394	cal.set(Calendar.DAY_OF_WEEK, START_DAY);
367	cal.set(Calendar.HOUR_OF_DAY, 0);	395	cal.set(Calendar.HOUR_OF_DAY, 0);
368	cal.set(Calendar.MINUTE, 0);	396	cal.set(Calendar.MINUTE, 0);
369	cal.set(Calendar.SECOND, 0);	397	cal.set(Calendar.SECOND, 0);
Lines 373-379 Link Here
373		401
374	private void snapToEndOfWeek(GregorianCalendar cal) {	402	private void snapToEndOfWeek(GregorianCalendar cal) {
375	cal.getTime();	403	cal.getTime();
376	cal.set(Calendar.DAY_OF_WEEK, Calendar.FRIDAY);	404	cal.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);// FRIDAY
377	cal.set(Calendar.HOUR_OF_DAY, cal.getMaximum(Calendar.HOUR_OF_DAY));	405	cal.set(Calendar.HOUR_OF_DAY, cal.getMaximum(Calendar.HOUR_OF_DAY));
378	cal.set(Calendar.MINUTE, cal.getMaximum(Calendar.MINUTE));	406	cal.set(Calendar.MINUTE, cal.getMaximum(Calendar.MINUTE));
379	cal.set(Calendar.SECOND, cal.getMaximum(Calendar.SECOND));	407	cal.set(Calendar.SECOND, cal.getMaximum(Calendar.SECOND));
Lines 381-386 Link Here
381	cal.getTime();	409	cal.getTime();
382	}	410	}
383		411
		412	public void setTomorrow(Calendar reminderCalendar) {
		413	reminderCalendar.add(Calendar.DAY_OF_MONTH, 1);
		414	reminderCalendar.set(Calendar.HOUR_OF_DAY, START_HOUR);
		415	reminderCalendar.set(Calendar.MINUTE, 0);
		416	reminderCalendar.set(Calendar.SECOND, 0);
		417	reminderCalendar.set(Calendar.MILLISECOND, 0);
		418	}
		419
384	public Object[] getDateRanges() {	420	public Object[] getDateRanges() {
385	// parseFutureReminders();	421	// parseFutureReminders();
386	return dateRangeContainers.toArray();	422	return dateRangeContainers.toArray();
Lines 404-410 Link Here
404	}	440	}
405		441
406	for (ITask task : taskList.getAllTasks()) {	442	for (ITask task : taskList.getAllTasks()) {
407	if (task.getReminderDate() != null)	443	if (task.getReminderDate() != null)// && task.hasBeenReminded()
		444	// != true
408	tasksWithReminders.add(task);	445	tasksWithReminders.add(task);
409	}	446	}
410	resetActivity();	447	resetActivity();





	private long totalEstimated = 0;

	// private String description;

	public DateRangeContainer(GregorianCalendar startDate, GregorianCalendar endDate, String description,
			TaskList taskList) {
		super(description, taskList);
		this.startDate = startDate;
		this.endDate = endDate;
	}

	public DateRangeContainer(Calendar startDate, Calendar endDate, String description, TaskList taskList) {
		super(description, taskList);
		this.startDate = startDate;

	}

	public DateRangeContainer(GregorianCalendar startDate, GregorianCalendar endDate, TaskList taskList) {
		super(DateFormat.getDateInstance(DateFormat.FULL).format(startDate.getTime()) + " to "
				+ DateFormat.getDateInstance(DateFormat.FULL).format(endDate.getTime()), taskList);
				+ DateFormat.getDateInstance(DateFormat.FULL).format(endDate.getTime()), 
				taskList);
		// super(startDate.hashCode() + endDate.hashCode() + "");
		// String start =
		// DateFormat.getDateInstance(DateFormat.FULL).format(startDate.getTime());
		// String end =
		// DateFormat.getDateInstance(DateFormat.FULL).format(endDate.getTime());
		// this.description = start + " to " + end;
		this.startDate = startDate;
		this.endDate = endDate;
	}

		startDate.setTime(time);
		endDate = new GregorianCalendar();
		endDate.setTime(time2);
		// this.description = description;
	}

	public boolean includes(Calendar cal) {
		return (startDate.getTimeInMillis() <= cal.getTimeInMillis())
				&& (endDate.getTimeInMillis() >= cal.getTimeInMillis());
	}

	public void clear() {
		children.clear();
	}

	public void addTask(DateRangeActivityDelegate taskWrapper) {
		long taskActivity = taskWrapper.getActivity();
		if (taskActivity < 0)
			taskActivity = 0;
		totalElapsed += taskActivity;
		children.remove(taskWrapper);
		children.add(taskWrapper);

		}
	}

	void remove(DateRangeActivityDelegate taskWrapper) {
		children.remove(taskWrapper);
	}

	public Calendar getStart() {
		return startDate;
	}

		return totalEstimated;
	}

	// public Set<TaskActivityDurationDelegate> getElements() {
	// return tasks;
	// }

	public boolean isArchive() {
		return false;

		return "";
	}

	// public String getDescription() {
	// return description;
	// }

	// public void setDescription(String description) {
	// this.description = description;
	// }

	// public String getHandleIdentifier() {
	// return description;
	// }

	public void setHandleIdentifier(String id) {
		// ignore
	}

	public Set<ITask> getChildren() {
		// Set<ITask> taskSet = new HashSet<ITask>();
		// taskSet.addAll(tasks);
		return children;
		// Set<ITask> emptySet = Collections.emptySet();
		// return emptySet;
	}

	public boolean isFuture() {
		return !isPresent() && getStart().after(Calendar.getInstance());
	}

	public boolean isPresent() {
		return getStart().before(Calendar.getInstance()) && getEnd().after(Calendar.getInstance());
	}

	@Override
	public int hashCode() {
		final int PRIME = 31;

Lines 102-110 Link Here

(-)src/org/eclipse/mylar/tasklist/tests/TaskActivityViewTest.java (-1 / +3 lines)
102	DateRangeContainer thisWeekActivity = MylarTaskListPlugin.getTaskListManager().getActivityThisWeek();	102	DateRangeContainer thisWeekActivity = MylarTaskListPlugin.getTaskListManager().getActivityThisWeek();
103	assertNotNull(thisWeekActivity);	103	assertNotNull(thisWeekActivity);
104	assertEquals(0, thisWeekActivity.getChildren().size());	104	assertEquals(0, thisWeekActivity.getChildren().size());
105		105	assertEquals(0, thisWeekActivity.getTotalElapsed());
106	Calendar thisWeekCalendarStart = GregorianCalendar.getInstance();	106	Calendar thisWeekCalendarStart = GregorianCalendar.getInstance();
		107	thisWeekCalendarStart.setTime(thisWeekActivity.getStart().getTime());
107	Calendar thisWeekCalendarStop = GregorianCalendar.getInstance();	108	Calendar thisWeekCalendarStop = GregorianCalendar.getInstance();
		109	thisWeekCalendarStop.setTime(thisWeekActivity.getStart().getTime());
108	thisWeekCalendarStop.add(Calendar.MILLISECOND, 2);	110	thisWeekCalendarStop.add(Calendar.MILLISECOND, 2);
109	assertTrue(thisWeekActivity.includes(thisWeekCalendarStart));	111	assertTrue(thisWeekActivity.includes(thisWeekCalendarStart));
110		112

Return to bug 124919

Lines 107-122 Link Here

(-)src/org/eclipse/mylar/internal/core/MylarContextManager.java (-4 / +60 lines)
107		107
108	private static ScalingFactors scalingFactors = new ScalingFactors();	108	private static ScalingFactors scalingFactors = new ScalingFactors();
109		109
110	private class ActivityListener implements ITimerThreadListener, IInteractionEventListener {	110	private class ActivityListener implements ITimerThreadListener, IInteractionEventListener, IMylarContextListener {
111		111
112	private TimerThread timer;	112	private TimerThread timer;
113		113	private int sleepPeriod = 60000;
114	private boolean isStalled;	114	private boolean isStalled;
115		115
116	public ActivityListener(int millis) {	116	public ActivityListener(int millis) {
117	timer = new TimerThread(millis);	117	timer = new TimerThread(millis);
118	timer.addListener(this);	118	timer.addListener(this);
119	timer.start();	119	timer.start();
		120	sleepPeriod = millis;
120	MylarPlugin.getDefault().addInteractionListener(this);	121	MylarPlugin.getDefault().addInteractionListener(this);
121	}	122	}
122		123
Lines 155-165 Link Here
155		156
156	public void setTimeout(int millis) {	157	public void setTimeout(int millis) {
157	timer.kill();	158	timer.kill();
158		159	sleepPeriod = millis;
159	timer = new TimerThread(millis);	160	timer = new TimerThread(millis);
160	timer.addListener(this);	161	timer.addListener(this);
161	timer.start();	162	timer.start();
162	}	163	}
		164
		165	public void contextActivated(IMylarContext context) {
		166	interactionObserved(null);
		167	timer.kill();
		168	timer = new TimerThread(sleepPeriod);
		169	timer.addListener(this);
		170	timer.start();
		171
		172	}
		173
		174	public void contextDeactivated(IMylarContext context) {
		175	interactionObserved(null);
		176	timer.kill();
		177	}
		178
		179	public void presentationSettingsChanging(UpdateKind kind) {
		180	// ignore
		181
		182	}
		183
		184	public void presentationSettingsChanged(UpdateKind kind) {
		185	// ignore
		186
		187	}
		188
		189	public void interestChanged(IMylarElement element) {
		190	// ignore
		191
		192	}
		193
		194	public void interestChanged(List<IMylarElement> elements) {
		195	// ignore
		196
		197	}
		198
		199	public void nodeDeleted(IMylarElement element) {
		200	// ignore
		201
		202	}
		203
		204	public void landmarkAdded(IMylarElement element) {
		205	// ignore
		206
		207	}
		208
		209	public void landmarkRemoved(IMylarElement element) {
		210	// ignore
		211
		212	}
		213
		214	public void edgesChanged(IMylarElement element) {
		215	// ignore
		216
		217	}
163	}	218	}
164		219
165	public MylarContextManager() {	220	public MylarContextManager() {
Lines 176-181 Link Here
176	}	231	}
177		232
178	activityListener = new ActivityListener(INACTIVITY_TIMEOUT_MILLIS);// INACTIVITY_TIMEOUT_MILLIS);	233	activityListener = new ActivityListener(INACTIVITY_TIMEOUT_MILLIS);// INACTIVITY_TIMEOUT_MILLIS);
		234	this.addListener(activityListener);
179	activityListener.startObserving();	235	activityListener.startObserving();
180	}	236	}
181		237
Lines 487-493 Link Here
487	public void contextDeactivated(String handleIdentifier) {	543	public void contextDeactivated(String handleIdentifier) {
488	try {	544	try {
489	IMylarContext context = currentContext.getContextMap().get(handleIdentifier);	545	IMylarContext context = currentContext.getContextMap().get(handleIdentifier);
490	if (context != null) {	546	if (context != null) {
491	saveContext(handleIdentifier);	547	saveContext(handleIdentifier);
492	currentContext.getContextMap().remove(handleIdentifier);	548	currentContext.getContextMap().remove(handleIdentifier);
493		549

Lines 38-51 Link Here

(-)src/org/eclipse/mylar/provisional/tasklist/DateRangeContainer.java (-34 / +40 lines)
38		38
39	private long totalEstimated = 0;	39	private long totalEstimated = 0;
40		40
41	// private String description;	41	// private String description;
42		42
43	public DateRangeContainer(GregorianCalendar startDate, GregorianCalendar endDate, String description, TaskList taskList) {	43	public DateRangeContainer(GregorianCalendar startDate, GregorianCalendar endDate, String description,
		44	TaskList taskList) {
44	super(description, taskList);	45	super(description, taskList);
45	this.startDate = startDate;	46	this.startDate = startDate;
46	this.endDate = endDate;	47	this.endDate = endDate;
47	}	48	}
48		49
49	public DateRangeContainer(Calendar startDate, Calendar endDate, String description, TaskList taskList) {	50	public DateRangeContainer(Calendar startDate, Calendar endDate, String description, TaskList taskList) {
50	super(description, taskList);	51	super(description, taskList);
51	this.startDate = startDate;	52	this.startDate = startDate;
Lines 53-66 Link Here
53	}	54	}
54		55
55	public DateRangeContainer(GregorianCalendar startDate, GregorianCalendar endDate, TaskList taskList) {	56	public DateRangeContainer(GregorianCalendar startDate, GregorianCalendar endDate, TaskList taskList) {
56	super(DateFormat.getDateInstance(DateFormat.FULL).format(startDate.getTime())	57	super(DateFormat.getDateInstance(DateFormat.FULL).format(startDate.getTime()) + " to "
57	+ " to "	58	+ DateFormat.getDateInstance(DateFormat.FULL).format(endDate.getTime()), taskList);
58	+ DateFormat.getDateInstance(DateFormat.FULL).format(endDate.getTime()),
59	taskList);
60	// super(startDate.hashCode() + endDate.hashCode() + "");	59	// super(startDate.hashCode() + endDate.hashCode() + "");
61	// String start = DateFormat.getDateInstance(DateFormat.FULL).format(startDate.getTime());	60	// String start =
62	// String end = DateFormat.getDateInstance(DateFormat.FULL).format(endDate.getTime());	61	// DateFormat.getDateInstance(DateFormat.FULL).format(startDate.getTime());
63	// this.description = start + " to " + end;	62	// String end =
		63	// DateFormat.getDateInstance(DateFormat.FULL).format(endDate.getTime());
		64	// this.description = start + " to " + end;
64	this.startDate = startDate;	65	this.startDate = startDate;
65	this.endDate = endDate;	66	this.endDate = endDate;
66	}	67	}
Lines 71-91 Link Here
71	startDate.setTime(time);	72	startDate.setTime(time);
72	endDate = new GregorianCalendar();	73	endDate = new GregorianCalendar();
73	endDate.setTime(time2);	74	endDate.setTime(time2);
74	// this.description = description;	75	// this.description = description;
75	}	76	}
76		77
77	public boolean includes(Calendar cal) {	78	public boolean includes(Calendar cal) {
78	return (startDate.getTimeInMillis() <= cal.getTimeInMillis())	79	return (startDate.getTimeInMillis() <= cal.getTimeInMillis())
79	&& (endDate.getTimeInMillis() >= cal.getTimeInMillis());	80	&& (endDate.getTimeInMillis() >= cal.getTimeInMillis());
80	}	81	}
81		82
82	public void clear() {	83	public void clear() {
83	children.clear();	84	children.clear();
84	}	85	}
85		86
86	public void addTask(DateRangeActivityDelegate taskWrapper) {	87	public void addTask(DateRangeActivityDelegate taskWrapper) {
87	long taskActivity = taskWrapper.getActivity();	88	long taskActivity = taskWrapper.getActivity();
88	if(taskActivity < 0) taskActivity = 0;	89	if (taskActivity < 0)
		90	taskActivity = 0;
89	totalElapsed += taskActivity;	91	totalElapsed += taskActivity;
90	children.remove(taskWrapper);	92	children.remove(taskWrapper);
91	children.add(taskWrapper);	93	children.add(taskWrapper);
Lines 98-103 Link Here
98	}	100	}
99	}	101	}
100		102
		103	void remove(DateRangeActivityDelegate taskWrapper) {
		104	children.remove(taskWrapper);
		105	}
		106
101	public Calendar getStart() {	107	public Calendar getStart() {
102	return startDate;	108	return startDate;
103	}	109	}
Lines 126-134 Link Here
126	return totalEstimated;	132	return totalEstimated;
127	}	133	}
128		134
129	// public Set<TaskActivityDurationDelegate> getElements() {	135	// public Set<TaskActivityDurationDelegate> getElements() {
130	// return tasks;	136	// return tasks;
131	// }	137	// }
132		138
133	public boolean isArchive() {	139	public boolean isArchive() {
134	return false;	140	return false;
Lines 142-179 Link Here
142	return "";	148	return "";
143	}	149	}
144		150
145	// public String getDescription() {	151	// public String getDescription() {
146	// return description;	152	// return description;
147	// }	153	// }
148		154
149	// public void setDescription(String description) {	155	// public void setDescription(String description) {
150	// this.description = description;	156	// this.description = description;
151	// }	157	// }
152		158
153	// public String getHandleIdentifier() {	159	// public String getHandleIdentifier() {
154	// return description;	160	// return description;
155	// }	161	// }
156		162
157	public void setHandleIdentifier(String id) {	163	public void setHandleIdentifier(String id) {
158	// ignore	164	// ignore
159	}	165	}
160		166
161	public Set<ITask> getChildren() {	167	public Set<ITask> getChildren() {
162	// Set<ITask> taskSet = new HashSet<ITask>();	168	// Set<ITask> taskSet = new HashSet<ITask>();
163	// taskSet.addAll(tasks);	169	// taskSet.addAll(tasks);
164	return children;	170	return children;
165	// Set<ITask> emptySet = Collections.emptySet();	171	// Set<ITask> emptySet = Collections.emptySet();
166	// return emptySet;	172	// return emptySet;
167	}	173	}
168		174
169	public boolean isFuture() {	175	public boolean isFuture() {
170	return !isPresent() && getStart().after(Calendar.getInstance());	176	return !isPresent() && getStart().after(Calendar.getInstance());
171	}	177	}
172		178
173	public boolean isPresent() {	179	public boolean isPresent() {
174	return getStart().before(Calendar.getInstance()) && getEnd().after(Calendar.getInstance());	180	return getStart().before(Calendar.getInstance()) && getEnd().after(Calendar.getInstance());
175	}	181	}
176		182
177	@Override	183	@Override
178	public int hashCode() {	184	public int hashCode() {
179	final int PRIME = 31;	185	final int PRIME = 31;