Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-09-15 05:57:41 +0000
committerEike Stepper2011-09-15 05:57:41 +0000
commit1ab66fad942f9274c4f667dd81e2b38dec226868 (patch)
treebde119e68592b306ad0075595fda5122f67042c1 /plugins
parent959ed964ce239bfe0264da95da55b2a2bae6cd14 (diff)
downloadcdo-1ab66fad942f9274c4f667dd81e2b38dec226868.tar.gz
cdo-1ab66fad942f9274c4f667dd81e2b38dec226868.tar.xz
cdo-1ab66fad942f9274c4f667dd81e2b38dec226868.zip
tutorials
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/html/online/Homepage.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/html/online/Wiki.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Legal.java21
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/toc.xml1
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/ExternalArticleImpl.java8
6 files changed, 31 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/online/Homepage.html b/plugins/org.eclipse.emf.cdo.doc/html/online/Homepage.html
deleted file mode 100644
index 5dbe513df9..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/html/online/Homepage.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Homepage</h1>
-<a name="Homepage.html"/>
-
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/online/Wiki.html b/plugins/org.eclipse.emf.cdo.doc/html/online/Wiki.html
deleted file mode 100644
index 2327e1a175..0000000000
--- a/plugins/org.eclipse.emf.cdo.doc/html/online/Wiki.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Wiki</h1>
-<a name="Wiki.html"/>
-
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Legal.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Legal.java
new file mode 100644
index 0000000000..8f3a2b2b74
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/Legal.java
@@ -0,0 +1,21 @@
+/**
+ * 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.doc;
+
+/**
+ * Legal
+ *
+ * @external about.html
+ * @number 666
+ */
+public class Legal
+{
+}
diff --git a/plugins/org.eclipse.emf.cdo.doc/toc.xml b/plugins/org.eclipse.emf.cdo.doc/toc.xml
index 36ea7310bd..b34f564577 100644
--- a/plugins/org.eclipse.emf.cdo.doc/toc.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/toc.xml
@@ -118,4 +118,5 @@
<topic label="Homepage" href="http://www.eclipse.org/cdo" />
<topic label="Wiki" href="http://wiki.eclipse.org/CDO" />
</topic>
+ <topic label="Legal" href="about.html" />
</toc>
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java
index 2f3c3837e7..3ce9c97580 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/TestCDODocumentation.java
@@ -39,7 +39,7 @@ public class TestCDODocumentation
public static void main(String[] args)
{
add("-sourcepath /develop/ws/cdo/plugins/org.eclipse.net4j.util.doc/src;/develop/ws/cdo/plugins/org.eclipse.net4j.db.doc/src;/develop/ws/cdo/plugins/org.eclipse.net4j.doc/src;/develop/ws/cdo/plugins/org.eclipse.emf.cdo.doc/src");
- add("-subpackages org.eclipse.net4j.util.doc:org.eclipse.emf.cdo.doc.connectors:org.eclipse.emf.cdo.doc.sessions:org.eclipse.emf.cdo.doc.reference:org.eclipse.emf.cdo.doc.reference.api:org.eclipse.emf.cdo.doc.online");
+ add("-subpackages org.eclipse.net4j.util.doc:org.eclipse.emf.cdo.doc.connectors:org.eclipse.emf.cdo.doc.sessions:org.eclipse.emf.cdo.doc.reference:org.eclipse.emf.cdo.doc.reference.api:org.eclipse.emf.cdo.doc.online:org.eclipse.emf.cdo.doc");
add("-doclet org.eclipse.emf.cdo.releng.doc.article.impl.ArticleDoclet");
add("-docletpath /develop/ws/cdo/plugins/org.eclipse.emf.cdo.releng.doc/bin;/develop/bin/org.eclipse.emf.cdo.releng.doc.supplemental/bin;/develop/ws/cdo/_target/plugins/org.eclipse.emf.ecore_2.7.0.v20110605-0747.jar;/develop/ws/cdo/_target/plugins/org.eclipse.emf.common_2.7.0.v20110605-0747.jar");
add("-encoding ISO-8859-1");
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 aa5baa4387..63b70315ab 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
@@ -127,7 +127,9 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (url: ");
@@ -137,6 +139,12 @@ public class ExternalArticleImpl extends ArticleImpl implements ExternalArticle
}
@Override
+ public void generate() throws IOException
+ {
+ // Do nothing
+ }
+
+ @Override
protected void generateTocEntry(BufferedWriter writer, String prefix) throws IOException
{
writer.write(prefix + "<topic label=\"" + getTitle() + "\" href=\"" + url + "\" />\n");

Back to the top