ASSIGNED - bug 236760: rename "Mylyn" UI entries to "Tasks"

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

7 files changed, 25 insertions, 81 deletions

diff --git a/org.eclipse.mylyn.help.ui/doc/toc.xml b/org.eclipse.mylyn.help.ui/doc/toc.xml
index 10ad48327..3cbf09a93 100644
--- a/org.eclipse.mylyn.help.ui/doc/toc.xml
+++ b/org.eclipse.mylyn.help.ui/doc/toc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
-<toc label="Mylyn" topic="doc/overview.html">
+<toc label="Task-Focused Interface" topic="doc/overview.html">
 	<topic label="Overview" href="doc/overview.html" />
 	<!--
 	<topic label="What's new" href="doc/new.html" />
diff --git a/org.eclipse.mylyn.help.ui/intro/overviewExtensionContent.xml b/org.eclipse.mylyn.help.ui/intro/overviewExtensionContent.xml
index 7d5510bfd..6473c7f8e 100644
--- a/org.eclipse.mylyn.help.ui/intro/overviewExtensionContent.xml
+++ b/org.eclipse.mylyn.help.ui/intro/overviewExtensionContent.xml
@@ -7,13 +7,13 @@
 			<link label="Mylyn"
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.mylyn.help.ui/doc/overview.html"
 				id="mylyn-overview" style-id="content-link">
-				<text>Learn more about Mylyn's Task-Focused UI</text>
+				<text>Learn more about how Mylyn will help you focus on tasks</text>
 			</link>
 			-->
-			<link label="Mylyn Overview"
+			<link label="Task-focused interface"
 				url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.mylyn.help.ui&amp;class=org.eclipse.mylyn.internal.help.ui.actions.ShowMylynLegendAction&amp;id=org.eclipse.mylyn.doc.legend.show.action"
 				id="mylyn-overview" style-id="content-link">
-				<text>See a summary of Mylyn's Task-Focused UI and open the Task List</text>
+				<text>See a summary of Mylyn's Task-Focused interface and open the Task List</text>
 			</link>
 		</group>
 	</extensionContent>
diff --git a/org.eclipse.mylyn.help.ui/intro/whatsnewExtensionContent.xml b/org.eclipse.mylyn.help.ui/intro/whatsnewExtensionContent.xml
index d988cc4e5..ce52bcd52 100644
--- a/org.eclipse.mylyn.help.ui/intro/whatsnewExtensionContent.xml
+++ b/org.eclipse.mylyn.help.ui/intro/whatsnewExtensionContent.xml
@@ -3,7 +3,7 @@
 	<extensionContent id="org.eclipse.mylyn" name="Mylyn"
 		style="css/whatsnew.css" path="whatsnew/@">
 		<group id="content-group" style-id="content-group">
-			<link label="Mylyn"
+			<link label="Task-focused interface"
 				url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.mylyn.help.ui/doc/new.html"
 				id="mylyn-noteworthy" style-id="content-link">
 				<text>
diff --git a/org.eclipse.mylyn.help.ui/plugin.xml b/org.eclipse.mylyn.help.ui/plugin.xml
index 6036791cb..94ee86250 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="Mylyn"
+         name="Tasks"
          point="org.eclipse.help.toc">
       <toc
             file="doc/toc.xml"
@@ -15,23 +15,15 @@
    <extension point="org.eclipse.ui.commands">
    <category
          id="org.eclipse.mylyn.help.ui.commands"
-         name="Mylyn Help">
+         name="Tasks Help">
    </category>
 	  <command
          categoryId="org.eclipse.mylyn.help.ui.commands"
-         description="Show Mylyn UI Legend"
+         description="Show Tasks UI Legend"
          id="org.eclipse.mylyn.doc.legend.show"
-         name="Show Mylyn UI Legend">
+         name="Show Tasks UI Legend">
       </command>
    </extension>
-  
-   <extension point="org.eclipse.ui.bindings">   
-      <key
-            sequence="M1+M2+M3+?"
-            commandId="org.eclipse.mylyn.doc.legend.show"
-            schemeId ="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-   </extension>
    
    <extension
          point="org.eclipse.ui.intro.configExtension">
@@ -52,7 +44,7 @@
          point="org.eclipse.ui.cheatsheets.cheatSheetContent">
       <category
             id="org.eclipse.mylyn.cheatsheet"
-            name="Mylyn">
+            name="Tasks">
       </category>
       <cheatsheet
             category="org.eclipse.mylyn.cheatsheet"
diff --git a/org.eclipse.mylyn.tasks.bugs/plugin.xml b/org.eclipse.mylyn.tasks.bugs/plugin.xml
index 3b62413fa..6201dbb65 100644
--- a/org.eclipse.mylyn.tasks.bugs/plugin.xml
+++ b/org.eclipse.mylyn.tasks.bugs/plugin.xml
@@ -23,7 +23,7 @@
    <extension point="org.eclipse.ui.actionSets">
 		<actionSet
             id="org.eclipse.mylyn.doc.actionSet"
-            label="Mylyn Help"
+            label="Tasks Help"
             visible="true"> 
         <action
               class="org.eclipse.mylyn.internal.tasks.bugs.actions.ReportBugAction"
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 5b7391f11..c581cca06 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -25,7 +25,7 @@
     </extension> 
     
 	<extension point="org.eclipse.ui.views">
-      <category name="Mylyn" id="org.eclipse.mylyn.ui"/>
+      <category name="Tasks" id="org.eclipse.mylyn.ui"/>
       <view
          allowMultiple="true"
          category="org.eclipse.mylyn.ui"
@@ -44,7 +44,7 @@
   	</extension>
      	
     <extension point="org.eclipse.ui.newWizards">
-        <category name="Mylyn" id="org.eclipse.mylyn.ui.wizards.new"/>
+        <category name="Tasks" id="org.eclipse.mylyn.ui.wizards.new"/>
     </extension>
 
     <extension
@@ -119,7 +119,7 @@
      </wizard>
      <category
            id="org.eclipse.mylyn.tasks.ui.wizards.import.category"
-           name="Mylyn"/>
+           name="Tasks"/>
   </extension>
 
      <extension point="org.eclipse.ui.exportWizards"> 
@@ -135,14 +135,14 @@
       </wizard>
       <category
             id="org.eclipse.mylyn.tasks.ui.wizards.export.category"
-            name="Mylyn"/> 
+            name="Tasks"/> 
     </extension> 
 
    <extension point="org.eclipse.ui.decorators">
       <decorator
             class="org.eclipse.mylyn.internal.tasks.ui.TaskLabelDecorator"
             id="org.eclipse.mylyn.tasks.ui.decorators.task"
-            label="Mylyn Task Decorator"
+            label="Task Decorator"
             lightweight="true"
             state="true">
          <description>
@@ -609,19 +609,12 @@
 
   <extension point="org.eclipse.ui.preferencePages">
 	  <page
-            name="Mylyn"
-            class="org.eclipse.mylyn.internal.tasks.ui.preferences.TaskFocusedUiPreferencePage"
-            id="org.eclipse.mylyn.ui.preferences">
+            name="Tasks"
+            class="org.eclipse.mylyn.internal.tasks.ui.preferences.TasksUiPreferencePage"
+            id="org.eclipse.mylyn.tasks.ui.preferences">
             <keywordReference 
             	id="org.eclipse.mylyn.tasks.ui.keywords"/>
-      </page>  
-      <page 
-         name="Task List"
-         class="org.eclipse.mylyn.internal.tasks.ui.preferences.TasksUiPreferencePage"
-         id="org.eclipse.mylyn.tasks.ui.preferences"
-         category="org.eclipse.mylyn.ui.preferences">
-         <keywordReference id="org.eclipse.mylyn.tasks.ui.keywords"/>
-      </page> 
+      </page>
    </extension>
  
   <extension point="org.eclipse.ui.bindings">
@@ -801,7 +794,7 @@
          point="org.eclipse.ui.actionSets">
       <actionSet
             id="org.eclipse.mylyn.tasks.ui.navigation"
-            label="Mylyn Task Navigation"
+            label="Task Navigation"
             visible="true">
 		<action
                class="org.eclipse.mylyn.internal.tasks.ui.actions.DeactivateAllTasksAction"
@@ -879,7 +872,7 @@
    <extension point="org.eclipse.ui.actionSets">
       <actionSet
             id="org.eclipse.mylyn.tasks.ui.navigation.additions"
-            label="Mylyn Task Navigation Extras"
+            label="Task Navigation Extras"
             visible="false">
   		<action
 	          allowLabelUpdate="true"
@@ -1039,14 +1032,14 @@
       <hyperlinkDetector            
             class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskHyperlinkDetector"
             id="org.eclipse.mylyn.tasks.ui.hyperlinks.detectors.task"
-            name="Mylyn Tasks"
+            name="Tasks"
             targetId="org.eclipse.ui.DefaultTextEditor">
       </hyperlinkDetector>
       <hyperlinkDetector
             class="org.eclipse.mylyn.internal.tasks.ui.editors.TaskUrlHyperlinkDetector"
-            description="Mylyn enabled URL hyperlink detector"
+            description="Task URL hyperlink detector"
             id="org.eclipse.mylyn.tasks.ui.hyperlinks.detectors.url"
-            name="Mylyn URLs"
+            name="Task URLs"
             targetId="org.eclipse.ui.DefaultTextEditor">
       </hyperlinkDetector>
    </extension>
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TaskFocusedUiPreferencePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TaskFocusedUiPreferencePage.java
deleted file mode 100644
index b5d3fea63..000000000
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TaskFocusedUiPreferencePage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 Mylyn project committers and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *******************************************************************************/
-
-package org.eclipse.mylyn.internal.tasks.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * @author Mik Kersten
- */
-public class TaskFocusedUiPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	@Override
-	protected Control createContents(Composite parent) {
-		Composite container = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout(1, false);
-		container.setLayout(layout);
-
-		Label label = new Label(container, SWT.NULL);
-		label.setText("Please select a preference page below \"Mylyn\".");
-
-		return container;
-	}
-
-	public void init(IWorkbench workbench) {
-		// ignore		
-	}
-
-}