Attachment 149078 Details for Bug 291084 – first pass

[patch] first pass

clipboard.txt (text/plain), 20.76 KB, created by Robert Elves

on 2009-10-07 21:15:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Elves

Created: 2009-10-07 21:15:52 EDT

Size: 20.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.monitor.ui
>Index: src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.monitor.ui/src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java,v
>retrieving revision 1.17
>diff -u -r1.17 MonitorUiPlugin.java
>--- src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java	11 Aug 2009 00:51:39 -0000	1.17
>+++ src/org/eclipse/mylyn/internal/monitor/ui/MonitorUiPlugin.java	8 Oct 2009 01:18:02 -0000
>@@ -84,6 +84,8 @@
> 
> 	public static final String PREF_USER_ACTIVITY_ENABLED = "org.eclipse.mylyn.monitor.user.activity.enabled"; //$NON-NLS-1$
> 
>+	public static final String ACTIVITY_TRACKING_ENABLED = "org.eclipse.mylyn.monitor.activity.tracking.enabled"; //$NON-NLS-1$
>+
> 	private IWorkbenchWindow launchingWorkbenchWindow = null;
> 
> 	private final org.eclipse.jface.util.IPropertyChangeListener PROPERTY_LISTENER = new org.eclipse.jface.util.IPropertyChangeListener() {
>@@ -98,7 +100,9 @@
> 				} else {
> 					activityContextManager.stop();
> 				}
>-
>+			} else if (event.getProperty().equals(ACTIVITY_TRACKING_ENABLED)) {
>+				ContextCorePlugin.getDefault().setActivityTrackingEnabled(
>+						getPreferenceStore().getBoolean(ACTIVITY_TRACKING_ENABLED));
> 			}
> 		}
> 
>@@ -417,6 +421,9 @@
> 				activityContextManager.start();
> 			}
> 
>+			ContextCorePlugin.getDefault().setActivityTrackingEnabled(
>+					getPreferenceStore().getBoolean(ACTIVITY_TRACKING_ENABLED));
>+
> 			getPreferenceStore().addPropertyChangeListener(PROPERTY_LISTENER);
> 
> 		} catch (Exception e) {
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java,v
>retrieving revision 1.36
>diff -u -r1.36 TasksUiPreferencePage.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java	24 Jul 2009 12:05:47 -0000	1.36
>+++ src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java	8 Oct 2009 01:18:03 -0000
>@@ -99,6 +99,8 @@
> 
> 	private Combo weekStartCombo;
> 
>+	private Button activityTrackingEnabledButton;
>+
> 	public TasksUiPreferencePage() {
> 		super();
> 		setPreferenceStore(TasksUiPlugin.getDefault().getPreferenceStore());
>@@ -199,7 +201,9 @@
> 				timeoutEnabledButton.getSelection());
> 		MonitorUiPlugin.getDefault().getPreferenceStore().setValue(ActivityContextManager.ACTIVITY_TIMEOUT,
> 				timeoutMinutes.getSelection() * (60 * 1000));
>-		//backupNow.setEnabled(true);
>+
>+		MonitorUiPlugin.getDefault().getPreferenceStore().setValue(MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED,
>+				activityTrackingEnabledButton.getSelection());
> 
> 		String taskDirectory = taskDirectoryText.getText();
> 		taskDirectory = taskDirectory.replaceAll(BACKSLASH_MULTI, FORWARDSLASH);
>@@ -262,6 +266,10 @@
> 		timeoutMinutes.setSelection(minutes);
> 		timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
> 				ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));
>+
>+		activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
>+				MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
>+
> 		return true;
> 	}
> 
>@@ -306,6 +314,10 @@
> 		timeoutMinutes.setSelection(activityTimeoutMinutes);
> 		timeoutEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(
> 				ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED));
>+
>+		activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(
>+				MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
>+
> 		updateRefreshGroupEnablements();
> 	}
> 
>@@ -413,54 +425,11 @@
> 
> 				if (taskDataDirectoryAction != IDialogConstants.CANCEL_ID) {
> 					taskDirectoryText.setText(dir);
>-//					backupFolderText.setText(dir + FORWARDSLASH + ITasksCoreConstants.DEFAULT_BACKUP_FOLDER_NAME);
>-//					backupNow.setEnabled(false);
> 				}
> 			}
> 
> 		});
> 
>-//		Composite backupComposite = new Composite(taskDataGroup, SWT.NULL);
>-//		gridLayout = new GridLayout(5, false);
>-//		gridLayout.marginWidth = 0;
>-//		gridLayout.marginHeight = 0;
>-//		backupComposite.setLayout(gridLayout);
>-//		backupComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>-
>-//		label = new Label(backupComposite, SWT.NULL);
>-//		label.setText("Backup every");
>-//		backupScheduleTimeText = new Text(backupComposite, SWT.BORDER | SWT.RIGHT);
>-//		final GridData gridData_1 = new GridData();
>-//		gridData_1.widthHint = 13;
>-//		backupScheduleTimeText.setLayoutData(gridData_1);
>-//
>-//		backupScheduleTimeText.setText("" + getPreferenceStore().getInt(TasksUiPreferenceConstants.BACKUP_SCHEDULE));
>-//		backupScheduleTimeText.addModifyListener(new ModifyListener() {
>-//			public void modifyText(ModifyEvent e) {
>-//				updateRefreshGroupEnablements();
>-//			}
>-//		});
>-//
>-//		label = new Label(backupComposite, SWT.NONE);
>-//		label.setText("days to");
>-
>-//		String backupDirectory = TasksUiPlugin.getDefault().getBackupFolderPath();// getPreferenceStore().getString(TaskListPreferenceConstants.BACKUP_FOLDER);
>-//		backupDirectory = backupDirectory.replaceAll(BACKSLASH_MULTI, FORWARDSLASH);
>-//		backupFolderText = new Text(backupComposite, SWT.BORDER);
>-//		backupFolderText.setText(backupDirectory);
>-//		backupFolderText.setEditable(false);
>-//		backupFolderText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>-//
>-//		backupNow = new Button(backupComposite, SWT.NONE);
>-//		backupNow.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
>-//		backupNow.setText("Backup Now");
>-//		backupNow.addSelectionListener(new SelectionAdapter() {
>-//
>-//			@Override
>-//			public void widgetSelected(SelectionEvent e) {
>-//				TasksUiPlugin.getBackupManager().backupNow(true);
>-//			}
>-//		});
> 	}
> 
> 	private void createSchedulingGroup(Composite container) {
>@@ -485,71 +454,6 @@
> 		weekStartCombo.add(CommonMessages.Saturday);
> 		weekStartCombo.select(getPreferenceStore().getInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);
> 
>-//		 Label workWeekBeginLabel = new Label(group, SWT.NONE);
>-//		 workWeekBeginLabel.setText(START_DAY_LABEL);
>-//		 workWeekBegin = new Combo(group, SWT.READ_ONLY);
>-//		 // Calendar.SUNDAY = 1
>-//		 workWeekBegin.add("SUNDAY");
>-//		 workWeekBegin.add("MONDAY");
>-//		 workWeekBegin.add("TUESDAY");
>-//		 workWeekBegin.add("WEDNESDAY");
>-//		 workWeekBegin.add("THURSDAY");
>-//		 workWeekBegin.add("FRIDAY");
>-//		 workWeekBegin.add("SATURDAY");
>-//		 workWeekBegin.select(getPreferenceStore().getInt(TaskListPreferenceConstants.PLANNING_STARTDAY)
>-//		 - 1);
>-
>-//		 Label workWeekEndLabel = new Label(group, SWT.NONE);
>-//		 workWeekEndLabel.setText(END_DAY_LABEL);
>-//		 workWeekEnd = new Combo(group, SWT.READ_ONLY);
>-//		 workWeekEnd.add("SUNDAY");
>-//		 workWeekEnd.add("MONDAY");
>-//		 workWeekEnd.add("TUESDAY");
>-//		 workWeekEnd.add("WEDNESDAY");
>-//		 workWeekEnd.add("THURSDAY");
>-//		 workWeekEnd.add("FRIDAY");
>-//		 workWeekEnd.add("SATURDAY");
>-//		 workWeekEnd.select(getPreferenceStore().getInt(TaskListPreferenceConstants.PLANNING_ENDDAY)
>-//		 - 1);
>-
>-//		Label hourDayStartLabel = new Label(group, SWT.NONE);
>-//		hourDayStartLabel.setText(START_HOUR_LABEL);
>-//		hourDayStart = new Spinner(group, SWT.BORDER);
>-//		hourDayStart.setDigits(0);
>-//		hourDayStart.setIncrement(1);
>-//		hourDayStart.setMaximum(23);
>-//		hourDayStart.setMinimum(0);
>-//		hourDayStart.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));
>-//		hourDayStart.addSelectionListener(new SelectionAdapter() {
>-//
>-//			@Override
>-//			public void widgetSelected(SelectionEvent e) {
>-//				updateRefreshGroupEnablements();
>-//			}
>-//
>-//		});
>-//
>-//		Label spacer = new Label(group, SWT.NONE);
>-//		GridDataFactory.fillDefaults().hint(40, SWT.DEFAULT).applyTo(spacer);
>-//
>-//		Label hourDayEndLabel = new Label(group, SWT.NONE);
>-//		hourDayEndLabel.setText(END_HOUR_LABEL);
>-//
>-//		hourDayEnd = new Spinner(group, SWT.BORDER);
>-//		hourDayEnd.setDigits(0);
>-//		hourDayEnd.setIncrement(1);
>-//		hourDayEnd.setMaximum(23);
>-//		hourDayEnd.setMinimum(0);
>-//		hourDayEnd.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));
>-//		hourDayEnd.addSelectionListener(new SelectionAdapter() {
>-//
>-//			@Override
>-//			public void widgetSelected(SelectionEvent e) {
>-//				updateRefreshGroupEnablements();
>-//			}
>-//
>-//		});
>-
> 	}
> 
> 	private void createTaskActivityGroup(Composite container) {
>@@ -558,9 +462,24 @@
> 		group.setLayout(new GridLayout(3, false));
> 		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
> 
>+		boolean activityTrackingEnabled = MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
>+				MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED);
>+
> 		boolean timeoutEnabled = MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
> 				ActivityContextManager.ACTIVITY_TIMEOUT_ENABLED);
> 
>+		activityTrackingEnabledButton = new Button(group, SWT.CHECK);
>+		activityTrackingEnabledButton.setText("Track time spent on active task within Eclipse");
>+		activityTrackingEnabledButton.setSelection(activityTrackingEnabled);
>+		activityTrackingEnabledButton.setToolTipText("Track the time spent within Eclipse");
>+		activityTrackingEnabledButton.addSelectionListener(new SelectionAdapter() {
>+			@Override
>+			public void widgetSelected(SelectionEvent e) {
>+				updateRefreshGroupEnablements();
>+			}
>+		});
>+		GridDataFactory.swtDefaults().span(3, 1).applyTo(activityTrackingEnabledButton);
>+
> 		timeoutEnabledButton = new Button(group, SWT.CHECK);
> 		timeoutEnabledButton.setText(Messages.TasksUiPreferencePage_Enable_inactivity_timeouts);
> 		timeoutEnabledButton.setSelection(timeoutEnabled);
>@@ -596,116 +515,11 @@
> 		timeoutLabel = new Label(group, SWT.NONE);
> 		timeoutLabel.setText(Messages.TasksUiPreferencePage_minutes_of_inactivity);
> 
>-//		Label spacer = new Label(group, SWT.NONE);
>-//		GridDataFactory.fillDefaults().hint(40, SWT.DEFAULT).applyTo(spacer);
>-//
>-//		Label hourDayEndLabel = new Label(group, SWT.NONE);
>-//		hourDayEndLabel.setText(END_HOUR_LABEL);
>-//
>-//		hourDayEnd = new Spinner(group, SWT.BORDER);
>-//		hourDayEnd.setDigits(0);
>-//		hourDayEnd.setIncrement(1);
>-//		hourDayEnd.setMaximum(23);
>-//		hourDayEnd.setMinimum(0);
>-//		hourDayEnd.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));
>-//		hourDayEnd.addSelectionListener(new SelectionAdapter() {
>-//
>-//			@Override
>-//			public void widgetSelected(SelectionEvent e) {
>-//				updateRefreshGroupEnablements();
>-//			}
>-//
>-//		});
>-
>-	}
>-
>-//	private void createSchedulingGroup(Composite container) {
>-//		Group group = new Group(container, SWT.SHADOW_ETCHED_IN);
>-//		group.setText(GROUP_WORK_WEEK_LABEL);
>-//		group.setLayout(new GridLayout(5, false));
>-//		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
>-//
>-//		// Label workWeekBeginLabel = new Label(group, SWT.NONE);
>-//		// workWeekBeginLabel.setText(START_DAY_LABEL);
>-//		// workWeekBegin = new Combo(group, SWT.READ_ONLY);
>-//		// // Calendar.SUNDAY = 1
>-//		// workWeekBegin.add("SUNDAY");
>-//		// workWeekBegin.add("MONDAY");
>-//		// workWeekBegin.add("TUESDAY");
>-//		// workWeekBegin.add("WEDNESDAY");
>-//		// workWeekBegin.add("THURSDAY");
>-//		// workWeekBegin.add("FRIDAY");
>-//		// workWeekBegin.add("SATURDAY");
>-//		// workWeekBegin.select(getPreferenceStore().getInt(TaskListPreferenceConstants.PLANNING_STARTDAY)
>-//		// - 1);
>-//		//		
>-//		// Label workWeekEndLabel = new Label(group, SWT.NONE);
>-//		// workWeekEndLabel.setText(END_DAY_LABEL);
>-//		// workWeekEnd = new Combo(group, SWT.READ_ONLY);
>-//		// workWeekEnd.add("SUNDAY");
>-//		// workWeekEnd.add("MONDAY");
>-//		// workWeekEnd.add("TUESDAY");
>-//		// workWeekEnd.add("WEDNESDAY");
>-//		// workWeekEnd.add("THURSDAY");
>-//		// workWeekEnd.add("FRIDAY");
>-//		// workWeekEnd.add("SATURDAY");
>-//		// workWeekEnd.select(getPreferenceStore().getInt(TaskListPreferenceConstants.PLANNING_ENDDAY)
>-//		// - 1);
>-//
>-//		Label hourDayStartLabel = new Label(group, SWT.NONE);
>-//		hourDayStartLabel.setText(START_HOUR_LABEL);
>-//		hourDayStart = new Spinner(group, SWT.BORDER);
>-//		hourDayStart.setDigits(0);
>-//		hourDayStart.setIncrement(1);
>-//		hourDayStart.setMaximum(23);
>-//		hourDayStart.setMinimum(0);
>-//		hourDayStart.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_STARTHOUR));
>-//		hourDayStart.addSelectionListener(new SelectionAdapter() {
>-//
>-//			@Override
>-//			public void widgetSelected(SelectionEvent e) {
>-//				updateRefreshGroupEnablements();
>-//			}
>-//
>-//		});
>-//
>-//		Label spacer = new Label(group, SWT.NONE);
>-//		GridDataFactory.fillDefaults().hint(40, SWT.DEFAULT).applyTo(spacer);
>-//
>-//		Label hourDayEndLabel = new Label(group, SWT.NONE);
>-//		hourDayEndLabel.setText(END_HOUR_LABEL);
>-//
>-//		hourDayEnd = new Spinner(group, SWT.BORDER);
>-//		hourDayEnd.setDigits(0);
>-//		hourDayEnd.setIncrement(1);
>-//		hourDayEnd.setMaximum(23);
>-//		hourDayEnd.setMinimum(0);
>-//		hourDayEnd.setSelection(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));
>-//		hourDayEnd.addSelectionListener(new SelectionAdapter() {
>-//
>-//			@Override
>-//			public void widgetSelected(SelectionEvent e) {
>-//				updateRefreshGroupEnablements();
>-//			}
>-//
>-//		});
>-//
>-//	}
>+	}
> 
> 	public void updateRefreshGroupEnablements() {
> 		String errorMessage = null;
> 
>-//		try {
>-//			long number = Integer.parseInt(backupScheduleTimeText.getText());
>-//			if (number <= 0) {
>-//				errorMessage = "Backup schedule time must be > 0";
>-//			} else if (backupFolderText.getText() == "") {
>-//				errorMessage = "Backup destination folder must be specified";
>-//			}
>-//		} catch (NumberFormatException e) {
>-//			errorMessage = "Backup schedule time must be valid integer";
>-//		}
>-
> 		if (enableBackgroundSynch.getSelection()) {
> 			try {
> 				long number = Long.parseLong(synchScheduleTime.getText());
>@@ -717,16 +531,23 @@
> 			}
> 		}
> 
>-//		if (hourDayEnd.getSelection() <= hourDayStart.getSelection()) {
>-//			errorMessage = "Planning: Work day start must be before end.";
>-//		}
>-
> 		setErrorMessage(errorMessage);
> 		setValid(errorMessage == null);
> 
>-		synchScheduleTime.setEnabled(enableBackgroundSynch.getSelection());
>+		if (activityTrackingEnabledButton.getSelection()) {
> 
>-		timeoutMinutes.setEnabled(timeoutEnabledButton.getSelection());
>+			timeoutEnabledButton.setEnabled(true);
>+
>+			synchScheduleTime.setEnabled(enableBackgroundSynch.getSelection());
>+
>+			timeoutMinutes.setEnabled(timeoutEnabledButton.getSelection());
>+		} else {
>+			timeoutEnabledButton.setEnabled(false);
>+
>+			synchScheduleTime.setEnabled(false);
>+
>+			timeoutMinutes.setEnabled(false);
>+		}
> 
> 	}
> 
>Index: src/org/eclipse/mylyn/internal/tasks/ui/TaskActivityMonitor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskActivityMonitor.java,v
>retrieving revision 1.23
>diff -u -r1.23 TaskActivityMonitor.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/TaskActivityMonitor.java	24 Jul 2009 12:05:46 -0000	1.23
>+++ src/org/eclipse/mylyn/internal/tasks/ui/TaskActivityMonitor.java	8 Oct 2009 01:18:03 -0000
>@@ -19,6 +19,7 @@
> import org.eclipse.mylyn.context.core.AbstractContextListener;
> import org.eclipse.mylyn.context.core.ContextChangeEvent;
> import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
>+import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
> import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
> import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
> import org.eclipse.mylyn.internal.tasks.core.TaskActivityManager;
>@@ -48,11 +49,11 @@
> 		public void contextChanged(ContextChangeEvent event) {
> 			switch (event.getEventKind()) {
> 			case INTEREST_CHANGED:
>-				List<InteractionEvent> events = contextManager.getActivityMetaContext().getInteractionHistory();
>-				if (events.size() > 0) {
>-					InteractionEvent interactionEvent = events.get(events.size() - 1);
>-					parseInteractionEvent(interactionEvent, false);
>-				}
>+					List<InteractionEvent> events = contextManager.getActivityMetaContext().getInteractionHistory();
>+					if (events.size() > 0) {
>+						InteractionEvent interactionEvent = events.get(events.size() - 1);
>+						parseInteractionEvent(interactionEvent, false);
>+					}
> 				break;
> 			}
> 		}
>#P org.eclipse.mylyn.context.core
>Index: src/org/eclipse/mylyn/internal/context/core/ContextCorePlugin.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/ContextCorePlugin.java,v
>retrieving revision 1.16
>diff -u -r1.16 ContextCorePlugin.java
>--- src/org/eclipse/mylyn/internal/context/core/ContextCorePlugin.java	24 Jul 2009 12:06:53 -0000	1.16
>+++ src/org/eclipse/mylyn/internal/context/core/ContextCorePlugin.java	8 Oct 2009 01:18:04 -0000
>@@ -64,6 +64,8 @@
> 
> 	private final InteractionContextScaling commonContextScaling = new InteractionContextScaling();
> 
>+	private boolean activityTrackingEnabled;
>+
> 	private static final AbstractContextStructureBridge DEFAULT_BRIDGE = new AbstractContextStructureBridge() {
> 
> 		@Override
>@@ -471,4 +473,13 @@
> 	public IInteractionContextScaling getCommonContextScaling() {
> 		return commonContextScaling;
> 	}
>+
>+	public void setActivityTrackingEnabled(boolean b) {
>+		this.activityTrackingEnabled = b;
>+	}
>+
>+	public boolean isActivityTrackingEnabled() {
>+		return activityTrackingEnabled;
>+	}
>+
> }
>Index: src/org/eclipse/mylyn/internal/context/core/SaxContextWriter.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.context.core/src/org/eclipse/mylyn/internal/context/core/SaxContextWriter.java,v
>retrieving revision 1.24
>diff -u -r1.24 SaxContextWriter.java
>--- src/org/eclipse/mylyn/internal/context/core/SaxContextWriter.java	24 Jul 2009 12:06:53 -0000	1.24
>+++ src/org/eclipse/mylyn/internal/context/core/SaxContextWriter.java	8 Oct 2009 01:18:04 -0000
>@@ -15,6 +15,7 @@
> import java.io.IOException;
> import java.io.OutputStream;
> import java.text.SimpleDateFormat;
>+import java.util.Date;
> import java.util.Locale;
> 
> import javax.xml.transform.Transformer;
>@@ -184,8 +185,20 @@
> 		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_DELTA, //$NON-NLS-1$
> 				InteractionContextExternalizer.ATR_DELTA, "", //$NON-NLS-1$
> 				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(ie.getDelta()));
>-		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_END_DATE, //$NON-NLS-1$
>-				InteractionContextExternalizer.ATR_END_DATE, "", dateFormat.format(ie.getEndDate())); //$NON-NLS-1$
>+		if (ie.getKind().equals(InteractionEvent.Kind.ATTENTION)
>+				|| (ie.getStructureKind().equals(InteractionContextManager.ACTIVITY_STRUCTUREKIND_ACTIVATION))) {
>+			if (ContextCorePlugin.getDefault().isActivityTrackingEnabled()) {
>+				ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_START_DATE, //$NON-NLS-1$
>+						InteractionContextExternalizer.ATR_START_DATE, "", dateFormat.format(ie.getDate())); //$NON-NLS-1$
>+				ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_END_DATE, //$NON-NLS-1$
>+						InteractionContextExternalizer.ATR_END_DATE, "", dateFormat.format(ie.getEndDate())); //$NON-NLS-1$
>+			} else {
>+				ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_START_DATE, //$NON-NLS-1$
>+						InteractionContextExternalizer.ATR_START_DATE, "", dateFormat.format(new Date(0))); //$NON-NLS-1$
>+				ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_END_DATE, //$NON-NLS-1$
>+						InteractionContextExternalizer.ATR_END_DATE, "", dateFormat.format(new Date(0))); //$NON-NLS-1$
>+			}
>+		}
> 		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_INTEREST, //$NON-NLS-1$
> 				InteractionContextExternalizer.ATR_INTEREST, "", Float.toString(ie.getInterestContribution())); //$NON-NLS-1$
> 		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_KIND, InteractionContextExternalizer.ATR_KIND, //$NON-NLS-1$
>@@ -196,8 +209,6 @@
> 		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_ORIGIN_ID, //$NON-NLS-1$
> 				InteractionContextExternalizer.ATR_ORIGIN_ID, "", //$NON-NLS-1$
> 				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(ie.getOriginId()));
>-		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_START_DATE, //$NON-NLS-1$
>-				InteractionContextExternalizer.ATR_START_DATE, "", dateFormat.format(ie.getDate())); //$NON-NLS-1$
> 		ieAttributes.addAttribute("", InteractionContextExternalizer.ATR_STRUCTURE_HANDLE, //$NON-NLS-1$
> 				InteractionContextExternalizer.ATR_STRUCTURE_HANDLE, "", //$NON-NLS-1$
> 				org.eclipse.mylyn.internal.commons.core.XmlStringConverter.convertToXmlString(ie.getStructureHandle()));

Actions: View | Diff

Attachments on bug 291084: 149078 | 149079 | 149177 | 149178 | 149197 | 149198 | 149287 | 149345 | 149399 | 149482