diff --git a/de.hftstuttgart.buildingphysics.application/Application.e4xmi b/de.hftstuttgart.buildingphysics.application/Application.e4xmi
index c902850ed8b501626d1c8ec1057c9408628e2035..54370e87aa0d8ce3e98de3330f363a9700bbc4c3 100644
--- a/de.hftstuttgart.buildingphysics.application/Application.e4xmi
+++ b/de.hftstuttgart.buildingphysics.application/Application.e4xmi
@@ -3,9 +3,9 @@
<children xsi:type="basic:TrimmedWindow" xmi:id="_6wlLccgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.window.main" label="HfT Stuttgart - Building Physics Catalog" width="800" height="600">
<mainMenu xmi:id="_6wlLicgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.main.menu">
<children xsi:type="menu:Menu" xmi:id="_6wlLisgZEeSyMNYR5xypkQ" elementId="file" label="File">
- <children xsi:type="menu:HandledMenuItem" xmi:id="_y6FesCWUEeux0PTSTJn6xg" elementId="de.hftstuttgart.buildingphysics.application.handleditem.file.new" label="New..." command="_PnX_ACWUEeux0PTSTJn6xg"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLi8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.file.open" label="Open" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.save" label="Save" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_y6FesCWUEeux0PTSTJn6xg" elementId="de.hftstuttgart.buildingphysics.application.handleditem.file.new" label="New..." iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/database-plus.png" command="_PnX_ACWUEeux0PTSTJn6xg"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLi8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.file.open" label="Open" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/blue-folder-open.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.save" label="Save" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/disk-black.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjcgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.quit" label="Quit" command="_6wlLfMgZEeSyMNYR5xypkQ"/>
</children>
<children xsi:type="menu:Menu" xmi:id="_6wlLjsgZEeSyMNYR5xypkQ" elementId="help" label="Help">
@@ -14,9 +14,9 @@
</mainMenu>
<trimBars xmi:id="_6wlLlcgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.trimbar.top">
<children xsi:type="menu:ToolBar" xmi:id="_6wlLlsgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.main.toolbar">
- <children xsi:type="menu:HandledToolItem" xmi:id="_rXiTQCWUEeux0PTSTJn6xg" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.new" label="New..." command="_PnX_ACWUEeux0PTSTJn6xg"/>
- <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLl8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.open" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
- <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLmMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.save" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
+ <children xsi:type="menu:HandledToolItem" xmi:id="_rXiTQCWUEeux0PTSTJn6xg" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.new" label="New..." iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/database-plus.png" command="_PnX_ACWUEeux0PTSTJn6xg"/>
+ <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLl8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.open" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/blue-folder-open.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
+ <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLmMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.save" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/disk-black.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
</children>
</trimBars>
</children>
diff --git a/de.hftstuttgart.buildingphysics.application/icons/blue-folder-open.png b/de.hftstuttgart.buildingphysics.application/icons/blue-folder-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..49f61097bb670a9e860e829ebfbba0a298f7943d
Binary files /dev/null and b/de.hftstuttgart.buildingphysics.application/icons/blue-folder-open.png differ
diff --git a/de.hftstuttgart.buildingphysics.application/icons/database-plus.png b/de.hftstuttgart.buildingphysics.application/icons/database-plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..99f26880ba3e685d6ed11ce211f7d3c4744c4d56
Binary files /dev/null and b/de.hftstuttgart.buildingphysics.application/icons/database-plus.png differ
diff --git a/de.hftstuttgart.buildingphysics.application/icons/disk-black.png b/de.hftstuttgart.buildingphysics.application/icons/disk-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..26507e51bf6ddc4dc3bb7c859ce1be402d5b5bc0
Binary files /dev/null and b/de.hftstuttgart.buildingphysics.application/icons/disk-black.png differ
diff --git a/de.hftstuttgart.buildingphysics.application/icons/open_in_app.png b/de.hftstuttgart.buildingphysics.application/icons/open_in_app.png
deleted file mode 100644
index 9df4eeb7c3b8e6d1ff41f77b6032062a0edb4695..0000000000000000000000000000000000000000
Binary files a/de.hftstuttgart.buildingphysics.application/icons/open_in_app.png and /dev/null differ
diff --git a/de.hftstuttgart.buildingphysics.application/icons/save_edit.png b/de.hftstuttgart.buildingphysics.application/icons/save_edit.png
deleted file mode 100644
index b17caf5a984540e8b1448057feeecc5183c58eaa..0000000000000000000000000000000000000000
Binary files a/de.hftstuttgart.buildingphysics.application/icons/save_edit.png and /dev/null differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Catalog.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Catalog.gif
deleted file mode 100644
index cb1755a712505aeaaa447d9b1cc5940e602f87b6..0000000000000000000000000000000000000000
Binary files a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Catalog.gif and /dev/null differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Layer.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Layer.gif
deleted file mode 100644
index 45731fe28e7e3521c15328ef201d58b47a13b383..0000000000000000000000000000000000000000
Binary files a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Layer.gif and /dev/null differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/LifeCycle.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/LifeCycle.gif
deleted file mode 100644
index 48e3cf2268736efbb8bc3c5bd29315702f2b38c4..0000000000000000000000000000000000000000
Binary files a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/LifeCycle.gif and /dev/null differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Material.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Material.gif
deleted file mode 100644
index afb82ea48a50d3fb875ce03cf0ec154e51c97cb7..0000000000000000000000000000000000000000
Binary files a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Material.gif and /dev/null differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/MaterialCatalog.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/MaterialCatalog.gif
index 05dc74ad5da0d7b040b29537d5b24f2b120b11d5..272419503027609edd05679b2f0d4c5b5ccb195c 100644
Binary files a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/MaterialCatalog.gif and b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/MaterialCatalog.gif differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Mounting.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Mounting.gif
deleted file mode 100644
index 45731fe28e7e3521c15328ef201d58b47a13b383..0000000000000000000000000000000000000000
Binary files a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Mounting.gif and /dev/null differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowCatalog.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowCatalog.gif
index 9250fecbffd185d174d53f6b7ea979f63ce222d2..178791c3d7f0f77647000dd2e93d63c2c8e42ba0 100644
Binary files a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowCatalog.gif and b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowCatalog.gif differ
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowType.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowType.gif
deleted file mode 100644
index 30f0c48da8d4450f7e94a696c4de0a7cc41aa728..0000000000000000000000000000000000000000
Binary files a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowType.gif and /dev/null differ
diff --git a/de.hftstuttgart.buildingphysics.edit/plugin.properties b/de.hftstuttgart.buildingphysics.edit/plugin.properties
index 1a6336595ebdb1f38fdaedd108fae1c91b499d89..93c281321eff12b5690cba0a80f2e86fa7eddde0 100644
--- a/de.hftstuttgart.buildingphysics.edit/plugin.properties
+++ b/de.hftstuttgart.buildingphysics.edit/plugin.properties
@@ -15,9 +15,9 @@ _UI_PropertyDescriptor_description = The {0} of the {1}
_UI_BuildingPhysicsCatalog_type = Catalog
_UI_WindowType_type = Window Type
_UI_Catalog_type = Catalog
-_UI_WindowCatalog_type = Window Catalog
-_UI_MaterialCatalog_type = Material Catalog
-_UI_MaterialCategory_type = Material Category
+_UI_WindowCatalog_type = Windows
+_UI_MaterialCatalog_type = Materials and Constructions
+_UI_MaterialCategory_type =
_UI_Material_type = Material
_UI_Unknown_type = Object
@@ -46,7 +46,6 @@ _UI_Material_heatCapacity_feature = Heat Capacity
_UI_Material_conductivity_feature = Conductivity
_UI_Unknown_feature = Unspecified
-_UI_Catalog_xxx_feature = Xxx
_UI_LifeCycle_type = Life Cycle
_UI_WindowType_lifeCycle_feature = Life Cycle
_UI_LifeCycle_embodiedEnergy_feature = Embodied Energy
@@ -55,8 +54,8 @@ _UI_LifeCycle_constructionDescription_feature = Construction Description
_UI_LifeCycle_disposalEnergy_feature = Disposal Energy
_UI_LifeCycle_disposalCarbon_feature = Disposal Carbon
_UI_LifeCycle_disposalDescription_feature = Disposal Description
-_UI_WindowType__feature =
-_UI_LifeCycle__feature =
+_UI_WindowType__feature = Window Type
+_UI_LifeCycle__feature = Life Cycle
_UI_LifeCycle_type_feature = Type
_UI_WindowType_embodiedEnergy_feature = Embodied Energy
_UI_WindowType_embodiedCarbon_feature = Embodied Carbon
@@ -70,11 +69,11 @@ _UI_Material_constructionDescription_feature = Construction Description
_UI_Material_disposalEnergy_feature = Disposal Energy
_UI_Material_disposalCarbon_feature = Disposal Carbon
_UI_Material_disposalDescription_feature = Disposal Description
-_UI_ConstructionCategory_type = Construction Category
+_UI_ConstructionCategory_type = Constructions
_UI_Mounting_type = Mounting
_UI_Layer_type = Layer
-_UI_MaterialCatalog_constructionCategories_feature = Construction Categories
-_UI_ConstructionCategory_name_feature = Name
+_UI_MaterialCatalog_constructionCategories_feature = Constructions
+_UI_ConstructionCategory_name_feature = Construction Category
_UI_ConstructionCategory_mountings_feature = Mountings
_UI_Mounting_id_feature = Id
_UI_Mounting_name_feature = Name
@@ -85,4 +84,4 @@ _UI_MaterialCategory_materials_feature = Materials
_UI_WindowType_windowTypeId_feature = Window Type Id
_UI_Material_materialId_feature = Material Id
_UI_Mounting_mountingId_feature = Mounting Id
-_UI_Layer__feature =
+_UI_Layer__feature = Layer
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java
index 954fc335519d00e22c484a0eae3811754f1d9a03..51af9ae0922d7c3c1c2b2b2ef0a3c5361f276159 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java
@@ -107,17 +107,6 @@ public class CatalogItemProvider extends ItemProviderAdapter implements IEditing
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This returns Catalog.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Catalog"));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/ConstructionCategoryItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/ConstructionCategoryItemProvider.java
index 008bb5086302e9344bd4f43e5c6eb1438af73659..9e64054bc7925e8528352cb5cd12c5450e8aee10 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/ConstructionCategoryItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/ConstructionCategoryItemProvider.java
@@ -2,7 +2,6 @@
*/
package de.hftstuttgart.buildingphysics.provider;
-import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.ConstructionCategory;
@@ -13,9 +12,6 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -77,36 +73,6 @@ public class ConstructionCategoryItemProvider extends ItemProviderAdapter implem
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(BuildingPhysicsPackage.Literals.CONSTRUCTION_CATEGORY__MOUNTINGS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- 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.
-
- return super.getChildFeature(object, child);
- }
-
/**
* This returns ConstructionCategory.gif.
* <!-- begin-user-doc -->
@@ -154,10 +120,8 @@ public class ConstructionCategoryItemProvider extends ItemProviderAdapter implem
switch (notification.getFeatureID(ConstructionCategory.class)) {
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
super.notifyChanged(notification);
@@ -173,9 +137,6 @@ public class ConstructionCategoryItemProvider extends ItemProviderAdapter implem
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.CONSTRUCTION_CATEGORY__MOUNTINGS,
- BuildingPhysicsFactory.eINSTANCE.createMounting()));
}
/**
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/LayerItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/LayerItemProvider.java
index a01650ff343e466c7c9a7d6ca44a6a10d9288a61..42898498bafbf0745c689f7170c0519090388cc5 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/LayerItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/LayerItemProvider.java
@@ -91,17 +91,6 @@ public class LayerItemProvider extends ItemProviderAdapter implements IEditingDo
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This returns Layer.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Layer"));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java
index b3b111217617c75c6bed94889d49aded8984a0a8..b05dcb7002f37f7a188a7ce4e3614e4b9a373dde 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java
@@ -2,7 +2,6 @@
*/
package de.hftstuttgart.buildingphysics.provider;
-import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.MaterialCatalog;
@@ -11,9 +10,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -105,13 +102,11 @@ public class MaterialCatalogItemProvider extends CatalogItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated NOT
*/
@Override
public String getText(Object object) {
- String label = ((MaterialCatalog) object).getName();
- return label == null || label.length() == 0 ? getString("_UI_MaterialCatalog_type")
- : getString("_UI_MaterialCatalog_type") + " " + label;
+ return getString("_UI_MaterialCatalog_type");
}
/**
@@ -144,14 +139,6 @@ public class MaterialCatalogItemProvider extends CatalogItemProvider {
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors
- .add(createChildParameter(BuildingPhysicsPackage.Literals.MATERIAL_CATALOG__MATERIAL_CATEGORIES,
- BuildingPhysicsFactory.eINSTANCE.createMaterialCategory()));
-
- newChildDescriptors
- .add(createChildParameter(BuildingPhysicsPackage.Literals.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES,
- BuildingPhysicsFactory.eINSTANCE.createConstructionCategory()));
}
}
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java
index b6e1711981c7ddc1f8dc27224fdcca5abad581ef..248f7ebc6cb25606c76e04c9a3b7dc9cd29515f7 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java
@@ -2,7 +2,6 @@
*/
package de.hftstuttgart.buildingphysics.provider;
-import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.MaterialCategory;
@@ -13,9 +12,6 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -77,36 +73,6 @@ public class MaterialCategoryItemProvider extends ItemProviderAdapter implements
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(BuildingPhysicsPackage.Literals.MATERIAL_CATEGORY__MATERIALS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- 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.
-
- return super.getChildFeature(object, child);
- }
-
/**
* This returns MaterialCategory.gif.
* <!-- begin-user-doc -->
@@ -153,12 +119,10 @@ public class MaterialCategoryItemProvider extends ItemProviderAdapter implements
updateChildren(notification);
switch (notification.getFeatureID(MaterialCategory.class)) {
+ case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIALS:
case BuildingPhysicsPackage.MATERIAL_CATEGORY__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIALS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
}
super.notifyChanged(notification);
}
@@ -173,9 +137,6 @@ public class MaterialCategoryItemProvider extends ItemProviderAdapter implements
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.MATERIAL_CATEGORY__MATERIALS,
- BuildingPhysicsFactory.eINSTANCE.createMaterial()));
}
/**
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java
index 4dad5f8b55d774217f35e73ef7c1530a63729921..a154fb62164c799e3f338fba07dc0640a02c24f7 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java
@@ -244,17 +244,6 @@ public class MaterialItemProvider extends ItemProviderAdapter implements IEditin
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This returns Material.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Material"));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java
index e94f7b88f95a41d3f0918fc7d178294bc6364adf..881ce3629e8a102863450b5162aefade8681087f 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java
@@ -124,17 +124,6 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
return super.getChildFeature(object, child);
}
- /**
- * This returns Mounting.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Mounting"));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
index 6c8c85e757470681dcfb782eb5d2cd185e176728..94d50a8867070171181ef1c244ed8b20167ed8be 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
@@ -2,7 +2,6 @@
*/
package de.hftstuttgart.buildingphysics.provider;
-import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.WindowCatalog;
@@ -11,9 +10,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -104,13 +101,11 @@ public class WindowCatalogItemProvider extends CatalogItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated NOT
*/
@Override
public String getText(Object object) {
- String label = ((WindowCatalog) object).getName();
- return label == null || label.length() == 0 ? getString("_UI_WindowCatalog_type")
- : getString("_UI_WindowCatalog_type") + " " + label;
+ return getString("_UI_WindowCatalog_type");
}
/**
@@ -142,9 +137,6 @@ public class WindowCatalogItemProvider extends CatalogItemProvider {
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.WINDOW_CATALOG__WINDOW_TYPES,
- BuildingPhysicsFactory.eINSTANCE.createWindowType()));
}
}
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java
index 6c3af04971739d00d469bd47e5ea88f07b22e750..fa4c6f62ebdeb3d53046843caac2b3f0dafe5974 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java
@@ -261,17 +261,6 @@ public class WindowTypeItemProvider extends ItemProviderAdapter implements IEdit
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This returns WindowType.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/WindowType"));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/ConstructionCategory.view b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/ConstructionCategory.view
index b5fd3971c6d79e8350825bd99ad12cf8c8322e45..d94eb26d35ac921fb4798e5118302475db1d05f5 100644
--- a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/ConstructionCategory.view
+++ b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/ConstructionCategory.view
@@ -1,10 +1,17 @@
<?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.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="__9S1ELPYEeup29SeaUMpQQ" name="ConstructionCategory">
+<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.model="http://org/eclipse/emf/ecp/view/model/1180" xmlns:org.eclipse.emf.ecp.view.table.model="http://org/eclipse/emf/ecp/view/table/model/150" xmi:id="__9S1ELPYEeup29SeaUMpQQ" name="ConstructionCategory">
<rootEClass href="http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory"/>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__9TcILPYEeup29SeaUMpQQ" name="Control name">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__9TcIbPYEeup29SeaUMpQQ">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory/name"/>
</domainModelReference>
</children>
+ <children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_vgicgLeuEeu0KumwacCHxQ" detailEditing="WithPanel">
+ <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_yN_hQLeuEeu0KumwacCHxQ">
+ <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_yN_hQbeuEeu0KumwacCHxQ">
+ <domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory/mountings"/>
+ </domainModelReference>
+ </domainModelReference>
+ </children>
<ecorePaths>/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore</ecorePaths>
</org.eclipse.emf.ecp.view.model:View>
diff --git a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowCatalog.view b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowCatalog.view
index 4239dd6de575858c8d80cd06f73b6c6673f8c970..817c56bf0ea295ff83ace52f2f80573c7fb345af 100644
--- a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowCatalog.view
+++ b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowCatalog.view
@@ -17,23 +17,8 @@
</domainModelReference>
</children>
<children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_jQX8wK15Eeuda6ijj1ILcQ" detailEditing="WithPanel">
- <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_lX_JgK15Eeuda6ijj1ILcQ">
- <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Fy7TkK22Eeup29SeaUMpQQ">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/id"/>
- </columnDomainModelReferences>
- <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Fy7Tka22Eeup29SeaUMpQQ">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/name"/>
- </columnDomainModelReferences>
- <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Fy7Tkq22Eeup29SeaUMpQQ">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/uValue"/>
- </columnDomainModelReferences>
- <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Fy7Tk622Eeup29SeaUMpQQ">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/gValue"/>
- </columnDomainModelReferences>
- <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Fy7TlK22Eeup29SeaUMpQQ">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/glazingNumber"/>
- </columnDomainModelReferences>
- <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_lX_Jga15Eeuda6ijj1ILcQ">
+ <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_v8IfcLfGEeu0KumwacCHxQ">
+ <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_v8IfcbfGEeu0KumwacCHxQ">
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//WindowCatalog/windowTypes"/>
</domainModelReference>
</domainModelReference>
diff --git a/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel b/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
index 026c8ce65d163816fa35fa6fea7ede41c1f6aeac..a3589865aa819b0567ae8d6bbce8caf806e457ad 100644
--- a/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
+++ b/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
@@ -16,7 +16,7 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/windowCatalog"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/materialCatalog"/>
</genClasses>
- <genClasses ecoreClass="buildingphysics.ecore#//WindowType">
+ <genClasses image="false" ecoreClass="buildingphysics.ecore#//WindowType">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/windowTypeId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/uValue"/>
@@ -30,23 +30,23 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalCarbon"/>
<genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalDescription"/>
</genClasses>
- <genClasses ecoreClass="buildingphysics.ecore#//Catalog">
+ <genClasses image="false" ecoreClass="buildingphysics.ecore#//Catalog">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/name"/>
<genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/description"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/source"/>
</genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//WindowCatalog">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//WindowCatalog/windowTypes"/>
+ <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//WindowCatalog/windowTypes"/>
</genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//MaterialCatalog">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/materialCategories"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
+ <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/materialCategories"/>
+ <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
</genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//MaterialCategory">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCategory/materials"/>
+ <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCategory/materials"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//MaterialCategory/name"/>
</genClasses>
- <genClasses ecoreClass="buildingphysics.ecore#//Material">
+ <genClasses image="false" ecoreClass="buildingphysics.ecore#//Material">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/materialId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/density"/>
@@ -61,14 +61,14 @@
</genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//ConstructionCategory">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//ConstructionCategory/name"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//ConstructionCategory/mountings"/>
+ <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//ConstructionCategory/mountings"/>
</genClasses>
- <genClasses ecoreClass="buildingphysics.ecore#//Mounting">
+ <genClasses image="false" ecoreClass="buildingphysics.ecore#//Mounting">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Mounting/mountingId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Mounting/name"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Mounting/layers"/>
</genClasses>
- <genClasses ecoreClass="buildingphysics.ecore#//Layer">
+ <genClasses image="false" ecoreClass="buildingphysics.ecore#//Layer">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Layer/material"
suppressedGetVisibility="false" suppressedSetVisibility="false"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Layer/thickness"/>