commit ba5120788768a37859ecdf524633aaefacd7bd6b
author Matthias Villiger <mvi@bsi-software.com> Fri Sep 22 17:21:14 2017 +0200
committer Matthias Villiger <mvi@bsi-software.com> Fri Sep 22 17:21:14 2017 +0200
tree 2f79e28ef54294c08af81537a1fd2d6b78805f3e
parent 5b69be2c8a6f699e78a5cc41acda69fed7e51222

Adapt signature of superHasCompilationUnit to newest API change in JDT

org.eclipse.scout.sdk.core/src/main/java/org/eclipse/scout/sdk/core/model/spi/internal/FileSystemWithOverride.java

diff --git a/org.eclipse.scout.sdk.core/src/main/java/org/eclipse/scout/sdk/core/model/spi/internal/FileSystemWithOverride.java b/org.eclipse.scout.sdk.core/src/main/java/org/eclipse/scout/sdk/core/model/spi/internal/FileSystemWithOverride.java
index 2e60333..7ab9db1 100644
--- a/org.eclipse.scout.sdk.core/src/main/java/org/eclipse/scout/sdk/core/model/spi/internal/FileSystemWithOverride.java
+++ b/org.eclipse.scout.sdk.core/src/main/java/org/eclipse/scout/sdk/core/model/spi/internal/FileSystemWithOverride.java
@@ -85,7 +85,7 @@
   }
 
   // @Override // override of the Java9 version
-  public NameEnvironmentAnswer findType(char[][] compoundName, char[] moduleName) {
+  public NameEnvironmentAnswer findType(final char[][] compoundName, final char[] moduleName) {
     final NameEnvironmentAnswer answer = searchInOverrideSupport(compoundName);
     if (answer != null) {
       return answer;
@@ -93,7 +93,7 @@
     return superFindType(compoundName, moduleName); // super call using reflection for backwards compatibility
   }
 
-  private NameEnvironmentAnswer superFindType(char[][] compoundName, char[] moduleName) {
+  private NameEnvironmentAnswer superFindType(final char[][] compoundName, final char[] moduleName) {
     try {
       final MethodHandle superFindType = MethodHandles.lookup()
           .findSpecial(FileSystem.class,
@@ -102,13 +102,13 @@
               FileSystemWithOverride.class);
       return (NameEnvironmentAnswer) superFindType.invoke(this, compoundName, moduleName);
     }
-    catch (Throwable e) {
+    catch (final Throwable e) {
       throw new SdkException(e);
     }
   }
 
   //@Override // override of the Java9 version
-  public NameEnvironmentAnswer findType(char[] typeName, char[][] packageName, char[] moduleName) {
+  public NameEnvironmentAnswer findType(final char[] typeName, final char[][] packageName, final char[] moduleName) {
     final NameEnvironmentAnswer answer = searchInOverrideSupport(typeName, packageName);
     if (answer != null) {
       return answer;
@@ -116,7 +116,7 @@
     return superFindType(typeName, packageName, moduleName);
   }
 
-  private NameEnvironmentAnswer superFindType(char[] typeName, char[][] packageName, char[] moduleName) {
+  private NameEnvironmentAnswer superFindType(final char[] typeName, final char[][] packageName, final char[] moduleName) {
     try {
       final MethodHandle superFindType = MethodHandles.lookup()
           .findSpecial(FileSystem.class,
@@ -125,31 +125,31 @@
               FileSystemWithOverride.class);
       return (NameEnvironmentAnswer) superFindType.invoke(this, typeName, packageName, moduleName);
     }
-    catch (Throwable e) {
+    catch (final Throwable e) {
       throw new SdkException(e);
     }
   }
 
   // @Override // override of the Java9 version
-  public boolean hasCompilationUnit(char[][] qualifiedPackageName, char[] moduleName) {
-    for (ICompilationUnit icu : overrideSupport().getCompilationUnits()) {
+  public boolean hasCompilationUnit(final char[][] qualifiedPackageName, final char[] moduleName, final boolean checkCUs) {
+    for (final ICompilationUnit icu : overrideSupport().getCompilationUnits()) {
       if (CharOperation.equals(icu.getPackageName(), qualifiedPackageName)) {
         return true;
       }
     }
-    return superHasCompilationUnit(qualifiedPackageName, moduleName);
+    return superHasCompilationUnit(qualifiedPackageName, moduleName, checkCUs);
   }
 
-  private boolean superHasCompilationUnit(final char[][] qualifiedPackageName, char[] moduleName) {
+  private boolean superHasCompilationUnit(final char[][] qualifiedPackageName, final char[] moduleName, final boolean checkCUs) {
     try {
       final MethodHandle superHasCompilationUnit = MethodHandles.lookup()
           .findSpecial(FileSystem.class,
               "hasCompilationUnit",
-              MethodType.methodType(boolean.class, char[][].class, char[].class),
+              MethodType.methodType(boolean.class, char[][].class, char[].class, boolean.class),
               FileSystemWithOverride.class);
-      return (Boolean) superHasCompilationUnit.invoke(this, qualifiedPackageName, moduleName);
+      return (Boolean) superHasCompilationUnit.invoke(this, qualifiedPackageName, moduleName, checkCUs);
     }
-    catch (Throwable e) {
+    catch (final Throwable e) {
       throw new SdkException(e);
     }
   }