From f885e81b3e049cfa01c28dee73bd74d8bf892bb6 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Thu, 22 Sep 2011 16:32:12 +0000
Subject: tutorials
---
plugins/org.eclipse.emf.cdo.doc/html/book.css | 8 +-
.../model/article.ecore | 1 +
.../model/article.ecorediag | 24 +++-
.../emf/cdo/releng/doc/article/ArticleFactory.java | 8 ++
.../emf/cdo/releng/doc/article/ArticlePackage.java | 145 ++++++++++++++++++++-
.../emf/cdo/releng/doc/article/PluginResource.java | 18 +++
.../doc/article/impl/ArticleFactoryImpl.java | 14 ++
.../doc/article/impl/ArticlePackageImpl.java | 24 ++++
.../releng/doc/article/impl/DocumentationImpl.java | 10 +-
.../doc/article/impl/PluginResourceImpl.java | 63 +++++++++
.../doc/article/impl/StructuralElementImpl.java | 20 +--
.../emf/cdo/releng/doc/article/impl/TocImpl.java | 2 -
.../doc/article/util/ArticleAdapterFactory.java | 21 +++
.../cdo/releng/doc/article/util/ArticleSwitch.java | 40 ++++++
.../org.eclipse.net4j.db.doc/html/Overview.html | 2 +-
plugins/org.eclipse.net4j.doc/html/Overview.html | 2 +-
.../org.eclipse.net4j.util.doc/html/Overview.html | 2 +-
17 files changed, 371 insertions(+), 33 deletions(-)
create mode 100644 plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/PluginResource.java
create mode 100644 plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/PluginResourceImpl.java
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 @@
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -814,7 +830,7 @@
-
+
@@ -964,4 +980,10 @@
+
+
+
+
+
+
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
@@ -200,6 +200,14 @@ public interface ArticleFactory extends EFactory
*/
Toc createToc();
+ /**
+ * Returns a new object of class 'Plugin Resource'.
+ *
+ * @return a new object of class 'Plugin Resource'.
+ * @generated
+ */
+ PluginResource createPluginResource();
+
/**
* Returns 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
@@ -1808,6 +1808,123 @@ 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
+ * Plugin Resource}' class.
+ *
+ * @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 'Id' attribute.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__ID = EXTERNAL_ARTICLE__ID;
+
+ /**
+ * The feature id for the 'Default Label' attribute.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__DEFAULT_LABEL = EXTERNAL_ARTICLE__DEFAULT_LABEL;
+
+ /**
+ * The feature id for the 'Tooltip' attribute.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__TOOLTIP = EXTERNAL_ARTICLE__TOOLTIP;
+
+ /**
+ * The feature id for the 'Children' containment reference list.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__CHILDREN = EXTERNAL_ARTICLE__CHILDREN;
+
+ /**
+ * The feature id for the 'Parent' container reference.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__PARENT = EXTERNAL_ARTICLE__PARENT;
+
+ /**
+ * The feature id for the 'Title' attribute.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__TITLE = EXTERNAL_ARTICLE__TITLE;
+
+ /**
+ * The feature id for the 'Documentation' reference.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__DOCUMENTATION = EXTERNAL_ARTICLE__DOCUMENTATION;
+
+ /**
+ * The feature id for the 'Doc' attribute.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__DOC = EXTERNAL_ARTICLE__DOC;
+
+ /**
+ * The feature id for the 'Elements' containment reference list.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__ELEMENTS = EXTERNAL_ARTICLE__ELEMENTS;
+
+ /**
+ * The feature id for the 'Category' reference.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__CATEGORY = EXTERNAL_ARTICLE__CATEGORY;
+
+ /**
+ * The feature id for the 'Article' reference.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__ARTICLE = EXTERNAL_ARTICLE__ARTICLE;
+
+ /**
+ * The feature id for the 'Url' attribute.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE__URL = EXTERNAL_ARTICLE__URL;
+
+ /**
+ * The number of structural features of the 'Plugin Resource' class.
+ *
+ * @generated
+ * @ordered
+ */
+ int PLUGIN_RESOURCE_FEATURE_COUNT = EXTERNAL_ARTICLE_FEATURE_COUNT + 0;
+
/**
* The meta object id for the 'Root Doc' data type.
*
@@ -1815,7 +1932,7 @@ public interface ArticlePackage extends EPackage
* @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 'File' data type.
@@ -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 'Doc' data type.
@@ -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 'Tag' data type.
@@ -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
@@ -2582,6 +2699,16 @@ public interface ArticlePackage extends EPackage
*/
EAttribute getToc_Levels();
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.doc.article.PluginResource
+ * Plugin Resource}'.
+ *
+ * @return the meta object for class 'Plugin Resource'.
+ * @see org.eclipse.emf.cdo.releng.doc.article.PluginResource
+ * @generated
+ */
+ EClass getPluginResource();
+
/**
* Returns the meta object for data type '{@link com.sun.javadoc.RootDoc Root Doc}'.
*
@@ -3250,6 +3377,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
+ * Plugin Resource}' class.
+ *
+ * @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 'Root Doc' data type.
*
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 @@
+/**
+ *
+ *
+ *
+ * $Id$
+ */
+package org.eclipse.emf.cdo.releng.doc.article;
+
+/**
+ * A representation of the model object 'Plugin Resource'.
+ *
+ * @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");
}
@@ -415,6 +418,17 @@ public class ArticleFactoryImpl extends EFactoryImpl implements ArticleFactory
return toc;
}
+ /**
+ *
+ *
+ * @generated
+ */
+ public PluginResource createPluginResource()
+ {
+ PluginResourceImpl pluginResource = new PluginResourceImpl();
+ return pluginResource;
+ }
+
/**
*
*
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;
@@ -262,6 +263,13 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
*/
private EClass tocEClass = null;
+ /**
+ *
+ *
+ * @generated
+ */
+ private EClass pluginResourceEClass = null;
+
/**
*
*
@@ -1032,6 +1040,16 @@ public class ArticlePackageImpl extends EPackageImpl implements ArticlePackage
return (EAttribute)tocEClass.getEStructuralFeatures().get(0);
}
+ /**
+ *
+ *
+ * @generated
+ */
+ public EClass getPluginResource()
+ {
+ return pluginResourceEClass;
+ }
+
/**
*
*
@@ -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 @@
+/**
+ *
+ *
+ *
+ * $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;
+
+/**
+ * An implementation of the model object 'Plugin Resource'.
+ *
+ *
+ *
+ * @generated
+ */
+public class PluginResourceImpl extends ExternalArticleImpl implements PluginResource
+{
+ /**
+ *
+ *
+ * @generated
+ */
+ protected PluginResourceImpl()
+ {
+ super();
+ }
+
+ public PluginResourceImpl(StructuralElement parent, ClassDoc classDoc, String url)
+ {
+ super(parent, classDoc, url);
+ }
+
+ /**
+ *
+ *
+ * @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)(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;
@@ -274,6 +275,12 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
return createTocAdapter();
}
+ @Override
+ public Adapter casePluginResource(PluginResource object)
+ {
+ return createPluginResourceAdapter();
+ }
+
@Override
public Adapter defaultCase(EObject object)
{
@@ -704,6 +711,20 @@ public class ArticleAdapterFactory extends AdapterFactoryImpl
return null;
}
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.doc.article.PluginResource
+ * Plugin Resource}'. 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.
+ *
+ * @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. This default implementation returns null.
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 extends Switch
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);
}
@@ -896,6 +921,21 @@ public class ArticleSwitch extends Switch
return null;
}
+ /**
+ * Returns the result of interpreting the object as an instance of 'Plugin Resource'.
+ * This implementation returns null; returning a non-null result will terminate the switch.
+ *
+ * @param object
+ * the target of the switch.
+ * @return the result of interpreting the object as an instance of 'Plugin Resource'.
+ * @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 'EObject'. This
* implementation returns null; returning a non-null result will terminate the switch, but this is the last case
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()
| Online Docs |
| | Homepage |
| | Wiki |
- | Legal |
+ | Legal |
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()
| Online Docs |
| | Homepage |
| | Wiki |
- | Legal |
+ | Legal |
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()
| Online Docs |
| | Homepage |
| | Wiki |
- | Legal |
+ | Legal |
--
cgit v1.2.3