Translated PQueryies are added to annotation.

4 files changed, 119 insertions, 1 deletions

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/TransfomedViatraQuery.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/TransfomedViatraQuery.java
index 9eb911d5..717b0436 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/TransfomedViatraQuery.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/TransfomedViatraQuery.java
@@ -14,6 +14,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.RelationAnnotation;
  * </p>

  * <ul>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getPatternFullyQualifiedName <em>Pattern Fully Qualified Name</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getPatternPQuery <em>Pattern PQuery</em>}</li>

  * </ul>

  *

  * @see hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage#getTransfomedViatraQuery()

@@ -47,4 +48,30 @@ public interface TransfomedViatraQuery extends RelationAnnotation {
          * @generated

          */

         void setPatternFullyQualifiedName(String value);

+

+        /**

+         * Returns the value of the '<em><b>Pattern PQuery</b></em>' attribute.

+         * <!-- begin-user-doc -->

+         * <p>

+         * If the meaning of the '<em>Pattern PQuery</em>' attribute isn't clear,

+         * there really should be more of a description here...

+         * </p>

+         * <!-- end-user-doc -->

+         * @return the value of the '<em>Pattern PQuery</em>' attribute.

+         * @see #setPatternPQuery(Object)

+         * @see hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage#getTransfomedViatraQuery_PatternPQuery()

+         * @model required="true" transient="true"

+         * @generated

+         */

+        Object getPatternPQuery();

+

+        /**

+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getPatternPQuery <em>Pattern PQuery</em>}' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @param value the new value of the '<em>Pattern PQuery</em>' attribute.

+         * @see #getPatternPQuery()

+         * @generated

+         */

+        void setPatternPQuery(Object value);

 } // TransfomedViatraQuery

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/Viatra2LogicAnnotationsPackage.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/Viatra2LogicAnnotationsPackage.java
index 0c3de242..97df7608 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/Viatra2LogicAnnotationsPackage.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/Viatra2LogicAnnotationsPackage.java
@@ -87,13 +87,22 @@ public interface Viatra2LogicAnnotationsPackage extends EPackage {
         int TRANSFOMED_VIATRA_QUERY__PATTERN_FULLY_QUALIFIED_NAME = LogicproblemPackage.RELATION_ANNOTATION_FEATURE_COUNT + 0;

 

         /**

+         * The feature id for the '<em><b>Pattern PQuery</b></em>' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         * @ordered

+         */

+        int TRANSFOMED_VIATRA_QUERY__PATTERN_PQUERY = LogicproblemPackage.RELATION_ANNOTATION_FEATURE_COUNT + 1;

+

+        /**

          * The number of structural features of the '<em>Transfomed Viatra Query</em>' class.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @generated

          * @ordered

          */

-        int TRANSFOMED_VIATRA_QUERY_FEATURE_COUNT = LogicproblemPackage.RELATION_ANNOTATION_FEATURE_COUNT + 1;

+        int TRANSFOMED_VIATRA_QUERY_FEATURE_COUNT = LogicproblemPackage.RELATION_ANNOTATION_FEATURE_COUNT + 2;

 

         /**

          * The number of operations of the '<em>Transfomed Viatra Query</em>' class.

@@ -220,6 +229,17 @@ public interface Viatra2LogicAnnotationsPackage extends EPackage {
         EAttribute getTransfomedViatraQuery_PatternFullyQualifiedName();

 

         /**

+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getPatternPQuery <em>Pattern PQuery</em>}'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return the meta object for the attribute '<em>Pattern PQuery</em>'.

+         * @see hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransfomedViatraQuery#getPatternPQuery()

+         * @see #getTransfomedViatraQuery()

+         * @generated

+         */

+        EAttribute getTransfomedViatraQuery_PatternPQuery();

+

+        /**

          * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.TransformedViatraWellformednessConstraint <em>Transformed Viatra Wellformedness Constraint</em>}'.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -303,6 +323,14 @@ public interface Viatra2LogicAnnotationsPackage extends EPackage {
                 EAttribute TRANSFOMED_VIATRA_QUERY__PATTERN_FULLY_QUALIFIED_NAME = eINSTANCE.getTransfomedViatraQuery_PatternFullyQualifiedName();

 

                 /**

+                 * The meta object literal for the '<em><b>Pattern PQuery</b></em>' attribute feature.

+                 * <!-- begin-user-doc -->

+                 * <!-- end-user-doc -->

+                 * @generated

+                 */

+                EAttribute TRANSFOMED_VIATRA_QUERY__PATTERN_PQUERY = eINSTANCE.getTransfomedViatraQuery_PatternPQuery();

+

+                /**

                  * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl.TransformedViatraWellformednessConstraintImpl <em>Transformed Viatra Wellformedness Constraint</em>}' class.

                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/TransfomedViatraQueryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/TransfomedViatraQueryImpl.java
index f0d18ee9..d7f9ff68 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/TransfomedViatraQueryImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/TransfomedViatraQueryImpl.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * </p>

  * <ul>

  *   <li>{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl.TransfomedViatraQueryImpl#getPatternFullyQualifiedName <em>Pattern Fully Qualified Name</em>}</li>

+ *   <li>{@link hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl.TransfomedViatraQueryImpl#getPatternPQuery <em>Pattern PQuery</em>}</li>

  * </ul>

  *

  * @generated

@@ -45,6 +46,24 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements
         protected String patternFullyQualifiedName = PATTERN_FULLY_QUALIFIED_NAME_EDEFAULT;

 

         /**

+         * The default value of the '{@link #getPatternPQuery() <em>Pattern PQuery</em>}' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @see #getPatternPQuery()

+         * @generated

+         * @ordered

+         */

+        protected static final Object PATTERN_PQUERY_EDEFAULT = null;

+        /**

+         * The cached value of the '{@link #getPatternPQuery() <em>Pattern PQuery</em>}' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @see #getPatternPQuery()

+         * @generated

+         * @ordered

+         */

+        protected Object patternPQuery = PATTERN_PQUERY_EDEFAULT;

+        /**

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @generated

@@ -89,11 +108,34 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements
          * <!-- end-user-doc -->

          * @generated

          */

+        public Object getPatternPQuery() {

+                return patternPQuery;

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        public void setPatternPQuery(Object newPatternPQuery) {

+                Object oldPatternPQuery = patternPQuery;

+                patternPQuery = newPatternPQuery;

+                if (eNotificationRequired())

+                        eNotify(new ENotificationImpl(this, Notification.SET, Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__PATTERN_PQUERY, oldPatternPQuery, patternPQuery));

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

                         case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__PATTERN_FULLY_QUALIFIED_NAME:

                                 return getPatternFullyQualifiedName();

+                        case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__PATTERN_PQUERY:

+                                return getPatternPQuery();

                 }

                 return super.eGet(featureID, resolve, coreType);

         }

@@ -109,6 +151,9 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements
                         case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__PATTERN_FULLY_QUALIFIED_NAME:

                                 setPatternFullyQualifiedName((String)newValue);

                                 return;

+                        case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__PATTERN_PQUERY:

+                                setPatternPQuery(newValue);

+                                return;

                 }

                 super.eSet(featureID, newValue);

         }

@@ -124,6 +169,9 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements
                         case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__PATTERN_FULLY_QUALIFIED_NAME:

                                 setPatternFullyQualifiedName(PATTERN_FULLY_QUALIFIED_NAME_EDEFAULT);

                                 return;

+                        case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__PATTERN_PQUERY:

+                                setPatternPQuery(PATTERN_PQUERY_EDEFAULT);

+                                return;

                 }

                 super.eUnset(featureID);

         }

@@ -138,6 +186,8 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements
                 switch (featureID) {

                         case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__PATTERN_FULLY_QUALIFIED_NAME:

                                 return PATTERN_FULLY_QUALIFIED_NAME_EDEFAULT == null ? patternFullyQualifiedName != null : !PATTERN_FULLY_QUALIFIED_NAME_EDEFAULT.equals(patternFullyQualifiedName);

+                        case Viatra2LogicAnnotationsPackage.TRANSFOMED_VIATRA_QUERY__PATTERN_PQUERY:

+                                return PATTERN_PQUERY_EDEFAULT == null ? patternPQuery != null : !PATTERN_PQUERY_EDEFAULT.equals(patternPQuery);

                 }

                 return super.eIsSet(featureID);

         }

@@ -154,6 +204,8 @@ public class TransfomedViatraQueryImpl extends RelationAnnotationImpl implements
                 StringBuffer result = new StringBuffer(super.toString());

                 result.append(" (patternFullyQualifiedName: ");

                 result.append(patternFullyQualifiedName);

+                result.append(", patternPQuery: ");

+                result.append(patternPQuery);

                 result.append(')');

                 return result.toString();

         }

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/Viatra2LogicAnnotationsPackageImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/Viatra2LogicAnnotationsPackageImpl.java
index b6992bf9..06965e87 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/Viatra2LogicAnnotationsPackageImpl.java
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/ecore-gen/hu/bme/mit/inf/dslreasoner/viatra2logic/viatra2logicannotations/impl/Viatra2LogicAnnotationsPackageImpl.java
@@ -135,6 +135,15 @@ public class Viatra2LogicAnnotationsPackageImpl extends EPackageImpl implements
          * <!-- end-user-doc -->

          * @generated

          */

+        public EAttribute getTransfomedViatraQuery_PatternPQuery() {

+                return (EAttribute)transfomedViatraQueryEClass.getEStructuralFeatures().get(1);

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

         public EClass getTransformedViatraWellformednessConstraint() {

                 return transformedViatraWellformednessConstraintEClass;

         }

@@ -196,6 +205,7 @@ public class Viatra2LogicAnnotationsPackageImpl extends EPackageImpl implements
                 // Create classes and their features

                 transfomedViatraQueryEClass = createEClass(TRANSFOMED_VIATRA_QUERY);

                 createEAttribute(transfomedViatraQueryEClass, TRANSFOMED_VIATRA_QUERY__PATTERN_FULLY_QUALIFIED_NAME);

+                createEAttribute(transfomedViatraQueryEClass, TRANSFOMED_VIATRA_QUERY__PATTERN_PQUERY);

 

                 transformedViatraWellformednessConstraintEClass = createEClass(TRANSFORMED_VIATRA_WELLFORMEDNESS_CONSTRAINT);

                 createEReference(transformedViatraWellformednessConstraintEClass, TRANSFORMED_VIATRA_WELLFORMEDNESS_CONSTRAINT__QUERY);

@@ -242,6 +252,7 @@ public class Viatra2LogicAnnotationsPackageImpl extends EPackageImpl implements
                 // Initialize classes, features, and operations; add parameters

                 initEClass(transfomedViatraQueryEClass, TransfomedViatraQuery.class, "TransfomedViatraQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 initEAttribute(getTransfomedViatraQuery_PatternFullyQualifiedName(), ecorePackage.getEString(), "patternFullyQualifiedName", null, 1, 1, TransfomedViatraQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEAttribute(getTransfomedViatraQuery_PatternPQuery(), ecorePackage.getEJavaObject(), "patternPQuery", null, 1, 1, TransfomedViatraQuery.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

                 initEClass(transformedViatraWellformednessConstraintEClass, TransformedViatraWellformednessConstraint.class, "TransformedViatraWellformednessConstraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 initEReference(getTransformedViatraWellformednessConstraint_Query(), this.getTransfomedViatraQuery(), null, "query", null, 1, 1, TransformedViatraWellformednessConstraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);