Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2019-02-14 15:22:48 -0500
committerAlexander Kurtakov2019-02-14 15:22:48 -0500
commitc40e4685598064f2be87b659f2c60e094d63ca07 (patch)
treedb28a5b231b56a652228a4039b5926f2906ed5a2
parent4bc184194956ba7fae4255997954321fba048452 (diff)
downloadeclipse.platform.text-c40e4685598064f2be87b659f2c60e094d63ca07.tar.gz
eclipse.platform.text-c40e4685598064f2be87b659f2c60e094d63ca07.tar.xz
eclipse.platform.text-c40e4685598064f2be87b659f2c60e094d63ca07.zip
Bug 543933 - Build javadocs with Java 11
Fix warnings catched by java 11 javadoc. (take 2) Change-Id: Iccf5071777c27d00d2bd06d9301e175b4ce820dc Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java6
-rw-r--r--org.eclipse.search/new search/org/eclipse/search/ui/text/Match.java4
-rw-r--r--org.eclipse.text/src/org/eclipse/text/edits/TextEdit.java14
-rw-r--r--org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextSelectionNavigationLocation.java5
4 files changed, 15 insertions, 14 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
index 689e13852..ea9234e7a 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
@@ -585,10 +585,10 @@ abstract public class AbstractInformationControlManager {
* anchor can not be used because the information control would not fit in the display client
* area.
* <p>
- * The fallback anchor for a given anchor is the one that comes directly after the given anchor or
- * is the first one in the sequence if the given anchor is the last one in the sequence.
- * <p>
+ * The fallback anchor for a given anchor is the one that comes directly after the given anchor
+ * or is the first one in the sequence if the given anchor is the last one in the sequence.
* </p>
+ * <p>
* Note: This sequence is ignored if the original anchor is not contained in this list.
* </p>
*
diff --git a/org.eclipse.search/new search/org/eclipse/search/ui/text/Match.java b/org.eclipse.search/new search/org/eclipse/search/ui/text/Match.java
index 48f1eb2c9..eb863da61 100644
--- a/org.eclipse.search/new search/org/eclipse/search/ui/text/Match.java
+++ b/org.eclipse.search/new search/org/eclipse/search/ui/text/Match.java
@@ -158,8 +158,8 @@ public class Match {
/**
* Returns whether this match is filtered or not.
*
- * @return <code>true<code> if the match is filtered;
- * otherwise <code>false</code>
+ * @return <code>true</code> if the match is filtered; otherwise
+ * <code>false</code>
*
* @since 3.1
*/
diff --git a/org.eclipse.text/src/org/eclipse/text/edits/TextEdit.java b/org.eclipse.text/src/org/eclipse/text/edits/TextEdit.java
index 2099acceb..11210704e 100644
--- a/org.eclipse.text/src/org/eclipse/text/edits/TextEdit.java
+++ b/org.eclipse.text/src/org/eclipse/text/edits/TextEdit.java
@@ -144,7 +144,7 @@ public abstract class TextEdit {
/**
* Create a new text edit. Parent is initialized to <code>
- * null<code> and the edit doesn't have any children.
+ * null</code> and the edit doesn't have any children.
*
* @param offset the edit's offset
* @param length the edit's length
@@ -213,7 +213,7 @@ public abstract class TextEdit {
* calculation:
* <pre>
* getOffset() + getLength() - 1;
- * <pre>
+ * </pre>
*
* @return the inclusive end position
*/
@@ -265,7 +265,7 @@ public abstract class TextEdit {
* decide if a edit of length zero can cover another edit.
*
* @param other the other edit
- * @return <code>true<code> if the edit covers the other edit;
+ * @return <code>true</code> if the edit covers the other edit;
* otherwise <code>false</code> is returned.
*/
public boolean covers(TextEdit other) {
@@ -598,10 +598,10 @@ public abstract class TextEdit {
* object to fulfill this requirement.
* <p>
* Implementers of this method should use the copy constructor <code>
- * Edit#Edit(Edit source) to initialize the edit part of the copy.
+ * Edit#Edit</code>(Edit source) to initialize the edit part of the copy.
* Implementors aren't responsible to actually copy the children or
* to set the right parent.
- * <p>
+ * </p>
* This method <b>should not be called</b> from outside the framework.
* Please use <code>copy</code> to create a copy of a edit tree.
*
@@ -648,6 +648,7 @@ public abstract class TextEdit {
* This method must be implemented in all concrete text edits.
* <p>
* General template for implementation on each concrete TextEdit class:
+ * </p>
* <pre>
* <code>
* boolean visitChildren= visitor.visit(this);
@@ -658,7 +659,6 @@ public abstract class TextEdit {
* </pre>
* Note that the caller (<code>accept</code>) takes care of invoking
* <code>visitor.preVisit(this)</code> and <code>visitor.postVisit(this)</code>.
- * </p>
*
* @param visitor the visitor object
*/
@@ -695,7 +695,7 @@ public abstract class TextEdit {
*
* @param document the document to be manipulated
* @param style flags controlling the execution of the edit tree. Valid
- * flags are: <code>CREATE_UNDO</code> and </code>UPDATE_REGIONS</code>.
+ * flags are: <code>CREATE_UNDO</code> and <code>UPDATE_REGIONS</code>.
* @return a undo edit, if <code>CREATE_UNDO</code> is specified. Otherwise
* <code>null</code> is returned.
*
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextSelectionNavigationLocation.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextSelectionNavigationLocation.java
index c246301d3..ec0cbc937 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextSelectionNavigationLocation.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextSelectionNavigationLocation.java
@@ -213,8 +213,9 @@ public class TextSelectionNavigationLocation extends NavigationLocation {
/**
* Merges the given location into this one.
*
- * @param location the location to merge into this one
- * @return <code>true<code> if merging was successful
+ * @param location
+ * the location to merge into this one
+ * @return <code>true</code> if merging was successful
*/
@Override
public boolean mergeInto(INavigationLocation location) {

Back to the top