Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2008-06-13 15:38:40 -0400
committermkersten2008-06-13 15:38:40 -0400
commitbab6895eb1b52844cb548402d191b01d318e3997 (patch)
tree8d94e2dd631d63c3703d5bee1d6adaa0d60abe39
parent9ca5cfff068e0fc36b58292a44927a9755969d8c (diff)
downloadorg.eclipse.mylyn.tasks-bab6895eb1b52844cb548402d191b01d318e3997.tar.gz
org.eclipse.mylyn.tasks-bab6895eb1b52844cb548402d191b01d318e3997.tar.xz
org.eclipse.mylyn.tasks-bab6895eb1b52844cb548402d191b01d318e3997.zip
RESOLVED - bug 236760: rename "Mylyn" UI entries to "Tasks"
https://bugs.eclipse.org/bugs/show_bug.cgi?id=236760
-rw-r--r--org.eclipse.mylyn-feature/feature.xml7
-rw-r--r--org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.help.ui/doc/toc.xml2
-rw-r--r--org.eclipse.mylyn.help.ui/intro/overviewExtensionContent.xml6
-rw-r--r--org.eclipse.mylyn.help.ui/intro/tutorialsExtensionContent.xml18
-rw-r--r--org.eclipse.mylyn.help.ui/intro/whatsnewExtensionContent.xml8
-rw-r--r--org.eclipse.mylyn.help.ui/plugin.xml29
-rw-r--r--org.eclipse.mylyn.help.ui/src/empty.txt1
-rw-r--r--org.eclipse.mylyn.tasks.ui/icons/etool16/icons-legend.gifbin0 -> 200 bytes
-rw-r--r--org.eclipse.mylyn.tasks.ui/plugin.xml11
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowTasksUiLegendAction.java (renamed from org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/actions/ShowMylynLegendAction.java)6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/UiLegendControl.java (renamed from org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendControl.java)4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/UiLegendDialog.java (renamed from org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java)2
13 files changed, 40 insertions, 56 deletions
diff --git a/org.eclipse.mylyn-feature/feature.xml b/org.eclipse.mylyn-feature/feature.xml
index 23acce0f4..4cbce61f6 100644
--- a/org.eclipse.mylyn-feature/feature.xml
+++ b/org.eclipse.mylyn-feature/feature.xml
@@ -96,13 +96,6 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t
</requires>
<plugin
- id="org.eclipse.mylyn.help.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.mylyn"
download-size="0"
install-size="0"
diff --git a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
index 3e0cd46ec..7b81af077 100644
--- a/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.help.ui/META-INF/MANIFEST.MF
@@ -11,6 +11,4 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.mylyn.tasks.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.tasks.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)"
-Export-Package: org.eclipse.mylyn.internal.help.ui.actions;x-internal:=true,
- org.eclipse.mylyn.internal.help.ui.dialogs;x-internal:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.mylyn.help.ui/doc/toc.xml b/org.eclipse.mylyn.help.ui/doc/toc.xml
index 3cbf09a93..10ad48327 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="Task-Focused Interface" topic="doc/overview.html">
+<toc label="Mylyn" 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 6473c7f8e..facc4d603 100644
--- a/org.eclipse.mylyn.help.ui/intro/overviewExtensionContent.xml
+++ b/org.eclipse.mylyn.help.ui/intro/overviewExtensionContent.xml
@@ -10,10 +10,10 @@
<text>Learn more about how Mylyn will help you focus on tasks</text>
</link>
-->
- <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"
+ <link label="Mylyn"
+ url="http://org.eclipse.ui.intro/runAction?pluginId=org.eclipse.mylyn.help.ui&amp;class=org.eclipse.mylyn.internal.tasks.ui.actions.ShowTasksUiLegendAction&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 interface and open the Task List</text>
+ <text>See the Tasks UI Legend and open the Task List</text>
</link>
</group>
</extensionContent>
diff --git a/org.eclipse.mylyn.help.ui/intro/tutorialsExtensionContent.xml b/org.eclipse.mylyn.help.ui/intro/tutorialsExtensionContent.xml
index 6f0b0a3c0..5aa015537 100644
--- a/org.eclipse.mylyn.help.ui/intro/tutorialsExtensionContent.xml
+++ b/org.eclipse.mylyn.help.ui/intro/tutorialsExtensionContent.xml
@@ -2,17 +2,25 @@
<introContent>
<extensionContent id="org.eclipse.mylyn" name="Mylyn"
style="css/tutorials.css" path="tutorials/@">
- <group label="Mylyn" id="mylyn" style-id="content-group">
+ <group label="Task-focused programming" id="mylyn" style-id="content-group">
<link
url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&amp;input=org.eclipse.mylyn.cheatsheet.query"
label="Use the Task List" id="mylyn-query" style-id="content-link">
- <text>Learn how to create tasks and task repository queries.</text>
+ <text>Learn how to create tasks and task repository queries</text>
</link>
<link
- url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&amp;input=org.eclipse.mylyn.cheatsheet.taskfocus"
- label="Use the Task-Focused UI" id="mylyn-task" style-id="content-link">
- <text>Learn how to reduce information overload and multitask with ease.</text>
+ url="http://www.eclipse.org/mylyn/start/"
+ label="Visit the Mylyn homepage" id="mylyn-task" style-id="content-link">
+ <text>Learn about the benefits of task-focused programming with Mylyn</text>
</link>
</group>
</extensionContent>
</introContent>
+
+<!--
+<link
+ url="http://org.eclipse.ui.intro/showStandby?partId=org.eclipse.platform.cheatsheet&amp;input=org.eclipse.mylyn.cheatsheet.taskfocus"
+ label="Focus on Java" id="mylyn-task" style-id="content-link">
+ <text>Learn how to reduce information overload and multitask with ease.</text>
+</link>
+-->
diff --git a/org.eclipse.mylyn.help.ui/intro/whatsnewExtensionContent.xml b/org.eclipse.mylyn.help.ui/intro/whatsnewExtensionContent.xml
index ce52bcd52..b9b4d7e00 100644
--- a/org.eclipse.mylyn.help.ui/intro/whatsnewExtensionContent.xml
+++ b/org.eclipse.mylyn.help.ui/intro/whatsnewExtensionContent.xml
@@ -3,8 +3,8 @@
<extensionContent id="org.eclipse.mylyn" name="Mylyn"
style="css/whatsnew.css" path="whatsnew/@">
<group id="content-group" style-id="content-group">
- <link label="Task-focused interface"
- url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.mylyn.help.ui/doc/new.html"
+ <link label="Mylyn"
+ url="http://www.eclipse.org/mylyn/new/"
id="mylyn-noteworthy" style-id="content-link">
<text>
Find out the significant changes made to Mylyn
@@ -13,3 +13,7 @@
</group>
</extensionContent>
</introContent>
+
+<!--
+ url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.mylyn.help.ui/doc/new.html"
+--> \ No newline at end of file
diff --git a/org.eclipse.mylyn.help.ui/plugin.xml b/org.eclipse.mylyn.help.ui/plugin.xml
index 94ee86250..6e23bc734 100644
--- a/org.eclipse.mylyn.help.ui/plugin.xml
+++ b/org.eclipse.mylyn.help.ui/plugin.xml
@@ -12,19 +12,6 @@
</toc>
</extension>
- <extension point="org.eclipse.ui.commands">
- <category
- id="org.eclipse.mylyn.help.ui.commands"
- name="Tasks Help">
- </category>
- <command
- categoryId="org.eclipse.mylyn.help.ui.commands"
- description="Show Tasks UI Legend"
- id="org.eclipse.mylyn.doc.legend.show"
- name="Show Tasks UI Legend">
- </command>
- </extension>
-
<extension
point="org.eclipse.ui.intro.configExtension">
<configExtension
@@ -65,21 +52,5 @@
</description>
</cheatsheet>
</extension>
- <extension
- point="org.eclipse.ui.viewActions">
- <viewContribution
- id="org.eclipse.mylyn.tasks.ui.views.tasks.help.contribution"
- targetID="org.eclipse.mylyn.tasks.ui.views.tasks">
- <action
- class="org.eclipse.mylyn.internal.help.ui.actions.ShowMylynLegendAction"
- icon="icons/etool16/icons-legend.gif"
- id="org.eclipse.mylyn.doc.legend.show.action"
- label="Show UI Legend"
- menubarPath="additions"
- style="push"
- tooltip="Show UI Legend">
- </action>
- </viewContribution>
- </extension>
</plugin>
diff --git a/org.eclipse.mylyn.help.ui/src/empty.txt b/org.eclipse.mylyn.help.ui/src/empty.txt
new file mode 100644
index 000000000..72979ee5e
--- /dev/null
+++ b/org.eclipse.mylyn.help.ui/src/empty.txt
@@ -0,0 +1 @@
+Currently no source in this bundle \ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.ui/icons/etool16/icons-legend.gif b/org.eclipse.mylyn.tasks.ui/icons/etool16/icons-legend.gif
new file mode 100644
index 000000000..f40ce6b17
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/icons/etool16/icons-legend.gif
Binary files differ
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index fc9f74a39..cdae46457 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="Tasks" id="org.eclipse.mylyn.ui"/>
+ <category name="Mylyn" id="org.eclipse.mylyn.ui"/>
<view
allowMultiple="true"
category="org.eclipse.mylyn.ui"
@@ -293,6 +293,15 @@
toolbarPath="new"
tooltip="New Task">
</action>
+ <action
+ class="org.eclipse.mylyn.internal.tasks.ui.actions.ShowTasksUiLegendAction"
+ icon="icons/etool16/icons-legend.gif"
+ id="org.eclipse.mylyn.doc.legend.show.action"
+ label="Show UI Legend"
+ menubarPath="additions"
+ style="push"
+ tooltip="Show Tasks UI Legend">
+ </action>
<!--<action
class="org.eclipse.mylyn.internal.tasks.ui.actions.NewLocalTaskAction"
icon="icons/etool16/task-new.gif"
diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/actions/ShowMylynLegendAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowTasksUiLegendAction.java
index 1ef290e39..86f00dc2d 100644
--- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/actions/ShowMylynLegendAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ShowTasksUiLegendAction.java
@@ -6,11 +6,11 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.mylyn.internal.help.ui.actions;
+package org.eclipse.mylyn.internal.tasks.ui.actions;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.mylyn.internal.help.ui.dialogs.UiLegendDialog;
+import org.eclipse.mylyn.internal.tasks.ui.dialogs.UiLegendDialog;
import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IViewActionDelegate;
@@ -25,7 +25,7 @@ import org.eclipse.ui.intro.IIntroPart;
* @author Mik Kersten
* @author Leo Dos Santos
*/
-public class ShowMylynLegendAction implements IWorkbenchWindowActionDelegate, IViewActionDelegate {
+public class ShowTasksUiLegendAction implements IWorkbenchWindowActionDelegate, IViewActionDelegate {
private IWorkbenchWindow wbWindow;
diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendControl.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/UiLegendControl.java
index 586eb01f0..fe7f1add8 100644
--- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendControl.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/UiLegendControl.java
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.mylyn.internal.help.ui.dialogs;
+package org.eclipse.mylyn.internal.tasks.ui.dialogs;
import java.util.ArrayList;
import java.util.Collection;
@@ -51,7 +51,7 @@ import org.eclipse.ui.themes.IThemeManager;
*/
public class UiLegendControl extends Composite {
- public static final String TITLE = "Mylyn UI Overview";
+ public static final String TITLE = "Tasks UI Legend";
private final FormToolkit toolkit;
diff --git a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/UiLegendDialog.java
index a2b39b159..1f08a57a6 100644
--- a/org.eclipse.mylyn.help.ui/src/org/eclipse/mylyn/internal/help/ui/dialogs/UiLegendDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/dialogs/UiLegendDialog.java
@@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.mylyn.internal.help.ui.dialogs;
+package org.eclipse.mylyn.internal.tasks.ui.dialogs;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.dialogs.PopupDialog;

Back to the top