NEW - bug 191406: rename Mylar project to Mylyn

https://bugs.eclipse.org/bugs/show_bug.cgi?id=191406

10 files changed, 49 insertions, 65 deletions

diff --git a/org.eclipse.mylyn.help.ui/plugin.xml b/org.eclipse.mylyn.help.ui/plugin.xml
index 4438d35e8..61f070c83 100644
--- a/org.eclipse.mylyn.help.ui/plugin.xml
+++ b/org.eclipse.mylyn.help.ui/plugin.xml
@@ -4,7 +4,7 @@
 <plugin>
 	<extension
          id="org.eclipse.mylyn.helpDocs"
-         name="Mylar Help"
+         name="Task-Focused UI"
          point="org.eclipse.help.toc">
       <toc
             file="doc/toc.xml"
@@ -15,17 +15,17 @@
     <extension point="org.eclipse.ui.actionSets">
 	<actionSet
             id="org.eclipse.mylyn.doc.actionSet"
-            label="Mylar Documentation"
+            label="Mylyn Documentation"
             visible="true"> 
   		<action
           class="org.eclipse.mylyn.doc.internal.actions.ShowMylarLegendAction"
           definitionId="org.eclipse.mylyn.doc.legend.show"
           icon="icons/etool16/icons-legend.gif"
           id="org.eclipse.mylyn.doc.legend.show.action"
-          label="Mylar UI Legend"
+          label="Task-Focused UI Legend"
           menubarPath="help/helpStart"
           style="push"
-          tooltip="Mylar UI Legend"> 
+          tooltip="Task-Focused UI Legend"> 
       	</action> 
     </actionSet>
     </extension>
@@ -33,14 +33,14 @@
    <extension point="org.eclipse.ui.commands">
    <category
          id="org.eclipse.mylyn.doc.commands"
-         name="Mylar Documentation">
+         name="Task-Focused UI Documentation">
    </category>
 	  <command
          category="org.eclipse.mylyn.doc.commands"
          categoryId="org.eclipse.mylyn.doc.commands"
-         description="Show Mylar UI Legend"
+         description="Show Mylyn UI Legend"
          id="org.eclipse.mylyn.doc.legend.show"
-         name="Show Mylar UI Legend">
+         name="Task-Focused UI Legend">
       </command>
    </extension>
   
@@ -71,7 +71,7 @@
          point="org.eclipse.ui.cheatsheets.cheatSheetContent">
       <category
             id="org.eclipse.mylyn.cheatsheet"
-            name="Mylar">
+            name="Task-Focused UI">
       </category>
       <cheatsheet
             category="org.eclipse.mylyn.cheatsheet"
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 39014ca33..6308dc39e 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -431,7 +431,7 @@
 
   <extension point="org.eclipse.ui.preferencePages">
 	  <page
-            name="Mylyn"
+            name="Task-Focused UI"
             class="org.eclipse.mylyn.internal.tasks.ui.preferences.MylarPreferencePage"
             id="org.eclipse.mylyn.ui.preferences">
             <keywordReference id="org.eclipse.mylyn.tasks.keywords"/>
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPreferenceConstants.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPreferenceConstants.java
index 857b0bae3..5166a6a10 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPreferenceConstants.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPreferenceConstants.java
@@ -14,10 +14,11 @@ package org.eclipse.mylyn.internal.tasks.ui;
 /**
  * @author Mik Kersten
  */
-@Deprecated
 public final class TasksUiPreferenceConstants {
 	
-	public static final String ACTIVATE_ON_OPEN = "org.eclipse.mylyn.tasks.ui.activate.onopen";
+	public static final String ACTIVATE_MULTIPLE = "org.eclipse.mylyn.tasks.ui.activation.multipe";
+
+	public static final String ACTIVATE_WHEN_OPENED = "org.eclipse.mylyn.tasks.ui.activate.when.opened";
 
 	public static final String BACKUP_LAST = "org.eclipse.mylyn.tasks.ui.backup.last";
 
@@ -33,30 +34,24 @@ public final class TasksUiPreferenceConstants {
 
 	public static final String FILTER_SUBTASKS = "org.eclipse.mylyn.tasks.ui.filters.subtasks";
 
-	public static final String INCOMING_OVERLAID = "org.eclipse.mylyn.tasks.ui.incoming.overlaid";
-
-	public static final String MULTIPLE_ACTIVE_TASKS = "org.eclipse.mylyn.tasks.ui.activation.multipe";
+	public static final String OVERLAYS_INCOMING_TIGHT = "org.eclipse.mylyn.tasks.ui.overlays.incoming.tight";
 
 	public static final String NOTIFICATIONS_ENABLED = "org.eclipse.mylyn.tasks.ui.notifications.enabled";
 
-	public static final String PLANNER_WIZARD_ID = "org.eclipse.mylyn.tasks.ui.planning.wizard";
-	
 	public static final String PLANNING_ENDHOUR = "org.eclipse.mylyn.tasks.ui.planning.end.hour";
 
 	public static final String PLANNING_STARTHOUR = "org.eclipse.mylyn.tasks.ui.planning.start.hour";
 
-	public static final String REPORT_DISABLE_INTERNAL = "org.eclipse.mylyn.tasks.ui.reporting.disable.internal";
+	public static final String REPORTING_OPEN_EDITOR = "org.eclipse.mylyn.tasks.ui.reporting.open.editor";
 	
-	public static final String REPORT_OPEN_EDITOR = "org.eclipse.mylyn.tasks.ui.reporting.open.editor";
+	public static final String REPORTING_OPEN_EXTERNAL = "org.eclipse.mylyn.tasks.ui.reporting.open.external";
 
-	public static final String REPORT_OPEN_EXTERNAL = "org.eclipse.mylyn.tasks.ui.reporting.open.external";
+	public static final String REPORTING_OPEN_INTERNAL = "org.eclipse.mylyn.tasks.ui.reporting.open.internal";
 
-	public static final String REPORT_OPEN_INTERNAL = "org.eclipse.mylyn.tasks.ui.reporting.open.internal";
+	public static final String REPORTING_DISABLE_INTERNAL = "org.eclipse.mylyn.tasks.ui.reporting.disable.internal";
 	
 	public static final String REPOSITORY_SYNCH_SCHEDULE_ENABLED = "org.eclipse.mylyn.tasks.ui.repositories.synch.schedule";
 	
 	public static final String REPOSITORY_SYNCH_SCHEDULE_MILISECONDS = "org.eclipse.mylyn.tasks.ui.repositories.synch.schedule.miliseconds";
 
-	public static final String SAVE_TASKLIST_MODE = "org.eclipse.mylyn.tasks.ui.save.mode";
-
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java
index d09ed2b31..63a86b661 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksPreferencePage.java
@@ -154,11 +154,11 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
 				notificationEnabledButton.getSelection());
 		getPreferenceStore().setValue(TasksUiPreferenceConstants.BACKUP_SCHEDULE, backupScheduleTimeText.getText());
 
-		getPreferenceStore().setValue(TasksUiPreferenceConstants.REPORT_OPEN_EDITOR, reportEditor.getSelection());
-		getPreferenceStore().setValue(TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL, reportInternal.getSelection());
-		getPreferenceStore().setValue(TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL,
+		getPreferenceStore().setValue(TasksUiPreferenceConstants.REPORTING_OPEN_EDITOR, reportEditor.getSelection());
+		getPreferenceStore().setValue(TasksUiPreferenceConstants.REPORTING_OPEN_INTERNAL, reportInternal.getSelection());
+		getPreferenceStore().setValue(TasksUiPreferenceConstants.REPORTING_DISABLE_INTERNAL,
 				disableInternal.getSelection());
-		getPreferenceStore().setValue(TasksUiPreferenceConstants.ACTIVATE_ON_OPEN, activateOnOpen.getSelection());
+		getPreferenceStore().setValue(TasksUiPreferenceConstants.ACTIVATE_WHEN_OPENED, activateOnOpen.getSelection());
 
 		// getPreferenceStore().setValue(TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP,
 		// synchQueries.getSelection());
@@ -172,7 +172,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
 		getPreferenceStore().setValue(TasksUiPreferenceConstants.PLANNING_ENDHOUR, hourDayEnd.getSelection());
 		backupNow.setEnabled(true);
 		
-		getPreferenceStore().setValue(TasksUiPreferenceConstants.INCOMING_OVERLAID,
+		getPreferenceStore().setValue(TasksUiPreferenceConstants.OVERLAYS_INCOMING_TIGHT,
 				incomingOverlaysButton.getSelection());
 		TaskListView view = TaskListView.getFromActivePerspective();
 		if (view != null) {
@@ -190,11 +190,11 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
 		backupScheduleTimeText.setText(getPreferenceStore().getString(TasksUiPreferenceConstants.BACKUP_SCHEDULE));
 		backupFolderText.setText(TasksUiPlugin.getDefault().getBackupFolderPath());
 
-		reportEditor.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORT_OPEN_EDITOR));
-		reportInternal.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL));
+		reportEditor.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORTING_OPEN_EDITOR));
+		reportInternal.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORTING_OPEN_INTERNAL));
 		disableInternal.setSelection(getPreferenceStore().getBoolean(
-				TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL));
-		activateOnOpen.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.ACTIVATE_ON_OPEN));
+				TasksUiPreferenceConstants.REPORTING_DISABLE_INTERNAL));
+		activateOnOpen.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.ACTIVATE_WHEN_OPENED));
 		// synchQueries.setSelection(getPreferenceStore().getBoolean(
 		// TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP));
 		enableBackgroundSynch.setSelection(getPreferenceStore().getBoolean(
@@ -233,11 +233,11 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
 		
 
 		reportEditor.setSelection(getPreferenceStore()
-				.getDefaultBoolean(TasksUiPreferenceConstants.REPORT_OPEN_EDITOR));
+				.getDefaultBoolean(TasksUiPreferenceConstants.REPORTING_OPEN_EDITOR));
 		reportInternal.setSelection(getPreferenceStore().getDefaultBoolean(
-				TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL));
+				TasksUiPreferenceConstants.REPORTING_OPEN_INTERNAL));
 		reportInternal.setSelection(getPreferenceStore().getDefaultBoolean(
-				TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL));
+				TasksUiPreferenceConstants.REPORTING_DISABLE_INTERNAL));
 
 		// synchQueries.setSelection(getPreferenceStore().getDefaultBoolean(
 		// TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP));
@@ -311,21 +311,21 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
 		container.setText("Open Repository Tasks with");
 		reportEditor = new Button(container, SWT.RADIO);
 		reportEditor.setText("Editor if available (Recommended)");
-		reportEditor.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORT_OPEN_EDITOR));
+		reportEditor.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORTING_OPEN_EDITOR));
 		reportInternal = new Button(container, SWT.RADIO);
 		reportInternal.setText("Internal browser");
-		reportInternal.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL));
+		reportInternal.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.REPORTING_OPEN_INTERNAL));
 
 		disableInternal = new Button(container, SWT.CHECK);
 		disableInternal.setText("Disable internal browser");
 		disableInternal.setEnabled(!reportInternal.getSelection());
 		disableInternal.setSelection(getPreferenceStore().getBoolean(
-				TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL));
+				TasksUiPreferenceConstants.REPORTING_DISABLE_INTERNAL));
 
 		activateOnOpen = new Button(container, SWT.CHECK);
 		activateOnOpen.setText("Active on double-click");
 		activateOnOpen.setEnabled(!reportInternal.getSelection());
-		activateOnOpen.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.ACTIVATE_ON_OPEN));
+		activateOnOpen.setSelection(getPreferenceStore().getBoolean(TasksUiPreferenceConstants.ACTIVATE_WHEN_OPENED));
 
 		reportInternal.addListener(SWT.Selection, new Listener() {
 
@@ -445,7 +445,7 @@ public class TasksPreferencePage extends PreferencePage implements IWorkbenchPre
 		incomingOverlaysButton = new Button(group, SWT.CHECK);
 		incomingOverlaysButton.setText("Use Synchronize View style incoming overlays and placement");
 		incomingOverlaysButton.setSelection(getPreferenceStore().getBoolean(
-				TasksUiPreferenceConstants.INCOMING_OVERLAID));
+				TasksUiPreferenceConstants.OVERLAYS_INCOMING_TIGHT));
 	}
 
 	private void createSchedulingGroup(Composite container) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
index 36d6dc536..fdfe5e463 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
@@ -47,7 +47,7 @@ class CustomTaskListDecorationDrawer implements Listener {
 		this.taskListView = taskListView;
 		this.activationImageOffset = activationImageOffset;
 		this.taskListView.synchronizationOverlaid = TasksUiPlugin.getDefault().getPluginPreferences().getBoolean(
-				TasksUiPreferenceConstants.INCOMING_OVERLAID);
+				TasksUiPreferenceConstants.OVERLAYS_INCOMING_TIGHT);
 
 		if (SWT.getPlatform().equals("gtk")) {
 			platformSpecificSquish = 8;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
index 1c49a3e19..3706968b4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
@@ -1370,7 +1370,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 				StructuredSelection selection = (StructuredSelection) getViewer().getSelection();
 				Object object = selection.getFirstElement();
 				if (TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
-						TasksUiPreferenceConstants.ACTIVATE_ON_OPEN)) {
+						TasksUiPreferenceConstants.ACTIVATE_WHEN_OPENED)) {
 					ITask selectedTask = TaskListView.getFromActivePerspective().getSelectedTask();
 					if (selectedTask != null) {
 						// TODO: move history stuff
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java
index 2eb61c752..8e180de2a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java
@@ -316,9 +316,9 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup {
 	private final IPropertyChangeListener PREFERENCE_LISTENER = new IPropertyChangeListener() {
 
 		public void propertyChange(PropertyChangeEvent event) {
-			if (event.getProperty().equals(TasksUiPreferenceConstants.MULTIPLE_ACTIVE_TASKS)) {
+			if (event.getProperty().equals(TasksUiPreferenceConstants.ACTIVATE_MULTIPLE)) {
 				TaskListView.getFromActivePerspective().togglePreviousAction(
-						!getPreferenceStore().getBoolean(TasksUiPreferenceConstants.MULTIPLE_ACTIVE_TASKS));
+						!getPreferenceStore().getBoolean(TasksUiPreferenceConstants.ACTIVATE_MULTIPLE));
 				getTaskListManager().getTaskActivationHistory().clear();
 
 			}
@@ -605,11 +605,11 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup {
 		store.setDefault(TasksUiPreferenceConstants.FILTER_SUBTASKS, true);
 		store.setDefault(TasksUiPreferenceConstants.NOTIFICATIONS_ENABLED, true);
 		store.setDefault(TasksUiPreferenceConstants.FILTER_PRIORITY, Task.PriorityLevel.P5.toString());
-		store.setDefault(TasksUiPreferenceConstants.REPORT_OPEN_EDITOR, true);
-		store.setDefault(TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL, false);
-		store.setDefault(TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL, false);
-		store.setDefault(TasksUiPreferenceConstants.ACTIVATE_ON_OPEN, false);
-		store.setDefault(TasksUiPreferenceConstants.REPORT_OPEN_EXTERNAL, false);
+		store.setDefault(TasksUiPreferenceConstants.REPORTING_OPEN_EDITOR, true);
+		store.setDefault(TasksUiPreferenceConstants.REPORTING_OPEN_INTERNAL, false);
+		store.setDefault(TasksUiPreferenceConstants.REPORTING_DISABLE_INTERNAL, false);
+		store.setDefault(TasksUiPreferenceConstants.ACTIVATE_WHEN_OPENED, false);
+		store.setDefault(TasksUiPreferenceConstants.REPORTING_OPEN_EXTERNAL, false);
 		// store.setDefault(TaskListPreferenceConstants.REPOSITORY_SYNCH_ON_STARTUP,
 		// false);
 
@@ -626,15 +626,13 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup {
 		store.setDefault(TasksUiPreferenceConstants.BACKUP_LAST, 0f);
 
 		store.setDefault(TasksUiPreferenceConstants.FILTER_ARCHIVE_MODE, true);
-		store.setDefault(TasksUiPreferenceConstants.MULTIPLE_ACTIVE_TASKS, false);
-		store.setValue(TasksUiPreferenceConstants.MULTIPLE_ACTIVE_TASKS, false);
+		store.setDefault(TasksUiPreferenceConstants.ACTIVATE_MULTIPLE, false);
+		store.setValue(TasksUiPreferenceConstants.ACTIVATE_MULTIPLE, false);
 
 		// store.setDefault(TaskListPreferenceConstants.PLANNING_STARTDAY, 2);
 		// store.setDefault(TaskListPreferenceConstants.PLANNING_ENDDAY, 6);
 		store.setDefault(TasksUiPreferenceConstants.PLANNING_STARTHOUR, 9);
 		store.setDefault(TasksUiPreferenceConstants.PLANNING_ENDHOUR, 18);
-
-		store.setDefault(TasksUiPreferenceConstants.SAVE_TASKLIST_MODE, TaskListSaveMode.THREE_HOURS.toString());
 	}
 
 	public static TaskListManager getTaskListManager() {
@@ -680,7 +678,7 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup {
 
 	// TODO: remove
 	public boolean isMultipleActiveTasksMode() {
-		return getPreferenceStore().getBoolean(TasksUiPreferenceConstants.MULTIPLE_ACTIVE_TASKS);
+		return getPreferenceStore().getBoolean(TasksUiPreferenceConstants.ACTIVATE_MULTIPLE);
 	}
 
 	public String[] getSaveOptions() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
index c5ce72102..365ea61f8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
@@ -284,7 +284,7 @@ public class TasksUiUtil {
 	public static void openEditor(final ITask task, boolean asyncExec, final boolean newTask) {
 
 		final boolean openWithBrowser = TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
-				TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL);
+				TasksUiPreferenceConstants.REPORTING_OPEN_INTERNAL);
 
 		final String taskEditorId = getTaskEditorId(task);
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
index 7fc2cee56..b62e09c7f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
@@ -119,7 +119,7 @@ public class TaskEditor extends SharedHeaderFormEditor implements IBusyEditor {
 
 	private int createBrowserPage(final String url) {
 		if (!TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
-				TasksUiPreferenceConstants.REPORT_DISABLE_INTERNAL)) {
+				TasksUiPreferenceConstants.REPORTING_DISABLE_INTERNAL)) {
 			try {
 				webBrowser = new Browser(getContainer(), SWT.NONE);
 				int index = addPage(webBrowser);
@@ -134,7 +134,7 @@ public class TaskEditor extends SharedHeaderFormEditor implements IBusyEditor {
 				});
 
 				boolean openWithBrowser = TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
-						TasksUiPreferenceConstants.REPORT_OPEN_INTERNAL);
+						TasksUiPreferenceConstants.REPORTING_OPEN_INTERNAL);
 
 				if (openWithBrowser) {
 					setActivePage(index);
diff --git a/org.eclipse.mylyn.trac.ui/plugin.xml b/org.eclipse.mylyn.trac.ui/plugin.xml
index e67ba94c3..2a5f111d6 100644
--- a/org.eclipse.mylyn.trac.ui/plugin.xml
+++ b/org.eclipse.mylyn.trac.ui/plugin.xml
@@ -34,14 +34,5 @@
          point="org.eclipse.mylyn.tasks.ui.editors">
       <editorFactory class="org.eclipse.mylyn.internal.trac.ui.editor.TracTaskEditorFactory"/>
    </extension>
-  <!-- <extension
-         point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
-      <hyperlinkDetector
-            class="org.eclipse.mylyn.internal.trac.ui.TracHyperlinkDetector"
-            id="org.eclipse.mylyn.jira.ui.hyperlinkdetector"
-            name="Mylar Task - Trac"
-            targetId="org.eclipse.jdt.ui.javaCode">
-      </hyperlinkDetector>
-   </extension>-->
 
 </plugin>