384331: [Property view] It should be possible to contribute non-customizable property view configurations

https://bugs.eclipse.org/bugs/show_bug.cgi?id=384331

7 files changed, 25 insertions, 4 deletions

diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
index 17861495a83..d9b1d9432df 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/src/org/eclipse/papyrus/customization/properties/ui/CustomizationDialog.java
@@ -86,7 +86,7 @@ public class CustomizationDialog extends TrayDialog implements SelectionListener
 		label.setText(Messages.CustomizationDialog_selectContextToEdit);

 		label.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));

 

-		Collection<Context> contexts = ConfigurationManager.instance.getContexts();

+		Collection<Context> contexts = ConfigurationManager.instance.getCustomizableContexts();

 

 		availableContexts = new List(contents, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);

 		availableContexts.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization.genmodel b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization.genmodel
index 68dc2e7b1e8..e4d15001e25 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization.genmodel
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization.genmodel
@@ -38,5 +38,7 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Customization.ecore#//UMLModel/description"/>

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Customization.ecore#//UMLModel/provider"/>

     </genClasses>

+    <genClasses ecoreClass="Customization.ecore#//ConstraintsEnvironment"/>

+    <genClasses ecoreClass="Customization.ecore#//PropertyViewEnvironment"/>

   </genPackages>

 </genmodel:GenModel>

diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx
index 7ec28a7500a..e4d098af9d6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx
@@ -3,7 +3,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9"

 	xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9"

 	name="Customization plug-in">

-	<tabs label="Default" id="default" category="default">

+	<tabs label="Customization plug-in" id="customizationPlugin" category="org.eclipse.papyrus">

 		<sections name="Single CustomizationConfiguration"

 			sectionFile="ui/SingleCustomizationConfiguration.xwt">

 			<widget href="ui/SingleCustomizationConfiguration.xwt#/" />

diff --git a/plugins/customization/org.eclipse.papyrus.customization/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization/plugin.xml
index 7170570d866..9b69cff3b10 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/plugin.xml
+++ b/plugins/customization/org.eclipse.papyrus.customization/plugin.xml
@@ -31,7 +31,8 @@
    <extension

          point="org.eclipse.papyrus.views.properties.context">

       <context

-            contextModel="Model/Customization/Customization.ctx">

+            contextModel="Model/Customization/Customization.ctx"

+            isCustomizable="false">

       </context>

    </extension>

    <extension

@@ -57,6 +58,12 @@
       <factory

             factory="org.eclipse.papyrus.customization.factory.UMLModelExtensionFactory">

       </factory>

+      <factory

+            factory="org.eclipse.papyrus.customization.factory.ConstraintEnvironmentExtensionFactory">

+      </factory>

+      <factory

+            factory="org.eclipse.papyrus.customization.factory.PropertyViewEnvironmentExtensionFactory">

+      </factory>

    </extension>

 

 </plugin>

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customizationplugin/impl/CustomizationPluginFactoryImpl.java b/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customizationplugin/impl/CustomizationPluginFactoryImpl.java
index 6c89bbf460f..99661671f18 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customizationplugin/impl/CustomizationPluginFactoryImpl.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customizationplugin/impl/CustomizationPluginFactoryImpl.java
@@ -63,6 +63,8 @@ public class CustomizationPluginFactoryImpl extends EFactoryImpl implements Cust
 			case CustomizationPluginPackage.PALETTE: return createPalette();

 			case CustomizationPluginPackage.PROFILE: return createProfile();

 			case CustomizationPluginPackage.UML_MODEL: return createUMLModel();

+			case CustomizationPluginPackage.CONSTRAINTS_ENVIRONMENT: return createConstraintsEnvironment();

+			case CustomizationPluginPackage.PROPERTY_VIEW_ENVIRONMENT: return createPropertyViewEnvironment();

 			default:

 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customizationplugin/impl/CustomizationPluginPackageImpl.java b/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customizationplugin/impl/CustomizationPluginPackageImpl.java
index fb4ea763ddf..db27f82e5ed 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customizationplugin/impl/CustomizationPluginPackageImpl.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src-gen/org/eclipse/papyrus/customization/model/customizationplugin/impl/CustomizationPluginPackageImpl.java
@@ -472,6 +472,10 @@ public class CustomizationPluginPackageImpl extends EPackageImpl implements Cust
 		createEAttribute(umlModelEClass, UML_MODEL__ICONPATH);

 		createEAttribute(umlModelEClass, UML_MODEL__DESCRIPTION);

 		createEAttribute(umlModelEClass, UML_MODEL__PROVIDER);

+

+		constraintsEnvironmentEClass = createEClass(CONSTRAINTS_ENVIRONMENT);

+

+		propertyViewEnvironmentEClass = createEClass(PROPERTY_VIEW_ENVIRONMENT);

 	}

 

 	/**

@@ -509,6 +513,8 @@ public class CustomizationPluginPackageImpl extends EPackageImpl implements Cust
 		paletteEClass.getESuperTypes().add(this.getFileBasedCustomizableElement());

 		profileEClass.getESuperTypes().add(this.getFileBasedCustomizableElement());

 		umlModelEClass.getESuperTypes().add(this.getFileBasedCustomizableElement());

+		constraintsEnvironmentEClass.getESuperTypes().add(this.getFileBasedCustomizableElement());

+		propertyViewEnvironmentEClass.getESuperTypes().add(this.getFileBasedCustomizableElement());

 

 		// Initialize classes and features; add operations and parameters

 		initEClass(customizationConfigurationEClass, CustomizationConfiguration.class, "CustomizationConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

@@ -545,6 +551,10 @@ public class CustomizationPluginPackageImpl extends EPackageImpl implements Cust
 		initEAttribute(getUMLModel_Description(), ecorePackage.getEString(), "description", null, 0, 1, UMLModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 		initEAttribute(getUMLModel_Provider(), ecorePackage.getEString(), "provider", null, 0, 1, UMLModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

+		initEClass(constraintsEnvironmentEClass, ConstraintsEnvironment.class, "ConstraintsEnvironment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

+		initEClass(propertyViewEnvironmentEClass, PropertyViewEnvironment.class, "PropertyViewEnvironment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+

 		// Create resource

 		createResource(eNS_URI);

 	}

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java
index 07c91131aaa..5053989c3bd 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java
@@ -22,7 +22,7 @@ import org.eclipse.papyrus.customization.plugin.PluginEditor;
 public class PropertyViewEnvironmentExtensionFactory extends FileBasedExtensionFactory {

 

 	public PropertyViewEnvironmentExtensionFactory() {

-		super(Messages.EnvironmentExtensionFactory_PropertyViewEnvironment, "org.eclipse.papyrus.views.properties.Environment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 

+		super(Messages.EnvironmentExtensionFactory_PropertyViewEnvironment, "org.eclipse.papyrus.views.properties.environment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 

 	}

 

 	@Override