diff options
author | vlorenzo | 2012-08-03 11:36:56 +0000 |
---|---|---|
committer | vlorenzo | 2012-08-03 11:36:56 +0000 |
commit | 9ca1b4307e70d5199d11d6c057c42a9ebdee2140 (patch) | |
tree | ad2e0fbcd9ccf0f73e5c2e87d317c82b469e4018 /incoming | |
parent | 8edc6c35df7e2262a68241f79f1f4453e4b18352 (diff) | |
download | org.eclipse.papyrus-9ca1b4307e70d5199d11d6c057c42a9ebdee2140.tar.gz org.eclipse.papyrus-9ca1b4307e70d5199d11d6c057c42a9ebdee2140.tar.xz org.eclipse.papyrus-9ca1b4307e70d5199d11d6c057c42a9ebdee2140.zip |
A save of my work on the new tables
Rename feature into ContextFeature
Diffstat (limited to 'incoming')
19 files changed, 910 insertions, 1036 deletions
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/plugin.properties b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/plugin.properties index 68f9143a538..bd223e91e20 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/plugin.properties +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/plugin.properties @@ -40,3 +40,4 @@ _UI_Unknown_feature = Unspecified _UI_FillingMode_User_literal = USER
_UI_FillingMode_Queries_literal = QUERIES
_UI_FillingMode_ContextFeature_literal = CONTEXT_FEATURE
+_UI_PapyrusTable_contextFeature_feature = Context Feature
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/provider/PapyrusTableItemProvider.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/provider/PapyrusTableItemProvider.java index a69f3281a94..8460dde6dbf 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/provider/PapyrusTableItemProvider.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/provider/PapyrusTableItemProvider.java @@ -76,7 +76,7 @@ public class PapyrusTableItemProvider addTypePropertyDescriptor(object);
addTablePropertyDescriptor(object);
addFillingModePropertyDescriptor(object);
- addFeaturePropertyDescriptor(object);
+ addContextFeaturePropertyDescriptor(object);
addQueriesPropertyDescriptor(object);
addUsingUserPropertyDescriptor(object);
addUsingContextFeaturePropertyDescriptor(object);
@@ -174,19 +174,19 @@ public class PapyrusTableItemProvider }
/**
- * This adds a property descriptor for the Feature feature.
+ * This adds a property descriptor for the Context Feature feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addFeaturePropertyDescriptor(Object object) {
+ protected void addContextFeaturePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_PapyrusTable_feature_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PapyrusTable_feature_feature", "_UI_PapyrusTable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- PapyrustablePackage.Literals.PAPYRUS_TABLE__FEATURE,
+ getString("_UI_PapyrusTable_contextFeature_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_PapyrusTable_contextFeature_feature", "_UI_PapyrusTable_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ PapyrustablePackage.Literals.PAPYRUS_TABLE__CONTEXT_FEATURE,
true,
false,
true,
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/model/papyrustable.ecore b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/model/papyrustable.ecore index 1159da5e508..63bf85fe639 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/model/papyrustable.ecore +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/model/papyrustable.ecore @@ -30,7 +30,7 @@ <details key="documentation" value="This attribute allows to store how the table should be filled."/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="feature" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="contextFeature" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="This field references the EStructuralFeature to listen when the table is in Feature Mode."/>
</eAnnotations>
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrusTable.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrusTable.java index aa6ceef0a7d..e0b68d7bddf 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrusTable.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrusTable.java @@ -37,7 +37,7 @@ import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.Table; * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getType <em>Type</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getTable <em>Table</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getFillingMode <em>Filling Mode</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getFeature <em>Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getContextFeature <em>Context Feature</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getQueries <em>Queries</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#isUsingUser <em>Using User</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#isUsingContextFeature <em>Using Context Feature</em>}</li>
@@ -157,29 +157,29 @@ public interface PapyrusTable extends EModelElement { void setFillingMode(FillingMode value);
/**
- * Returns the value of the '<em><b>Feature</b></em>' reference.
+ * Returns the value of the '<em><b>Context Feature</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* This field references the EStructuralFeature to listen when the table is in Feature Mode.
* <!-- end-model-doc -->
- * @return the value of the '<em>Feature</em>' reference.
- * @see #setFeature(EStructuralFeature)
- * @see org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrustablePackage#getPapyrusTable_Feature()
+ * @return the value of the '<em>Context Feature</em>' reference.
+ * @see #setContextFeature(EStructuralFeature)
+ * @see org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrustablePackage#getPapyrusTable_ContextFeature()
* @model
* @generated
*/
- EStructuralFeature getFeature();
+ EStructuralFeature getContextFeature();
/**
- * Sets the value of the '{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getFeature <em>Feature</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getContextFeature <em>Context Feature</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Feature</em>' reference.
- * @see #getFeature()
+ * @param value the new value of the '<em>Context Feature</em>' reference.
+ * @see #getContextFeature()
* @generated
*/
- void setFeature(EStructuralFeature value);
+ void setContextFeature(EStructuralFeature value);
/**
* Returns the value of the '<em><b>Queries</b></em>' reference list.
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrustablePackage.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrustablePackage.java index 600dd4dccf5..c5e802dcef3 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrustablePackage.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/PapyrustablePackage.java @@ -126,13 +126,13 @@ public interface PapyrustablePackage extends EPackage { int PAPYRUS_TABLE__FILLING_MODE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>Feature</b></em>' reference.
+ * The feature id for the '<em><b>Context Feature</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PAPYRUS_TABLE__FEATURE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;
+ int PAPYRUS_TABLE__CONTEXT_FEATURE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Queries</b></em>' reference list.
@@ -245,15 +245,15 @@ public interface PapyrustablePackage extends EPackage { EAttribute getPapyrusTable_FillingMode();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getFeature <em>Feature</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getContextFeature <em>Context Feature</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Feature</em>'.
- * @see org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getFeature()
+ * @return the meta object for the reference '<em>Context Feature</em>'.
+ * @see org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getContextFeature()
* @see #getPapyrusTable()
* @generated
*/
- EReference getPapyrusTable_Feature();
+ EReference getPapyrusTable_ContextFeature();
/**
* Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.PapyrusTable#getQueries <em>Queries</em>}'.
@@ -374,12 +374,12 @@ public interface PapyrustablePackage extends EPackage { EAttribute PAPYRUS_TABLE__FILLING_MODE = eINSTANCE.getPapyrusTable_FillingMode();
/**
- * The meta object literal for the '<em><b>Feature</b></em>' reference feature.
+ * The meta object literal for the '<em><b>Context Feature</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference PAPYRUS_TABLE__FEATURE = eINSTANCE.getPapyrusTable_Feature();
+ EReference PAPYRUS_TABLE__CONTEXT_FEATURE = eINSTANCE.getPapyrusTable_ContextFeature();
/**
* The meta object literal for the '<em><b>Queries</b></em>' reference list feature.
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrusTableImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrusTableImpl.java index 1642535b4b5..72fcc6c4558 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrusTableImpl.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrusTableImpl.java @@ -36,19 +36,18 @@ import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.Papyrustabl * <p>
* The following features are implemented:
* <ul>
- * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getTable <em>Table</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getFillingMode <em>Filling Mode</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getFeature <em>Feature</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getQueries <em>Queries</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#isUsingUser <em>Using User</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#isUsingContextFeature <em>Using Context Feature
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#isUsingQueries <em>Using Queries</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getType <em>Type</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getTable <em>Table</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getFillingMode <em>Filling Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getContextFeature <em>Context Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#getQueries <em>Queries</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#isUsingUser <em>Using User</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#isUsingContextFeature <em>Using Context Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.impl.PapyrusTableImpl#isUsingQueries <em>Using Queries</em>}</li>
* </ul>
* </p>
- *
+ *
* @generated
*/
public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable {
@@ -57,7 +56,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable * The default value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getName()
* @generated
* @ordered
@@ -68,7 +66,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getName()
* @generated
* @ordered
@@ -79,7 +76,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable * The default value of the '{@link #getType() <em>Type</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getType()
* @generated
* @ordered
@@ -90,7 +86,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getType()
* @generated
* @ordered
@@ -101,7 +96,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable * The cached value of the '{@link #getTable() <em>Table</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getTable()
* @generated
* @ordered
@@ -112,7 +106,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable * The default value of the '{@link #getFillingMode() <em>Filling Mode</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getFillingMode()
* @generated
* @ordered
@@ -123,7 +116,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable * The cached value of the '{@link #getFillingMode() <em>Filling Mode</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getFillingMode()
* @generated
* @ordered
@@ -131,21 +123,19 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable protected FillingMode fillingMode = FILLING_MODE_EDEFAULT;
/**
- * The cached value of the '{@link #getFeature() <em>Feature</em>}' reference.
+ * The cached value of the '{@link #getContextFeature() <em>Context Feature</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @see #getFeature()
+ * @see #getContextFeature()
* @generated
* @ordered
*/
- protected EStructuralFeature feature;
+ protected EStructuralFeature contextFeature;
/**
* The cached value of the '{@link #getQueries() <em>Queries</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #getQueries()
* @generated
* @ordered
@@ -156,7 +146,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable * The default value of the '{@link #isUsingUser() <em>Using User</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #isUsingUser()
* @generated
* @ordered
@@ -167,7 +156,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable * The default value of the '{@link #isUsingContextFeature() <em>Using Context Feature</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #isUsingContextFeature()
* @generated
* @ordered
@@ -178,7 +166,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable * The default value of the '{@link #isUsingQueries() <em>Using Queries</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @see #isUsingQueries()
* @generated
* @ordered
@@ -188,7 +175,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected PapyrusTableImpl() {
@@ -198,7 +184,6 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -209,77 +194,65 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public String getName() {
- return this.name;
+ return name;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void setName(final String newName) {
- final String oldName = this.name;
- this.name = newName;
- if(eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__NAME, oldName, this.name));
- }
+ public void setName(String newName) {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__NAME, oldName, name));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public String getType() {
- return this.type;
+ return type;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void setType(final String newType) {
- final String oldType = this.type;
- this.type = newType;
- if(eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__TYPE, oldType, this.type));
- }
+ public void setType(String newType) {
+ String oldType = type;
+ type = newType;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__TYPE, oldType, type));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public Table getTable() {
- return this.table;
+ return table;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public NotificationChain basicSetTable(final Table newTable, NotificationChain msgs) {
- final Table oldTable = this.table;
- this.table = newTable;
- if(eNotificationRequired()) {
- final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__TABLE, oldTable, newTable);
- if(msgs == null) {
- msgs = notification;
- } else {
- msgs.add(notification);
- }
+ public NotificationChain basicSetTable(Table newTable, NotificationChain msgs) {
+ Table oldTable = table;
+ table = newTable;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__TABLE, oldTable, newTable);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
}
return msgs;
}
@@ -287,105 +260,91 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void setTable(final Table newTable) {
- if(newTable != this.table) {
+ public void setTable(Table newTable) {
+ if (newTable != table) {
NotificationChain msgs = null;
- if(this.table != null) {
- msgs = ((InternalEObject)this.table).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PapyrustablePackage.PAPYRUS_TABLE__TABLE, null, msgs);
- }
- if(newTable != null) {
+ if (table != null)
+ msgs = ((InternalEObject)table).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - PapyrustablePackage.PAPYRUS_TABLE__TABLE, null, msgs);
+ if (newTable != null)
msgs = ((InternalEObject)newTable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - PapyrustablePackage.PAPYRUS_TABLE__TABLE, null, msgs);
- }
msgs = basicSetTable(newTable, msgs);
- if(msgs != null) {
- msgs.dispatch();
- }
- } else if(eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__TABLE, newTable, newTable));
+ if (msgs != null) msgs.dispatch();
}
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__TABLE, newTable, newTable));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public FillingMode getFillingMode() {
- return this.fillingMode;
+ return fillingMode;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void setFillingMode(final FillingMode newFillingMode) {
- final FillingMode oldFillingMode = this.fillingMode;
- this.fillingMode = newFillingMode == null ? FILLING_MODE_EDEFAULT : newFillingMode;
- if(eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__FILLING_MODE, oldFillingMode, this.fillingMode));
- }
+ public void setFillingMode(FillingMode newFillingMode) {
+ FillingMode oldFillingMode = fillingMode;
+ fillingMode = newFillingMode == null ? FILLING_MODE_EDEFAULT : newFillingMode;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__FILLING_MODE, oldFillingMode, fillingMode));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public EStructuralFeature getFeature() {
- if(this.feature != null && this.feature.eIsProxy()) {
- final InternalEObject oldFeature = (InternalEObject)this.feature;
- this.feature = (EStructuralFeature)eResolveProxy(oldFeature);
- if(this.feature != oldFeature) {
- if(eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, PapyrustablePackage.PAPYRUS_TABLE__FEATURE, oldFeature, this.feature));
- }
+ public EStructuralFeature getContextFeature() {
+ if (contextFeature != null && contextFeature.eIsProxy()) {
+ InternalEObject oldContextFeature = (InternalEObject)contextFeature;
+ contextFeature = (EStructuralFeature)eResolveProxy(oldContextFeature);
+ if (contextFeature != oldContextFeature) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, PapyrustablePackage.PAPYRUS_TABLE__CONTEXT_FEATURE, oldContextFeature, contextFeature));
}
}
- return this.feature;
+ return contextFeature;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public EStructuralFeature basicGetFeature() {
- return this.feature;
+ public EStructuralFeature basicGetContextFeature() {
+ return contextFeature;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void setFeature(final EStructuralFeature newFeature) {
- final EStructuralFeature oldFeature = this.feature;
- this.feature = newFeature;
- if(eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__FEATURE, oldFeature, this.feature));
- }
+ public void setContextFeature(EStructuralFeature newContextFeature) {
+ EStructuralFeature oldContextFeature = contextFeature;
+ contextFeature = newContextFeature;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, PapyrustablePackage.PAPYRUS_TABLE__CONTEXT_FEATURE, oldContextFeature, contextFeature));
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EList<Query> getQueries() {
- if(this.queries == null) {
- this.queries = new EObjectResolvingEList<Query>(Query.class, this, PapyrustablePackage.PAPYRUS_TABLE__QUERIES);
+ if (queries == null) {
+ queries = new EObjectResolvingEList<Query>(Query.class, this, PapyrustablePackage.PAPYRUS_TABLE__QUERIES);
}
- return this.queries;
+ return queries;
}
/**
@@ -401,40 +360,35 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public boolean isUsingContextFeature() {
// TODO: implement this method to return the 'Using Context Feature' attribute
// Ensure that you remove @generated or mark it @generated NOT
- // throw new UnsupportedOperationException();
- return false;
+ throw new UnsupportedOperationException();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public boolean isUsingQueries() {
// TODO: implement this method to return the 'Using Queries' attribute
// Ensure that you remove @generated or mark it @generated NOT
- // throw new UnsupportedOperationException();
- return false;
+ throw new UnsupportedOperationException();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public NotificationChain eInverseRemove(final InternalEObject otherEnd, final int featureID, final NotificationChain msgs) {
- switch(featureID) {
- case PapyrustablePackage.PAPYRUS_TABLE__TABLE:
- return basicSetTable(null, msgs);
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case PapyrustablePackage.PAPYRUS_TABLE__TABLE:
+ return basicSetTable(null, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -442,33 +396,30 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public Object eGet(final int featureID, final boolean resolve, final boolean coreType) {
- switch(featureID) {
- case PapyrustablePackage.PAPYRUS_TABLE__NAME:
- return getName();
- case PapyrustablePackage.PAPYRUS_TABLE__TYPE:
- return getType();
- case PapyrustablePackage.PAPYRUS_TABLE__TABLE:
- return getTable();
- case PapyrustablePackage.PAPYRUS_TABLE__FILLING_MODE:
- return getFillingMode();
- case PapyrustablePackage.PAPYRUS_TABLE__FEATURE:
- if(resolve) {
- return getFeature();
- }
- return basicGetFeature();
- case PapyrustablePackage.PAPYRUS_TABLE__QUERIES:
- return getQueries();
- case PapyrustablePackage.PAPYRUS_TABLE__USING_USER:
- return isUsingUser();
- case PapyrustablePackage.PAPYRUS_TABLE__USING_CONTEXT_FEATURE:
- return isUsingContextFeature();
- case PapyrustablePackage.PAPYRUS_TABLE__USING_QUERIES:
- return isUsingQueries();
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case PapyrustablePackage.PAPYRUS_TABLE__NAME:
+ return getName();
+ case PapyrustablePackage.PAPYRUS_TABLE__TYPE:
+ return getType();
+ case PapyrustablePackage.PAPYRUS_TABLE__TABLE:
+ return getTable();
+ case PapyrustablePackage.PAPYRUS_TABLE__FILLING_MODE:
+ return getFillingMode();
+ case PapyrustablePackage.PAPYRUS_TABLE__CONTEXT_FEATURE:
+ if (resolve) return getContextFeature();
+ return basicGetContextFeature();
+ case PapyrustablePackage.PAPYRUS_TABLE__QUERIES:
+ return getQueries();
+ case PapyrustablePackage.PAPYRUS_TABLE__USING_USER:
+ return isUsingUser();
+ case PapyrustablePackage.PAPYRUS_TABLE__USING_CONTEXT_FEATURE:
+ return isUsingContextFeature();
+ case PapyrustablePackage.PAPYRUS_TABLE__USING_QUERIES:
+ return isUsingQueries();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -476,32 +427,31 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("unchecked")
@Override
- public void eSet(final int featureID, final Object newValue) {
- switch(featureID) {
- case PapyrustablePackage.PAPYRUS_TABLE__NAME:
- setName((String)newValue);
- return;
- case PapyrustablePackage.PAPYRUS_TABLE__TYPE:
- setType((String)newValue);
- return;
- case PapyrustablePackage.PAPYRUS_TABLE__TABLE:
- setTable((Table)newValue);
- return;
- case PapyrustablePackage.PAPYRUS_TABLE__FILLING_MODE:
- setFillingMode((FillingMode)newValue);
- return;
- case PapyrustablePackage.PAPYRUS_TABLE__FEATURE:
- setFeature((EStructuralFeature)newValue);
- return;
- case PapyrustablePackage.PAPYRUS_TABLE__QUERIES:
- getQueries().clear();
- getQueries().addAll((Collection<? extends Query>)newValue);
- return;
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case PapyrustablePackage.PAPYRUS_TABLE__NAME:
+ setName((String)newValue);
+ return;
+ case PapyrustablePackage.PAPYRUS_TABLE__TYPE:
+ setType((String)newValue);
+ return;
+ case PapyrustablePackage.PAPYRUS_TABLE__TABLE:
+ setTable((Table)newValue);
+ return;
+ case PapyrustablePackage.PAPYRUS_TABLE__FILLING_MODE:
+ setFillingMode((FillingMode)newValue);
+ return;
+ case PapyrustablePackage.PAPYRUS_TABLE__CONTEXT_FEATURE:
+ setContextFeature((EStructuralFeature)newValue);
+ return;
+ case PapyrustablePackage.PAPYRUS_TABLE__QUERIES:
+ getQueries().clear();
+ getQueries().addAll((Collection<? extends Query>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -509,30 +459,29 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public void eUnset(final int featureID) {
- switch(featureID) {
- case PapyrustablePackage.PAPYRUS_TABLE__NAME:
- setName(NAME_EDEFAULT);
- return;
- case PapyrustablePackage.PAPYRUS_TABLE__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- case PapyrustablePackage.PAPYRUS_TABLE__TABLE:
- setTable((Table)null);
- return;
- case PapyrustablePackage.PAPYRUS_TABLE__FILLING_MODE:
- setFillingMode(FILLING_MODE_EDEFAULT);
- return;
- case PapyrustablePackage.PAPYRUS_TABLE__FEATURE:
- setFeature((EStructuralFeature)null);
- return;
- case PapyrustablePackage.PAPYRUS_TABLE__QUERIES:
- getQueries().clear();
- return;
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case PapyrustablePackage.PAPYRUS_TABLE__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case PapyrustablePackage.PAPYRUS_TABLE__TYPE:
+ setType(TYPE_EDEFAULT);
+ return;
+ case PapyrustablePackage.PAPYRUS_TABLE__TABLE:
+ setTable((Table)null);
+ return;
+ case PapyrustablePackage.PAPYRUS_TABLE__FILLING_MODE:
+ setFillingMode(FILLING_MODE_EDEFAULT);
+ return;
+ case PapyrustablePackage.PAPYRUS_TABLE__CONTEXT_FEATURE:
+ setContextFeature((EStructuralFeature)null);
+ return;
+ case PapyrustablePackage.PAPYRUS_TABLE__QUERIES:
+ getQueries().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -540,30 +489,29 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public boolean eIsSet(final int featureID) {
- switch(featureID) {
- case PapyrustablePackage.PAPYRUS_TABLE__NAME:
- return NAME_EDEFAULT == null ? this.name != null : !NAME_EDEFAULT.equals(this.name);
- case PapyrustablePackage.PAPYRUS_TABLE__TYPE:
- return TYPE_EDEFAULT == null ? this.type != null : !TYPE_EDEFAULT.equals(this.type);
- case PapyrustablePackage.PAPYRUS_TABLE__TABLE:
- return this.table != null;
- case PapyrustablePackage.PAPYRUS_TABLE__FILLING_MODE:
- return this.fillingMode != FILLING_MODE_EDEFAULT;
- case PapyrustablePackage.PAPYRUS_TABLE__FEATURE:
- return this.feature != null;
- case PapyrustablePackage.PAPYRUS_TABLE__QUERIES:
- return this.queries != null && !this.queries.isEmpty();
- case PapyrustablePackage.PAPYRUS_TABLE__USING_USER:
- return isUsingUser() != USING_USER_EDEFAULT;
- case PapyrustablePackage.PAPYRUS_TABLE__USING_CONTEXT_FEATURE:
- return isUsingContextFeature() != USING_CONTEXT_FEATURE_EDEFAULT;
- case PapyrustablePackage.PAPYRUS_TABLE__USING_QUERIES:
- return isUsingQueries() != USING_QUERIES_EDEFAULT;
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case PapyrustablePackage.PAPYRUS_TABLE__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case PapyrustablePackage.PAPYRUS_TABLE__TYPE:
+ return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
+ case PapyrustablePackage.PAPYRUS_TABLE__TABLE:
+ return table != null;
+ case PapyrustablePackage.PAPYRUS_TABLE__FILLING_MODE:
+ return fillingMode != FILLING_MODE_EDEFAULT;
+ case PapyrustablePackage.PAPYRUS_TABLE__CONTEXT_FEATURE:
+ return contextFeature != null;
+ case PapyrustablePackage.PAPYRUS_TABLE__QUERIES:
+ return queries != null && !queries.isEmpty();
+ case PapyrustablePackage.PAPYRUS_TABLE__USING_USER:
+ return isUsingUser() != USING_USER_EDEFAULT;
+ case PapyrustablePackage.PAPYRUS_TABLE__USING_CONTEXT_FEATURE:
+ return isUsingContextFeature() != USING_CONTEXT_FEATURE_EDEFAULT;
+ case PapyrustablePackage.PAPYRUS_TABLE__USING_QUERIES:
+ return isUsingQueries() != USING_QUERIES_EDEFAULT;
}
return super.eIsSet(featureID);
}
@@ -571,22 +519,19 @@ public class PapyrusTableImpl extends EModelElementImpl implements PapyrusTable /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public String toString() {
- if(eIsProxy()) {
- return super.toString();
- }
+ if (eIsProxy()) return super.toString();
- final StringBuffer result = new StringBuffer(super.toString());
+ StringBuffer result = new StringBuffer(super.toString());
result.append(" (name: "); //$NON-NLS-1$
- result.append(this.name);
+ result.append(name);
result.append(", type: "); //$NON-NLS-1$
- result.append(this.type);
+ result.append(type);
result.append(", fillingMode: "); //$NON-NLS-1$
- result.append(this.fillingMode);
+ result.append(fillingMode);
result.append(')');
return result.toString();
}
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustablePackageImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustablePackageImpl.java index f49983bb14f..ca5ae408a0a 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustablePackageImpl.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/metamodel/papyrustable/impl/PapyrustablePackageImpl.java @@ -165,7 +165,7 @@ public class PapyrustablePackageImpl extends EPackageImpl implements Papyrustabl * <!-- end-user-doc -->
* @generated
*/
- public EReference getPapyrusTable_Feature() {
+ public EReference getPapyrusTable_ContextFeature() {
return (EReference)papyrusTableEClass.getEStructuralFeatures().get(4);
}
@@ -247,7 +247,7 @@ public class PapyrustablePackageImpl extends EPackageImpl implements Papyrustabl createEAttribute(papyrusTableEClass, PAPYRUS_TABLE__TYPE);
createEReference(papyrusTableEClass, PAPYRUS_TABLE__TABLE);
createEAttribute(papyrusTableEClass, PAPYRUS_TABLE__FILLING_MODE);
- createEReference(papyrusTableEClass, PAPYRUS_TABLE__FEATURE);
+ createEReference(papyrusTableEClass, PAPYRUS_TABLE__CONTEXT_FEATURE);
createEReference(papyrusTableEClass, PAPYRUS_TABLE__QUERIES);
createEAttribute(papyrusTableEClass, PAPYRUS_TABLE__USING_USER);
createEAttribute(papyrusTableEClass, PAPYRUS_TABLE__USING_CONTEXT_FEATURE);
@@ -298,7 +298,7 @@ public class PapyrustablePackageImpl extends EPackageImpl implements Papyrustabl initEAttribute(getPapyrusTable_Type(), ecorePackage.getEString(), "type", null, 0, 1, PapyrusTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getPapyrusTable_Table(), theTablePackage.getTable(), null, "table", null, 0, 1, PapyrusTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getPapyrusTable_FillingMode(), this.getFillingMode(), "fillingMode", null, 0, 1, PapyrusTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(getPapyrusTable_Feature(), theEcorePackage.getEStructuralFeature(), null, "feature", null, 0, 1, PapyrusTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getPapyrusTable_ContextFeature(), theEcorePackage.getEStructuralFeature(), null, "contextFeature", null, 0, 1, PapyrusTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getPapyrusTable_Queries(), theExtensiblePackage.getQuery(), null, "queries", null, 0, -1, PapyrusTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getPapyrusTable_UsingUser(), ecorePackage.getEBoolean(), "usingUser", null, 0, 1, PapyrusTable.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
initEAttribute(getPapyrusTable_UsingContextFeature(), ecorePackage.getEBoolean(), "usingContextFeature", null, 0, 1, PapyrusTable.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/plugin.properties b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/plugin.properties index bc9358f783f..594cc526064 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/plugin.properties +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/plugin.properties @@ -32,3 +32,4 @@ _UI_PapyrusTableConfiguration_listenFeature_feature = Listen Feature _UI_PapyrusTableConfiguration_tableConfiguration_feature = Table Configuration
_UI_Unknown_feature = Unspecified
+_UI_PapyrusTableConfiguration_listenContextFeature_feature = Listen Context Feature
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/provider/PapyrusTableConfigurationItemProvider.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/provider/PapyrusTableConfigurationItemProvider.java index 27490828a9d..5fb4b3a6765 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/provider/PapyrusTableConfigurationItemProvider.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/provider/PapyrusTableConfigurationItemProvider.java @@ -38,11 +38,9 @@ import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamode /**
- * This is the item provider adapter for a
- * {@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public class PapyrusTableConfigurationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
@@ -51,10 +49,9 @@ public class PapyrusTableConfigurationItemProvider extends ItemProviderAdapter i * This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public PapyrusTableConfigurationItemProvider(final AdapterFactory adapterFactory) {
+ public PapyrusTableConfigurationItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -62,58 +59,84 @@ public class PapyrusTableConfigurationItemProvider extends ItemProviderAdapter i * This returns the property descriptors for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(final Object object) {
- if(this.itemPropertyDescriptors == null) {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addFillingModePropertyDescriptor(object);
addFillingQueriesPropertyDescriptor(object);
- addListenFeaturePropertyDescriptor(object);
+ addListenContextFeaturePropertyDescriptor(object);
}
- return this.itemPropertyDescriptors;
+ return itemPropertyDescriptors;
}
/**
* This adds a property descriptor for the Filling Mode feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- protected void addFillingModePropertyDescriptor(final Object object) {
- this.itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)this.adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PapyrusTableConfiguration_fillingMode_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PapyrusTableConfiguration_fillingMode_feature", "_UI_PapyrusTableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- PapyrustableconfigurationPackage.Literals.PAPYRUS_TABLE_CONFIGURATION__FILLING_MODE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ protected void addFillingModePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_PapyrusTableConfiguration_fillingMode_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_PapyrusTableConfiguration_fillingMode_feature", "_UI_PapyrusTableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ PapyrustableconfigurationPackage.Literals.PAPYRUS_TABLE_CONFIGURATION__FILLING_MODE,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
}
/**
* This adds a property descriptor for the Filling Queries feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- protected void addFillingQueriesPropertyDescriptor(final Object object) {
- this.itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)this.adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PapyrusTableConfiguration_fillingQueries_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PapyrusTableConfiguration_fillingQueries_feature", "_UI_PapyrusTableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- PapyrustableconfigurationPackage.Literals.PAPYRUS_TABLE_CONFIGURATION__FILLING_QUERIES, true, false, true, null, null, null));
+ protected void addFillingQueriesPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_PapyrusTableConfiguration_fillingQueries_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_PapyrusTableConfiguration_fillingQueries_feature", "_UI_PapyrusTableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ PapyrustableconfigurationPackage.Literals.PAPYRUS_TABLE_CONFIGURATION__FILLING_QUERIES,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
}
/**
- * This adds a property descriptor for the Listen Feature feature.
+ * This adds a property descriptor for the Listen Context Feature feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- protected void addListenFeaturePropertyDescriptor(final Object object) {
- this.itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)this.adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PapyrusTableConfiguration_listenFeature_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PapyrusTableConfiguration_listenFeature_feature", "_UI_PapyrusTableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- PapyrustableconfigurationPackage.Literals.PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE, true, false, true, null, null, null));
+ protected void addListenContextFeaturePropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_PapyrusTableConfiguration_listenContextFeature_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_PapyrusTableConfiguration_listenContextFeature_feature", "_UI_PapyrusTableConfiguration_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ PapyrustableconfigurationPackage.Literals.PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
}
/**
@@ -122,27 +145,25 @@ public class PapyrusTableConfigurationItemProvider extends ItemProviderAdapter i * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(final Object object) {
- if(this.childrenFeatures == null) {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
- this.childrenFeatures.add(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);
- this.childrenFeatures.add(PapyrustableconfigurationPackage.Literals.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION);
+ childrenFeatures.add(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);
+ childrenFeatures.add(PapyrustableconfigurationPackage.Literals.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION);
}
- return this.childrenFeatures;
+ return childrenFeatures;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- protected EStructuralFeature getChildFeature(final Object object, final Object child) {
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
@@ -153,11 +174,10 @@ public class PapyrusTableConfigurationItemProvider extends ItemProviderAdapter i * This returns PapyrusTableConfiguration.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public Object getImage(final Object object) {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/PapyrusTableConfiguration")); //$NON-NLS-1$
}
@@ -165,15 +185,15 @@ public class PapyrusTableConfigurationItemProvider extends ItemProviderAdapter i * This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public String getText(final Object object) {
- final FillingMode labelValue = ((PapyrusTableConfiguration)object).getFillingMode();
- final String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ? getString("_UI_PapyrusTableConfiguration_type") : //$NON-NLS-1$
- getString("_UI_PapyrusTableConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+ public String getText(Object object) {
+ FillingMode labelValue = ((PapyrusTableConfiguration)object).getFillingMode();
+ String label = labelValue == null ? null : labelValue.toString();
+ return label == null || label.length() == 0 ?
+ getString("_UI_PapyrusTableConfiguration_type") : //$NON-NLS-1$
+ getString("_UI_PapyrusTableConfiguration_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
/**
@@ -181,21 +201,20 @@ public class PapyrusTableConfigurationItemProvider extends ItemProviderAdapter i * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public void notifyChanged(final Notification notification) {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch(notification.getFeatureID(PapyrusTableConfiguration.class)) {
- case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__FILLING_MODE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__EANNOTATIONS:
- case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
+ switch (notification.getFeatureID(PapyrusTableConfiguration.class)) {
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__FILLING_MODE:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__EANNOTATIONS:
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ return;
}
super.notifyChanged(notification);
}
@@ -205,21 +224,22 @@ public class PapyrusTableConfigurationItemProvider extends ItemProviderAdapter i * that can be created under this object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- protected void collectNewChildDescriptors(final Collection<Object> newChildDescriptors, final Object object) {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(PapyrustableconfigurationPackage.Literals.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION, TableconfigurationFactory.eINSTANCE.createTableConfiguration()));
+ newChildDescriptors.add
+ (createChildParameter
+ (PapyrustableconfigurationPackage.Literals.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION,
+ TableconfigurationFactory.eINSTANCE.createTableConfiguration()));
}
/**
* Return the resource locator for this item provider's resources.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/provider/PapyrustableconfigurationEditPlugin.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/provider/PapyrustableconfigurationEditPlugin.java index 376165e407f..765aaa13ae5 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/provider/PapyrustableconfigurationEditPlugin.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.edit/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/provider/PapyrustableconfigurationEditPlugin.java @@ -27,7 +27,6 @@ import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.provider.Pa * This is the central singleton for the Papyrustableconfiguration edit plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public final class PapyrustableconfigurationEditPlugin extends EMFPlugin {
@@ -36,7 +35,6 @@ public final class PapyrustableconfigurationEditPlugin extends EMFPlugin { * Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public static final PapyrustableconfigurationEditPlugin INSTANCE = new PapyrustableconfigurationEditPlugin();
@@ -45,7 +43,6 @@ public final class PapyrustableconfigurationEditPlugin extends EMFPlugin { * Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
private static Implementation plugin;
@@ -67,7 +64,6 @@ public final class PapyrustableconfigurationEditPlugin extends EMFPlugin { * Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the singleton instance.
* @generated
*/
@@ -80,7 +76,6 @@ public final class PapyrustableconfigurationEditPlugin extends EMFPlugin { * Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the singleton instance.
* @generated
*/
@@ -92,7 +87,6 @@ public final class PapyrustableconfigurationEditPlugin extends EMFPlugin { * The actual implementation of the Eclipse <b>Plugin</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public static class Implementation extends EclipsePlugin {
@@ -101,7 +95,6 @@ public final class PapyrustableconfigurationEditPlugin extends EMFPlugin { * Creates an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public Implementation() {
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditor.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditor.java index e69a4e62aed..cc48dab9eb4 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditor.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditor.java @@ -82,6 +82,8 @@ import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.query.provider.Query import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.runtime.provider.RuntimeItemProviderAdapterFactory;
import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.serialization.provider.SerializationItemProviderAdapterFactory;
import org.eclipse.emf.facet.widgets.celleditors.modelCellEditor.provider.ModelCellEditorItemProviderAdapterFactory;
+import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.provider.TableItemProviderAdapterFactory;
+import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.provider.TableconfigurationItemProviderAdapterFactory;
import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IStatusLineManager;
@@ -143,7 +145,6 @@ import org.eclipse.ui.views.properties.PropertySheetPage; * This is an example of a Papyrustableconfiguration model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public class PapyrustableconfigurationEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
@@ -152,7 +153,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This keeps track of the editing domain that is used to track all changes to the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected AdapterFactoryEditingDomain editingDomain;
@@ -161,7 +161,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This is the one adapter factory used for providing views of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected ComposedAdapterFactory adapterFactory;
@@ -170,7 +169,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This is the content outline page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected IContentOutlinePage contentOutlinePage;
@@ -179,7 +177,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This is a kludge...
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected IStatusLineManager contentOutlineStatusLineManager;
@@ -188,7 +185,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This is the content outline page's viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected TreeViewer contentOutlineViewer;
@@ -197,7 +193,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This is the property sheet page.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected PropertySheetPage propertySheetPage;
@@ -207,7 +202,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * The parent relation must be correctly defined for this to work.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected TreeViewer selectionViewer;
@@ -216,7 +210,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This inverts the roll of parent and child in the content provider and show parents as a tree.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected TreeViewer parentViewer;
@@ -225,7 +218,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This shows how a tree view works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected TreeViewer treeViewer;
@@ -235,7 +227,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * A list viewer doesn't support icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected ListViewer listViewer;
@@ -245,7 +236,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * A table can be used as a list with icons.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected TableViewer tableViewer;
@@ -254,7 +244,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This shows how a tree view with columns works.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected TreeViewer treeViewerWithColumns;
@@ -263,7 +252,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This keeps track of the active viewer pane, in the book.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected ViewerPane currentViewerPane;
@@ -272,7 +260,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected Viewer currentViewer;
@@ -281,7 +268,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This listens to which ever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected ISelectionChangedListener selectionChangedListener;
@@ -290,7 +276,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
@@ -299,7 +284,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This keeps track of the selection of the editor as a whole.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected ISelection editorSelection = StructuredSelection.EMPTY;
@@ -309,7 +293,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * in Eclipse's Problems View.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected MarkerHelper markerHelper = new EditUIMarkerHelper();
@@ -318,50 +301,45 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This listens for when the outline becomes active
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected IPartListener partListener = new IPartListener() {
+ public void partActivated(IWorkbenchPart p) {
+ if (p instanceof ContentOutline) {
+ if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
+ getActionBarContributor().setActiveEditor(PapyrustableconfigurationEditor.this);
- public void partActivated(final IWorkbenchPart p) {
- if(p instanceof ContentOutline) {
- if(((ContentOutline)p).getCurrentPage() == PapyrustableconfigurationEditor.this.contentOutlinePage) {
- getActionBarContributor().setActiveEditor(PapyrustableconfigurationEditor.this);
-
- setCurrentViewer(PapyrustableconfigurationEditor.this.contentOutlineViewer);
+ setCurrentViewer(contentOutlineViewer);
+ }
}
- } else if(p instanceof PropertySheet) {
- if(((PropertySheet)p).getCurrentPage() == PapyrustableconfigurationEditor.this.propertySheetPage) {
- getActionBarContributor().setActiveEditor(PapyrustableconfigurationEditor.this);
+ else if (p instanceof PropertySheet) {
+ if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {
+ getActionBarContributor().setActiveEditor(PapyrustableconfigurationEditor.this);
+ handleActivate();
+ }
+ }
+ else if (p == PapyrustableconfigurationEditor.this) {
handleActivate();
}
- } else if(p == PapyrustableconfigurationEditor.this) {
- handleActivate();
}
- }
-
- public void partBroughtToTop(final IWorkbenchPart p) {
- // Ignore.
- }
-
- public void partClosed(final IWorkbenchPart p) {
- // Ignore.
- }
-
- public void partDeactivated(final IWorkbenchPart p) {
- // Ignore.
- }
-
- public void partOpened(final IWorkbenchPart p) {
- // Ignore.
- }
- };
+ public void partBroughtToTop(IWorkbenchPart p) {
+ // Ignore.
+ }
+ public void partClosed(IWorkbenchPart p) {
+ // Ignore.
+ }
+ public void partDeactivated(IWorkbenchPart p) {
+ // Ignore.
+ }
+ public void partOpened(IWorkbenchPart p) {
+ // Ignore.
+ }
+ };
/**
* Resources that have been removed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected Collection<Resource> removedResources = new ArrayList<Resource>();
@@ -370,7 +348,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * Resources that have been changed since last activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected Collection<Resource> changedResources = new ArrayList<Resource>();
@@ -379,7 +356,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * Resources that have been saved.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected Collection<Resource> savedResources = new ArrayList<Resource>();
@@ -388,7 +364,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * Map to store the diagnostic associated with a resource.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
@@ -397,7 +372,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * Controls whether the problem indication should be updated.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected boolean updateProblemIndication = true;
@@ -406,163 +380,161 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * Adapter used to update the problem indication when resources are demanded loaded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected EContentAdapter problemIndicationAdapter = new EContentAdapter() {
+ @Override
+ public void notifyChanged(Notification notification) {
+ if (notification.getNotifier() instanceof Resource) {
+ switch (notification.getFeatureID(Resource.class)) {
+ case Resource.RESOURCE__IS_LOADED:
+ case Resource.RESOURCE__ERRORS:
+ case Resource.RESOURCE__WARNINGS: {
+ Resource resource = (Resource)notification.getNotifier();
+ Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ resourceToDiagnosticMap.put(resource, diagnostic);
+ }
+ else {
+ resourceToDiagnosticMap.remove(resource);
+ }
- @Override
- public void notifyChanged(final Notification notification) {
- if(notification.getNotifier() instanceof Resource) {
- switch(notification.getFeatureID(Resource.class)) {
- case Resource.RESOURCE__IS_LOADED:
- case Resource.RESOURCE__ERRORS:
- case Resource.RESOURCE__WARNINGS:
- {
- final Resource resource = (Resource)notification.getNotifier();
- final Diagnostic diagnostic = analyzeResourceProblems(resource, null);
- if(diagnostic.getSeverity() != Diagnostic.OK) {
- PapyrustableconfigurationEditor.this.resourceToDiagnosticMap.put(resource, diagnostic);
- } else {
- PapyrustableconfigurationEditor.this.resourceToDiagnosticMap.remove(resource);
- }
-
- if(PapyrustableconfigurationEditor.this.updateProblemIndication) {
- getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
- public void run() {
- updateProblemIndication();
+ if (updateProblemIndication) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ updateProblemIndication();
+ }
+ });
}
- });
+ break;
+ }
}
- break;
}
+ else {
+ super.notifyChanged(notification);
}
- } else {
- super.notifyChanged(notification);
}
- }
- @Override
- protected void setTarget(final Resource target) {
- basicSetTarget(target);
- }
+ @Override
+ protected void setTarget(Resource target) {
+ basicSetTarget(target);
+ }
- @Override
- protected void unsetTarget(final Resource target) {
- basicUnsetTarget(target);
- }
- };
+ @Override
+ protected void unsetTarget(Resource target) {
+ basicUnsetTarget(target);
+ }
+ };
/**
* This listens for workspace changes.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {
-
- public void resourceChanged(final IResourceChangeEvent event) {
- final IResourceDelta delta = event.getDelta();
- try {
- class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-
- protected ResourceSet resourceSet = PapyrustableconfigurationEditor.this.editingDomain.getResourceSet();
-
- protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
- protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
- public boolean visit(final IResourceDelta delta) {
- if(delta.getResource().getType() == IResource.FILE) {
- if(delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
- final Resource resource = this.resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
- if(resource != null) {
- if(delta.getKind() == IResourceDelta.REMOVED) {
- this.removedResources.add(resource);
- } else if(!PapyrustableconfigurationEditor.this.savedResources.remove(resource)) {
- this.changedResources.add(resource);
+ public void resourceChanged(IResourceChangeEvent event) {
+ IResourceDelta delta = event.getDelta();
+ try {
+ class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+ protected ResourceSet resourceSet = editingDomain.getResourceSet();
+ protected Collection<Resource> changedResources = new ArrayList<Resource>();
+ protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+ public boolean visit(IResourceDelta delta) {
+ if (delta.getResource().getType() == IResource.FILE) {
+ if (delta.getKind() == IResourceDelta.REMOVED ||
+ delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
+ Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+ if (resource != null) {
+ if (delta.getKind() == IResourceDelta.REMOVED) {
+ removedResources.add(resource);
+ }
+ else if (!savedResources.remove(resource)) {
+ changedResources.add(resource);
+ }
}
}
}
+
+ return true;
}
- return true;
- }
+ public Collection<Resource> getChangedResources() {
+ return changedResources;
+ }
- public Collection<Resource> getChangedResources() {
- return this.changedResources;
+ public Collection<Resource> getRemovedResources() {
+ return removedResources;
+ }
}
- public Collection<Resource> getRemovedResources() {
- return this.removedResources;
+ final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+ delta.accept(visitor);
+
+ if (!visitor.getRemovedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ removedResources.addAll(visitor.getRemovedResources());
+ if (!isDirty()) {
+ getSite().getPage().closeEditor(PapyrustableconfigurationEditor.this, false);
+ }
+ }
+ });
}
- }
-
- final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
- delta.accept(visitor);
-
- if(!visitor.getRemovedResources().isEmpty()) {
- getSite().getShell().getDisplay().asyncExec(new Runnable() {
- public void run() {
- PapyrustableconfigurationEditor.this.removedResources.addAll(visitor.getRemovedResources());
- if(!isDirty()) {
- getSite().getPage().closeEditor(PapyrustableconfigurationEditor.this, false);
- }
- }
- });
+ if (!visitor.getChangedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ changedResources.addAll(visitor.getChangedResources());
+ if (getSite().getPage().getActiveEditor() == PapyrustableconfigurationEditor.this) {
+ handleActivate();
+ }
+ }
+ });
+ }
}
-
- if(!visitor.getChangedResources().isEmpty()) {
- getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
- public void run() {
- PapyrustableconfigurationEditor.this.changedResources.addAll(visitor.getChangedResources());
- if(getSite().getPage().getActiveEditor() == PapyrustableconfigurationEditor.this) {
- handleActivate();
- }
- }
- });
+ catch (CoreException exception) {
+ PapyrustableconfigurationEditorPlugin.INSTANCE.log(exception);
}
- } catch (final CoreException exception) {
- PapyrustableconfigurationEditorPlugin.INSTANCE.log(exception);
}
- }
- };
+ };
/**
* Handles activation of the editor or it's associated views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected void handleActivate() {
// Recompute the read only state.
//
- if(this.editingDomain.getResourceToReadOnlyMap() != null) {
- this.editingDomain.getResourceToReadOnlyMap().clear();
+ if (editingDomain.getResourceToReadOnlyMap() != null) {
+ editingDomain.getResourceToReadOnlyMap().clear();
- // Refresh any actions that may become enabled or disabled.
- //
- setSelection(getSelection());
+ // Refresh any actions that may become enabled or disabled.
+ //
+ setSelection(getSelection());
}
- if(!this.removedResources.isEmpty()) {
- if(handleDirtyConflict()) {
+ if (!removedResources.isEmpty()) {
+ if (handleDirtyConflict()) {
getSite().getPage().closeEditor(PapyrustableconfigurationEditor.this, false);
- } else {
- this.removedResources.clear();
- this.changedResources.clear();
- this.savedResources.clear();
}
- } else if(!this.changedResources.isEmpty()) {
- this.changedResources.removeAll(this.savedResources);
+ else {
+ removedResources.clear();
+ changedResources.clear();
+ savedResources.clear();
+ }
+ }
+ else if (!changedResources.isEmpty()) {
+ changedResources.removeAll(savedResources);
handleChangedResources();
- this.changedResources.clear();
- this.savedResources.clear();
+ changedResources.clear();
+ savedResources.clear();
}
}
@@ -570,35 +542,35 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * Handles what to do with changed resources on activation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected void handleChangedResources() {
- if(!this.changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
- if(isDirty()) {
- this.changedResources.addAll(this.editingDomain.getResourceSet().getResources());
+ if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+ if (isDirty()) {
+ changedResources.addAll(editingDomain.getResourceSet().getResources());
}
- this.editingDomain.getCommandStack().flush();
+ editingDomain.getCommandStack().flush();
- this.updateProblemIndication = false;
- for(final Resource resource : this.changedResources) {
- if(resource.isLoaded()) {
+ updateProblemIndication = false;
+ for (Resource resource : changedResources) {
+ if (resource.isLoaded()) {
resource.unload();
try {
resource.load(Collections.EMPTY_MAP);
- } catch (final IOException exception) {
- if(!this.resourceToDiagnosticMap.containsKey(resource)) {
- this.resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ }
+ catch (IOException exception) {
+ if (!resourceToDiagnosticMap.containsKey(resource)) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
}
}
}
}
- if(AdapterFactoryEditingDomain.isStale(this.editorSelection)) {
+ if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
setSelection(StructuredSelection.EMPTY);
}
- this.updateProblemIndication = true;
+ updateProblemIndication = true;
updateProblemIndication();
}
}
@@ -607,45 +579,52 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * Updates the problems indication with the information described in the specified diagnostic.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected void updateProblemIndication() {
- if(this.updateProblemIndication) {
- final BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor", //$NON-NLS-1$
- 0, null, new Object[]{ this.editingDomain.getResourceSet() });
- for(final Diagnostic childDiagnostic : this.resourceToDiagnosticMap.values()) {
- if(childDiagnostic.getSeverity() != Diagnostic.OK) {
+ if (updateProblemIndication) {
+ BasicDiagnostic diagnostic =
+ new BasicDiagnostic
+ (Diagnostic.OK,
+ "org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor", //$NON-NLS-1$
+ 0,
+ null,
+ new Object [] { editingDomain.getResourceSet() });
+ for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+ if (childDiagnostic.getSeverity() != Diagnostic.OK) {
diagnostic.add(childDiagnostic);
}
}
int lastEditorPage = getPageCount() - 1;
- if(lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
+ if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
- if(diagnostic.getSeverity() != Diagnostic.OK) {
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
setActivePage(lastEditorPage);
}
- } else if(diagnostic.getSeverity() != Diagnostic.OK) {
- final ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+ }
+ else if (diagnostic.getSeverity() != Diagnostic.OK) {
+ ProblemEditorPart problemEditorPart = new ProblemEditorPart();
problemEditorPart.setDiagnostic(diagnostic);
- problemEditorPart.setMarkerHelper(this.markerHelper);
+ problemEditorPart.setMarkerHelper(markerHelper);
try {
addPage(++lastEditorPage, problemEditorPart, getEditorInput());
setPageText(lastEditorPage, problemEditorPart.getPartName());
setActivePage(lastEditorPage);
showTabs();
- } catch (final PartInitException exception) {
+ }
+ catch (PartInitException exception) {
PapyrustableconfigurationEditorPlugin.INSTANCE.log(exception);
}
}
- if(this.markerHelper.hasMarkers(this.editingDomain.getResourceSet())) {
- this.markerHelper.deleteMarkers(this.editingDomain.getResourceSet());
- if(diagnostic.getSeverity() != Diagnostic.OK) {
+ if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
+ markerHelper.deleteMarkers(editingDomain.getResourceSet());
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
try {
- this.markerHelper.createMarkers(diagnostic);
- } catch (final CoreException exception) {
+ markerHelper.createMarkers(diagnostic);
+ }
+ catch (CoreException exception) {
PapyrustableconfigurationEditorPlugin.INSTANCE.log(exception);
}
}
@@ -657,19 +636,20 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * Shows a dialog that asks if conflicting changes should be discarded.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected boolean handleDirtyConflict() {
- return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), //$NON-NLS-1$
- getString("_WARN_FileConflict")); //$NON-NLS-1$
+ return
+ MessageDialog.openQuestion
+ (getSite().getShell(),
+ getString("_UI_FileConflict_label"), //$NON-NLS-1$
+ getString("_WARN_FileConflict")); //$NON-NLS-1$
}
/**
* This creates a model editor.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public PapyrustableconfigurationEditor() {
@@ -739,11 +719,10 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This is here for the listener to be able to call it.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- protected void firePropertyChange(final int action) {
+ protected void firePropertyChange(int action) {
super.firePropertyChange(action);
}
@@ -751,45 +730,42 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This sets the selection into whichever viewer is active.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void setSelectionToViewer(final Collection<?> collection) {
+ public void setSelectionToViewer(Collection<?> collection) {
final Collection<?> theSelection = collection;
// Make sure it's okay.
//
- if(theSelection != null && !theSelection.isEmpty()) {
- final Runnable runnable = new Runnable() {
-
- public void run() {
- // Try to select the items in the current content viewer of the editor.
- //
- if(PapyrustableconfigurationEditor.this.currentViewer != null) {
- PapyrustableconfigurationEditor.this.currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+ if (theSelection != null && !theSelection.isEmpty()) {
+ Runnable runnable =
+ new Runnable() {
+ public void run() {
+ // Try to select the items in the current content viewer of the editor.
+ //
+ if (currentViewer != null) {
+ currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+ }
}
- }
- };
+ };
getSite().getShell().getDisplay().asyncExec(runnable);
}
}
/**
* This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
- * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting
- * {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+ * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+ * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EditingDomain getEditingDomain() {
- return this.editingDomain;
+ return editingDomain;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
@@ -797,57 +773,52 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public ReverseAdapterFactoryContentProvider(final AdapterFactory adapterFactory) {
+ public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public Object[] getElements(final Object object) {
- final Object parent = super.getParent(object);
+ public Object [] getElements(Object object) {
+ Object parent = super.getParent(object);
return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public Object[] getChildren(final Object object) {
- final Object parent = super.getParent(object);
+ public Object [] getChildren(Object object) {
+ Object parent = super.getParent(object);
return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public boolean hasChildren(final Object object) {
- final Object parent = super.getParent(object);
+ public boolean hasChildren(Object object) {
+ Object parent = super.getParent(object);
return parent != null;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public Object getParent(final Object object) {
+ public Object getParent(Object object) {
return null;
}
}
@@ -855,17 +826,16 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void setCurrentViewerPane(final ViewerPane viewerPane) {
- if(this.currentViewerPane != viewerPane) {
- if(this.currentViewerPane != null) {
- this.currentViewerPane.showFocus(false);
+ public void setCurrentViewerPane(ViewerPane viewerPane) {
+ if (currentViewerPane != viewerPane) {
+ if (currentViewerPane != null) {
+ currentViewerPane.showFocus(false);
}
- this.currentViewerPane = viewerPane;
+ currentViewerPane = viewerPane;
}
- setCurrentViewer(this.currentViewerPane.getViewer());
+ setCurrentViewer(currentViewerPane.getViewer());
}
/**
@@ -873,45 +843,44 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * is the current one.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void setCurrentViewer(final Viewer viewer) {
+ public void setCurrentViewer(Viewer viewer) {
// If it is changing...
//
- if(this.currentViewer != viewer) {
- if(this.selectionChangedListener == null) {
+ if (currentViewer != viewer) {
+ if (selectionChangedListener == null) {
// Create the listener on demand.
//
- this.selectionChangedListener = new ISelectionChangedListener() {
-
- // This just notifies those things that are affected by the section.
- //
- public void selectionChanged(final SelectionChangedEvent selectionChangedEvent) {
- setSelection(selectionChangedEvent.getSelection());
- }
- };
+ selectionChangedListener =
+ new ISelectionChangedListener() {
+ // This just notifies those things that are affected by the section.
+ //
+ public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+ setSelection(selectionChangedEvent.getSelection());
+ }
+ };
}
// Stop listening to the old one.
//
- if(this.currentViewer != null) {
- this.currentViewer.removeSelectionChangedListener(this.selectionChangedListener);
+ if (currentViewer != null) {
+ currentViewer.removeSelectionChangedListener(selectionChangedListener);
}
// Start listening to the new one.
//
- if(viewer != null) {
- viewer.addSelectionChangedListener(this.selectionChangedListener);
+ if (viewer != null) {
+ viewer.addSelectionChangedListener(selectionChangedListener);
}
// Remember it.
//
- this.currentViewer = viewer;
+ currentViewer = viewer;
// Set the editors selection based on the current viewer's selection.
//
- setSelection(this.currentViewer == null ? StructuredSelection.EMPTY : this.currentViewer.getSelection());
+ setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
}
}
@@ -919,60 +888,58 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This returns the viewer as required by the {@link IViewerProvider} interface.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public Viewer getViewer() {
- return this.currentViewer;
+ return currentViewer;
}
/**
* This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- protected void createContextMenuFor(final StructuredViewer viewer) {
- final MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+ protected void createContextMenuFor(StructuredViewer viewer) {
+ MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
contextMenu.add(new Separator("additions")); //$NON-NLS-1$
contextMenu.setRemoveAllWhenShown(true);
contextMenu.addMenuListener(this);
- final Menu menu = contextMenu.createContextMenu(viewer.getControl());
+ Menu menu= contextMenu.createContextMenu(viewer.getControl());
viewer.getControl().setMenu(menu);
getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
- final int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
- final Transfer[] transfers = new Transfer[]{ LocalTransfer.getInstance() };
+ int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+ Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
- viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(this.editingDomain, viewer));
+ viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
}
/**
* This is the method called to load a resource into the editing domain's resource set based on the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public void createModel() {
- final URI resourceURI = EditUIUtil.getURI(getEditorInput());
+ URI resourceURI = EditUIUtil.getURI(getEditorInput());
Exception exception = null;
Resource resource = null;
try {
// Load the resource through the editing domain.
//
- resource = this.editingDomain.getResourceSet().getResource(resourceURI, true);
- } catch (final Exception e) {
+ resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+ }
+ catch (Exception e) {
exception = e;
- resource = this.editingDomain.getResourceSet().getResource(resourceURI, false);
+ resource = editingDomain.getResourceSet().getResource(resourceURI, false);
}
- final Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
- if(diagnostic.getSeverity() != Diagnostic.OK) {
- this.resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
}
- this.editingDomain.getResourceSet().eAdapters().add(this.problemIndicationAdapter);
+ editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
}
/**
@@ -980,21 +947,30 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * and the specified exception (if any).
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public Diagnostic analyzeResourceProblems(final Resource resource, final Exception exception) {
- if(!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
- final BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor", //$NON-NLS-1$
- 0, getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
- new Object[]{ exception == null ? (Object)resource : exception });
+ public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+ if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+ BasicDiagnostic basicDiagnostic =
+ new BasicDiagnostic
+ (Diagnostic.ERROR,
+ "org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor", //$NON-NLS-1$
+ 0,
+ getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+ new Object [] { exception == null ? (Object)resource : exception });
basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
return basicDiagnostic;
- } else if(exception != null) {
- return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor", //$NON-NLS-1$
- 0, getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
- new Object[]{ exception });
- } else {
+ }
+ else if (exception != null) {
+ return
+ new BasicDiagnostic
+ (Diagnostic.ERROR,
+ "org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor", //$NON-NLS-1$
+ 0,
+ getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+ new Object[] { exception });
+ }
+ else {
return Diagnostic.OK_INSTANCE;
}
}
@@ -1003,7 +979,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This is the method used by the framework to install your own controls.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -1014,245 +989,238 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme // Only creates the other pages if there is something that can be edited
//
- if(!getEditingDomain().getResourceSet().getResources().isEmpty()) {
+ if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
// Create a page for the selection tree view.
//
{
- final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
-
- @Override
- public Viewer createViewer(final Composite composite) {
- final Tree tree = new Tree(composite, SWT.MULTI);
- final TreeViewer newTreeViewer = new TreeViewer(tree);
- return newTreeViewer;
- }
-
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ Tree tree = new Tree(composite, SWT.MULTI);
+ TreeViewer newTreeViewer = new TreeViewer(tree);
+ return newTreeViewer;
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
- this.selectionViewer = (TreeViewer)viewerPane.getViewer();
- this.selectionViewer.setContentProvider(new AdapterFactoryContentProvider(this.adapterFactory));
+ selectionViewer = (TreeViewer)viewerPane.getViewer();
+ selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
- this.selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory));
- this.selectionViewer.setInput(this.editingDomain.getResourceSet());
- this.selectionViewer.setSelection(new StructuredSelection(this.editingDomain.getResourceSet().getResources().get(0)), true);
- viewerPane.setTitle(this.editingDomain.getResourceSet());
+ selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+ selectionViewer.setInput(editingDomain.getResourceSet());
+ selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+ viewerPane.setTitle(editingDomain.getResourceSet());
- new AdapterFactoryTreeEditor(this.selectionViewer.getTree(), this.adapterFactory);
+ new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
- createContextMenuFor(this.selectionViewer);
- final int pageIndex = addPage(viewerPane.getControl());
+ createContextMenuFor(selectionViewer);
+ int pageIndex = addPage(viewerPane.getControl());
setPageText(pageIndex, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
}
// Create a page for the parent tree view.
//
{
- final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
-
- @Override
- public Viewer createViewer(final Composite composite) {
- final Tree tree = new Tree(composite, SWT.MULTI);
- final TreeViewer newTreeViewer = new TreeViewer(tree);
- return newTreeViewer;
- }
-
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ Tree tree = new Tree(composite, SWT.MULTI);
+ TreeViewer newTreeViewer = new TreeViewer(tree);
+ return newTreeViewer;
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
- this.parentViewer = (TreeViewer)viewerPane.getViewer();
- this.parentViewer.setAutoExpandLevel(30);
- this.parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(this.adapterFactory));
- this.parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory));
+ parentViewer = (TreeViewer)viewerPane.getViewer();
+ parentViewer.setAutoExpandLevel(30);
+ parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+ parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
- createContextMenuFor(this.parentViewer);
- final int pageIndex = addPage(viewerPane.getControl());
+ createContextMenuFor(parentViewer);
+ int pageIndex = addPage(viewerPane.getControl());
setPageText(pageIndex, getString("_UI_ParentPage_label")); //$NON-NLS-1$
}
// This is the page for the list viewer
//
{
- final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
-
- @Override
- public Viewer createViewer(final Composite composite) {
- return new ListViewer(composite);
- }
-
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new ListViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
- this.listViewer = (ListViewer)viewerPane.getViewer();
- this.listViewer.setContentProvider(new AdapterFactoryContentProvider(this.adapterFactory));
- this.listViewer.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory));
+ listViewer = (ListViewer)viewerPane.getViewer();
+ listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
- createContextMenuFor(this.listViewer);
- final int pageIndex = addPage(viewerPane.getControl());
+ createContextMenuFor(listViewer);
+ int pageIndex = addPage(viewerPane.getControl());
setPageText(pageIndex, getString("_UI_ListPage_label")); //$NON-NLS-1$
}
// This is the page for the tree viewer
//
{
- final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
-
- @Override
- public Viewer createViewer(final Composite composite) {
- return new TreeViewer(composite);
- }
-
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TreeViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
- this.treeViewer = (TreeViewer)viewerPane.getViewer();
- this.treeViewer.setContentProvider(new AdapterFactoryContentProvider(this.adapterFactory));
- this.treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory));
+ treeViewer = (TreeViewer)viewerPane.getViewer();
+ treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
- new AdapterFactoryTreeEditor(this.treeViewer.getTree(), this.adapterFactory);
+ new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
- createContextMenuFor(this.treeViewer);
- final int pageIndex = addPage(viewerPane.getControl());
+ createContextMenuFor(treeViewer);
+ int pageIndex = addPage(viewerPane.getControl());
setPageText(pageIndex, getString("_UI_TreePage_label")); //$NON-NLS-1$
}
// This is the page for the table viewer.
//
{
- final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
-
- @Override
- public Viewer createViewer(final Composite composite) {
- return new TableViewer(composite);
- }
-
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TableViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
- this.tableViewer = (TableViewer)viewerPane.getViewer();
+ tableViewer = (TableViewer)viewerPane.getViewer();
- final Table table = this.tableViewer.getTable();
- final TableLayout layout = new TableLayout();
+ Table table = tableViewer.getTable();
+ TableLayout layout = new TableLayout();
table.setLayout(layout);
table.setHeaderVisible(true);
table.setLinesVisible(true);
- final TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+ TableColumn objectColumn = new TableColumn(table, SWT.NONE);
layout.addColumnData(new ColumnWeightData(3, 100, true));
objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
objectColumn.setResizable(true);
- final TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+ TableColumn selfColumn = new TableColumn(table, SWT.NONE);
layout.addColumnData(new ColumnWeightData(2, 100, true));
selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
selfColumn.setResizable(true);
- this.tableViewer.setColumnProperties(new String[]{ "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$
- this.tableViewer.setContentProvider(new AdapterFactoryContentProvider(this.adapterFactory));
- this.tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory));
+ tableViewer.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+ tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
- createContextMenuFor(this.tableViewer);
- final int pageIndex = addPage(viewerPane.getControl());
+ createContextMenuFor(tableViewer);
+ int pageIndex = addPage(viewerPane.getControl());
setPageText(pageIndex, getString("_UI_TablePage_label")); //$NON-NLS-1$
}
// This is the page for the table tree viewer.
//
{
- final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
-
- @Override
- public Viewer createViewer(final Composite composite) {
- return new TreeViewer(composite);
- }
-
- @Override
- public void requestActivation() {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ ViewerPane viewerPane =
+ new ViewerPane(getSite().getPage(), PapyrustableconfigurationEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TreeViewer(composite);
+ }
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
- this.treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+ treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
- final Tree tree = this.treeViewerWithColumns.getTree();
+ Tree tree = treeViewerWithColumns.getTree();
tree.setLayoutData(new FillLayout());
tree.setHeaderVisible(true);
tree.setLinesVisible(true);
- final TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+ TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
objectColumn.setText(getString("_UI_ObjectColumn_label")); //$NON-NLS-1$
objectColumn.setResizable(true);
objectColumn.setWidth(250);
- final TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+ TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
selfColumn.setText(getString("_UI_SelfColumn_label")); //$NON-NLS-1$
selfColumn.setResizable(true);
selfColumn.setWidth(200);
- this.treeViewerWithColumns.setColumnProperties(new String[]{ "a", "b" }); //$NON-NLS-1$ //$NON-NLS-2$
- this.treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(this.adapterFactory));
- this.treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(this.adapterFactory));
+ treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"}); //$NON-NLS-1$ //$NON-NLS-2$
+ treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
- createContextMenuFor(this.treeViewerWithColumns);
- final int pageIndex = addPage(viewerPane.getControl());
+ createContextMenuFor(treeViewerWithColumns);
+ int pageIndex = addPage(viewerPane.getControl());
setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
}
- getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
- public void run() {
- setActivePage(0);
- }
- });
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ setActivePage(0);
+ }
+ });
}
// Ensures that this editor will only display the page's tab
// area if there are more than one page
//
- getContainer().addControlListener(new ControlAdapter() {
-
- boolean guard = false;
-
- @Override
- public void controlResized(final ControlEvent event) {
- if(!this.guard) {
- this.guard = true;
- hideTabs();
- this.guard = false;
+ getContainer().addControlListener
+ (new ControlAdapter() {
+ boolean guard = false;
+ @Override
+ public void controlResized(ControlEvent event) {
+ if (!guard) {
+ guard = true;
+ hideTabs();
+ guard = false;
+ }
}
- }
- });
-
- getSite().getShell().getDisplay().asyncExec(new Runnable() {
-
- public void run() {
- updateProblemIndication();
- }
- });
+ });
+
+ getSite().getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ updateProblemIndication();
+ }
+ });
}
/**
@@ -1260,15 +1228,14 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * this hides the single tab at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected void hideTabs() {
- if(getPageCount() <= 1) {
+ if (getPageCount() <= 1) {
setPageText(0, ""); //$NON-NLS-1$
- if(getContainer() instanceof CTabFolder) {
+ if (getContainer() instanceof CTabFolder) {
((CTabFolder)getContainer()).setTabHeight(1);
- final Point point = getContainer().getSize();
+ Point point = getContainer().getSize();
getContainer().setSize(point.x, point.y + 6);
}
}
@@ -1279,15 +1246,14 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * this shows the tabs at the bottom.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected void showTabs() {
- if(getPageCount() > 1) {
+ if (getPageCount() > 1) {
setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
- if(getContainer() instanceof CTabFolder) {
+ if (getContainer() instanceof CTabFolder) {
((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
- final Point point = getContainer().getSize();
+ Point point = getContainer().getSize();
getContainer().setSize(point.x, point.y - 6);
}
}
@@ -1297,15 +1263,14 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This is used to track the active viewer.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- protected void pageChange(final int pageIndex) {
+ protected void pageChange(int pageIndex) {
super.pageChange(pageIndex);
- if(this.contentOutlinePage != null) {
- handleContentOutlineSelection(this.contentOutlinePage.getSelection());
+ if (contentOutlinePage != null) {
+ handleContentOutlineSelection(contentOutlinePage.getSelection());
}
}
@@ -1313,19 +1278,21 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This is how the framework determines which interfaces we implement.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@SuppressWarnings("rawtypes")
@Override
- public Object getAdapter(final Class key) {
- if(key.equals(IContentOutlinePage.class)) {
+ public Object getAdapter(Class key) {
+ if (key.equals(IContentOutlinePage.class)) {
return showOutlineView() ? getContentOutlinePage() : null;
- } else if(key.equals(IPropertySheetPage.class)) {
+ }
+ else if (key.equals(IPropertySheetPage.class)) {
return getPropertySheetPage();
- } else if(key.equals(IGotoMarker.class)) {
+ }
+ else if (key.equals(IGotoMarker.class)) {
return this;
- } else {
+ }
+ else {
return super.getAdapter(key);
}
}
@@ -1334,130 +1301,127 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This accesses a cached version of the content outliner.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public IContentOutlinePage getContentOutlinePage() {
- if(this.contentOutlinePage == null) {
+ if (contentOutlinePage == null) {
// The content outline is just a tree.
//
class MyContentOutlinePage extends ContentOutlinePage {
-
@Override
- public void createControl(final Composite parent) {
+ public void createControl(Composite parent) {
super.createControl(parent);
- PapyrustableconfigurationEditor.this.contentOutlineViewer = getTreeViewer();
- PapyrustableconfigurationEditor.this.contentOutlineViewer.addSelectionChangedListener(this);
+ contentOutlineViewer = getTreeViewer();
+ contentOutlineViewer.addSelectionChangedListener(this);
// Set up the tree viewer.
//
- PapyrustableconfigurationEditor.this.contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(PapyrustableconfigurationEditor.this.adapterFactory));
- PapyrustableconfigurationEditor.this.contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(PapyrustableconfigurationEditor.this.adapterFactory));
- PapyrustableconfigurationEditor.this.contentOutlineViewer.setInput(PapyrustableconfigurationEditor.this.editingDomain.getResourceSet());
+ contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+ contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+ contentOutlineViewer.setInput(editingDomain.getResourceSet());
// Make sure our popups work.
//
- createContextMenuFor(PapyrustableconfigurationEditor.this.contentOutlineViewer);
+ createContextMenuFor(contentOutlineViewer);
- if(!PapyrustableconfigurationEditor.this.editingDomain.getResourceSet().getResources().isEmpty()) {
- // Select the root object in the view.
- //
- PapyrustableconfigurationEditor.this.contentOutlineViewer.setSelection(new StructuredSelection(PapyrustableconfigurationEditor.this.editingDomain.getResourceSet().getResources().get(0)), true);
+ if (!editingDomain.getResourceSet().getResources().isEmpty()) {
+ // Select the root object in the view.
+ //
+ contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
}
}
@Override
- public void makeContributions(final IMenuManager menuManager, final IToolBarManager toolBarManager, final IStatusLineManager statusLineManager) {
+ public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
super.makeContributions(menuManager, toolBarManager, statusLineManager);
- PapyrustableconfigurationEditor.this.contentOutlineStatusLineManager = statusLineManager;
+ contentOutlineStatusLineManager = statusLineManager;
}
@Override
- public void setActionBars(final IActionBars actionBars) {
+ public void setActionBars(IActionBars actionBars) {
super.setActionBars(actionBars);
getActionBarContributor().shareGlobalActions(this, actionBars);
}
}
- this.contentOutlinePage = new MyContentOutlinePage();
+ contentOutlinePage = new MyContentOutlinePage();
// Listen to selection so that we can handle it is a special way.
//
- this.contentOutlinePage.addSelectionChangedListener(new ISelectionChangedListener() {
-
- // This ensures that we handle selections correctly.
- //
- public void selectionChanged(final SelectionChangedEvent event) {
- handleContentOutlineSelection(event.getSelection());
- }
- });
+ contentOutlinePage.addSelectionChangedListener
+ (new ISelectionChangedListener() {
+ // This ensures that we handle selections correctly.
+ //
+ public void selectionChanged(SelectionChangedEvent event) {
+ handleContentOutlineSelection(event.getSelection());
+ }
+ });
}
- return this.contentOutlinePage;
+ return contentOutlinePage;
}
/**
* This accesses a cached version of the property sheet.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public IPropertySheetPage getPropertySheetPage() {
- if(this.propertySheetPage == null) {
- this.propertySheetPage = new ExtendedPropertySheetPage(this.editingDomain) {
-
- @Override
- public void setSelectionToViewer(final List<?> selection) {
- PapyrustableconfigurationEditor.this.setSelectionToViewer(selection);
- PapyrustableconfigurationEditor.this.setFocus();
- }
+ if (propertySheetPage == null) {
+ propertySheetPage =
+ new ExtendedPropertySheetPage(editingDomain) {
+ @Override
+ public void setSelectionToViewer(List<?> selection) {
+ PapyrustableconfigurationEditor.this.setSelectionToViewer(selection);
+ PapyrustableconfigurationEditor.this.setFocus();
+ }
- @Override
- public void setActionBars(final IActionBars actionBars) {
- super.setActionBars(actionBars);
- getActionBarContributor().shareGlobalActions(this, actionBars);
- }
- };
- this.propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(this.adapterFactory));
+ @Override
+ public void setActionBars(IActionBars actionBars) {
+ super.setActionBars(actionBars);
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ };
+ propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
}
- return this.propertySheetPage;
+ return propertySheetPage;
}
/**
* This deals with how we want selection in the outliner to affect the other views.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void handleContentOutlineSelection(final ISelection selection) {
- if(this.currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
- final Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
- if(selectedElements.hasNext()) {
+ public void handleContentOutlineSelection(ISelection selection) {
+ if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
+ Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+ if (selectedElements.hasNext()) {
// Get the first selected element.
//
- final Object selectedElement = selectedElements.next();
+ Object selectedElement = selectedElements.next();
// If it's the selection viewer, then we want it to select the same selection as this selection.
//
- if(this.currentViewerPane.getViewer() == this.selectionViewer) {
- final ArrayList<Object> selectionList = new ArrayList<Object>();
+ if (currentViewerPane.getViewer() == selectionViewer) {
+ ArrayList<Object> selectionList = new ArrayList<Object>();
selectionList.add(selectedElement);
- while(selectedElements.hasNext()) {
+ while (selectedElements.hasNext()) {
selectionList.add(selectedElements.next());
}
// Set the selection to the widget.
//
- this.selectionViewer.setSelection(new StructuredSelection(selectionList));
- } else {
+ selectionViewer.setSelection(new StructuredSelection(selectionList));
+ }
+ else {
// Set the input to the widget.
//
- if(this.currentViewerPane.getViewer().getInput() != selectedElement) {
- this.currentViewerPane.getViewer().setInput(selectedElement);
- this.currentViewerPane.setTitle(selectedElement);
+ if (currentViewerPane.getViewer().getInput() != selectedElement) {
+ currentViewerPane.getViewer().setInput(selectedElement);
+ currentViewerPane.setTitle(selectedElement);
}
}
}
@@ -1468,23 +1432,21 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This is for implementing {@link IEditorPart} and simply tests the command stack.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public boolean isDirty() {
- return ((BasicCommandStack)this.editingDomain.getCommandStack()).isSaveNeeded();
+ return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
}
/**
* This is for implementing {@link IEditorPart} and simply saves the model file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public void doSave(final IProgressMonitor progressMonitor) {
+ public void doSave(IProgressMonitor progressMonitor) {
// Save only resources that have actually changed.
//
final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
@@ -1492,33 +1454,34 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme // Do the work within an operation because this is a long running activity that modifies the workbench.
//
- final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-
- // This is the method that gets invoked when the operation runs.
- //
- @Override
- public void execute(final IProgressMonitor monitor) {
- // Save the resources to the file system.
+ WorkspaceModifyOperation operation =
+ new WorkspaceModifyOperation() {
+ // This is the method that gets invoked when the operation runs.
//
- boolean first = true;
- for(final Resource resource : PapyrustableconfigurationEditor.this.editingDomain.getResourceSet().getResources()) {
- if((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !PapyrustableconfigurationEditor.this.editingDomain.isReadOnly(resource)) {
- try {
- final long timeStamp = resource.getTimeStamp();
- resource.save(saveOptions);
- if(resource.getTimeStamp() != timeStamp) {
- PapyrustableconfigurationEditor.this.savedResources.add(resource);
+ @Override
+ public void execute(IProgressMonitor monitor) {
+ // Save the resources to the file system.
+ //
+ boolean first = true;
+ for (Resource resource : editingDomain.getResourceSet().getResources()) {
+ if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
+ try {
+ long timeStamp = resource.getTimeStamp();
+ resource.save(saveOptions);
+ if (resource.getTimeStamp() != timeStamp) {
+ savedResources.add(resource);
+ }
}
- } catch (final Exception exception) {
- PapyrustableconfigurationEditor.this.resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ catch (Exception exception) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+ }
+ first = false;
}
- first = false;
}
}
- }
- };
+ };
- this.updateProblemIndication = false;
+ updateProblemIndication = false;
try {
// This runs the options, and shows progress.
//
@@ -1526,34 +1489,35 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme // Refresh the necessary state.
//
- ((BasicCommandStack)this.editingDomain.getCommandStack()).saveIsDone();
+ ((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
firePropertyChange(IEditorPart.PROP_DIRTY);
- } catch (final Exception exception) {
+ }
+ catch (Exception exception) {
// Something went wrong that shouldn't.
//
PapyrustableconfigurationEditorPlugin.INSTANCE.log(exception);
}
- this.updateProblemIndication = true;
+ updateProblemIndication = true;
updateProblemIndication();
}
/**
* This returns whether something has been persisted to the URI of the specified resource.
- * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
+ * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- protected boolean isPersisted(final Resource resource) {
+ protected boolean isPersisted(Resource resource) {
boolean result = false;
try {
- final InputStream stream = this.editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
- if(stream != null) {
+ InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+ if (stream != null) {
result = true;
stream.close();
}
- } catch (final IOException e) {
+ }
+ catch (IOException e) {
// Ignore
}
return result;
@@ -1563,7 +1527,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This always returns true because it is not currently supported.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
@@ -1575,17 +1538,16 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This also changes the editor's input.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public void doSaveAs() {
- final SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+ SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
saveAsDialog.open();
- final IPath path = saveAsDialog.getResult();
- if(path != null) {
- final IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- if(file != null) {
+ IPath path = saveAsDialog.getResult();
+ if (path != null) {
+ IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+ if (file != null) {
doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
}
}
@@ -1594,36 +1556,38 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- protected void doSaveAs(final URI uri, final IEditorInput editorInput) {
- (this.editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+ protected void doSaveAs(URI uri, IEditorInput editorInput) {
+ (editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
setInputWithNotify(editorInput);
setPartName(editorInput.getName());
- final IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
+ IProgressMonitor progressMonitor =
+ getActionBars().getStatusLineManager() != null ?
+ getActionBars().getStatusLineManager().getProgressMonitor() :
+ new NullProgressMonitor();
doSave(progressMonitor);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void gotoMarker(final IMarker marker) {
+ public void gotoMarker(IMarker marker) {
try {
- if(marker.getType().equals(EValidator.MARKER)) {
- final String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
- if(uriAttribute != null) {
- final URI uri = URI.createURI(uriAttribute);
- final EObject eObject = this.editingDomain.getResourceSet().getEObject(uri, true);
- if(eObject != null) {
- setSelectionToViewer(Collections.singleton(this.editingDomain.getWrapper(eObject)));
+ if (marker.getType().equals(EValidator.MARKER)) {
+ String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
+ if (uriAttribute != null) {
+ URI uri = URI.createURI(uriAttribute);
+ EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
+ if (eObject != null) {
+ setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
}
}
}
- } catch (final CoreException exception) {
+ }
+ catch (CoreException exception) {
PapyrustableconfigurationEditorPlugin.INSTANCE.log(exception);
}
}
@@ -1632,30 +1596,29 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This is called during startup.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
- public void init(final IEditorSite site, final IEditorInput editorInput) {
+ public void init(IEditorSite site, IEditorInput editorInput) {
setSite(site);
setInputWithNotify(editorInput);
setPartName(editorInput.getName());
site.setSelectionProvider(this);
- site.getPage().addPartListener(this.partListener);
- ResourcesPlugin.getWorkspace().addResourceChangeListener(this.resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+ site.getPage().addPartListener(partListener);
+ ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public void setFocus() {
- if(this.currentViewerPane != null) {
- this.currentViewerPane.setFocus();
- } else {
+ if (currentViewerPane != null) {
+ currentViewerPane.setFocus();
+ }
+ else {
getControl(getActivePage()).setFocus();
}
}
@@ -1664,33 +1627,30 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void addSelectionChangedListener(final ISelectionChangedListener listener) {
- this.selectionChangedListeners.add(listener);
+ public void addSelectionChangedListener(ISelectionChangedListener listener) {
+ selectionChangedListeners.add(listener);
}
/**
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void removeSelectionChangedListener(final ISelectionChangedListener listener) {
- this.selectionChangedListeners.remove(listener);
+ public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+ selectionChangedListeners.remove(listener);
}
/**
* This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public ISelection getSelection() {
- return this.editorSelection;
+ return editorSelection;
}
/**
@@ -1698,13 +1658,12 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * Calling this result will notify the listeners.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void setSelection(final ISelection selection) {
- this.editorSelection = selection;
+ public void setSelection(ISelection selection) {
+ editorSelection = selection;
- for(final ISelectionChangedListener listener : this.selectionChangedListeners) {
+ for (ISelectionChangedListener listener : selectionChangedListeners) {
listener.selectionChanged(new SelectionChangedEvent(this, selection));
}
setStatusLineManager(selection);
@@ -1713,34 +1672,32 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void setStatusLineManager(final ISelection selection) {
- final IStatusLineManager statusLineManager = this.currentViewer != null && this.currentViewer == this.contentOutlineViewer ? this.contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+ public void setStatusLineManager(ISelection selection) {
+ IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+ contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
- if(statusLineManager != null) {
- if(selection instanceof IStructuredSelection) {
- final Collection<?> collection = ((IStructuredSelection)selection).toList();
- switch(collection.size()) {
- case 0:
- {
- statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
- break;
- }
- case 1:
- {
- final String text = new AdapterFactoryItemDelegator(this.adapterFactory).getText(collection.iterator().next());
- statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
- break;
- }
- default:
- {
- statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
- break;
- }
+ if (statusLineManager != null) {
+ if (selection instanceof IStructuredSelection) {
+ Collection<?> collection = ((IStructuredSelection)selection).toList();
+ switch (collection.size()) {
+ case 0: {
+ statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
+ break;
+ }
+ case 1: {
+ String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+ statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text)); //$NON-NLS-1$
+ break;
+ }
+ default: {
+ statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size()))); //$NON-NLS-1$
+ break;
+ }
}
- } else {
+ }
+ else {
statusLineManager.setMessage(""); //$NON-NLS-1$
}
}
@@ -1750,10 +1707,9 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This looks up a string in the plugin's plugin.properties file.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- private static String getString(final String key) {
+ private static String getString(String key) {
return PapyrustableconfigurationEditorPlugin.INSTANCE.getString(key);
}
@@ -1761,28 +1717,25 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * This looks up a string in plugin.properties, making a substitution.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- private static String getString(final String key, final Object s1) {
- return PapyrustableconfigurationEditorPlugin.INSTANCE.getString(key, new Object[]{ s1 });
+ private static String getString(String key, Object s1) {
+ return PapyrustableconfigurationEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
}
/**
* This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
- public void menuAboutToShow(final IMenuManager menuManager) {
+ public void menuAboutToShow(IMenuManager menuManager) {
((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public EditingDomainActionBarContributor getActionBarContributor() {
@@ -1792,7 +1745,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public IActionBars getActionBars() {
@@ -1802,39 +1754,37 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public AdapterFactory getAdapterFactory() {
- return this.adapterFactory;
+ return adapterFactory;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
@Override
public void dispose() {
- this.updateProblemIndication = false;
+ updateProblemIndication = false;
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this.resourceChangeListener);
+ ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
- getSite().getPage().removePartListener(this.partListener);
+ getSite().getPage().removePartListener(partListener);
- this.adapterFactory.dispose();
+ adapterFactory.dispose();
- if(getActionBarContributor().getActiveEditor() == this) {
+ if (getActionBarContributor().getActiveEditor() == this) {
getActionBarContributor().setActiveEditor(null);
}
- if(this.propertySheetPage != null) {
- this.propertySheetPage.dispose();
+ if (propertySheetPage != null) {
+ propertySheetPage.dispose();
}
- if(this.contentOutlinePage != null) {
- this.contentOutlinePage.dispose();
+ if (contentOutlinePage != null) {
+ contentOutlinePage.dispose();
}
super.dispose();
@@ -1844,7 +1794,6 @@ public class PapyrustableconfigurationEditor extends MultiPageEditorPart impleme * Returns whether the outline view should be presented to the user.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
protected boolean showOutlineView() {
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditorPlugin.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditorPlugin.java index a1faac3158e..0986d2f1b1d 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditorPlugin.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationEditorPlugin.java @@ -19,13 +19,14 @@ import org.eclipse.emf.ecore.provider.EcoreEditPlugin; import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.provider.CustomEditPlugin;
import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.provider.Efacet2EditPlugin;
import org.eclipse.emf.facet.widgets.celleditors.edit.CelleditorsEditPlugin;
+import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.table.provider.Tableinstance02EditPlugin;
+import org.eclipse.emf.facet.widgets.table.metamodel.v0_2_0.tableconfiguration.provider.TableConfigurationEditPlugin;
import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.provider.PapyrustableEditPlugin;
/**
* This is the central singleton for the Papyrustableconfiguration editor plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public final class PapyrustableconfigurationEditorPlugin extends EMFPlugin {
@@ -34,7 +35,6 @@ public final class PapyrustableconfigurationEditorPlugin extends EMFPlugin { * Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public static final PapyrustableconfigurationEditorPlugin INSTANCE = new PapyrustableconfigurationEditorPlugin();
@@ -43,7 +43,6 @@ public final class PapyrustableconfigurationEditorPlugin extends EMFPlugin { * Keep track of the singleton.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
private static Implementation plugin;
@@ -63,7 +62,6 @@ public final class PapyrustableconfigurationEditorPlugin extends EMFPlugin { * Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the singleton instance.
* @generated
*/
@@ -76,7 +74,6 @@ public final class PapyrustableconfigurationEditorPlugin extends EMFPlugin { * Returns the singleton instance of the Eclipse plugin.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @return the singleton instance.
* @generated
*/
@@ -88,7 +85,6 @@ public final class PapyrustableconfigurationEditorPlugin extends EMFPlugin { * The actual implementation of the Eclipse <b>Plugin</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public static class Implementation extends EclipseUIPlugin {
@@ -97,12 +93,11 @@ public final class PapyrustableconfigurationEditorPlugin extends EMFPlugin { * Creates an instance.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
* @generated
*/
public Implementation() {
super();
-
+
// Remember the static instance.
//
plugin = this;
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationModelWizard.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationModelWizard.java index fb0a7013f67..e0f29367ca1 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationModelWizard.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.editor/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/presentation/PapyrustableconfigurationModelWizard.java @@ -380,8 +380,7 @@ public class PapyrustableconfigurationModelWizard extends Wizard implements INew * @generated
*/
public void createControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- {
+ Composite composite = new Composite(parent, SWT.NONE); {
GridLayout layout = new GridLayout();
layout.numColumns = 1;
layout.verticalSpacing = 12;
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore index 451aab86ad6..594b89c2065 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/model/papyrustableconfiguration.ecore @@ -21,7 +21,7 @@ <details key="documentation" value="This list registers the queries used to fill the PapyrusTable when it is in Queries Mode"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="listenFeature" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="listenContextFeature" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EStructuralFeature">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<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>
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java index 94e65332faf..9266e1bf96d 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrusTableConfiguration.java @@ -26,29 +26,21 @@ import org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.FillingMode * <!-- begin-user-doc -->
* A representation of the model object '<em><b>Papyrus Table Configuration</b></em>'.
* <!-- end-user-doc -->
- *
+ *
* <!-- begin-model-doc -->
* This element registers the parameters to configure a PapyrusTableInstance2
* <!-- end-model-doc -->
- *
+ *
* <p>
* The following features are supported:
* <ul>
- * <li>
- * {@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getFillingMode
- * <em>Filling Mode</em>}</li>
- * <li>
- * {@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getFillingQueries
- * <em>Filling Queries</em>}</li>
- * <li>
- * {@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getListenFeature
- * <em>Listen Feature</em>}</li>
- * <li>
- * {@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getTableConfiguration
- * <em>Table Configuration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getFillingMode <em>Filling Mode</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getFillingQueries <em>Filling Queries</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getListenContextFeature <em>Listen Context Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getTableConfiguration <em>Table Configuration</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage#getPapyrusTableConfiguration()
* @model
* @generated
@@ -63,7 +55,6 @@ public interface PapyrusTableConfiguration extends EObject, EModelElement { * <!-- begin-model-doc -->
* This field allows to define the filling mode to use when the table is created.
* <!-- end-model-doc -->
- *
* @return the value of the '<em>Filling Mode</em>' attribute.
* @see org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.FillingMode
* @see #setFillingMode(FillingMode)
@@ -74,14 +65,10 @@ public interface PapyrusTableConfiguration extends EObject, EModelElement { FillingMode getFillingMode();
/**
- * Sets the value of the '
- * {@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getFillingMode
- * <em>Filling Mode</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getFillingMode <em>Filling Mode</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Filling Mode</em>' attribute.
+ * @param value the new value of the '<em>Filling Mode</em>' attribute.
* @see org.eclipse.papyrus.infra.table.efacet.metamodel.papyrustable.FillingMode
* @see #getFillingMode()
* @generated
@@ -96,7 +83,6 @@ public interface PapyrusTableConfiguration extends EObject, EModelElement { * <!-- begin-model-doc -->
* This list registers the queries used to fill the PapyrusTable when it is in Queries Mode
* <!-- end-model-doc -->
- *
* @return the value of the '<em>Filling Queries</em>' reference list.
* @see org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage#getPapyrusTableConfiguration_FillingQueries()
* @model
@@ -105,34 +91,29 @@ public interface PapyrusTableConfiguration extends EObject, EModelElement { EList<Query> getFillingQueries();
/**
- * Returns the value of the '<em><b>Listen Feature</b></em>' reference.
+ * Returns the value of the '<em><b>Listen Context Feature</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
* This field references the feature of the context of the table to listen, when the table in is Feature Mode
* <!-- end-model-doc -->
- *
- * @return the value of the '<em>Listen Feature</em>' reference.
- * @see #setListenFeature(EStructuralFeature)
- * @see org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage#getPapyrusTableConfiguration_ListenFeature()
+ * @return the value of the '<em>Listen Context Feature</em>' reference.
+ * @see #setListenContextFeature(EStructuralFeature)
+ * @see org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage#getPapyrusTableConfiguration_ListenContextFeature()
* @model
* @generated
*/
- EStructuralFeature getListenFeature();
+ EStructuralFeature getListenContextFeature();
/**
- * Sets the value of the '
- * {@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getListenFeature
- * <em>Listen Feature</em>}' reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getListenContextFeature <em>Listen Context Feature</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @param value
- * the new value of the '<em>Listen Feature</em>' reference.
- * @see #getListenFeature()
+ * @param value the new value of the '<em>Listen Context Feature</em>' reference.
+ * @see #getListenContextFeature()
* @generated
*/
- void setListenFeature(EStructuralFeature value);
+ void setListenContextFeature(EStructuralFeature value);
/**
* Returns the value of the '<em><b>Table Configuration</b></em>' containment reference.
@@ -141,7 +122,6 @@ public interface PapyrusTableConfiguration extends EObject, EModelElement { * <!-- 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.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrustableconfigurationPackage#getPapyrusTableConfiguration_TableConfiguration()
@@ -151,14 +131,10 @@ public interface PapyrusTableConfiguration extends EObject, EModelElement { TableConfiguration getTableConfiguration();
/**
- * Sets the value of the '
- * {@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getTableConfiguration
- * <em>Table Configuration</em>}' containment reference.
+ * Sets the value of the '{@link org.eclipse.papyrus.infra.table.efacet.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.
+ * @param value the new value of the '<em>Table Configuration</em>' containment reference.
* @see #getTableConfiguration()
* @generated
*/
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrustableconfigurationPackage.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrustableconfigurationPackage.java index 5dde77272d2..6c2378eaa13 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrustableconfigurationPackage.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/PapyrustableconfigurationPackage.java @@ -107,13 +107,13 @@ public interface PapyrustableconfigurationPackage extends EPackage { int PAPYRUS_TABLE_CONFIGURATION__FILLING_QUERIES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Listen Feature</b></em>' reference.
+ * The feature id for the '<em><b>Listen Context Feature</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
+ int PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Table Configuration</b></em>' containment reference.
@@ -167,15 +167,15 @@ public interface PapyrustableconfigurationPackage extends EPackage { EReference getPapyrusTableConfiguration_FillingQueries();
/**
- * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getListenFeature <em>Listen Feature</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getListenContextFeature <em>Listen Context Feature</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the reference '<em>Listen Feature</em>'.
- * @see org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getListenFeature()
+ * @return the meta object for the reference '<em>Listen Context Feature</em>'.
+ * @see org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getListenContextFeature()
* @see #getPapyrusTableConfiguration()
* @generated
*/
- EReference getPapyrusTableConfiguration_ListenFeature();
+ EReference getPapyrusTableConfiguration_ListenContextFeature();
/**
* Returns the meta object for the containment reference '{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.PapyrusTableConfiguration#getTableConfiguration <em>Table Configuration</em>}'.
@@ -237,12 +237,12 @@ public interface PapyrustableconfigurationPackage extends EPackage { EReference PAPYRUS_TABLE_CONFIGURATION__FILLING_QUERIES = eINSTANCE.getPapyrusTableConfiguration_FillingQueries();
/**
- * The meta object literal for the '<em><b>Listen Feature</b></em>' reference feature.
+ * The meta object literal for the '<em><b>Listen Context Feature</b></em>' reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EReference PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE = eINSTANCE.getPapyrusTableConfiguration_ListenFeature();
+ EReference PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE = eINSTANCE.getPapyrusTableConfiguration_ListenContextFeature();
/**
* The meta object literal for the '<em><b>Table Configuration</b></em>' containment reference feature.
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java index f870142ac01..cd0036cb2de 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrusTableConfigurationImpl.java @@ -46,7 +46,7 @@ import org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamode * <ul>
* <li>{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.impl.PapyrusTableConfigurationImpl#getFillingMode <em>Filling Mode</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.impl.PapyrusTableConfigurationImpl#getFillingQueries <em>Filling Queries</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.impl.PapyrusTableConfigurationImpl#getListenFeature <em>Listen Feature</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.impl.PapyrusTableConfigurationImpl#getListenContextFeature <em>Listen Context Feature</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel.papyrustableconfiguration.impl.PapyrusTableConfigurationImpl#getTableConfiguration <em>Table Configuration</em>}</li>
* </ul>
* </p>
@@ -85,14 +85,14 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements protected EList<Query> fillingQueries;
/**
- * The cached value of the '{@link #getListenFeature() <em>Listen Feature</em>}' reference.
+ * The cached value of the '{@link #getListenContextFeature() <em>Listen Context Feature</em>}' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getListenFeature()
+ * @see #getListenContextFeature()
* @generated
* @ordered
*/
- protected EStructuralFeature listenFeature;
+ protected EStructuralFeature listenContextFeature;
/**
* The cached value of the '{@link #getTableConfiguration() <em>Table Configuration</em>}' containment reference.
@@ -161,16 +161,16 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements * <!-- end-user-doc -->
* @generated
*/
- public EStructuralFeature getListenFeature() {
- if (listenFeature != null && listenFeature.eIsProxy()) {
- InternalEObject oldListenFeature = (InternalEObject)listenFeature;
- listenFeature = (EStructuralFeature)eResolveProxy(oldListenFeature);
- if (listenFeature != oldListenFeature) {
+ public EStructuralFeature getListenContextFeature() {
+ if (listenContextFeature != null && listenContextFeature.eIsProxy()) {
+ InternalEObject oldListenContextFeature = (InternalEObject)listenContextFeature;
+ listenContextFeature = (EStructuralFeature)eResolveProxy(oldListenContextFeature);
+ if (listenContextFeature != oldListenContextFeature) {
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE, oldListenContextFeature, listenContextFeature));
}
}
- return listenFeature;
+ return listenContextFeature;
}
/**
@@ -178,8 +178,8 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements * <!-- end-user-doc -->
* @generated
*/
- public EStructuralFeature basicGetListenFeature() {
- return listenFeature;
+ public EStructuralFeature basicGetListenContextFeature() {
+ return listenContextFeature;
}
/**
@@ -187,11 +187,11 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements * <!-- end-user-doc -->
* @generated
*/
- public void setListenFeature(EStructuralFeature newListenFeature) {
- EStructuralFeature oldListenFeature = listenFeature;
- listenFeature = newListenFeature;
+ public void setListenContextFeature(EStructuralFeature newListenContextFeature) {
+ EStructuralFeature oldListenContextFeature = listenContextFeature;
+ listenContextFeature = newListenContextFeature;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE, oldListenFeature, listenFeature));
+ eNotify(new ENotificationImpl(this, Notification.SET, PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE, oldListenContextFeature, listenContextFeature));
}
/**
@@ -263,9 +263,9 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements return getFillingMode();
case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__FILLING_QUERIES:
return getFillingQueries();
- case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE:
- if (resolve) return getListenFeature();
- return basicGetListenFeature();
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE:
+ if (resolve) return getListenContextFeature();
+ return basicGetListenContextFeature();
case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:
return getTableConfiguration();
}
@@ -288,8 +288,8 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements getFillingQueries().clear();
getFillingQueries().addAll((Collection<? extends Query>)newValue);
return;
- case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE:
- setListenFeature((EStructuralFeature)newValue);
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE:
+ setListenContextFeature((EStructuralFeature)newValue);
return;
case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:
setTableConfiguration((TableConfiguration)newValue);
@@ -312,8 +312,8 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__FILLING_QUERIES:
getFillingQueries().clear();
return;
- case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE:
- setListenFeature((EStructuralFeature)null);
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE:
+ setListenContextFeature((EStructuralFeature)null);
return;
case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:
setTableConfiguration((TableConfiguration)null);
@@ -334,8 +334,8 @@ public class PapyrusTableConfigurationImpl extends EModelElementImpl implements return fillingMode != FILLING_MODE_EDEFAULT;
case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__FILLING_QUERIES:
return fillingQueries != null && !fillingQueries.isEmpty();
- case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_FEATURE:
- return listenFeature != null;
+ case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__LISTEN_CONTEXT_FEATURE:
+ return listenContextFeature != null;
case PapyrustableconfigurationPackage.PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION:
return tableConfiguration != null;
}
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java index 5568048390b..a0401babb60 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java +++ b/incoming/TableEFacet/org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration.metamodel/src-gen/org/eclipse/papyrus/infra/table/efacet/papyrustableconfiguration/metamodel/papyrustableconfiguration/impl/PapyrustableconfigurationPackageImpl.java @@ -140,7 +140,7 @@ public class PapyrustableconfigurationPackageImpl extends EPackageImpl implement * <!-- end-user-doc -->
* @generated
*/
- public EReference getPapyrusTableConfiguration_ListenFeature() {
+ public EReference getPapyrusTableConfiguration_ListenContextFeature() {
return (EReference)papyrusTableConfigurationEClass.getEStructuralFeatures().get(2);
}
@@ -184,7 +184,7 @@ public class PapyrustableconfigurationPackageImpl extends EPackageImpl implement papyrusTableConfigurationEClass = createEClass(PAPYRUS_TABLE_CONFIGURATION);
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__LISTEN_CONTEXT_FEATURE);
createEReference(papyrusTableConfigurationEClass, PAPYRUS_TABLE_CONFIGURATION__TABLE_CONFIGURATION);
}
@@ -228,7 +228,7 @@ public class PapyrustableconfigurationPackageImpl extends EPackageImpl implement initEClass(papyrusTableConfigurationEClass, PapyrusTableConfiguration.class, "PapyrusTableConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
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); //$NON-NLS-1$
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); //$NON-NLS-1$
- 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); //$NON-NLS-1$
+ initEReference(getPapyrusTableConfiguration_ListenContextFeature(), theEcorePackage.getEStructuralFeature(), null, "listenContextFeature", null, 0, 1, PapyrusTableConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
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); //$NON-NLS-1$
// Create resource
diff --git a/incoming/TableEFacet/org.eclipse.papyrus.table.efacet.uml.generic/resources/uml_generic_table.papyrustableconfiguration b/incoming/TableEFacet/org.eclipse.papyrus.table.efacet.uml.generic/resources/uml_generic_table.papyrustableconfiguration index 0828c3fc2fb..5829857fef5 100644 --- a/incoming/TableEFacet/org.eclipse.papyrus.table.efacet.uml.generic/resources/uml_generic_table.papyrustableconfiguration +++ b/incoming/TableEFacet/org.eclipse.papyrus.table.efacet.uml.generic/resources/uml_generic_table.papyrustableconfiguration @@ -1,10 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.papyrus.infra.table.papyrustableconfiguration:PapyrusTableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" xmlns:org.eclipse.papyrus.infra.table.papyrustableconfiguration="http://www.eclipse.org/Papyrus/PapyrusTableConfiguration/0.9.0/papyrustableconfiguration">
+<org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration:PapyrusTableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" xmlns:org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration="http://www.eclipse.org/Papyrus/PapyrusTableConfiguration/0.9.0/papyrustableconfiguration">
<tableConfiguration>
- <canBePresentedInTheTable xsi:type="efacet:FacetOperation" href="platform:/plugin/org.eclipse.papyrus.uml.efacet/resources/uml.efacet#//uml_element/isUMLElementQuery"/>
- <defaultFacets href="platform:/plugin/org.eclipse.papyrus.infra.emf.efacet/resources/papyrus_emf_facets.efacet#//papyrus_emf_facets"/>
- <defaultCustomizations href="platform:/plugin/org.eclipse.papyrus.infra.emf.efacet/resources/emf_hidden_features.custom#/"/>
- <defaultCustomizations href="platform:/plugin/org.eclipse.papyrus.uml.efacet/resources/uml_label.custom#/"/>
- <defaultColumns xsi:type="efacet:FacetReference" href="platform:/plugin/org.eclipse.papyrus.infra.emf.efacet/resources/papyrus_emf_facets.efacet#//papyrus_emf_facets/self"/>
</tableConfiguration>
-</org.eclipse.papyrus.infra.table.papyrustableconfiguration:PapyrusTableConfiguration>
\ No newline at end of file +</org.eclipse.papyrus.infra.table.efacet.papyrustableconfiguration:PapyrusTableConfiguration>
|