Skip to content

Validation Fixes for Recovered Elements #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HansMartinA wants to merge 2 commits into
base: 23_performance_measurements
Choose a base branch
from
Open

Validation Fixes for Recovered Elements #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb76077
During the trivial recovery, an empty name for packages and the artif…
HansMartinA Mar 31, 2024
c2b7f6e
Enum constants are also recovered by the trivial recovery.
HansMartinA Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions bundles/jamopp.resolution/src/jamopp/recovery/trivial/TrivialRecovery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.emftext.language.java.classifiers.Annotation;
import org.emftext.language.java.classifiers.ClassifiersFactory;
import org.emftext.language.java.classifiers.Enumeration;
import org.emftext.language.java.containers.CompilationUnit;
import org.emftext.language.java.containers.ContainersFactory;
import org.emftext.language.java.members.ClassMethod;
import org.emftext.language.java.members.EnumConstant;
import org.emftext.language.java.members.Field;
import org.emftext.language.java.members.InterfaceMethod;
import org.emftext.language.java.members.MembersFactory;
Expand All @@ -42,10 +44,12 @@ public class TrivialRecovery {
private Resource artificialResource;
private CompilationUnit artificialCU;
private org.emftext.language.java.classifiers.Class artificialClass;
private Enumeration artificialEnum;
private org.emftext.language.java.classifiers.Class objectClass;
private HashMap<String, org.emftext.language.java.classifiers.Class> artClasses = new HashMap<>();
private HashMap<String, Annotation> artAnnotations = new HashMap<>();
private HashMap<String, Field> artFields = new HashMap<>();
private HashMap<String, EnumConstant> artConstants = new HashMap<>();
private HashMap<String, ClassMethod> artClassMethods = new HashMap<>();
private HashMap<String, InterfaceMethod> artInterfaceMethods = new HashMap<>();
private HashMap<String, org.emftext.language.java.containers.Package> artPackages = new HashMap<>();
Expand Down Expand Up @@ -107,6 +111,15 @@ private EObject recoverActualElement(EObject obj) {
this.artificialClass.getMembers().add(result);
this.artFields.put(name, result);
return result;
} else if (obj instanceof EnumConstant) {
if (this.artConstants.containsKey(obj)) {
return this.artConstants.get(obj);
}
var result = MembersFactory.eINSTANCE.createEnumConstant();
result.setName(name);
this.artificialEnum.getConstants().add(result);
this.artConstants.put(name, result);
return result;
} else if (obj instanceof ClassMethod) {
if (this.artClassMethods.containsKey(name)) {
return this.artClassMethods.get(name);
Expand Down Expand Up @@ -138,6 +151,7 @@ private EObject recoverActualElement(EObject obj) {
return this.artPackages.get(name);
}
var result = ContainersFactory.eINSTANCE.createPackage();
result.setName("");
p.getNamespaces().forEach(ns -> result.getNamespaces().add(ns));
this.artificialResource.getContents().add(result);
this.artPackages.put(name, result);
Expand All @@ -161,6 +175,7 @@ private void initArtificialResource() {
URI.createURI("pathmap:/javaclass/ArtificialResource.java"));

this.artificialCU = ContainersFactory.eINSTANCE.createCompilationUnit();
this.artificialCU.setName("");
this.artificialResource.getContents().add(this.artificialCU);

this.artificialClass = ClassifiersFactory.eINSTANCE.createClass();
Expand All @@ -169,6 +184,10 @@ private void initArtificialResource() {

this.objectClass = findObjectClass();
this.artClasses.put("Object", objectClass);

this.artificialEnum = ClassifiersFactory.eINSTANCE.createEnumeration();
this.artificialEnum.setName("SyntheticEnum");
this.artificialCU.getClassifiers().add(this.artificialEnum);
}
}

Expand Down