diff options
| author | vlorenzo | 2012-05-21 09:44:42 +0000 |
|---|---|---|
| committer | vlorenzo | 2012-05-21 09:44:42 +0000 |
| commit | 8c7e71cb5df5c1a19c76aade1a4f3b9f443ae0d3 (patch) | |
| tree | c0ca59385061e6c312f49b9590dfd801b2ff319b /incoming | |
| parent | 612f62d127b28805ca9da2481a2a96ccddc91729 (diff) | |
| download | org.eclipse.papyrus-8c7e71cb5df5c1a19c76aade1a4f3b9f443ae0d3.tar.gz org.eclipse.papyrus-8c7e71cb5df5c1a19c76aade1a4f3b9f443ae0d3.tar.xz org.eclipse.papyrus-8c7e71cb5df5c1a19c76aade1a4f3b9f443ae0d3.zip | |
379113: [Table Editor] Papyrus should provide its own model for the configuration of the PapyrusTable
https://bugs.eclipse.org/bugs/show_bug.cgi?id=379113
Diffstat (limited to 'incoming')
12 files changed, 212 insertions, 81 deletions
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/.project b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/.project index de2de1bc893..e7563facb15 100644 --- a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/.project +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel</name>
+ <name>org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel</name>
<comment></comment>
<projects>
</projects>
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/META-INF/MANIFEST.MF b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/META-INF/MANIFEST.MF index 5278ddf7968..054c6772ac3 100644 --- a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/META-INF/MANIFEST.MF +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/about.html b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/about.html new file mode 100644 index 00000000000..82d49bf5f81 --- /dev/null +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/about.html @@ -0,0 +1,28 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2007</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/documentation.pdoc b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/documentation.pdoc new file mode 100644 index 00000000000..40c207632b9 --- /dev/null +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/documentation.pdoc @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the metamodel used in Papyrus for the Papyrus table configuration.">
+ <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
+</doc:Documentation>
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore index 33e3dfeb50b..96a79f66e46 100644 --- a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore @@ -5,7 +5,7 @@ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="This package contains the model used in Papyrus to configure a PapyrusTableInstance2"/>
</eAnnotations>
- <eClassifiers xsi:type="ecore:EClass" name="PapyrusTableConfiguration" eSuperTypes="platform:/plugin/org.eclipse.emf.facet.widgets.table.metamodel/model/tableConfiguration-0.2.0.ecore#//TableConfiguration">
+ <eClassifiers xsi:type="ecore:EClass" name="PapyrusTableConfiguration" eSuperTypes="http://www.eclipse.org/emf/2002/Ecore#//EModelElement">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="This element registers the parameters to configure a PapyrusTableInstance2"/>
</eAnnotations>
@@ -26,5 +26,11 @@ <details key="documentation" value="This field references the feature of the context of the table to listen, when the table in is Feature Mode"/>
</eAnnotations>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="tableConfiguration" eType="ecore:EClass platform:/plugin/org.eclipse.emf.facet.widgets.table.metamodel/model/tableConfiguration-0.2.0.ecore#//TableConfiguration"
+ containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="This field references the emf-facet table configuration."/>
+ </eAnnotations>
+ </eStructuralFeatures>
</eClassifiers>
</ecore:EPackage>
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.genmodel b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.genmodel index aa9fed989d6..f4d0fe2057c 100644 --- a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.genmodel +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.genmodel @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2012 CEA LIST.

 
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
ttp://www.eclipse.org/legal/epl-v10.html

Contributors:
 Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation"
- modelDirectory="/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src"
- modelPluginID="org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel"
+ modelDirectory="/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel/src"
+ editDirectory="/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.edit/src"
+ editorDirectory="/org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.editor/src"
+ modelPluginID="org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel"
modelName="Papyrustableconfiguration" importerID="org.eclipse.emf.importer.ecore"
complianceLevel="5.0" copyrightFields="false" language="" usedGenPackages="platform:/plugin/org.eclipse.emf.facet.widgets.celleditors/model/celleditors.genmodel#//modelCellEditor platform:/plugin/org.eclipse.emf.facet.custom.metamodel/model/custom-0.2.0.genmodel#//custom platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.facet.efacet.metamodel/model/efacet-0.2.0.genmodel#//efacet platform:/plugin/org.eclipse.papyrus.infra.table.metamodel/model/papyrustable.genmodel#//papyrustable platform:/plugin/org.eclipse.emf.facet.widgets.table.metamodel/model/tableConfiguration-0.2.0.genmodel#//tableconfiguration platform:/plugin/org.eclipse.emf.facet.widgets.table.metamodel/model/table-0.2.0.genmodel#//table">
<foreignModel>papyrustableconfiguration.ecore</foreignModel>
@@ -12,6 +14,7 @@ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute papyrustableconfiguration.ecore#//PapyrusTableConfiguration/fillingMode"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrustableconfiguration.ecore#//PapyrusTableConfiguration/fillingQueries"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference papyrustableconfiguration.ecore#//PapyrusTableConfiguration/listenFeature"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference papyrustableconfiguration.ecore#//PapyrusTableConfiguration/tableConfiguration"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java index b80707111c8..7e598cfbef6 100644 --- a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java @@ -14,6 +14,8 @@ package org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papy import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EModelElement;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;
@@ -37,6 +39,7 @@ import org.eclipse.papyrus.infra.table.metamodel.papyrustable.FillingMode; * <li>{@link org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getFillingMode <em>Filling Mode</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getFillingQueries <em>Filling Queries</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getListenFeature <em>Listen Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getTableConfiguration <em>Table Configuration</em>}</li>
* </ul>
* </p>
*
@@ -44,7 +47,7 @@ import org.eclipse.papyrus.infra.table.metamodel.papyrustable.FillingMode; * @model
* @generated
*/
-public interface PapyrusTableConfiguration extends TableConfiguration {
+public interface PapyrusTableConfiguration extends EObject, EModelElement {
/**
* Returns the value of the '<em><b>Filling Mode</b></em>' attribute.
* The literals are from the enumeration {@link org.eclipse.papyrus.infra.table.metamodel.papyrustable.FillingMode}.
@@ -113,4 +116,29 @@ public interface PapyrusTableConfiguration extends TableConfiguration { */
void setListenFeature(EStructuralFeature value);
+ /**
+ * Returns the value of the '<em><b>Table Configuration</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * This field references the emf-facet table configuration.
+ * <!-- end-model-doc -->
+ * @return the value of the '<em>Table Configuration</em>' containment reference.
+ * @see #setTableConfiguration(TableConfiguration)
+ * @see org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage#getPapyrusTableConfiguration_TableConfiguration()
+ * @model containment="true"
+ * @generated
+ */
+ TableConfiguration getTableConfiguration();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getTableConfiguration <em>Table Configuration</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Table Configuration</em>' containment reference.
+ * @see #getTableConfiguration()
+ * @generated
+ */
+ void setTableConfiguration(TableConfiguration value);
+
} // PapyrusTableConfiguration
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrustableconfigurationPackage.java b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrustableconfigurationPackage.java index 4d051cc4c42..dbe79e30840 100644 --- a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrustableconfigurationPackage.java +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrustableconfigurationPackage.java @@ -16,8 +16,7 @@ import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.TableconfigurationPackage;
+import org.eclipse.emf.ecore.EcorePackage;
/**
* <!-- begin-user-doc -->
@@ -81,94 +80,49 @@ public interface PapyrustableconfigurationPackage extends EPackage { int PAPYRUS_TABLE_CONFIGURATION = 0;
/**
- * The feature id for the '<em><b>Default Local Customizations</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PAPYRUS_TABLE_CONFIGURATION__DEFAULT_LOCAL_CUSTOMIZATIONS = TableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_LOCAL_CUSTOMIZATIONS;
-
- /**
- * The feature id for the '<em><b>Can Be Presented In The Table</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PAPYRUS_TABLE_CONFIGURATION__CAN_BE_PRESENTED_IN_THE_TABLE = TableconfigurationPackage.TABLE_CONFIGURATION__CAN_BE_PRESENTED_IN_THE_TABLE;
-
- /**
- * The feature id for the '<em><b>Forced Cell Editors</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PAPYRUS_TABLE_CONFIGURATION__FORCED_CELL_EDITORS = TableconfigurationPackage.TABLE_CONFIGURATION__FORCED_CELL_EDITORS;
-
- /**
- * The feature id for the '<em><b>Default Facets</b></em>' reference list.
+ * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PAPYRUS_TABLE_CONFIGURATION__DEFAULT_FACETS = TableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_FACETS;
+ int PAPYRUS_TABLE_CONFIGURATION__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
/**
- * The feature id for the '<em><b>Default Customizations</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PAPYRUS_TABLE_CONFIGURATION__DEFAULT_CUSTOMIZATIONS = TableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_CUSTOMIZATIONS;
-
- /**
- * The feature id for the '<em><b>Instantiation Method</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int PAPYRUS_TABLE_CONFIGURATION__INSTANTIATION_METHOD = TableconfigurationPackage.TABLE_CONFIGURATION__INSTANTIATION_METHOD;
-
- /**
- * The feature id for the '<em><b>Default Columns</b></em>' reference list.
+ * The feature id for the '<em><b>Filling Mode</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PAPYRUS_TABLE_CONFIGURATION__DEFAULT_COLUMNS = TableconfigurationPackage.TABLE_CONFIGURATION__DEFAULT_COLUMNS;
+ int PAPYRUS_TABLE_CONFIGURATION__FILLING_MODE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
/**
- * The feature id for the '<em><b>Filling Mode</b></em>' attribute.
+ * The feature id for the '<em><b>Filling Queries</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PAPYRUS_TABLE_CONFIGURATION__FILLING_MODE = TableconfigurationPackage.TABLE_CONFIGURATION_FEATURE_COUNT + 0;
+ int PAPYRUS_TABLE_CONFIGURATION__FILLING_QUERIES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Filling Queries</b></em>' reference list.
+ * The feature id for the '<em><b>Listen Feature</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PAPYRUS_TABLE_CONFIGURATION__FILLING_QUERIES = TableconfigurationPackage.TABLE_CONFIGURATION_FEATURE_COUNT + 1;
+ int PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
/**
- * The feature id for the '<em><b>Listen Feature</b></em>' reference.
+ * The feature id for the '<em><b>Table Configuration</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE = TableconfigurationPackage.TABLE_CONFIGURATION_FEATURE_COUNT + 2;
+ int PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
/**
* The number of structural features of the '<em>Papyrus Table Configuration</em>' class.
@@ -177,7 +131,7 @@ public interface PapyrustableconfigurationPackage extends EPackage { * @generated
* @ordered
*/
- int PAPYRUS_TABLE_CONFIGURATION_FEATURE_COUNT = TableconfigurationPackage.TABLE_CONFIGURATION_FEATURE_COUNT + 3;
+ int PAPYRUS_TABLE_CONFIGURATION_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;
/**
@@ -224,6 +178,17 @@ public interface PapyrustableconfigurationPackage extends EPackage { EReference getPapyrusTableConfiguration_ListenFeature();
/**
+ * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getTableConfiguration <em>Table Configuration</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference '<em>Table Configuration</em>'.
+ * @see org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getTableConfiguration()
+ * @see #getPapyrusTableConfiguration()
+ * @generated
+ */
+ EReference getPapyrusTableConfiguration_TableConfiguration();
+
+ /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -279,6 +244,14 @@ public interface PapyrustableconfigurationPackage extends EPackage { */
EReference PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE = eINSTANCE.getPapyrusTableConfiguration_ListenFeature();
+ /**
+ * The meta object literal for the '<em><b>Table Configuration</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION = eINSTANCE.getPapyrusTableConfiguration_TableConfiguration();
+
}
} //PapyrustableconfigurationPackage
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java index 25601acafcc..24c7ec78804 100644 --- a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java @@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papy import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.common.util.EList;
@@ -22,13 +23,14 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.EModelElementImpl;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.extensible.Query;
-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.impl.TableConfigurationImpl;
+import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.TableConfiguration;
import org.eclipse.papyrus.infra.table.metamodel.papyrustable.FillingMode;
@@ -45,12 +47,13 @@ import org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyr * <li>{@link org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.impl.PapyrusTableConfigurationImpl#getFillingMode <em>Filling Mode</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.impl.PapyrusTableConfigurationImpl#getFillingQueries <em>Filling Queries</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.impl.PapyrusTableConfigurationImpl#getListenFeature <em>Listen Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.impl.PapyrusTableConfigurationImpl#getTableConfiguration <em>Table Configuration</em>}</li>
* </ul>
* </p>
*
* @generated
*/
-public class PapyrusTableConfigurationImpl extends TableConfigurationImpl implements PapyrusTableConfiguration {
+public class PapyrusTableConfigurationImpl extends EModelElementImpl implements PapyrusTableConfiguration {
/**
* The default value of the '{@link #getFillingMode() <em>Filling Mode</em>}' attribute.
* <!-- begin-user-doc -->
@@ -92,6 +95,16 @@ public class PapyrusTableConfigurationImpl extends TableConfigurationImpl implem protected EStructuralFeature listenFeature;
/**
+ * The cached value of the '{@link #getTableConfiguration() <em>Table Configuration</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getTableConfiguration()
+ * @generated
+ * @ordered
+ */
+ protected TableConfiguration tableConfiguration;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -186,6 +199,63 @@ public class PapyrusTableConfigurationImpl extends TableConfigurationImpl implem * <!-- end-user-doc -->
* @generated
*/
+ public TableConfiguration getTableConfiguration() {
+ return tableConfiguration;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetTableConfiguration(TableConfiguration newTableConfiguration, NotificationChain msgs) {
+ TableConfiguration oldTableConfiguration = tableConfiguration;
+ tableConfiguration = newTableConfiguration;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION, oldTableConfiguration, newTableConfiguration);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setTableConfiguration(TableConfiguration newTableConfiguration) {
+ if (newTableConfiguration != tableConfiguration) {
+ NotificationChain msgs = null;
+ if (tableConfiguration != null)
+ msgs = ((InternalEObject)tableConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION, null, msgs);
+ if (newTableConfiguration != null)
+ msgs = ((InternalEObject)newTableConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION, null, msgs);
+ msgs = basicSetTableConfiguration(newTableConfiguration, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION, newTableConfiguration, newTableConfiguration));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:
+ return basicSetTableConfiguration(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
@@ -196,6 +266,8 @@ public class PapyrusTableConfigurationImpl extends TableConfigurationImpl implem case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE:
if (resolve) return getListenFeature();
return basicGetListenFeature();
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:
+ return getTableConfiguration();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -219,6 +291,9 @@ public class PapyrusTableConfigurationImpl extends TableConfigurationImpl implem case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE:
setListenFeature((EStructuralFeature)newValue);
return;
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:
+ setTableConfiguration((TableConfiguration)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -240,6 +315,9 @@ public class PapyrusTableConfigurationImpl extends TableConfigurationImpl implem case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE:
setListenFeature((EStructuralFeature)null);
return;
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:
+ setTableConfiguration((TableConfiguration)null);
+ return;
}
super.eUnset(featureID);
}
@@ -258,6 +336,8 @@ public class PapyrusTableConfigurationImpl extends TableConfigurationImpl implem return fillingQueries != null && !fillingQueries.isEmpty();
case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE:
return listenFeature != null;
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:
+ return tableConfiguration != null;
}
return super.eIsSet(featureID);
}
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java index 2c0150057f3..2bdca18deaa 100644 --- a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java @@ -149,6 +149,15 @@ public class PapyrustableconfigurationPackageImpl extends EPackageImpl implement * <!-- end-user-doc -->
* @generated
*/
+ public EReference getPapyrusTableConfiguration_TableConfiguration() {
+ return (EReference)papyrusTableConfigurationEClass.getEStructuralFeatures().get(3);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public PapyrustableconfigurationFactory getPapyrustableconfigurationFactory() {
return (PapyrustableconfigurationFactory)getEFactoryInstance();
}
@@ -176,6 +185,7 @@ public class PapyrustableconfigurationPackageImpl extends EPackageImpl implement createEAttribute(papyrusTableConfigurationEClass, PAPYRUS_TABLE_CONFIGURATION__FILLING_MODE);
createEReference(papyrusTableConfigurationEClass, PAPYRUS_TABLE_CONFIGURATION__FILLING_QUERIES);
createEReference(papyrusTableConfigurationEClass, PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE);
+ createEReference(papyrusTableConfigurationEClass, PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION);
}
/**
@@ -202,23 +212,24 @@ public class PapyrustableconfigurationPackageImpl extends EPackageImpl implement setNsURI(eNS_URI);
// Obtain other dependent packages
- TableconfigurationPackage theTableconfigurationPackage = (TableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(TableconfigurationPackage.eNS_URI);
PapyrustablePackage thePapyrustablePackage = (PapyrustablePackage)EPackage.Registry.INSTANCE.getEPackage(PapyrustablePackage.eNS_URI);
ExtensiblePackage theExtensiblePackage = (ExtensiblePackage)EPackage.Registry.INSTANCE.getEPackage(ExtensiblePackage.eNS_URI);
EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+ TableconfigurationPackage theTableconfigurationPackage = (TableconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(TableconfigurationPackage.eNS_URI);
// Create type parameters
// Set bounds for type parameters
// Add supertypes to classes
- papyrusTableConfigurationEClass.getESuperTypes().add(theTableconfigurationPackage.getTableConfiguration());
+ papyrusTableConfigurationEClass.getESuperTypes().add(ecorePackage.getEModelElement());
// Initialize classes and features; add operations and parameters
initEClass(papyrusTableConfigurationEClass, PapyrusTableConfiguration.class, "PapyrusTableConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getPapyrusTableConfiguration_FillingMode(), thePapyrustablePackage.getFillingMode(), "fillingMode", null, 0, 1, PapyrusTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEReference(getPapyrusTableConfiguration_FillingQueries(), theExtensiblePackage.getQuery(), null, "fillingQueries", null, 0, -1, PapyrusTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getPapyrusTableConfiguration_ListenFeature(), theEcorePackage.getEStructuralFeature(), null, "listenFeature", null, 0, 1, PapyrusTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getPapyrusTableConfiguration_TableConfiguration(), theTableconfigurationPackage.getTableConfiguration(), null, "tableConfiguration", null, 0, 1, PapyrusTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationAdapterFactory.java b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationAdapterFactory.java index a54a7c754bf..2ab1aba0ef0 100644 --- a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationAdapterFactory.java +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationAdapterFactory.java @@ -17,10 +17,9 @@ import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.TableConfiguration;
-
import org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.*;
/**
@@ -84,8 +83,8 @@ public class PapyrustableconfigurationAdapterFactory extends AdapterFactoryImpl return createPapyrusTableConfigurationAdapter();
}
@Override
- public Adapter caseTableConfiguration(TableConfiguration object) {
- return createTableConfigurationAdapter();
+ public Adapter caseEModelElement(EModelElement object) {
+ return createEModelElementAdapter();
}
@Override
public Adapter defaultCase(EObject object) {
@@ -122,16 +121,16 @@ public class PapyrustableconfigurationAdapterFactory extends AdapterFactoryImpl }
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.TableConfiguration <em>Table Configuration</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
* <!-- begin-user-doc -->
* 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.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.TableConfiguration
+ * @see org.eclipse.emf.ecore.EModelElement
* @generated
*/
- public Adapter createTableConfigurationAdapter() {
+ public Adapter createEModelElementAdapter() {
return null;
}
diff --git a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationSwitch.java b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationSwitch.java index ac80265f654..c82945c6d65 100644 --- a/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationSwitch.java +++ b/incoming/org.eclispe.papyrus.infra.table.papyrustableconfiguration.metamodel/src/org/eclipse/papyrus/infra/table/papyrustableconfiguration/metamodel/papyrustableconfiguration/util/PapyrustableconfigurationSwitch.java @@ -12,13 +12,12 @@ */
package org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.util;
+import org.eclipse.emf.ecore.EModelElement;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.TableConfiguration;
-
import org.eclipse.papyrus.infra.table.papyrustableconfiguration.metamodel.papyrustableconfiguration.*;
/**
@@ -81,7 +80,7 @@ public class PapyrustableconfigurationSwitch<T> extends Switch<T> { case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION: {
PapyrusTableConfiguration papyrusTableConfiguration = (PapyrusTableConfiguration)theEObject;
T result = casePapyrusTableConfiguration(papyrusTableConfiguration);
- if (result == null) result = caseTableConfiguration(papyrusTableConfiguration);
+ if (result == null) result = caseEModelElement(papyrusTableConfiguration);
if (result == null) result = defaultCase(theEObject);
return result;
}
@@ -105,17 +104,17 @@ public class PapyrustableconfigurationSwitch<T> extends Switch<T> { }
/**
- * Returns the result of interpreting the object as an instance of '<em>Table Configuration</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Table Configuration</em>'.
+ * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public T caseTableConfiguration(TableConfiguration object) {
+ public T caseEModelElement(EModelElement object) {
return null;
}
|