Bug 468284: N&N for Mars (4.5): finished JDT N&N
diff --git a/bundles/org.eclipse.jdt.doc.user/whatsNew/jdt_whatsnew.html b/bundles/org.eclipse.jdt.doc.user/whatsNew/jdt_whatsnew.html
index c2cc46f..2edc624 100644
--- a/bundles/org.eclipse.jdt.doc.user/whatsNew/jdt_whatsnew.html
+++ b/bundles/org.eclipse.jdt.doc.user/whatsNew/jdt_whatsnew.html
@@ -20,17 +20,17 @@
 <h2>What's New in Mars (JDT)</h2>
 <p>Here are descriptions of some of the more interesting or significant changes made to the Java development tools (JDT)
 for the Mars (4.5) release of Eclipse.
-</p>
-<!-- TODO: They are grouped into:</p>
+They are grouped into:</p>
 <ul>
 	<li><a href="#JavaEditor">Java Editor</a></li>
+	<li><a href="#JavaViewsAndToolbars">Java Views and Toolbars</a></li>
 	<li><a href="#JavaFormatter">Java Formatter</a></li>
 	<li><a href="#JavaCompiler">Java Compiler</a></li>
-	<li><a href="#JavaViewsAndDialogs">Java Views and Dialogs</a></li>
+	<li><a href="#Annotations">Working with Annotations</a></li>
 	<li><a href="#Debug">Debug</a></li>
 	<li><a href="#JUnit">JUnit</a></li>
 </ul>
--->
+
 <p>See also the <b><a href="../../org.eclipse.platform.doc.user/whatsNew/platform_whatsnew.html">Eclipse Platform What's New</a></b>
 document for changes in the Platform.</p>
 <p>We also recommend to read the <a href="../tips/jdt_tips.html">Tips and Tricks</a>.</p>
@@ -38,22 +38,11 @@
 
 <table class="news" border="0" cellpadding="10" cellspacing="0" width="80%" summary="New and noteworthy items">
 <tbody>
-  
-  <tr id="jdt-performance">
-    <td class="title">Improved compiler performance</td>
-    <td class="content">
-      Significant performance improvements have been made to the Java compiler on generics-heavy code.
-      Details on affected scenarios, fix and performance results can be found on <b><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=434326">bug 434326</a></b>
-    </td>
-  </tr>
 
-  <tr id="infer-lambda-parameter-types">
-    <td class="title">Add inferred lambda parameter types</td>
-    <td class="content">
-      You can explicitly add the inferred types of the parameters in a lambda expression by invoking the <b>Quick Assist (Ctrl+1) - Add inferred lambda parameter types</b>:
-          <p>
-            <img src="images/infer-lambda-parameter-types.png" alt="" />
-          </p>
+  <!-- ******************* Java Editor ************************************* -->
+  <tr>
+    <td id="JavaEditor" class="section" colspan="2">
+    <h2>Java Editor </h2>
     </td>
   </tr>
 
@@ -76,18 +65,105 @@
     </td>
   </tr>
 
-  <tr id="final-watchpoint">
-    <td class="title">Add Watchpoint for final variables</td>
+  <tr id="infer-lambda-parameter-types">
+    <td class="title">Add inferred lambda parameter types</td>
     <td class="content">
-      You can now add a Watchpoint for non-constant final variables:
+      You can explicitly add the inferred types of the parameters in a lambda expression by invoking the <b>Quick Assist (Ctrl+1) - Add inferred lambda parameter types</b>:
           <p>
-            <img src="images/final-watchpoint.png" alt="" />
+            <img src="images/infer-lambda-parameter-types.png" alt="" />
           </p>
-      This cannot be implemented for final variables with compile-time constant values
-      because Java compiles the constant value into class files and leaves no
-      trace of a field access at points where the final field is read.
     </td>
-   </tr>
+  </tr>
+
+  <tr id="add-remove-parentheses-around-lambda-parameter">
+    <td class="title">Add and remove parentheses around lambda parameter</td>
+    <td class="content">
+      New <b>Quick Assists (Ctrl+1)</b> have been added to add and remove the parentheses around lambda parameter:
+          <p>
+            <img src="images/add-remove-parentheses-around-lambda-parameter.png" alt=""/>
+          </p>
+    </td>
+  </tr>
+
+  <tr id="new-java-editor-templates">
+    <td class="title">New Java editor templates</td>
+    <td class="content">
+      New templates (try_finally, finally, lock) have been added to insert commonly occurring patters in concurrent programming:
+          <p>
+            <img src="images/new-java-editor-templates.png" alt="" />
+          </p>
+    </td>
+  </tr>
+
+  <!-- ******************* Java Views and Toolbars ************************************* -->
+  <tr>
+    <td id="JavaViewsAndToolbars" class="section" colspan="2">
+    <h2>Java Views and Toolbars</h2>
+    </td>
+  </tr>
+
+  <tr id="new-jdticons">
+    <td class="title">New icon set in JDT</td>
+    <td class="content">
+      The JDT project now uses png icons to render better with a dark theme. The following screenshot shows a few
+      example icons, on the left side is the old gif icon, on the right side the new png icon.
+      <p>
+      <img src="images/jdt-iconsexample.png" alt=""/>
+      </p>
+    </td>
+  </tr>
+
+  <!-- ******************* Java Formatter ************************************* -->
+  <tr>
+    <td id="JavaFormatter" class="section" colspan="2">
+    <h2>Java Formatter </h2>
+    </td>
+  </tr>
+  
+  <tr id="formatter-extension">
+	<td class="title">Extension point for third-party formatters</td>
+	<td class="content">
+		JDT now provides an extension point (<code>org.eclipse.jdt.core.javaFormatter</code>) to allow third-party source code formatters as extensions.
+		<p>
+			<img src="images/java-formatter.png" alt="" />
+		</p>
+		The default code formatter is used if no third-party formatter is provided.
+	</td>
+  </tr>
+
+  <!-- ******************* Java Compiler ************************************* -->
+  <tr>
+    <td id="JavaCompiler" class="section" colspan="2">
+    <h2>Java Compiler</h2>
+    </td>
+  </tr>
+
+  <tr id="ecj-requries-17">
+    <td class="title">ECJ requires 1.7 Java runtime</td>
+    <td class="content">
+  		JDT Core projects are now compiled at 1.7 compliance level. As a result, a Java Runtime of
+  		1.7 or above is required to run the Eclipse compiler.
+    </td>
+  </tr>
+
+  <tr id="jdt-performance">
+    <td class="title">Improved compiler performance</td>
+    <td class="content">
+      Significant performance improvements have been made to the Java compiler on generics-heavy code.
+      Details on affected scenarios, fix and performance results can be found on <b><a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=434326">bug 434326</a></b>
+    </td>
+  </tr>
+
+  <tr id="unused-exception-parameters">
+    <td class="title">Unused exception parameters</td>
+    <td class="content">
+		A new compiler option to report unused exception parameters in try-catch statements has been added. The option
+		is set to <code>Ignore</code> by default.
+        <p>
+          <img src="images/unused-exception.png" alt="" />
+        </p>
+    </td>
+  </tr>
 
   <tr id="loop-flows">
     <td class="title">Improved flow analysis for loops</td>
@@ -118,66 +194,26 @@
     </td>
   </tr>
 
-  <tr id="junit-rerun">
-	<td class="title">Re-run parameterized JUnit tests</td>
-	<td class="content">
-		The JUnit view now allows you to re-run groups of parameterized tests, or actually any
-		kind of tests that are run by a specialized runner and add another level of grouping
-		in the JUnit view.
-		<p>
-			<img src="images/junit-rerun-parameterized.png" alt="'Rerun' in context menu of the parameter of a" />
-		</p>
-		<p>
-			See the full story in
-			<a href="http://blog.moritz.eysholdt.de/2014/11/new-eclipse-junit-feature-run-subtrees.html">Moritz' Blog</a>.
-		</p>
-	</td>
-  </tr>
-
-  <tr id="unused-exception-parameters">
-    <td class="title">Unused exception parameters</td>
+  <tr id="more-precise-flow-analysis">
+    <td class="title">More precise flow analysis</td>
     <td class="content">
-		A new compiler option to report unused exception parameters in try-catch statements has been added. The option
-		is set to <code>Ignore</code> by default.
-        <p>
-          <img src="images/unused-exception.png" alt="" />
-        </p>
-        (In earlier Mars milestones, detection for unused exception parameters was added as part of
-        the old "Value of parameter is not used" option. But since it turned out that there are
-        situations were not using an exception parameter actually makes sense, we've reverted the old option
-        to only apply to method parameters.)
+      Flow analysis, as performed by the compiler to warn the user about potential programming problems,
+      has been made smarter. Some examples are:
+      <ul>
+      <li>Leverage knowledge that auto-boxing always produces a non-null value.</li>
+      <li>Leverage knowledge that certain compiler-generated methods - like <code>valueOf()</code> and <code>values()</code> on enum types - provide non-null values.</li>
+      <li>Various improvements in resource leak analysis.</li>
+      </ul>
     </td>
   </tr>
 
-  <tr id="formatter-extension">
-	<td class="title">Extension point for third-party formatters</td>
-	<td class="content">
-		JDT now provides an extension point (<code>org.eclipse.jdt.core.javaFormatter</code>) to allow third-party source code formatters as extensions.
-		<p>
-			<img src="images/java-formatter.png" alt="" />
-		</p>
-		The default code formatter is used if no third-party formatter is provided.
-	</td>
+  <!-- ******************* Working with Annotations ************************************* -->
+  <tr>
+    <td id="Annotations" class="section" colspan="2">
+    <h2>Working with Annotations</h2>
+    </td>
   </tr>
 
-  <tr id="hotkey-skip-all-breakpoints">
-    <td class="title">Shortcut for Skip All Breakpoints</td>
-    <td class="content">
-  		<b>Ctrl+Alt+B</b> has been added as the shortcut for <b>Skip All Breakpoints</b>.
-  		<p>
-        <img src="images/skip-all-breakpoints.png" alt=""/>
-        </p>
-    </td>
-   </tr>
-   
-  <tr id="ecj-requries-17">
-    <td class="title">ECJ requires 1.7 Java runtime</td>
-    <td class="content">
-  		JDT Core projects are now compiled at 1.7 compliance level. As a result, a Java Runtime of
-  		1.7 or above is required to run the Eclipse compiler.
-    </td>
-  </tr>
-  
   <tr id="external-annotations">
     <td class="title">External annotations</td>
     <td class="content">
@@ -231,62 +267,6 @@
     </td>
   </tr>
 
-  <tr id="new-jdticons">
-    <td class="title">New icon set in JDT</td>
-    <td class="content">
-      The JDT project now uses png icons to render better with a dark theme. The following screenshot shows a few
-      example icons, on the left side is the old gif icon, on the right side the new png icon.
-      <p>
-      <img src="images/jdt-iconsexample.png" alt=""/>
-      </p>
-    </td>
-  </tr>
-  
-  
-
-  <tr id="junit-view-filter-to-show-skipped-tests-only">
-    <td class="title">Show skipped tests only in JUnit view</td>
-    <td class="content">
-      The JUnit view now has a filter to show only the skipped (ignored or assumption failed) tests:
-          <p>
-            <img src="images/junit-view-filter-to-show-skipped-tests-only.png" alt=""/>
-          </p>
-    </td>
-  </tr>
-
-  <tr id="add-remove-parentheses-around-lambda-parameter">
-    <td class="title">Add and remove parentheses around lambda parameter</td>
-    <td class="content">
-      New <b>Quick Assists (Ctrl+1)</b> have been added to add and remove the parentheses around lambda parameter:
-          <p>
-            <img src="images/add-remove-parentheses-around-lambda-parameter.png" alt=""/>
-          </p>
-    </td>
-  </tr>
-
-  <tr id="new-java-editor-templates">
-    <td class="title">New Java editor templates</td>
-    <td class="content">
-      New templates (try_finally, finally, lock) have been added to insert commonly occurring patters in concurrent programming:
-          <p>
-            <img src="images/new-java-editor-templates.png" alt="" />
-          </p>
-    </td>
-  </tr>
-
-  <tr id="more-precise-flow-analysis">
-    <td class="title">More precise flow analysis</td>
-    <td class="content">
-      Flow analysis, as performed by the compiler to warn the user about potential programming problems,
-      has been made smarter. Some examples are:
-      <ul>
-      <li>Leverage knowledge that auto-boxing always produces a non-null value.</li>
-      <li>Leverage knowledge that certain compiler-generated methods - like <code>valueOf()</code> and <code>values()</code> on enum types - provide non-null values.</li>
-      <li>Various improvements in resource leak analysis.</li>
-      </ul>
-    </td>
-  </tr>
-
   <tr id="annotations-in-hover">
     <td class="title">Render all annotations in Javadoc hovers</td>
     <td class="content">
@@ -308,51 +288,77 @@
     </td>
   </tr>
 
-  <!-- ******************* Java Editor ************************************* -->
-  <tr>
-    <td id="JavaEditor" class="section" colspan="2">
-    <h2>Java Editor </h2>
-    </td>
-  </tr>
-  
-  
-  <!-- ******************* Java Formatter ************************************* -->
-  <tr>
-    <td id="JavaFormatter" class="section" colspan="2">
-    <h2>Java Formatter </h2>
-    </td>
-  </tr>
-  
-  
-  <!-- ******************* Java Compiler ************************************* -->
-  <tr>
-    <td id="JavaCompiler" class="section" colspan="2">
-    <h2>Java Compiler</h2>
-    </td>
-  </tr>
-  
-  <!-- ******************* Java Views and Dialogs ************************************* -->
-  <tr>
-    <td id="JavaViewsAndDialogs" class="section" colspan="2">
-    <h2>Java Views and Dialogs</h2>
-    </td>
-  </tr>
-  
-  
   <!-- *********************** Debug ******************************** -->
   <tr>
     <td id="Debug" class="section" colspan="2">
     <h2>Debug</h2>
     </td>
-  </tr>  
-  
+  </tr>
+
+  <tr id="hotkey-skip-all-breakpoints">
+    <td class="title">Shortcut for Skip All Breakpoints</td>
+    <td class="content">
+  		<b>Ctrl+Alt+B</b> has been added as the shortcut for <b>Skip All Breakpoints</b>.
+  		<p>
+        <img src="images/skip-all-breakpoints.png" alt=""/>
+        </p>
+    </td>
+   </tr>
+
+  <tr id="final-watchpoint">
+    <td class="title">Add Watchpoint for final variables</td>
+    <td class="content">
+      You can now add a Watchpoint for non-constant final variables:
+          <p>
+            <img src="images/final-watchpoint.png" alt="" />
+          </p>
+      This cannot be implemented for final variables with compile-time constant values
+      because Java compiles the constant value into class files and leaves no
+      trace of a field access at points where the final field is read.
+    </td>
+   </tr>
+
   <!-- ******************* JUnit ************************************* -->
   <tr>
     <td id="JUnit" class="section" colspan="2">
     <h2>JUnit</h2>
     </td>
   </tr>
-  
+
+  <tr id="junit-4-12">
+    <td class="title">JUnit 4.12</td>
+    <td class="content">
+        The org.junit bundle has been updated to
+        <a href="https://github.com/junit-team/junit/blob/master/doc/ReleaseNotes4.12.md">JUnit 4.12</a>.
+    </td>
+  </tr>
+
+  <tr id="junit-view-filter-to-show-skipped-tests-only">
+    <td class="title">Show skipped tests only in JUnit view</td>
+    <td class="content">
+      The JUnit view now has a filter to show only the skipped (ignored or assumption failed) tests:
+          <p>
+            <img src="images/junit-view-filter-to-show-skipped-tests-only.png" alt=""/>
+          </p>
+    </td>
+  </tr>
+
+  <tr id="junit-rerun">
+	<td class="title">Re-run parameterized JUnit tests</td>
+	<td class="content">
+		The JUnit view now allows you to re-run groups of parameterized tests, or actually any
+		kind of tests that are run by a specialized runner and add another level of grouping
+		in the JUnit view.
+		<p>
+			<img src="images/junit-rerun-parameterized.png" alt="'Rerun' in context menu of the parameter of a" />
+		</p>
+		<p>
+			See the full story in
+			<a href="http://blog.moritz.eysholdt.de/2014/11/new-eclipse-junit-feature-run-subtrees.html">Moritz' Blog</a>.
+		</p>
+	</td>
+  </tr>
+
 
 </tbody>
 </table>