Fixes all remaining resource set based model generator resets

This commit is contained in:
Maximilian Kratz 2024-04-19 12:54:50 +02:00
parent c7e0424a89
commit 0648c0fb08
2 changed files with 15 additions and 3 deletions

View file

@ -33,6 +33,7 @@ public class MultiLayeredInheritenceRSInitTest extends AMultiLayeredInheritenceT
@BeforeEach
public void resetModel() {
gen = new MultiLayeredInheritenceResourceSetModelGenerator();
((MultiLayeredInheritenceResourceSetModelGenerator) gen).init();
gen.reset();
final ResourceSet model = ((MultiLayeredInheritenceResourceSetModelGenerator) gen).getResourceSet();
con = new MultiLayeredInheritenceRSInitConnector(model);

View file

@ -24,7 +24,14 @@ public class MultiLayeredInheritenceResourceSetModelGenerator extends AMultiLaye
@Override
public void reset() {
init();
clearResourceSet();
createModel();
}
private void createModel() {
final Root root = MultilayeredinheritencemodelFactory.eINSTANCE.createRoot();
resourceSet.getResources().get(0).getContents().add(root);
}
@Override
@ -51,8 +58,8 @@ public class MultiLayeredInheritenceResourceSetModelGenerator extends AMultiLaye
getObjects().add(c);
}
private void init() {
resourceSet.getResources().clear();
public void init() {
clearResourceSet();
final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
reg.getExtensionToFactoryMap().put("xmi", new SmartEMFResourceFactoryImpl("../"));
@ -72,5 +79,9 @@ public class MultiLayeredInheritenceResourceSetModelGenerator extends AMultiLaye
public ResourceSet getResourceSet() {
return resourceSet;
}
private void clearResourceSet() {
resourceSet.getResources().forEach(r -> r.getContents().clear());
}
}