Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2020-04-11 12:28:09 +0000
committerStephan Herrmann2020-04-11 12:28:09 +0000
commitc4606e8c36137ec06dbe7f751e5a1b6fe3148e55 (patch)
treec4e3c0787b3b203dc4cd5446a35f0229a343bb5a /org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env
parentbcd16035e3129a4b2ef22ffacae59d6a5ab65085 (diff)
downloadorg.eclipse.objectteams-c4606e8c36137ec06dbe7f751e5a1b6fe3148e55.tar.gz
org.eclipse.objectteams-c4606e8c36137ec06dbe7f751e5a1b6fe3148e55.tar.xz
org.eclipse.objectteams-c4606e8c36137ec06dbe7f751e5a1b6fe3148e55.zip
Remove trailing whitespace on all lines
- manually replays JDT's 560451
Diffstat (limited to 'org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env')
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/AutomaticModuleNaming.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryTypeAnnotation.java14
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ICompilationUnit.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModule.java14
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModuleAwareNameEnvironment.java10
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModulePathEntry.java14
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IMultiModuleEntry.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/INameEnvironmentExtension.java8
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ITypeAnnotationWalker.java6
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IUpdatableModule.java16
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ModuleReferenceImpl.java2
-rw-r--r--org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/NameEnvironmentAnswer.java10
13 files changed, 51 insertions, 51 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/AutomaticModuleNaming.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/AutomaticModuleNaming.java
index 815bc96c2..3a624edcb 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/AutomaticModuleNaming.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/AutomaticModuleNaming.java
@@ -84,7 +84,7 @@ public class AutomaticModuleNaming {
* Determine the automatic module name if no "Automatic-Module-Name" was found in the Manifest, as specified in
* {@link <a href=
* "http://download.java.net/java/jdk9/docs/api/java/lang/module/ModuleFinder.html#of-java.nio.file.Path...-">ModuleFinder.of</a>}
- *
+ *
* @param name
* the filename (or directory name)
* @param skipDirectory
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java
index 9c2dd6707..0fb5989e3 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryType.java
@@ -182,7 +182,7 @@ ExternalAnnotationStatus getExternalAnnotationStatus();
* Answers the "real" binary type for the given binary type.
* By default this is an identity transformation.
* Only IndexBinaryType will retrieve the bytes from disk to answer a fresh ClassFileReader.
- * @throws Exception
+ * @throws Exception
*/
default IBinaryType withClassBytes() throws Exception {
return this;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryTypeAnnotation.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryTypeAnnotation.java
index 2038cbc8e..1910b7555 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryTypeAnnotation.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryTypeAnnotation.java
@@ -20,7 +20,7 @@ import org.eclipse.jdt.internal.compiler.codegen.AnnotationTargetTypeConstants;
* This represents class file information about an annotation instance.
*/
public interface IBinaryTypeAnnotation {
-
+
static int[] NO_TYPE_PATH = new int[0];
/**
@@ -34,42 +34,42 @@ IBinaryAnnotation getAnnotation();
int getTargetType();
/**
- *
+ *
* @return the raw type path data, each pair of ints is a type path entry
*/
int[] getTypePath();
/**
* Applicable for target type 0x10(CLASS_EXTENDS)
- *
+ *
* @return the supertype index. -1 (65535) for superclass, 0..n for superinterfaces
*/
int getSupertypeIndex();
/**
* Applicable for target type 0x00(CLASS_TYPE_PARAMETER), 0x01(METHOD_TYPE_PARAMETER)
- *
+ *
* @return the type parameter index (0 based)
*/
int getTypeParameterIndex();
/**
* Applicable for target type 0x11(CLASS_TYPE_PARAMETER_BOUND), 0x12(METHOD_TYPE_PARAMETER_BOUND)
- *
+ *
* @return the bound index
*/
int getBoundIndex();
/**
* Applicable for target type 0x16(METHOD_FORMAL_PARAMETER)
- *
+ *
* @return the method formal parameter index
*/
int getMethodFormalParameterIndex();
/**
* Applicable for target type 0x17(THROWS)
- *
+ *
* @return the throws type index
*/
int getThrowsTypeIndex();
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ICompilationUnit.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ICompilationUnit.java
index a27574e55..24bd52d73 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ICompilationUnit.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ICompilationUnit.java
@@ -18,7 +18,7 @@ import org.eclipse.jdt.internal.compiler.lookup.ModuleBinding;
/**
* This interface denotes a compilation unit, providing its name and content.
- *
+ *
* <p>
* Note: This internal interface has been implemented illegally by the
* org.apache.jasper.glassfish bundle from Orbit, see
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModule.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModule.java
index bd417f0f5..11998aa7c 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModule.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModule.java
@@ -70,7 +70,7 @@ public interface IModule {
public char[] name();
char[][] with();
}
-
+
public default boolean isAutomatic() {
return false;
}
@@ -92,32 +92,32 @@ public interface IModule {
public char[] name() {
return this.name;
}
-
+
@Override
public IModuleReference[] requires() {
return IModule.NO_MODULE_REFS;
}
-
+
@Override
public IPackageExport[] exports() {
return IModule.NO_EXPORTS;
}
-
+
@Override
public char[][] uses() {
return IModule.NO_USES;
}
-
+
@Override
public IService[] provides() {
return IModule.NO_PROVIDES;
}
-
+
@Override
public IPackageExport[] opens() {
return NO_OPENS;
}
-
+
@Override
public boolean isAutomatic() {
return true;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModuleAwareNameEnvironment.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModuleAwareNameEnvironment.java
index 539caaba7..cbc554ee0 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModuleAwareNameEnvironment.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModuleAwareNameEnvironment.java
@@ -72,7 +72,7 @@ public interface IModuleAwareNameEnvironment extends INameEnvironment {
public <T> boolean matches(T elem, Predicate<T> isNamed) {
return matchesWithName(elem, isNamed, t -> true);
}
-
+
/** Get the lookup strategy corresponding to the given module name. */
public static LookupStrategy get(char[] moduleName) {
if (moduleName == ModuleBinding.ANY)
@@ -91,7 +91,7 @@ public interface IModuleAwareNameEnvironment extends INameEnvironment {
}
}
}
-
+
@Override
default NameEnvironmentAnswer findType(char[][] compoundTypeName) {
return findType(compoundTypeName, ModuleBinding.ANY);
@@ -121,7 +121,7 @@ public interface IModuleAwareNameEnvironment extends INameEnvironment {
return allNames;
}
-
+
/**
* Answer whether the given package (within the given module) contains any compilation unit.
* @param qualifiedPackageName
@@ -129,7 +129,7 @@ public interface IModuleAwareNameEnvironment extends INameEnvironment {
* @return true iff the package contains at least one compilation unit.
*/
boolean hasCompilationUnit(char[][] qualifiedPackageName, char[] moduleName, boolean checkCUs);
-
+
/** Get the module with the given name, which must denote a named module. */
IModule getModule(char[] moduleName);
char[][] getAllAutomaticModules();
@@ -142,7 +142,7 @@ public interface IModuleAwareNameEnvironment extends INameEnvironment {
default void applyModuleUpdates(IUpdatableModule module, IUpdatableModule.UpdateKind kind) { /* default: do nothing */ }
/**
- * Lists all packages in the module identified by the given, real module name
+ * Lists all packages in the module identified by the given, real module name
* (i.e., this method is implemented only for {@link LookupStrategy#Named}).
* @param moduleName
* @return array of flat, dot-separated package names
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModulePathEntry.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModulePathEntry.java
index 86f24f73a..e5eb40c0d 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModulePathEntry.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IModulePathEntry.java
@@ -25,18 +25,18 @@ public interface IModulePathEntry {
/**
* Get the module that this entry contributes. May be null, for instance when this entry does not
* represent a single module
- *
+ *
* @return The module that this entry contributes or null
*/
default IModule getModule() {
return null;
}
-
+
/**
* Get the module named name from this entry. May be null
- *
+ *
* @param name - The name of the module to look up
- *
+ *
* @return The module named name or null
*/
default IModule getModule(char[] name) {
@@ -48,9 +48,9 @@ public interface IModulePathEntry {
/**
* Indicates whether this entry knows the module named name and can answer queries regarding the module
- *
+ *
* @param name The name of the module
- *
+ *
* @return True if this entry knows the module, false otherwise
*/
default boolean servesModule(char[] name) {
@@ -84,7 +84,7 @@ public interface IModulePathEntry {
/**
* Specifies whether this entry represents an automatic module.
- *
+ *
* @return true if this is an automatic module, false otherwise
*/
public default boolean isAutomaticModule() {
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IMultiModuleEntry.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IMultiModuleEntry.java
index 1d48ff940..ca0b105f6 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IMultiModuleEntry.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IMultiModuleEntry.java
@@ -23,7 +23,7 @@ import java.util.Collection;
public interface IMultiModuleEntry extends IModulePathEntry {
/**
- * Get the module named name that this entry contributes to the module path
+ * Get the module named name that this entry contributes to the module path
*/
@Override
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/INameEnvironmentExtension.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/INameEnvironmentExtension.java
index 5fd197078..986fc82d8 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/INameEnvironmentExtension.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/INameEnvironmentExtension.java
@@ -7,7 +7,7 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -18,10 +18,10 @@ package org.eclipse.jdt.internal.compiler.env;
* can use to look up types, compilation units, and packages in the
* current environment. The name environment is passed to the compiler
* on creation.
- *
+ *
* This name environment adds a method to switch on/off the search for secondary types.
* Refer {@link #findType(char[], char[][], boolean)}.
- *
+ *
*/
public interface INameEnvironmentExtension extends INameEnvironment {
/**
@@ -48,7 +48,7 @@ public interface INameEnvironmentExtension extends INameEnvironment {
* @return {@link NameEnvironmentAnswer}
*/
NameEnvironmentAnswer findType(char[] typeName, char[][] packageName, boolean searchWithSecondaryTypes, char[] moduleName);
-
+
default NameEnvironmentAnswer findType(char[] typeName, char[][] packageName, boolean searchWithSecondaryTypes) {
return findType(typeName, packageName, searchWithSecondaryTypes, null);
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ITypeAnnotationWalker.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ITypeAnnotationWalker.java
index cc846adcc..7c3a7835b 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ITypeAnnotationWalker.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ITypeAnnotationWalker.java
@@ -18,7 +18,7 @@ package org.eclipse.jdt.internal.compiler.env;
* A TypeAnnotationWalker is initialized with all type annotations found at a given element.
* It can be used to walk into the types at the given element and finally answer the
* actual annotations at any node of the walk.
- *
+ *
* The walker is implemented as immutable objects. During the walk either new instances
* are created, or the current instance is shared if no difference is encountered.
*/
@@ -90,13 +90,13 @@ public interface ITypeAnnotationWalker {
/**
* Detail of {@link #toTypeParameterBounds(boolean, int)}: walk to the bounds
- * of the previously selected type parameter.
+ * of the previously selected type parameter.
* @param boundIndex
*/
public abstract ITypeAnnotationWalker toTypeBound(short boundIndex);
/** Walk to the specified supertype either index based or name based:
- * @param index -1 is superclass, else index into the list of superinterfaces
+ * @param index -1 is superclass, else index into the list of superinterfaces
* @param superTypeSignature name and type arguments of the super type to visit
*/
public abstract ITypeAnnotationWalker toSupertype(short index, char[] superTypeSignature);
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IUpdatableModule.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IUpdatableModule.java
index 0704eefe9..82e3bd10c 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IUpdatableModule.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IUpdatableModule.java
@@ -45,15 +45,15 @@ public interface IUpdatableModule {
public void accept(IUpdatableModule t) {
t.addExports(this.name, this.targets);
}
-
+
public char[] getName() {
return this.name;
}
-
+
public char[][] getTargetModules() {
return this.targets;
}
-
+
public UpdateKind getKind() {
return UpdateKind.PACKAGE;
}
@@ -62,7 +62,7 @@ public interface IUpdatableModule {
if (this == other) return true;
if (!(other instanceof AddExports)) return false;
AddExports pu = (AddExports) other;
-
+
if (!CharOperation.equals(this.name, pu.name))
return false;
if (!CharOperation.equals(this.targets, pu.targets))
@@ -80,11 +80,11 @@ public interface IUpdatableModule {
return hash;
}
}
-
+
class AddReads implements Consumer<IUpdatableModule> {
char[] targetModule;
-
+
public AddReads(char[] target) {
this.targetModule = target;
}
@@ -93,11 +93,11 @@ public interface IUpdatableModule {
// TODO Auto-generated method stub
t.addReads(this.targetModule);
}
-
+
public char[] getTarget() {
return this.targetModule;
}
-
+
public UpdateKind getKind() {
return UpdateKind.MODULE;
}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ModuleReferenceImpl.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ModuleReferenceImpl.java
index 6af1a826e..cdc69584c 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ModuleReferenceImpl.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ModuleReferenceImpl.java
@@ -24,7 +24,7 @@ public class ModuleReferenceImpl implements IModule.IModuleReference {
}
@Override
public boolean equals(Object o) {
- if (this == o)
+ if (this == o)
return true;
if (!(o instanceof IModule.IModuleReference))
return false;
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/NameEnvironmentAnswer.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/NameEnvironmentAnswer.java
index b11078dfe..6f6496c40 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/NameEnvironmentAnswer.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/NameEnvironmentAnswer.java
@@ -55,7 +55,7 @@ public class NameEnvironmentAnswer {
this.externalAnnotationPath = externalAnnotationPath;
this.moduleName = module;
}
-
+
public NameEnvironmentAnswer(ReferenceBinding binding, ModuleBinding module) {
this.binding = binding;
this.moduleBinding = module;
@@ -86,7 +86,7 @@ public class NameEnvironmentAnswer {
}
return baseString;
}
-
+
/**
* Returns the associated access restriction, or null if none.
*/
@@ -167,10 +167,10 @@ public class NameEnvironmentAnswer {
public boolean ignoreIfBetter() {
return this.accessRestriction != null && this.accessRestriction.ignoreIfBetter();
}
-
- /**
+
+ /**
* Name of the module to which the CU in this answer is associated.
- * {@code null} when associated to the unnamed module.
+ * {@code null} when associated to the unnamed module.
* @return module name or {@code null}
*/
public char[] moduleName() {

Back to the top