diff options
| author | Eike Stepper | 2011-09-17 04:18:06 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-09-17 04:18:06 +0000 |
| commit | 3d93b34ca70bdb4c0f56f81be98f745f76264a05 (patch) | |
| tree | 0f9dae615a96b87bfadb2dd67024c3959ee21e6f | |
| parent | 20ff4ac8c011164612761ee3bd2200a9300e6e16 (diff) | |
| download | cdo-3d93b34ca70bdb4c0f56f81be98f745f76264a05.tar.gz cdo-3d93b34ca70bdb4c0f56f81be98f745f76264a05.tar.xz cdo-3d93b34ca70bdb4c0f56f81be98f745f76264a05.zip | |
tutorials
81 files changed, 1385 insertions, 344 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/build.xml b/plugins/org.eclipse.emf.cdo.doc/build.xml index a3b941aeef..10374ed348 100644 --- a/plugins/org.eclipse.emf.cdo.doc/build.xml +++ b/plugins/org.eclipse.emf.cdo.doc/build.xml @@ -345,12 +345,13 @@ </fileset> <package name="org.eclipse.emf.cdo.doc" /> - <package name="org.eclipse.emf.cdo.doc.connectors" /> <package name="org.eclipse.emf.cdo.doc.online" /> + <package name="org.eclipse.emf.cdo.doc.programmers" /> + <package name="org.eclipse.emf.cdo.doc.programmers.connectors" /> + <package name="org.eclipse.emf.cdo.doc.programmers.sessions" /> <package name="org.eclipse.emf.cdo.doc.reference" /> <package name="org.eclipse.emf.cdo.doc.reference.api" /> <package name="org.eclipse.emf.cdo.doc.reference.schema" /> - <package name="org.eclipse.emf.cdo.doc.sessions" /> <package name="org.eclipse.net4j.db.doc" /> <package name="org.eclipse.net4j.db.doc.online" /> <package name="org.eclipse.net4j.db.doc.reference" /> diff --git a/plugins/org.eclipse.emf.cdo.doc/html/Overview.html b/plugins/org.eclipse.emf.cdo.doc/html/Overview.html index 3b313a7347..b683b14204 100644 --- a/plugins/org.eclipse.emf.cdo.doc/html/Overview.html +++ b/plugins/org.eclipse.emf.cdo.doc/html/Overview.html @@ -20,10 +20,33 @@ function windowTitle() <BODY BGCOLOR="white" onload="windowTitle();"> <HR> -<center> -<h1>Overview</h1> -</center> -<a name="Overview.html"/> +<h1><a name="Overview.html"/>Overview</h1> +<p> + <p> +<table border="0"> +<tr><td><img src="../images/category.gif"/> </td><td colspan="7"><a href="programmers" title="Category in CDO Model Repository Documentation">Programmer's Guide</a></td></tr> +<tr><td/><td><img src="../images/category.gif"/> </td><td colspan="6"><a href="programmers/connectors" title="Category in CDO Model Repository Documentation">Connectors</a></td></tr> +<tr><td/><td/><td><img src="../images/article.gif"/> </td><td colspan="5"><a href="programmers/connectors/CreatingTransportConnections.html" title="Article in CDO Model Repository Documentation">Creating Transport Connections</a></td></tr> +<tr><td/><td/><td/><td>1 </td><td colspan="4"><a href="programmers/connectors/CreatingTransportConnections.html#SelectTransportType" title="Chapter in CDO Model Repository Documentation">Select a Transport Type</a></td></tr> +<tr><td/><td/><td/><td>2 </td><td colspan="4"><a href="programmers/connectors/CreatingTransportConnections.html#SetupWiringContainer" title="Chapter in CDO Model Repository Documentation">Setup a Wiring Container</a></td></tr> +<tr><td/><td/><td/><td>3 </td><td colspan="4"><a href="programmers/connectors/CreatingTransportConnections.html#AddConfigurationParameters" title="Chapter in CDO Model Repository Documentation">Add Configuration Parameters</a></td></tr> +<tr><td/><td/><td/><td/><td>3.1 </td><td colspan="3"><a href="programmers/connectors/CreatingTransportConnections.html#SetBufferCapacity" title="Chapter in CDO Model Repository Documentation">Set the Buffer Capacity</a></td></tr> +<tr><td/><td/><td/><td/><td>3.2 </td><td colspan="3"><a href="programmers/connectors/CreatingTransportConnections.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set the Connection Timeout</a></td></tr> +<tr><td/><td><img src="../images/category.gif"/> </td><td colspan="6"><a href="programmers/sessions" title="Category in CDO Model Repository Documentation">Sessions</a></td></tr> +<tr><td/><td/><td><img src="../images/article.gif"/> </td><td colspan="5"><a href="programmers/sessions/ConnectingToRepositories.html" title="Article in CDO Model Repository Documentation">Connecting To Repositories</a></td></tr> +<tr><td/><td/><td/><td>1 </td><td colspan="4"><a href="programmers/sessions/ConnectingToRepositories.html#SetBufferCapacity" title="Chapter in CDO Model Repository Documentation">Set Buffer Capacity</a></td></tr> +<tr><td/><td/><td/><td>2 </td><td colspan="4"><a href="programmers/sessions/ConnectingToRepositories.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set Connection Timeout</a></td></tr> +<tr><td><img src="../images/category.gif"/> </td><td colspan="7"><a href="reference" title="Category in CDO Model Repository Documentation">Reference</a></td></tr> +<tr><td/><td><img src="../images/category.gif"/> </td><td colspan="6"><a href="reference/api" title="Category in CDO Model Repository Documentation">API Reference</a></td></tr> +<tr><td/><td><img src="../images/category.gif"/> </td><td colspan="6"><a href="reference/schema" title="Category in CDO Model Repository Documentation">Extension Point Reference</a></td></tr> +<tr><td><img src="../images/category.gif"/> </td><td colspan="7"><a href="online" title="Category in CDO Model Repository Documentation">Online Docs</a></td></tr> +<tr><td/><td><img src="../images/article.gif"/> </td><td colspan="6"><a href="http://wiki.eclipse.org/CDO" title="Article in CDO Model Repository Documentation">Wiki</a></td></tr> +<tr><td/><td><img src="../images/article.gif"/> </td><td colspan="6"><a href="http://www.eclipse.org/cdo" title="Article in CDO Model Repository Documentation">Homepage</a></td></tr> +<tr><td><img src="../images/article.gif"/> </td><td colspan="7"><a href="" title="Article in CDO Model Repository Documentation">Overview</a></td></tr> +<tr><td><img src="../images/article.gif"/> </td><td colspan="7"><a href="about.html" title="Article in CDO Model Repository Documentation">Legal</a></td></tr> +</table> +</p> + <HR> <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> diff --git a/plugins/org.eclipse.emf.cdo.doc/html/online/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/online/summary.html index 55c41767cb..941163ca5b 100644 --- a/plugins/org.eclipse.emf.cdo.doc/html/online/summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/html/online/summary.html @@ -20,9 +20,13 @@ function windowTitle() <BODY BGCOLOR="white" onload="windowTitle();"> <HR> -<center> <h1>Online Docs</h1> -</center> +<p> +<table border="0"> +<tr><td><img src="../../images/article.gif"/> </td><td colspan="3"><a href="http://wiki.eclipse.org/CDO" title="Article in CDO Model Repository Documentation">Wiki</a></td></tr> +<tr><td><img src="../../images/article.gif"/> </td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in CDO Model Repository Documentation">Homepage</a></td></tr> +</table> +</p> <HR> diff --git a/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/CreatingTransportConnections.html b/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/CreatingTransportConnections.html index 36979697fc..4eec0142dd 100644 --- a/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/CreatingTransportConnections.html +++ b/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/CreatingTransportConnections.html @@ -20,10 +20,8 @@ function windowTitle() <BODY BGCOLOR="white" onload="windowTitle();"> <HR> -<center> -<h1>Creating Transport Connections</h1> -</center> -<a name="CreatingTransportConnections.html"/><p> +<h1><a name="CreatingTransportConnections.html"/>Creating Transport Connections</h1> +<p> This tutorial outlines the steps needed to create a Net4j <a href="../../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/connector/IConnector.html" title="Interface in org.eclipse.net4j.connector"><code>IConnector</code></a> and connect it to an <a href="../../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/acceptor/IAcceptor.html" title="Interface in org.eclipse.net4j.acceptor"><code>IAcceptor</code></a>. <p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus @@ -34,9 +32,20 @@ function windowTitle() porta, risus eu auctor semper, ante lectus lobortis sem, a luctus diam dui eu sapien. Sed at metus et dolor tincidunt convallis id a est. Donec quam nisl, scelerisque a feugiat id, mattis vel urna. Suspendisse facilisis, libero ac ultricies dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a viverra metus. - -<h2>1 Select a Transport Type</h2> -<a name="SelectTransportType"/><p> + <p> + <b>Table of Contents</b> <p> +<table border="0"> +<tr><td>1 </td><td colspan="4"><a href="CreatingTransportConnections.html#SelectTransportType" title="Chapter in CDO Model Repository Documentation">Select a Transport Type</a></td></tr> +<tr><td>2 </td><td colspan="4"><a href="CreatingTransportConnections.html#SetupWiringContainer" title="Chapter in CDO Model Repository Documentation">Setup a Wiring Container</a></td></tr> +<tr><td>3 </td><td colspan="4"><a href="CreatingTransportConnections.html#AddConfigurationParameters" title="Chapter in CDO Model Repository Documentation">Add Configuration Parameters</a></td></tr> +<tr><td/><td>3.1 </td><td colspan="3"><a href="CreatingTransportConnections.html#SetBufferCapacity" title="Chapter in CDO Model Repository Documentation">Set the Buffer Capacity</a></td></tr> +<tr><td/><td>3.2 </td><td colspan="3"><a href="CreatingTransportConnections.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set the Connection Timeout</a></td></tr> +</table> +</p> + + +<h2><a name="SelectTransportType"/>1 Select a Transport Type</h2> +<p> Currently supported transport types are: <ul> <li><b>JVM</b> to connect to an <a href="../../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/IJVMAcceptor.html" title="Interface in org.eclipse.net4j.jvm"><code>IJVMAcceptor</code></a> in the same Java Virtual Machine. @@ -46,8 +55,8 @@ function windowTitle() </ul> Continue with <a href="../sessions/ConnectingToRepositories.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set Connection Timeout</a>. -<h2>2 Setup a Wiring Container</h2> -<a name="SetupWiringContainer"/><p> +<h2><a name="SetupWiringContainer"/>2 Setup a Wiring Container</h2> +<p> Ut eget massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien sollicitudin nisi vestibulum nec vulputate urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat eget. Integer eu erat ac risus ultricies mattis vel nec nunc. @@ -125,11 +134,11 @@ function windowTitle() Suspendisse facilisis, libero ac ultricies dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a viverra metus. -<h2>3 Add Configuration Parameters</h2> -<a name="AddConfigurationParameters"/> +<h2><a name="AddConfigurationParameters"/>3 Add Configuration Parameters</h2> + -<h3>3.1 Set the Buffer Capacity</h3> -<a name="SetBufferCapacity"/><p> +<h3><a name="SetBufferCapacity"/>3.1 Set the Buffer Capacity</h3> +<p> <div class="snippet" style="margin-left:24px;" align="left"> @@ -178,8 +187,8 @@ function windowTitle() <p/> -<h3>3.2 Set the Connection Timeout</h3> -<a name="SetConnectionTimeout"/><p> +<h3><a name="SetConnectionTimeout"/>3.2 Set the Connection Timeout</h3> +<p> Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus lacinia dictum. Mauris non sem sapien. Vivamus sem ante, posuere a rhoncus ac, varius in nisi. Sed pulvinar urna ac est iaculis mattis. Ut eget massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien diff --git a/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/summary.html index 435f5914c4..0c7fa20042 100644 --- a/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/html/programmers/connectors/summary.html @@ -20,11 +20,19 @@ function windowTitle() <BODY BGCOLOR="white" onload="windowTitle();"> <HR> -<center> <h1>Connectors</h1> -</center> <p> - In this category you'll find a number of articles about physical transport connections: + In this category you'll find a number of articles about physical transport connections:<p> +<table border="0"> +<tr><td><img src="../../../images/article.gif"/> </td><td colspan="5"><a href="CreatingTransportConnections.html" title="Article in CDO Model Repository Documentation">Creating Transport Connections</a></td></tr> +<tr><td/><td>1 </td><td colspan="4"><a href="CreatingTransportConnections.html#SelectTransportType" title="Chapter in CDO Model Repository Documentation">Select a Transport Type</a></td></tr> +<tr><td/><td>2 </td><td colspan="4"><a href="CreatingTransportConnections.html#SetupWiringContainer" title="Chapter in CDO Model Repository Documentation">Setup a Wiring Container</a></td></tr> +<tr><td/><td>3 </td><td colspan="4"><a href="CreatingTransportConnections.html#AddConfigurationParameters" title="Chapter in CDO Model Repository Documentation">Add Configuration Parameters</a></td></tr> +<tr><td/><td/><td>3.1 </td><td colspan="3"><a href="CreatingTransportConnections.html#SetBufferCapacity" title="Chapter in CDO Model Repository Documentation">Set the Buffer Capacity</a></td></tr> +<tr><td/><td/><td>3.2 </td><td colspan="3"><a href="CreatingTransportConnections.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set the Connection Timeout</a></td></tr> +</table> +</p> + <HR> <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> diff --git a/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/ConnectingToRepositories.html b/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/ConnectingToRepositories.html index 2962dffd48..bd1693e6d0 100644 --- a/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/ConnectingToRepositories.html +++ b/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/ConnectingToRepositories.html @@ -20,16 +20,14 @@ function windowTitle() <BODY BGCOLOR="white" onload="windowTitle();"> <HR> -<center> -<h1>Connecting To Repositories</h1> -</center> -<a name="ConnectingToRepositories.html"/> +<h1><a name="ConnectingToRepositories.html"/>Connecting To Repositories</h1> -<h2>1 Set Buffer Capacity</h2> -<a name="SetBufferCapacity"/> -<h2>2 Set Connection Timeout</h2> -<a name="SetConnectionTimeout"/> +<h2><a name="SetBufferCapacity"/>1 Set Buffer Capacity</h2> + + +<h2><a name="SetConnectionTimeout"/>2 Set Connection Timeout</h2> + <HR> <i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> diff --git a/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/summary.html index 80c38af029..6292845925 100644 --- a/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions/summary.html @@ -20,9 +20,14 @@ function windowTitle() <BODY BGCOLOR="white" onload="windowTitle();"> <HR> -<center> <h1>Sessions</h1> -</center> +<p> +<table border="0"> +<tr><td><img src="../../../images/article.gif"/> </td><td colspan="4"><a href="ConnectingToRepositories.html" title="Article in CDO Model Repository Documentation">Connecting To Repositories</a></td></tr> +<tr><td/><td>1 </td><td colspan="3"><a href="ConnectingToRepositories.html#SetBufferCapacity" title="Chapter in CDO Model Repository Documentation">Set Buffer Capacity</a></td></tr> +<tr><td/><td>2 </td><td colspan="3"><a href="ConnectingToRepositories.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set Connection Timeout</a></td></tr> +</table> +</p> <HR> diff --git a/plugins/org.eclipse.emf.cdo.doc/html/programmers/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/programmers/summary.html index be9f2d0650..74a974ccbb 100644 --- a/plugins/org.eclipse.emf.cdo.doc/html/programmers/summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/html/programmers/summary.html @@ -20,9 +20,22 @@ function windowTitle() <BODY BGCOLOR="white" onload="windowTitle();"> <HR> -<center> <h1>Programmer's Guide</h1> -</center> +<p> +<table border="0"> +<tr><td><img src="../../images/category.gif"/> </td><td colspan="6"><a href="connectors" title="Category in CDO Model Repository Documentation">Connectors</a></td></tr> +<tr><td/><td><img src="../../images/article.gif"/> </td><td colspan="5"><a href="connectors/CreatingTransportConnections.html" title="Article in CDO Model Repository Documentation">Creating Transport Connections</a></td></tr> +<tr><td/><td/><td>1 </td><td colspan="4"><a href="connectors/CreatingTransportConnections.html#SelectTransportType" title="Chapter in CDO Model Repository Documentation">Select a Transport Type</a></td></tr> +<tr><td/><td/><td>2 </td><td colspan="4"><a href="connectors/CreatingTransportConnections.html#SetupWiringContainer" title="Chapter in CDO Model Repository Documentation">Setup a Wiring Container</a></td></tr> +<tr><td/><td/><td>3 </td><td colspan="4"><a href="connectors/CreatingTransportConnections.html#AddConfigurationParameters" title="Chapter in CDO Model Repository Documentation">Add Configuration Parameters</a></td></tr> +<tr><td/><td/><td/><td>3.1 </td><td colspan="3"><a href="connectors/CreatingTransportConnections.html#SetBufferCapacity" title="Chapter in CDO Model Repository Documentation">Set the Buffer Capacity</a></td></tr> +<tr><td/><td/><td/><td>3.2 </td><td colspan="3"><a href="connectors/CreatingTransportConnections.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set the Connection Timeout</a></td></tr> +<tr><td><img src="../../images/category.gif"/> </td><td colspan="6"><a href="sessions" title="Category in CDO Model Repository Documentation">Sessions</a></td></tr> +<tr><td/><td><img src="../../images/article.gif"/> </td><td colspan="5"><a href="sessions/ConnectingToRepositories.html" title="Article in CDO Model Repository Documentation">Connecting To Repositories</a></td></tr> +<tr><td/><td/><td>1 </td><td colspan="4"><a href="sessions/ConnectingToRepositories.html#SetBufferCapacity" title="Chapter in CDO Model Repository Documentation">Set Buffer Capacity</a></td></tr> +<tr><td/><td/><td>2 </td><td colspan="4"><a href="sessions/ConnectingToRepositories.html#SetConnectionTimeout" title="Chapter in CDO Model Repository Documentation">Set Connection Timeout</a></td></tr> +</table> +</p> <HR> diff --git a/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/summary.html index b22b9d2f78..838dc91aa2 100644 --- a/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/html/reference/schema/summary.html @@ -20,9 +20,11 @@ function windowTitle() <BODY BGCOLOR="white" onload="windowTitle();"> <HR> -<center> <h1>Extension Point Reference</h1> -</center> +<p> +<table border="0"> +</table> +</p> <HR> diff --git a/plugins/org.eclipse.emf.cdo.doc/html/reference/summary.html b/plugins/org.eclipse.emf.cdo.doc/html/reference/summary.html index 9c0651ace6..0b8cccd08c 100644 --- a/plugins/org.eclipse.emf.cdo.doc/html/reference/summary.html +++ b/plugins/org.eclipse.emf.cdo.doc/html/reference/summary.html @@ -20,9 +20,13 @@ function windowTitle() <BODY BGCOLOR="white" onload="windowTitle();"> <HR> -<center> <h1>Reference</h1> -</center> +<p> +<table border="0"> +<tr><td><img src="../../images/category.gif"/> </td><td colspan="3"><a href="api" title="Category in CDO Model Repository Documentation">API Reference</a></td></tr> +<tr><td><img src="../../images/category.gif"/> </td><td colspan="3"><a href="schema" title="Category in CDO Model Repository Documentation">Extension Point Reference</a></td></tr> +</table> +</p> <HR> diff --git a/plugins/org.eclipse.emf.cdo.doc/images/article.gif b/plugins/org.eclipse.emf.cdo.doc/images/article.gif Binary files differnew file mode 100644 index 0000000000..ab33f93147 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.doc/images/article.gif diff --git a/plugins/org.eclipse.emf.cdo.doc/images/category.gif b/plugins/org.eclipse.emf.cdo.doc/images/category.gif Binary files differnew file mode 100644 index 0000000000..1bff447388 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.doc/images/category.gif diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Overview.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Overview.java index ffce912194..baac65d114 100644 --- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Overview.java +++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Overview.java @@ -12,6 +12,8 @@ package org.eclipse.emf.cdo.doc; /**
* Overview
+ * <p>
+ * {@toc}
*
* @number 0
* @default
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/connectors/CreatingTransportConnections.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/connectors/CreatingTransportConnections.java index f475526988..60255ff14d 100644 --- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/connectors/CreatingTransportConnections.java +++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/connectors/CreatingTransportConnections.java @@ -47,6 +47,8 @@ import java.nio.channels.SocketChannel; * porta, risus eu auctor semper, ante lectus lobortis sem, a luctus diam dui eu sapien. Sed at metus et dolor tincidunt
* convallis id a est. Donec quam nisl, scelerisque a feugiat id, mattis vel urna. Suspendisse facilisis, libero ac
* ultricies dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a viverra metus.
+ * <p>
+ * <b>Table of Contents</b> {@toc}
*
* @author Eike Stepper
*/
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/connectors/package-info.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/connectors/package-info.java index 7f8770afdf..cee6a9c810 100644 --- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/connectors/package-info.java +++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/programmers/connectors/package-info.java @@ -12,7 +12,7 @@ /**
* Connectors
* <p>
- * In this category you'll find a number of articles about physical transport connections: {@toc}
+ * In this category you'll find a number of articles about physical transport connections:
*
* @number 1
*/
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore index afea90995b..61d2a8a31c 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore +++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore @@ -146,4 +146,8 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="plugin" lowerBound="1"
eType="#//Plugin" eOpposite="#//Plugin/extensionPoints"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Toc" eSuperTypes="#//BodyElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="levels" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+ changeable="false" defaultValueLiteral="-1" derived="true"/>
+ </eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag index 21851b0ef5..1fa107ce4a 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag +++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag @@ -532,6 +532,26 @@ <element xmi:type="ecore:EClass" href="article.ecore#//ExtensionPoint"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_nYaYgt8BEeCn4588_wNmZw" x="765" y="560" width="119"/>
</children>
+ <children xmi:type="notation:Node" xmi:id="_t9OYkeAuEeCnqI1gDJ3KzQ" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_t9Rb4OAuEeCnqI1gDJ3KzQ" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_t9SC8OAuEeCnqI1gDJ3KzQ" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_x25Y0OAuEeCnqI1gDJ3KzQ" type="2001">
+ <element xmi:type="ecore:EAttribute" href="article.ecore#//Toc/levels"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_x25Y0eAuEeCnqI1gDJ3KzQ"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_t9SC8eAuEeCnqI1gDJ3KzQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_t9SC8uAuEeCnqI1gDJ3KzQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_t9SC8-AuEeCnqI1gDJ3KzQ"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_t9SqAOAuEeCnqI1gDJ3KzQ" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_t9SqAeAuEeCnqI1gDJ3KzQ"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_t9SqAuAuEeCnqI1gDJ3KzQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_t9SqA-AuEeCnqI1gDJ3KzQ"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_t9O_oOAuEeCnqI1gDJ3KzQ" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="article.ecore#//Toc"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t9O_oeAuEeCnqI1gDJ3KzQ" x="550" y="896"/>
+ </children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_x6vqQNxNEeCpIJpgvmzkYA"/>
<element xmi:type="ecore:EPackage" href="article.ecore#/"/>
<edges xmi:type="notation:Edge" xmi:id="_qxw_8NxOEeCpIJpgvmzkYA" type="3002" source="_9P3IYNxNEeCpIJpgvmzkYA" target="_zVqwINxNEeCpIJpgvmzkYA">
@@ -570,10 +590,10 @@ </edges>
<edges xmi:type="notation:Edge" xmi:id="_2wb78NxPEeCpIJpgvmzkYA" type="3002" source="_RFRXINxPEeCpIJpgvmzkYA" target="_RFRXINxPEeCpIJpgvmzkYA">
<children xmi:type="notation:Node" xmi:id="_2wb79NxPEeCpIJpgvmzkYA" type="4011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_2wb79dxPEeCpIJpgvmzkYA" x="-4" y="-11"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_2wb79dxPEeCpIJpgvmzkYA" x="-16" y="-12"/>
</children>
<children xmi:type="notation:Node" xmi:id="_2wcjANxPEeCpIJpgvmzkYA" type="4012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_2wcjAdxPEeCpIJpgvmzkYA" x="7" y="9"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_2wcjAdxPEeCpIJpgvmzkYA" x="-10" y="13"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_2wb78dxPEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_2wb78txPEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
@@ -646,7 +666,7 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_nZNWcdxTEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_nZNWctxTEeCpIJpgvmzkYA" fontName="Segoe UI"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nZNWc9xTEeCpIJpgvmzkYA" points="[-4, -20, 66, 90]$[-4, -54, 66, 56]$[-70, -54, 0, 56]$[-70, -79, 0, 31]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nZNWc9xTEeCpIJpgvmzkYA" points="[-1, -20, 101, 100]$[-1, -61, 101, 59]$[-92, -61, 10, 59]$[-92, -98, 10, 22]"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_AlwecNxUEeCpIJpgvmzkYA" type="3003" source="_EOyM4NxPEeCpIJpgvmzkYA" target="_x5KOgNxQEeCpIJpgvmzkYA">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_AlwecdxUEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
@@ -717,7 +737,7 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_HbG98dxaEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_HbG98txaEeCpIJpgvmzkYA" fontName="Segoe UI"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HbG989xaEeCpIJpgvmzkYA" points="[22, -20, -153, 75]$[22, -42, -153, 53]$[175, -42, 0, 53]$[175, -70, 0, 25]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HbG989xaEeCpIJpgvmzkYA" points="[-1, -20, -176, 75]$[-1, -42, -176, 53]$[175, -42, 0, 53]$[175, -70, 0, 25]"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_pSB1ENxaEeCpIJpgvmzkYA" type="3003" source="_hvZKENxaEeCpIJpgvmzkYA" target="_yWi_ANxZEeCpIJpgvmzkYA">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_pSB1EdxaEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
@@ -898,7 +918,7 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_YnpCkd6jEeCgeMAkr6dR9Q" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_YnpCkt6jEeCgeMAkr6dR9Q" fontName="Segoe UI"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YnpCk96jEeCgeMAkr6dR9Q" points="[17, -20, 75, 128]$[17, -46, 75, 102]$[-59, -46, -1, 102]$[-59, -127, -1, 21]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YnpCk96jEeCgeMAkr6dR9Q" points="[17, -20, 75, 128]$[17, -46, 75, 102]$[-50, -46, 8, 102]$[-50, -127, 8, 21]"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_Fv_XwN7-EeCn4588_wNmZw" type="3003" source="_6rOp0N79EeCn4588_wNmZw" target="_-tAmYNxOEeCpIJpgvmzkYA">
<styles xmi:type="notation:ConnectorStyle" xmi:id="_Fv_Xwd7-EeCn4588_wNmZw" routing="Rectilinear" lineColor="4210752"/>
@@ -910,7 +930,7 @@ <styles xmi:type="notation:ConnectorStyle" xmi:id="_jR5PEd8BEeCn4588_wNmZw" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_jR5PEt8BEeCn4588_wNmZw" fontName="Segoe UI"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jR5PE98BEeCn4588_wNmZw" points="[15, -20, -55, 108]$[15, -46, -55, 82]$[62, -46, -8, 82]$[62, -127, -8, 1]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jR5PE98BEeCn4588_wNmZw" points="[15, -20, -55, 108]$[15, -46, -55, 82]$[71, -46, 1, 82]$[71, -127, 1, 1]"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SIwVgN9REeCn4588_wNmZw" id="(0.5784313725490197,0.9767441860465116)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_06bPkN9PEeCn4588_wNmZw" type="3002" source="_LJYjIN6iEeCgeMAkr6dR9Q" target="_nYaYgN8BEeCn4588_wNmZw">
@@ -953,4 +973,11 @@ <element xmi:type="ecore:EReference" href="article.ecore#//Documentation/plugins"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_irgyo99QEeCn4588_wNmZw" points="[78, -11, -188, -19]$[208, -11, -58, -19]"/>
</edges>
+ <edges xmi:type="notation:Edge" xmi:id="_z0wzsOAuEeCnqI1gDJ3KzQ" type="3003" source="_t9OYkeAuEeCnqI1gDJ3KzQ" target="_yWi_ANxZEeCpIJpgvmzkYA">
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_z0wzseAuEeCnqI1gDJ3KzQ" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_z0wzsuAuEeCnqI1gDJ3KzQ" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_z0wzs-AuEeCnqI1gDJ3KzQ" points="[1, -24, 319, 73]$[1, -55, 319, 42]$[-311, -55, 7, 42]$[-311, -91, 7, 6]"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z01FIOAuEeCnqI1gDJ3KzQ" id="(0.4215686274509804,0.8823529411764706)"/>
+ </edges>
</notation:Diagram>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/resources/article.gif b/plugins/org.eclipse.emf.cdo.releng.doc/resources/article.gif Binary files differnew file mode 100644 index 0000000000..ab33f93147 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.doc/resources/article.gif diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/resources/category.gif b/plugins/org.eclipse.emf.cdo.releng.doc/resources/category.gif Binary files differnew file mode 100644 index 0000000000..1bff447388 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.doc/resources/category.gif diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java index cc43dc3b0f..ecda78ccdd 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java @@ -193,6 +193,14 @@ public interface ArticleFactory extends EFactory ExtensionPoint createExtensionPoint(); /** + * Returns a new object of class '<em>Toc</em>'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return a new object of class '<em>Toc</em>'. + * @generated + */ + Toc createToc(); + + /** * Returns the package supported by this factory. <!-- begin-user-doc --> <!-- end-user-doc --> * * @return the package supported by this factory. diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java index 4ce01c3fff..893c4383ba 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java @@ -2038,13 +2038,56 @@ public interface ArticlePackage extends EPackage int EXTENSION_POINT_FEATURE_COUNT = 2; /** + * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.TocImpl <em>Toc</em>}' class. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.emf.cdo.releng.doc.article.impl.TocImpl + * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getToc() + * @generated + */ + int TOC = 28; + + /** + * The feature id for the '<em><b>Container</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @generated + * @ordered + */ + int TOC__CONTAINER = BODY_ELEMENT__CONTAINER; + + /** + * The feature id for the '<em><b>Tag</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TOC__TAG = BODY_ELEMENT__TAG; + + /** + * The feature id for the '<em><b>Levels</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TOC__LEVELS = BODY_ELEMENT_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>Toc</em>' class. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + * @ordered + */ + int TOC_FEATURE_COUNT = BODY_ELEMENT_FEATURE_COUNT + 1; + + /** * The meta object id for the '<em>Root Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> * * @see com.sun.javadoc.RootDoc * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getRootDoc() * @generated */ - int ROOT_DOC = 28; + int ROOT_DOC = 29; /** * The meta object id for the '<em>File</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -2053,7 +2096,7 @@ public interface ArticlePackage extends EPackage * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFile() * @generated */ - int FILE = 29; + int FILE = 30; /** * The meta object id for the '<em>Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -2062,7 +2105,7 @@ public interface ArticlePackage extends EPackage * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getDoc() * @generated */ - int DOC = 30; + int DOC = 31; /** * The meta object id for the '<em>Tag</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> @@ -2071,7 +2114,7 @@ public interface ArticlePackage extends EPackage * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getTag() * @generated */ - int TAG = 31; + int TAG = 32; /** * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Documentation @@ -2837,6 +2880,27 @@ public interface ArticlePackage extends EPackage EReference getExtensionPoint_Plugin(); /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Toc <em>Toc</em>}'. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for class '<em>Toc</em>'. + * @see org.eclipse.emf.cdo.releng.doc.article.Toc + * @generated + */ + EClass getToc(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.doc.article.Toc#getLevels + * <em>Levels</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @return the meta object for the attribute '<em>Levels</em>'. + * @see org.eclipse.emf.cdo.releng.doc.article.Toc#getLevels() + * @see #getToc() + * @generated + */ + EAttribute getToc_Levels(); + + /** * Returns the meta object for data type '{@link com.sun.javadoc.RootDoc <em>Root Doc</em>}'. <!-- begin-user-doc --> * <!-- end-user-doc --> * @@ -3519,6 +3583,24 @@ public interface ArticlePackage extends EPackage EReference EXTENSION_POINT__PLUGIN = eINSTANCE.getExtensionPoint_Plugin(); /** + * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.TocImpl <em>Toc</em>}' class. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @see org.eclipse.emf.cdo.releng.doc.article.impl.TocImpl + * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getToc() + * @generated + */ + EClass TOC = eINSTANCE.getToc(); + + /** + * The meta object literal for the '<em><b>Levels</b></em>' attribute feature. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @generated + */ + EAttribute TOC__LEVELS = eINSTANCE.getToc_Levels(); + + /** * The meta object literal for the '<em>Root Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc --> * * @see com.sun.javadoc.RootDoc diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElement.java index 7f6eec70f6..5bf560d4cd 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElement.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/BodyElement.java @@ -6,13 +6,12 @@ */ package org.eclipse.emf.cdo.releng.doc.article; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; - import org.eclipse.emf.ecore.EObject; import com.sun.javadoc.Tag; import java.io.IOException; +import java.io.PrintWriter; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Body Element</b></em>'. <!-- end-user-doc --> @@ -74,5 +73,5 @@ public interface BodyElement extends EObject */ Tag getTag(); - void generate(HtmlWriter out, StructuralElement linkSource) throws IOException; + void generate(PrintWriter out, StructuralElement linkSource) throws IOException; } // BodyElement diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java index 4c47416911..7719ff59e7 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Chapter.java @@ -36,4 +36,5 @@ public interface Chapter extends Body * @generated */ Article getArticle(); + } // Chapter diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java index 87c6b725ff..005c00cb62 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/EmbeddableElement.java @@ -6,9 +6,8 @@ */ package org.eclipse.emf.cdo.releng.doc.article; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; - import java.io.IOException; +import java.io.PrintWriter; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Embeddable Element</b></em>'. <!-- end-user-doc @@ -56,5 +55,5 @@ public interface EmbeddableElement extends Identifiable */ void setDocumentation(Documentation value); - void generate(HtmlWriter out, Embedding embedder) throws IOException; + void generate(PrintWriter out, Embedding embedder) throws IOException; } // EmbeddableElement diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/LinkTarget.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/LinkTarget.java index 6c3466a675..140e132b3f 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/LinkTarget.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/LinkTarget.java @@ -6,10 +6,10 @@ */ package org.eclipse.emf.cdo.releng.doc.article; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; - import com.sun.javadoc.SeeTag; +import java.io.PrintWriter; + /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Link Target</b></em>'. <!-- end-user-doc --> * <p> @@ -63,6 +63,6 @@ public interface LinkTarget extends Identifiable */ String linkFrom(StructuralElement source); - void generateLink(HtmlWriter out, StructuralElement linkSource, SeeTag tag); + void generateLink(PrintWriter out, StructuralElement linkSource, SeeTag tag); } // LinkTarget diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java index 2f3dd85d01..21108f1f3a 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/StructuralElement.java @@ -6,14 +6,13 @@ */ package org.eclipse.emf.cdo.releng.doc.article; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; - import org.eclipse.emf.common.util.EList; import com.sun.javadoc.Doc; import java.io.File; import java.io.IOException; +import java.io.PrintWriter; /** * <!-- begin-user-doc --> A representation of the model object '<em><b>Structural Element</b></em>'. <!-- end-user-doc @@ -175,8 +174,10 @@ public interface StructuralElement extends LinkTarget */ Doc getDoc(); + int getDepth(); + void generate() throws IOException; - void generate(HtmlWriter out) throws IOException; + void generate(PrintWriter out) throws IOException; } // StructuralElement diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Toc.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Toc.java new file mode 100644 index 0000000000..f71d207aa4 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/Toc.java @@ -0,0 +1,39 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.eclipse.emf.cdo.releng.doc.article; + +/** + * <!-- begin-user-doc --> A representation of the model object '<em><b>Toc</b></em>'. <!-- end-user-doc --> + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.cdo.releng.doc.article.Toc#getLevels <em>Levels</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getToc() + * @model + * @generated + */ +public interface Toc extends BodyElement +{ + /** + * Returns the value of the '<em><b>Levels</b></em>' attribute. The default value is <code>"-1"</code>. <!-- + * begin-user-doc --> + * <p> + * If the meaning of the '<em>Levels</em>' attribute isn't clear, there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * + * @return the value of the '<em>Levels</em>' attribute. + * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getToc_Levels() + * @model default="-1" changeable="false" derived="true" + * @generated + */ + int getLevels(); + +} // Toc diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java index c241e2cc7f..24b2fcf067 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java @@ -29,6 +29,7 @@ import org.eclipse.emf.cdo.releng.doc.article.Schemadoc; import org.eclipse.emf.cdo.releng.doc.article.Snippet; import org.eclipse.emf.cdo.releng.doc.article.SourceCode; import org.eclipse.emf.cdo.releng.doc.article.Text; +import org.eclipse.emf.cdo.releng.doc.article.Toc; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; @@ -131,6 +132,8 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory return createSchemadoc(); case ArticlePackage.EXTENSION_POINT: return createExtensionPoint(); + case ArticlePackage.TOC: + return createToc(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -406,6 +409,17 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory * * @generated */ + public Toc createToc() + { + TocImpl toc = new TocImpl(); + return toc; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public File createFileFromString(EDataType eDataType, String initialValue) { return (File)super.createFromString(eDataType, initialValue); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java index 1eadc412a1..6d4a2c0d6e 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java @@ -36,6 +36,7 @@ import org.eclipse.emf.cdo.releng.doc.article.Snippet; import org.eclipse.emf.cdo.releng.doc.article.SourceCode; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; import org.eclipse.emf.cdo.releng.doc.article.Text; +import org.eclipse.emf.cdo.releng.doc.article.Toc; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -259,6 +260,13 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage * * @generated */ + private EClass tocEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ private EDataType rootDocEDataType = null; /** @@ -1049,6 +1057,26 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage * * @generated */ + public EClass getToc() + { + return tocEClass; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public EAttribute getToc_Levels() + { + return (EAttribute)tocEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ public EDataType getRootDoc() { return rootDocEDataType; @@ -1212,6 +1240,9 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage createEAttribute(extensionPointEClass, EXTENSION_POINT__NAME); createEReference(extensionPointEClass, EXTENSION_POINT__PLUGIN); + tocEClass = createEClass(TOC); + createEAttribute(tocEClass, TOC__LEVELS); + // Create data types rootDocEDataType = createEDataType(ROOT_DOC); fileEDataType = createEDataType(FILE); @@ -1270,6 +1301,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage javadocEClass.getESuperTypes().add(this.getCategory()); externalArticleEClass.getESuperTypes().add(this.getArticle()); schemadocEClass.getESuperTypes().add(this.getCategory()); + tocEClass.getESuperTypes().add(this.getBodyElement()); // Initialize classes and features; add operations and parameters initEClass(documentationEClass, Documentation.class, "Documentation", !IS_ABSTRACT, !IS_INTERFACE, @@ -1455,6 +1487,10 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage 1, ExtensionPoint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(tocEClass, Toc.class, "Toc", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getToc_Levels(), ecorePackage.getEInt(), "levels", "-1", 0, 1, Toc.class, !IS_TRANSIENT, + !IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + // Initialize data types initEDataType(rootDocEDataType, RootDoc.class, "RootDoc", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); initEDataType(fileEDataType, File.class, "File", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementContainerImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementContainerImpl.java index a8f1bb9a66..8ef5f1d64a 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementContainerImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementContainerImpl.java @@ -10,7 +10,6 @@ import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage; import org.eclipse.emf.cdo.releng.doc.article.BodyElement; import org.eclipse.emf.cdo.releng.doc.article.BodyElementContainer; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -23,6 +22,7 @@ import org.eclipse.emf.ecore.util.InternalEList; import com.sun.javadoc.Tag; import java.io.IOException; +import java.io.PrintWriter; import java.util.Collection; /** @@ -189,6 +189,7 @@ public abstract class BodyElementContainerImpl extends EObjectImpl implements Bo public static String analyzeTags(EList<BodyElement> elements, Tag[] tags, boolean withTitle) { String title = null; + if (tags != null && tags.length != 0) { int bodyStart = 0; @@ -226,13 +227,22 @@ public abstract class BodyElementContainerImpl extends EObjectImpl implements Bo private static void addElement(EList<BodyElement> elements, Tag tag) { - if (tag.kind().equals("Text")) + String name = tag.name(); + if (name.equals("Text")) + { + elements.add(new TextImpl(tag)); + } + else if (name.equals("@toc")) + { + elements.add(new TocImpl(tag)); + } + else if (name.equals("@diagram")) { - elements.add(new TextImpl(null, tag)); + elements.add(new DiagramImpl(tag)); } else { - elements.add(new UnresolvedBodyElement(null, tag)); + elements.add(new UnresolvedBodyElement(tag)); } } @@ -253,7 +263,7 @@ public abstract class BodyElementContainerImpl extends EObjectImpl implements Bo return result == Integer.MAX_VALUE ? -1 : result; } - public static void generate(HtmlWriter out, StructuralElement linkSource, EList<BodyElement> elements) + public static void generate(PrintWriter out, StructuralElement linkSource, EList<BodyElement> elements) throws IOException { UnresolvedBodyElement.resolve(linkSource.getDocumentation().getContext(), elements); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java index 1f6aedcddd..9b5e058777 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyElementImpl.java @@ -56,9 +56,8 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement super(); } - BodyElementImpl(BodyElementContainer container, Tag tag) + BodyElementImpl(Tag tag) { - setContainer(container); this.tag = tag; } @@ -81,7 +80,9 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement public BodyElementContainer getContainer() { if (eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__CONTAINER) + { return null; + } return (BodyElementContainer)eContainer(); } @@ -103,24 +104,34 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement */ public void setContainer(BodyElementContainer newContainer) { - if (newContainer != eInternalContainer() - || (eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__CONTAINER && newContainer != null)) + if (newContainer != eInternalContainer() || eContainerFeatureID() != ArticlePackage.BODY_ELEMENT__CONTAINER + && newContainer != null) { if (EcoreUtil.isAncestor(this, newContainer)) + { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + } NotificationChain msgs = null; if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } if (newContainer != null) + { msgs = ((InternalEObject)newContainer).eInverseAdd(this, ArticlePackage.BODY_ELEMENT_CONTAINER__ELEMENTS, BodyElementContainer.class, msgs); + } msgs = basicSetContainer(newContainer, msgs); if (msgs != null) + { msgs.dispatch(); + } } else if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.BODY_ELEMENT__CONTAINER, newContainer, newContainer)); + } } /** @@ -145,7 +156,9 @@ public abstract class BodyElementImpl extends EObjectImpl implements BodyElement { case ArticlePackage.BODY_ELEMENT__CONTAINER: if (eInternalContainer() != null) + { msgs = eBasicRemoveFromContainer(msgs); + } return basicSetContainer((BodyElementContainer)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java index ea1274456a..edfe558b8c 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/BodyImpl.java @@ -13,7 +13,6 @@ import org.eclipse.emf.cdo.releng.doc.article.BodyElementContainer; import org.eclipse.emf.cdo.releng.doc.article.Category; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -26,6 +25,7 @@ import com.sun.javadoc.Doc; import com.sun.javadoc.Tag; import java.io.IOException; +import java.io.PrintWriter; import java.util.Collection; /** @@ -332,7 +332,9 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body public String toString() { if (eIsProxy()) + { return super.toString(); + } StringBuffer result = new StringBuffer(super.toString()); result.append(" (number: "); @@ -348,7 +350,7 @@ public abstract class BodyImpl extends StructuralElementImpl implements Body } @Override - public void generate(HtmlWriter out) throws IOException + public void generate(PrintWriter out) throws IOException { EList<BodyElement> elements = getElements(); BodyElementContainerImpl.generate(out, this, elements); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java index e5c041760c..f13c2275cf 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/CategoryImpl.java @@ -7,19 +7,18 @@ package org.eclipse.emf.cdo.releng.doc.article.impl; import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage; -import org.eclipse.emf.cdo.releng.doc.article.BodyElement; import org.eclipse.emf.cdo.releng.doc.article.Category; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; -import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import com.sun.javadoc.PackageDoc; +import com.sun.javadoc.Tag; import java.io.File; import java.io.IOException; +import java.io.PrintWriter; /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Category</b></em>'. <!-- end-user-doc --> @@ -44,6 +43,16 @@ public class CategoryImpl extends BodyImpl implements Category { super(parent, ArticleUtil.getSimplePackageName(packageDoc), packageDoc); getDocumentation().getContext().register(getId(), this); + + for (Tag tag : packageDoc.inlineTags()) + { + if (tag.name().equals("@toc")) + { + return; + } + } + + elements.add(new TocImpl(null)); } /** @@ -92,15 +101,13 @@ public class CategoryImpl extends BodyImpl implements Category } @Override - public void generate(HtmlWriter out) throws IOException + public void generate(PrintWriter out) throws IOException { - String title = getTitle(); - out.write("<center>\n"); - out.writeHeading(1, title); - out.write("</center>\n"); + out.write("<h" + 1 + ">"); + out.write(getTitle()); + out.write("</h" + 1 + ">\n"); - EList<BodyElement> elements = getElements(); - BodyElementContainerImpl.generate(out, this, elements); + BodyElementContainerImpl.generate(out, this, getElements()); } @Override diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java index 65316bfdbc..23c1286a2a 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ChapterImpl.java @@ -10,7 +10,6 @@ import org.eclipse.emf.cdo.releng.doc.article.Article; import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage; import org.eclipse.emf.cdo.releng.doc.article.Chapter; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.ecore.EClass; @@ -18,6 +17,7 @@ import com.sun.javadoc.ClassDoc; import java.io.BufferedWriter; import java.io.IOException; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; @@ -146,44 +146,51 @@ public class ChapterImpl extends BodyImpl implements Chapter } @Override - public void generate(HtmlWriter out) throws IOException + public void generate(PrintWriter out) throws IOException { - String title = getTitle(); + String anchor = "<a name=\"" + getPath() + "\"/>"; + if (this instanceof Article) { - out.write("<center>\n"); - out.writeHeading(1, title); - out.write("</center>\n"); + out.write("<h" + 1 + ">"); + out.write(anchor + getTitle()); + out.write("</h" + 1 + ">\n"); } else { - int[] chapterNumber = getChapterNumber(); + int level = getChapterNumbers().length + 1; + out.write("<h" + level + ">"); + out.write(anchor + getTitleWithNumber()); + out.write("</h" + level + ">\n"); + } - StringBuilder builder = new StringBuilder(); - for (int number : chapterNumber) - { - if (builder.length() != 0) - { - builder.append("."); - } + super.generate(out); + } + + public String getTitleWithNumber() + { + return getChapterNumber() + " " + getTitle(); + } + + public String getChapterNumber() + { + int[] chapterNumber = getChapterNumbers(); - builder.append(number); + StringBuilder builder = new StringBuilder(); + for (int number : chapterNumber) + { + if (builder.length() != 0) + { + builder.append("."); } - builder.append(" "); - builder.append(title); - String result = builder.toString(); - out.writeHeading(chapterNumber.length + 1, result); + builder.append(number); } - out.write("<a name=\""); - out.write(getPath()); - out.write("\"/>"); - - super.generate(out); + return builder.toString(); } - public int[] getChapterNumber() + public int[] getChapterNumbers() { List<Integer> levelNumbers = new ArrayList<Integer>(); getLevelNumbers(this, levelNumbers); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java index 8b22adcf83..53fdbe58b6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ContextImpl.java @@ -349,9 +349,7 @@ public class ContextImpl extends EObjectImpl implements Context public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (baseFolder: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java index d7edafd6dc..a9c837bdbb 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DiagramImpl.java @@ -9,11 +9,14 @@ package org.eclipse.emf.cdo.releng.doc.article.impl; import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage; import org.eclipse.emf.cdo.releng.doc.article.Diagram; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.ecore.EClass; +import com.sun.javadoc.Tag; + +import java.io.File; import java.io.IOException; +import java.io.PrintWriter; /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Diagram</b></em>'. <!-- end-user-doc --> @@ -24,6 +27,14 @@ import java.io.IOException; */ public class DiagramImpl extends BodyElementImpl implements Diagram { + // org.eclipse.emf.cdo.releng.doc.supplemental;bundle-version="[1.0.0,2.0.0)";resolution:=optional, + // org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.4.1", + // org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0", + // org.eclipse.core.runtime;bundle-version="3.7.0", + // com.ibm.icu;bundle-version="4.4.2" + + // private org.eclipse.gmf.runtime.notation.Diagram diagram; + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -34,6 +45,34 @@ public class DiagramImpl extends BodyElementImpl implements Diagram super(); } + DiagramImpl(Tag tag) + { + super(tag); + + loadDiagram(tag.text()); + } + + public void loadDiagram(String path) + { + // try + // { + // NotationPackage.eINSTANCE.getClass(); + // URI uri = URI.createFileURI(path); + // + // ResourceSet resourceSet = new ResourceSetImpl(); + // Map<String, Object> map = resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap(); + // map.put("*", new XMIResourceFactoryImpl()); + // + // Resource resource = resourceSet.getResource(uri, true); + // diagram = (org.eclipse.gmf.runtime.notation.Diagram)resource.getContents().get(0); + // } + // catch (Exception ex) + // { + // System.err.println("Could not load diagram " + path); + // ex.printStackTrace(); + // } + } + /** * <!-- begin-user-doc --> <!-- end-user-doc --> * @@ -45,10 +84,58 @@ public class DiagramImpl extends BodyElementImpl implements Diagram return ArticlePackage.Literals.DIAGRAM; } - public void generate(HtmlWriter out, StructuralElement linkSource) throws IOException + public void generate(PrintWriter out, StructuralElement linkSource) throws IOException + { + generate(linkSource.getOutputFile().getParentFile()); + } + + public void generate(File folder) throws IOException { - // TODO: implement DiagramImpl.generate(out, linkSource) - throw new UnsupportedOperationException(); + // String name = diagram.eResource().getURI().path(); + // int lastDot = name.lastIndexOf('.'); + // if (lastDot != -1) + // { + // name = name.substring(0, lastDot); + // } + // + // IPath destination = new Path(new File(folder, name + ".png").getCanonicalPath()); + // + // PreferencesHint hint = null; + // + // try + // { + // CopyToImageUtil copyToImageUtil = new CopyToImageUtil(); + // + // Shell shell = new Shell(); + // try + // { + // DiagramEditPart diagramEditPart = OffscreenEditPartFactory.getInstance().createDiagramEditPart(diagram, shell, + // hint); + // Assert.isNotNull(diagramEditPart); + // DiagramGenerator generator = copyToImageUtil.copyToImage(diagramEditPart, destination, ImageFileFormat.PNG, + // new NullProgressMonitor()); + // List partInfo = generator.getDiagramPartInfo(diagramEditPart); + // System.out.println(partInfo); + // } + // finally + // { + // shell.dispose(); + // } + // + // // copyToImageUtil.copyToImage(diagram, destination, ImageFileFormat.PNG, new NullProgressMonitor(), hint); + // } + // catch (Exception ex) + // { + // ex.printStackTrace(); + // } } + public static void main(String[] args) throws Exception + { + File folder = new File("/develop/ws/cdo/plugins/org.eclipse.emf.cdo.doc/html/programmers/sessions"); + + DiagramImpl impl = new DiagramImpl(); + impl.loadDiagram("/develop/ws/cdo/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag"); + impl.generate(folder); + } } // DiagramImpl diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java index db5b54cc5a..bc2582aeaf 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java @@ -339,9 +339,7 @@ public class DocumentationImpl extends StructuralElementImpl implements Document public Context getContext() { if (eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT) - { return null; - } return (Context)eContainer(); } @@ -363,34 +361,24 @@ public class DocumentationImpl extends StructuralElementImpl implements Document */ public void setContext(Context newContext) { - if (newContext != eInternalContainer() || eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT - && newContext != null) + if (newContext != eInternalContainer() + || (eContainerFeatureID() != ArticlePackage.DOCUMENTATION__CONTEXT && newContext != null)) { if (EcoreUtil.isAncestor(this, newContext)) - { throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); - } NotificationChain msgs = null; if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } if (newContext != null) - { msgs = ((InternalEObject)newContext).eInverseAdd(this, ArticlePackage.CONTEXT__DOCUMENTATIONS, Context.class, msgs); - } msgs = basicSetContext(newContext, msgs); if (msgs != null) - { msgs.dispatch(); - } } else if (eNotificationRequired()) - { eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.DOCUMENTATION__CONTEXT, newContext, newContext)); - } } /** @@ -460,9 +448,7 @@ public class DocumentationImpl extends StructuralElementImpl implements Document { case ArticlePackage.DOCUMENTATION__CONTEXT: if (eInternalContainer() != null) - { msgs = eBasicRemoveFromContainer(msgs); - } return basicSetContext((Context)otherEnd, msgs); case ArticlePackage.DOCUMENTATION__EMBEDDABLE_ELEMENTS: return ((InternalEList<InternalEObject>)(InternalEList<?>)getEmbeddableElements()).basicAdd(otherEnd, msgs); @@ -612,9 +598,7 @@ public class DocumentationImpl extends StructuralElementImpl implements Document public String toString() { if (eIsProxy()) - { return super.toString(); - } StringBuffer result = new StringBuffer(super.toString()); result.append(" (project: "); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddingImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddingImpl.java index bfaa45d486..573b9cee62 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddingImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/EmbeddingImpl.java @@ -7,17 +7,16 @@ package org.eclipse.emf.cdo.releng.doc.article.impl; import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage; -import org.eclipse.emf.cdo.releng.doc.article.Body; import org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement; import org.eclipse.emf.cdo.releng.doc.article.Embedding; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.ecore.EClass; import com.sun.javadoc.SeeTag; import java.io.IOException; +import java.io.PrintWriter; /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Embedding</b></em>'. <!-- end-user-doc --> @@ -52,9 +51,9 @@ public class EmbeddingImpl extends BodyElementImpl implements Embedding super(); } - EmbeddingImpl(Body body, SeeTag tag, EmbeddableElement element) + EmbeddingImpl(SeeTag tag, EmbeddableElement element) { - super(body, tag); + super(tag); this.element = element; } @@ -111,7 +110,7 @@ public class EmbeddingImpl extends BodyElementImpl implements Embedding return super.eIsSet(featureID); } - public void generate(HtmlWriter out, StructuralElement linkSource) throws IOException + public void generate(PrintWriter out, StructuralElement linkSource) throws IOException { element.generate(out, this); } diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java index a2be900e38..6429fb62e7 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java @@ -145,6 +145,12 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle } @Override + public String linkFrom(StructuralElement source) + { + return url; + } + + @Override protected void generateTocEntry(BufferedWriter writer, String prefix) throws IOException { writer.write(prefix + "<topic label=\"" + getTitle() + "\" href=\"" + url + "\" />\n"); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java index c9979eb30e..0264eec440 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalTargetImpl.java @@ -10,12 +10,13 @@ import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage; import org.eclipse.emf.cdo.releng.doc.article.Context; import org.eclipse.emf.cdo.releng.doc.article.ExternalTarget; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.ecore.EClass; import com.sun.javadoc.ClassDoc; +import java.io.PrintWriter; + /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>External Target</b></em>'. <!-- end-user-doc * --> @@ -153,7 +154,7 @@ public class ExternalTargetImpl extends LinkTargetImpl implements ExternalTarget } @Override - protected void writeLink(HtmlWriter out, String label, String href, String tooltip) + protected void writeLink(PrintWriter out, String label, String href, String tooltip) { super.writeLink(out, "<code>" + label + "</code>", href, tooltip); } diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FactoryImpl.java index 391aa1ab40..77736bb3ff 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FactoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/FactoryImpl.java @@ -10,13 +10,13 @@ import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage; import org.eclipse.emf.cdo.releng.doc.article.Documentation; import org.eclipse.emf.cdo.releng.doc.article.Embedding; import org.eclipse.emf.cdo.releng.doc.article.Factory; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.ecore.EClass; import com.sun.javadoc.MethodDoc; import java.io.IOException; +import java.io.PrintWriter; /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Factory</b></em>'. <!-- end-user-doc --> @@ -57,7 +57,7 @@ public class FactoryImpl extends EmbeddableElementImpl implements Factory return ArticlePackage.Literals.FACTORY; } - public void generate(HtmlWriter out, Embedding embedder) throws IOException + public void generate(PrintWriter out, Embedding embedder) throws IOException { // TODO: implement FactoryImpl.generate(out, embedder) throw new UnsupportedOperationException(); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java index e84eaadb1c..87a9054cc7 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java @@ -11,7 +11,6 @@ import org.eclipse.emf.cdo.releng.doc.article.Documentation; import org.eclipse.emf.cdo.releng.doc.article.JavaElement; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.ecore.EClass; @@ -21,6 +20,7 @@ import com.sun.javadoc.PackageDoc; import com.sun.javadoc.ProgramElementDoc; import java.io.File; +import java.io.PrintWriter; /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Java Element</b></em>'. <!-- end-user-doc --> @@ -168,7 +168,7 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement } @Override - protected void writeLink(HtmlWriter out, String label, String href, String tooltip) + protected void writeLink(PrintWriter out, String label, String href, String tooltip) { super.writeLink(out, "<code>" + label + "</code>", href, tooltip); } diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java index 5be73ec922..8252b824dd 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkImpl.java @@ -7,11 +7,9 @@ package org.eclipse.emf.cdo.releng.doc.article.impl; import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage; -import org.eclipse.emf.cdo.releng.doc.article.Body; import org.eclipse.emf.cdo.releng.doc.article.Link; import org.eclipse.emf.cdo.releng.doc.article.LinkTarget; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -20,6 +18,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import com.sun.javadoc.SeeTag; import java.io.IOException; +import java.io.PrintWriter; /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Link</b></em>'. <!-- end-user-doc --> @@ -54,9 +53,9 @@ public class LinkImpl extends BodyElementImpl implements Link super(); } - LinkImpl(Body body, SeeTag tag, LinkTarget target) + LinkImpl(SeeTag tag, LinkTarget target) { - super(body, tag); + super(tag); this.target = target; } @@ -91,7 +90,9 @@ public class LinkImpl extends BodyElementImpl implements Link LinkTarget oldTarget = target; target = newTarget; if (eNotificationRequired()) + { eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.LINK__TARGET, oldTarget, target)); + } } /** @@ -166,7 +167,7 @@ public class LinkImpl extends BodyElementImpl implements Link return (SeeTag)super.getTag(); } - public void generate(HtmlWriter out, StructuralElement linkSource) throws IOException + public void generate(PrintWriter out, StructuralElement linkSource) throws IOException { target.generateLink(out, linkSource, getTag()); } diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkTargetImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkTargetImpl.java index 776f9b7ce0..cf43e781b6 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkTargetImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/LinkTargetImpl.java @@ -9,13 +9,14 @@ package org.eclipse.emf.cdo.releng.doc.article.impl; import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage; import org.eclipse.emf.cdo.releng.doc.article.LinkTarget; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.EObjectImpl; import com.sun.javadoc.SeeTag; +import java.io.PrintWriter; + /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Link Target</b></em>'. <!-- end-user-doc --> * <p> @@ -153,21 +154,31 @@ public abstract class LinkTargetImpl extends EObjectImpl implements LinkTarget return super.eIsSet(featureID); } - public void generateLink(HtmlWriter out, StructuralElement linkSource, SeeTag tag) + public void generateLink(PrintWriter out, StructuralElement linkSource, SeeTag tag) { - String href = linkFrom(linkSource); - - String label = tag.label(); + String label = tag == null ? null : tag.label(); if (label == null || label.length() == 0) { label = getDefaultLabel(); if (label == null || label.length() == 0) { - label = tag.text(); + label = tag == null ? null : tag.text(); } } + writeLink(out, linkSource, label); + } + + protected void writeLink(PrintWriter out, StructuralElement linkSource, String label) + { + String href = linkFrom(linkSource); String tooltip = getTooltip(); + + writeLink(out, label, href, tooltip); + } + + protected void writeLink(PrintWriter out, String label, String href, String tooltip) + { if (tooltip != null && tooltip.length() != 0) { tooltip = " title=\"" + tooltip + "\""; @@ -177,11 +188,6 @@ public abstract class LinkTargetImpl extends EObjectImpl implements LinkTarget tooltip = ""; } - writeLink(out, label, href, tooltip); - } - - protected void writeLink(HtmlWriter out, String label, String href, String tooltip) - { out.write("<a href=\"" + href + "\"" + tooltip + ">" + label + "</a>"); } diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java index 8cd0f43955..0dc6281602 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/SnippetImpl.java @@ -15,7 +15,6 @@ import org.eclipse.emf.cdo.releng.doc.article.Snippet; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; import org.eclipse.emf.cdo.releng.doc.article.util.ArticleException; import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList; @@ -32,6 +31,7 @@ import com.sun.javadoc.Tag; import java.io.File; import java.io.IOException; +import java.io.PrintWriter; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.Collection; @@ -228,7 +228,7 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet return doc; } - public void generate(HtmlWriter out, Embedding embedder) throws IOException + public void generate(PrintWriter out, Embedding embedder) throws IOException { String id = doc.name(); int lastDot = id.lastIndexOf('.'); @@ -315,25 +315,6 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet } out.write("<p/>\n"); - - // out.write("<ol>\n"); - // for (Callout callout : getCallouts()) - // { - // out.write("<li>"); - // - // try - // { - // BodyElementContainerImpl.generate(structuralElement, callout.getElements(), out); - // } - // catch (IOException ex) - // { - // ex.printStackTrace(); - // } - // - // out.write("</li>\n"); - // } - // - // out.write("</ol>\n"); } private StructuralElement getStructuralElement(Embedding embedder) @@ -347,7 +328,7 @@ public class SnippetImpl extends EmbeddableElementImpl implements Snippet throw new ArticleException(ArticleUtil.makeConsoleLink("Nested embedding in ", embedder.getTag().position())); } - private String getCodeSnippetHtml(HtmlWriter out, String id, String title) + private String getCodeSnippetHtml(PrintWriter out, String id, String title) { Map<String, Object> options = new HashMap<String, Object>(); options.put("id", id); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java index 650a71a74b..102f913c1d 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java @@ -11,7 +11,6 @@ import org.eclipse.emf.cdo.releng.doc.article.Body; import org.eclipse.emf.cdo.releng.doc.article.Documentation; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -28,6 +27,7 @@ import com.sun.javadoc.Doc; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -538,6 +538,17 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St return result.toString(); } + public int getDepth() + { + int depth = 0; + for (StructuralElement child : getChildren()) + { + depth = Math.max(depth, child.getDepth()); + } + + return 1 + depth; + } + @Override public String getDefaultLabel() { @@ -560,7 +571,7 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St } } - public void generate(HtmlWriter out) throws IOException + public void generate(PrintWriter out) throws IOException { for (StructuralElement child : getChildren()) { @@ -571,12 +582,12 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St protected void generate(File file) throws IOException { String title = getTitle() + " (" + getDocumentation().getTitle() + ")"; - HtmlWriter out = null; + PrintWriter out = null; try { file.getParentFile().mkdirs(); - out = new HtmlWriter(file); + out = new PrintWriter(file); out.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"); out.write("<HTML>\n"); diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java index 0973af4970..b624577fb3 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TextImpl.java @@ -7,16 +7,15 @@ package org.eclipse.emf.cdo.releng.doc.article.impl; import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage; -import org.eclipse.emf.cdo.releng.doc.article.Body; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; import org.eclipse.emf.cdo.releng.doc.article.Text; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.ecore.EClass; import com.sun.javadoc.Tag; import java.io.IOException; +import java.io.PrintWriter; /** * <!-- begin-user-doc --> An implementation of the model object '<em><b>Text</b></em>'. <!-- end-user-doc --> @@ -37,9 +36,9 @@ public class TextImpl extends BodyElementImpl implements Text super(); } - TextImpl(Body body, Tag tag) + TextImpl(Tag tag) { - super(body, tag); + super(tag); } /** @@ -53,7 +52,7 @@ public class TextImpl extends BodyElementImpl implements Text return ArticlePackage.Literals.TEXT; } - public void generate(HtmlWriter out, StructuralElement linkSource) throws IOException + public void generate(PrintWriter out, StructuralElement linkSource) throws IOException { out.write(getTag().text()); } diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java new file mode 100644 index 0000000000..7333ff53a2 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java @@ -0,0 +1,234 @@ +/** + * <copyright> + * </copyright> + * + * $Id$ + */ +package org.eclipse.emf.cdo.releng.doc.article.impl; + +import org.eclipse.emf.cdo.releng.doc.article.Article; +import org.eclipse.emf.cdo.releng.doc.article.ArticlePackage; +import org.eclipse.emf.cdo.releng.doc.article.Category; +import org.eclipse.emf.cdo.releng.doc.article.Documentation; +import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; +import org.eclipse.emf.cdo.releng.doc.article.Toc; +import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil; + +import org.eclipse.emf.ecore.EClass; + +import com.sun.javadoc.Tag; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; + +/** + * <!-- begin-user-doc --> An implementation of the model object '<em><b>Toc</b></em>'. <!-- end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.cdo.releng.doc.article.impl.TocImpl#getLevels <em>Levels</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class TocImpl extends BodyElementImpl implements Toc +{ + /** + * The default value of the '{@link #getLevels() <em>Levels</em>}' attribute. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * + * @see #getLevels() + * @generated + * @ordered + */ + protected static final int LEVELS_EDEFAULT = -1; + + /** + * The cached value of the '{@link #getLevels() <em>Levels</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * + * @see #getLevels() + * @generated + * @ordered + */ + protected int levels = LEVELS_EDEFAULT; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + protected TocImpl() + { + super(); + } + + TocImpl(Tag tag) + { + super(tag); + + String text = tag == null ? null : tag.text(); + if (text != null && text.length() != 0) + { + levels = Integer.parseInt(text); + } + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EClass eStaticClass() + { + return ArticlePackage.Literals.TOC; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + public int getLevels() + { + return levels; + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) + { + switch (featureID) + { + case ArticlePackage.TOC__LEVELS: + return getLevels(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) + { + switch (featureID) + { + case ArticlePackage.TOC__LEVELS: + return levels != LEVELS_EDEFAULT; + } + return super.eIsSet(featureID); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public String toString() + { + if (eIsProxy()) + { + return super.toString(); + } + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (levels: "); + result.append(levels); + result.append(')'); + return result.toString(); + } + + public void generate(PrintWriter out, StructuralElement linkSource) throws IOException + { + StructuralElement element = (StructuralElement)getContainer(); + if (ArticleUtil.isTagged(element.getDoc(), "@default")) + { + element = element.getDocumentation(); + } + + File source = linkSource.getOutputFile(); + File target = new File(linkSource.getDocumentation().getOutputFile().getParentFile(), "images"); + String imagePath = ArticleUtil.createLink(source, target) + "/"; + if (linkSource instanceof Category) + { + imagePath = "../" + imagePath; + } + + out.write("<p>\n"); + out.write("<table border=\"0\">\n"); + + generate(out, linkSource, imagePath, element.getDepth(), element, 0); + + out.write("</table>\n"); + out.write("</p>\n"); + } + + private void generate(PrintWriter out, StructuralElement linkSource, String imagePath, int depth, + StructuralElement element, int level) + { + if (level > levels && levels > 0) + { + return; + } + + if (levels == -2) + { + if (!(element instanceof Documentation || element instanceof Category || element instanceof Article)) + { + return; + } + } + else if (levels == -3) + { + if (!(element instanceof Documentation || element instanceof Category)) + { + return; + } + } + + if (level > 0) + { + out.write("<tr>"); + for (int i = 1; i < level; i++) + { + out.write("<td/>"); + } + + out.write("<td>"); + + if (element instanceof Category) + { + out.write("<img src=\"" + imagePath + "category.gif\"/>"); + } + else if (element instanceof Article) + { + out.write("<img src=\"" + imagePath + "article.gif\"/>"); + } + else + { + out.write(((ChapterImpl)element).getChapterNumber()); + } + + int colspan = depth - level + 2; + out.write(" </td><td colspan=\"" + colspan + "\">"); + element.generateLink(out, linkSource, null); + out.write("</td></tr>\n"); + } + + for (StructuralElement child : element.getChildren()) + { + generate(out, linkSource, imagePath, depth, child, level + 1); + } + } +} // TocImpl diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElement.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElement.java index 1987c9e99f..d8a09a86cd 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElement.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/UnresolvedBodyElement.java @@ -10,7 +10,6 @@ */ package org.eclipse.emf.cdo.releng.doc.article.impl; -import org.eclipse.emf.cdo.releng.doc.article.Body; import org.eclipse.emf.cdo.releng.doc.article.BodyElement; import org.eclipse.emf.cdo.releng.doc.article.Context; import org.eclipse.emf.cdo.releng.doc.article.Documentation; @@ -18,7 +17,6 @@ import org.eclipse.emf.cdo.releng.doc.article.EmbeddableElement; import org.eclipse.emf.cdo.releng.doc.article.LinkTarget; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil; -import org.eclipse.emf.cdo.releng.doc.article.util.HtmlWriter; import org.eclipse.emf.common.util.EList; @@ -29,6 +27,7 @@ import com.sun.javadoc.Tag; import java.io.File; import java.io.IOException; +import java.io.PrintWriter; /** * @author Eike Stepper @@ -37,9 +36,9 @@ public class UnresolvedBodyElement extends BodyElementImpl { private static final boolean DEBUG = false; - UnresolvedBodyElement(Body body, Tag tag) + UnresolvedBodyElement(Tag tag) { - super(body, tag); + super(tag); } public final String getText() @@ -52,7 +51,7 @@ public class UnresolvedBodyElement extends BodyElementImpl return getTag().text(); } - public void generate(HtmlWriter out, StructuralElement linkSource) throws IOException + public void generate(PrintWriter out, StructuralElement linkSource) throws IOException { out.write(getText()); } @@ -133,12 +132,12 @@ public class UnresolvedBodyElement extends BodyElementImpl { if (target instanceof LinkTarget) { - return new LinkImpl(null, tag, (LinkTarget)target); + return new LinkImpl(tag, (LinkTarget)target); } if (target instanceof EmbeddableElement) { - return new EmbeddingImpl(null, tag, (EmbeddableElement)target); + return new EmbeddingImpl(tag, (EmbeddableElement)target); } return null; diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/overview-summary.html b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/overview-summary.html deleted file mode 100644 index d236d95c0e..0000000000 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/overview-summary.html +++ /dev/null @@ -1,26 +0,0 @@ -out.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n");
-out.write("<HTML>\n");
-out.write("\n");
-out.write("<HEAD>\n");
-out.write("<TITLE>\n");
-out.write("Overview (CDO Model Repository Documentation)\n");
-out.write("</TITLE>\n");
-out.write("
-out.write("<SCRIPT type=\"text/javascript\">
-out.write("function windowTitle()\n");
-out.write("{\n");
-out.write(" if (location.href.indexOf('is-external=true') == -1) {\n");
-out.write(" parent.document.title=\"Overview (CDO Model Repository Documentation)\";\n");
-out.write(" }\n");
-out.write("}\n");
-out.write("</SCRIPT>\n");
-out.write("<NOSCRIPT>\n");
-out.write("</NOSCRIPT>\n");
-out.write("</HEAD>\n");
-out.write("\n");
-out.write("<BODY BGCOLOR=\"white\" onload=\"windowTitle();\">\n");
-out.write("<HR>\n");
-out.write("<HR>\n");
-out.write("<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i>\n");
-out.write("</BODY>\n");
-out.write("</HTML>\n");
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java index f095d3cc75..1512f26b0a 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java @@ -35,6 +35,7 @@ import org.eclipse.emf.cdo.releng.doc.article.Snippet; import org.eclipse.emf.cdo.releng.doc.article.SourceCode; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; import org.eclipse.emf.cdo.releng.doc.article.Text; +import org.eclipse.emf.cdo.releng.doc.article.Toc; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -268,6 +269,12 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl } @Override + public Adapter caseToc(Toc object) + { + return createTocAdapter(); + } + + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); @@ -684,6 +691,20 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl } /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.Toc <em>Toc</em>}'. + * <!-- begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to + * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc --> + * + * @return the new adapter. + * @see org.eclipse.emf.cdo.releng.doc.article.Toc + * @generated + */ + public Adapter createTocAdapter() + { + return null; + } + + /** * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns null. <!-- * end-user-doc --> * diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java index 6c67140163..d69456e7a4 100644 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java +++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java @@ -35,6 +35,7 @@ import org.eclipse.emf.cdo.releng.doc.article.Snippet; import org.eclipse.emf.cdo.releng.doc.article.SourceCode; import org.eclipse.emf.cdo.releng.doc.article.StructuralElement; import org.eclipse.emf.cdo.releng.doc.article.Text; +import org.eclipse.emf.cdo.releng.doc.article.Toc; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -444,6 +445,16 @@ public class ArticleSwitch<T> extends Switch<T> result = defaultCase(theEObject); return result; } + case ArticlePackage.TOC: + { + Toc toc = (Toc)theEObject; + T result = caseToc(toc); + if (result == null) + result = caseBodyElement(toc); + if (result == null) + result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } @@ -871,6 +882,21 @@ public class ArticleSwitch<T> extends Switch<T> } /** + * Returns the result of interpreting the object as an instance of '<em>Toc</em>'. <!-- begin-user-doc --> This + * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc --> + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Toc</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseToc(Toc object) + { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This * implementation returns null; returning a non-null result will terminate the switch, but this is the last case * anyway. <!-- end-user-doc --> diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/HtmlWriter.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/HtmlWriter.java deleted file mode 100644 index 805cb53cfd..0000000000 --- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/HtmlWriter.java +++ /dev/null @@ -1,86 +0,0 @@ -/*
- * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) 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
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.releng.doc.article.util;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-
-/**
- * @author Eike Stepper
- */
-public class HtmlWriter extends PrintWriter
-{
- public HtmlWriter(File file, String csn) throws FileNotFoundException, UnsupportedEncodingException
- {
- super(file, csn);
- }
-
- public HtmlWriter(File file) throws FileNotFoundException
- {
- super(file);
- }
-
- public HtmlWriter(OutputStream out, boolean autoFlush)
- {
- super(out, autoFlush);
- }
-
- public HtmlWriter(OutputStream out)
- {
- super(out);
- }
-
- public HtmlWriter(String fileName, String csn) throws FileNotFoundException, UnsupportedEncodingException
- {
- super(fileName, csn);
- }
-
- public HtmlWriter(String fileName) throws FileNotFoundException
- {
- super(fileName);
- }
-
- public HtmlWriter(Writer out, boolean autoFlush)
- {
- super(out, autoFlush);
- }
-
- public HtmlWriter(Writer out)
- {
- super(out);
- }
-
- public void writeHeading(int level, String label)
- {
- String h = Integer.toString(level);
-
- write("<h");
- write(h);
- write(">");
- write(label);
- write("</h");
- write(h);
- write(">\n");
- }
-
- public void writeHRef(String href, String label)
- {
- write("<a href=\"");
- write(href);
- write("\">");
- write(label);
- write("</a>");
- }
-}
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/web/index.html b/plugins/org.eclipse.emf.cdo.releng.doc/web/index.html new file mode 100644 index 0000000000..51dd4a41fc --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.releng.doc/web/index.html @@ -0,0 +1,60 @@ +<html>
+<head>
+<title>ttt</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<style>@import url("web/site.css");</style>
+<script type="text/javascript">
+ var returnval = 0;
+ var stylesheet, xmlFile, cache, doc;
+ function init(){
+ // NSCP 7.1+ / Mozilla 1.4.1+ / Safari
+ // Use the standard DOM Level 2 technique, if it is supported
+ if (document.implementation && document.implementation.createDocument) {
+ xmlFile = document.implementation.createDocument("", "", null);
+ stylesheet = document.implementation.createDocument("", "", null);
+ if (xmlFile.load){
+ xmlFile.load("site.xml");
+ stylesheet.load("web/site.xsl");
+ } else {
+ alert("Document could not be loaded by browser.");
+ }
+ xmlFile.addEventListener("load", transform, false);
+ stylesheet.addEventListener("load", transform, false);
+ }
+ //IE 6.0+ solution
+ else if (window.ActiveXObject) {
+ xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
+ xmlFile.async = false;
+ xmlFile.load("site.xml");
+ stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
+ stylesheet.async = false;
+ stylesheet.load("web/site.xsl");
+ cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
+ cache.stylesheet = stylesheet;
+ transformData();
+ }
+ }
+ // separate transformation function for IE 6.0+
+ function transformData(){
+ var processor = cache.createProcessor();
+ processor.input = xmlFile;
+ processor.transform();
+ data.innerHTML = processor.output;
+ }
+ // separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+
+ function transform(){
+ returnval+=1;
+ if (returnval==2){
+ var processor = new XSLTProcessor();
+ processor.importStylesheet(stylesheet);
+ doc = processor.transformToDocument(xmlFile);
+ document.getElementById("data").innerHTML = doc.documentElement.innerHTML;
+ }
+ }
+</script>
+</head>
+<body onload="init();">
+<!--[insert static HTML here]-->
+<div id="data"><!-- this is where the transformed data goes --></div>
+</body>
+</html>
diff --git a/plugins/org.eclipse.net4j.db.doc/build.xml b/plugins/org.eclipse.net4j.db.doc/build.xml index c601cd1ef4..33cdb36f82 100644 --- a/plugins/org.eclipse.net4j.db.doc/build.xml +++ b/plugins/org.eclipse.net4j.db.doc/build.xml @@ -204,11 +204,6 @@ </delete> <mkdir dir="${article.destdir}" /> - <copy todir="${article.destdir}" verbose="true" failonerror="false"> - <fileset dir="${article.sources}" defaultexcludes="true"> - <exclude name="**/*.java" /> - </fileset> - </copy> <copy todir="${project.path}/images" verbose="true" failonerror="false"> <fileset dir="plugins/org.eclipse.emf.cdo.releng.doc/resources" defaultexcludes="true"> <include name="**/*" /> diff --git a/plugins/org.eclipse.net4j.db.doc/html/Overview.html b/plugins/org.eclipse.net4j.db.doc/html/Overview.html index 62b026dc16..72fb714c36 100644 --- a/plugins/org.eclipse.net4j.db.doc/html/Overview.html +++ b/plugins/org.eclipse.net4j.db.doc/html/Overview.html @@ -1,3 +1,42 @@ -<h1>Overview</h1> -<a name="Overview.html"/> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> +<HEAD> +<TITLE> +Overview (Net4j DB Framework Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Overview (Net4j DB Framework Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1><a name="Overview.html"/>Overview</h1> +<p> + <p> +<table border="0"> +<tr><td><img src="../images/article.gif"/> </td><td colspan="4"><a href="about.html" title="Article in Net4j DB Framework Documentation">Legal</a></td></tr> +<tr><td><img src="../images/article.gif"/> </td><td colspan="4"><a href="" title="Article in Net4j DB Framework Documentation">Overview</a></td></tr> +<tr><td><img src="../images/category.gif"/> </td><td colspan="4"><a href="online" title="Category in Net4j DB Framework Documentation">Online Docs</a></td></tr> +<tr><td/><td><img src="../images/article.gif"/> </td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j DB Framework Documentation">Homepage</a></td></tr> +<tr><td/><td><img src="../images/article.gif"/> </td><td colspan="3"><a href="http://wiki.eclipse.org/CDO" title="Article in Net4j DB Framework Documentation">Wiki</a></td></tr> +<tr><td><img src="../images/category.gif"/> </td><td colspan="4"><a href="reference" title="Category in Net4j DB Framework Documentation">Reference</a></td></tr> +<tr><td/><td><img src="../images/category.gif"/> </td><td colspan="3"><a href="reference/api" title="Category in Net4j DB Framework Documentation">API Reference</a></td></tr> +<tr><td/><td><img src="../images/category.gif"/> </td><td colspan="3"><a href="reference/schema" title="Category in Net4j DB Framework Documentation">Extension Point Reference</a></td></tr> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.db.doc/html/online/summary.html b/plugins/org.eclipse.net4j.db.doc/html/online/summary.html new file mode 100644 index 0000000000..3c96870164 --- /dev/null +++ b/plugins/org.eclipse.net4j.db.doc/html/online/summary.html @@ -0,0 +1,35 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> + +<HEAD> +<TITLE> +Online Docs (Net4j DB Framework Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Online Docs (Net4j DB Framework Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1>Online Docs</h1> +<p> +<table border="0"> +<tr><td><img src="../../images/article.gif"/> </td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j DB Framework Documentation">Homepage</a></td></tr> +<tr><td><img src="../../images/article.gif"/> </td><td colspan="3"><a href="http://wiki.eclipse.org/CDO" title="Article in Net4j DB Framework Documentation">Wiki</a></td></tr> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.db.doc/html/reference/schema/summary.html b/plugins/org.eclipse.net4j.db.doc/html/reference/schema/summary.html new file mode 100644 index 0000000000..1284f7a362 --- /dev/null +++ b/plugins/org.eclipse.net4j.db.doc/html/reference/schema/summary.html @@ -0,0 +1,33 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> + +<HEAD> +<TITLE> +Extension Point Reference (Net4j DB Framework Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Extension Point Reference (Net4j DB Framework Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1>Extension Point Reference</h1> +<p> +<table border="0"> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.db.doc/html/reference/summary.html b/plugins/org.eclipse.net4j.db.doc/html/reference/summary.html new file mode 100644 index 0000000000..cdc20221c9 --- /dev/null +++ b/plugins/org.eclipse.net4j.db.doc/html/reference/summary.html @@ -0,0 +1,35 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> + +<HEAD> +<TITLE> +Reference (Net4j DB Framework Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Reference (Net4j DB Framework Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1>Reference</h1> +<p> +<table border="0"> +<tr><td><img src="../../images/category.gif"/> </td><td colspan="3"><a href="api" title="Category in Net4j DB Framework Documentation">API Reference</a></td></tr> +<tr><td><img src="../../images/category.gif"/> </td><td colspan="3"><a href="schema" title="Category in Net4j DB Framework Documentation">Extension Point Reference</a></td></tr> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.db.doc/images/article.gif b/plugins/org.eclipse.net4j.db.doc/images/article.gif Binary files differnew file mode 100644 index 0000000000..ab33f93147 --- /dev/null +++ b/plugins/org.eclipse.net4j.db.doc/images/article.gif diff --git a/plugins/org.eclipse.net4j.db.doc/images/category.gif b/plugins/org.eclipse.net4j.db.doc/images/category.gif Binary files differnew file mode 100644 index 0000000000..1bff447388 --- /dev/null +++ b/plugins/org.eclipse.net4j.db.doc/images/category.gif diff --git a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Overview.java b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Overview.java index cc041ecac0..6ae7002ff5 100644 --- a/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Overview.java +++ b/plugins/org.eclipse.net4j.db.doc/src/org/eclipse/net4j/db/doc/Overview.java @@ -12,8 +12,11 @@ package org.eclipse.net4j.db.doc; /**
* Overview
+ * <p>
+ * {@toc}
*
* @number 0
+ * @default
*/
public class Overview
{
diff --git a/plugins/org.eclipse.net4j.db.doc/toc.xml b/plugins/org.eclipse.net4j.db.doc/toc.xml index 8136e7529e..6b822e4e36 100644 --- a/plugins/org.eclipse.net4j.db.doc/toc.xml +++ b/plugins/org.eclipse.net4j.db.doc/toc.xml @@ -2,10 +2,10 @@ <?NLS TYPE="org.eclipse.help.toc"?> -<toc label="Net4j DB Framework Documentation" topic="javadoc/overview-summary.html"> +<toc label="Net4j DB Framework Documentation" topic="html/Overview.html"> <topic label="Overview" href="html/Overview.html"> </topic> - <topic label="Reference" href="html/reference"> + <topic label="Reference" href="html/reference/summary.html"> <topic label="API Reference" href="javadoc/overview-summary.html"> <topic label="Net4j DB Framework" href="javadoc/org/eclipse/net4j/db/package-summary.html"> <topic label="org.eclipse.net4j.db" href="javadoc/org/eclipse/net4j/db/package-summary.html" /> @@ -29,13 +29,13 @@ <topic label="org.eclipse.net4j.db.postgresql" href="javadoc/org/eclipse/net4j/db/postgresql/package-summary.html" /> </topic> </topic> - <topic label="Extension Point Reference" href="schemadoc/overview-summary.html"> + <topic label="Extension Point Reference" href="html/reference/schema/summary.html"> <topic label="Net4j DB Framework" href="schemadoc/org_eclipse_net4j_db_dbAdapters.html"> <topic label="dbAdapters" href="schemadoc/org_eclipse_net4j_db_dbAdapters.html" /> </topic> </topic> </topic> - <topic label="Online" href="html/online"> + <topic label="Online Docs" href="html/online/summary.html"> <topic label="Homepage" href="http://www.eclipse.org/cdo" /> <topic label="Wiki" href="http://wiki.eclipse.org/CDO" /> </topic> diff --git a/plugins/org.eclipse.net4j.doc/build.xml b/plugins/org.eclipse.net4j.doc/build.xml index 99e7a14724..298b6e04a5 100644 --- a/plugins/org.eclipse.net4j.doc/build.xml +++ b/plugins/org.eclipse.net4j.doc/build.xml @@ -232,11 +232,6 @@ </delete> <mkdir dir="${article.destdir}" /> - <copy todir="${article.destdir}" verbose="true" failonerror="false"> - <fileset dir="${article.sources}" defaultexcludes="true"> - <exclude name="**/*.java" /> - </fileset> - </copy> <copy todir="${project.path}/images" verbose="true" failonerror="false"> <fileset dir="plugins/org.eclipse.emf.cdo.releng.doc/resources" defaultexcludes="true"> <include name="**/*" /> diff --git a/plugins/org.eclipse.net4j.doc/html/Overview.html b/plugins/org.eclipse.net4j.doc/html/Overview.html index 62b026dc16..9cf6f3e1e1 100644 --- a/plugins/org.eclipse.net4j.doc/html/Overview.html +++ b/plugins/org.eclipse.net4j.doc/html/Overview.html @@ -1,3 +1,42 @@ -<h1>Overview</h1> -<a name="Overview.html"/> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> +<HEAD> +<TITLE> +Overview (Net4j Signalling Platform Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Overview (Net4j Signalling Platform Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1><a name="Overview.html"/>Overview</h1> +<p> + <p> +<table border="0"> +<tr><td><img src="../images/article.gif"/> </td><td colspan="4"><a href="about.html" title="Article in Net4j Signalling Platform Documentation">Legal</a></td></tr> +<tr><td><img src="../images/article.gif"/> </td><td colspan="4"><a href="" title="Article in Net4j Signalling Platform Documentation">Overview</a></td></tr> +<tr><td><img src="../images/category.gif"/> </td><td colspan="4"><a href="online" title="Category in Net4j Signalling Platform Documentation">Online Docs</a></td></tr> +<tr><td/><td><img src="../images/article.gif"/> </td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j Signalling Platform Documentation">Homepage</a></td></tr> +<tr><td/><td><img src="../images/article.gif"/> </td><td colspan="3"><a href="http://wiki.eclipse.org/CDO" title="Article in Net4j Signalling Platform Documentation">Wiki</a></td></tr> +<tr><td><img src="../images/category.gif"/> </td><td colspan="4"><a href="reference" title="Category in Net4j Signalling Platform Documentation">Reference</a></td></tr> +<tr><td/><td><img src="../images/category.gif"/> </td><td colspan="3"><a href="reference/api" title="Category in Net4j Signalling Platform Documentation">API Reference</a></td></tr> +<tr><td/><td><img src="../images/category.gif"/> </td><td colspan="3"><a href="reference/schema" title="Category in Net4j Signalling Platform Documentation">Extension Point Reference</a></td></tr> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.doc/html/online/summary.html b/plugins/org.eclipse.net4j.doc/html/online/summary.html new file mode 100644 index 0000000000..2019df68e4 --- /dev/null +++ b/plugins/org.eclipse.net4j.doc/html/online/summary.html @@ -0,0 +1,35 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> + +<HEAD> +<TITLE> +Online Docs (Net4j Signalling Platform Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Online Docs (Net4j Signalling Platform Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1>Online Docs</h1> +<p> +<table border="0"> +<tr><td><img src="../../images/article.gif"/> </td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j Signalling Platform Documentation">Homepage</a></td></tr> +<tr><td><img src="../../images/article.gif"/> </td><td colspan="3"><a href="http://wiki.eclipse.org/CDO" title="Article in Net4j Signalling Platform Documentation">Wiki</a></td></tr> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.doc/html/reference/schema/summary.html b/plugins/org.eclipse.net4j.doc/html/reference/schema/summary.html new file mode 100644 index 0000000000..f5fdacda1c --- /dev/null +++ b/plugins/org.eclipse.net4j.doc/html/reference/schema/summary.html @@ -0,0 +1,33 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> + +<HEAD> +<TITLE> +Extension Point Reference (Net4j Signalling Platform Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Extension Point Reference (Net4j Signalling Platform Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1>Extension Point Reference</h1> +<p> +<table border="0"> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.doc/html/reference/summary.html b/plugins/org.eclipse.net4j.doc/html/reference/summary.html new file mode 100644 index 0000000000..bb7d915ed0 --- /dev/null +++ b/plugins/org.eclipse.net4j.doc/html/reference/summary.html @@ -0,0 +1,35 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> + +<HEAD> +<TITLE> +Reference (Net4j Signalling Platform Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Reference (Net4j Signalling Platform Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1>Reference</h1> +<p> +<table border="0"> +<tr><td><img src="../../images/category.gif"/> </td><td colspan="3"><a href="api" title="Category in Net4j Signalling Platform Documentation">API Reference</a></td></tr> +<tr><td><img src="../../images/category.gif"/> </td><td colspan="3"><a href="schema" title="Category in Net4j Signalling Platform Documentation">Extension Point Reference</a></td></tr> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.doc/images/article.gif b/plugins/org.eclipse.net4j.doc/images/article.gif Binary files differnew file mode 100644 index 0000000000..ab33f93147 --- /dev/null +++ b/plugins/org.eclipse.net4j.doc/images/article.gif diff --git a/plugins/org.eclipse.net4j.doc/images/category.gif b/plugins/org.eclipse.net4j.doc/images/category.gif Binary files differnew file mode 100644 index 0000000000..1bff447388 --- /dev/null +++ b/plugins/org.eclipse.net4j.doc/images/category.gif diff --git a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Overview.java b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Overview.java index 789838367c..6891e88a39 100644 --- a/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Overview.java +++ b/plugins/org.eclipse.net4j.doc/src/org/eclipse/net4j/doc/Overview.java @@ -12,8 +12,11 @@ package org.eclipse.net4j.doc; /**
* Overview
+ * <p>
+ * {@toc}
*
* @number 0
+ * @default
*/
public class Overview
{
diff --git a/plugins/org.eclipse.net4j.doc/toc.xml b/plugins/org.eclipse.net4j.doc/toc.xml index e9d812788d..8d7ee9564b 100644 --- a/plugins/org.eclipse.net4j.doc/toc.xml +++ b/plugins/org.eclipse.net4j.doc/toc.xml @@ -2,10 +2,10 @@ <?NLS TYPE="org.eclipse.help.toc"?> -<toc label="Net4j Signalling Platform Documentation" topic="javadoc/overview-summary.html"> +<toc label="Net4j Signalling Platform Documentation" topic="html/Overview.html"> <topic label="Overview" href="html/Overview.html"> </topic> - <topic label="Reference" href="html/reference"> + <topic label="Reference" href="html/reference/summary.html"> <topic label="API Reference" href="javadoc/overview-summary.html"> <topic label="Net4j Signalling Platform Transport" href="javadoc/org/eclipse/net4j/package-summary.html"> <topic label="org.eclipse.net4j" href="javadoc/org/eclipse/net4j/package-summary.html" /> @@ -40,7 +40,7 @@ </topic> </topic> </topic> - <topic label="Online" href="html/online"> + <topic label="Online Docs" href="html/online/summary.html"> <topic label="Homepage" href="http://www.eclipse.org/cdo" /> <topic label="Wiki" href="http://wiki.eclipse.org/CDO" /> </topic> diff --git a/plugins/org.eclipse.net4j.util.doc/build.xml b/plugins/org.eclipse.net4j.util.doc/build.xml index 1bda4f880a..017b24cc15 100644 --- a/plugins/org.eclipse.net4j.util.doc/build.xml +++ b/plugins/org.eclipse.net4j.util.doc/build.xml @@ -239,11 +239,6 @@ </delete> <mkdir dir="${article.destdir}" /> - <copy todir="${article.destdir}" verbose="true" failonerror="false"> - <fileset dir="${article.sources}" defaultexcludes="true"> - <exclude name="**/*.java" /> - </fileset> - </copy> <copy todir="${project.path}/images" verbose="true" failonerror="false"> <fileset dir="plugins/org.eclipse.emf.cdo.releng.doc/resources" defaultexcludes="true"> <include name="**/*" /> diff --git a/plugins/org.eclipse.net4j.util.doc/html/Overview.html b/plugins/org.eclipse.net4j.util.doc/html/Overview.html index 62b026dc16..603ee2f161 100644 --- a/plugins/org.eclipse.net4j.util.doc/html/Overview.html +++ b/plugins/org.eclipse.net4j.util.doc/html/Overview.html @@ -1,3 +1,42 @@ -<h1>Overview</h1> -<a name="Overview.html"/> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> +<HEAD> +<TITLE> +Overview (Net4j Utilities Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Overview (Net4j Utilities Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1><a name="Overview.html"/>Overview</h1> +<p> + <p> +<table border="0"> +<tr><td><img src="../images/article.gif"/> </td><td colspan="4"><a href="about.html" title="Article in Net4j Utilities Documentation">Legal</a></td></tr> +<tr><td><img src="../images/article.gif"/> </td><td colspan="4"><a href="" title="Article in Net4j Utilities Documentation">Overview</a></td></tr> +<tr><td><img src="../images/category.gif"/> </td><td colspan="4"><a href="online" title="Category in Net4j Utilities Documentation">Online Docs</a></td></tr> +<tr><td/><td><img src="../images/article.gif"/> </td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j Utilities Documentation">Homepage</a></td></tr> +<tr><td/><td><img src="../images/article.gif"/> </td><td colspan="3"><a href="http://wiki.eclipse.org/CDO" title="Article in Net4j Utilities Documentation">Wiki</a></td></tr> +<tr><td><img src="../images/category.gif"/> </td><td colspan="4"><a href="reference" title="Category in Net4j Utilities Documentation">Reference</a></td></tr> +<tr><td/><td><img src="../images/category.gif"/> </td><td colspan="3"><a href="reference/api" title="Category in Net4j Utilities Documentation">API Reference</a></td></tr> +<tr><td/><td><img src="../images/category.gif"/> </td><td colspan="3"><a href="reference/schema" title="Category in Net4j Utilities Documentation">Extension Point Reference</a></td></tr> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.util.doc/html/online/summary.html b/plugins/org.eclipse.net4j.util.doc/html/online/summary.html new file mode 100644 index 0000000000..5d1751c320 --- /dev/null +++ b/plugins/org.eclipse.net4j.util.doc/html/online/summary.html @@ -0,0 +1,35 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> + +<HEAD> +<TITLE> +Online Docs (Net4j Utilities Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Online Docs (Net4j Utilities Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1>Online Docs</h1> +<p> +<table border="0"> +<tr><td><img src="../../images/article.gif"/> </td><td colspan="3"><a href="http://www.eclipse.org/cdo" title="Article in Net4j Utilities Documentation">Homepage</a></td></tr> +<tr><td><img src="../../images/article.gif"/> </td><td colspan="3"><a href="http://wiki.eclipse.org/CDO" title="Article in Net4j Utilities Documentation">Wiki</a></td></tr> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.util.doc/html/reference/schema/summary.html b/plugins/org.eclipse.net4j.util.doc/html/reference/schema/summary.html new file mode 100644 index 0000000000..96839b7f2b --- /dev/null +++ b/plugins/org.eclipse.net4j.util.doc/html/reference/schema/summary.html @@ -0,0 +1,33 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> + +<HEAD> +<TITLE> +Extension Point Reference (Net4j Utilities Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Extension Point Reference (Net4j Utilities Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1>Extension Point Reference</h1> +<p> +<table border="0"> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.util.doc/html/reference/summary.html b/plugins/org.eclipse.net4j.util.doc/html/reference/summary.html new file mode 100644 index 0000000000..ac58a72839 --- /dev/null +++ b/plugins/org.eclipse.net4j.util.doc/html/reference/summary.html @@ -0,0 +1,35 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<HTML> + +<HEAD> +<TITLE> +Reference (Net4j Utilities Documentation) +</TITLE> + +<SCRIPT type="text/javascript"> +function windowTitle() +{ + if (location.href.indexOf('is-external=true') == -1) { + parent.document.title="Reference (Net4j Utilities Documentation)"; + } +} +</SCRIPT> +<NOSCRIPT> +</NOSCRIPT> +</HEAD> + +<BODY BGCOLOR="white" onload="windowTitle();"> +<HR> +<h1>Reference</h1> +<p> +<table border="0"> +<tr><td><img src="../../images/category.gif"/> </td><td colspan="3"><a href="api" title="Category in Net4j Utilities Documentation">API Reference</a></td></tr> +<tr><td><img src="../../images/category.gif"/> </td><td colspan="3"><a href="schema" title="Category in Net4j Utilities Documentation">Extension Point Reference</a></td></tr> +</table> +</p> + + +<HR> +<i>Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.</i> +</BODY> +</HTML> diff --git a/plugins/org.eclipse.net4j.util.doc/images/article.gif b/plugins/org.eclipse.net4j.util.doc/images/article.gif Binary files differnew file mode 100644 index 0000000000..ab33f93147 --- /dev/null +++ b/plugins/org.eclipse.net4j.util.doc/images/article.gif diff --git a/plugins/org.eclipse.net4j.util.doc/images/category.gif b/plugins/org.eclipse.net4j.util.doc/images/category.gif Binary files differnew file mode 100644 index 0000000000..1bff447388 --- /dev/null +++ b/plugins/org.eclipse.net4j.util.doc/images/category.gif diff --git a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Overview.java b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Overview.java index 38413af6cb..9daeacc4c6 100644 --- a/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Overview.java +++ b/plugins/org.eclipse.net4j.util.doc/src/org/eclipse/net4j/util/doc/Overview.java @@ -12,8 +12,11 @@ package org.eclipse.net4j.util.doc; /**
* Overview
+ * <p>
+ * {@toc}
*
* @number 0
+ * @default
*/
public class Overview
{
diff --git a/plugins/org.eclipse.net4j.util.doc/toc.xml b/plugins/org.eclipse.net4j.util.doc/toc.xml index 7e96dfb0f5..2175c22287 100644 --- a/plugins/org.eclipse.net4j.util.doc/toc.xml +++ b/plugins/org.eclipse.net4j.util.doc/toc.xml @@ -2,10 +2,10 @@ <?NLS TYPE="org.eclipse.help.toc"?> -<toc label="Net4j Utilities Documentation" topic="javadoc/overview-summary.html"> +<toc label="Net4j Utilities Documentation" topic="html/Overview.html"> <topic label="Overview" href="html/Overview.html"> </topic> - <topic label="Reference" href="html/reference"> + <topic label="Reference" href="html/reference/summary.html"> <topic label="API Reference" href="javadoc/overview-summary.html"> <topic label="Net4j Utilities" href="javadoc/org/eclipse/net4j/util/package-summary.html"> <topic label="org.eclipse.net4j.util" href="javadoc/org/eclipse/net4j/util/package-summary.html" /> @@ -43,14 +43,14 @@ <topic label="org.eclipse.net4j.util.ui.widgets" href="javadoc/org/eclipse/net4j/util/ui/widgets/package-summary.html" /> </topic> </topic> - <topic label="Extension Point Reference" href="schemadoc/overview-summary.html"> + <topic label="Extension Point Reference" href="html/reference/schema/summary.html"> <topic label="Net4j Utilities" href="schemadoc/org_eclipse_net4j_util_elementProcessors.html"> <topic label="elementProcessors" href="schemadoc/org_eclipse_net4j_util_elementProcessors.html" /> <topic label="factories" href="schemadoc/org_eclipse_net4j_util_factories.html" /> </topic> </topic> </topic> - <topic label="Online" href="html/online"> + <topic label="Online Docs" href="html/online/summary.html"> <topic label="Homepage" href="http://www.eclipse.org/cdo" /> <topic label="Wiki" href="http://wiki.eclipse.org/CDO" /> </topic> |
