diff options
| author | Stephan Herrmann | 2019-04-13 12:09:15 +0000 |
|---|---|---|
| committer | Stephan Herrmann | 2019-04-13 12:35:00 +0000 |
| commit | 04ac9ac21116d3f4ecb0af7a026fd07be9f4bc99 (patch) | |
| tree | ba0401e7964a91b9fcd60d96af6fb89ca293d275 /org.eclipse.jdt.core/model/org/eclipse | |
| parent | c830660bd12b8a17058f87b7070c8de16e2b2ec1 (diff) | |
| download | org.eclipse.objectteams-04ac9ac21116d3f4ecb0af7a026fd07be9f4bc99.tar.gz org.eclipse.objectteams-04ac9ac21116d3f4ecb0af7a026fd07be9f4bc99.tar.xz org.eclipse.objectteams-04ac9ac21116d3f4ecb0af7a026fd07be9f4bc99.zip | |
update jdt.core to S4_12_0_M1
Diffstat (limited to 'org.eclipse.jdt.core/model/org/eclipse')
29 files changed, 161 insertions, 208 deletions
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/BindingKey.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/BindingKey.java index defeedffe..043322247 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/BindingKey.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/BindingKey.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2011 IBM Corporation and others. + * Copyright (c) 2005, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -52,7 +52,6 @@ public final class BindingKey { * createArrayTypeBindingKey("I", 2) -> "[[I" * </code> * </pre> - * </p> * * @param typeKey the binding key of the given type * @param arrayDimension the given array dimension @@ -83,7 +82,6 @@ public final class BindingKey { * "Ljava/util/List<>;" * </code> * </pre> - * </p> * * @param genericTypeKey the binding key of the generic type * @param argumentTypeKeys the possibly empty list of binding keys of argument types @@ -116,7 +114,6 @@ public final class BindingKey { * createTypeBindingKey("boolean[]") -> "[Z" * </code> * </pre> - * </p> * * @param typeName the possibly qualified type name * @return a new type binding key @@ -139,7 +136,6 @@ public final class BindingKey { * "Lp/X;.foo()V:TSomeTypeVariable;" * </code> * </pre> - * </p> * * @param typeVariableName the name of the given type variable * @param declaringKey the binding key of the type or method the type variable belongs to @@ -171,7 +167,6 @@ public final class BindingKey { * "+Ljava/util/ArrayList;" * </code> * </pre> - * </p> * * @param typeKey the binding key of the given type * @param kind one of {@link Signature#C_STAR}, {@link Signature#C_SUPER}, or {@link Signature#C_EXTENDS} @@ -208,7 +203,6 @@ public final class BindingKey { * "Ljava/util/HashMap;{1}+Ljava/lang/String;" * </code> * </pre> - * </p> * * @param genericTypeKey the binding key of the generic type * @param boundKind one of {@link Signature#C_STAR}, {@link Signature#C_SUPER}, or {@link Signature#C_EXTENDS} diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ClasspathContainerInitializer.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ClasspathContainerInitializer.java index a087d856d..e70ca2a53 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ClasspathContainerInitializer.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ClasspathContainerInitializer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -120,7 +120,6 @@ public abstract class ClasspathContainerInitializer { * <li>Java element operations marked as "handle-only"</li> * </ul> * The effects of using other Java model APIs are unspecified. - * </p> * * @param containerPath a two-segment path (ID/hint) identifying the container that needs * to be resolved @@ -275,7 +274,7 @@ public abstract class ClasspathContainerInitializer { * respectively the {@link #ATTRIBUTE_NOT_SUPPORTED} value * or the {@link #ATTRIBUTE_READ_ONLY} value.</li> * </ul> - * </p><p> + * <p> * The status message can contain more information. * </p><p> * If the subclass does not override this method, then the default behavior is @@ -311,7 +310,7 @@ public abstract class ClasspathContainerInitializer { * respectively the {@link #ATTRIBUTE_NOT_SUPPORTED} value * or the {@link #ATTRIBUTE_READ_ONLY} value.</li> * </ul> - * </p><p> + * <p> * The status message can contain more information. * </p><p> * If the subclass does not override this method, then the default behavior is @@ -349,7 +348,7 @@ public abstract class ClasspathContainerInitializer { * respectively the {@link #ATTRIBUTE_NOT_SUPPORTED} value * or the {@link #ATTRIBUTE_READ_ONLY} value.</li> * </ul> - * </p><p> + * <p> * The status message can contain more information. * </p><p> * If the subclass does not override this method, then the default behavior is diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/CompletionProposal.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/CompletionProposal.java index 80381ca34..ba57ebe51 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/CompletionProposal.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/CompletionProposal.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2018 IBM Corporation and others. + * Copyright (c) 2004, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -83,7 +83,6 @@ public class CompletionProposal { * the modifiers flags of the constructor that is referenced * </li> * </ul> - * </p> * * @see #getKind() */ @@ -113,7 +112,6 @@ public class CompletionProposal { * is declared) * </li> * </ul> - * </p> * * @see #getKind() */ @@ -135,7 +133,6 @@ public class CompletionProposal { * the corresponding modifier flags if the keyword is a modifier * </li> * </ul> - * </p> * * @see #getKind() */ @@ -154,7 +151,6 @@ public class CompletionProposal { * the simple name of the label that is referenced * </li> * </ul> - * </p> * * @see #getKind() */ @@ -179,7 +175,6 @@ public class CompletionProposal { * the type signature of the local variable's type * </li> * </ul> - * </p> * * @see #getKind() */ @@ -207,7 +202,6 @@ public class CompletionProposal { * the method signature of the method that is referenced * </li> * </ul> - * </p> * * @see #getKind() */ @@ -247,7 +241,6 @@ public class CompletionProposal { * overridden or implemented * </li> * </ul> - * </p> * * @see #getKind() */ @@ -266,7 +259,6 @@ public class CompletionProposal { * the dot-based package name of the package that is referenced * </li> * </ul> - * </p> * * @see #getKind() */ @@ -295,7 +287,6 @@ public class CompletionProposal { * and AccAnnotation) of the type that is referenced * </li> * </ul> - * </p> * * @see #getKind() */ @@ -319,7 +310,6 @@ public class CompletionProposal { * the modifiers flags of the variable being declared * </li> * </ul> - * </p> * @see #getKind() */ public static final int VARIABLE_DECLARATION = 10; @@ -349,7 +339,6 @@ public class CompletionProposal { * created * </li> * </ul> - * </p> * * @see #getKind() * @since 3.1 @@ -364,6 +353,7 @@ public class CompletionProposal { * <p> * The following additional context information is available * for this kind of completion proposal at little extra cost: + * </p> * <ul> * <li>{@link #getDeclarationSignature()} - * the type signature of the type that declares the method that is referenced @@ -378,7 +368,6 @@ public class CompletionProposal { * the method signature of the method that is referenced * </li> * </ul> - * </p> * * @see #getKind() * @since 3.1 @@ -409,7 +398,6 @@ public class CompletionProposal { * is declared) * </li> * </ul> - * </p> * * @see #getKind() * @since 3.1 @@ -440,7 +428,6 @@ public class CompletionProposal { * is declared) * </li> * </ul> - * </p> * * @see #getKind() * @since 3.2 @@ -469,7 +456,6 @@ public class CompletionProposal { * the method signature of the method that is referenced * </li> * </ul> - * </p> * * @see #getKind() * @since 3.2 @@ -499,7 +485,6 @@ public class CompletionProposal { * and AccAnnotation) of the type that is referenced * </li> * </ul> - * </p> * * @see #getKind() * @since 3.2 @@ -530,7 +515,6 @@ public class CompletionProposal { * is declared) * </li> * </ul> - * </p> * * @see #getKind() * @since 3.2 @@ -565,7 +549,6 @@ public class CompletionProposal { * is declared) * </li> * </ul> - * </p> * * @see #getKind() * @since 3.2 @@ -596,7 +579,6 @@ public class CompletionProposal { * is declared) * </li> * </ul> - * </p> * * @see #getKind() * @since 3.2 @@ -627,7 +609,6 @@ public class CompletionProposal { * is declared) * </li> * </ul> - * </p> * * @see #getKind() * @since 3.2 @@ -659,7 +640,6 @@ public class CompletionProposal { * of the proposed import * </li> * </ul> - * </p> * * @see #getKind() * @@ -690,7 +670,6 @@ public class CompletionProposal { * of the proposed import * </li> * </ul> - * </p> * * @see #getKind() * @@ -721,7 +700,6 @@ public class CompletionProposal { * of the proposed import * </li> * </ul> - * </p> * * @see #getKind() * @@ -754,7 +732,6 @@ public class CompletionProposal { * the method signature of the method that is referenced * </li> * </ul> - * </p> * * @see #getKind() * @@ -790,7 +767,6 @@ public class CompletionProposal { * </li> * * </ul> - * </p> * * @see #getKind() * @@ -820,7 +796,6 @@ public class CompletionProposal { * the method signature of the constructor that is referenced * </li> * </ul> - * </p> * <p> * This kind of proposal could require a long computation, so they are computed only if completion operation is called with a {@link IProgressMonitor} * (e.g. {@link ICodeAssist#codeComplete(int, CompletionRequestor, IProgressMonitor)}).<br> @@ -861,7 +836,6 @@ public class CompletionProposal { * the modifiers flags of the constructor that is referenced * </li> * </ul> - * </p> * <p> * This kind of proposal could require a long computation, so they are computed only if completion operation is called with a {@link IProgressMonitor} * (e.g. {@link ICodeAssist#codeComplete(int, CompletionRequestor, IProgressMonitor)})<br> @@ -1010,7 +984,6 @@ public class CompletionProposal { * </ul> * For other kinds of completion proposals, this method returns * <code>CompletionFlags.Default</code>. - * </p> * * @return the completion flags, or * <code>CompletionFlags.Default</code> if none @@ -1285,7 +1258,6 @@ public class CompletionProposal { * For kinds of completion proposals, this method returns * <code>null</code>. Clients must not modify the array * returned. - * </p> * * @return a type signature or a package name or module name (9) (depending * on the kind of completion), or <code>null</code> if none @@ -1312,7 +1284,6 @@ public class CompletionProposal { * For kinds of completion proposals, this method returns * <code>null</code>. Clients must not modify the array * returned. - * </p> * * @return a key, or <code>null</code> if none * @see org.eclipse.jdt.core.dom.ASTParser#createASTs(ICompilationUnit[], String[], org.eclipse.jdt.core.dom.ASTRequestor, IProgressMonitor) @@ -1384,7 +1355,6 @@ public class CompletionProposal { * For kinds of completion proposals, this method returns * <code>null</code>. Clients must not modify the array * returned. - * </p> * * @return the keyword, field, method, local variable, or member * name, or <code>null</code> if none @@ -1452,7 +1422,6 @@ public class CompletionProposal { * For kinds of completion proposals, this method returns * <code>null</code>. Clients must not modify the array * returned. - * </p> * * @return the signature, or <code>null</code> if none * @see Signature @@ -1477,7 +1446,6 @@ public class CompletionProposal { * For kinds of completion proposals, this method returns * <code>null</code>. Clients must not modify the array * returned. - * </p> * * @return the key, or <code>null</code> if none * @see org.eclipse.jdt.core.dom.ASTParser#createASTs(ICompilationUnit[], String[], org.eclipse.jdt.core.dom.ASTRequestor, IProgressMonitor) @@ -1578,7 +1546,6 @@ public class CompletionProposal { * </ul> * For other kinds of completion proposals, this method returns * <code>Flags.AccDefault</code>. - * </p> * * @return the modifier flags, or * <code>Flags.AccDefault</code> if none @@ -1627,7 +1594,6 @@ public class CompletionProposal { * <li><code>TYPE_IMPORT</code></li> * <li><code>METHOD_IMPORT</code></li> * </ul> - * </li> * </li> * <li><code>TYPE_REF</code> - The allowed required proposals for this kind are: * <ul> @@ -1650,7 +1616,6 @@ public class CompletionProposal { * </ul> * </li> * </ul> - * </p> * <p> * Other kinds of required proposals will be returned in the future, therefore clients of this * API must allow with {@link CompletionRequestor#setAllowsRequiredProposals(int, int, boolean)} @@ -1741,7 +1706,6 @@ public class CompletionProposal { * {@link IAccessRule#K_ACCESSIBLE} or {@link IAccessRule#K_DISCOURAGED} * or {@link IAccessRule#K_NON_ACCESSIBLE}. * By default this method return {@link IAccessRule#K_ACCESSIBLE}. - * </p> * * @see IAccessRule * @@ -1766,7 +1730,6 @@ public class CompletionProposal { * </ul> * For kinds of completion proposals, this method returns * <code>false</code>. - * </p> * * @return <code>true</code> if the proposal is a constructor. * @since 3.1 @@ -1790,7 +1753,6 @@ public class CompletionProposal { * For kinds of completion proposals, this method returns * <code>null</code>. Clients must not modify the array * returned. - * </p> * * @return a type signature or a package name (depending * on the kind of completion), or <code>null</code> if none @@ -1816,7 +1778,6 @@ public class CompletionProposal { * <li><code>METHOD_REF_WITH_CASTED_RECEIVER</code></li> * </ul> * For kinds of completion proposals, this method returns <code>0</code>. - * </p> * * @return character index of receiver start position (inclusive) * @@ -1839,7 +1800,6 @@ public class CompletionProposal { * <li><code>METHOD_REF_WITH_CASTED_RECEIVER</code></li> * </ul> * For kinds of completion proposals, this method returns <code>0</code>. - * </p> * * @return character index of receiver end position (exclusive) * diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/CompletionRequestor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/CompletionRequestor.java index dfc71066a..1465be709 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/CompletionRequestor.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/CompletionRequestor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2008 IBM Corporation and others. + * Copyright (c) 2004, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -33,6 +33,7 @@ import org.eclipse.jdt.core.compiler.IProblem; * ... * requestor.endReporting(); * </pre> + * <p> * If, however, the engine is unable to offer completion proposals * for whatever reason, <code>completionFailure</code> is called * with a problem object describing why completions were unavailable. @@ -43,6 +44,7 @@ import org.eclipse.jdt.core.compiler.IProblem; * requestor.completionFailure(problem); * requestor.endReporting(); * </pre> + * <p> * In either case, the bracketing <code>beginReporting</code> * <code>endReporting</code> calls are always made as well as * <code>acceptContext</code> call. diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java index ca3f5ec52..fda96862a 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2017 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -506,14 +506,12 @@ public final class Flags { * int flags = method.getFlags() & ~Flags.AccVarargs; * return Flags.toString(flags); * </pre> - * </p> * <p> * Examples results: * <pre> * <code>"public static final"</code> * <code>"private native"</code> * </pre> - * </p> * * @param flags the flags * @return the standard string representation of the given flags diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathAttribute.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathAttribute.java index 24c188302..c841fb860 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathAttribute.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathAttribute.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2017 IBM Corporation and others. + * Copyright (c) 2005, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -219,7 +219,7 @@ public interface IClasspathAttribute { * <code>"false"</code> is assumed. If the value of this attribute is <code>"true"</code>, and the classpath entry * is a source folder, it is assumed to contain test sources, otherwise main sources. * </p> - * </p> + * <p> * During the compilation of main sources, only code is visible, that is reachable via classpath entries which do * not have the test attribute set to to "true". During the compilation of test sources, all code is visible as if * this attribute didn't exist at all. diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathContainer.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathContainer.java index 93a331723..ba3afda8f 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathContainer.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathContainer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -98,6 +98,7 @@ public interface IClasspathContainer { * <li>{@link IJavaProject#readOutputLocation()}</li> * <li>Java element operations marked as "handle-only"</li> * </ul> + * <p> * The effects of using other Java model APIs are unspecified. * </p> * diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathEntry.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathEntry.java index bbe602970..ad735bc07 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathEntry.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IClasspathEntry.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2015 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -22,7 +22,6 @@ import org.eclipse.core.runtime.IPath; * by each package fragment root and package fragment associated with the entry. * <p> * A classpath entry can refer to any of the following:<ul> - * * <li>Source code in the current project. In this case, the entry identifies a * root folder in the current project containing package fragments and * source files with one of the {@link JavaCore#getJavaLikeExtensions() @@ -91,7 +90,6 @@ import org.eclipse.core.runtime.IPath; * <br> Also note that the container resolution APIs include an IJavaProject argument, so as to allow the same * container path to be interpreted in different ways for different projects. </li> * </ul> - * </p> * The result of {@link IJavaProject#getResolvedClasspath} will have all entries of type * {@link #CPE_VARIABLE} and {@link #CPE_CONTAINER} resolved to a set of * {@link #CPE_SOURCE}, {@link #CPE_LIBRARY} or {@link #CPE_PROJECT} @@ -275,7 +273,6 @@ public interface IClasspathEntry { * <code>tests</code>). * </li> * </ul> - * </p> * * @return the possibly empty list of resource exclusion patterns * associated with this classpath entry, or <code>null</code> if this kind @@ -335,7 +332,6 @@ public interface IClasspathEntry { * named <code>Foo.java</code>. * </li> * </ul> - * </p> * * @return the possibly empty list of resource inclusion patterns * associated with this classpath entry, or <code>null</code> if this kind diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICodeAssist.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICodeAssist.java index 2f7c535b4..0e0a5f595 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICodeAssist.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICodeAssist.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -95,7 +95,6 @@ public interface ICodeAssist { * An <code>offset</code> of -1 indicates to code assist at the beginning of this * compilation unit. * <p> - * <p> * If {@link IProgressMonitor} is not <code>null</code> then some proposals which * can be very long to compute are proposed. To avoid that the code assist operation * take too much time a {@link IProgressMonitor} which automatically cancel the code diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICompilationUnit.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICompilationUnit.java index 5f2c667a8..2530489df 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICompilationUnit.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ICompilationUnit.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2015 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -418,11 +418,11 @@ IImportDeclaration[] getImports() throws JavaModelException; */ ICompilationUnit getPrimary(); /** - * Returns <tt>null</tt> if this <code>ICompilationUnit</code> is the primary + * Returns <code>null</code> if this <code>ICompilationUnit</code> is the primary * working copy, or this <code>ICompilationUnit</code> is not a working copy, * otherwise the <code>WorkingCopyOwner</code> * - * @return <tt>null</tt> if this <code>ICompilationUnit</code> is the primary + * @return <code>null</code> if this <code>ICompilationUnit</code> is the primary * working copy, or this <code>ICompilationUnit</code> is not a working copy, * otherwise the <code>WorkingCopyOwner</code> * @since 3.0 @@ -736,7 +736,6 @@ CompilationUnit reconcile(int astLevel, boolean forceProblemDetection, boolean e * <li>the requested level of AST API is not supported</li> * <li>the working copy was already consistent and problem detection is not forced</li> * </ul> - * </p> * * <p> * If statements recovery is enabled by passing the {@link #ENABLE_STATEMENTS_RECOVERY} bit in the given reconcile flag diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaElementDelta.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaElementDelta.java index 386196364..0ab4326b7 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaElementDelta.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaElementDelta.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2011 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -23,7 +23,7 @@ import org.eclipse.jdt.core.dom.CompilationUnit; * <p> * Deltas have a different status depending on the kind of change they represent. * The list below summarizes each status (as returned by {@link #getKind}) - * and its meaning (see individual constants for a more detailled description): + * and its meaning (see individual constants for a more detailed description): * <ul> * <li>{@link #ADDED} - The element described by the delta has been added.</li> * <li>{@link #REMOVED} - The element described by the delta has been removed.</li> @@ -60,11 +60,10 @@ import org.eclipse.jdt.core.dom.CompilationUnit; * <li>{@link #F_SOURCEDETACHED} - The source attachment path or the source attachment root path * of a classpath entry corresponding to the element was removed. This flag is only valid if the element is an * {@link IPackageFragmentRoot}.</li> - * <li>{@link #F_SUPER_TYPES} - One of the supertypes of an {@link IType} has changed</li>. + * <li>{@link #F_SUPER_TYPES} - One of the supertypes of an {@link IType} has changed.</li> * </ul> * </li> * </ul> - * </p> * <p> * Move operations are indicated by other change flags, layered on top * of the change flags described above. If element A is moved to become B, @@ -369,7 +368,7 @@ public interface IJavaElementDelta { /** * Returns flags that describe how an element has changed. - * Such flags should be tested using the <code>&</code> operand. For example: + * Such flags should be tested using the <code>&</code> operand. For example: * <pre> * if ((delta.getFlags() & IJavaElementDelta.F_CONTENT) != 0) { * // the delta indicates a content change diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaProject.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaProject.java index d0e384d1f..9c9c818f6 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaProject.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IJavaProject.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -49,14 +49,13 @@ import org.eclipse.jdt.core.eval.IEvaluationContext; * the corresponding generated class files from the required project's output * location(s)). The classpath format is a sequence of classpath entries * describing the location and contents of package fragment roots. - * </p> + * <p> * Java project elements need to be opened before they can be navigated or manipulated. * The children of a Java project are the package fragment roots that are * defined by the classpath and contained in this project (in other words, it * does not include package fragment roots for other projects). The children * (i.e. the package fragment roots) appear in the order they are defined by * the classpath. - * </p> * <p> * An instance of one of these handles can be created via * <code>JavaCore.create(project)</code>. @@ -172,7 +171,7 @@ public interface IJavaProject extends IParent, IJavaElement, IOpenable { * variable}</li> * <li>{@link IAnnotation} for a binding key from an * {@link IAnnotationBinding}</li> - * </ul></p> + * </ul> * <p>Note: if two methods correspond to the binding key because their * parameter types' simple names are the same, then the first one is returned. * For example, if a class defines two methods <code>foo(p1.Y, String)</code> @@ -649,7 +648,7 @@ public interface IJavaProject extends IParent, IJavaElement, IOpenable { * </p> * <p> * Note that in case the project isn't yet opened, the classpath will - * be read directly from the associated <tt>.classpath</tt> file. + * be read directly from the associated <code>.classpath</code> file. * </p> * * @return the raw classpath for the project, as a list of classpath entries @@ -1218,7 +1217,7 @@ public interface IJavaProject extends IParent, IJavaElement, IOpenable { * * @param path * IPath - * @return the classpath entry or <code>null</null>. + * @return the classpath entry or <code>null</code>. * @throws JavaModelException * @since 3.14 */ diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IModuleDescription.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IModuleDescription.java index 602b1d275..ebda6d8ce 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IModuleDescription.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IModuleDescription.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2018 IBM Corporation. + * Copyright (c) 2017, 2019 IBM Corporation. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -38,6 +38,24 @@ public interface IModuleDescription extends IMember, IAnnotatable { String[] getRequiredModuleNames() throws JavaModelException; /** + * Get provided service names for this module. + * + * @return a non-null array of provided service names + * @throws JavaModelException + * @since 3.18 + */ + String[] getProvidedServiceNames() throws JavaModelException; + + /** + * Get used service names for this module. + * + * @return a non-null array of used service names + * @throws JavaModelException + * @since 3.18 + */ + String[] getUsedServiceNames() throws JavaModelException; + + /** * * @return true if automatic module, else false * @since 3.14 diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IType.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IType.java index a0466b1b6..630f40cc7 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IType.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IType.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2016 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -348,10 +348,11 @@ public interface IType extends IMember, IAnnotatable { * * <p>It is possible that a field with the same name already exists in this type. * The value of the <code>force</code> parameter affects the resolution of - * such a conflict:<ul> + * such a conflict: + * <ul> * <li> <code>true</code> - in this case the field is created with the new contents</li> * <li> <code>false</code> - in this case a <code>JavaModelException</code> is thrown</li> - * </ul></p> + * </ul> * * @param contents the given contents * @param sibling the given sibling @@ -406,10 +407,11 @@ public interface IType extends IMember, IAnnotatable { * * <p>It is possible that a method with the same signature already exists in this type. * The value of the <code>force</code> parameter affects the resolution of - * such a conflict:<ul> + * such a conflict: + * <ul> * <li> <code>true</code> - in this case the method is created with the new contents</li> * <li> <code>false</code> - in this case a <code>JavaModelException</code> is thrown</li> - * </ul></p> + * </ul> * * @param contents the given contents * @param sibling the given sibling @@ -440,10 +442,11 @@ public interface IType extends IMember, IAnnotatable { * * <p>It is possible that a type with the same name already exists in this type. * The value of the <code>force</code> parameter affects the resolution of - * such a conflict:<ul> + * such a conflict: + * <ul> * <li> <code>true</code> - in this case the type is created with the new contents</li> * <li> <code>false</code> - in this case a <code>JavaModelException</code> is thrown</li> - * </ul></p> + * </ul> * * @param contents the given contents * @param sibling the given sibling diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java index 6bda1aec7..b18211867 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/JavaConventions.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -122,7 +122,6 @@ public final class JavaConventions { * <li> it must not contain any characters or substrings that are not valid * on the file system on which workspace root is located. * </ul> - * </p> * @param name the name of a compilation unit * @return a status object with code <code>IStatus.OK</code> if * the given name is valid as a compilation unit name, otherwise a status @@ -145,7 +144,6 @@ public final class JavaConventions { * <li> it must not contain any characters or substrings that are not valid * on the file system on which workspace root is located. * </ul> - * </p> * @param name the name of a compilation unit * @param sourceLevel the source level * @param complianceLevel the compliance level @@ -196,7 +194,6 @@ public final class JavaConventions { * <li> it must not contain any characters or substrings that are not valid * on the file system on which workspace root is located. * </ul> - * </p> * @param name the name of a .class file * @return a status object with code <code>IStatus.OK</code> if * the given name is valid as a .class file name, otherwise a status @@ -219,7 +216,6 @@ public final class JavaConventions { * <li> it must not contain any characters or substrings that are not valid * on the file system on which workspace root is located. * </ul> - * </p> * @param name the name of a .class file * @param sourceLevel the source level * @param complianceLevel the compliance level diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/NamingConventions.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/NamingConventions.java index a02a4a667..f2be556ad 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/NamingConventions.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/NamingConventions.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -42,7 +42,6 @@ import org.eclipse.jdt.internal.core.InternalNamingConventions; * <li> {@link JavaCore#CODEASSIST_ARGUMENT_PREFIXES} : Define the Prefixes for Argument Name.</li> * <li> {@link JavaCore#CODEASSIST_ARGUMENT_SUFFIXES} : Define the Suffixes for Argument Name.</li> * </ul> - * </p> * <p> * For a complete description of the configurable options, see {@link JavaCore#getDefaultOptions()}. * To programmatically change these options, see {@link JavaCore#setOptions(java.util.Hashtable)}. @@ -518,7 +517,6 @@ public final class NamingConventions { * <li>{@link #VK_STATIC_FIELD}: {@link JavaCore#CODEASSIST_STATIC_FIELD_PREFIXES} and {@link JavaCore#CODEASSIST_STATIC_FIELD_SUFFIXES}</li> * <li>{@link #VK_STATIC_FINAL_FIELD}: {@link JavaCore#CODEASSIST_STATIC_FINAL_FIELD_PREFIXES} and {@link JavaCore#CODEASSIST_STATIC_FINAL_FIELD_SUFFIXES}</li> * </ul> - * </p> * <p> * e.g.<br> * If the variable is a {@link #VK_LOCAL}, the variable name is <code>preVariableNamesuf</code>, a possible prefix is <code>pre</code> and a possible suffix is <code>suf</code> @@ -1083,7 +1081,6 @@ public final class NamingConventions { * </ul></li> * </ul> * Some other kinds could be added in the future. - * </p> * <p> * Each variable kind is affected by the following JavaCore options: * <ul> @@ -1093,7 +1090,6 @@ public final class NamingConventions { * <li>{@link #VK_STATIC_FIELD}: {@link JavaCore#CODEASSIST_STATIC_FIELD_PREFIXES} and {@link JavaCore#CODEASSIST_STATIC_FIELD_SUFFIXES}</li> * <li>{@link #VK_STATIC_FINAL_FIELD}: {@link JavaCore#CODEASSIST_STATIC_FINAL_FIELD_PREFIXES} and {@link JavaCore#CODEASSIST_STATIC_FINAL_FIELD_SUFFIXES}</li> * </ul> - * </p> * <p> * For a complete description of these configurable options, see {@link JavaCore#getDefaultOptions()}. * To programmatically change these options, see {@link JavaCore#setOptions(java.util.Hashtable)} and {@link IJavaProject#setOptions(java.util.Map)} @@ -1107,7 +1103,6 @@ public final class NamingConventions { * <li>Names with suffix. Longer names are proposed first</li> * <li>Names without prefix and suffix. Longer names are proposed first</li> * </ol> - * </p> * * @param variableKind specifies what type the variable is: {@link #VK_LOCAL}, {@link #VK_PARAMETER}, {@link #VK_STATIC_FIELD}, * {@link #VK_INSTANCE_FIELD} or {@link #VK_STATIC_FINAL_FIELD}. diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Signature.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Signature.java index 76801f2ea..4c6d2d123 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Signature.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Signature.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -97,7 +97,6 @@ import org.eclipse.jdt.internal.compiler.util.Util; * "<" + FormalTypeParameterSignature+ + ">" * | * </pre> - * </p> * <p> * Examples: * <ul> @@ -107,10 +106,9 @@ import org.eclipse.jdt.internal.compiler.util.Util; * <li><code>"Qjava.lang.String;"</code> denotes <code>java.lang.String</code> in source code</li> * <li><code>"[QString;"</code> denotes <code>String[]</code> in source code</li> * <li><code>"QMap<QString;*>;"</code> denotes <code>Map<String,?></code> in source code</li> - * <li><code>"Qjava.util.List<TV;>;"</code> denotes <code>java.util.List<V></code> in source code</li> - * <li><code>"<E;>Ljava.util.List;"</code> denotes <code><E>java.util.List</code> in source code</li> + * <li><code>"Qjava.util.List<V>;"</code> denotes <code>java.util.List<V></code> in source code</li> + * <li><code>"<E>Ljava.util.List;"</code> denotes <code><E>java.util.List</code> in source code</li> * </ul> - * </p> * <p> * The syntax for a method signature is: * <pre> @@ -125,7 +123,6 @@ import org.eclipse.jdt.internal.compiler.util.Util; * <li><code>"([Ljava.lang.String;)V"</code> denotes <code>void foo(java.lang.String[])</code> in compiled code</li> * <li><code>"(QString;)QObject;"</code> denotes <code>Object foo(String)</code> in source code</li> * </ul> - * </p> * <p> * The syntax for a formal type parameter signature is: * <pre> @@ -145,7 +142,6 @@ import org.eclipse.jdt.internal.compiler.util.Util; * <li><code>"X:QReader;"</code> denotes <code>X extends Reader</code> in source code</li> * <li><code>"X:QReader;:QSerializable;"</code> denotes <code>X extends Reader & Serializable</code> in source code</li> * </ul> - * </p> * <p> * This class provides static methods and constants only. * </p> @@ -1342,7 +1338,6 @@ public static String createTypeSignature(char[] typeName, boolean isResolved) { * createTypeSignature("int []", false) -> "[I" * </code> * </pre> - * </p> * * @param typeName the possibly qualified type name * @param isResolved <code>true</code> if the type name is to be considered @@ -1603,7 +1598,6 @@ public static int getArrayCount(String typeSignature) throws IllegalArgumentExce * getElementType({'[', '[', 'I'}) --> {'I'}. * </code> * </pre> - * </p> * * @param typeSignature the type signature * @return the type signature without arrays @@ -1630,7 +1624,6 @@ public static char[] getElementType(char[] typeSignature) throws IllegalArgument * getElementType("[[I") --> "I". * </code> * </pre> - * </p> * * @param typeSignature the type signature * @return the type signature without arrays @@ -1842,7 +1835,6 @@ public static String[] getParameterTypes(String methodSignature) throws IllegalA * getQualifier({'j', 'a', 'v', 'a', '.', 'u', 't', 'i', 'l', '.', 'L', 'i', 's', 't', '<', 'j', 'a', 'v', 'a', '.', 'l', 'a', 'n', 'g', '.', 'S', 't', 'r', 'i', 'n', 'g', '>'}) -> {'j', 'a', 'v', 'a', '.', 'u', 't', 'i', 'l'} * </code> * </pre> - * </p> * * @param name the name * @return the qualifier prefix, or the empty char array if the name contains no @@ -1871,7 +1863,6 @@ public static char[] getQualifier(char[] name) { * getQualifier("java.util.List<java.lang.String>") -> "java.util" * </code> * </pre> - * </p> * * @param name the name * @return the qualifier prefix, or the empty string if the name contains no @@ -1929,7 +1920,6 @@ public static String getReturnType(String methodSignature) throws IllegalArgumen * getSignatureQualifier({'L', 'j', 'a', 'v', 'a', '.', 'u', 't', 'i', 'l', '.', 'M', 'a', 'p', '$', 'E', 'n', 't', 'r', 'y', ';'}) -> {'j', 'a', 'v', 'a', '.', 'u', 't', 'i', 'l'} * </code> * </pre> - * </p> * * @param typeSignature the type signature * @return the package fragment (separators are '.') @@ -1975,7 +1965,6 @@ public static char[] getSignatureQualifier(char[] typeSignature) { * getSignatureQualifier("Ljava.util.Map$Entry") -> "java.util" * </code> * </pre> - * </p> * * @param typeSignature the type signature * @return the package fragment (separators are '.') @@ -1994,7 +1983,6 @@ public static String getSignatureQualifier(String typeSignature) { * getSignatureSimpleName({'L', 'j', 'a', 'v', 'a', '.', 'u', 't', 'i', 'l', '.', 'M', 'a', 'p', '$', 'E', 'n', 't', 'r', 'y', ';'}) -> {'M', 'a', 'p', '.', 'E', 'n', 't', 'r', 'y'} * </code> * </pre> - * </p> * * @param typeSignature the type signature * @return the type fragment (separators are '.') @@ -2049,7 +2037,6 @@ public static char[] getSignatureSimpleName(char[] typeSignature) { * getSignatureSimpleName("Ljava.util.Map$Entry") -> "Map.Entry" * </code> * </pre> - * </p> * * @param typeSignature the type signature * @return the type fragment (separators are '.') @@ -2068,7 +2055,6 @@ public static String getSignatureSimpleName(String typeSignature) { * getSimpleName({'j', 'a', 'v', 'a', '.', 'l', 'a', 'n', 'g', '.', 'O', 'b', 'j', 'e', 'c', 't'}) -> {'O', 'b', 'j', 'e', 'c', 't'} * </code> * </pre> - * </p> * * @param name the name * @return the last segment of the qualified name @@ -2126,7 +2112,6 @@ public static char[] getSimpleName(char[] name) { * getSimpleName("java.util.Map<java.lang.String, java.lang.Object>") -> "Map<String,Object>" * </code> * </pre> - * </p> * * @param name the name * @return the last segment of the qualified name @@ -2715,7 +2700,6 @@ public static String getTypeVariable(String formalTypeParameterSignature) throws * will return: "LTest<+Ljava.lang.Throwable;>;" * </code> * </pre> - * </p> * * @param methodOrTypeSignature the signature which may have been captured * @return a new signature without capture information or the signature itself @@ -2740,7 +2724,6 @@ public static char[] removeCapture(char[] methodOrTypeSignature) { * will return: "LTest<+Ljava.lang.Throwable;>;" * </code> * </pre> - * </p> * * @param methodOrTypeSignature the signature which may have been captured * @return a new signature without capture information or the signature itself @@ -2768,7 +2751,6 @@ public static String removeCapture(String methodOrTypeSignature) { * toString({'+', 'L', 'O', 'b', 'j', 'e', 'c', 't', ';'}) -> {'?', ' ', 'e', 'x', 't', 'e', 'n', 'd', 's', ' ', 'O', 'b', 'j', 'e', 'c', 't'} * </code> * </pre> - * </p> * <p> * Note: This method assumes that a type signature containing a <code>'$'</code> * is an inner type signature. While this is correct in most cases, someone could @@ -2808,7 +2790,6 @@ public static char[] toCharArray(char[] signature) throws IllegalArgumentExcepti * toString("([Ljava.lang.String;)V", "main", new String[] {"args"}, false, true) -> "void main(String[] args)" * </code> * </pre> - * </p> * * @param methodSignature the method signature to convert * @param methodName the name of the method to insert in the result, or @@ -2838,7 +2819,6 @@ public static char[] toCharArray(char[] methodSignature, char[] methodName, char * toString("([Ljava.lang.String;)V", "main", new String[] {"args"}, false, true) -> "void main(String[] args)" * </code> * </pre> - * </p> * * @param methodSignature the method signature to convert * @param methodName the name of the method to insert in the result, or @@ -2921,7 +2901,6 @@ public static char[] toCharArray(char[] methodSignature, char[] methodName, char * toQualifiedName({{}}) -> {} * </code> * </pre> - * </p> * * @param segments the list of name segments, possibly empty * @return the dot-separated qualified name, or the empty string @@ -2963,7 +2942,6 @@ public static char[] toQualifiedName(char[][] segments) { * toQualifiedName(new String[0]) -> "" * </code> * </pre> - * </p> * * @param segments the list of name segments, possibly empty * @return the dot-separated qualified name, or the empty string @@ -2989,7 +2967,6 @@ public static String toQualifiedName(String[] segments) { * toString("+QObject;") -> "? extends Object" * </code> * </pre> - * </p> * <p> * Note: This method assumes that a type signature containing a <code>'$'</code> * is an inner type signature. While this is correct in most cases, someone could diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ToolFactory.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ToolFactory.java index a9d4c7a0f..dfe106164 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ToolFactory.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ToolFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -411,8 +411,8 @@ public class ToolFactory { * used to tokenize some source in a Java aware way. * Here is a typical scanning loop: * - * <code> * <pre> + * <code> * IScanner scanner = ToolFactory.createScanner(false, false, false, false); * scanner.setSource("int i = 0;".toCharArray()); * while (true) { @@ -420,8 +420,8 @@ public class ToolFactory { * if (token == ITerminalSymbols.TokenNameEOF) break; * System.out.println(token + " : " + new String(scanner.getCurrentTokenSource())); * } - * </pre> * </code> + * </pre> * * <p>By default the compliance used to create the scanner is the workspace's compliance when running inside the IDE * or 1.4 if running from outside of a headless eclipse. @@ -465,8 +465,8 @@ public class ToolFactory { * used to tokenize some source in a Java aware way. * Here is a typical scanning loop: * - * <code> * <pre> + * <code> * IScanner scanner = ToolFactory.createScanner(false, false, false, false); * scanner.setSource("int i = 0;".toCharArray()); * while (true) { @@ -474,8 +474,8 @@ public class ToolFactory { * if (token == ITerminalSymbols.TokenNameEOF) break; * System.out.println(token + " : " + new String(scanner.getCurrentTokenSource())); * } - * </pre> * </code> + * </pre> * * <p>By default the compliance used to create the scanner is the workspace's compliance when running inside the IDE * or 1.4 if running from outside of a headless eclipse. @@ -522,8 +522,8 @@ public class ToolFactory { * used to tokenize some source in a Java aware way. * Here is a typical scanning loop: * - * <code> * <pre> + * <code> * IScanner scanner = ToolFactory.createScanner(false, false, false, false); * scanner.setSource("int i = 0;".toCharArray()); * while (true) { @@ -531,8 +531,8 @@ public class ToolFactory { * if (token == ITerminalSymbols.TokenNameEOF) break; * System.out.println(token + " : " + new String(scanner.getCurrentTokenSource())); * } - * </pre> * </code> + * </pre> * * @param tokenizeComments if set to <code>false</code>, comments will be silently consumed * @param tokenizeWhiteSpace if set to <code>false</code>, white spaces will be silently consumed, diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/WorkingCopyOwner.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/WorkingCopyOwner.java index 9496e385a..ba7a912eb 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/WorkingCopyOwner.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/WorkingCopyOwner.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -136,7 +136,6 @@ public abstract class WorkingCopyOwner { * CompilationUnit cu = (CompilationUnit) parser.createAST(null); * assert cu.getProblems().length == 0; * </pre> - * </p> * * @param typeName the simple name of the type to lookup * @param packageName the dot-separated name of the package of type @@ -178,7 +177,7 @@ public abstract class WorkingCopyOwner { * </p><p> * A DOM AST created using this working copy will have bindings resolved using the given * classpath, and problem are reported to the given problem requestor. - * <p></p> + * </p><p> * <code>JavaCore#getOptions()</code> is used to create the DOM AST as it is not * possible to set the options on the non-existing Java project. * </p><p> @@ -231,7 +230,7 @@ public abstract class WorkingCopyOwner { * If a DOM AST is created using this working copy, then given classpath will be used * if bindings need to be resolved. Problems will be reported to the problem requestor * of the current working copy owner problem if it is not <code>null</code>. - * <p></p> + * </p><p> * Options used to create the DOM AST are got from {@link JavaCore#getOptions()} * as it is not possible to set the options on a non-existing Java project. * </p><p> diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/compiler/CompilationParticipant.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/compiler/CompilationParticipant.java index d4788a8e2..f996bc574 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/compiler/CompilationParticipant.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/compiler/CompilationParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2016 IBM Corporation and others. + * Copyright (c) 2005, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -109,7 +109,6 @@ public void cleanStarting(IJavaProject project) { * <pre> * javaProject.getProject().isOpen(); * </pre> - * </p> * @param project the project to participate in * @return whether this participant is active for a given project */ diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/eval/ICodeSnippetRequestor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/eval/ICodeSnippetRequestor.java index 435e2880f..9ae7369b5 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/eval/ICodeSnippetRequestor.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/eval/ICodeSnippetRequestor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -153,7 +153,6 @@ public boolean acceptClassFiles(byte[][] classFileBytes, String[][] classFileCom /** * Notifies of an evaluation problem. * Problems can arise for source of the following kinds: - * <p> * <ul> * <li>global variable (<code>VARIABLE</code>) - fragment source is name of * variable</li> @@ -165,7 +164,6 @@ public boolean acceptClassFiles(byte[][] classFileBytes, String[][] classFileCom * package declaration</li> * <li>other (<code>INTERNAL</code>) - no fragment source is involved, internal error occurred.</li> * </ul> - * </p> * @param problemMarker the problem marker (cannot be null) * @param fragmentSource the fragment source * @param fragmentKind the kind of source fragment; one of: diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/eval/IEvaluationContext.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/eval/IEvaluationContext.java index a5f800144..4f14cd522 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/eval/IEvaluationContext.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/eval/IEvaluationContext.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -26,6 +26,7 @@ import org.eclipse.jdt.core.JavaModelException; * A code snippet is pretty much any valid piece of Java code that could be * pasted into the body of a method and compiled. However, there are two * areas where the rules are slightly more liberal. + * </p> * <p> * First, a code snippet can return heterogeneous types. Inside the same code * snippet an <code>int</code> could be returned on one line, and a @@ -42,7 +43,6 @@ import org.eclipse.jdt.core.JavaModelException; * } * </code> * </pre> - * </p> * <p> * Second, if the last statement is only an expression, the <code>return</code> * keyword is implied. For example, the following returns <code>false</code>: @@ -52,7 +52,6 @@ import org.eclipse.jdt.core.JavaModelException; * i == 2 * </code> * </pre> - * </p> * <p> * Global variables are an additional feature of evaluation contexts. Within an * evaluation context, global variables maintain their value across evaluations. @@ -80,7 +79,6 @@ import org.eclipse.jdt.core.JavaModelException; * context.evaluateCodeSnippet(codeSnippet, requestor, progressMonitor); * </code> * </pre> - * </p> * <p> * <code>IJavaProject.newEvaluationContext</code> can be used to obtain an * instance. @@ -187,7 +185,6 @@ public interface IEvaluationContext { * <p> * Note that code completion does not involve evaluation. * <p> - * <p> * If {@link IProgressMonitor} is not <code>null</code> then some proposals which * can be very long to compute are proposed. To avoid that the code assist operation * take too much time a {@link IProgressMonitor} which automatically cancel the code @@ -275,7 +272,6 @@ public interface IEvaluationContext { * <p> * Note that code completion does not involve evaluation. * <p> - * <p> * If {@link IProgressMonitor} is not <code>null</code> then some proposals which * can be very long to compute are proposed. To avoid that the code assist operation * take too much time a {@link IProgressMonitor} which automatically cancel the code @@ -395,7 +391,6 @@ public interface IEvaluationContext { * <li>retrieve the values of the local variables, * <li>retrieve the returned value of the code snippet * </ol> - * </p> * <p> * This method is long-running; progress and cancellation are provided * by the given progress monitor. diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMNode.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMNode.java index 9ca9be23c..2bf5fa5dc 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMNode.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -48,7 +48,6 @@ import org.eclipse.jdt.core.IJavaElement; * <li>add/insert - this splices an un-parented DF (one that has been cloned, removed, or created stand-alone), * into an existing DF such that the newly inserted DF is only dependent on its new host.</li> * </ul> - * </p> * <p> * Wherever types are specified in DOM APIs, type names must be specified as they would appear * in source code. The DOM does not have a notion of type signatures, only raw text. Example type diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/CompilationUnitSorter.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/CompilationUnitSorter.java index 23f801453..c4a942990 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/CompilationUnitSorter.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/CompilationUnitSorter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -84,7 +84,6 @@ public final class CompilationUnitSorter { * Integer i2 = (Integer) b2.getProperty(RELATIVE_ORDER); * return i1.intValue() - i2.intValue(); // preserve original order * </pre> - * </p> * * @see #sort(ICompilationUnit, int[], Comparator, int, IProgressMonitor) * @see org.eclipse.jdt.core.dom.BodyDeclaration @@ -127,34 +126,35 @@ public final class CompilationUnitSorter { * The body declarations passed as parameters to the comparator * always carry at least the following minimal signature information: * <br> - * <table border="1" width="80%" cellpadding="5"> + * <table border="1"> * <tr> - * <td width="20%"><code>TypeDeclaration</code></td> - * <td width="50%"><code>modifiers, isInterface, name, superclass, + * <td><code>TypeDeclaration</code></td> + * <td><code>modifiers, isInterface, name, superclass, * superInterfaces<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>FieldDeclaration</code></td> - * <td width="50%"><code>modifiers, type, fragments + * <td><code>FieldDeclaration</code></td> + * <td><code>modifiers, type, fragments * (VariableDeclarationFragments * with name only)<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>MethodDeclaration</code></td> - * <td width="50%"><code>modifiers, isConstructor, returnType, name, + * <td><code>MethodDeclaration</code></td> + * <td><code>modifiers, isConstructor, returnType, name, * parameters * (SingleVariableDeclarations with name and type only), * thrownExceptions<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>Initializer</code></td> - * <td width="50%"><code>modifiers<br> + * <td><code>Initializer</code></td> + * <td><code>modifiers<br> * RELATIVE_ORDER property</code></td> * </tr> * </table> + * <p> * Clients should not rely on the AST nodes being properly parented or on * having source range information. (Future releases may provide options * for requesting additional information like source positions, full ASTs, @@ -242,51 +242,51 @@ public final class CompilationUnitSorter { * The body declarations passed as parameters to the comparator * always carry at least the following minimal signature information: * <br> - * <table border="1" width="80%" cellpadding="5"> + * <table border="1"> * <tr> - * <td width="20%"><code>TypeDeclaration</code></td> - * <td width="50%"><code>modifiers, isInterface, name, superclass, + * <td><code>TypeDeclaration</code></td> + * <td><code>modifiers, isInterface, name, superclass, * superInterfaces, typeParameters<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>FieldDeclaration</code></td> - * <td width="50%"><code>modifiers, type, fragments + * <td><code>FieldDeclaration</code></td> + * <td><code>modifiers, type, fragments * (VariableDeclarationFragments * with name only)<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>MethodDeclaration</code></td> - * <td width="50%"><code>modifiers, isConstructor, returnType, name, + * <td><code>MethodDeclaration</code></td> + * <td><code>modifiers, isConstructor, returnType, name, * typeParameters, parameters * (SingleVariableDeclarations with name, type, and modifiers only), * thrownExceptions<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>Initializer</code></td> - * <td width="50%"><code>modifiers<br> + * <td><code>Initializer</code></td> + * <td><code>modifiers<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>AnnotationTypeDeclaration</code></td> - * <td width="50%"><code>modifiers, name<br> + * <td><code>AnnotationTypeDeclaration</code></td> + * <td><code>modifiers, name<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>AnnotationTypeMemberDeclaration</code></td> - * <td width="50%"><code>modifiers, name, type, default<br> + * <td><code>AnnotationTypeMemberDeclaration</code></td> + * <td><code>modifiers, name, type, default<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>EnumDeclaration</code></td> - * <td width="50%"><code>modifiers, name, superInterfaces<br> + * <td><code>EnumDeclaration</code></td> + * <td><code>modifiers, name, superInterfaces<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>EnumConstantDeclaration</code></td> - * <td width="50%"><code>modifiers, name, arguments<br> + * <td><code>EnumConstantDeclaration</code></td> + * <td><code>modifiers, name, arguments<br> * RELATIVE_ORDER property</code></td> * </tr> * </table> @@ -294,7 +294,6 @@ public final class CompilationUnitSorter { * having source range information. (Future releases may provide options * for requesting additional information like source positions, full ASTs, * non-recursive sorting, etc.) - * </p> * * @param level the AST level; one of the <code>{@link AST}.JLS*</code> constants * @param compilationUnit the given compilation unit, which must be a @@ -371,55 +370,54 @@ public final class CompilationUnitSorter { * <p> * The body declarations passed as parameters to the comparator always carry * at least the following minimal signature information: <br> - * <table border="1" width="80%" cellpadding="5"> + * <table border="1"> * <tr> - * <td width="20%"><code>TypeDeclaration</code></td> - * <td width="50%"><code>modifiers, isInterface, name, superclass, + * <td><code>TypeDeclaration</code></td> + * <td><code>modifiers, isInterface, name, superclass, * superInterfaces, typeParameters<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>FieldDeclaration</code></td> - * <td width="50%"><code>modifiers, type, fragments + * <td><code>FieldDeclaration</code></td> + * <td><code>modifiers, type, fragments * (VariableDeclarationFragments * with name only)<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>MethodDeclaration</code></td> - * <td width="50%"><code>modifiers, isConstructor, returnType, name, + * <td><code>MethodDeclaration</code></td> + * <td><code>modifiers, isConstructor, returnType, name, * typeParameters, parameters * (SingleVariableDeclarations with name, type, and modifiers only), * thrownExceptions<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>Initializer</code></td> - * <td width="50%"><code>modifiers<br> + * <td><code>Initializer</code></td> + * <td><code>modifiers<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>AnnotationTypeDeclaration</code></td> - * <td width="50%"><code>modifiers, name<br> + * <td><code>AnnotationTypeDeclaration</code></td> + * <td><code>modifiers, name<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>AnnotationTypeMemberDeclaration</code></td> - * <td width="50%"><code>modifiers, name, type, default<br> + * <td><code>AnnotationTypeMemberDeclaration</code></td> + * <td><code>modifiers, name, type, default<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>EnumDeclaration</code></td> - * <td width="50%"><code>modifiers, name, superInterfaces<br> + * <td><code>EnumDeclaration</code></td> + * <td><code>modifiers, name, superInterfaces<br> * RELATIVE_ORDER property</code></td> * </tr> * <tr> - * <td width="20%"><code>EnumConstantDeclaration</code></td> - * <td width="50%"><code>modifiers, name, arguments<br> + * <td><code>EnumConstantDeclaration</code></td> + * <td><code>modifiers, name, arguments<br> * RELATIVE_ORDER property</code></td> * </tr> * </table> - * </p> * * @param unit * the CompilationUnit to sort diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/ExternalAnnotationUtil.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/ExternalAnnotationUtil.java index 53d63ea1f..301b4e5bd 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/ExternalAnnotationUtil.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/ExternalAnnotationUtil.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015, 2016 GK Software AG. + * Copyright (c) 2015, 2019 GK Software AG. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -612,7 +612,7 @@ public final class ExternalAnnotationUtil { * <li>prefix up-to the changed type</li> * <li>original type</li> * <li>changed type</li> - * <li>postfix after the changed type <em>(here: empty string)</li> + * <li>postfix after the changed type <em>(here: empty string)</em></li> * </ul> */ public static String[] annotateType(String originalSignature, String annotatedType, MergeStrategy mergeStrategy) @@ -639,7 +639,7 @@ public final class ExternalAnnotationUtil { * <li>prefix up-to the changed type</li> * <li>original type</li> * <li>changed type</li> - * <li>postfix after the changed type <em>(here: empty string)</li> + * <li>postfix after the changed type <em>(here: empty string)</em></li> * </ul> */ public static String[] annotateReturnType(String originalSignature, String annotatedType, MergeStrategy mergeStrategy) diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IStackMapFrame.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IStackMapFrame.java index e6033f684..0f2534c60 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IStackMapFrame.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IStackMapFrame.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -26,8 +26,8 @@ public interface IStackMapFrame { * Answer back the frame type for this entry. * <table> * <tr> - * <th align="left">Type</th> - * <th align="left">Range</th> + * <th>Type</th> + * <th>Range</th> * </tr> * <tr> * <td>SAME</td> diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/AbstractModule.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/AbstractModule.java index 61316949c..761778fc1 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/AbstractModule.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/AbstractModule.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2018 IBM Corporation and others. + * Copyright (c) 2017, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.jdt.internal.core; +import java.util.ArrayList; import java.util.Arrays; import org.eclipse.jdt.core.IJavaElement; @@ -88,9 +89,29 @@ public interface AbstractModule extends IModuleDescription { default IService[] getProvidedServices() throws JavaModelException { return getModuleInfo().provides(); } + @Override + default String[] getProvidedServiceNames() throws JavaModelException { + ArrayList<String> results = new ArrayList<>(); + IService[] services = getProvidedServices(); + for (IService service : services) { + results.add(new String(service.name())); + } + return results.toArray(new String[0]); + + } default char[][] getUsedServices() throws JavaModelException { return getModuleInfo().uses(); } + @Override + default String[] getUsedServiceNames() throws JavaModelException { + ArrayList<String> results = new ArrayList<>(); + char[][] services = getUsedServices(); + for (int i = 0; i < services.length; ++i) { + char[] service = services[i]; + results.add(new String(service)); + } + return results.toArray(new String[0]); + } default IPackageExport[] getOpenedPackages() throws JavaModelException { return getModuleInfo().opens(); } diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java index c79788ebc..45f3ceed4 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java @@ -2292,7 +2292,7 @@ public class JavaModelManager implements ISaveParticipant, IContentTypeChangeLis monitor.subTask(Messages.bind(Messages.build_readStateProgress, project.getName())); info.savedState = readState(project); } catch (CoreException e) { - e.printStackTrace(); + Util.log(e, "Exception while reading last build state for: " + project); //$NON-NLS-1$ } } return info.savedState; diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SearchableEnvironment.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SearchableEnvironment.java index 4bc371272..0f7c5d756 100644 --- a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SearchableEnvironment.java +++ b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SearchableEnvironment.java @@ -107,6 +107,15 @@ public class SearchableEnvironment this.moduleUpdater.computeModuleUpdates(entry); } } + + /** + * Note: this is required for (abandoned) Scala-IDE + */ + @Deprecated + public SearchableEnvironment(JavaProject project, WorkingCopyOwner owner) throws JavaModelException { + this(project, owner, false); + } + /** * Creates a SearchableEnvironment on the given project */ |