Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-09-22 16:32:12 +0000
committerEike Stepper2011-09-22 16:32:12 +0000
commitf885e81b3e049cfa01c28dee73bd74d8bf892bb6 (patch)
tree2266b66d6c7ed5a76b0fab4c098330669241aedf
parent868c5f785730fdf0fd79c4ec486f0bb07cc2a928 (diff)
downloadcdo-f885e81b3e049cfa01c28dee73bd74d8bf892bb6.tar.gz
cdo-f885e81b3e049cfa01c28dee73bd74d8bf892bb6.tar.xz
cdo-f885e81b3e049cfa01c28dee73bd74d8bf892bb6.zip
tutorials
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/html/book.css8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag24
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticleFactory.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/ArticlePackage.java145
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/PluginResource.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticleFactoryImpl.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ArticlePackageImpl.java24
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/StructuralElementImpl.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/TocImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleAdapterFactory.java21
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleSwitch.java40
-rw-r--r--plugins/org.eclipse.net4j.db.doc/html/Overview.html2
-rw-r--r--plugins/org.eclipse.net4j.doc/html/Overview.html2
-rw-r--r--plugins/org.eclipse.net4j.util.doc/html/Overview.html2
17 files changed, 371 insertions, 33 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/book.css b/plugins/org.eclipse.emf.cdo.doc/html/book.css
index f9822b0dbf..ad66fb1694 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/book.css
+++ b/plugins/org.eclipse.emf.cdo.doc/html/book.css
@@ -94,12 +94,12 @@ a:link { color: #0000FF }
a:hover { color: #000080 }
a:visited { text-decoration: underline }
ul { margin-top: 10px; margin-bottom: 10px; }
-li { margin-top: 5px; margin-bottom: 5px; }
-li p { margin-top: 5px; margin-bottom: 5px; }
+li { margin-top: 10px; margin-bottom: 10px; }
+li p { margin-top: 10px; margin-bottom: 10px; }
ol { margin-top: 10px; margin-bottom: 10px; }
dl { margin-top: 10px; margin-bottom: 10px; }
-dt { margin-top: 5px; margin-bottom: 5px; font-weight: bold; }
-dd { margin-top: 5px; margin-bottom: 5px; }
+dt { margin-top: 10px; margin-bottom: 10px; font-weight: bold; }
+dd { margin-top: 10px; margin-bottom: 10px; }
strong { font-weight: bold}
em { font-style: italic}
var { font-style: italic}
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 76d3ab4350..a7af133d9f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecore
@@ -141,4 +141,5 @@
<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>
+ <eClassifiers xsi:type="ecore:EClass" name="PluginResource" eSuperTypes="#//ExternalArticle"/>
</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 893e947fb1..bbb97a66ea 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
@@ -536,6 +536,22 @@
<element xmi:type="ecore:EClass" href="article.ecore#//Toc"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_t9O_oeAuEeCnqI1gDJ3KzQ" x="550" y="896"/>
</children>
+ <children xmi:type="notation:Node" xmi:id="_QTSU4eU0EeCV6YVTTJ6_1g" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_QTUKEOU0EeCV6YVTTJ6_1g" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_QTUxIOU0EeCV6YVTTJ6_1g" type="5001">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_QTUxIeU0EeCV6YVTTJ6_1g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_QTUxIuU0EeCV6YVTTJ6_1g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_QTUxI-U0EeCV6YVTTJ6_1g"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_QTVYMOU0EeCV6YVTTJ6_1g" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_QTVYMeU0EeCV6YVTTJ6_1g"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_QTVYMuU0EeCV6YVTTJ6_1g"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_QTVYM-U0EeCV6YVTTJ6_1g"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_QTSU4uU0EeCV6YVTTJ6_1g" fontColor="4210752" fontName="Segoe UI" fontHeight="10" fillColor="10011046" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="article.ecore#//PluginResource"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QTSU4-U0EeCV6YVTTJ6_1g" x="693" y="917" width="117"/>
+ </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">
@@ -814,7 +830,7 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_TgH44dxjEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>
<styles xmi:type="notation:FontStyle" xmi:id="_TgH44txjEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>
<element xmi:type="ecore:EReference" href="article.ecore#//Chapter/article"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TgH449xjEeCpIJpgvmzkYA" points="[-11, 2, -15, -95]$[-58, 2, -62, -95]$[-58, 114, -62, 17]$[-11, 114, -15, 17]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TgH449xjEeCpIJpgvmzkYA" points="[-11, -2, -15, -56]$[-58, -2, -62, -56]$[-58, 71, -62, 17]$[-11, 71, -15, 17]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TgJuENxjEeCpIJpgvmzkYA" id="(0.11764705882352941,0.5581395348837209)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TgJuEdxjEeCpIJpgvmzkYA" id="(0.1568627450980392,0.09302325581395349)"/>
</edges>
@@ -964,4 +980,10 @@
<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>
+ <edges xmi:type="notation:Edge" xmi:id="_TZU4wOU0EeCV6YVTTJ6_1g" type="3003" source="_QTSU4eU0EeCV6YVTTJ6_1g" target="_6rOp0N79EeCn4588_wNmZw">
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_TZU4weU0EeCV6YVTTJ6_1g" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_TZU4wuU0EeCV6YVTTJ6_1g" fontName="Segoe UI"/>
+ <element xsi:nil="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TZU4w-U0EeCV6YVTTJ6_1g" points="[58, -1, -96, -4]$[95, -1, -59, -4]"/>
+ </edges>
</notation:Diagram>
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 ecda78ccdd..6dec9d55de 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
@@ -201,6 +201,14 @@ public interface ArticleFactory extends EFactory
Toc createToc();
/**
+ * Returns a new object of class '<em>Plugin Resource</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Plugin Resource</em>'.
+ * @generated
+ */
+ PluginResource createPluginResource();
+
+ /**
* 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 10b7eac4d4..e35858e5c6 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
@@ -1809,13 +1809,130 @@ public interface ArticlePackage extends EPackage
int TOC_FEATURE_COUNT = BODY_ELEMENT_FEATURE_COUNT + 1;
/**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.PluginResourceImpl
+ * <em>Plugin Resource</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.PluginResourceImpl
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getPluginResource()
+ * @generated
+ */
+ int PLUGIN_RESOURCE = 29;
+
+ /**
+ * The feature id for the '<em><b>Id</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__ID = EXTERNAL_ARTICLE__ID;
+
+ /**
+ * The feature id for the '<em><b>Default Label</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__DEFAULT_LABEL = EXTERNAL_ARTICLE__DEFAULT_LABEL;
+
+ /**
+ * The feature id for the '<em><b>Tooltip</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__TOOLTIP = EXTERNAL_ARTICLE__TOOLTIP;
+
+ /**
+ * The feature id for the '<em><b>Children</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__CHILDREN = EXTERNAL_ARTICLE__CHILDREN;
+
+ /**
+ * The feature id for the '<em><b>Parent</b></em>' container reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__PARENT = EXTERNAL_ARTICLE__PARENT;
+
+ /**
+ * The feature id for the '<em><b>Title</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__TITLE = EXTERNAL_ARTICLE__TITLE;
+
+ /**
+ * The feature id for the '<em><b>Documentation</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__DOCUMENTATION = EXTERNAL_ARTICLE__DOCUMENTATION;
+
+ /**
+ * The feature id for the '<em><b>Doc</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__DOC = EXTERNAL_ARTICLE__DOC;
+
+ /**
+ * The feature id for the '<em><b>Elements</b></em>' containment reference list. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__ELEMENTS = EXTERNAL_ARTICLE__ELEMENTS;
+
+ /**
+ * The feature id for the '<em><b>Category</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__CATEGORY = EXTERNAL_ARTICLE__CATEGORY;
+
+ /**
+ * The feature id for the '<em><b>Article</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__ARTICLE = EXTERNAL_ARTICLE__ARTICLE;
+
+ /**
+ * The feature id for the '<em><b>Url</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__URL = EXTERNAL_ARTICLE__URL;
+
+ /**
+ * The number of structural features of the '<em>Plugin Resource</em>' class. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE_FEATURE_COUNT = EXTERNAL_ARTICLE_FEATURE_COUNT + 0;
+
+ /**
* 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 = 29;
+ int ROOT_DOC = 30;
/**
* The meta object id for the '<em>File</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1824,7 +1941,7 @@ public interface ArticlePackage extends EPackage
* @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getFile()
* @generated
*/
- int FILE = 30;
+ int FILE = 31;
/**
* The meta object id for the '<em>Doc</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1833,7 +1950,7 @@ public interface ArticlePackage extends EPackage
* @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getDoc()
* @generated
*/
- int DOC = 31;
+ int DOC = 32;
/**
* The meta object id for the '<em>Tag</em>' data type. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -1842,7 +1959,7 @@ public interface ArticlePackage extends EPackage
* @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getTag()
* @generated
*/
- int TAG = 32;
+ int TAG = 33;
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.Documentation
@@ -2583,6 +2700,16 @@ public interface ArticlePackage extends EPackage
EAttribute getToc_Levels();
/**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.PluginResource
+ * <em>Plugin Resource</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Plugin Resource</em>'.
+ * @see org.eclipse.emf.cdo.releng.doc.article.PluginResource
+ * @generated
+ */
+ EClass getPluginResource();
+
+ /**
* Returns the meta object for data type '{@link com.sun.javadoc.RootDoc <em>Root Doc</em>}'. <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -3251,6 +3378,16 @@ public interface ArticlePackage extends EPackage
EAttribute TOC__LEVELS = eINSTANCE.getToc_Levels();
/**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.doc.article.impl.PluginResourceImpl
+ * <em>Plugin Resource</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.PluginResourceImpl
+ * @see org.eclipse.emf.cdo.releng.doc.article.impl.ArticlePackageImpl#getPluginResource()
+ * @generated
+ */
+ EClass PLUGIN_RESOURCE = eINSTANCE.getPluginResource();
+
+ /**
* 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/PluginResource.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/PluginResource.java
new file mode 100644
index 0000000000..bf543ade6b
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/PluginResource.java
@@ -0,0 +1,18 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '<em><b>Plugin Resource</b></em>'. <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.cdo.releng.doc.article.ArticlePackage#getPluginResource()
+ * @model
+ * @generated
+ */
+public interface PluginResource extends ExternalArticle
+{
+} // PluginResource
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 24b2fcf067..d8501f7d79 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
@@ -25,6 +25,7 @@ import org.eclipse.emf.cdo.releng.doc.article.JavaPackage;
import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
import org.eclipse.emf.cdo.releng.doc.article.Link;
import org.eclipse.emf.cdo.releng.doc.article.Plugin;
+import org.eclipse.emf.cdo.releng.doc.article.PluginResource;
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;
@@ -134,6 +135,8 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
return createExtensionPoint();
case ArticlePackage.TOC:
return createToc();
+ case ArticlePackage.PLUGIN_RESOURCE:
+ return createPluginResource();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -420,6 +423,17 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
*
* @generated
*/
+ public PluginResource createPluginResource()
+ {
+ PluginResourceImpl pluginResource = new PluginResourceImpl();
+ return pluginResource;
+ }
+
+ /**
+ * <!-- 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 acb4af607c..529a361aa5 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
@@ -31,6 +31,7 @@ import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
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.Plugin;
+import org.eclipse.emf.cdo.releng.doc.article.PluginResource;
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;
@@ -267,6 +268,13 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
*
* @generated
*/
+ private EClass pluginResourceEClass = null;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
private EDataType rootDocEDataType = null;
/**
@@ -1037,6 +1045,16 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
*
* @generated
*/
+ public EClass getPluginResource()
+ {
+ return pluginResourceEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
public EDataType getRootDoc()
{
return rootDocEDataType;
@@ -1199,6 +1217,8 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
tocEClass = createEClass(TOC);
createEAttribute(tocEClass, TOC__LEVELS);
+ pluginResourceEClass = createEClass(PLUGIN_RESOURCE);
+
// Create data types
rootDocEDataType = createEDataType(ROOT_DOC);
fileEDataType = createEDataType(FILE);
@@ -1258,6 +1278,7 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
externalArticleEClass.getESuperTypes().add(this.getArticle());
schemadocEClass.getESuperTypes().add(this.getCategory());
tocEClass.getESuperTypes().add(this.getBodyElement());
+ pluginResourceEClass.getESuperTypes().add(this.getExternalArticle());
// Initialize classes and features; add operations and parameters
initEClass(documentationEClass, Documentation.class, "Documentation", !IS_ABSTRACT, !IS_INTERFACE,
@@ -1437,6 +1458,9 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
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);
+ initEClass(pluginResourceEClass, PluginResource.class, "PluginResource", !IS_ABSTRACT, !IS_INTERFACE,
+ IS_GENERATED_INSTANCE_CLASS);
+
// 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/DocumentationImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/DocumentationImpl.java
index 9ef2978876..aa3c098917 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
@@ -256,7 +256,15 @@ public class DocumentationImpl extends StructuralElementImpl implements Document
if (externals != null && externals.length != 0)
{
String url = externals[0].inlineTags()[0].text();
- new ExternalArticleImpl(parent, classDoc, url);
+ if (URI.createURI(url).isRelative())
+ {
+ new PluginResourceImpl(parent, classDoc, url);
+ }
+ else
+ {
+ new ExternalArticleImpl(parent, classDoc, url);
+ }
+
return;
}
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java
new file mode 100644
index 0000000000..5830bb94e6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java
@@ -0,0 +1,63 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+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.PluginResource;
+import org.eclipse.emf.cdo.releng.doc.article.StructuralElement;
+import org.eclipse.emf.cdo.releng.doc.article.util.ArticleUtil;
+
+import org.eclipse.emf.ecore.EClass;
+
+import com.sun.javadoc.ClassDoc;
+
+import java.io.File;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Plugin Resource</b></em>'. <!-- end-user-doc
+ * -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class PluginResourceImpl extends ExternalArticleImpl implements PluginResource
+{
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected PluginResourceImpl()
+ {
+ super();
+ }
+
+ public PluginResourceImpl(StructuralElement parent, ClassDoc classDoc, String url)
+ {
+ super(parent, classDoc, url);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass()
+ {
+ return ArticlePackage.Literals.PLUGIN_RESOURCE;
+ }
+
+ @Override
+ public String linkFrom(StructuralElement source)
+ {
+ File sourceFile = source.getOutputFile();
+ File targetFile = new File(getDocumentation().getProjectFolder(), getUrl());
+ return ArticleUtil.createLink(sourceFile, targetFile);
+ }
+} // PluginResourceImpl
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 09415d6d04..35872aef45 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
@@ -188,9 +188,7 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
public StructuralElement getParent()
{
if (eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT)
- {
return null;
- }
return (StructuralElement)eContainer();
}
@@ -212,34 +210,24 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
*/
public void setParent(StructuralElement newParent)
{
- if (newParent != eInternalContainer() || eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT
- && newParent != null)
+ if (newParent != eInternalContainer()
+ || (eContainerFeatureID() != ArticlePackage.STRUCTURAL_ELEMENT__PARENT && newParent != null))
{
if (EcoreUtil.isAncestor(this, newParent))
- {
throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
- }
NotificationChain msgs = null;
if (eInternalContainer() != null)
- {
msgs = eBasicRemoveFromContainer(msgs);
- }
if (newParent != null)
- {
msgs = ((InternalEObject)newParent).eInverseAdd(this, ArticlePackage.STRUCTURAL_ELEMENT__CHILDREN,
StructuralElement.class, msgs);
- }
msgs = basicSetParent(newParent, msgs);
if (msgs != null)
- {
msgs.dispatch();
- }
}
else if (eNotificationRequired())
- {
eNotify(new ENotificationImpl(this, Notification.SET, ArticlePackage.STRUCTURAL_ELEMENT__PARENT, newParent,
newParent));
- }
}
/**
@@ -301,9 +289,7 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
case ArticlePackage.STRUCTURAL_ELEMENT__PARENT:
if (eInternalContainer() != null)
- {
msgs = eBasicRemoveFromContainer(msgs);
- }
return basicSetParent((StructuralElement)otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -443,9 +429,7 @@ public abstract class StructuralElementImpl extends LinkTargetImpl implements St
public String toString()
{
if (eIsProxy())
- {
return super.toString();
- }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (title: ");
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
index 351978e556..146b42bf23 100644
--- 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
@@ -138,9 +138,7 @@ public class TocImpl extends BodyElementImpl implements Toc
public String toString()
{
if (eIsProxy())
- {
return super.toString();
- }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (levels: ");
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 1512f26b0a..a008c39ff4 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
@@ -30,6 +30,7 @@ import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
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.Plugin;
+import org.eclipse.emf.cdo.releng.doc.article.PluginResource;
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;
@@ -275,6 +276,12 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
}
@Override
+ public Adapter casePluginResource(PluginResource object)
+ {
+ return createPluginResourceAdapter();
+ }
+
+ @Override
public Adapter defaultCase(EObject object)
{
return createEObjectAdapter();
@@ -705,6 +712,20 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.PluginResource
+ * <em>Plugin Resource</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.PluginResource
+ * @generated
+ */
+ public Adapter createPluginResourceAdapter()
+ {
+ 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 d69456e7a4..d4cc44b98d 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
@@ -30,6 +30,7 @@ import org.eclipse.emf.cdo.releng.doc.article.Javadoc;
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.Plugin;
+import org.eclipse.emf.cdo.releng.doc.article.PluginResource;
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;
@@ -455,6 +456,30 @@ public class ArticleSwitch<T> extends Switch<T>
result = defaultCase(theEObject);
return result;
}
+ case ArticlePackage.PLUGIN_RESOURCE:
+ {
+ PluginResource pluginResource = (PluginResource)theEObject;
+ T result = casePluginResource(pluginResource);
+ if (result == null)
+ result = caseExternalArticle(pluginResource);
+ if (result == null)
+ result = caseArticle(pluginResource);
+ if (result == null)
+ result = caseChapter(pluginResource);
+ if (result == null)
+ result = caseBody(pluginResource);
+ if (result == null)
+ result = caseStructuralElement(pluginResource);
+ if (result == null)
+ result = caseBodyElementContainer(pluginResource);
+ if (result == null)
+ result = caseLinkTarget(pluginResource);
+ if (result == null)
+ result = caseIdentifiable(pluginResource);
+ if (result == null)
+ result = defaultCase(theEObject);
+ return result;
+ }
default:
return defaultCase(theEObject);
}
@@ -897,6 +922,21 @@ public class ArticleSwitch<T> extends Switch<T>
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Plugin Resource</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>Plugin Resource</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T casePluginResource(PluginResource 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.net4j.db.doc/html/Overview.html b/plugins/org.eclipse.net4j.db.doc/html/Overview.html
index 8e79dc924a..d8b25452e0 100644
--- a/plugins/org.eclipse.net4j.db.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.db.doc/html/Overview.html
@@ -31,7 +31,7 @@ function windowTitle()
<tr><td><img src="../images/category.gif"/>&nbsp;</td><td colspan="4"><a href="online/index.html" title="Category in Net4j DB Framework Documentation">Online Docs</a></td></tr>
<tr><td/><td><img src="../images/article.gif"/>&nbsp;</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"/>&nbsp;</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/article.gif"/>&nbsp;</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"/>&nbsp;</td><td colspan="4"><a href="../about.html" title="Article in Net4j DB Framework Documentation">Legal</a></td></tr>
</table>
</p>
diff --git a/plugins/org.eclipse.net4j.doc/html/Overview.html b/plugins/org.eclipse.net4j.doc/html/Overview.html
index 1ee3b67a38..c98fbd1d2b 100644
--- a/plugins/org.eclipse.net4j.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.doc/html/Overview.html
@@ -31,7 +31,7 @@ function windowTitle()
<tr><td><img src="../images/category.gif"/>&nbsp;</td><td colspan="4"><a href="online/index.html" title="Category in Net4j Signalling Platform Documentation">Online Docs</a></td></tr>
<tr><td/><td><img src="../images/article.gif"/>&nbsp;</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"/>&nbsp;</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/article.gif"/>&nbsp;</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"/>&nbsp;</td><td colspan="4"><a href="../about.html" title="Article in Net4j Signalling Platform Documentation">Legal</a></td></tr>
</table>
</p>
diff --git a/plugins/org.eclipse.net4j.util.doc/html/Overview.html b/plugins/org.eclipse.net4j.util.doc/html/Overview.html
index 1cfe3c0097..2d4e1d5d65 100644
--- a/plugins/org.eclipse.net4j.util.doc/html/Overview.html
+++ b/plugins/org.eclipse.net4j.util.doc/html/Overview.html
@@ -31,7 +31,7 @@ function windowTitle()
<tr><td><img src="../images/category.gif"/>&nbsp;</td><td colspan="4"><a href="online/index.html" title="Category in Net4j Utilities Documentation">Online Docs</a></td></tr>
<tr><td/><td><img src="../images/article.gif"/>&nbsp;</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"/>&nbsp;</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/article.gif"/>&nbsp;</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"/>&nbsp;</td><td colspan="4"><a href="../about.html" title="Article in Net4j Utilities Documentation">Legal</a></td></tr>
</table>
</p>

Back to the top