First step regarding Bug 349242 - [help] split otdt.ui.help plug-in
- this is approx. what I submitted for the indigo info center.
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/.classpath b/plugins/org.eclipse.objectteams.otdt.ui.help/.classpath
index 9b7e6c5..c835067 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/.classpath
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/.classpath
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="OTRE"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/.project b/plugins/org.eclipse.objectteams.otdt.ui.help/.project
index 15612ac..98a9eac 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/.project
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/.project
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.objectteams.otdt.ui.help</name>
+ <name>org.eclipse.objectteams.otdt.doc</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.objectteams.otdt.builder.OTJBuilder</name>
+ <name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
@@ -24,6 +24,5 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.objectteams.otdt.OTJavaNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
index 75e5312..156b0db 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/META-INF/MANIFEST.MF
@@ -1,28 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.objectteams.otdt.ui.help;singleton:=true
+Bundle-SymbolicName: org.eclipse.objectteams.otdt.doc;singleton:=true
Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.eclipse.objectteams.otdt.ui.help.OTHelpPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.objectteams.otdt.internal.ui.help.actions;x-internal:=true,
- org.eclipse.objectteams.otdt.internal.ui.help.views;x-internal:=true,
- org.eclipse.objectteams.otdt.ui.help
-Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.ui.intro;bundle-version="[3.4.100,4.0.0)",
- org.eclipse.ui.cheatsheets;bundle-version="[3.4.100,4.0.0)",
- org.eclipse.help;bundle-version="[3.5.100,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.ui.browser;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.7.0.v_OTDT_r200,4.0.0)",
- org.eclipse.objectteams.otdt.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.objectteams.otequinox;bundle-version="[2.0.0,3.0.0)"
+Require-Bundle: org.eclipse.help;bundle-version="[3.5.100,4.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Classpath: .
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/build.properties b/plugins/org.eclipse.objectteams.otdt.ui.help/build.properties
index f85821a..35470ae 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/build.properties
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/build.properties
@@ -19,17 +19,13 @@
# Technical University Berlin - Initial API and implementation
########################################################################
customBuildCallbacks=customBuildCallbacks.xml
-source.. = src/
-output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.,\
- cheatsheets/,\
css/,\
guide/,\
icons/,\
images/,\
- intro/,\
plugin.properties,\
ot.html,\
reference/,\
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/guide/toc.xml b/plugins/org.eclipse.objectteams.otdt.ui.help/guide/toc.xml
index 699f55a..f3abb53 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/guide/toc.xml
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/guide/toc.xml
@@ -41,21 +41,21 @@
<topic label="OTDT 0.7 New&Noteworthy" href="guide/news/new_in_0.7.html"/>
</topic>
</topic>
- <topic label="Object Teams Language Definition" href="/org.eclipse.objectteams.otdt.ui.help/guide/otjld/def/index.html">
- <topic label="Teams and Roles" href="/org.eclipse.objectteams.otdt.ui.help/guide/otjld/def/s1.html"/>
- <topic label="Role Binding" href="/org.eclipse.objectteams.otdt.ui.help/guide/otjld/def/s2.html"/>
- <topic label="Callout Binding" href="/org.eclipse.objectteams.otdt.ui.help/guide/otjld/def/s3.html"/>
- <topic label="Callin Binding" href="/org.eclipse.objectteams.otdt.ui.help/guide/otjld/def/s4.html"/>
- <topic label="Team Activation" href="/org.eclipse.objectteams.otdt.ui.help/guide/otjld/def/s5.html"/>
- <topic label="Object Teams API" href="/org.eclipse.objectteams.otdt.ui.help/guide/otjld/def/s6.html"/>
- <topic label="Role Encapsulation" href="/org.eclipse.objectteams.otdt.ui.help/guide/otjld/def/s7.html"/>
- <topic label="Value Dependent Classes" href="/org.eclipse.objectteams.otdt.ui.help/guide/otjld/def/s9.html"/>
- <topic label="OT/J Syntax" href="/org.eclipse.objectteams.otdt.ui.help/guide/otjld/def/sA.html"/>
- <topic label="Changes between versions" href="/org.eclipse.objectteams.otdt.ui.help/guide/otjld/def/sB.html"/>
+ <topic label="Object Teams Language Definition" href="/org.eclipse.objectteams.otdt.doc/guide/otjld/def/index.html">
+ <topic label="Teams and Roles" href="/org.eclipse.objectteams.otdt.doc/guide/otjld/def/s1.html"/>
+ <topic label="Role Binding" href="/org.eclipse.objectteams.otdt.doc/guide/otjld/def/s2.html"/>
+ <topic label="Callout Binding" href="/org.eclipse.objectteams.otdt.doc/guide/otjld/def/s3.html"/>
+ <topic label="Callin Binding" href="/org.eclipse.objectteams.otdt.doc/guide/otjld/def/s4.html"/>
+ <topic label="Team Activation" href="/org.eclipse.objectteams.otdt.doc/guide/otjld/def/s5.html"/>
+ <topic label="Object Teams API" href="/org.eclipse.objectteams.otdt.doc/guide/otjld/def/s6.html"/>
+ <topic label="Role Encapsulation" href="/org.eclipse.objectteams.otdt.doc/guide/otjld/def/s7.html"/>
+ <topic label="Value Dependent Classes" href="/org.eclipse.objectteams.otdt.doc/guide/otjld/def/s9.html"/>
+ <topic label="OT/J Syntax" href="/org.eclipse.objectteams.otdt.doc/guide/otjld/def/sA.html"/>
+ <topic label="Changes between versions" href="/org.eclipse.objectteams.otdt.doc/guide/otjld/def/sB.html"/>
</topic>
<topic label="OT/Equinox Extension Points Reference">
- <topic label="org.eclipse.objectteams.otequinox.aspectBindings" href="/org.eclipse.objectteams.otdt.ui.help/reference/extension-points/org_eclipse_objectteams_otequinox_aspectBindings.html"/>
- <topic label="org.eclipse.objectteams.otequinox.aspectBindingNegotiators" href="/org.eclipse.objectteams.otdt.ui.help/reference/extension-points/org_eclipse_objectteams_otequinox_aspectBindingNegotiators.html"/>
- <topic label="org.eclipse.objectteams.otequinox.liftingParticipant" href="/org.eclipse.objectteams.otdt.ui.help/reference/extension-points/org_eclipse_objectteams_otequinox_liftingParticipant.html"/>
+ <topic label="org.eclipse.objectteams.otequinox.aspectBindings" href="/org.eclipse.objectteams.otdt.doc/reference/extension-points/org_eclipse_objectteams_otequinox_aspectBindings.html"/>
+ <topic label="org.eclipse.objectteams.otequinox.aspectBindingNegotiators" href="/org.eclipse.objectteams.otdt.doc/reference/extension-points/org_eclipse_objectteams_otequinox_aspectBindingNegotiators.html"/>
+ <topic label="org.eclipse.objectteams.otequinox.liftingParticipant" href="/org.eclipse.objectteams.otdt.doc/reference/extension-points/org_eclipse_objectteams_otequinox_liftingParticipant.html"/>
</topic>
</toc>
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.properties b/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.properties
index 8b02360..80b2bf9 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.properties
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.properties
@@ -1,6 +1,3 @@
pluginName=Object Teams Development Tooling Help
providerName=Eclipse.org - Object Teams
-cheatsheet.SimpleOTApplication.name = Object Teams Application
-cheatsheet.SimpleOTApplication.desc = This tutorial will show you how to use Eclipse to create an Object Teams program.
-simple Object Teams application.
diff --git a/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.xml b/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.xml
index 2d0dcb7..638c8f8 100644
--- a/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.xml
+++ b/plugins/org.eclipse.objectteams.otdt.ui.help/plugin.xml
@@ -3,159 +3,10 @@
<plugin>
-<!-- OTDT extensions for intro/welcome page -->
- <extension point="org.eclipse.ui.intro.configExtension">
- <configExtension
- configId="org.eclipse.ui.intro.universalConfig"
- content="intro/overviewExtensionContent.xml"/>
- </extension>
-
- <extension point="org.eclipse.ui.intro.configExtension">
- <configExtension
- configId="org.eclipse.ui.intro.universalConfig"
- content="intro/tutorialsExtensionContentOT.xml"/>
- </extension>
-
- <extension point="org.eclipse.ui.intro.configExtension">
- <configExtension
- configId="org.eclipse.ui.intro.universalConfig"
- content="intro/whatsnewExtensionContent.xml"/>
- </extension>
-
-<!-- OTDT cheat sheet extension for small OT example -->
- <extension point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <cheatsheet
- category="org.eclipse.objectteams"
- contentFile="cheatsheets/SimpleOTApplication.xml"
- id="org.eclipse.objectteams.otdt.ui.help.cheatsheets.SimpleOTApplication"
- name="%cheatsheet.SimpleOTApplication.name">
- <description>%cheatsheet.SimpleOTApplication.desc</description>
- </cheatsheet>
- <category
- id="org.eclipse.objectteams"
- name="Object Teams">
- </category>
- </extension>
<!-- OTDT help extension-->
<extension point="org.eclipse.help.toc">
<toc file="guide/toc.xml" primary="true"/>
</extension>
- <extension
- point="org.eclipse.ui.views">
- <view
- name="OT/J Language Definition"
- icon="icons/ot_paragraph.gif"
- category="org.eclipse.objectteams.otdt.ui"
- class="org.eclipse.objectteams.otdt.internal.ui.help.views.OTJLDView"
- id="org.eclipse.objectteams.otdt.ui.help.views.OTJLDView">
- <description>
- Browsable view of the OT/J Language Definition.
- </description>
- </view>
- </extension>
- <extension
- point="org.eclipse.ui.popupMenus">
- <viewerContribution
- targetID="org.eclipse.ui.views.ProblemView"
- id="org.eclipse.objectteams.otdt.ui.help.problemContribution">
- <action
- class="org.eclipse.objectteams.otdt.internal.ui.help.actions.ShowOTJLDAction"
- enablesFor="1"
- icon="icons/ot_paragraph.gif"
- id="org.eclipse.objectteams.otdt.ui.help.actions.ShowOTJLDAction"
- label="Go to Language Definition"
- menubarPath="group.showIn"/>
- </viewerContribution>
- </extension>
-
- <extension
- point="org.eclipse.ui.viewActions">
- <viewContribution
- id="org.eclipse.objectteams.otdt.ui.help.OTJLDView.actions"
- targetID="org.eclipse.objectteams.otdt.ui.help.views.OTJLDView">
- <action
- class="org.eclipse.objectteams.otdt.internal.ui.help.actions.OTJLDViewActionDelegate"
- disabledIcon="icons/dlcl16/nav_home.gif"
- hoverIcon="icons/clcl16/nav_home.gif"
- icon="icons/elcl16/nav_home.gif"
- id="org.eclipse.objectteams.otdt.ui.help.OTJLDView.home"
- label="Table Of Contents"
- style="push"
- toolbarPath="additions"
- tooltip="Table Of Contents">
- </action>
- <action
- class="org.eclipse.objectteams.otdt.internal.ui.help.actions.OTJLDViewActionDelegate"
- disabledIcon="icons/dlcl16/nav_forward.gif"
- hoverIcon="icons/clcl16/nav_forward.gif"
- icon="icons/elcl16/nav_forward.gif"
- id="org.eclipse.objectteams.otdt.ui.help.OTJLDView.next"
- label="Forward to the next page"
- style="push"
- toolbarPath="additions"
- tooltip="Forward to the next page">
- </action>
- <action
- class="org.eclipse.objectteams.otdt.internal.ui.help.actions.OTJLDViewActionDelegate"
- disabledIcon="icons/dlcl16/nav_backward.gif"
- hoverIcon="icons/clcl16/nav_backward.gif"
- icon="icons/elcl16/nav_backward.gif"
- id="org.eclipse.objectteams.otdt.ui.help.OTJLDView.back"
- label="Back to the previous page"
- style="push"
- toolbarPath="additions"
- tooltip="Back to the previous page">
- </action>
- </viewContribution>
- </extension>
- <extension
- point="org.eclipse.ui.perspectiveExtensions">
- <perspectiveExtension
- targetID="org.eclipse.objectteams.otdt.ui.OTJavaPerspective">
- <viewShortcut
- id="org.eclipse.objectteams.otdt.ui.help.views.OTJLDView">
- </viewShortcut>
- <view
- id="org.eclipse.objectteams.otdt.ui.help.views.OTJLDView"
- minimized="false"
- relationship="stack"
- relative="org.eclipse.ui.views.ProblemView">
- </view>
- </perspectiveExtension>
- </extension>
- <extension
- point="org.eclipse.objectteams.otdt.ui.updateRulerActionExtenders">
- <extender
- class="org.eclipse.objectteams.otdt.internal.ui.help.actions.UpdateRulerAction"
- editorClass="org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitEditor">
- </extender>
- </extension>
- <extension
- point="org.eclipse.objectteams.otequinox.aspectBindings">
- <aspectBinding
- icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/calloutbinding_obj.gif">
- <basePlugin
- icon="platform:/plugin/org.eclipse.pde.ui/icons/obj16/plugin_obj.gif"
- id="org.eclipse.jdt.ui">
- </basePlugin>
- <team
- activation="ALL_THREADS"
- class="org.eclipse.objectteams.otdt.internal.ui.help.actions.HoverAdaptor"
- icon="platform:/plugin/org.eclipse.objectteams.otdt.ui/icons/ot/team_obj.gif">
- </team>
- </aspectBinding>
- </extension>
-
- <!--
- <extension
- point="org.eclipse.jdt.ui.javaEditorTextHovers">
- <hover
- id="org.eclipse.objectteams.otdt.ui.help.IProblemDocumentation"
- class="org.eclipse.objectteams.otdt.ui.help.IProblemDocumentation"
- label="ObjectTeams Language Specification Hover"/>
- </extension>
- -->
-
</plugin>