diff options
| author | Dejan Gloszic | 2006-02-10 21:21:08 +0000 |
|---|---|---|
| committer | Dejan Gloszic | 2006-02-10 21:21:08 +0000 |
| commit | 30e186d185d580f841ff790ae3ab2efb33424db6 (patch) | |
| tree | 859fd4dd56c3f9b6356cab087367464c40edd569 | |
| parent | a35672e21ee26fdb4d4ac864a122e6b0aa03ec6e (diff) | |
| download | eclipse.platform.ua-30e186d185d580f841ff790ae3ab2efb33424db6.tar.gz eclipse.platform.ua-30e186d185d580f841ff790ae3ab2efb33424db6.tar.xz eclipse.platform.ua-30e186d185d580f841ff790ae3ab2efb33424db6.zip | |
*** empty log message ***
11 files changed, 111 insertions, 60 deletions
diff --git a/org.eclipse.ui.intro/plugin.xml b/org.eclipse.ui.intro/plugin.xml index 9d7786b57..eb4cd359f 100644 --- a/org.eclipse.ui.intro/plugin.xml +++ b/org.eclipse.ui.intro/plugin.xml @@ -60,7 +60,7 @@ <launchBar location="fastview" bg="#c6c3e8" - dynamic="true"> + computed="true"> </launchBar> </presentation> </config> diff --git a/org.eclipse.ui.intro/schema/IntroContent.exsd b/org.eclipse.ui.intro/schema/IntroContent.exsd index cf5d04b6e..86df70460 100644 --- a/org.eclipse.ui.intro/schema/IntroContent.exsd +++ b/org.eclipse.ui.intro/schema/IntroContent.exsd @@ -119,6 +119,14 @@ Since 3.1, if the content of the external file is XHTML 1.0, then the page is re </documentation> </annotation> </attribute> + <attribute name="bgImage" type="string"> + <annotation> + <documentation> + an optional URL of the image to use as a background for this group + + </documentation> + </annotation> + </attribute> </complexType> </element> @@ -175,13 +183,20 @@ Since 3.1, if the content of the external file is XHTML 1.0, then the page is re </restriction> </simpleType> </attribute> - <attribute name="dynamic" type="boolean" use="default" value="false"> + <attribute name="computed" type="boolean" use="default" value="false"> <annotation> <documentation> if <code>true</code>, the children of this group will be provided by the intro configurer at run time. It is advised not to define any children statically in this case. </documentation> </annotation> </attribute> + <attribute name="bgImage" type="string"> + <annotation> + <documentation> + an optional URL of the image to use as a background for this group + </documentation> + </annotation> + </attribute> </complexType> </element> @@ -650,6 +665,21 @@ Since 3.1, styles can also be a comma separated list of styles. These styles wil </documentation> </annotation> </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + (since 3.2) a unique identifier of this extension required when used in conjunction with intro configurer. + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + (since 3.2) a translatable name of this extension required when used in conjunction with intro configurer + </documentation> + </annotation> + </attribute> </complexType> </element> diff --git a/org.eclipse.ui.intro/schema/config.exsd b/org.eclipse.ui.intro/schema/config.exsd index 0b94b0e26..6864ea7af 100644 --- a/org.eclipse.ui.intro/schema/config.exsd +++ b/org.eclipse.ui.intro/schema/config.exsd @@ -217,10 +217,10 @@ The content file is parsed at run time by the intro framework. Based on the sett </documentation> </annotation> </attribute> - <attribute name="dynamic" type="boolean" use="default" value="false"> + <attribute name="computed" type="boolean" use="default" value="false"> <annotation> <documentation> - an optional boolean flag that indicates whether the launch bar shortcuts will be computed dynamically by the intro configurer. When set to <code>true</code>, static <code>shortcut</code> elements are ignored. + an optional boolean flag that indicates whether the launch bar shortcuts will be computed by the intro configurer. When set to <code>true</code>, static <code>shortcut</code> elements defined in plugin.xml will be ignored. </documentation> </annotation> </attribute> diff --git a/org.eclipse.ui.intro/schema/introContentFileSpec.html b/org.eclipse.ui.intro/schema/introContentFileSpec.html index 0ff6a8f61..0af9bdfed 100644 --- a/org.eclipse.ui.intro/schema/introContentFileSpec.html +++ b/org.eclipse.ui.intro/schema/introContentFileSpec.html @@ -31,7 +31,8 @@ The introContent element defines the body of the intro content file. The conten <br><p class=code id=dtd><!ELEMENT <a name="e.page">page</a> (<a href="#e.group">group</a>* | <a href="#e.link">link</a>* | <a href="#e.text">text</a>* | <a href="#e.head">head</a>* | <a href="#e.img">img</a>* | <a href="#e.include">include</a>* | <a href="#e.html">html</a>* | <a href="#e.title">title</a>? | <a href="#e.anchor">anchor</a>* | <a href="#e.contentProvider">contentProvider</a>*)></p> <p class=code id=dtd><!ATTLIST page</p> -<p class=code id=dtdAttlist>url CDATA #IMPLIED<p class=code id=dtdAttlist>id CDATA #REQUIRED<p class=code id=dtdAttlist>style CDATA #IMPLIED<p class=code id=dtdAttlist>alt-style CDATA #IMPLIED<p class=code id=dtdAttlist>filteredFrom (swt|html) <p class=code id=dtdAttlist>content CDATA #IMPLIED<p class=code id=dtdAttlist>style-id CDATA #IMPLIED></p> +<p class=code id=dtdAttlist>url CDATA #IMPLIED<p class=code id=dtdAttlist>id CDATA #REQUIRED<p class=code id=dtdAttlist>style CDATA #IMPLIED<p class=code id=dtdAttlist>alt-style CDATA #IMPLIED<p class=code id=dtdAttlist>filteredFrom (swt|html)<br> +bgImage CDATA #IMPLIED <p class=code id=dtdAttlist>content CDATA #IMPLIED<p class=code id=dtdAttlist>style-id CDATA #IMPLIED></p> <p></p> <p class=ConfigMarkup id=elementDesc> This element is used to describe a page to be displayed. The intro can display both dynamic and static pages.<br> @@ -72,13 +73,15 @@ The subelements used in a dynamic page are as follows: A <b>group</b> subelement This separation of pages can be used when performance is an issue, as the content of a page is now loaded more lazily.Since 3.1, if the content of the external file is XHTML 1.0, then the page is rendered as is.</li> <li><b>style-id</b> - A means to classify the page into a given category so that a common style may be applied.</li> <li><strong>shared-style </strong> - a boolean flag that controls the addition of the shared style into this page's list of styles. If true (the default), the shared style is added to this page's styles. If false , the shared style defined in the Intro configuration will not be injected into the styles of this page. </li> -<li></li> +<li><b>bgImage</b> - an optional URL of the background image to be used for this +page</li> </ul> <h2><code>group</code></h2> <br><p class=code id=dtd><!ELEMENT <a name="e.group">group</a> (<a href="#e.group">group</a>* | <a href="#e.link">link</a>* | <a href="#e.text">text</a>* | <a href="#e.img">img</a>* | <a href="#e.include">include</a>* | <a href="#e.html">html</a>* | <a href="#e.anchor">anchor</a>*)></p> <p class=code id=dtd><!ATTLIST group</p> <p class=code id=dtdAttlist>id CDATA #REQUIRED<p class=code id=dtdAttlist>label CDATA #IMPLIED<p class=code id=dtdAttlist>style-id CDATA #IMPLIED<p class=code> -<p class=code id=dtdAttlist>dynamic CDATA (true|false) "false"</p> +<p class=code id=dtdAttlist>computed CDATA (true|false) "false"<br> +bgImage CDATA #IMPLIED</p> <p class=code id=dtdAttlist>filteredFrom (swt|html) ></p> <p></p> <p class=ConfigMarkup id=elementDesc> @@ -89,9 +92,11 @@ Used to group related content, content that should have similar style applied, o <li><b>label</b> - a label or heading for this group</li> <li><b>style-id</b> - A means to classify this group into a given category so that a common style may be applied.</li> <li><b>filteredFrom</b> - an optional attribute that allows for filtering a given element out of a specific implementation. For example, if a group has filteredFrom = swt, it means that this group will not appear as content in the swt implementation.</li> -<li><b>dynamic</b> - if <code>true</code>, the children of this group will be +<li><b>computed</b> - if <code>true</code>, the children of this group will be provided by the intro configurer at run time. It is advised not to define any children statically in this case.</li> +<li><b>bgImage</b> - an optional URL of the background image to be used for this +group</li> </ul> <h2><code>link</code></h2> <br><p class=code id=dtd><!ELEMENT <a name="e.link">link</a> (<a href="#e.text">text</a>? , <a href="#e.img">img</a>?)></p> @@ -287,7 +292,9 @@ An image that represents intro content and not presentation (as opposed to decor <h2><code>extensionContent</code></h2> <br><p class=code id=dtd><!ELEMENT <a name="e.extensionContent">extensionContent</a> (<a href="#e.text">text</a> | <a href="#e.group">group</a> | <a href="#e.link">link</a> | <a href="#e.html">html</a> | <a href="#e.include">include</a>)></p> <p class=code id=dtd><!ATTLIST extensionContent</p> -<p class=code id=dtdAttlist>style CDATA #IMPLIED<p class=code id=dtdAttlist>alt-style CDATA #IMPLIED<p class=code id=dtdAttlist>path CDATA #REQUIRED></p> +<p class=code id=dtdAttlist>style CDATA #IMPLIED<p class=code id=dtdAttlist>alt-style CDATA #IMPLIED<br> +id CDATA #IMPLIED<p class=code>name +CDATA #IMPLIED<p class=code id=dtdAttlist>path CDATA #REQUIRED></p> <p></p> <p class=ConfigMarkup id=elementDesc> The content to be added to the target anchor. Only one extensionContent is allowed in a given configExtension because if this extension could not be resolved (if the config could not be found, or the target anchor element could not be found) then the pages and/or groups in the extension need to be @@ -304,10 +311,18 @@ Since 3.1, styles can also be a comma separated list of styles. These styles wil A relative path to a SWT presentation properies file which is applied to the page only when using the SWT based presentation. The path is relative to the location of this xml content file. <br> Since 3.1, styles can also be a comma separated list of styles. These styles will be used when creating the SWT presentation of the welcome page.</li> -<li><b>path</b> - the path that uniquely represents the path to an anchor. (e.g. page/group1/group2/anchorId) within the target configuration to be extended. It can only be an anchor which can be in any page or group, including shared groups at configuration level</li> -<li><strong>content </strong> - if content is defined, it is assumed that the extension content is defined in an external XHTML file. In that case the resource pointed to by this content attribute is loaded and the path attribute is now resolved in this external file. since 3.1 </li> -<li></li> +<li><b>path</b> - the path that uniquely represents the path to an anchor. (e.g. +<b>page/group1/group2/anchorId</b>) within the target configuration to be extended. It can only be an anchor which can be in any page or group, including shared groups at configuration level. +Since 3.2, path can also use format 'page/@'. This format delegates path +resolution to the intro configurer.</li> +<li><b>id</b> - (since 3.2) a unique identifier of this extension required when +used in conjunction with intro configurer.</li> +<li><b>name</b> - (since 3.2) a translatable name of this extension required +when used in conjunction with intro configurer</li> +<li><strong>content </strong>- if content is defined, it is assumed that the extension content is defined in an external XHTML file. In that case the resource pointed to by this content attribute is loaded and the path attribute is now resolved in this external file. since 3.1 +</li> </ul> +<p></p> <h2><code>anchor</code></h2> <br><p class=code id=dtd><!ELEMENT <a name="e.anchor">anchor</a> EMPTY></p> <p class=code id=dtd><!ATTLIST anchor</p> diff --git a/org.eclipse.ui.intro/shared/introContent.xml b/org.eclipse.ui.intro/shared/introContent.xml index 8508ac375..a71ba11b7 100644 --- a/org.eclipse.ui.intro/shared/introContent.xml +++ b/org.eclipse.ui.intro/shared/introContent.xml @@ -4,7 +4,7 @@ bgImage="$INTRO_BACKGROUND_IMAGE$"> <title style-id="intro-header">$introTitle$</title> <group id="links-background" bgImage="css/graphics/root/circles.png"> - <group id="page-links" dynamic="true"/> + <group id="page-links" computed="true"/> </group> <group id="action-links"> <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench"> @@ -20,7 +20,7 @@ style-id="page" bgImage="$INTRO_BACKGROUND_IMAGE$"> <title style-id="intro-header">$introTitle$</title> <group id="links-background"> - <group id="page-links" dynamic="true"> + <group id="page-links" computed="true"> </group> </group> <group id="action-links"> @@ -36,11 +36,11 @@ <page id="overview" style="css/overview/overview.css" alt-style="css/overview/swt.properties" style-id="page"> <group id="navigation-links" filteredFrom="swt" bgImage="css/graphics/ov_banner.jpg"> - <group id="page-links" dynamic="true"> + <group id="page-links" computed="true"> </group> <img id="banner-lines" src="css/graphics/banner_left_lines.png"/> <group id="action-links"> - <group id="customize" dynamic="true"/> + <group id="customize" computed="true"/> <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench"> <text>Go to the workbench</text> </link> @@ -51,18 +51,18 @@ </group> <text style-id="page-title" id="page-title" filteredFrom="html">OVERVIEW</text> <text style-id="page-description" id="page-description">Eclipse is a kind of universal tool platform - an open extensible IDE for anything and nothing in particular. It provides a feature-rich development environment that allows the developer to efficiently create tools that integrate seamlessly into the Eclipse Platform.</text> - <group id="left" dynamic="true"/> - <group id="right" dynamic="true"/> - <group id="bottom" dynamic="true"/> + <group id="left" computed="true"/> + <group id="right" computed="true"/> + <group id="bottom" computed="true"/> </group> </page> <page id="tutorials" style="css/tutorials/tutorials.css" alt-style="css/tutorials/swt.properties" style-id="page"> <group id="navigation-links" filteredFrom="swt" bgImage="css/graphics/tu_banner.jpg"> - <group id="page-links" dynamic="true"> + <group id="page-links" computed="true"> </group> <img id="banner-lines" src="css/graphics/banner_left_lines.png"/> <group id="action-links"> - <group id="customize" dynamic="true"/> + <group id="customize" computed="true"/> <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench"> <text>Go to the workbench</text> </link> @@ -73,18 +73,18 @@ </group> <text style-id="page-title" id="page-title" filteredFrom="html">TUTORIALS</text> <text style-id="page-description" id="page-description">Learn how to be productive using Eclipse by completing end-to-end tutorials that will guide you along the way.</text> - <group id="left" dynamic="true"/> - <group id="right" dynamic="true"/> - <group id="bottom" dynamic="true"/> + <group id="left" computed="true"/> + <group id="right" computed="true"/> + <group id="bottom" computed="true"/> </group> </page> <page id="samples" style="css/samples/samples.css" alt-style="css/samples/swt.properties" style-id="page"> <group id="navigation-links" filteredFrom="swt" bgImage="css/graphics/sa_banner.jpg"> - <group id="page-links" dynamic="true"> + <group id="page-links" computed="true"> </group> <img id="banner-lines" src="css/graphics/banner_left_lines.png"/> <group id="action-links"> - <group id="customize" dynamic="true"/> + <group id="customize" computed="true"/> <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench"> <text>Go to the workbench</text> </link> @@ -95,19 +95,19 @@ </group> <text style-id="page-title" id="page-title" filteredFrom="html">SAMPLES</text> <text style-id="page-description" id="page-description">Explore Eclipse by installing prefabricated samples (may require Internet connection).</text> - <group id="left" dynamic="true"/> - <group id="right" dynamic="true"/> - <group id="bottom" dynamic="true"/> + <group id="left" computed="true"/> + <group id="right" computed="true"/> + <group id="bottom" computed="true"/> </group> </page> <page id="whatsnew" style="css/whatsnew/whatsnew.css" alt-style="css/whatsnew/swt.properties" style-id="page"> <group id="navigation-links" filteredFrom="swt" bgImage="css/graphics/wn_banner.jpg"> - <group id="page-links" dynamic="true"> + <group id="page-links" computed="true"> </group> <img id="banner-lines" src="css/graphics/banner_left_lines.png"/> <group id="action-links"> - <group id="customize" dynamic="true"/> + <group id="customize" computed="true"/> <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench"> <text>Go to the workbench</text> </link> @@ -117,19 +117,19 @@ <group id="content-header" label="WHAT'S NEW" filteredFrom="swt"> </group> <text style-id="page-title" id="page-title" filteredFrom="html">WHAT'S NEW</text> - <group id="left" dynamic="true"/> - <group id="right" dynamic="true"/> - <group id="bottom" dynamic="true"/> + <group id="left" computed="true"/> + <group id="right" computed="true"/> + <group id="bottom" computed="true"/> </group> </page> <page id="firststeps" style="css/firststeps/firststeps.css" alt-style="css/firststeps/swt.properties" style-id="page"> <group id="navigation-links" filteredFrom="swt" bgImage="css/graphics/fs_banner.jpg"> - <group id="page-links" dynamic="true"> + <group id="page-links" computed="true"> </group> <img id="banner-lines" src="css/graphics/banner_left_lines.png"/> <group id="action-links"> - <group id="customize" dynamic="true"/> + <group id="customize" computed="true"/> <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench"> <text>Go to the workbench</text> </link> @@ -139,19 +139,19 @@ <group id="content-header" label="FIRST STEPS" filteredFrom="swt"> </group> <text style-id="page-title" id="page-title" filteredFrom="html">FIRST STEPS</text> - <group id="left" dynamic="true"/> - <group id="right" dynamic="true"/> - <group id="bottom" dynamic="true"/> + <group id="left" computed="true"/> + <group id="right" computed="true"/> + <group id="bottom" computed="true"/> </group> </page> <page id="webresources" style="css/webresources/webresources.css" alt-style="css/webresources/swt.properties" style-id="page"> <group id="navigation-links" filteredFrom="swt" bgImage="css/graphics/wr_banner.jpg"> - <group id="page-links" dynamic="true"> + <group id="page-links" computed="true"> </group> <img id="banner-lines" src="css/graphics/banner_left_lines.png"/> <group id="action-links"> - <group id="customize" dynamic="true"/> + <group id="customize" computed="true"/> <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench"> <text>Go to the workbench</text> </link> @@ -161,19 +161,19 @@ <group id="content-header" label="WEB RESOURCES" filteredFrom="swt"> </group> <text style-id="page-title" id="page-title" filteredFrom="html">WEB RESOURCE</text> - <group id="left" dynamic="true"/> - <group id="right" dynamic="true"/> - <group id="bottom" dynamic="true"/> + <group id="left" computed="true"/> + <group id="right" computed="true"/> + <group id="bottom" computed="true"/> </group> </page> <page id="migrate" style="css/migrate/migrate.css" alt-style="css/migrate/swt.properties" style-id="page"> <group id="navigation-links" filteredFrom="swt" bgImage="css/graphics/mi_banner.jpg"> - <group id="page-links" dynamic="true"> + <group id="page-links" computed="true"> </group> <img id="banner-lines" src="css/graphics/banner_left_lines.png"/> <group id="action-links"> - <group id="customize" dynamic="true"/> + <group id="customize" computed="true"/> <link url="http://org.eclipse.ui.intro/switchToLaunchBar" label="Workbench" id="workbench"> <text>Go to the workbench</text> </link> @@ -183,9 +183,9 @@ <group id="content-header" label="MIGRATE" filteredFrom="swt"> </group> <text style-id="page-title" id="page-title" filteredFrom="html">MIGRATE</text> - <group id="left" dynamic="true"/> - <group id="right" dynamic="true"/> - <group id="bottom" dynamic="true"/> + <group id="left" computed="true"/> + <group id="right" computed="true"/> + <group id="bottom" computed="true"/> </group> </page> <!-- diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroGroup.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroGroup.java index 84fcd4c78..a74900e4a 100644 --- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroGroup.java +++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroGroup.java @@ -25,7 +25,7 @@ public class IntroGroup extends AbstractIntroContainer { protected static final String TAG_GROUP = "group"; //$NON-NLS-1$ private static final String ATT_LABEL = "label"; //$NON-NLS-1$ - private static final String ATT_DYNAMIC = "dynamic"; //$NON-NLS-1$ + private static final String ATT_COMPUTED = "computed"; //$NON-NLS-1$ private String label; /** * @param element @@ -52,7 +52,7 @@ public class IntroGroup extends AbstractIntroContainer { } protected void loadChildren() { - String value = getAttribute(element, ATT_DYNAMIC); + String value = getAttribute(element, ATT_COMPUTED); if (value!=null && value.equalsIgnoreCase("true")) //$NON-NLS-1$ loadDynamicNodes(); super.loadChildren(); diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroLaunchBarElement.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroLaunchBarElement.java index 50ab594eb..c8f5ae9df 100644 --- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroLaunchBarElement.java +++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/model/IntroLaunchBarElement.java @@ -163,10 +163,10 @@ public class IntroLaunchBarElement extends AbstractIntroElement { IntroModelRoot model = getModelRoot(); IntroConfigurer configurer = model!=null?model.getConfigurer():null; - String dvalue = getCfgElement().getAttribute("dynamic"); //$NON-NLS-1$ - boolean dynamic = dvalue!=null && dvalue.equalsIgnoreCase("true"); //$NON-NLS-1$ + String cvalue = getCfgElement().getAttribute("computed"); //$NON-NLS-1$ + boolean computed = cvalue!=null && cvalue.equalsIgnoreCase("true"); //$NON-NLS-1$ - if (dynamic && configurer!=null) { + if (computed && configurer!=null) { IntroElement [] children = configurer.getLaunchBarShortcuts(); for (int i=0; i<children.length; i++) { IntroLaunchBarShortcut shortcut = new IntroLaunchBarShortcut(getCfgElement(), children[i]); diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/WelcomeCustomizationPreferencePage.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/WelcomeCustomizationPreferencePage.java index e6c937677..d7dc3f2d8 100644 --- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/WelcomeCustomizationPreferencePage.java +++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/shared/WelcomeCustomizationPreferencePage.java @@ -336,12 +336,15 @@ public class WelcomeCustomizationPreferencePage extends PreferencePage implement } private boolean isCustomizationMode() { + /* String[] args = Platform.getApplicationArgs(); for (int i = 0; i < args.length; i++) { if (args[i].equalsIgnoreCase("-welcomeCustomization")) //$NON-NLS-1$ return true; } return false; + */ + return true; } public void init(IWorkbench workbench) { diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/ExtensionFactory.java b/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/ExtensionFactory.java index 79c556045..0b38ebe5c 100644 --- a/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/ExtensionFactory.java +++ b/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/ExtensionFactory.java @@ -29,6 +29,8 @@ import org.eclipse.ui.internal.intro.shared.WelcomeCustomizationPreferencePage; * <li>welcomeCustomization - a preference page that allows user customization of the shared * Welcome.</li> * </ul> + * <p>This class should be referenced in extensions but not subclassed + * or instantiated programmatically. * * @since 3.2 */ diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/IntroConfigurer.java b/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/IntroConfigurer.java index df3e6563d..4b5dca362 100644 --- a/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/IntroConfigurer.java +++ b/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/IntroConfigurer.java @@ -35,7 +35,7 @@ public abstract class IntroConfigurer { public abstract String getVariable(String variableName); /** - * Returns the children of dynamic groups. Groups marked as dynamic will be completed at run + * Returns the children of computed groups. Groups marked as computed will be completed at run * time when the group is asked to provide children. * * @param pageId @@ -50,7 +50,7 @@ public abstract class IntroConfigurer { /** * Returns an array of elements that will be used to build launch bar short cut links. Override - * this method if the intro launch bar has been marked as dynamic. + * this method if the intro launch bar has been marked as computed. * * @return an array of elements that will be used to dynamically build shortcut links. */ diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/IntroElement.java b/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/IntroElement.java index 075a4af90..098f2513a 100644 --- a/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/IntroElement.java +++ b/org.eclipse.ui.intro/src/org/eclipse/ui/intro/config/IntroElement.java @@ -14,9 +14,9 @@ import java.util.Enumeration; import java.util.Hashtable; /** - * Used to provide children of the dynamic gruops while constructing intro content. Clients provide + * Used to provide children of the computed gruops while constructing intro content. Clients provide * instances of this class from <code>IntroConfigurer</code> to dynamically complete the intro - * content. Attribute and element names, as well as content model must match the intro content + * content. Attribute and element names, as well as content model must match the intro * schema. * * @since 3.2 @@ -60,12 +60,13 @@ public class IntroElement { public String getAttribute(String name) { return (String) atts.get(name); } - + /** * Returns the names of all the attributes defined in this element. + * * @return an enumeration of all the element names */ - + public Enumeration getAttributes() { return atts.keys(); } |