Display IDs

de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java

@@ -192,7 +192,7 @@ public class MaterialItemProvider extends ItemProviderAdapter implements IEditin
 				getString("_UI_Material_constructionDescription_feature"),
 				getString("_UI_PropertyDescriptor_description", "_UI_Material_constructionDescription_feature",
 						"_UI_Material_type"),
-				BuildingPhysicsPackage.Literals.MATERIAL__CONSTRUCTION_DESCRIPTION, true, false, false,
+				BuildingPhysicsPackage.Literals.MATERIAL__CONSTRUCTION_DESCRIPTION, true, true, false,
 				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
@@ -240,7 +240,7 @@ public class MaterialItemProvider extends ItemProviderAdapter implements IEditin
 						getResourceLocator(), getString("_UI_Material_disposalDescription_feature"),
 						getString("_UI_PropertyDescriptor_description", "_UI_Material_disposalDescription_feature",
 								"_UI_Material_type"),
-						BuildingPhysicsPackage.Literals.MATERIAL__DISPOSAL_DESCRIPTION, true, false, false,
+						BuildingPhysicsPackage.Literals.MATERIAL__DISPOSAL_DESCRIPTION, true, true, false,
 						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 

de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java

@@ -209,7 +209,7 @@ public class WindowTypeItemProvider extends ItemProviderAdapter implements IEdit
 				getString("_UI_WindowType_constructionDescription_feature"),
 				getString("_UI_PropertyDescriptor_description", "_UI_WindowType_constructionDescription_feature",
 						"_UI_WindowType_type"),
-				BuildingPhysicsPackage.Literals.WINDOW_TYPE__CONSTRUCTION_DESCRIPTION, true, false, false,
+				BuildingPhysicsPackage.Literals.WINDOW_TYPE__CONSTRUCTION_DESCRIPTION, true, true, false,
 				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
@@ -257,7 +257,7 @@ public class WindowTypeItemProvider extends ItemProviderAdapter implements IEdit
 				getString("_UI_WindowType_disposalDescription_feature"),
 				getString("_UI_PropertyDescriptor_description", "_UI_WindowType_disposalDescription_feature",
 						"_UI_WindowType_type"),
-				BuildingPhysicsPackage.Literals.WINDOW_TYPE__DISPOSAL_DESCRIPTION, true, false, false,
+				BuildingPhysicsPackage.Literals.WINDOW_TYPE__DISPOSAL_DESCRIPTION, true, true, false,
 				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 

de.hftstuttgart.buildingphysics.viewmodel/viewmodels/Material.view

 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_bUohgK22Eeup29SeaUMpQQ" name="Material">
   <rootEClass href="http://www.hftstuttgart.de/buildingphysics#//Material"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_D1u4sLP5Eeu2NpUbC-wFIA" name="Control materialId">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_D1u4sbP5Eeu2NpUbC-wFIA">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Material/materialId"/>
+    </domainModelReference>
+  </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_bUpvoq22Eeup29SeaUMpQQ" name="Control name">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_bUpvo622Eeup29SeaUMpQQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//Material/name"/>

de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowType.view

 <?xml version="1.0" encoding="UTF-8"?>
 <org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.group.model="http://org/eclipse/emf/ecp/view/group/model" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="_7hNMIK21Eeup29SeaUMpQQ" name="WindowType">
   <rootEClass href="http://www.hftstuttgart.de/buildingphysics#//WindowType"/>
+  <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_UulsMLP5Eeu2NpUbC-wFIA" name="Control windowTypeId">
+    <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_UulsMbP5Eeu2NpUbC-wFIA">
+      <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/windowTypeId"/>
+    </domainModelReference>
+  </children>
   <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_7hPBUq21Eeup29SeaUMpQQ" name="Control name">
     <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_7hPBU621Eeup29SeaUMpQQ">
       <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/name"/>

de.hftstuttgart.buildingphysics/model/buildingphysics.ecore

@@ -12,7 +12,7 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="WindowType">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="windowTypeId" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="uValue" lowerBound="1"
         eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
@@ -105,7 +105,7 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Mounting">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="mountingId" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" iD="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="layers" lowerBound="1"
         upperBound="-1" eType="#//Layer" containment="true"/>

de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel

@@ -25,10 +25,10 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/frameRatio"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/embodiedEnergy"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/embodiedCarbon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/constructionDescription"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/constructionDescription"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalEnergy"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalCarbon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalDescription"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalDescription"/>
     </genClasses>
     <genClasses ecoreClass="buildingphysics.ecore#//Catalog">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/name"/>
@@ -54,10 +54,10 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/conductivity"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/embodiedEnergy"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/embodiedCarbon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/constructionDescription"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/constructionDescription"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/disposalEnergy"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/disposalCarbon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/disposalDescription"/>
+      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/disposalDescription"/>
     </genClasses>
     <genClasses ecoreClass="buildingphysics.ecore#//ConstructionCategory">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//ConstructionCategory/name"/>

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Mounting.java

@@ -32,7 +32,7 @@ public interface Mounting extends EObject {
 	 * @return the value of the '<em>Mounting Id</em>' attribute.
 	 * @see #setMountingId(String)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMounting_MountingId()
-	 * @model required="true"
+	 * @model id="true" required="true"
 	 * @generated
 	 */
 	String getMountingId();

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowType.java

@@ -41,7 +41,7 @@ public interface WindowType extends EObject {
 	 * @return the value of the '<em>Window Type Id</em>' attribute.
 	 * @see #setWindowTypeId(String)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_WindowTypeId()
-	 * @model required="true"
+	 * @model id="true" required="true"
 	 * @generated
 	 */
 	String getWindowTypeId();

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java

@@ -822,7 +822,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		initEClass(windowTypeEClass, WindowType.class, "WindowType", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getWindowType_WindowTypeId(), ecorePackage.getEString(), "windowTypeId", null, 1, 1,
-				WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+				WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
 		initEAttribute(getWindowType_Name(), ecorePackage.getEString(), "name", null, 1, 1, WindowType.class,
 				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -934,7 +934,7 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		initEClass(mountingEClass, Mounting.class, "Mounting", !IS_ABSTRACT, !IS_INTERFACE,
 				IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getMounting_MountingId(), ecorePackage.getEString(), "mountingId", null, 1, 1, Mounting.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMounting_Name(), ecorePackage.getEString(), "name", null, 1, 1, Mounting.class, !IS_TRANSIENT,
 				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getMounting_Layers(), this.getLayer(), null, "layers", null, 1, -1, Mounting.class,