Bug 526040: Merge Java 9 related changes from JDT
- fix compile errors in OT plugins
diff --git a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/AdaptorActivator.java b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/AdaptorActivator.java
index d810120..b5d54c0 100644
--- a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/AdaptorActivator.java
+++ b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/AdaptorActivator.java
@@ -200,7 +200,7 @@
 		void enhanceCPEntries(IClasspathEntry[] resolvedEntries) 
 			<- before void computePackageFragmentRoots(IClasspathEntry[] resolvedEntries, ObjectVector accumulatedRoots,
 													   HashSet rootIDs, IClasspathEntry referringEntry,
-													   boolean retrieveExportedRoots, Map rootToResolvedEntries);
+													   boolean retrieveExportedRoots, boolean filterModuleRoots, Map rootToResolvedEntries);
 
 		/**
 		 * @param entries the entries whose access rules to enhance
diff --git a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/RoleReuseGuard.java b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/RoleReuseGuard.java
index 6345187..8c92af6 100644
--- a/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/RoleReuseGuard.java
+++ b/plugins/org.eclipse.objectteams.otdt.compiler.adaptor/src/org/eclipse/objectteams/otdt/internal/compiler/adaptor/RoleReuseGuard.java
@@ -20,6 +20,7 @@
 import org.eclipse.jdt.internal.compiler.classfmt.ClassFileStruct;
 import org.eclipse.jdt.internal.compiler.env.AccessRestriction;
 import org.eclipse.jdt.internal.compiler.env.IBinaryType;
+import org.eclipse.jdt.internal.compiler.lookup.ModuleBinding;
 import org.eclipse.jdt.internal.compiler.lookup.PackageBinding;
 import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
 import org.eclipse.objectteams.otdt.core.compiler.IOTConstants;
@@ -119,7 +120,7 @@
 	
 	protected class SafeEnvironment playedBy LookupEnvironment {
 		ReferenceBinding askForType(char[][] typeName) 
-			<- replace ReferenceBinding askForType(char[][] typeName);
+			<- replace ReferenceBinding askForType(char[][] typeName, ModuleBinding module);
 		@SuppressWarnings("basecall")
 		callin ReferenceBinding askForType(char[][] typeName) {
 			try {