EDIT: Support for Eclipse 2020-06.

tsaglam · tsaglam · commit 2ed3db291b01 · 2020-06-18T10:55:34.000+02:00
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -5,22 +5,22 @@ Bundle-SymbolicName: JavaCodeEcorification;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
- org.eclipse.emf.ecore;bundle-version="2.12.0",
- org.eclipse.emf.ecore.xmi;bundle-version="2.12.0",
- org.eclipse.core.resources;bundle-version="3.11.0",
- org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.jdt.core;bundle-version="3.12.1",
- org.eclipse.jdt.launching;bundle-version="3.8.100",
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.launching,
  org.junit,
- org.apache.log4j;bundle-version="1.2.15",
- org.eclipse.emf.importer.ecore;bundle-version="2.8.0",
- org.eclipse.emf.codegen.ecore;bundle-version="2.12.0",
+ org.apache.log4j,
+ org.eclipse.emf.importer.ecore,
+ org.eclipse.emf.codegen.ecore,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtend.lib,
  org.eclipse.xtend.lib.macro,
- EcoreMetamodelExtraction;bundle-version="1.0.0",
+ EcoreMetamodelExtraction,
  org.eclipse.text,
- org.eclipse.pde.core;bundle-version="3.11.1",
+ org.eclipse.pde.core,
  org.eclipse.jdt.ui,
  org.eclipse.ltk.core.refactoring,
  org.eclipse.swt,
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ This process is depicted in the following diagram:
 ## How to install:
 1. Clone or download the project.
 2. Import as existing project into the Eclipse IDE.
-3. Do the steps one and two of the [EcoreMetamodelExtraction project](https://github.com/tsaglam/EcoreMetamodelExtraction) installation instructions (use Eclipse 2018-09 or newer, Oxygen is no longer supported).
-4. You need the Eclipse Modeling Framework, the Eclipse Java Development Tools, the Eclipse Plug-in Development Environment, the Xtend IDE and [XAnnotations](https://github.com/kit-sdq/XAnnotations). Make sure that all five are installed.
+3. Do the steps one and two of the [EcoreMetamodelExtraction project](https://github.com/tsaglam/EcoreMetamodelExtraction) installation instructions (use Eclipse 2018-09 or newer, Oxygen is no longer supported, tested up to Eclipse 2020-06).
+4. You need the Eclipse Modeling Framework, the Eclipse Java Development Tools, the Eclipse Plug-in Development Environment, the Xtend IDE, [XAnnotations](https://github.com/kit-sdq/XAnnotations), and log4j. Make sure that all of them are installed.
 5. Run the project as Eclipse Application.
 6. You can start the extraction from the context menu of a Java project (provisional UI).
diff --git a/src/main/java/jce/codemanipulation/ImportOrganizer.java b/src/main/java/jce/codemanipulation/ImportOrganizer.java
@@ -36,7 +36,7 @@ public ImportOrganizer(EcorificationProperties properties) {
     @Override
     protected void manipulate(ICompilationUnit unit) throws JavaModelException {
         unit.becomeWorkingCopy(monitor); // changes unit handle to working copy
-        CompilationUnit reconciledUnit = unit.reconcile(AST.JLS10, false, null, monitor);
+        CompilationUnit reconciledUnit = unit.reconcile(AST.JLS14 , false, null, monitor);
         try {
             OrganizeImportsOperation operation = new OrganizeImportsOperation(unit, reconciledUnit, true, true, true, null);
             TextEdit edit = operation.createTextEdit(monitor);
