diff options
6 files changed, 15 insertions, 4 deletions
diff --git a/bundles/org.eclipse.jdt.doc.user/whatsNew/Java7news/whats-new-java-7.html b/bundles/org.eclipse.jdt.doc.user/whatsNew/Java7news/whats-new-java-7.html index 98e32f689..19b3a4f6e 100644 --- a/bundles/org.eclipse.jdt.doc.user/whatsNew/Java7news/whats-new-java-7.html +++ b/bundles/org.eclipse.jdt.doc.user/whatsNew/Java7news/whats-new-java-7.html @@ -266,6 +266,7 @@ and many additions to the libraries. The Eclipse compiler implements all the new The evaluation engine in JDT debug has been updated to support Java 7. <p> You can now use all of the new code structures from Java 7 in: + </p> <ul> <li>Display / Inspect actions</li> @@ -273,7 +274,6 @@ and many additions to the libraries. The Eclipse compiler implements all the new <li>Assign variable value operations</li> <li>Breakpoint conditions</li> </ul> - </p> For example, switch on string is supported in breakpoint conditions: <p> <img src="images/bp-condition.png" alt="Breakpoint condition example using switch on string"/> @@ -302,7 +302,7 @@ and many additions to the libraries. The Eclipse compiler implements all the new </td> </tr> - <tr id="ee-description"> + <tr id="api-tools"> <td class="title">API Tools support for Java 7</td> <td class="content"> The execution environment description for Java 7 is available from the corresponding <a href="http://wiki.eclipse.org/Eclipse_Project_Update_Sites">update site</a>. diff --git a/bundles/org.eclipse.pde.doc.user/pdeOptions.txt b/bundles/org.eclipse.pde.doc.user/pdeOptions.txt index f87537733..47c48a107 100644 --- a/bundles/org.eclipse.pde.doc.user/pdeOptions.txt +++ b/bundles/org.eclipse.pde.doc.user/pdeOptions.txt @@ -20,6 +20,9 @@ ;../org.eclipse.debug.core/@dot ;../org.eclipse.debug.ui/@dot ;../org.eclipse.equinox.common/@dot +;../org.eclipse.equinox.frameworkadmin/@dot +;../org.eclipse.equinox.p2.metadata/@dot +;../org.eclipse.equinox.p2.publisher.eclipse/@dot ;../org.eclipse.equinox.preferences/@dot ;../org.eclipse.equinox.registry/@dot ;../org.eclipse.equinox.supplement/@dot @@ -52,7 +55,6 @@ ;../org.eclipse.ui.workbench/@dot ;../org.eclipse.ui.workbench.texteditor/@dot ;../org.eclipse.update.configurator/@dot -;../org.eclipse.equinox.p2.publisher.eclipse/@dot -breakiterator -use -splitIndex diff --git a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt index 5a32d915b..39c5ff903 100644 --- a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt +++ b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt @@ -28,6 +28,7 @@ ;../org.eclipse.equinox.bidi/src ;../org.eclipse.equinox.ds/src ;../org.eclipse.equinox.common/src +;../org.eclipse.equinox.frameworkadmin/src ;../org.eclipse.equinox.http.jetty_3.0.0/src ;../org.eclipse.equinox.http.registry/src ;../org.eclipse.equinox.http.servlet/src @@ -131,7 +132,6 @@ ;../org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.v20120531-2105.jar ;../org.eclipse.ecf.provider.filetransfer.httpclient_4.0.200.v20120531-2105.jar ;../org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.v20120531-2105.jar -;../org.eclipse.equinox.frameworkadmin/@dot ;../org.eclipse.equinox.p2.director/@dot ;../org.eclipse.equinox.p2.garbagecollector/@dot ;../org.eclipse.equinox.p2.metadata.repository/@dot @@ -241,6 +241,8 @@ org.eclipse.equinox.bidi org.eclipse.equinox.bidi.advanced org.eclipse.equinox.bidi.custom +org.eclipse.equinox.frameworkadmin + org.eclipse.equinox.http.jetty org.eclipse.equinox.http.registry org.eclipse.equinox.http.servlet diff --git a/bundles/org.eclipse.platform.doc.isv/plugin.xml b/bundles/org.eclipse.platform.doc.isv/plugin.xml index fcbb77452..d3c346fee 100644 --- a/bundles/org.eclipse.platform.doc.isv/plugin.xml +++ b/bundles/org.eclipse.platform.doc.isv/plugin.xml @@ -69,6 +69,7 @@ <plugin id="org.eclipse.equinox.app"/> <plugin id="org.eclipse.equinox.bidi"/> <plugin id="org.eclipse.equinox.common"/> + <plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.http.jetty"/> <plugin id="org.eclipse.equinox.http.registry"/> <plugin id="org.eclipse.equinox.http.servlet"/> diff --git a/bundles/org.eclipse.platform.doc.isv/reference/misc/overview-platform.html b/bundles/org.eclipse.platform.doc.isv/reference/misc/overview-platform.html index a55d292a0..920e102b9 100644 --- a/bundles/org.eclipse.platform.doc.isv/reference/misc/overview-platform.html +++ b/bundles/org.eclipse.platform.doc.isv/reference/misc/overview-platform.html @@ -217,6 +217,11 @@ determining which plug-ins a given plug-in should include as prerequisites.</p> <td> </td> </tr> <tr> + <td><tt>org.eclipse.equinox.frameworkadmin</tt></td> + <td><tt>org.eclipse.equinox.frameworkadmin</tt></td> + <td> </td> + </tr> + <tr> <td><tt>org.eclipse.equinox.http.jetty<br> org.eclipse.equinox.http.servlet<br></tt></td> <td><tt>org.eclipse.equinox.http.servlet</tt></td> diff --git a/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml b/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml index 1f1a9afd6..d17d39494 100644 --- a/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml +++ b/bundles/org.eclipse.platform.doc.isv/topics_Reference.xml @@ -68,6 +68,7 @@ <topic label="org.eclipse.equinox.bidi" href="reference/api/org/eclipse/equinox/bidi/package-summary.html"/> <topic label="org.eclipse.equinox.bidi.advanced" href="reference/api/org/eclipse/equinox/bidi/advanced/package-summary.html"/> <topic label="org.eclipse.equinox.bidi.custom" href="reference/api/org/eclipse/equinox/bidi/custom/package-summary.html"/> + <topic label="org.eclipse.equinox.frameworkadmin" href="reference/api/org/eclipse/equinox/frameworkadmin/package-summary.html"/> <topic label="org.eclipse.equinox.http.jetty" href="reference/api/org/eclipse/equinox/http/jetty/package-summary.html"/> <topic label="org.eclipse.equinox.http.registry" href="reference/api/org/eclipse/equinox/http/registry/package-summary.html"/> <topic label="org.eclipse.equinox.http.servlet" href="reference/api/org/eclipse/equinox/http/servlet/package-summary.html"/> |