Simplify catalog hierarchy

de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Catalog.java

-/**
- */
-package de.hftstuttgart.buildingphysics;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Catalog</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link de.hftstuttgart.buildingphysics.Catalog#getName <em>Name</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.Catalog#getDescription <em>Description</em>}</li>
- *   <li>{@link de.hftstuttgart.buildingphysics.Catalog#getSource <em>Source</em>}</li>
- * </ul>
- *
- * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog()
- * @model abstract="true"
- * @generated
- */
-public interface Catalog extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog_Name()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Catalog#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Catalog#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Source</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Source</em>' attribute.
-	 * @see #setSource(String)
-	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getCatalog_Source()
-	 * @model
-	 * @generated
-	 */
-	String getSource();
-
-	/**
-	 * Sets the value of the '{@link de.hftstuttgart.buildingphysics.Catalog#getSource <em>Source</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source</em>' attribute.
-	 * @see #getSource()
-	 * @generated
-	 */
-	void setSource(String value);
-
-} // Catalog

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

@@ -60,10 +60,8 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
 			return createBuildingPhysicsCatalog();
 		case BuildingPhysicsPackage.WINDOW_TYPE:
 			return createWindowType();
-		case BuildingPhysicsPackage.WINDOW_CATALOG:
-			return createWindowCatalog();
-		case BuildingPhysicsPackage.MATERIAL_CATALOG:
-			return createMaterialCatalog();
+		case BuildingPhysicsPackage.WINDOW_CATEGORY:
+			return createWindowCategory();
 		case BuildingPhysicsPackage.MATERIAL_CATEGORY:
 			return createMaterialCategory();
 		case BuildingPhysicsPackage.MATERIAL:
@@ -107,20 +105,9 @@ public class BuildingPhysicsFactoryImpl extends EFactoryImpl implements Building
 	 * @generated
 	 */
 	@Override
-	public WindowCatalog createWindowCatalog() {
-		WindowCatalogImpl windowCatalog = new WindowCatalogImpl();
-		return windowCatalog;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public MaterialCatalog createMaterialCatalog() {
-		MaterialCatalogImpl materialCatalog = new MaterialCatalogImpl();
-		return materialCatalog;
+	public WindowCategory createWindowCategory() {
+		WindowCategoryImpl windowCategory = new WindowCategoryImpl();
+		return windowCategory;
 	}
 
 	/**