From 8e461ef60f59a2cb57ddca31a0b785c1b046e63a Mon Sep 17 00:00:00 2001 From: ArenBabikian Date: Mon, 3 Feb 2020 15:20:02 -0500 Subject: VAMPIRE: last commit --- .../ecore-gen/functionalarchitecture/Function.java | 14 +++- .../functionalarchitecture/FunctionalData.java | 33 ++++++++- .../functionalarchitecture/FunctionalElement.java | 8 +- .../FunctionalarchitecturePackage.java | 48 +++++++++++- .../functionalarchitecture/impl/FunctionImpl.java | 15 ++++ .../impl/FunctionalDataImpl.java | 86 +++++++++++++++++++--- .../impl/FunctionalElementImpl.java | 21 +++--- .../impl/FunctionalInterfaceImpl.java | 3 +- .../impl/FunctionalarchitectureFactoryImpl.java | 14 +++- .../impl/FunctionalarchitecturePackageImpl.java | 52 +++++++------ .../util/FunctionalarchitectureAdapterFactory.java | 14 +++- .../util/FunctionalarchitectureSwitch.java | 16 ++-- .../model/FamMetamodel.ecore | 73 ++++++++++++++++++ .../model/FamMetamodel.genmodel | 1 + .../Examples/ModelGenExampleFAM_plugin/plugin.xml | 21 ++++++ 15 files changed, 353 insertions(+), 66 deletions(-) (limited to 'Domains/Examples') diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/Function.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/Function.java index 5b484066..0a4e6361 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/Function.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/Function.java @@ -51,11 +51,23 @@ public interface Function extends FunctionalElement { * * @return the value of the 'Type' attribute. * @see functionalarchitecture.FunctionType + * @see #setType(FunctionType) * @see functionalarchitecture.FunctionalarchitecturePackage#getFunction_Type() - * @model required="true" transient="true" changeable="false" volatile="true" derived="true" + * @model required="true" transient="true" volatile="true" * annotation="org.eclipse.viatra.query.querybasedfeature patternFQN='hu.bme.mit.inf.dslreasoner.domains.transima.fam.type'" * @generated */ FunctionType getType(); + /** + * Sets the value of the '{@link functionalarchitecture.Function#getType Type}' attribute. + * + * + * @param value the new value of the 'Type' attribute. + * @see functionalarchitecture.FunctionType + * @see #getType() + * @generated + */ + void setType(FunctionType value); + } // Function diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java index 39639f99..23b7b9a0 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java @@ -15,6 +15,7 @@ import org.eclipse.emf.ecore.EObject; * * * @see functionalarchitecture.FunctionalarchitecturePackage#getFunctionalData() @@ -60,13 +61,13 @@ public interface FunctionalData extends EObject { *

* * @return the value of the 'Interface' container reference. - * @see #setInterface(FunctionalInterface) + * @see #setInterface(functionalarchitecture.FunctionalInterface) * @see functionalarchitecture.FunctionalarchitecturePackage#getFunctionalData_Interface() * @see functionalarchitecture.FunctionalInterface#getData * @model opposite="data" transient="false" * @generated */ - FunctionalInterface getInterface(); + functionalarchitecture.FunctionalInterface getInterface(); /** * Sets the value of the '{@link functionalarchitecture.FunctionalData#getInterface Interface}' container reference. @@ -76,6 +77,32 @@ public interface FunctionalData extends EObject { * @see #getInterface() * @generated */ - void setInterface(FunctionalInterface value); + void setInterface(functionalarchitecture.FunctionalInterface value); + + /** + * Returns the value of the 'Value' attribute. + * + *

+ * If the meaning of the 'Value' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Value' attribute. + * @see #setValue(int) + * @see functionalarchitecture.FunctionalarchitecturePackage#getFunctionalData_Value() + * @model required="true" + * @generated + */ + int getValue(); + + /** + * Sets the value of the '{@link functionalarchitecture.FunctionalData#getValue Value}' attribute. + * + * + * @param value the new value of the 'Value' attribute. + * @see #getValue() + * @generated + */ + void setValue(int value); } // FunctionalData diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java index f5a2ff19..1fb9b9b8 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java @@ -33,13 +33,13 @@ public interface FunctionalElement extends EObject { *

* * @return the value of the 'Interface' containment reference. - * @see #setInterface(FunctionalInterface) + * @see #setInterface(functionalarchitecture.FunctionalInterface) * @see functionalarchitecture.FunctionalarchitecturePackage#getFunctionalElement_Interface() * @see functionalarchitecture.FunctionalInterface#getElement * @model opposite="element" containment="true" * @generated */ - FunctionalInterface getInterface(); + functionalarchitecture.FunctionalInterface getInterface(); /** * Sets the value of the '{@link functionalarchitecture.FunctionalElement#getInterface Interface}' containment reference. @@ -49,7 +49,7 @@ public interface FunctionalElement extends EObject { * @see #getInterface() * @generated */ - void setInterface(FunctionalInterface value); + void setInterface(functionalarchitecture.FunctionalInterface value); /** * Returns the value of the 'Model' reference. @@ -62,7 +62,7 @@ public interface FunctionalElement extends EObject { * @return the value of the 'Model' reference. * @see #setModel(FunctionalArchitectureModel) * @see functionalarchitecture.FunctionalarchitecturePackage#getFunctionalElement_Model() - * @model required="true" transient="true" volatile="true" derived="true" + * @model required="true" transient="true" volatile="true" * annotation="org.eclipse.viatra.query.querybasedfeature patternFQN='hu.bme.mit.inf.dslreasoner.domains.transima.fam.model'" * @generated */ diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalarchitecturePackage.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalarchitecturePackage.java index ac0d910e..dee2cc59 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalarchitecturePackage.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalarchitecturePackage.java @@ -380,6 +380,15 @@ public interface FunctionalarchitecturePackage extends EPackage { */ int FUNCTIONAL_DATA__INTERFACE = 1; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int FUNCTIONAL_DATA__VALUE = 2; + /** * The number of structural features of the 'Functional Data' class. * @@ -387,7 +396,7 @@ public interface FunctionalarchitecturePackage extends EPackage { * @generated * @ordered */ - int FUNCTIONAL_DATA_FEATURE_COUNT = 2; + int FUNCTIONAL_DATA_FEATURE_COUNT = 3; /** * The number of operations of the 'Functional Data' class. @@ -426,6 +435,15 @@ public interface FunctionalarchitecturePackage extends EPackage { */ int FUNCTIONAL_INPUT__INTERFACE = FUNCTIONAL_DATA__INTERFACE; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int FUNCTIONAL_INPUT__VALUE = FUNCTIONAL_DATA__VALUE; + /** * The feature id for the 'Incoming Links' reference list. * @@ -481,6 +499,15 @@ public interface FunctionalarchitecturePackage extends EPackage { */ int FUNCTIONAL_OUTPUT__INTERFACE = FUNCTIONAL_DATA__INTERFACE; + /** + * The feature id for the 'Value' attribute. + * + * + * @generated + * @ordered + */ + int FUNCTIONAL_OUTPUT__VALUE = FUNCTIONAL_DATA__VALUE; + /** * The feature id for the 'Outgoing Links' containment reference list. * @@ -774,6 +801,17 @@ public interface FunctionalarchitecturePackage extends EPackage { */ EReference getFunctionalData_Interface(); + /** + * Returns the meta object for the attribute '{@link functionalarchitecture.FunctionalData#getValue Value}'. + * + * + * @return the meta object for the attribute 'Value'. + * @see functionalarchitecture.FunctionalData#getValue() + * @see #getFunctionalData() + * @generated + */ + EAttribute getFunctionalData_Value(); + /** * Returns the meta object for enum '{@link functionalarchitecture.FunctionType Function Type}'. * @@ -1017,6 +1055,14 @@ public interface FunctionalarchitecturePackage extends EPackage { */ EReference FUNCTIONAL_DATA__INTERFACE = eINSTANCE.getFunctionalData_Interface(); + /** + * The meta object literal for the 'Value' attribute feature. + * + * + * @generated + */ + EAttribute FUNCTIONAL_DATA__VALUE = eINSTANCE.getFunctionalData_Value(); + /** * The meta object literal for the '{@link functionalarchitecture.FunctionType Function Type}' enum. * diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java index 46736c8c..2262094e 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java @@ -95,6 +95,15 @@ public class FunctionImpl extends FunctionalElementImpl implements Function { return (FunctionType)TYPE__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false); } + /** + * + * + * @generated + */ + public void setType(FunctionType newType) { + TYPE__ESETTING_DELEGATE.dynamicSet(this, null, 0, newType); + } + /** * * @@ -153,6 +162,9 @@ public class FunctionImpl extends FunctionalElementImpl implements Function { getSubElements().clear(); getSubElements().addAll((Collection)newValue); return; + case FunctionalarchitecturePackage.FUNCTION__TYPE: + setType((FunctionType)newValue); + return; } super.eSet(featureID, newValue); } @@ -168,6 +180,9 @@ public class FunctionImpl extends FunctionalElementImpl implements Function { case FunctionalarchitecturePackage.FUNCTION__SUB_ELEMENTS: getSubElements().clear(); return; + case FunctionalarchitecturePackage.FUNCTION__TYPE: + TYPE__ESETTING_DELEGATE.dynamicUnset(this, null, 0); + return; } super.eUnset(featureID); } diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java index 10937e8d..ecab54af 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java @@ -4,7 +4,6 @@ package functionalarchitecture.impl; import functionalarchitecture.FAMTerminator; import functionalarchitecture.FunctionalData; -import functionalarchitecture.FunctionalInterface; import functionalarchitecture.FunctionalarchitecturePackage; import org.eclipse.emf.common.notify.Notification; @@ -28,6 +27,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; * * * @generated @@ -43,6 +43,25 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im */ protected FAMTerminator terminator; + /** + * The default value of the '{@link #getValue() Value}' attribute. + * + * + * @see #getValue() + * @generated + * @ordered + */ + protected static final int VALUE_EDEFAULT = 0; + /** + * The cached value of the '{@link #getValue() Value}' attribute. + * + * + * @see #getValue() + * @generated + * @ordered + */ + protected int value = VALUE_EDEFAULT; + /** * * @@ -110,9 +129,9 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im * * @generated */ - public FunctionalInterface getInterface() { + public functionalarchitecture.FunctionalInterface getInterface() { if (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE) return null; - return (FunctionalInterface)eInternalContainer(); + return (functionalarchitecture.FunctionalInterface)eInternalContainer(); } /** @@ -120,7 +139,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im * * @generated */ - public NotificationChain basicSetInterface(FunctionalInterface newInterface, NotificationChain msgs) { + public NotificationChain basicSetInterface(functionalarchitecture.FunctionalInterface newInterface, NotificationChain msgs) { msgs = eBasicSetContainer((InternalEObject)newInterface, FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE, msgs); return msgs; } @@ -130,7 +149,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im * * @generated */ - public void setInterface(FunctionalInterface newInterface) { + public void setInterface(functionalarchitecture.FunctionalInterface newInterface) { if (newInterface != eInternalContainer() || (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE && newInterface != null)) { if (EcoreUtil.isAncestor(this, newInterface)) throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); @@ -138,7 +157,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im if (eInternalContainer() != null) msgs = eBasicRemoveFromContainer(msgs); if (newInterface != null) - msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, FunctionalInterface.class, msgs); + msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, functionalarchitecture.FunctionalInterface.class, msgs); msgs = basicSetInterface(newInterface, msgs); if (msgs != null) msgs.dispatch(); } @@ -146,6 +165,27 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im eNotify(new ENotificationImpl(this, Notification.SET, FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE, newInterface, newInterface)); } + /** + * + * + * @generated + */ + public int getValue() { + return value; + } + + /** + * + * + * @generated + */ + public void setValue(int newValue) { + int oldValue = value; + value = newValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, FunctionalarchitecturePackage.FUNCTIONAL_DATA__VALUE, oldValue, value)); + } + /** * * @@ -161,7 +201,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE: if (eInternalContainer() != null) msgs = eBasicRemoveFromContainer(msgs); - return basicSetInterface((FunctionalInterface)otherEnd, msgs); + return basicSetInterface((functionalarchitecture.FunctionalInterface)otherEnd, msgs); } return super.eInverseAdd(otherEnd, featureID, msgs); } @@ -191,7 +231,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) { switch (eContainerFeatureID()) { case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE: - return eInternalContainer().eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, FunctionalInterface.class, msgs); + return eInternalContainer().eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, functionalarchitecture.FunctionalInterface.class, msgs); } return super.eBasicRemoveFromContainerFeature(msgs); } @@ -208,6 +248,8 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im return getTerminator(); case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE: return getInterface(); + case FunctionalarchitecturePackage.FUNCTIONAL_DATA__VALUE: + return getValue(); } return super.eGet(featureID, resolve, coreType); } @@ -224,7 +266,10 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im setTerminator((FAMTerminator)newValue); return; case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE: - setInterface((FunctionalInterface)newValue); + setInterface((functionalarchitecture.FunctionalInterface)newValue); + return; + case FunctionalarchitecturePackage.FUNCTIONAL_DATA__VALUE: + setValue((Integer)newValue); return; } super.eSet(featureID, newValue); @@ -242,7 +287,10 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im setTerminator((FAMTerminator)null); return; case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE: - setInterface((FunctionalInterface)null); + setInterface((functionalarchitecture.FunctionalInterface)null); + return; + case FunctionalarchitecturePackage.FUNCTIONAL_DATA__VALUE: + setValue(VALUE_EDEFAULT); return; } super.eUnset(featureID); @@ -260,8 +308,26 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im return terminator != null; case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE: return getInterface() != null; + case FunctionalarchitecturePackage.FUNCTIONAL_DATA__VALUE: + return value != VALUE_EDEFAULT; } return super.eIsSet(featureID); } + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (value: "); + result.append(value); + result.append(')'); + return result.toString(); + } + } //FunctionalDataImpl diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java index 809e9ed5..090ccd32 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java @@ -5,7 +5,6 @@ package functionalarchitecture.impl; import functionalarchitecture.Function; import functionalarchitecture.FunctionalArchitectureModel; import functionalarchitecture.FunctionalElement; -import functionalarchitecture.FunctionalInterface; import functionalarchitecture.FunctionalarchitecturePackage; import org.eclipse.emf.common.notify.Notification; @@ -44,7 +43,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container * @generated * @ordered */ - protected FunctionalInterface interface_; + protected functionalarchitecture.FunctionalInterface interface_; /** * The cached setting delegate for the '{@link #getModel() Model}' reference. @@ -80,7 +79,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container * * @generated */ - public FunctionalInterface getInterface() { + public functionalarchitecture.FunctionalInterface getInterface() { return interface_; } @@ -89,8 +88,8 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container * * @generated */ - public NotificationChain basicSetInterface(FunctionalInterface newInterface, NotificationChain msgs) { - FunctionalInterface oldInterface = interface_; + public NotificationChain basicSetInterface(functionalarchitecture.FunctionalInterface newInterface, NotificationChain msgs) { + functionalarchitecture.FunctionalInterface oldInterface = interface_; interface_ = newInterface; if (eNotificationRequired()) { ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE, oldInterface, newInterface); @@ -104,13 +103,13 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container * * @generated */ - public void setInterface(FunctionalInterface newInterface) { + public void setInterface(functionalarchitecture.FunctionalInterface newInterface) { if (newInterface != interface_) { NotificationChain msgs = null; if (interface_ != null) - msgs = ((InternalEObject)interface_).eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, FunctionalInterface.class, msgs); + msgs = ((InternalEObject)interface_).eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, functionalarchitecture.FunctionalInterface.class, msgs); if (newInterface != null) - msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, FunctionalInterface.class, msgs); + msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, functionalarchitecture.FunctionalInterface.class, msgs); msgs = basicSetInterface(newInterface, msgs); if (msgs != null) msgs.dispatch(); } @@ -197,7 +196,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE: if (interface_ != null) msgs = ((InternalEObject)interface_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE, null, msgs); - return basicSetInterface((FunctionalInterface)otherEnd, msgs); + return basicSetInterface((functionalarchitecture.FunctionalInterface)otherEnd, msgs); case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__PARENT: if (eInternalContainer() != null) msgs = eBasicRemoveFromContainer(msgs); @@ -264,7 +263,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container public void eSet(int featureID, Object newValue) { switch (featureID) { case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE: - setInterface((FunctionalInterface)newValue); + setInterface((functionalarchitecture.FunctionalInterface)newValue); return; case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__MODEL: setModel((FunctionalArchitectureModel)newValue); @@ -285,7 +284,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container public void eUnset(int featureID) { switch (featureID) { case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE: - setInterface((FunctionalInterface)null); + setInterface((functionalarchitecture.FunctionalInterface)null); return; case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__MODEL: setModel((FunctionalArchitectureModel)null); diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java index 20151886..be8f8700 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java @@ -4,7 +4,6 @@ package functionalarchitecture.impl; import functionalarchitecture.FunctionalData; import functionalarchitecture.FunctionalElement; -import functionalarchitecture.FunctionalInterface; import functionalarchitecture.FunctionalarchitecturePackage; import java.util.Collection; @@ -38,7 +37,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * * @generated */ -public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implements FunctionalInterface { +public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implements functionalarchitecture.FunctionalInterface { /** * The cached value of the '{@link #getData() Data}' containment reference list. * diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java index 56ecfa25..726f7a32 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java @@ -2,9 +2,15 @@ */ package functionalarchitecture.impl; -import functionalarchitecture.*; -import functionalarchitecture.FunctionalInterface; - +import functionalarchitecture.FAMTerminator; +import functionalarchitecture.Function; +import functionalarchitecture.FunctionType; +import functionalarchitecture.FunctionalArchitectureModel; +import functionalarchitecture.FunctionalInput; +import functionalarchitecture.FunctionalOutput; +import functionalarchitecture.FunctionalarchitectureFactory; +import functionalarchitecture.FunctionalarchitecturePackage; +import functionalarchitecture.InformationLink; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EObject; @@ -145,7 +151,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F * * @generated */ - public FunctionalInterface createFunctionalInterface() { + public functionalarchitecture.FunctionalInterface createFunctionalInterface() { FunctionalInterfaceImpl functionalInterface = new FunctionalInterfaceImpl(); return functionalInterface; } diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java index 22c15533..110f3d6c 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java @@ -9,7 +9,6 @@ import functionalarchitecture.FunctionalArchitectureModel; import functionalarchitecture.FunctionalData; import functionalarchitecture.FunctionalElement; import functionalarchitecture.FunctionalInput; -import functionalarchitecture.FunctionalInterface; import functionalarchitecture.FunctionalOutput; import functionalarchitecture.FunctionalarchitectureFactory; import functionalarchitecture.FunctionalarchitecturePackage; @@ -128,7 +127,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F /** * Creates, registers, and initializes the Package for this model, and for any others upon which it depends. - * + * *

This method is used to initialize {@link FunctionalarchitecturePackage#eINSTANCE} when that field is accessed. * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. * @@ -142,7 +141,8 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F if (isInited) return (FunctionalarchitecturePackage)EPackage.Registry.INSTANCE.getEPackage(FunctionalarchitecturePackage.eNS_URI); // Obtain or create and register package - FunctionalarchitecturePackageImpl theFunctionalarchitecturePackage = (FunctionalarchitecturePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FunctionalarchitecturePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FunctionalarchitecturePackageImpl()); + Object registeredFunctionalarchitecturePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + FunctionalarchitecturePackageImpl theFunctionalarchitecturePackage = registeredFunctionalarchitecturePackage instanceof FunctionalarchitecturePackageImpl ? (FunctionalarchitecturePackageImpl)registeredFunctionalarchitecturePackage : new FunctionalarchitecturePackageImpl(); isInited = true; @@ -155,7 +155,6 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F // Mark meta-data to indicate it can't be changed theFunctionalarchitecturePackage.freeze(); - // Update the registry and return the package EPackage.Registry.INSTANCE.put(FunctionalarchitecturePackage.eNS_URI, theFunctionalarchitecturePackage); return theFunctionalarchitecturePackage; @@ -377,6 +376,15 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F return (EReference)functionalDataEClass.getEStructuralFeatures().get(1); } + /** + * + * + * @generated + */ + public EAttribute getFunctionalData_Value() { + return (EAttribute)functionalDataEClass.getEStructuralFeatures().get(2); + } + /** * * @@ -446,6 +454,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F functionalDataEClass = createEClass(FUNCTIONAL_DATA); createEReference(functionalDataEClass, FUNCTIONAL_DATA__TERMINATOR); createEReference(functionalDataEClass, FUNCTIONAL_DATA__INTERFACE); + createEAttribute(functionalDataEClass, FUNCTIONAL_DATA__VALUE); // Create enums functionTypeEEnum = createEEnum(FUNCTION_TYPE); @@ -486,7 +495,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F // Initialize classes, features, and operations; add parameters initEClass(functionalElementEClass, FunctionalElement.class, "FunctionalElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getFunctionalElement_Interface(), this.getFunctionalInterface(), this.getFunctionalInterface_Element(), "interface", null, 0, 1, FunctionalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getFunctionalElement_Model(), this.getFunctionalArchitectureModel(), null, "model", null, 1, 1, FunctionalElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEReference(getFunctionalElement_Model(), this.getFunctionalArchitectureModel(), null, "model", null, 1, 1, FunctionalElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getFunctionalElement_Parent(), this.getFunction(), this.getFunction_SubElements(), "parent", null, 0, 1, FunctionalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(functionalArchitectureModelEClass, FunctionalArchitectureModel.class, "FunctionalArchitectureModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -494,7 +503,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F initEClass(functionEClass, Function.class, "Function", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getFunction_SubElements(), this.getFunctionalElement(), this.getFunctionalElement_Parent(), "subElements", null, 0, -1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getFunction_Type(), this.getFunctionType(), "type", null, 1, 1, Function.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); + initEAttribute(getFunction_Type(), this.getFunctionType(), "type", null, 1, 1, Function.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(famTerminatorEClass, FAMTerminator.class, "FAMTerminator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getFAMTerminator_Data(), this.getFunctionalData(), this.getFunctionalData_Terminator(), "data", null, 0, 1, FAMTerminator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -503,9 +512,9 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F initEReference(getInformationLink_From(), this.getFunctionalOutput(), this.getFunctionalOutput_OutgoingLinks(), "from", null, 0, 1, InformationLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getInformationLink_To(), this.getFunctionalInput(), this.getFunctionalInput_IncomingLinks(), "to", null, 1, 1, InformationLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(functionalInterfaceEClass, FunctionalInterface.class, "FunctionalInterface", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getFunctionalInterface_Data(), this.getFunctionalData(), this.getFunctionalData_Interface(), "data", null, 0, -1, FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getFunctionalInterface_Element(), this.getFunctionalElement(), this.getFunctionalElement_Interface(), "element", null, 0, 1, FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(functionalInterfaceEClass, functionalarchitecture.FunctionalInterface.class, "FunctionalInterface", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getFunctionalInterface_Data(), this.getFunctionalData(), this.getFunctionalData_Interface(), "data", null, 0, -1, functionalarchitecture.FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getFunctionalInterface_Element(), this.getFunctionalElement(), this.getFunctionalElement_Interface(), "element", null, 0, 1, functionalarchitecture.FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(functionalInputEClass, FunctionalInput.class, "FunctionalInput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getFunctionalInput_IncomingLinks(), this.getInformationLink(), this.getInformationLink_To(), "IncomingLinks", null, 0, -1, FunctionalInput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -516,6 +525,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F initEClass(functionalDataEClass, FunctionalData.class, "FunctionalData", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getFunctionalData_Terminator(), this.getFAMTerminator(), this.getFAMTerminator_Data(), "terminator", null, 0, 1, FunctionalData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getFunctionalData_Interface(), this.getFunctionalInterface(), this.getFunctionalInterface_Data(), "interface", null, 0, 1, FunctionalData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getFunctionalData_Value(), ecorePackage.getEInt(), "value", null, 1, 1, FunctionalData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Initialize enums and add enum literals initEEnum(functionTypeEEnum, FunctionType.class, "FunctionType"); @@ -540,12 +550,12 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F * @generated */ protected void createEcoreAnnotations() { - String source = "http://www.eclipse.org/emf/2002/Ecore"; + String source = "http://www.eclipse.org/emf/2002/Ecore"; addAnnotation - (this, - source, + (this, + source, new String[] { - "settingDelegates", "org.eclipse.viatra.query.querybasedfeature" + "settingDelegates", "org.eclipse.viatra.query.querybasedfeature" }); } @@ -556,18 +566,18 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F * @generated */ protected void createOrgAnnotations() { - String source = "org.eclipse.viatra.query.querybasedfeature"; + String source = "org.eclipse.viatra.query.querybasedfeature"; addAnnotation - (getFunctionalElement_Model(), - source, + (getFunctionalElement_Model(), + source, new String[] { - "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.model" - }); + "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.model" + }); addAnnotation - (getFunction_Type(), - source, + (getFunction_Type(), + source, new String[] { - "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.type" + "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.type" }); } diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java index f990a7a4..9846bd62 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java @@ -2,9 +2,15 @@ */ package functionalarchitecture.util; -import functionalarchitecture.*; -import functionalarchitecture.FunctionalInterface; - +import functionalarchitecture.FAMTerminator; +import functionalarchitecture.Function; +import functionalarchitecture.FunctionalArchitectureModel; +import functionalarchitecture.FunctionalData; +import functionalarchitecture.FunctionalElement; +import functionalarchitecture.FunctionalInput; +import functionalarchitecture.FunctionalOutput; +import functionalarchitecture.FunctionalarchitecturePackage; +import functionalarchitecture.InformationLink; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; @@ -89,7 +95,7 @@ public class FunctionalarchitectureAdapterFactory extends AdapterFactoryImpl { return createInformationLinkAdapter(); } @Override - public Adapter caseFunctionalInterface(FunctionalInterface object) { + public Adapter caseFunctionalInterface(functionalarchitecture.FunctionalInterface object) { return createFunctionalInterfaceAdapter(); } @Override diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java index b481a978..a1bbb480 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java +++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java @@ -2,9 +2,15 @@ */ package functionalarchitecture.util; -import functionalarchitecture.*; -import functionalarchitecture.FunctionalInterface; - +import functionalarchitecture.FAMTerminator; +import functionalarchitecture.Function; +import functionalarchitecture.FunctionalArchitectureModel; +import functionalarchitecture.FunctionalData; +import functionalarchitecture.FunctionalElement; +import functionalarchitecture.FunctionalInput; +import functionalarchitecture.FunctionalOutput; +import functionalarchitecture.FunctionalarchitecturePackage; +import functionalarchitecture.InformationLink; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; @@ -99,7 +105,7 @@ public class FunctionalarchitectureSwitch extends Switch { return result; } case FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE: { - FunctionalInterface functionalInterface = (FunctionalInterface)theEObject; + functionalarchitecture.FunctionalInterface functionalInterface = (functionalarchitecture.FunctionalInterface)theEObject; T result = caseFunctionalInterface(functionalInterface); if (result == null) result = defaultCase(theEObject); return result; @@ -214,7 +220,7 @@ public class FunctionalarchitectureSwitch extends Switch { * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseFunctionalInterface(FunctionalInterface object) { + public T caseFunctionalInterface(functionalarchitecture.FunctionalInterface object) { return null; } diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore index 5f638164..89fbcfcb 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore +++ b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore @@ -1,6 +1,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5d1165ce... VAMPIRE: Implement Vampire measurement code +======= + + + +

+ + + + + +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> 4d27f278... VAMPIRE: last commit diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.genmodel b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.genmodel index 9d89c145..bd428811 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.genmodel +++ b/Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.genmodel @@ -43,6 +43,7 @@ + diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml index 04702ac5..d4dfa1c9 100644 --- a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml +++ b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml @@ -1,6 +1,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD @@ -78,3 +79,23 @@ >>>>>>> 5d1165ce... VAMPIRE: Implement Vampire measurement code +======= + + + + + + + + + + + + + + + +>>>>>>> 4d27f278... VAMPIRE: last commit -- cgit v1.2.3-54-g00ecf