From a91b3de04b9caf10e2ad06cb0b2f001421af8094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Galland?= Date: Fri, 31 Jan 2020 16:31:38 +0100 Subject: [PATCH] [lang] Remove reference to JDT in "io.sarl.lang" module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Galland --- main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF | 4 +--- .../coreplugins/io.sarl.lang/src/io/sarl/lang/util/Utils.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF b/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF index 00b5e3dc5d..a4a9582d33 100644 --- a/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF +++ b/main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF @@ -18,13 +18,11 @@ Require-Bundle: io.sarl.lang.core;bundle-version="0.11.0";visibility:=reexport, org.eclipse.osgi;bundle-version="3.15.100", org.antlr.runtime;bundle-version="3.2.0", org.objectweb.asm;bundle-version="7.2.0";resolution:=optional, - org.eclipse.jdt.core;bundle-version="3.20.0", org.eclipse.emf.ecore;bundle-version="2.20.0", org.eclipse.emf.common;bundle-version="2.17.0", - org.eclipse.core.runtime;bundle-version="3.17.0", com.google.inject;bundle-version="4.1.0", org.apache.commons.io;bundle-version="2.6.0", - slf4j.api;bundle-version="2.0.0" + org.eclipse.core.runtime;bundle-version="3.17.0" Bundle-Activator: io.sarl.lang.SARLLangActivator Export-Package: io.sarl.lang, io.sarl.lang.bugfixes.pending.bug621, diff --git a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/util/Utils.java b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/util/Utils.java index 17de8534a6..c33097c0ab 100644 --- a/main/coreplugins/io.sarl.lang/src/io/sarl/lang/util/Utils.java +++ b/main/coreplugins/io.sarl.lang/src/io/sarl/lang/util/Utils.java @@ -44,7 +44,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.jdt.core.Flags; import org.eclipse.xtend.core.jvmmodel.XtendJvmModelInferrer; import org.eclipse.xtend.core.xtend.XtendFunction; import org.eclipse.xtend.core.xtend.XtendMember; @@ -1457,7 +1456,7 @@ public static String dump(Object object, boolean includeStaticField) { boolean firstRound = true; for (final Field field : fields) { - if (!includeStaticField && Flags.isStatic(field.getModifiers())) { + if (!includeStaticField && Modifier.isStatic(field.getModifiers())) { continue; } if (!firstRound) {