Header Label
@@ -1041,6 +983,30 @@ public interface TablePackage extends EPackage {
*/
EClass getCellDescription();
+ /**
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.sirius.components.view.table.CellDescription#getName Name}'.
+ *
+ *
+ * @return the meta object for the attribute 'Name'.
+ * @generated
+ * @see org.eclipse.sirius.components.view.table.CellDescription#getName()
+ * @see #getCellDescription()
+ */
+ EAttribute getCellDescription_Name();
+
+ /**
+ * Returns the meta object for the attribute
+ * '{@link org.eclipse.sirius.components.view.table.CellDescription#getPreconditionExpression Precondition
+ * Expression}'.
+ *
+ * @return the meta object for the attribute 'Precondition Expression'.
+ * @generated
+ * @see org.eclipse.sirius.components.view.table.CellDescription#getPreconditionExpression()
+ * @see #getCellDescription()
+ */
+ EAttribute getCellDescription_PreconditionExpression();
+
/**
* Returns the meta object for the attribute
* '{@link org.eclipse.sirius.components.view.table.CellDescription#getValueExpression Value Expression}'.
@@ -1289,15 +1255,14 @@ interface Literals {
EReference TABLE_DESCRIPTION__CELL_DESCRIPTIONS = eINSTANCE.getTableDescription_CellDescriptions();
/**
- * The meta object literal for the
- * '{@link org.eclipse.sirius.components.view.table.impl.TableElementDescriptionImpl Element
- * Description}' class.
+ * The meta object literal for the '{@link org.eclipse.sirius.components.view.table.impl.ColumnDescriptionImpl
+ * Column Description}' class.
*
* @generated
- * @see org.eclipse.sirius.components.view.table.impl.TableElementDescriptionImpl
- * @see org.eclipse.sirius.components.view.table.impl.TablePackageImpl#getTableElementDescription()
+ * @see org.eclipse.sirius.components.view.table.impl.ColumnDescriptionImpl
+ * @see org.eclipse.sirius.components.view.table.impl.TablePackageImpl#getColumnDescription()
*/
- EClass TABLE_ELEMENT_DESCRIPTION = eINSTANCE.getTableElementDescription();
+ EClass COLUMN_DESCRIPTION = eINSTANCE.getColumnDescription();
/**
* The meta object literal for the 'Name' attribute feature.
- *
- * @generated
- * @see org.eclipse.sirius.components.view.table.impl.ColumnDescriptionImpl
- * @see org.eclipse.sirius.components.view.table.impl.TablePackageImpl#getColumnDescription()
- */
- EClass COLUMN_DESCRIPTION = eINSTANCE.getColumnDescription();
+ EAttribute COLUMN_DESCRIPTION__PRECONDITION_EXPRESSION = eINSTANCE.getColumnDescription_PreconditionExpression();
/**
* The meta object literal for the 'Header Index Label Expression' attribute feature.
+ *
+ * @generated
+ */
+ EAttribute ROW_DESCRIPTION__NAME = eINSTANCE.getRowDescription_Name();
+
+ /**
+ * The meta object literal for the 'Pagination Predicate Expression' attribute feature.
+ *
+ * @generated
+ */
+ EAttribute ROW_DESCRIPTION__PAGINATION_PREDICATE_EXPRESSION = eINSTANCE.getRowDescription_PaginationPredicateExpression();
+
+ /**
+ * The meta object literal for the 'Semantic Candidates Expression' attribute feature.
+ *
+ * @generated
+ */
+ EAttribute ROW_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION = eINSTANCE.getRowDescription_SemanticCandidatesExpression();
+
/**
* The meta object literal for the 'Header Label Expression' attribute feature.
@@ -1457,6 +1436,22 @@ interface Literals {
*/
EClass CELL_DESCRIPTION = eINSTANCE.getCellDescription();
+ /**
+ * The meta object literal for the 'Name' attribute feature.
+ *
+ * @generated
+ */
+ EAttribute CELL_DESCRIPTION__NAME = eINSTANCE.getCellDescription_Name();
+
+ /**
+ * The meta object literal for the 'Precondition Expression' attribute feature.
+ *
+ * @generated
+ */
+ EAttribute CELL_DESCRIPTION__PRECONDITION_EXPRESSION = eINSTANCE.getCellDescription_PreconditionExpression();
+
/**
* The meta object literal for the 'Value Expression' attribute feature.
*
diff --git a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/CellDescriptionImpl.java b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/CellDescriptionImpl.java
index 9116ab3d1f..2f199f80ce 100644
--- a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/CellDescriptionImpl.java
+++ b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/CellDescriptionImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2024 CEA LIST.
+ * Copyright (c) 2024, 2025 CEA LIST.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.sirius.components.view.table.CellDescription;
import org.eclipse.sirius.components.view.table.CellWidgetDescription;
import org.eclipse.sirius.components.view.table.TablePackage;
@@ -38,28 +39,35 @@
*
* @generated
*/
-public class CellDescriptionImpl extends TableElementDescriptionImpl implements CellDescription {
+public class CellDescriptionImpl extends MinimalEObjectImpl.Container implements CellDescription {
/**
- * The default value of the '{@link #getValueExpression() Value Expression}' attribute.
+ * The default value of the '{@link #getName() Name}' attribute.
*
- * @see #getValueExpression()
* @generated
* @ordered
+ * @see #getName()
*/
- protected static final String VALUE_EXPRESSION_EDEFAULT = "";
-
+ protected static final String NAME_EDEFAULT = null;
/**
- * The cached value of the '{@link #getValueExpression() Value Expression}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getPreconditionExpression()
+ */
+ protected static final String PRECONDITION_EXPRESSION_EDEFAULT = "";
+ /**
+ * The default value of the '{@link #getValueExpression() Value Expression}' attribute.
*
- * @see #getValueExpression()
* @generated
* @ordered
+ * @see #getValueExpression()
*/
- protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
-
+ protected static final String VALUE_EXPRESSION_EDEFAULT = "";
/**
* The default value of the '{@link #getTooltipExpression() Tooltip Expression}' attribute.
@@ -69,7 +77,33 @@ public class CellDescriptionImpl extends TableElementDescriptionImpl implements
* @see #getTooltipExpression()
*/
protected static final String TOOLTIP_EXPRESSION_EDEFAULT = "";
-
+ /**
+ * The cached value of the '{@link #getName() Name}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getName()
+ */
+ protected String name = NAME_EDEFAULT;
+ /**
+ * The cached value of the '{@link #getPreconditionExpression() Precondition Expression}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getPreconditionExpression()
+ */
+ protected String preconditionExpression = PRECONDITION_EXPRESSION_EDEFAULT;
+ /**
+ * The cached value of the '{@link #getValueExpression() Value Expression}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getValueExpression()
+ */
+ protected String valueExpression = VALUE_EXPRESSION_EDEFAULT;
/**
* The cached value of the '{@link #getTooltipExpression() Tooltip Expression}' attribute.
@@ -84,9 +118,9 @@ public class CellDescriptionImpl extends TableElementDescriptionImpl implements
* The cached value of the '{@link #getCellWidgetDescription() Cell Widget Description}' containment
* reference.
*
- * @see #getCellWidgetDescription()
* @generated
* @ordered
+ * @see #getCellWidgetDescription()
*/
protected CellWidgetDescription cellWidgetDescription;
@@ -109,6 +143,52 @@ protected EClass eStaticClass() {
return TablePackage.Literals.CELL_DESCRIPTION;
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getName() {
+ return this.name;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setName(String newName) {
+ String oldName = this.name;
+ this.name = newName;
+ if (this.eNotificationRequired())
+ this.eNotify(new ENotificationImpl(this, Notification.SET, TablePackage.CELL_DESCRIPTION__NAME, oldName, this.name));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getPreconditionExpression() {
+ return this.preconditionExpression;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setPreconditionExpression(String newPreconditionExpression) {
+ String oldPreconditionExpression = this.preconditionExpression;
+ this.preconditionExpression = newPreconditionExpression;
+ if (this.eNotificationRequired())
+ this.eNotify(new ENotificationImpl(this, Notification.SET, TablePackage.CELL_DESCRIPTION__PRECONDITION_EXPRESSION, oldPreconditionExpression, this.preconditionExpression));
+ }
+
/**
*
*
@@ -225,6 +305,10 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
+ case TablePackage.CELL_DESCRIPTION__NAME:
+ return this.getName();
+ case TablePackage.CELL_DESCRIPTION__PRECONDITION_EXPRESSION:
+ return this.getPreconditionExpression();
case TablePackage.CELL_DESCRIPTION__VALUE_EXPRESSION:
return this.getValueExpression();
case TablePackage.CELL_DESCRIPTION__TOOLTIP_EXPRESSION:
@@ -243,6 +327,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
+ case TablePackage.CELL_DESCRIPTION__NAME:
+ this.setName((String) newValue);
+ return;
+ case TablePackage.CELL_DESCRIPTION__PRECONDITION_EXPRESSION:
+ this.setPreconditionExpression((String) newValue);
+ return;
case TablePackage.CELL_DESCRIPTION__VALUE_EXPRESSION:
this.setValueExpression((String) newValue);
return;
@@ -264,6 +354,12 @@ public void eSet(int featureID, Object newValue) {
@Override
public void eUnset(int featureID) {
switch (featureID) {
+ case TablePackage.CELL_DESCRIPTION__NAME:
+ this.setName(NAME_EDEFAULT);
+ return;
+ case TablePackage.CELL_DESCRIPTION__PRECONDITION_EXPRESSION:
+ this.setPreconditionExpression(PRECONDITION_EXPRESSION_EDEFAULT);
+ return;
case TablePackage.CELL_DESCRIPTION__VALUE_EXPRESSION:
this.setValueExpression(VALUE_EXPRESSION_EDEFAULT);
return;
@@ -285,6 +381,10 @@ public void eUnset(int featureID) {
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
+ case TablePackage.CELL_DESCRIPTION__NAME:
+ return NAME_EDEFAULT == null ? this.name != null : !NAME_EDEFAULT.equals(this.name);
+ case TablePackage.CELL_DESCRIPTION__PRECONDITION_EXPRESSION:
+ return PRECONDITION_EXPRESSION_EDEFAULT == null ? this.preconditionExpression != null : !PRECONDITION_EXPRESSION_EDEFAULT.equals(this.preconditionExpression);
case TablePackage.CELL_DESCRIPTION__VALUE_EXPRESSION:
return VALUE_EXPRESSION_EDEFAULT == null ? this.valueExpression != null : !VALUE_EXPRESSION_EDEFAULT.equals(this.valueExpression);
case TablePackage.CELL_DESCRIPTION__TOOLTIP_EXPRESSION:
@@ -306,7 +406,11 @@ public String toString() {
return super.toString();
StringBuilder result = new StringBuilder(super.toString());
- result.append(" (valueExpression: ");
+ result.append(" (name: ");
+ result.append(this.name);
+ result.append(", preconditionExpression: ");
+ result.append(this.preconditionExpression);
+ result.append(", valueExpression: ");
result.append(this.valueExpression);
result.append(", tooltipExpression: ");
result.append(this.tooltipExpression);
diff --git a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/ColumnDescriptionImpl.java b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/ColumnDescriptionImpl.java
index cf70dd37b9..8844f26c8d 100644
--- a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/ColumnDescriptionImpl.java
+++ b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/ColumnDescriptionImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2024 CEA LIST.
+ * Copyright (c) 2024, 2025 CEA LIST.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -15,6 +15,7 @@
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.sirius.components.view.table.ColumnDescription;
import org.eclipse.sirius.components.view.table.TablePackage;
@@ -41,8 +42,44 @@
*
* @generated
*/
-public class ColumnDescriptionImpl extends TableElementDescriptionImpl implements ColumnDescription {
+public class ColumnDescriptionImpl extends MinimalEObjectImpl.Container implements ColumnDescription {
+ /**
+ * The default value of the '{@link #getName() Name}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getName()
+ */
+ protected static final String NAME_EDEFAULT = null;
+ /**
+ * The default value of the '{@link #getDomainType() Domain Type}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getDomainType()
+ */
+ protected static final String DOMAIN_TYPE_EDEFAULT = "";
+ /**
+ * The default value of the '{@link #getSemanticCandidatesExpression() Semantic Candidates Expression}'
+ * attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getSemanticCandidatesExpression()
+ */
+ protected static final String SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT = null;
+ /**
+ * The default value of the '{@link #getPreconditionExpression() Precondition Expression}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getPreconditionExpression()
+ */
+ protected static final String PRECONDITION_EXPRESSION_EDEFAULT = "";
/**
* The default value of the '{@link #getHeaderIndexLabelExpression() Header Index Label Expression}'
* attribute.
@@ -97,6 +134,42 @@ public class ColumnDescriptionImpl extends TableElementDescriptionImpl implement
* @see #getFilterWidgetExpression()
*/
protected static final String FILTER_WIDGET_EXPRESSION_EDEFAULT = "";
+ /**
+ * The cached value of the '{@link #getName() Name}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getName()
+ */
+ protected String name = NAME_EDEFAULT;
+ /**
+ * The cached value of the '{@link #getDomainType() Domain Type}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getDomainType()
+ */
+ protected String domainType = DOMAIN_TYPE_EDEFAULT;
+ /**
+ * The cached value of the '{@link #getSemanticCandidatesExpression() Semantic Candidates Expression}'
+ * attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getSemanticCandidatesExpression()
+ */
+ protected String semanticCandidatesExpression = SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT;
+ /**
+ * The cached value of the '{@link #getPreconditionExpression() Precondition Expression}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getPreconditionExpression()
+ */
+ protected String preconditionExpression = PRECONDITION_EXPRESSION_EDEFAULT;
/**
* The cached value of the '{@link #getHeaderIndexLabelExpression() Header Index Label Expression}'
* attribute.
@@ -171,6 +244,99 @@ protected EClass eStaticClass() {
return TablePackage.Literals.COLUMN_DESCRIPTION;
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getName() {
+ return this.name;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setName(String newName) {
+ String oldName = this.name;
+ this.name = newName;
+ if (this.eNotificationRequired())
+ this.eNotify(new ENotificationImpl(this, Notification.SET, TablePackage.COLUMN_DESCRIPTION__NAME, oldName, this.name));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getDomainType() {
+ return this.domainType;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setDomainType(String newDomainType) {
+ String oldDomainType = this.domainType;
+ this.domainType = newDomainType;
+ if (this.eNotificationRequired())
+ this.eNotify(new ENotificationImpl(this, Notification.SET, TablePackage.COLUMN_DESCRIPTION__DOMAIN_TYPE, oldDomainType, this.domainType));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getSemanticCandidatesExpression() {
+ return this.semanticCandidatesExpression;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setSemanticCandidatesExpression(String newSemanticCandidatesExpression) {
+ String oldSemanticCandidatesExpression = this.semanticCandidatesExpression;
+ this.semanticCandidatesExpression = newSemanticCandidatesExpression;
+ if (this.eNotificationRequired())
+ this.eNotify(
+ new ENotificationImpl(this, Notification.SET, TablePackage.COLUMN_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION, oldSemanticCandidatesExpression, this.semanticCandidatesExpression));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getPreconditionExpression() {
+ return this.preconditionExpression;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setPreconditionExpression(String newPreconditionExpression) {
+ String oldPreconditionExpression = this.preconditionExpression;
+ this.preconditionExpression = newPreconditionExpression;
+ if (this.eNotificationRequired())
+ this.eNotify(new ENotificationImpl(this, Notification.SET, TablePackage.COLUMN_DESCRIPTION__PRECONDITION_EXPRESSION, oldPreconditionExpression, this.preconditionExpression));
+ }
+
/**
*
*
@@ -317,6 +483,14 @@ public void setFilterWidgetExpression(String newFilterWidgetExpression) {
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
+ case TablePackage.COLUMN_DESCRIPTION__NAME:
+ return this.getName();
+ case TablePackage.COLUMN_DESCRIPTION__DOMAIN_TYPE:
+ return this.getDomainType();
+ case TablePackage.COLUMN_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
+ return this.getSemanticCandidatesExpression();
+ case TablePackage.COLUMN_DESCRIPTION__PRECONDITION_EXPRESSION:
+ return this.getPreconditionExpression();
case TablePackage.COLUMN_DESCRIPTION__HEADER_INDEX_LABEL_EXPRESSION:
return this.getHeaderIndexLabelExpression();
case TablePackage.COLUMN_DESCRIPTION__HEADER_LABEL_EXPRESSION:
@@ -341,6 +515,18 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
+ case TablePackage.COLUMN_DESCRIPTION__NAME:
+ this.setName((String) newValue);
+ return;
+ case TablePackage.COLUMN_DESCRIPTION__DOMAIN_TYPE:
+ this.setDomainType((String) newValue);
+ return;
+ case TablePackage.COLUMN_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
+ this.setSemanticCandidatesExpression((String) newValue);
+ return;
+ case TablePackage.COLUMN_DESCRIPTION__PRECONDITION_EXPRESSION:
+ this.setPreconditionExpression((String) newValue);
+ return;
case TablePackage.COLUMN_DESCRIPTION__HEADER_INDEX_LABEL_EXPRESSION:
this.setHeaderIndexLabelExpression((String) newValue);
return;
@@ -371,6 +557,18 @@ public void eSet(int featureID, Object newValue) {
@Override
public void eUnset(int featureID) {
switch (featureID) {
+ case TablePackage.COLUMN_DESCRIPTION__NAME:
+ this.setName(NAME_EDEFAULT);
+ return;
+ case TablePackage.COLUMN_DESCRIPTION__DOMAIN_TYPE:
+ this.setDomainType(DOMAIN_TYPE_EDEFAULT);
+ return;
+ case TablePackage.COLUMN_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
+ this.setSemanticCandidatesExpression(SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT);
+ return;
+ case TablePackage.COLUMN_DESCRIPTION__PRECONDITION_EXPRESSION:
+ this.setPreconditionExpression(PRECONDITION_EXPRESSION_EDEFAULT);
+ return;
case TablePackage.COLUMN_DESCRIPTION__HEADER_INDEX_LABEL_EXPRESSION:
this.setHeaderIndexLabelExpression(HEADER_INDEX_LABEL_EXPRESSION_EDEFAULT);
return;
@@ -401,6 +599,14 @@ public void eUnset(int featureID) {
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
+ case TablePackage.COLUMN_DESCRIPTION__NAME:
+ return NAME_EDEFAULT == null ? this.name != null : !NAME_EDEFAULT.equals(this.name);
+ case TablePackage.COLUMN_DESCRIPTION__DOMAIN_TYPE:
+ return DOMAIN_TYPE_EDEFAULT == null ? this.domainType != null : !DOMAIN_TYPE_EDEFAULT.equals(this.domainType);
+ case TablePackage.COLUMN_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
+ return SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT == null ? this.semanticCandidatesExpression != null : !SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT.equals(this.semanticCandidatesExpression);
+ case TablePackage.COLUMN_DESCRIPTION__PRECONDITION_EXPRESSION:
+ return PRECONDITION_EXPRESSION_EDEFAULT == null ? this.preconditionExpression != null : !PRECONDITION_EXPRESSION_EDEFAULT.equals(this.preconditionExpression);
case TablePackage.COLUMN_DESCRIPTION__HEADER_INDEX_LABEL_EXPRESSION:
return HEADER_INDEX_LABEL_EXPRESSION_EDEFAULT == null ? this.headerIndexLabelExpression != null : !HEADER_INDEX_LABEL_EXPRESSION_EDEFAULT.equals(this.headerIndexLabelExpression);
case TablePackage.COLUMN_DESCRIPTION__HEADER_LABEL_EXPRESSION:
@@ -427,20 +633,29 @@ public String toString() {
if (this.eIsProxy())
return super.toString();
- String result = super.toString() + " (headerIndexLabelExpression: " +
- this.headerIndexLabelExpression +
- ", headerLabelExpression: " +
- this.headerLabelExpression +
- ", headerIconExpression: " +
- this.headerIconExpression +
- ", initialWidthExpression: " +
- this.initialWidthExpression +
- ", isResizableExpression: " +
- this.isResizableExpression +
- ", filterWidgetExpression: " +
- this.filterWidgetExpression +
- ')';
- return result;
+ StringBuilder result = new StringBuilder(super.toString());
+ result.append(" (name: ");
+ result.append(this.name);
+ result.append(", domainType: ");
+ result.append(this.domainType);
+ result.append(", semanticCandidatesExpression: ");
+ result.append(this.semanticCandidatesExpression);
+ result.append(", preconditionExpression: ");
+ result.append(this.preconditionExpression);
+ result.append(", headerIndexLabelExpression: ");
+ result.append(this.headerIndexLabelExpression);
+ result.append(", headerLabelExpression: ");
+ result.append(this.headerLabelExpression);
+ result.append(", headerIconExpression: ");
+ result.append(this.headerIconExpression);
+ result.append(", initialWidthExpression: ");
+ result.append(this.initialWidthExpression);
+ result.append(", isResizableExpression: ");
+ result.append(this.isResizableExpression);
+ result.append(", filterWidgetExpression: ");
+ result.append(this.filterWidgetExpression);
+ result.append(')');
+ return result.toString();
}
} // ColumnDescriptionImpl
diff --git a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/RowDescriptionImpl.java b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/RowDescriptionImpl.java
index cd64a76e32..38626f1314 100644
--- a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/RowDescriptionImpl.java
+++ b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/RowDescriptionImpl.java
@@ -21,6 +21,7 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.sirius.components.view.table.RowContextMenuEntry;
@@ -42,8 +43,35 @@
*
* @generated
*/
-public class RowDescriptionImpl extends TableElementDescriptionImpl implements RowDescription {
+public class RowDescriptionImpl extends MinimalEObjectImpl.Container implements RowDescription {
+ /**
+ * The default value of the '{@link #getName() Name}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getName()
+ */
+ protected static final String NAME_EDEFAULT = null;
+ /**
+ * The default value of the '{@link #getPaginationPredicateExpression() Pagination Predicate Expression}'
+ * attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getPaginationPredicateExpression()
+ */
+ protected static final String PAGINATION_PREDICATE_EXPRESSION_EDEFAULT = "";
+ /**
+ * The default value of the '{@link #getSemanticCandidatesExpression() Semantic Candidates Expression}'
+ * attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getSemanticCandidatesExpression()
+ */
+ protected static final String SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT = "";
/**
* The default value of the '{@link #getHeaderLabelExpression() Header Label Expression}' attribute.
@@ -89,6 +117,33 @@ public class RowDescriptionImpl extends TableElementDescriptionImpl implements R
* @see #getIsResizableExpression()
*/
protected static final String IS_RESIZABLE_EXPRESSION_EDEFAULT = "";
+ /**
+ * The cached value of the '{@link #getName() Name}' attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getName()
+ */
+ protected String name = NAME_EDEFAULT;
+ /**
+ * The cached value of the '{@link #getPaginationPredicateExpression() Pagination Predicate Expression}'
+ * attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getPaginationPredicateExpression()
+ */
+ protected String paginationPredicateExpression = PAGINATION_PREDICATE_EXPRESSION_EDEFAULT;
+ /**
+ * The cached value of the '{@link #getSemanticCandidatesExpression() Semantic Candidates Expression}'
+ * attribute.
+ *
+ * @generated
+ * @ordered
+ * @see #getSemanticCandidatesExpression()
+ */
+ protected String semanticCandidatesExpression = SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT;
/**
* The cached value of the '{@link #getHeaderLabelExpression() Header Label Expression}' attribute.
@@ -164,6 +219,77 @@ protected EClass eStaticClass() {
return TablePackage.Literals.ROW_DESCRIPTION;
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getName() {
+ return this.name;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setName(String newName) {
+ String oldName = this.name;
+ this.name = newName;
+ if (this.eNotificationRequired())
+ this.eNotify(new ENotificationImpl(this, Notification.SET, TablePackage.ROW_DESCRIPTION__NAME, oldName, this.name));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getPaginationPredicateExpression() {
+ return this.paginationPredicateExpression;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setPaginationPredicateExpression(String newPaginationPredicateExpression) {
+ String oldPaginationPredicateExpression = this.paginationPredicateExpression;
+ this.paginationPredicateExpression = newPaginationPredicateExpression;
+ if (this.eNotificationRequired())
+ this.eNotify(
+ new ENotificationImpl(this, Notification.SET, TablePackage.ROW_DESCRIPTION__PAGINATION_PREDICATE_EXPRESSION, oldPaginationPredicateExpression, this.paginationPredicateExpression));
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getSemanticCandidatesExpression() {
+ return this.semanticCandidatesExpression;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setSemanticCandidatesExpression(String newSemanticCandidatesExpression) {
+ String oldSemanticCandidatesExpression = this.semanticCandidatesExpression;
+ this.semanticCandidatesExpression = newSemanticCandidatesExpression;
+ if (this.eNotificationRequired())
+ this.eNotify(
+ new ENotificationImpl(this, Notification.SET, TablePackage.ROW_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION, oldSemanticCandidatesExpression, this.semanticCandidatesExpression));
+ }
+
/**
*
*
@@ -314,6 +440,12 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
+ case TablePackage.ROW_DESCRIPTION__NAME:
+ return this.getName();
+ case TablePackage.ROW_DESCRIPTION__PAGINATION_PREDICATE_EXPRESSION:
+ return this.getPaginationPredicateExpression();
+ case TablePackage.ROW_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
+ return this.getSemanticCandidatesExpression();
case TablePackage.ROW_DESCRIPTION__HEADER_LABEL_EXPRESSION:
return this.getHeaderLabelExpression();
case TablePackage.ROW_DESCRIPTION__HEADER_ICON_EXPRESSION:
@@ -339,6 +471,15 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
+ case TablePackage.ROW_DESCRIPTION__NAME:
+ this.setName((String) newValue);
+ return;
+ case TablePackage.ROW_DESCRIPTION__PAGINATION_PREDICATE_EXPRESSION:
+ this.setPaginationPredicateExpression((String) newValue);
+ return;
+ case TablePackage.ROW_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
+ this.setSemanticCandidatesExpression((String) newValue);
+ return;
case TablePackage.ROW_DESCRIPTION__HEADER_LABEL_EXPRESSION:
this.setHeaderLabelExpression((String) newValue);
return;
@@ -370,6 +511,15 @@ public void eSet(int featureID, Object newValue) {
@Override
public void eUnset(int featureID) {
switch (featureID) {
+ case TablePackage.ROW_DESCRIPTION__NAME:
+ this.setName(NAME_EDEFAULT);
+ return;
+ case TablePackage.ROW_DESCRIPTION__PAGINATION_PREDICATE_EXPRESSION:
+ this.setPaginationPredicateExpression(PAGINATION_PREDICATE_EXPRESSION_EDEFAULT);
+ return;
+ case TablePackage.ROW_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
+ this.setSemanticCandidatesExpression(SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT);
+ return;
case TablePackage.ROW_DESCRIPTION__HEADER_LABEL_EXPRESSION:
this.setHeaderLabelExpression(HEADER_LABEL_EXPRESSION_EDEFAULT);
return;
@@ -400,6 +550,13 @@ public void eUnset(int featureID) {
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
+ case TablePackage.ROW_DESCRIPTION__NAME:
+ return !Objects.equals(NAME_EDEFAULT, this.name);
+ case TablePackage.ROW_DESCRIPTION__PAGINATION_PREDICATE_EXPRESSION:
+ return PAGINATION_PREDICATE_EXPRESSION_EDEFAULT == null ? this.paginationPredicateExpression != null
+ : !PAGINATION_PREDICATE_EXPRESSION_EDEFAULT.equals(this.paginationPredicateExpression);
+ case TablePackage.ROW_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
+ return SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT == null ? this.semanticCandidatesExpression != null : !SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT.equals(this.semanticCandidatesExpression);
case TablePackage.ROW_DESCRIPTION__HEADER_LABEL_EXPRESSION:
return HEADER_LABEL_EXPRESSION_EDEFAULT == null ? this.headerLabelExpression != null : !HEADER_LABEL_EXPRESSION_EDEFAULT.equals(this.headerLabelExpression);
case TablePackage.ROW_DESCRIPTION__HEADER_ICON_EXPRESSION:
@@ -426,7 +583,13 @@ public String toString() {
if (this.eIsProxy())
return super.toString();
- String result = super.toString() + " (headerLabelExpression: " +
+ String result = super.toString() + " (name: " +
+ this.name +
+ ", paginationPredicateExpression: " +
+ this.paginationPredicateExpression +
+ ", semanticCandidatesExpression: " +
+ this.semanticCandidatesExpression +
+ ", headerLabelExpression: " +
this.headerLabelExpression +
", headerIconExpression: " +
this.headerIconExpression +
diff --git a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/TableDescriptionImpl.java b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/TableDescriptionImpl.java
index bb532611a9..3a839497d3 100644
--- a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/TableDescriptionImpl.java
+++ b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/TableDescriptionImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2024 CEA LIST.
+ * Copyright (c) 2024, 2025 CEA LIST.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,6 @@
package org.eclipse.sirius.components.view.table.impl;
import java.util.Collection;
-import java.util.Objects;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
@@ -296,7 +295,7 @@ public void eUnset(int featureID) {
this.getColumnDescriptions().clear();
return;
case TablePackage.TABLE_DESCRIPTION__ROW_DESCRIPTION:
- this.setRowDescription(null);
+ this.setRowDescription((RowDescription) null);
return;
case TablePackage.TABLE_DESCRIPTION__CELL_DESCRIPTIONS:
this.getCellDescriptions().clear();
@@ -314,7 +313,7 @@ public void eUnset(int featureID) {
public boolean eIsSet(int featureID) {
switch (featureID) {
case TablePackage.TABLE_DESCRIPTION__USE_STRIPED_ROWS_EXPRESSION:
- return !Objects.equals(USE_STRIPED_ROWS_EXPRESSION_EDEFAULT, this.useStripedRowsExpression);
+ return USE_STRIPED_ROWS_EXPRESSION_EDEFAULT == null ? this.useStripedRowsExpression != null : !USE_STRIPED_ROWS_EXPRESSION_EDEFAULT.equals(this.useStripedRowsExpression);
case TablePackage.TABLE_DESCRIPTION__COLUMN_DESCRIPTIONS:
return this.columnDescriptions != null && !this.columnDescriptions.isEmpty();
case TablePackage.TABLE_DESCRIPTION__ROW_DESCRIPTION:
@@ -335,10 +334,11 @@ public String toString() {
if (this.eIsProxy())
return super.toString();
- String result = super.toString() + " (useStripedRowsExpression: " +
- this.useStripedRowsExpression +
- ')';
- return result;
+ StringBuilder result = new StringBuilder(super.toString());
+ result.append(" (useStripedRowsExpression: ");
+ result.append(this.useStripedRowsExpression);
+ result.append(')');
+ return result.toString();
}
} // TableDescriptionImpl
diff --git a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/TableElementDescriptionImpl.java b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/TableElementDescriptionImpl.java
deleted file mode 100644
index 39b19d0cf3..0000000000
--- a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/TableElementDescriptionImpl.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2024 CEA LIST.
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.components.view.table.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.sirius.components.view.table.TableElementDescription;
-import org.eclipse.sirius.components.view.table.TablePackage;
-
-/**
- * An implementation of the model object 'Element Description'.
- *
- * The following features are implemented:
- *
- *
- * - {@link org.eclipse.sirius.components.view.table.impl.TableElementDescriptionImpl#getName Name}
- * - {@link org.eclipse.sirius.components.view.table.impl.TableElementDescriptionImpl#getDomainType Domain
- * Type}
- * - {@link org.eclipse.sirius.components.view.table.impl.TableElementDescriptionImpl#getSemanticCandidatesExpression
- * Semantic Candidates Expression}
- * - {@link org.eclipse.sirius.components.view.table.impl.TableElementDescriptionImpl#getPreconditionExpression
- * Precondition Expression}
- *
- *
- * @generated
- */
-public abstract class TableElementDescriptionImpl extends MinimalEObjectImpl.Container implements TableElementDescription {
-
- /**
- * The default value of the '{@link #getName() Name}' attribute.
- *
- * @generated
- * @ordered
- * @see #getName()
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() Name}' attribute.
- *
- * @generated
- * @ordered
- * @see #getName()
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getDomainType() Domain Type}' attribute.
- *
- * @see #getDomainType()
- * @generated
- * @ordered
- */
- protected static final String DOMAIN_TYPE_EDEFAULT = "";
-
- /**
- * The cached value of the '{@link #getDomainType() Domain Type}' attribute.
- *
- * @see #getDomainType()
- * @generated
- * @ordered
- */
- protected String domainType = DOMAIN_TYPE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSemanticCandidatesExpression() Semantic Candidates Expression}'
- * attribute.
- *
- * @see #getSemanticCandidatesExpression()
- * @generated
- * @ordered
- */
- protected static final String SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSemanticCandidatesExpression() Semantic Candidates Expression}'
- * attribute.
- *
- * @see #getSemanticCandidatesExpression()
- * @generated
- * @ordered
- */
- protected String semanticCandidatesExpression = SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT;
-
- /**
- * The default value of the '{@link #getPreconditionExpression() Precondition Expression}' attribute.
- *
- * @generated
- * @ordered
- * @see #getPreconditionExpression()
- */
- protected static final String PRECONDITION_EXPRESSION_EDEFAULT = "";
-
- /**
- * The cached value of the '{@link #getPreconditionExpression() Precondition Expression}' attribute.
- *
- * @generated
- * @ordered
- * @see #getPreconditionExpression()
- */
- protected String preconditionExpression = PRECONDITION_EXPRESSION_EDEFAULT;
-
- /**
- *
- *
- * @generated
- */
- protected TableElementDescriptionImpl() {
- super();
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return TablePackage.Literals.TABLE_ELEMENT_DESCRIPTION;
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public String getName() {
- return this.name;
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public void setName(String newName) {
- String oldName = this.name;
- this.name = newName;
- if (this.eNotificationRequired())
- this.eNotify(new ENotificationImpl(this, Notification.SET, TablePackage.TABLE_ELEMENT_DESCRIPTION__NAME, oldName, this.name));
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public String getDomainType() {
- return this.domainType;
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public void setDomainType(String newDomainType) {
- String oldDomainType = this.domainType;
- this.domainType = newDomainType;
- if (this.eNotificationRequired())
- this.eNotify(new ENotificationImpl(this, Notification.SET, TablePackage.TABLE_ELEMENT_DESCRIPTION__DOMAIN_TYPE, oldDomainType, this.domainType));
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public String getSemanticCandidatesExpression() {
- return this.semanticCandidatesExpression;
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public void setSemanticCandidatesExpression(String newSemanticCandidatesExpression) {
- String oldSemanticCandidatesExpression = this.semanticCandidatesExpression;
- this.semanticCandidatesExpression = newSemanticCandidatesExpression;
- if (this.eNotificationRequired())
- this.eNotify(new ENotificationImpl(this, Notification.SET, TablePackage.TABLE_ELEMENT_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION, oldSemanticCandidatesExpression,
- this.semanticCandidatesExpression));
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public String getPreconditionExpression() {
- return this.preconditionExpression;
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public void setPreconditionExpression(String newPreconditionExpression) {
- String oldPreconditionExpression = this.preconditionExpression;
- this.preconditionExpression = newPreconditionExpression;
- if (this.eNotificationRequired())
- this.eNotify(new ENotificationImpl(this, Notification.SET, TablePackage.TABLE_ELEMENT_DESCRIPTION__PRECONDITION_EXPRESSION, oldPreconditionExpression, this.preconditionExpression));
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__NAME:
- return this.getName();
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__DOMAIN_TYPE:
- return this.getDomainType();
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
- return this.getSemanticCandidatesExpression();
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__PRECONDITION_EXPRESSION:
- return this.getPreconditionExpression();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__NAME:
- this.setName((String) newValue);
- return;
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__DOMAIN_TYPE:
- this.setDomainType((String) newValue);
- return;
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
- this.setSemanticCandidatesExpression((String) newValue);
- return;
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__PRECONDITION_EXPRESSION:
- this.setPreconditionExpression((String) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__NAME:
- this.setName(NAME_EDEFAULT);
- return;
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__DOMAIN_TYPE:
- this.setDomainType(DOMAIN_TYPE_EDEFAULT);
- return;
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
- this.setSemanticCandidatesExpression(SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT);
- return;
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__PRECONDITION_EXPRESSION:
- this.setPreconditionExpression(PRECONDITION_EXPRESSION_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__NAME:
- return NAME_EDEFAULT == null ? this.name != null : !NAME_EDEFAULT.equals(this.name);
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__DOMAIN_TYPE:
- return DOMAIN_TYPE_EDEFAULT == null ? this.domainType != null : !DOMAIN_TYPE_EDEFAULT.equals(this.domainType);
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION:
- return SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT == null ? this.semanticCandidatesExpression != null : !SEMANTIC_CANDIDATES_EXPRESSION_EDEFAULT.equals(this.semanticCandidatesExpression);
- case TablePackage.TABLE_ELEMENT_DESCRIPTION__PRECONDITION_EXPRESSION:
- return PRECONDITION_EXPRESSION_EDEFAULT == null ? this.preconditionExpression != null : !PRECONDITION_EXPRESSION_EDEFAULT.equals(this.preconditionExpression);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public String toString() {
- if (this.eIsProxy())
- return super.toString();
-
- StringBuilder result = new StringBuilder(super.toString());
- result.append(" (name: ");
- result.append(this.name);
- result.append(", domainType: ");
- result.append(this.domainType);
- result.append(", semanticCandidatesExpression: ");
- result.append(this.semanticCandidatesExpression);
- result.append(", preconditionExpression: ");
- result.append(this.preconditionExpression);
- result.append(')');
- return result.toString();
- }
-
-} // TableElementDescriptionImpl
diff --git a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/TablePackageImpl.java b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/TablePackageImpl.java
index 1e359ec63b..b2060680a8 100644
--- a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/TablePackageImpl.java
+++ b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/impl/TablePackageImpl.java
@@ -27,7 +27,6 @@
import org.eclipse.sirius.components.view.table.RowContextMenuEntry;
import org.eclipse.sirius.components.view.table.RowDescription;
import org.eclipse.sirius.components.view.table.TableDescription;
-import org.eclipse.sirius.components.view.table.TableElementDescription;
import org.eclipse.sirius.components.view.table.TableFactory;
import org.eclipse.sirius.components.view.table.TablePackage;
@@ -45,13 +44,6 @@ public class TablePackageImpl extends EPackageImpl implements TablePackage {
*/
private EClass tableDescriptionEClass = null;
- /**
- *
- *
- * @generated
- */
- private EClass tableElementDescriptionEClass = null;
-
/**
*
*
@@ -242,18 +234,8 @@ public EReference getTableDescription_CellDescriptions() {
* @generated
*/
@Override
- public EClass getTableElementDescription() {
- return this.tableElementDescriptionEClass;
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public EAttribute getTableElementDescription_Name() {
- return (EAttribute) this.tableElementDescriptionEClass.getEStructuralFeatures().get(0);
+ public EClass getColumnDescription() {
+ return this.columnDescriptionEClass;
}
/**
@@ -262,8 +244,8 @@ public EAttribute getTableElementDescription_Name() {
* @generated
*/
@Override
- public EAttribute getTableElementDescription_DomainType() {
- return (EAttribute) this.tableElementDescriptionEClass.getEStructuralFeatures().get(1);
+ public EAttribute getColumnDescription_Name() {
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(0);
}
/**
@@ -272,8 +254,8 @@ public EAttribute getTableElementDescription_DomainType() {
* @generated
*/
@Override
- public EAttribute getTableElementDescription_SemanticCandidatesExpression() {
- return (EAttribute) this.tableElementDescriptionEClass.getEStructuralFeatures().get(2);
+ public EAttribute getColumnDescription_DomainType() {
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(1);
}
/**
@@ -282,8 +264,8 @@ public EAttribute getTableElementDescription_SemanticCandidatesExpression() {
* @generated
*/
@Override
- public EAttribute getTableElementDescription_PreconditionExpression() {
- return (EAttribute) this.tableElementDescriptionEClass.getEStructuralFeatures().get(3);
+ public EAttribute getColumnDescription_SemanticCandidatesExpression() {
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(2);
}
/**
@@ -292,8 +274,8 @@ public EAttribute getTableElementDescription_PreconditionExpression() {
* @generated
*/
@Override
- public EClass getColumnDescription() {
- return this.columnDescriptionEClass;
+ public EAttribute getColumnDescription_PreconditionExpression() {
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(3);
}
/**
@@ -303,7 +285,7 @@ public EClass getColumnDescription() {
*/
@Override
public EAttribute getColumnDescription_HeaderIndexLabelExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(0);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(4);
}
/**
@@ -313,7 +295,7 @@ public EAttribute getColumnDescription_HeaderIndexLabelExpression() {
*/
@Override
public EAttribute getColumnDescription_HeaderLabelExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(1);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(5);
}
/**
@@ -323,7 +305,7 @@ public EAttribute getColumnDescription_HeaderLabelExpression() {
*/
@Override
public EAttribute getColumnDescription_HeaderIconExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(2);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(6);
}
/**
@@ -333,7 +315,7 @@ public EAttribute getColumnDescription_HeaderIconExpression() {
*/
@Override
public EAttribute getColumnDescription_InitialWidthExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(3);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(7);
}
/**
@@ -343,7 +325,7 @@ public EAttribute getColumnDescription_InitialWidthExpression() {
*/
@Override
public EAttribute getColumnDescription_IsResizableExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(4);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(8);
}
/**
@@ -353,7 +335,7 @@ public EAttribute getColumnDescription_IsResizableExpression() {
*/
@Override
public EAttribute getColumnDescription_FilterWidgetExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(5);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(9);
}
/**
@@ -372,7 +354,7 @@ public EClass getRowDescription() {
* @generated
*/
@Override
- public EAttribute getRowDescription_HeaderLabelExpression() {
+ public EAttribute getRowDescription_Name() {
return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(0);
}
@@ -382,7 +364,7 @@ public EAttribute getRowDescription_HeaderLabelExpression() {
* @generated
*/
@Override
- public EAttribute getRowDescription_HeaderIconExpression() {
+ public EAttribute getRowDescription_PaginationPredicateExpression() {
return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(1);
}
@@ -392,7 +374,7 @@ public EAttribute getRowDescription_HeaderIconExpression() {
* @generated
*/
@Override
- public EAttribute getRowDescription_HeaderIndexLabelExpression() {
+ public EAttribute getRowDescription_SemanticCandidatesExpression() {
return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(2);
}
@@ -402,7 +384,7 @@ public EAttribute getRowDescription_HeaderIndexLabelExpression() {
* @generated
*/
@Override
- public EAttribute getRowDescription_InitialHeightExpression() {
+ public EAttribute getRowDescription_HeaderLabelExpression() {
return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(3);
}
@@ -412,10 +394,40 @@ public EAttribute getRowDescription_InitialHeightExpression() {
* @generated
*/
@Override
- public EAttribute getRowDescription_IsResizableExpression() {
+ public EAttribute getRowDescription_HeaderIconExpression() {
return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(4);
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getRowDescription_HeaderIndexLabelExpression() {
+ return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(5);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getRowDescription_InitialHeightExpression() {
+ return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(6);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getRowDescription_IsResizableExpression() {
+ return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(7);
+ }
+
/**
*
*
@@ -423,7 +435,7 @@ public EAttribute getRowDescription_IsResizableExpression() {
*/
@Override
public EReference getRowDescription_ContextMenuEntries() {
- return (EReference) this.rowDescriptionEClass.getEStructuralFeatures().get(5);
+ return (EReference) this.rowDescriptionEClass.getEStructuralFeatures().get(8);
}
/**
@@ -442,7 +454,7 @@ public EClass getCellDescription() {
* @generated
*/
@Override
- public EAttribute getCellDescription_ValueExpression() {
+ public EAttribute getCellDescription_Name() {
return (EAttribute) this.cellDescriptionEClass.getEStructuralFeatures().get(0);
}
@@ -452,10 +464,30 @@ public EAttribute getCellDescription_ValueExpression() {
* @generated
*/
@Override
- public EAttribute getCellDescription_TooltipExpression() {
+ public EAttribute getCellDescription_PreconditionExpression() {
return (EAttribute) this.cellDescriptionEClass.getEStructuralFeatures().get(1);
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getCellDescription_ValueExpression() {
+ return (EAttribute) this.cellDescriptionEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getCellDescription_TooltipExpression() {
+ return (EAttribute) this.cellDescriptionEClass.getEStructuralFeatures().get(3);
+ }
+
/**
*
*
@@ -463,7 +495,7 @@ public EAttribute getCellDescription_TooltipExpression() {
*/
@Override
public EReference getCellDescription_CellWidgetDescription() {
- return (EReference) this.cellDescriptionEClass.getEStructuralFeatures().get(2);
+ return (EReference) this.cellDescriptionEClass.getEStructuralFeatures().get(4);
}
/**
@@ -624,13 +656,11 @@ public void createPackageContents() {
this.createEReference(this.tableDescriptionEClass, TABLE_DESCRIPTION__ROW_DESCRIPTION);
this.createEReference(this.tableDescriptionEClass, TABLE_DESCRIPTION__CELL_DESCRIPTIONS);
- this.tableElementDescriptionEClass = this.createEClass(TABLE_ELEMENT_DESCRIPTION);
- this.createEAttribute(this.tableElementDescriptionEClass, TABLE_ELEMENT_DESCRIPTION__NAME);
- this.createEAttribute(this.tableElementDescriptionEClass, TABLE_ELEMENT_DESCRIPTION__DOMAIN_TYPE);
- this.createEAttribute(this.tableElementDescriptionEClass, TABLE_ELEMENT_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION);
- this.createEAttribute(this.tableElementDescriptionEClass, TABLE_ELEMENT_DESCRIPTION__PRECONDITION_EXPRESSION);
-
this.columnDescriptionEClass = this.createEClass(COLUMN_DESCRIPTION);
+ this.createEAttribute(this.columnDescriptionEClass, COLUMN_DESCRIPTION__NAME);
+ this.createEAttribute(this.columnDescriptionEClass, COLUMN_DESCRIPTION__DOMAIN_TYPE);
+ this.createEAttribute(this.columnDescriptionEClass, COLUMN_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION);
+ this.createEAttribute(this.columnDescriptionEClass, COLUMN_DESCRIPTION__PRECONDITION_EXPRESSION);
this.createEAttribute(this.columnDescriptionEClass, COLUMN_DESCRIPTION__HEADER_INDEX_LABEL_EXPRESSION);
this.createEAttribute(this.columnDescriptionEClass, COLUMN_DESCRIPTION__HEADER_LABEL_EXPRESSION);
this.createEAttribute(this.columnDescriptionEClass, COLUMN_DESCRIPTION__HEADER_ICON_EXPRESSION);
@@ -639,6 +669,9 @@ public void createPackageContents() {
this.createEAttribute(this.columnDescriptionEClass, COLUMN_DESCRIPTION__FILTER_WIDGET_EXPRESSION);
this.rowDescriptionEClass = this.createEClass(ROW_DESCRIPTION);
+ this.createEAttribute(this.rowDescriptionEClass, ROW_DESCRIPTION__NAME);
+ this.createEAttribute(this.rowDescriptionEClass, ROW_DESCRIPTION__PAGINATION_PREDICATE_EXPRESSION);
+ this.createEAttribute(this.rowDescriptionEClass, ROW_DESCRIPTION__SEMANTIC_CANDIDATES_EXPRESSION);
this.createEAttribute(this.rowDescriptionEClass, ROW_DESCRIPTION__HEADER_LABEL_EXPRESSION);
this.createEAttribute(this.rowDescriptionEClass, ROW_DESCRIPTION__HEADER_ICON_EXPRESSION);
this.createEAttribute(this.rowDescriptionEClass, ROW_DESCRIPTION__HEADER_INDEX_LABEL_EXPRESSION);
@@ -647,6 +680,8 @@ public void createPackageContents() {
this.createEReference(this.rowDescriptionEClass, ROW_DESCRIPTION__CONTEXT_MENU_ENTRIES);
this.cellDescriptionEClass = this.createEClass(CELL_DESCRIPTION);
+ this.createEAttribute(this.cellDescriptionEClass, CELL_DESCRIPTION__NAME);
+ this.createEAttribute(this.cellDescriptionEClass, CELL_DESCRIPTION__PRECONDITION_EXPRESSION);
this.createEAttribute(this.cellDescriptionEClass, CELL_DESCRIPTION__VALUE_EXPRESSION);
this.createEAttribute(this.cellDescriptionEClass, CELL_DESCRIPTION__TOOLTIP_EXPRESSION);
this.createEReference(this.cellDescriptionEClass, CELL_DESCRIPTION__CELL_WIDGET_DESCRIPTION);
@@ -659,15 +694,15 @@ public void createPackageContents() {
this.cellLabelWidgetDescriptionEClass = this.createEClass(CELL_LABEL_WIDGET_DESCRIPTION);
this.createEAttribute(this.cellLabelWidgetDescriptionEClass, CELL_LABEL_WIDGET_DESCRIPTION__ICON_EXPRESSION);
- this.cellTextareaWidgetDescriptionEClass = this.createEClass(CELL_TEXTAREA_WIDGET_DESCRIPTION);
- this.createEReference(this.cellTextareaWidgetDescriptionEClass, CELL_TEXTAREA_WIDGET_DESCRIPTION__BODY);
-
this.rowContextMenuEntryEClass = this.createEClass(ROW_CONTEXT_MENU_ENTRY);
this.createEAttribute(this.rowContextMenuEntryEClass, ROW_CONTEXT_MENU_ENTRY__NAME);
this.createEAttribute(this.rowContextMenuEntryEClass, ROW_CONTEXT_MENU_ENTRY__LABEL_EXPRESSION);
this.createEAttribute(this.rowContextMenuEntryEClass, ROW_CONTEXT_MENU_ENTRY__ICON_URL_EXPRESSION);
this.createEAttribute(this.rowContextMenuEntryEClass, ROW_CONTEXT_MENU_ENTRY__PRECONDITION_EXPRESSION);
this.createEReference(this.rowContextMenuEntryEClass, ROW_CONTEXT_MENU_ENTRY__BODY);
+
+ this.cellTextareaWidgetDescriptionEClass = this.createEClass(CELL_TEXTAREA_WIDGET_DESCRIPTION);
+ this.createEReference(this.cellTextareaWidgetDescriptionEClass, CELL_TEXTAREA_WIDGET_DESCRIPTION__BODY);
}
/**
@@ -695,9 +730,6 @@ public void initializePackageContents() {
// Add supertypes to classes
this.tableDescriptionEClass.getESuperTypes().add(theViewPackage.getRepresentationDescription());
- this.columnDescriptionEClass.getESuperTypes().add(this.getTableElementDescription());
- this.rowDescriptionEClass.getESuperTypes().add(this.getTableElementDescription());
- this.cellDescriptionEClass.getESuperTypes().add(this.getTableElementDescription());
this.cellTextfieldWidgetDescriptionEClass.getESuperTypes().add(this.getCellWidgetDescription());
this.cellLabelWidgetDescriptionEClass.getESuperTypes().add(this.getCellWidgetDescription());
this.cellTextareaWidgetDescriptionEClass.getESuperTypes().add(this.getCellWidgetDescription());
@@ -708,25 +740,20 @@ public void initializePackageContents() {
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
this.initEReference(this.getTableDescription_ColumnDescriptions(), this.getColumnDescription(), null, "columnDescriptions", null, 0, -1, TableDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- this.getTableDescription_ColumnDescriptions().getEKeys().add(this.getTableElementDescription_Name());
this.initEReference(this.getTableDescription_RowDescription(), this.getRowDescription(), null, "rowDescription", null, 0, 1, TableDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- this.getTableDescription_RowDescription().getEKeys().add(this.getTableElementDescription_Name());
this.initEReference(this.getTableDescription_CellDescriptions(), this.getCellDescription(), null, "cellDescriptions", null, 0, -1, TableDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- this.getTableDescription_CellDescriptions().getEKeys().add(this.getTableElementDescription_Name());
- this.initEClass(this.tableElementDescriptionEClass, TableElementDescription.class, "TableElementDescription", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- this.initEAttribute(this.getTableElementDescription_Name(), theViewPackage.getIdentifier(), "name", null, 0, 1, TableElementDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+ this.initEClass(this.columnDescriptionEClass, ColumnDescription.class, "ColumnDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ this.initEAttribute(this.getColumnDescription_Name(), theViewPackage.getIdentifier(), "name", null, 0, 1, ColumnDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ this.initEAttribute(this.getColumnDescription_DomainType(), theViewPackage.getDomainType(), "domainType", "", 0, 1, ColumnDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- this.initEAttribute(this.getTableElementDescription_DomainType(), theViewPackage.getDomainType(), "domainType", "", 0, 1, TableElementDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
- IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- this.initEAttribute(this.getTableElementDescription_SemanticCandidatesExpression(), theViewPackage.getInterpretedExpression(), "semanticCandidatesExpression", null, 0, 1,
- TableElementDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- this.initEAttribute(this.getTableElementDescription_PreconditionExpression(), theViewPackage.getInterpretedExpression(), "preconditionExpression", "", 0, 1, TableElementDescription.class,
+ this.initEAttribute(this.getColumnDescription_SemanticCandidatesExpression(), theViewPackage.getInterpretedExpression(), "semanticCandidatesExpression", null, 0, 1, ColumnDescription.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- this.initEClass(this.columnDescriptionEClass, ColumnDescription.class, "ColumnDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ this.initEAttribute(this.getColumnDescription_PreconditionExpression(), theViewPackage.getInterpretedExpression(), "preconditionExpression", "", 0, 1, ColumnDescription.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
this.initEAttribute(this.getColumnDescription_HeaderIndexLabelExpression(), theViewPackage.getInterpretedExpression(), "headerIndexLabelExpression", "", 0, 1, ColumnDescription.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
this.initEAttribute(this.getColumnDescription_HeaderLabelExpression(), theViewPackage.getInterpretedExpression(), "headerLabelExpression", "", 0, 1, ColumnDescription.class, !IS_TRANSIENT,
@@ -741,6 +768,12 @@ public void initializePackageContents() {
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
this.initEClass(this.rowDescriptionEClass, RowDescription.class, "RowDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ this.initEAttribute(this.getRowDescription_Name(), theViewPackage.getIdentifier(), "name", null, 0, 1, RowDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ this.initEAttribute(this.getRowDescription_PaginationPredicateExpression(), theViewPackage.getInterpretedExpression(), "paginationPredicateExpression", "", 0, 1, RowDescription.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ this.initEAttribute(this.getRowDescription_SemanticCandidatesExpression(), theViewPackage.getInterpretedExpression(), "semanticCandidatesExpression", "", 0, 1, RowDescription.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
this.initEAttribute(this.getRowDescription_HeaderLabelExpression(), theViewPackage.getInterpretedExpression(), "headerLabelExpression", "", 0, 1, RowDescription.class, !IS_TRANSIENT,
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
this.initEAttribute(this.getRowDescription_HeaderIconExpression(), theViewPackage.getInterpretedExpression(), "headerIconExpression", "", 0, 1, RowDescription.class, !IS_TRANSIENT,
@@ -755,6 +788,10 @@ public void initializePackageContents() {
IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
this.initEClass(this.cellDescriptionEClass, CellDescription.class, "CellDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ this.initEAttribute(this.getCellDescription_Name(), theViewPackage.getIdentifier(), "name", null, 0, 1, CellDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ this.initEAttribute(this.getCellDescription_PreconditionExpression(), theViewPackage.getInterpretedExpression(), "preconditionExpression", "", 0, 1, CellDescription.class, !IS_TRANSIENT,
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
this.initEAttribute(this.getCellDescription_ValueExpression(), theViewPackage.getInterpretedExpression(), "valueExpression", "", 0, 1, CellDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
this.initEAttribute(this.getCellDescription_TooltipExpression(), theViewPackage.getInterpretedExpression(), "tooltipExpression", "", 0, 1, CellDescription.class, !IS_TRANSIENT, !IS_VOLATILE,
diff --git a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/util/TableAdapterFactory.java b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/util/TableAdapterFactory.java
index c44fd490d1..d9b3468033 100644
--- a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/util/TableAdapterFactory.java
+++ b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/util/TableAdapterFactory.java
@@ -26,15 +26,14 @@
import org.eclipse.sirius.components.view.table.RowContextMenuEntry;
import org.eclipse.sirius.components.view.table.RowDescription;
import org.eclipse.sirius.components.view.table.TableDescription;
-import org.eclipse.sirius.components.view.table.TableElementDescription;
import org.eclipse.sirius.components.view.table.TablePackage;
/**
* The Adapter Factory for the model. It provides an adapter createXXX
* method for each class of the model.
*
- * @see org.eclipse.sirius.components.view.table.TablePackage
* @generated
+ * @see org.eclipse.sirius.components.view.table.TablePackage
*/
public class TableAdapterFactory extends AdapterFactoryImpl {
@@ -56,11 +55,6 @@ public Adapter caseTableDescription(TableDescription object) {
return TableAdapterFactory.this.createTableDescriptionAdapter();
}
- @Override
- public Adapter caseTableElementDescription(TableElementDescription object) {
- return TableAdapterFactory.this.createTableElementDescriptionAdapter();
- }
-
@Override
public Adapter caseColumnDescription(ColumnDescription object) {
return TableAdapterFactory.this.createColumnDescriptionAdapter();
@@ -146,7 +140,7 @@ public boolean isFactoryForType(Object object) {
* Creates an adapter for the target.
*
* @param target
- * the object to adapt.
+ * the object to adapt.
* @return the adapter for the target.
* @generated
*/
@@ -169,20 +163,6 @@ public Adapter createTableDescriptionAdapter() {
return null;
}
- /**
- * Creates a new adapter for an object of class
- * '{@link org.eclipse.sirius.components.view.table.TableElementDescription Element Description}'. This default implementation returns null so that we can easily ignore cases; it's useful to
- * ignore a case when inheritance will catch all the cases anyway.
- *
- * @return the new adapter.
- * @generated
- * @see org.eclipse.sirius.components.view.table.TableElementDescription
- */
- public Adapter createTableElementDescriptionAdapter() {
- return null;
- }
-
/**
* Creates a new adapter for an object of class '{@link org.eclipse.sirius.components.view.table.ColumnDescription
* Column Description}'. This default implementation returns null so that we can
@@ -190,8 +170,8 @@ public Adapter createTableElementDescriptionAdapter() {
* end-user-doc -->
*
* @return the new adapter.
- * @see org.eclipse.sirius.components.view.table.ColumnDescription
* @generated
+ * @see org.eclipse.sirius.components.view.table.ColumnDescription
*/
public Adapter createColumnDescriptionAdapter() {
return null;
@@ -204,8 +184,8 @@ public Adapter createColumnDescriptionAdapter() {
* end-user-doc -->
*
* @return the new adapter.
- * @see org.eclipse.sirius.components.view.table.RowDescription
* @generated
+ * @see org.eclipse.sirius.components.view.table.RowDescription
*/
public Adapter createRowDescriptionAdapter() {
return null;
@@ -218,8 +198,8 @@ public Adapter createRowDescriptionAdapter() {
* end-user-doc -->
*
* @return the new adapter.
- * @see org.eclipse.sirius.components.view.table.CellDescription
* @generated
+ * @see org.eclipse.sirius.components.view.table.CellDescription
*/
public Adapter createCellDescriptionAdapter() {
return null;
@@ -246,8 +226,8 @@ public Adapter createCellWidgetDescriptionAdapter() {
* cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
* @return the new adapter.
- * @see org.eclipse.sirius.components.view.table.CellTextfieldWidgetDescription
* @generated
+ * @see org.eclipse.sirius.components.view.table.CellTextfieldWidgetDescription
*/
public Adapter createCellTextfieldWidgetDescriptionAdapter() {
return null;
@@ -260,8 +240,8 @@ public Adapter createCellTextfieldWidgetDescriptionAdapter() {
* cases; it's useful to ignore a case when inheritance will catch all the cases anyway.
*
* @return the new adapter.
- * @see org.eclipse.sirius.components.view.table.CellLabelWidgetDescription
* @generated
+ * @see org.eclipse.sirius.components.view.table.CellLabelWidgetDescription
*/
public Adapter createCellLabelWidgetDescriptionAdapter() {
return null;
@@ -302,8 +282,8 @@ public Adapter createRowContextMenuEntryAdapter() {
* end-user-doc -->
*
* @return the new adapter.
- * @see org.eclipse.sirius.components.view.RepresentationDescription
* @generated
+ * @see org.eclipse.sirius.components.view.RepresentationDescription
*/
public Adapter createRepresentationDescriptionAdapter() {
return null;
diff --git a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/util/TableSwitch.java b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/util/TableSwitch.java
index 596fed30d4..62c8691f90 100644
--- a/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/util/TableSwitch.java
+++ b/packages/view/backend/sirius-components-view-table/src/main/java/org/eclipse/sirius/components/view/table/util/TableSwitch.java
@@ -25,7 +25,6 @@
import org.eclipse.sirius.components.view.table.RowContextMenuEntry;
import org.eclipse.sirius.components.view.table.RowDescription;
import org.eclipse.sirius.components.view.table.TableDescription;
-import org.eclipse.sirius.components.view.table.TableElementDescription;
import org.eclipse.sirius.components.view.table.TablePackage;
/**
@@ -34,8 +33,8 @@
* starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
* returned, which is the result of the switch.
*
- * @see org.eclipse.sirius.components.view.table.TablePackage
* @generated
+ * @see org.eclipse.sirius.components.view.table.TablePackage
*/
public class TableSwitch extends Switch {
@@ -61,7 +60,7 @@ public TableSwitch() {
* Checks whether this is a switch for the given package.
*
* @param ePackage
- * the package in question.
+ * the package in question.
* @return whether this is a switch for the given package.
* @generated
*/
@@ -89,18 +88,9 @@ protected T doSwitch(int classifierID, EObject theEObject) {
result = this.defaultCase(theEObject);
return result;
}
- case TablePackage.TABLE_ELEMENT_DESCRIPTION: {
- TableElementDescription tableElementDescription = (TableElementDescription) theEObject;
- T result = this.caseTableElementDescription(tableElementDescription);
- if (result == null)
- result = this.defaultCase(theEObject);
- return result;
- }
case TablePackage.COLUMN_DESCRIPTION: {
ColumnDescription columnDescription = (ColumnDescription) theEObject;
T result = this.caseColumnDescription(columnDescription);
- if (result == null)
- result = this.caseTableElementDescription(columnDescription);
if (result == null)
result = this.defaultCase(theEObject);
return result;
@@ -108,8 +98,6 @@ protected T doSwitch(int classifierID, EObject theEObject) {
case TablePackage.ROW_DESCRIPTION: {
RowDescription rowDescription = (RowDescription) theEObject;
T result = this.caseRowDescription(rowDescription);
- if (result == null)
- result = this.caseTableElementDescription(rowDescription);
if (result == null)
result = this.defaultCase(theEObject);
return result;
@@ -117,8 +105,6 @@ protected T doSwitch(int classifierID, EObject theEObject) {
case TablePackage.CELL_DESCRIPTION: {
CellDescription cellDescription = (CellDescription) theEObject;
T result = this.caseCellDescription(cellDescription);
- if (result == null)
- result = this.caseTableElementDescription(cellDescription);
if (result == null)
result = this.defaultCase(theEObject);
return result;
@@ -174,27 +160,12 @@ protected T doSwitch(int classifierID, EObject theEObject) {
* This implementation returns null; returning a non-null result will terminate the switch.
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of 'Description'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseTableDescription(TableDescription object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of 'Element Description'. This implementation returns null; returning a non-null result will terminate the switch.
- *
- * @param object
- * the target of the switch.
- * @return the result of interpreting the object as an instance of 'Element Description'.
* @generated
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
*/
- public T caseTableElementDescription(TableElementDescription object) {
+ public T caseTableDescription(TableDescription object) {
return null;
}
@@ -204,7 +175,7 @@ public T caseTableElementDescription(TableElementDescription object) {
* end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of 'Column Description'.
* @generated
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -219,7 +190,7 @@ public T caseColumnDescription(ColumnDescription object) {
* -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of 'Row Description'.
* @generated
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -234,7 +205,7 @@ public T caseRowDescription(RowDescription object) {
* -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of 'Cell Description'.
* @generated
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -249,7 +220,7 @@ public T caseCellDescription(CellDescription object) {
* end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of 'Cell Widget Description'.
* @generated
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -264,10 +235,10 @@ public T caseCellWidgetDescription(CellWidgetDescription object) {
*
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of 'Cell Textfield Widget Description'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
*/
public T caseCellTextfieldWidgetDescription(CellTextfieldWidgetDescription object) {
return null;
@@ -279,7 +250,7 @@ public T caseCellTextfieldWidgetDescription(CellTextfieldWidgetDescription objec
* end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of 'Cell Label Widget Description'.
* @generated
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -324,7 +295,7 @@ public T caseRowContextMenuEntry(RowContextMenuEntry object) {
* end-user-doc -->
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of 'Representation Description'.
* @generated
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -339,10 +310,10 @@ public T caseRepresentationDescription(RepresentationDescription object) {
* anyway.
*
* @param object
- * the target of the switch.
+ * the target of the switch.
* @return the result of interpreting the object as an instance of 'EObject'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject)
*/
@Override
public T defaultCase(EObject object) {
diff --git a/packages/view/backend/sirius-components-view-table/src/main/resources/model/table.ecore b/packages/view/backend/sirius-components-view-table/src/main/resources/model/table.ecore
index 7e90028c30..1550c98a60 100644
--- a/packages/view/backend/sirius-components-view-table/src/main/resources/model/table.ecore
+++ b/packages/view/backend/sirius-components-view-table/src/main/resources/model/table.ecore
@@ -5,13 +5,13 @@
+ eType="#//ColumnDescription" containment="true"/>
+ containment="true"/>
+ eType="#//CellDescription" containment="true"/>
-
+
@@ -20,8 +20,6 @@
-
-
@@ -40,7 +38,14 @@
eType="ecore:EDataType ../../../../../sirius-components-view/src/main/resources/model/view.ecore#//InterpretedExpression"
defaultValueLiteral=""/>
-
+
+
+
+
@@ -57,7 +62,11 @@
-
+
+
+
-
-
-
-
-
-
+
+
+
+
@@ -34,6 +32,9 @@
+
+
+
@@ -42,6 +43,8 @@
+
+