WIP: Integrate changes for IBeX v2

org.emoflon.core.dependencies/.settings/org.eclipse.jdt.core.prefs

@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
-org.eclipse.jdt.core.compiler.compliance=17
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=17
+org.eclipse.jdt.core.compiler.source=21

org.emoflon.smartemf.dependencies/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="jdom-2.0.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="jdom-2.0.6-contrib.jar"/>

org.emoflon.smartemf.dependencies/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=15
-org.eclipse.jdt.core.compiler.compliance=15
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=15
+org.eclipse.jdt.core.compiler.source=21

org.emoflon.smartemf.dependencies/META-INF/MANIFEST.MF

@@ -51,5 +51,5 @@ Export-Package: org.jdom2,
  org.jdom2.xpath.jaxen,
  org.jdom2.xpath.util
 Require-Bundle: org.junit
-Bundle-RequiredExecutionEnvironment: JavaSE-15
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: org.emoflon.smartemf.dependencies

org.emoflon.smartemf/src/org/emoflon/smartemf/SmartEMFGenerator.java

@@ -24,38 +24,38 @@
 /**
  * Class which generates the code
  */
-public class SmartEMFGenerator{
+public class SmartEMFGenerator {
+
+	/** ########################Attributes######################## */
 
-	/**########################Attributes########################*/
-
 	private String path;
 	private Collection<CodeTemplate> templates;
 	private GenModel genModel;
 
-	/**########################Constructor########################*/
+	/** ########################Constructor######################## */
 
 	/**
 	 * constructs a new EMFGenerator object
+	 * 
 	 * @param ePackage to build from
 	 * @param genmodel to build with
-	 * @param path to the original Ecore of the corresponding project
-	 */ 
+	 * @param path     to the original Ecore of the corresponding project
+	 */
 	public SmartEMFGenerator(IProject project, EPackage ePackage, GenModel genmodel) {
 		String projectPath = project.getLocation().makeAbsolute().toString();
-		
+
 		// if modeldirectory contains project name -> don't duplicate it
-		if(genmodel.getModelDirectory().contains(project.getName())) {
+		if (genmodel.getModelDirectory().contains(project.getName())) {
 			File f = new File(projectPath);
 			path = f.getParentFile().getAbsolutePath() + "/" + genmodel.getModelDirectory() + "/";
-		}
-		else {
-			path = projectPath + "/" + genmodel.getModelDirectory()+ "/";			
+		} else {
+			path = projectPath + "/" + genmodel.getModelDirectory() + "/";
 		}
 
 		templates = new LinkedList<>();
 		this.genModel = genmodel;
-		
-		for(GenPackage genPkg : getGenPackages(genmodel)){
+
+		for (GenPackage genPkg : getGenPackages(genmodel)) {
 			initTemplates(genPkg);
 		}
 	}
@@ -67,65 +67,65 @@ private void initTemplates(GenPackage genPkg) {
 		initFactoryImplementation(genPkg);
 		initSmartEMFInterfaces(genPkg);
 		initSmartEMFImplementations(genPkg);
-		
-		for(GenPackage subPkg : genPkg.getSubGenPackages()) {
+
+		for (GenPackage subPkg : genPkg.getSubGenPackages()) {
 			initTemplates(subPkg);
 		}
 	}
-	
+
 	private Collection<GenPackage> getGenPackages(GenModel genmodel) {
 		Collection<GenPackage> visited = new HashSet<>();
 		Collection<GenPackage> unvisited = new HashSet<>();
 		unvisited.addAll(genmodel.getGenPackages());
-		while(!unvisited.isEmpty()) {
+		while (!unvisited.isEmpty()) {
 			GenPackage next = unvisited.iterator().next();
 			visited.add(next);
 			unvisited.remove(next);
-			
+
 			unvisited.addAll(next.getSubGenPackages());
 		}
 		return visited;
 	}
-	
+
 	private void initPackageInterface(GenPackage genPkg) {
 		PackageInterfaceTemplate creator = new PackageInterfaceTemplate(genPkg, path);
 		templates.add(creator);
-		
-		for(org.eclipse.emf.ecore.EEnum eenum : TemplateUtil.getEEnums(genPkg)){
+
+		for (org.eclipse.emf.ecore.EEnum eenum : TemplateUtil.getEEnums(genPkg)) {
 			EEnumTemplate eenum_creator = new EEnumTemplate(genPkg, eenum, path);
 			templates.add(eenum_creator);
 		}
 	}
-	
+
 	private void initPackageImplementation(GenPackage genPkg) {
 		PackageImplTemplate creator = new PackageImplTemplate(genPkg, path);
 		templates.add(creator);
 	}
-	
+
 	private void initFactoryInterface(GenPackage genPkg) {
 		FactoryInterfaceTemplate creator = new FactoryInterfaceTemplate(genPkg, path);
 		templates.add(creator);
 	}
-	
+
 	private void initFactoryImplementation(GenPackage genPkg) {
 		FactoryImplTemplate creator = new FactoryImplTemplate(genPkg, path);
 		templates.add(creator);
 	}
-	
+
 	private void initSmartEMFInterfaces(GenPackage genPkg) {
-		for(EClassifier classifier : genPkg.getEcorePackage().getEClassifiers()){
-			if(classifier instanceof EClass eClass) {
+		for (EClassifier classifier : genPkg.getEcorePackage().getEClassifiers()) {
+			if (classifier instanceof EClass eClass) {
 				SmartEMFInterfaceTemplate interfaceTemplate = new SmartEMFInterfaceTemplate(genPkg, eClass, path);
-				templates.add(interfaceTemplate);				
+				templates.add(interfaceTemplate);
 			}
 		}
-		
+
 	}
-	
+
 	private void initSmartEMFImplementations(GenPackage genPkg) {
-		for(EClassifier classifier : genPkg.getEcorePackage().getEClassifiers()){
-			if(classifier instanceof EClass eClass) {
-				if(eClass.isInterface()) {
+		for (EClassifier classifier : genPkg.getEcorePackage().getEClassifiers()) {
+			if (classifier instanceof EClass eClass) {
+				if (eClass.isInterface()) {
 					continue;
 				}
 				SmartEMFObjectTemplate implTemplate = new SmartEMFObjectTemplate(genPkg, eClass, path);

org.emoflon.smartemf/src/org/emoflon/smartemf/persistence/AdapterList.java

@@ -13,11 +13,11 @@ public class AdapterList implements EList<Adapter> {
 
 	private Collection<Adapter> adapters = new LinkedHashSet<>();
 	private SmartEMFResource resource;
-	
+
 	public AdapterList(SmartEMFResource resource) {
 		this.resource = resource;
 	}
-	
+
 	@Override
 	public int size() {
 		return adapters.size();
@@ -50,7 +50,7 @@ public <T> T[] toArray(T[] a) {
 
 	@Override
 	public boolean add(Adapter e) {
-		if(!adapters.contains(e)) {
+		if (!adapters.contains(e)) {
 			boolean result = adapters.add(e);
 			resource.adapterAdded(e);
 			return result;
@@ -76,7 +76,7 @@ public boolean containsAll(Collection<?> c) {
 	@Override
 	public boolean addAll(Collection<? extends Adapter> c) {
 		boolean changed = false;
-		for(Adapter a : c) {
+		for (Adapter a : c) {
 			changed = changed || add(a);
 		}
 		return changed;
@@ -90,10 +90,10 @@ public boolean addAll(int index, Collection<? extends Adapter> c) {
 	@Override
 	public boolean removeAll(Collection<?> c) {
 		boolean changed = false;
-		for(Object a : c) {
+		for (Object a : c) {
 			boolean success = remove(a);
 			changed = changed || success;
-			if(success)
+			if (success)
 				resource.sendRemoveAdapterMessages((Adapter) a);
 		}
 		return changed;