cellDescriptions;
@@ -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 d06cbe2470..32cd937a13 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
@@ -25,7 +25,6 @@
import org.eclipse.sirius.components.view.table.ColumnDescription;
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;
@@ -43,13 +42,6 @@ public class TablePackageImpl extends EPackageImpl implements TablePackage {
*/
private EClass tableDescriptionEClass = null;
- /**
- *
- *
- * @generated
- */
- private EClass tableElementDescriptionEClass = null;
-
/**
*
*
@@ -138,10 +130,10 @@ private TablePackageImpl() {
* invoke it directly. Instead, they should simply access that field to obtain the package.
*
*
- * @generated
* @see #eNS_URI
* @see #createPackageContents()
* @see #initializePackageContents()
+ * @generated
*/
public static TablePackage init() {
if (isInited)
@@ -226,18 +218,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;
}
/**
@@ -246,8 +228,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);
}
/**
@@ -256,8 +238,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);
}
/**
@@ -266,8 +248,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);
}
/**
@@ -276,8 +258,8 @@ public EAttribute getTableElementDescription_PreconditionExpression() {
* @generated
*/
@Override
- public EClass getColumnDescription() {
- return this.columnDescriptionEClass;
+ public EAttribute getColumnDescription_PreconditionExpression() {
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(3);
}
/**
@@ -287,7 +269,7 @@ public EClass getColumnDescription() {
*/
@Override
public EAttribute getColumnDescription_HeaderIndexLabelExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(0);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(4);
}
/**
@@ -297,7 +279,7 @@ public EAttribute getColumnDescription_HeaderIndexLabelExpression() {
*/
@Override
public EAttribute getColumnDescription_HeaderLabelExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(1);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(5);
}
/**
@@ -307,7 +289,7 @@ public EAttribute getColumnDescription_HeaderLabelExpression() {
*/
@Override
public EAttribute getColumnDescription_HeaderIconExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(2);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(6);
}
/**
@@ -317,7 +299,7 @@ public EAttribute getColumnDescription_HeaderIconExpression() {
*/
@Override
public EAttribute getColumnDescription_InitialWidthExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(3);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(7);
}
/**
@@ -327,7 +309,7 @@ public EAttribute getColumnDescription_InitialWidthExpression() {
*/
@Override
public EAttribute getColumnDescription_IsResizableExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(4);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(8);
}
/**
@@ -337,7 +319,7 @@ public EAttribute getColumnDescription_IsResizableExpression() {
*/
@Override
public EAttribute getColumnDescription_FilterWidgetExpression() {
- return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(5);
+ return (EAttribute) this.columnDescriptionEClass.getEStructuralFeatures().get(9);
}
/**
@@ -356,7 +338,7 @@ public EClass getRowDescription() {
* @generated
*/
@Override
- public EAttribute getRowDescription_HeaderLabelExpression() {
+ public EAttribute getRowDescription_Name() {
return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(0);
}
@@ -366,7 +348,7 @@ public EAttribute getRowDescription_HeaderLabelExpression() {
* @generated
*/
@Override
- public EAttribute getRowDescription_HeaderIconExpression() {
+ public EAttribute getRowDescription_PaginationPredicateExpression() {
return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(1);
}
@@ -376,7 +358,7 @@ public EAttribute getRowDescription_HeaderIconExpression() {
* @generated
*/
@Override
- public EAttribute getRowDescription_HeaderIndexLabelExpression() {
+ public EAttribute getRowDescription_PreconditionExpression() {
return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(2);
}
@@ -386,7 +368,7 @@ public EAttribute getRowDescription_HeaderIndexLabelExpression() {
* @generated
*/
@Override
- public EAttribute getRowDescription_InitialHeightExpression() {
+ public EAttribute getRowDescription_HeaderLabelExpression() {
return (EAttribute) this.rowDescriptionEClass.getEStructuralFeatures().get(3);
}
@@ -396,10 +378,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);
+ }
+
/**
*
*
@@ -416,7 +428,7 @@ public EClass getCellDescription() {
* @generated
*/
@Override
- public EAttribute getCellDescription_ValueExpression() {
+ public EAttribute getCellDescription_Name() {
return (EAttribute) this.cellDescriptionEClass.getEStructuralFeatures().get(0);
}
@@ -426,10 +438,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);
+ }
+
/**
*
*
@@ -437,7 +469,7 @@ public EAttribute getCellDescription_TooltipExpression() {
*/
@Override
public EReference getCellDescription_CellWidgetDescription() {
- return (EReference) this.cellDescriptionEClass.getEStructuralFeatures().get(2);
+ return (EReference) this.cellDescriptionEClass.getEStructuralFeatures().get(4);
}
/**
@@ -518,13 +550,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);
@@ -533,6 +563,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__PRECONDITION_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);
@@ -540,6 +573,8 @@ public void createPackageContents() {
this.createEAttribute(this.rowDescriptionEClass, ROW_DESCRIPTION__IS_RESIZABLE_EXPRESSION);
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);
@@ -578,9 +613,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());
@@ -590,25 +622,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,
@@ -623,6 +650,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_PreconditionExpression(), theViewPackage.getInterpretedExpression(), "preconditionExpression", "", 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,
@@ -635,6 +668,10 @@ public void initializePackageContents() {
!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, 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 9e6e1b5509..4204768b5c 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
@@ -24,7 +24,6 @@
import org.eclipse.sirius.components.view.table.ColumnDescription;
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;
/**
@@ -54,11 +53,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();
@@ -157,20 +151,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
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 e15a4a238b..e36f658b9a 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
@@ -23,7 +23,6 @@
import org.eclipse.sirius.components.view.table.ColumnDescription;
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;
/**
@@ -87,18 +86,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;
@@ -106,8 +96,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;
@@ -115,8 +103,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;
@@ -165,21 +151,6 @@ 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) {
- return null;
- }
-
/**
* Returns the result of interpreting the object as an instance of 'Column Description'. This implementation returns null; returning a non-null result will terminate the switch.