Bug 428514 - Merge the examples project that contain only views.
Fix links in o.e.platform.doc.isv bundle.
Change-Id: Ifb5e54333381ab58630b73d78030c8bb7daa0d2d
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
index c1a2d37..bf8d949 100644
--- a/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
+++ b/bundles/org.eclipse.platform.doc.isv/buildDoc.xml
@@ -88,12 +88,9 @@
<copy todir="samples">
<fileset dir="${eclipse.platform.swt.examples}">
<include name="org.eclipse.swt.examples/doc-html/"/>
- <include name="org.eclipse.swt.examples.browser/doc-html/"/>
- <include name="org.eclipse.swt.examples.controls/doc-html/"/>
+ <include name="org.eclipse.swt.examples.views/doc-html/"/>
<include name="org.eclipse.swt.examples.launcher/doc-html/"/>
- <include name="org.eclipse.swt.examples.layouts/doc-html/"/>
<include name="org.eclipse.swt.examples.ole.win32/doc-html/"/>
- <include name="org.eclipse.swt.examples.paint/doc-html/"/>
</fileset>
</copy>
<copy todir="samples">
diff --git a/bundles/org.eclipse.platform.doc.isv/topics_Samples.xml b/bundles/org.eclipse.platform.doc.isv/topics_Samples.xml
index 17fee3e..0743c3f 100644
--- a/bundles/org.eclipse.platform.doc.isv/topics_Samples.xml
+++ b/bundles/org.eclipse.platform.doc.isv/topics_Samples.xml
@@ -19,12 +19,12 @@
<topic label="Text editor" href="samples/org.eclipse.swt.examples/doc-html/swt_texteditor_ex.html"/>
</topic>
<topic label="Workbench views" >
- <topic label="Browser" href="samples/org.eclipse.swt.examples.browser/doc-html/swt_browser_ex.html"/>
- <topic label="Controls" href="samples/org.eclipse.swt.examples.controls/doc-html/swt_controls_ex.html"/>
- <topic label="Custom Controls" href="samples/org.eclipse.swt.examples.controls/doc-html/swt_customcontrols_ex.html"/>
- <topic label="Layout" href="samples/org.eclipse.swt.examples.layouts/doc-html/swt_layout_ex.html"/>
+ <topic label="Browser" href="samples/org.eclipse.swt.examples.views/doc-html/swt_browser_ex.html"/>
+ <topic label="Controls" href="samples/org.eclipse.swt.examples.views/doc-html/swt_controls_ex.html"/>
+ <topic label="Custom Controls" href="samples/org.eclipse.swt.examples.views/doc-html/swt_customcontrols_ex.html"/>
+ <topic label="Layout" href="samples/org.eclipse.swt.examples.views/doc-html/swt_layout_ex.html"/>
<topic label="OLE" href="samples/org.eclipse.swt.examples.ole.win32/doc-html/swt_ole_ex.html" />
- <topic label="Paint" href="samples/org.eclipse.swt.examples.paint/doc-html/swt_paint_ex.html"/>
+ <topic label="Paint" href="samples/org.eclipse.swt.examples.views/doc-html/swt_paint_ex.html"/>
</topic>
</topic>
