diff --git a/emf_datamodel/model/iPos_Datamodel.aird b/emf_datamodel/model/iPos_Datamodel.aird
index be0d88cbb52e1c3311a142dedfcfc1c303a785b2..6cc9afa543b94738765e2262b2b9f739498f0012 100644
--- a/emf_datamodel/model/iPos_Datamodel.aird
+++ b/emf_datamodel/model/iPos_Datamodel.aird
@@ -5,7 +5,7 @@
<semanticResources>iPos_Datamodel.genmodel</semanticResources>
<ownedViews xmi:type="viewpoint:DView" uid="_EpwecAQNEey-kNQ7esRa_g">
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
- <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_Et4wgAQNEey-kNQ7esRa_g" name="iPos_Datamodel" repPath="#_Es-xkAQNEey-kNQ7esRa_g" changeId="4b573575-dd6c-4a51-8a05-adc49daf7af5">
+ <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_Et4wgAQNEey-kNQ7esRa_g" name="iPos_Datamodel" repPath="#_Es-xkAQNEey-kNQ7esRa_g" changeId="de9b3043-b6a3-4d89-afc7-963d67701d45">
<description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
<target xmi:type="ecore:EPackage" href="iPos_Datamodel.ecore#/"/>
</ownedRepresentationDescriptors>
@@ -673,14 +673,6 @@
<styles xmi:type="notation:FontStyle" xmi:id="_1t7TQRE8EeydeasO1RaQEg" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_1t7TQhE8EeydeasO1RaQEg"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_GKgacBE9EeydeasO1RaQEg" type="3010" element="_GJ1sEBE9EeydeasO1RaQEg">
- <styles xmi:type="notation:FontStyle" xmi:id="_GKgacRE9EeydeasO1RaQEg" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_GKgachE9EeydeasO1RaQEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_RTTT0BE9EeydeasO1RaQEg" type="3010" element="_RSvTIBE9EeydeasO1RaQEg">
- <styles xmi:type="notation:FontStyle" xmi:id="_RTTT0RE9EeydeasO1RaQEg" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_RTTT0hE9EeydeasO1RaQEg"/>
- </children>
<children xmi:type="notation:Node" xmi:id="_Wz2yUBE9EeydeasO1RaQEg" type="3010" element="_WzdJsBE9EeydeasO1RaQEg">
<styles xmi:type="notation:FontStyle" xmi:id="_Wz2yURE9EeydeasO1RaQEg" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_Wz2yUhE9EeydeasO1RaQEg"/>
@@ -709,6 +701,14 @@
<styles xmi:type="notation:FontStyle" xmi:id="_1GpwsRFkEeydeasO1RaQEg" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_1GpwshFkEeydeasO1RaQEg"/>
</children>
+ <children xmi:type="notation:Node" xmi:id="_eKDl0B_NEeyaJIyxidrtuQ" type="3010" element="_eIgtsB_NEeyaJIyxidrtuQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_eKDl0R_NEeyaJIyxidrtuQ" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_eKDl0h_NEeyaJIyxidrtuQ"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_iWqJIB_NEeyaJIyxidrtuQ" type="3010" element="_iWX1QB_NEeyaJIyxidrtuQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_iWqJIR_NEeyaJIyxidrtuQ" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_iWqJIh_NEeyaJIyxidrtuQ"/>
+ </children>
<styles xmi:type="notation:SortingStyle" xmi:id="_D9ZrhQc-Eey-kNQ7esRa_g"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_D9Zrhgc-Eey-kNQ7esRa_g"/>
</children>
@@ -2800,7 +2800,7 @@
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
- <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_7MmbTRFkEeydeasO1RaQEg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+ <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_l8_WqR_NEeyaJIyxidrtuQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
@@ -2812,22 +2812,6 @@
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
</ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" uid="_GJ1sEBE9EeydeasO1RaQEg" name="categoryCondition : StringList" tooltipText="">
- <target xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//EventFilterCondition/categoryCondition"/>
- <semanticElements xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//EventFilterCondition/categoryCondition"/>
- <ownedStyle xmi:type="diagram:BundledImage" uid="_LfaCkxE9EeydeasO1RaQEg" labelAlignment="LEFT">
- <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
- </ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" uid="_RSvTIBE9EeydeasO1RaQEg" name="idCondition : StringList" tooltipText="">
- <target xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//EventFilterCondition/idCondition"/>
- <semanticElements xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//EventFilterCondition/idCondition"/>
- <ownedStyle xmi:type="diagram:BundledImage" uid="_WX3Z5xE9EeydeasO1RaQEg" labelAlignment="LEFT">
- <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
- </ownedElements>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_WzdJsBE9EeydeasO1RaQEg" name="accuracyCondition : Float = 0.0" tooltipText="">
<target xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//EventFilterCondition/accuracyCondition"/>
<semanticElements xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//EventFilterCondition/accuracyCondition"/>
@@ -2884,6 +2868,22 @@
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
</ownedElements>
+ <ownedElements xmi:type="diagram:DNodeListElement" uid="_eIgtsB_NEeyaJIyxidrtuQ" name="idCondition : StringList" tooltipText="">
+ <target xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//EventFilterCondition/idCondition"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//EventFilterCondition/idCondition"/>
+ <ownedStyle xmi:type="diagram:BundledImage" uid="_hcgOBR_NEeyaJIyxidrtuQ" labelAlignment="LEFT">
+ <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+ </ownedStyle>
+ <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+ </ownedElements>
+ <ownedElements xmi:type="diagram:DNodeListElement" uid="_iWX1QB_NEeyaJIyxidrtuQ" name="categoryCondition : StringList" tooltipText="">
+ <target xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//EventFilterCondition/categoryCondition"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="iPos_Datamodel.ecore#//EventFilterCondition/categoryCondition"/>
+ <ownedStyle xmi:type="diagram:BundledImage" uid="_l9EPIx_NEeyaJIyxidrtuQ" labelAlignment="LEFT">
+ <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+ </ownedStyle>
+ <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+ </ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_JkOxSgc-Eey-kNQ7esRa_g" name="[0..*] eventfiltercondition" sourceNode="_IOFwkAZtEey-kNQ7esRa_g" targetNode="_D9Ka8Ac-Eey-kNQ7esRa_g">
<target xmi:type="ecore:EReference" href="iPos_Datamodel.ecore#//EventFilterConfiguration/eventfiltercondition"/>
diff --git a/emf_datamodel/model/iPos_Datamodel.ecore b/emf_datamodel/model/iPos_Datamodel.ecore
index 86ed28d5c41cacb3417b5b9e58d8fa5f49ead4b9..f77db0cd0f2356def153cc681bd32a3ea438bec2 100644
--- a/emf_datamodel/model/iPos_Datamodel.ecore
+++ b/emf_datamodel/model/iPos_Datamodel.ecore
@@ -220,10 +220,6 @@
<eClassifiers xsi:type="ecore:EClass" name="EventFilterCondition">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="timeCondition" eType="#//StringArray"
transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="categoryCondition" eType="#//StringList"
- transient="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="idCondition" eType="#//StringList"
- transient="true" defaultValueLiteral=""/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="accuracyCondition" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Float"
transient="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="positionCondition" eType="#//FloatArray"
@@ -237,6 +233,8 @@
transient="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="positionConditionCell"
eType="#//FloatArray3d"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="idCondition" eType="#//StringList"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="categoryCondition" eType="#//StringList"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EDataType" name="StringList" instanceClassName="java.util.List<java.lang.String>"/>
<eClassifiers xsi:type="ecore:EDataType" name="StringArray" instanceClassName="java.util.ArrayList<java.lang.String[]>"/>
diff --git a/emf_datamodel/model/iPos_Datamodel.genmodel b/emf_datamodel/model/iPos_Datamodel.genmodel
index 3fb36f94dda2251710a79b43308ad03fe3a27c0a..1b9e4b44f00fc48dce02e561b6479f714866c741 100644
--- a/emf_datamodel/model/iPos_Datamodel.genmodel
+++ b/emf_datamodel/model/iPos_Datamodel.genmodel
@@ -170,8 +170,6 @@
</genClasses>
<genClasses ecoreClass="iPos_Datamodel.ecore#//EventFilterCondition">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterCondition/timeCondition"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterCondition/categoryCondition"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterCondition/idCondition"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterCondition/accuracyCondition"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterCondition/positionCondition"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterCondition/timeMinInterval"/>
@@ -179,6 +177,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterCondition/sensorIdCondition"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterCondition/filterStructure"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterCondition/positionConditionCell"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterCondition/idCondition"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute iPos_Datamodel.ecore#//EventFilterCondition/categoryCondition"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/EventFilterCondition.java b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/EventFilterCondition.java
index 6aea00da4db647c20055103d4232a441c7d95bc5..873e353f53a3c20815d13640638dad094b88628c 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/EventFilterCondition.java
+++ b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/EventFilterCondition.java
@@ -17,8 +17,6 @@ import org.eclipse.emf.ecore.EObject;
* </p>
* <ul>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getTimeCondition <em>Time Condition</em>}</li>
- * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}</li>
- * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}</li>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getAccuracyCondition <em>Accuracy Condition</em>}</li>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionCondition <em>Position Condition</em>}</li>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getTimeMinInterval <em>Time Min Interval</em>}</li>
@@ -26,6 +24,8 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getSensorIdCondition <em>Sensor Id Condition</em>}</li>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getFilterStructure <em>Filter Structure</em>}</li>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getPositionConditionCell <em>Position Condition Cell</em>}</li>
+ * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}</li>
+ * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}</li>
* </ul>
*
* @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition()
@@ -55,51 +55,6 @@ public interface EventFilterCondition extends EObject {
*/
void setTimeCondition(ArrayList<String[]> value);
- /**
- * Returns the value of the '<em><b>Category Condition</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the value of the '<em>Category Condition</em>' attribute.
- * @see #setCategoryCondition(List)
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_CategoryCondition()
- * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.StringList" transient="true"
- * @generated
- */
- List<String> getCategoryCondition();
-
- /**
- * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Category Condition</em>' attribute.
- * @see #getCategoryCondition()
- * @generated
- */
- void setCategoryCondition(List<String> value);
-
- /**
- * Returns the value of the '<em><b>Id Condition</b></em>' attribute.
- * The default value is <code>""</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the value of the '<em>Id Condition</em>' attribute.
- * @see #setIdCondition(List)
- * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_IdCondition()
- * @model default="" dataType="ipos.project.DataModellntegration.iPos_Datamodel.StringList" transient="true"
- * @generated
- */
- List<String> getIdCondition();
-
- /**
- * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Id Condition</em>' attribute.
- * @see #getIdCondition()
- * @generated
- */
- void setIdCondition(List<String> value);
-
/**
* Returns the value of the '<em><b>Accuracy Condition</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -254,4 +209,48 @@ public interface EventFilterCondition extends EObject {
*/
void setPositionConditionCell(ArrayList<Float[][]> value);
+ /**
+ * Returns the value of the '<em><b>Id Condition</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Id Condition</em>' attribute.
+ * @see #setIdCondition(List)
+ * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_IdCondition()
+ * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.StringList"
+ * @generated
+ */
+ List<String> getIdCondition();
+
+ /**
+ * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Id Condition</em>' attribute.
+ * @see #getIdCondition()
+ * @generated
+ */
+ void setIdCondition(List<String> value);
+
+ /**
+ * Returns the value of the '<em><b>Category Condition</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Category Condition</em>' attribute.
+ * @see #setCategoryCondition(List)
+ * @see ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage#getEventFilterCondition_CategoryCondition()
+ * @model dataType="ipos.project.DataModellntegration.iPos_Datamodel.StringList"
+ * @generated
+ */
+ List<String> getCategoryCondition();
+
+ /**
+ * Sets the value of the '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Category Condition</em>' attribute.
+ * @see #getCategoryCondition()
+ * @generated
+ */
+ void setCategoryCondition(List<String> value);
+
} // EventFilterCondition
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPos_DatamodelPackage.java b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPos_DatamodelPackage.java
index 94aeabefaf41b9be198ce864557b437377b3acda..f3913e5bc6e45073c062644fddc7c06291151196 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPos_DatamodelPackage.java
+++ b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/IPos_DatamodelPackage.java
@@ -2320,85 +2320,85 @@ public interface IPos_DatamodelPackage extends EPackage {
int EVENT_FILTER_CONDITION__TIME_CONDITION = 0;
/**
- * The feature id for the '<em><b>Category Condition</b></em>' attribute.
+ * The feature id for the '<em><b>Accuracy Condition</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EVENT_FILTER_CONDITION__CATEGORY_CONDITION = 1;
+ int EVENT_FILTER_CONDITION__ACCURACY_CONDITION = 1;
/**
- * The feature id for the '<em><b>Id Condition</b></em>' attribute.
+ * The feature id for the '<em><b>Position Condition</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EVENT_FILTER_CONDITION__ID_CONDITION = 2;
+ int EVENT_FILTER_CONDITION__POSITION_CONDITION = 2;
/**
- * The feature id for the '<em><b>Accuracy Condition</b></em>' attribute.
+ * The feature id for the '<em><b>Time Min Interval</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EVENT_FILTER_CONDITION__ACCURACY_CONDITION = 3;
+ int EVENT_FILTER_CONDITION__TIME_MIN_INTERVAL = 3;
/**
- * The feature id for the '<em><b>Position Condition</b></em>' attribute.
+ * The feature id for the '<em><b>Position Delta</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EVENT_FILTER_CONDITION__POSITION_CONDITION = 4;
+ int EVENT_FILTER_CONDITION__POSITION_DELTA = 4;
/**
- * The feature id for the '<em><b>Time Min Interval</b></em>' attribute.
+ * The feature id for the '<em><b>Sensor Id Condition</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EVENT_FILTER_CONDITION__TIME_MIN_INTERVAL = 5;
+ int EVENT_FILTER_CONDITION__SENSOR_ID_CONDITION = 5;
/**
- * The feature id for the '<em><b>Position Delta</b></em>' attribute.
+ * The feature id for the '<em><b>Filter Structure</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EVENT_FILTER_CONDITION__POSITION_DELTA = 6;
+ int EVENT_FILTER_CONDITION__FILTER_STRUCTURE = 6;
/**
- * The feature id for the '<em><b>Sensor Id Condition</b></em>' attribute.
+ * The feature id for the '<em><b>Position Condition Cell</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EVENT_FILTER_CONDITION__SENSOR_ID_CONDITION = 7;
+ int EVENT_FILTER_CONDITION__POSITION_CONDITION_CELL = 7;
/**
- * The feature id for the '<em><b>Filter Structure</b></em>' attribute.
+ * The feature id for the '<em><b>Id Condition</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EVENT_FILTER_CONDITION__FILTER_STRUCTURE = 8;
+ int EVENT_FILTER_CONDITION__ID_CONDITION = 8;
/**
- * The feature id for the '<em><b>Position Condition Cell</b></em>' attribute.
+ * The feature id for the '<em><b>Category Condition</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int EVENT_FILTER_CONDITION__POSITION_CONDITION_CELL = 9;
+ int EVENT_FILTER_CONDITION__CATEGORY_CONDITION = 9;
/**
* The number of structural features of the '<em>Event Filter Condition</em>' class.
@@ -3781,28 +3781,6 @@ public interface IPos_DatamodelPackage extends EPackage {
*/
EAttribute getEventFilterCondition_TimeCondition();
- /**
- * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Category Condition</em>'.
- * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition()
- * @see #getEventFilterCondition()
- * @generated
- */
- EAttribute getEventFilterCondition_CategoryCondition();
-
- /**
- * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id Condition</em>'.
- * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition()
- * @see #getEventFilterCondition()
- * @generated
- */
- EAttribute getEventFilterCondition_IdCondition();
-
/**
* Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getAccuracyCondition <em>Accuracy Condition</em>}'.
* <!-- begin-user-doc -->
@@ -3880,6 +3858,28 @@ public interface IPos_DatamodelPackage extends EPackage {
*/
EAttribute getEventFilterCondition_PositionConditionCell();
+ /**
+ * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition <em>Id Condition</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Id Condition</em>'.
+ * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getIdCondition()
+ * @see #getEventFilterCondition()
+ * @generated
+ */
+ EAttribute getEventFilterCondition_IdCondition();
+
+ /**
+ * Returns the meta object for the attribute '{@link ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition <em>Category Condition</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Category Condition</em>'.
+ * @see ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition#getCategoryCondition()
+ * @see #getEventFilterCondition()
+ * @generated
+ */
+ EAttribute getEventFilterCondition_CategoryCondition();
+
/**
* Returns the meta object for data type '{@link java.util.List <em>String List</em>}'.
* <!-- begin-user-doc -->
@@ -5043,22 +5043,6 @@ public interface IPos_DatamodelPackage extends EPackage {
*/
EAttribute EVENT_FILTER_CONDITION__TIME_CONDITION = eINSTANCE.getEventFilterCondition_TimeCondition();
- /**
- * The meta object literal for the '<em><b>Category Condition</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute EVENT_FILTER_CONDITION__CATEGORY_CONDITION = eINSTANCE.getEventFilterCondition_CategoryCondition();
-
- /**
- * The meta object literal for the '<em><b>Id Condition</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute EVENT_FILTER_CONDITION__ID_CONDITION = eINSTANCE.getEventFilterCondition_IdCondition();
-
/**
* The meta object literal for the '<em><b>Accuracy Condition</b></em>' attribute feature.
* <!-- begin-user-doc -->
@@ -5116,6 +5100,22 @@ public interface IPos_DatamodelPackage extends EPackage {
EAttribute EVENT_FILTER_CONDITION__POSITION_CONDITION_CELL = eINSTANCE
.getEventFilterCondition_PositionConditionCell();
+ /**
+ * The meta object literal for the '<em><b>Id Condition</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute EVENT_FILTER_CONDITION__ID_CONDITION = eINSTANCE.getEventFilterCondition_IdCondition();
+
+ /**
+ * The meta object literal for the '<em><b>Category Condition</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute EVENT_FILTER_CONDITION__CATEGORY_CONDITION = eINSTANCE.getEventFilterCondition_CategoryCondition();
+
/**
* The meta object literal for the '<em>String List</em>' data type.
* <!-- begin-user-doc -->
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EventFilterConditionImpl.java b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EventFilterConditionImpl.java
index 69a103f555e34241ec5e1a126c9285708c83ee92..28bae6c07777838ddece605b19e99e8e782666ff 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EventFilterConditionImpl.java
+++ b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/EventFilterConditionImpl.java
@@ -3,7 +3,6 @@
package ipos.project.DataModellntegration.iPos_Datamodel.impl;
import ipos.project.DataModellntegration.iPos_Datamodel.EventFilterCondition;
-import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelFactory;
import ipos.project.DataModellntegration.iPos_Datamodel.IPos_DatamodelPackage;
import java.util.ArrayList;
@@ -25,8 +24,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* </p>
* <ul>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getTimeCondition <em>Time Condition</em>}</li>
- * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getCategoryCondition <em>Category Condition</em>}</li>
- * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getIdCondition <em>Id Condition</em>}</li>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getAccuracyCondition <em>Accuracy Condition</em>}</li>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getPositionCondition <em>Position Condition</em>}</li>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getTimeMinInterval <em>Time Min Interval</em>}</li>
@@ -34,6 +31,8 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getSensorIdCondition <em>Sensor Id Condition</em>}</li>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getFilterStructure <em>Filter Structure</em>}</li>
* <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getPositionConditionCell <em>Position Condition Cell</em>}</li>
+ * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getIdCondition <em>Id Condition</em>}</li>
+ * <li>{@link ipos.project.DataModellntegration.iPos_Datamodel.impl.EventFilterConditionImpl#getCategoryCondition <em>Category Condition</em>}</li>
* </ul>
*
* @generated
@@ -59,47 +58,6 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
*/
protected ArrayList<String[]> timeCondition = TIME_CONDITION_EDEFAULT;
- /**
- * The default value of the '{@link #getCategoryCondition() <em>Category Condition</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCategoryCondition()
- * @generated
- * @ordered
- */
- protected static final List<String> CATEGORY_CONDITION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getCategoryCondition() <em>Category Condition</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCategoryCondition()
- * @generated
- * @ordered
- */
- protected List<String> categoryCondition = CATEGORY_CONDITION_EDEFAULT;
-
- /**
- * The default value of the '{@link #getIdCondition() <em>Id Condition</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIdCondition()
- * @generated
- * @ordered
- */
- protected static final List<String> ID_CONDITION_EDEFAULT = (List<String>) IPos_DatamodelFactory.eINSTANCE
- .createFromString(IPos_DatamodelPackage.eINSTANCE.getStringList(), "");
-
- /**
- * The cached value of the '{@link #getIdCondition() <em>Id Condition</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIdCondition()
- * @generated
- * @ordered
- */
- protected List<String> idCondition = ID_CONDITION_EDEFAULT;
-
/**
* The default value of the '{@link #getAccuracyCondition() <em>Accuracy Condition</em>}' attribute.
* <!-- begin-user-doc -->
@@ -241,53 +199,52 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
protected ArrayList<Float[][]> positionConditionCell = POSITION_CONDITION_CELL_EDEFAULT;
/**
+ * The default value of the '{@link #getIdCondition() <em>Id Condition</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see #getIdCondition()
* @generated
+ * @ordered
*/
- protected EventFilterConditionImpl() {
- super();
- }
+ protected static final List<String> ID_CONDITION_EDEFAULT = null;
/**
+ * The cached value of the '{@link #getIdCondition() <em>Id Condition</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see #getIdCondition()
* @generated
+ * @ordered
*/
- @Override
- protected EClass eStaticClass() {
- return IPos_DatamodelPackage.Literals.EVENT_FILTER_CONDITION;
- }
+ protected List<String> idCondition = ID_CONDITION_EDEFAULT;
/**
+ * The default value of the '{@link #getCategoryCondition() <em>Category Condition</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see #getCategoryCondition()
* @generated
+ * @ordered
*/
- public ArrayList<String[]> getTimeCondition() {
- return timeCondition;
- }
+ protected static final List<String> CATEGORY_CONDITION_EDEFAULT = null;
/**
+ * The cached value of the '{@link #getCategoryCondition() <em>Category Condition</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see #getCategoryCondition()
* @generated
+ * @ordered
*/
- public void setTimeCondition(ArrayList<String[]> newTimeCondition) {
- ArrayList<String[]> oldTimeCondition = timeCondition;
- timeCondition = newTimeCondition;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- IPos_DatamodelPackage.EVENT_FILTER_CONDITION__TIME_CONDITION, oldTimeCondition, timeCondition));
- }
+ protected List<String> categoryCondition = CATEGORY_CONDITION_EDEFAULT;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public List<String> getCategoryCondition() {
- return categoryCondition;
+ protected EventFilterConditionImpl() {
+ super();
}
/**
@@ -295,13 +252,9 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
* <!-- end-user-doc -->
* @generated
*/
- public void setCategoryCondition(List<String> newCategoryCondition) {
- List<String> oldCategoryCondition = categoryCondition;
- categoryCondition = newCategoryCondition;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- IPos_DatamodelPackage.EVENT_FILTER_CONDITION__CATEGORY_CONDITION, oldCategoryCondition,
- categoryCondition));
+ @Override
+ protected EClass eStaticClass() {
+ return IPos_DatamodelPackage.Literals.EVENT_FILTER_CONDITION;
}
/**
@@ -309,8 +262,8 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
* <!-- end-user-doc -->
* @generated
*/
- public List<String> getIdCondition() {
- return idCondition;
+ public ArrayList<String[]> getTimeCondition() {
+ return timeCondition;
}
/**
@@ -318,12 +271,12 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
* <!-- end-user-doc -->
* @generated
*/
- public void setIdCondition(List<String> newIdCondition) {
- List<String> oldIdCondition = idCondition;
- idCondition = newIdCondition;
+ public void setTimeCondition(ArrayList<String[]> newTimeCondition) {
+ ArrayList<String[]> oldTimeCondition = timeCondition;
+ timeCondition = newTimeCondition;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET,
- IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ID_CONDITION, oldIdCondition, idCondition));
+ IPos_DatamodelPackage.EVENT_FILTER_CONDITION__TIME_CONDITION, oldTimeCondition, timeCondition));
}
/**
@@ -486,6 +439,51 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
positionConditionCell));
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public List<String> getIdCondition() {
+ return idCondition;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setIdCondition(List<String> newIdCondition) {
+ List<String> oldIdCondition = idCondition;
+ idCondition = newIdCondition;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ID_CONDITION, oldIdCondition, idCondition));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public List<String> getCategoryCondition() {
+ return categoryCondition;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setCategoryCondition(List<String> newCategoryCondition) {
+ List<String> oldCategoryCondition = categoryCondition;
+ categoryCondition = newCategoryCondition;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ IPos_DatamodelPackage.EVENT_FILTER_CONDITION__CATEGORY_CONDITION, oldCategoryCondition,
+ categoryCondition));
+ }
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -496,10 +494,6 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
switch (featureID) {
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__TIME_CONDITION:
return getTimeCondition();
- case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__CATEGORY_CONDITION:
- return getCategoryCondition();
- case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ID_CONDITION:
- return getIdCondition();
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ACCURACY_CONDITION:
return getAccuracyCondition();
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__POSITION_CONDITION:
@@ -514,6 +508,10 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
return getFilterStructure();
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__POSITION_CONDITION_CELL:
return getPositionConditionCell();
+ case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ID_CONDITION:
+ return getIdCondition();
+ case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__CATEGORY_CONDITION:
+ return getCategoryCondition();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -530,12 +528,6 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__TIME_CONDITION:
setTimeCondition((ArrayList<String[]>) newValue);
return;
- case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__CATEGORY_CONDITION:
- setCategoryCondition((List<String>) newValue);
- return;
- case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ID_CONDITION:
- setIdCondition((List<String>) newValue);
- return;
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ACCURACY_CONDITION:
setAccuracyCondition((Float) newValue);
return;
@@ -557,6 +549,12 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__POSITION_CONDITION_CELL:
setPositionConditionCell((ArrayList<Float[][]>) newValue);
return;
+ case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ID_CONDITION:
+ setIdCondition((List<String>) newValue);
+ return;
+ case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__CATEGORY_CONDITION:
+ setCategoryCondition((List<String>) newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -572,12 +570,6 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__TIME_CONDITION:
setTimeCondition(TIME_CONDITION_EDEFAULT);
return;
- case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__CATEGORY_CONDITION:
- setCategoryCondition(CATEGORY_CONDITION_EDEFAULT);
- return;
- case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ID_CONDITION:
- setIdCondition(ID_CONDITION_EDEFAULT);
- return;
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ACCURACY_CONDITION:
setAccuracyCondition(ACCURACY_CONDITION_EDEFAULT);
return;
@@ -599,6 +591,12 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__POSITION_CONDITION_CELL:
setPositionConditionCell(POSITION_CONDITION_CELL_EDEFAULT);
return;
+ case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ID_CONDITION:
+ setIdCondition(ID_CONDITION_EDEFAULT);
+ return;
+ case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__CATEGORY_CONDITION:
+ setCategoryCondition(CATEGORY_CONDITION_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -614,11 +612,6 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__TIME_CONDITION:
return TIME_CONDITION_EDEFAULT == null ? timeCondition != null
: !TIME_CONDITION_EDEFAULT.equals(timeCondition);
- case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__CATEGORY_CONDITION:
- return CATEGORY_CONDITION_EDEFAULT == null ? categoryCondition != null
- : !CATEGORY_CONDITION_EDEFAULT.equals(categoryCondition);
- case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ID_CONDITION:
- return ID_CONDITION_EDEFAULT == null ? idCondition != null : !ID_CONDITION_EDEFAULT.equals(idCondition);
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ACCURACY_CONDITION:
return accuracyCondition != ACCURACY_CONDITION_EDEFAULT;
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__POSITION_CONDITION:
@@ -637,6 +630,11 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__POSITION_CONDITION_CELL:
return POSITION_CONDITION_CELL_EDEFAULT == null ? positionConditionCell != null
: !POSITION_CONDITION_CELL_EDEFAULT.equals(positionConditionCell);
+ case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__ID_CONDITION:
+ return ID_CONDITION_EDEFAULT == null ? idCondition != null : !ID_CONDITION_EDEFAULT.equals(idCondition);
+ case IPos_DatamodelPackage.EVENT_FILTER_CONDITION__CATEGORY_CONDITION:
+ return CATEGORY_CONDITION_EDEFAULT == null ? categoryCondition != null
+ : !CATEGORY_CONDITION_EDEFAULT.equals(categoryCondition);
}
return super.eIsSet(featureID);
}
@@ -654,10 +652,6 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
StringBuilder result = new StringBuilder(super.toString());
result.append(" (timeCondition: ");
result.append(timeCondition);
- result.append(", categoryCondition: ");
- result.append(categoryCondition);
- result.append(", idCondition: ");
- result.append(idCondition);
result.append(", accuracyCondition: ");
result.append(accuracyCondition);
result.append(", positionCondition: ");
@@ -672,6 +666,10 @@ public class EventFilterConditionImpl extends MinimalEObjectImpl.Container imple
result.append(filterStructure);
result.append(", positionConditionCell: ");
result.append(positionConditionCell);
+ result.append(", idCondition: ");
+ result.append(idCondition);
+ result.append(", categoryCondition: ");
+ result.append(categoryCondition);
result.append(')');
return result.toString();
}
diff --git a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IPos_DatamodelPackageImpl.java b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IPos_DatamodelPackageImpl.java
index 6136dba349959eaa09de9e4053bb7c6c5ce0140d..5d8b8e12511982bfdd736e45f59a8a7811271473 100644
--- a/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IPos_DatamodelPackageImpl.java
+++ b/src/main/java/ipos/project/DataModellntegration/iPos_Datamodel/impl/IPos_DatamodelPackageImpl.java
@@ -1620,7 +1620,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getEventFilterCondition_CategoryCondition() {
+ public EAttribute getEventFilterCondition_AccuracyCondition() {
return (EAttribute) eventFilterConditionEClass.getEStructuralFeatures().get(1);
}
@@ -1629,7 +1629,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getEventFilterCondition_IdCondition() {
+ public EAttribute getEventFilterCondition_PositionCondition() {
return (EAttribute) eventFilterConditionEClass.getEStructuralFeatures().get(2);
}
@@ -1638,7 +1638,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getEventFilterCondition_AccuracyCondition() {
+ public EAttribute getEventFilterCondition_TimeMinInterval() {
return (EAttribute) eventFilterConditionEClass.getEStructuralFeatures().get(3);
}
@@ -1647,7 +1647,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getEventFilterCondition_PositionCondition() {
+ public EAttribute getEventFilterCondition_PositionDelta() {
return (EAttribute) eventFilterConditionEClass.getEStructuralFeatures().get(4);
}
@@ -1656,7 +1656,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getEventFilterCondition_TimeMinInterval() {
+ public EAttribute getEventFilterCondition_SensorIdCondition() {
return (EAttribute) eventFilterConditionEClass.getEStructuralFeatures().get(5);
}
@@ -1665,7 +1665,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getEventFilterCondition_PositionDelta() {
+ public EAttribute getEventFilterCondition_FilterStructure() {
return (EAttribute) eventFilterConditionEClass.getEStructuralFeatures().get(6);
}
@@ -1674,7 +1674,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getEventFilterCondition_SensorIdCondition() {
+ public EAttribute getEventFilterCondition_PositionConditionCell() {
return (EAttribute) eventFilterConditionEClass.getEStructuralFeatures().get(7);
}
@@ -1683,7 +1683,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getEventFilterCondition_FilterStructure() {
+ public EAttribute getEventFilterCondition_IdCondition() {
return (EAttribute) eventFilterConditionEClass.getEStructuralFeatures().get(8);
}
@@ -1692,7 +1692,7 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getEventFilterCondition_PositionConditionCell() {
+ public EAttribute getEventFilterCondition_CategoryCondition() {
return (EAttribute) eventFilterConditionEClass.getEStructuralFeatures().get(9);
}
@@ -1940,8 +1940,6 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
eventFilterConditionEClass = createEClass(EVENT_FILTER_CONDITION);
createEAttribute(eventFilterConditionEClass, EVENT_FILTER_CONDITION__TIME_CONDITION);
- createEAttribute(eventFilterConditionEClass, EVENT_FILTER_CONDITION__CATEGORY_CONDITION);
- createEAttribute(eventFilterConditionEClass, EVENT_FILTER_CONDITION__ID_CONDITION);
createEAttribute(eventFilterConditionEClass, EVENT_FILTER_CONDITION__ACCURACY_CONDITION);
createEAttribute(eventFilterConditionEClass, EVENT_FILTER_CONDITION__POSITION_CONDITION);
createEAttribute(eventFilterConditionEClass, EVENT_FILTER_CONDITION__TIME_MIN_INTERVAL);
@@ -1949,6 +1947,8 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
createEAttribute(eventFilterConditionEClass, EVENT_FILTER_CONDITION__SENSOR_ID_CONDITION);
createEAttribute(eventFilterConditionEClass, EVENT_FILTER_CONDITION__FILTER_STRUCTURE);
createEAttribute(eventFilterConditionEClass, EVENT_FILTER_CONDITION__POSITION_CONDITION_CELL);
+ createEAttribute(eventFilterConditionEClass, EVENT_FILTER_CONDITION__ID_CONDITION);
+ createEAttribute(eventFilterConditionEClass, EVENT_FILTER_CONDITION__CATEGORY_CONDITION);
// Create data types
stringListEDataType = createEDataType(STRING_LIST);
@@ -2380,12 +2380,6 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
initEAttribute(getEventFilterCondition_TimeCondition(), this.getStringArray(), "timeCondition", null, 0, 1,
EventFilterCondition.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getEventFilterCondition_CategoryCondition(), this.getStringList(), "categoryCondition", null, 0,
- 1, EventFilterCondition.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getEventFilterCondition_IdCondition(), this.getStringList(), "idCondition", "", 0, 1,
- EventFilterCondition.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getEventFilterCondition_AccuracyCondition(), theXMLTypePackage.getFloat(), "accuracyCondition",
null, 0, 1, EventFilterCondition.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2407,6 +2401,12 @@ public class IPos_DatamodelPackageImpl extends EPackageImpl implements IPos_Data
initEAttribute(getEventFilterCondition_PositionConditionCell(), this.getFloatArray3d(), "positionConditionCell",
null, 0, 1, EventFilterCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getEventFilterCondition_IdCondition(), this.getStringList(), "idCondition", null, 0, 1,
+ EventFilterCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getEventFilterCondition_CategoryCondition(), this.getStringList(), "categoryCondition", null, 0,
+ 1, EventFilterCondition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Initialize data types
initEDataType(stringListEDataType, List.class, "StringList", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS,