Skip to content

Commit

Permalink
Update example generated code in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Degueule committed Dec 1, 2015
1 parent 8698435 commit 783a5e8
Show file tree
Hide file tree
Showing 49 changed files with 3,624 additions and 325 deletions.
7 changes: 5 additions & 2 deletions tests/fr.inria.diverse.melange.tests/src/main/java/simplefsm/Fsm.java
View file
@@ -1,7 +1,10 @@
package simplefsm;

import fr.inria.diverse.melange.lib.IMetamodel;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import simplefsm.FsmMT;

@SuppressWarnings("all")
Expand All @@ -17,8 +20,8 @@ public void setResource(final Resource resource) {
}

public static Fsm load(final String uri) {
org.eclipse.emf.ecore.resource.ResourceSet rs = new org.eclipse.emf.ecore.resource.impl.ResourceSetImpl() ;
Resource res = rs.getResource(org.eclipse.emf.common.util.URI.createURI(uri), true) ;
ResourceSet rs = new ResourceSetImpl() ;
Resource res = rs.getResource(URI.createURI(uri), true) ;
Fsm mm = new Fsm() ;
mm.setResource(res) ;
return mm ;
Expand Down
4 changes: 2 additions & 2 deletions tests/fr.inria.diverse.melange.tests/src/main/java/simplefsm/FsmMT.java
View file
Expand Up @@ -4,13 +4,13 @@
import java.io.IOException;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import simplefsm.fsmmt.FsmMTFactory;
import simplefsm.fsmmt.fsm.FsmFactory;

@SuppressWarnings("all")
public interface FsmMT extends IModelType {
public abstract EList<EObject> getContents();

public abstract FsmMTFactory getFactory();
public abstract FsmFactory getFactory();

public abstract void save(final String uri) throws IOException;
}
37 changes: 22 additions & 15 deletions tests/fr.inria.diverse.melange.tests/src/main/java/simplefsm/StandaloneSetup.java
View file
@@ -1,5 +1,12 @@
package simplefsm;

import fr.inria.diverse.melange.resource.MelangeRegistry;
import fr.inria.diverse.melange.resource.MelangeRegistryImpl;
import fr.inria.diverse.melange.resource.MelangeResourceFactoryImpl;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

@SuppressWarnings("all")
public class StandaloneSetup {
public static void doSetup() {
Expand All @@ -9,55 +16,55 @@ public static void doSetup() {
}

public void doEMFRegistration() {
org.eclipse.emf.ecore.EPackage.Registry.INSTANCE.put(
EPackage.Registry.INSTANCE.put(
fsm.FsmPackage.eNS_URI,
fsm.FsmPackage.eINSTANCE
) ;
org.eclipse.emf.ecore.EPackage.Registry.INSTANCE.put(
EPackage.Registry.INSTANCE.put(
timedfsm.TimedfsmPackage.eNS_URI,
timedfsm.TimedfsmPackage.eINSTANCE
) ;
org.eclipse.emf.ecore.resource.Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(

Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put(
"*",
new org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl()
new XMIResourceFactoryImpl()
) ;
org.eclipse.emf.ecore.resource.Resource.Factory.Registry.INSTANCE.getProtocolToFactoryMap().put(
Resource.Factory.Registry.INSTANCE.getProtocolToFactoryMap().put(
"melange",
new fr.inria.diverse.melange.resource.MelangeResourceFactoryImpl()
new MelangeResourceFactoryImpl()
) ;
}

public void doAdaptersRegistration() {
fr.inria.diverse.melange.resource.MelangeRegistryImpl.LanguageDescriptorImpl fsm = new fr.inria.diverse.melange.resource.MelangeRegistryImpl.LanguageDescriptorImpl(
MelangeRegistry.LanguageDescriptor fsm = new MelangeRegistryImpl.LanguageDescriptorImpl(
"simplefsm.Fsm", "", "http://fsm/", "simplefsm.FsmMT"
) ;
fsm.addAdapter("simplefsm.FsmMT", simplefsm.fsm.adapters.fsmmt.FsmAdapter.class) ;
fr.inria.diverse.melange.resource.MelangeRegistry.INSTANCE.getLanguageMap().put(
MelangeRegistry.INSTANCE.getLanguageMap().put(
"simplefsm.Fsm",
fsm
) ;
fr.inria.diverse.melange.resource.MelangeRegistryImpl.LanguageDescriptorImpl timedFsm = new fr.inria.diverse.melange.resource.MelangeRegistryImpl.LanguageDescriptorImpl(
MelangeRegistry.LanguageDescriptor timedFsm = new MelangeRegistryImpl.LanguageDescriptorImpl(
"simplefsm.TimedFsm", "", "http://timedfsm/", "simplefsm.TimedFsmMT"
) ;
timedFsm.addAdapter("simplefsm.FsmMT", simplefsm.timedfsm.adapters.fsmmt.TimedFsmAdapter.class) ;
timedFsm.addAdapter("simplefsm.TimedFsmMT", simplefsm.timedfsm.adapters.timedfsmmt.TimedFsmAdapter.class) ;
fr.inria.diverse.melange.resource.MelangeRegistry.INSTANCE.getLanguageMap().put(
MelangeRegistry.INSTANCE.getLanguageMap().put(
"simplefsm.TimedFsm",
timedFsm
) ;
fr.inria.diverse.melange.resource.MelangeRegistryImpl.ModelTypeDescriptorImpl fsmMT = new fr.inria.diverse.melange.resource.MelangeRegistryImpl.ModelTypeDescriptorImpl(
MelangeRegistry.ModelTypeDescriptor fsmMT = new MelangeRegistryImpl.ModelTypeDescriptorImpl(
"simplefsm.FsmMT", "", "http://fsmmt/"
) ;
fr.inria.diverse.melange.resource.MelangeRegistry.INSTANCE.getModelTypeMap().put(
MelangeRegistry.INSTANCE.getModelTypeMap().put(
"simplefsm.FsmMT",
fsmMT
) ;
fr.inria.diverse.melange.resource.MelangeRegistryImpl.ModelTypeDescriptorImpl timedFsmMT = new fr.inria.diverse.melange.resource.MelangeRegistryImpl.ModelTypeDescriptorImpl(
MelangeRegistry.ModelTypeDescriptor timedFsmMT = new MelangeRegistryImpl.ModelTypeDescriptorImpl(
"simplefsm.TimedFsmMT", "", "http://timedfsmmt/"
) ;
timedFsmMT.addSuperType("simplefsm.FsmMT") ;
fr.inria.diverse.melange.resource.MelangeRegistry.INSTANCE.getModelTypeMap().put(
MelangeRegistry.INSTANCE.getModelTypeMap().put(
"simplefsm.TimedFsmMT",
timedFsmMT
) ;
Expand Down
7 changes: 5 additions & 2 deletions tests/fr.inria.diverse.melange.tests/src/main/java/simplefsm/TimedFsm.java
View file
@@ -1,7 +1,10 @@
package simplefsm;

import fr.inria.diverse.melange.lib.IMetamodel;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import simplefsm.FsmMT;
import simplefsm.TimedFsmMT;

Expand All @@ -18,8 +21,8 @@ public void setResource(final Resource resource) {
}

public static TimedFsm load(final String uri) {
org.eclipse.emf.ecore.resource.ResourceSet rs = new org.eclipse.emf.ecore.resource.impl.ResourceSetImpl() ;
Resource res = rs.getResource(org.eclipse.emf.common.util.URI.createURI(uri), true) ;
ResourceSet rs = new ResourceSetImpl() ;
Resource res = rs.getResource(URI.createURI(uri), true) ;
TimedFsm mm = new TimedFsm() ;
mm.setResource(res) ;
return mm ;
Expand Down
4 changes: 2 additions & 2 deletions tests/fr.inria.diverse.melange.tests/src/main/java/simplefsm/TimedFsmMT.java
View file
Expand Up @@ -4,13 +4,13 @@
import java.io.IOException;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import simplefsm.timedfsmmt.TimedFsmMTFactory;
import simplefsm.timedfsmmt.timedfsm.TimedfsmFactory;

@SuppressWarnings("all")
public interface TimedFsmMT extends IModelType {
public abstract EList<EObject> getContents();

public abstract TimedFsmMTFactory getFactory();
public abstract TimedfsmFactory getFactory();

public abstract void save(final String uri) throws IOException;
}
9 changes: 5 additions & 4 deletions ...fr.inria.diverse.melange.tests/src/main/java/simplefsm/fsm/adapters/fsmmt/FSMAdapter.java
View file
@@ -1,13 +1,14 @@
package simplefsm.fsm.adapters.fsmmt;

import fr.inria.diverse.melange.adapters.EListAdapter;
import fr.inria.diverse.melange.adapters.EObjectAdapter;
import fsm.FSM;
import org.eclipse.emf.common.util.EList;
import simplefsm.fsm.adapters.fsmmt.FsmMTAdaptersFactory;
import simplefsm.fsmmt.State;
import simplefsm.fsmmt.fsm.State;

@SuppressWarnings("all")
public class FSMAdapter extends EObjectAdapter<FSM> implements simplefsm.fsmmt.FSM {
public class FSMAdapter extends EObjectAdapter<FSM> implements simplefsm.fsmmt.fsm.FSM {
private FsmMTAdaptersFactory adaptersFactory;

public FSMAdapter() {
Expand All @@ -16,7 +17,7 @@ public FSMAdapter() {

@Override
public EList<State> getOwnedState() {
return fr.inria.diverse.melange.adapters.EListAdapter.newInstance(adaptee.getOwnedState(), simplefsm.fsm.adapters.fsmmt.StateAdapter.class) ;
return EListAdapter.newInstance(adaptee.getOwnedState(), simplefsm.fsm.adapters.fsmmt.StateAdapter.class) ;
}

@Override
Expand All @@ -31,6 +32,6 @@ public void setInitialState(final State o) {

@Override
public EList<State> getFinalState() {
return fr.inria.diverse.melange.adapters.EListAdapter.newInstance(adaptee.getFinalState(), simplefsm.fsm.adapters.fsmmt.StateAdapter.class) ;
return EListAdapter.newInstance(adaptee.getFinalState(), simplefsm.fsm.adapters.fsmmt.StateAdapter.class) ;
}
}
7 changes: 4 additions & 3 deletions ...fr.inria.diverse.melange.tests/src/main/java/simplefsm/fsm/adapters/fsmmt/FsmAdapter.java
View file
Expand Up @@ -2,8 +2,9 @@

import fr.inria.diverse.melange.adapters.ResourceAdapter;
import java.io.IOException;
import org.eclipse.emf.common.util.URI;
import simplefsm.FsmMT;
import simplefsm.fsmmt.FsmMTFactory;
import simplefsm.fsmmt.fsm.FsmFactory;

@SuppressWarnings("all")
public class FsmAdapter extends ResourceAdapter implements FsmMT {
Expand All @@ -12,13 +13,13 @@ public FsmAdapter() {
}

@Override
public FsmMTFactory getFactory() {
public FsmFactory getFactory() {
return new simplefsm.fsm.adapters.fsmmt.FsmMTFactoryAdapter() ;
}

@Override
public void save(final String uri) throws IOException {
this.adaptee.setURI(org.eclipse.emf.common.util.URI.createURI(uri));
this.adaptee.setURI(URI.createURI(uri));
this.adaptee.save(null);
}
}
67 changes: 38 additions & 29 deletions ...iverse.melange.tests/src/main/java/simplefsm/fsm/adapters/fsmmt/FsmMTAdaptersFactory.java
View file
Expand Up @@ -29,46 +29,55 @@ public static FsmMTAdaptersFactory getInstance() {
}

public EObjectAdapter createAdapter(final EObject o) {
EObjectAdapter res = register.get(o);
if(res != null){
return res;
if (o instanceof fsm.FSM){
return createFSMAdapter((fsm.FSM) o) ;
}
else{
if (o instanceof fsm.FSM){
res = createFSMAdapter((fsm.FSM) o) ;
register.put(o,res);
return res;
}
if (o instanceof fsm.State){
res = createStateAdapter((fsm.State) o) ;
register.put(o,res);
return res;
}
if (o instanceof fsm.Transition){
res = createTransitionAdapter((fsm.Transition) o) ;
register.put(o,res);
return res;
}
if (o instanceof fsm.State){
return createStateAdapter((fsm.State) o) ;
}

if (o instanceof fsm.Transition){
return createTransitionAdapter((fsm.Transition) o) ;
}

return null ;
}

public FSMAdapter createFSMAdapter(final FSM adaptee) {
simplefsm.fsm.adapters.fsmmt.FSMAdapter adap = new simplefsm.fsm.adapters.fsmmt.FSMAdapter() ;
adap.setAdaptee(adaptee) ;
return adap ;
EObjectAdapter res = register.get(adaptee);
if(res != null){
return (simplefsm.fsm.adapters.fsmmt.FSMAdapter) res;
}
else{
res = new simplefsm.fsm.adapters.fsmmt.FSMAdapter() ;
res.setAdaptee(adaptee) ;
register.put(adaptee,res);
return (simplefsm.fsm.adapters.fsmmt.FSMAdapter) res ;
}
}

public StateAdapter createStateAdapter(final State adaptee) {
simplefsm.fsm.adapters.fsmmt.StateAdapter adap = new simplefsm.fsm.adapters.fsmmt.StateAdapter() ;
adap.setAdaptee(adaptee) ;
return adap ;
EObjectAdapter res = register.get(adaptee);
if(res != null){
return (simplefsm.fsm.adapters.fsmmt.StateAdapter) res;
}
else{
res = new simplefsm.fsm.adapters.fsmmt.StateAdapter() ;
res.setAdaptee(adaptee) ;
register.put(adaptee,res);
return (simplefsm.fsm.adapters.fsmmt.StateAdapter) res ;
}
}

public TransitionAdapter createTransitionAdapter(final Transition adaptee) {
simplefsm.fsm.adapters.fsmmt.TransitionAdapter adap = new simplefsm.fsm.adapters.fsmmt.TransitionAdapter() ;
adap.setAdaptee(adaptee) ;
return adap ;
EObjectAdapter res = register.get(adaptee);
if(res != null){
return (simplefsm.fsm.adapters.fsmmt.TransitionAdapter) res;
}
else{
res = new simplefsm.fsm.adapters.fsmmt.TransitionAdapter() ;
res.setAdaptee(adaptee) ;
register.put(adaptee,res);
return (simplefsm.fsm.adapters.fsmmt.TransitionAdapter) res ;
}
}
}
19 changes: 12 additions & 7 deletions ...diverse.melange.tests/src/main/java/simplefsm/fsm/adapters/fsmmt/FsmMTFactoryAdapter.java
View file
@@ -1,17 +1,18 @@
package simplefsm.fsm.adapters.fsmmt;

import fsm.FsmFactory;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import simplefsm.fsm.adapters.fsmmt.FsmMTAdaptersFactory;
import simplefsm.fsmmt.FSM;
import simplefsm.fsmmt.FsmMTFactory;
import simplefsm.fsmmt.State;
import simplefsm.fsmmt.Transition;
import simplefsm.fsmmt.fsm.FSM;
import simplefsm.fsmmt.fsm.FsmFactory;
import simplefsm.fsmmt.fsm.FsmPackage;
import simplefsm.fsmmt.fsm.State;
import simplefsm.fsmmt.fsm.Transition;

@SuppressWarnings("all")
public class FsmMTFactoryAdapter implements FsmMTFactory {
public class FsmMTFactoryAdapter extends EFactoryImpl implements FsmFactory {
private FsmMTAdaptersFactory adaptersFactory = simplefsm.fsm.adapters.fsmmt.FsmMTAdaptersFactory.getInstance();

private FsmFactory fsmAdaptee = fsm.FsmFactory.eINSTANCE;
private fsm.FsmFactory fsmAdaptee = fsm.FsmFactory.eINSTANCE;

@Override
public FSM createFSM() {
Expand All @@ -27,4 +28,8 @@ public State createState() {
public Transition createTransition() {
return adaptersFactory.createTransitionAdapter(fsmAdaptee.createTransition()) ;
}

public FsmPackage getFsmPackage() {
return simplefsm.fsmmt.fsm.FsmPackage.eINSTANCE;
}
}
11 changes: 6 additions & 5 deletions ....inria.diverse.melange.tests/src/main/java/simplefsm/fsm/adapters/fsmmt/StateAdapter.java
View file
@@ -1,14 +1,15 @@
package simplefsm.fsm.adapters.fsmmt;

import fr.inria.diverse.melange.adapters.EListAdapter;
import fr.inria.diverse.melange.adapters.EObjectAdapter;
import fsm.State;
import org.eclipse.emf.common.util.EList;
import simplefsm.fsm.adapters.fsmmt.FsmMTAdaptersFactory;
import simplefsm.fsmmt.FSM;
import simplefsm.fsmmt.Transition;
import simplefsm.fsmmt.fsm.FSM;
import simplefsm.fsmmt.fsm.Transition;

@SuppressWarnings("all")
public class StateAdapter extends EObjectAdapter<State> implements simplefsm.fsmmt.State {
public class StateAdapter extends EObjectAdapter<State> implements simplefsm.fsmmt.fsm.State {
private FsmMTAdaptersFactory adaptersFactory;

public StateAdapter() {
Expand Down Expand Up @@ -37,11 +38,11 @@ public void setOwningFSM(final FSM o) {

@Override
public EList<Transition> getOutgoingTransition() {
return fr.inria.diverse.melange.adapters.EListAdapter.newInstance(adaptee.getOutgoingTransition(), simplefsm.fsm.adapters.fsmmt.TransitionAdapter.class) ;
return EListAdapter.newInstance(adaptee.getOutgoingTransition(), simplefsm.fsm.adapters.fsmmt.TransitionAdapter.class) ;
}

@Override
public EList<Transition> getIncomingTransition() {
return fr.inria.diverse.melange.adapters.EListAdapter.newInstance(adaptee.getIncomingTransition(), simplefsm.fsm.adapters.fsmmt.TransitionAdapter.class) ;
return EListAdapter.newInstance(adaptee.getIncomingTransition(), simplefsm.fsm.adapters.fsmmt.TransitionAdapter.class) ;
}
}
4 changes: 2 additions & 2 deletions ...a.diverse.melange.tests/src/main/java/simplefsm/fsm/adapters/fsmmt/TransitionAdapter.java
View file
Expand Up @@ -3,10 +3,10 @@
import fr.inria.diverse.melange.adapters.EObjectAdapter;
import fsm.Transition;
import simplefsm.fsm.adapters.fsmmt.FsmMTAdaptersFactory;
import simplefsm.fsmmt.State;
import simplefsm.fsmmt.fsm.State;

@SuppressWarnings("all")
public class TransitionAdapter extends EObjectAdapter<Transition> implements simplefsm.fsmmt.Transition {
public class TransitionAdapter extends EObjectAdapter<Transition> implements simplefsm.fsmmt.fsm.Transition {
private FsmMTAdaptersFactory adaptersFactory;

public TransitionAdapter() {
Expand Down

0 comments on commit 783a5e8

Please sign in to comment.