Camel case names for model files genmodel prefix

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/EnergyComponent.java

@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link demo.catalog.democatalog.EnergyComponent#getProducedBy <em>Produced By</em>}</li>
  * </ul>
  *
- * @see demo.catalog.democatalog.democatalogPackage#getEnergyComponent()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getEnergyComponent()
  * @model abstract="true"
  * @generated
  */
@@ -29,7 +29,7 @@ public interface EnergyComponent extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Model Name</em>' attribute.
 	 * @see #setModelName(String)
-	 * @see demo.catalog.democatalog.democatalogPackage#getEnergyComponent_ModelName()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getEnergyComponent_ModelName()
 	 * @model required="true"
 	 * @generated
 	 */
@@ -51,7 +51,7 @@ public interface EnergyComponent extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Revision Year</em>' attribute.
 	 * @see #setRevisionYear(int)
-	 * @see demo.catalog.democatalog.democatalogPackage#getEnergyComponent_RevisionYear()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getEnergyComponent_RevisionYear()
 	 * @model
 	 * @generated
 	 */
@@ -73,7 +73,7 @@ public interface EnergyComponent extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Produced By</em>' reference.
 	 * @see #setProducedBy(Manufacturer)
-	 * @see demo.catalog.democatalog.democatalogPackage#getEnergyComponent_ProducedBy()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getEnergyComponent_ProducedBy()
 	 * @model required="true"
 	 * @generated
 	 */

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/EnergyComponentsCatalog.java

@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link demo.catalog.democatalog.EnergyComponentsCatalog#getManufacturers <em>Manufacturers</em>}</li>
  * </ul>
  *
- * @see demo.catalog.democatalog.democatalogPackage#getEnergyComponentsCatalog()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getEnergyComponentsCatalog()
  * @model
  * @generated
  */
@@ -34,7 +34,7 @@ public interface EnergyComponentsCatalog extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Author</em>' attribute.
 	 * @see #setAuthor(String)
-	 * @see demo.catalog.democatalog.democatalogPackage#getEnergyComponentsCatalog_Author()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getEnergyComponentsCatalog_Author()
 	 * @model required="true"
 	 * @generated
 	 */
@@ -56,7 +56,7 @@ public interface EnergyComponentsCatalog extends EObject {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Boilers</em>' containment reference list.
-	 * @see demo.catalog.democatalog.democatalogPackage#getEnergyComponentsCatalog_Boilers()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getEnergyComponentsCatalog_Boilers()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -68,7 +68,7 @@ public interface EnergyComponentsCatalog extends EObject {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Chps</em>' containment reference list.
-	 * @see demo.catalog.democatalog.democatalogPackage#getEnergyComponentsCatalog_Chps()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getEnergyComponentsCatalog_Chps()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -80,7 +80,7 @@ public interface EnergyComponentsCatalog extends EObject {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Solarpanels</em>' containment reference list.
-	 * @see demo.catalog.democatalog.democatalogPackage#getEnergyComponentsCatalog_Solarpanels()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getEnergyComponentsCatalog_Solarpanels()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -92,7 +92,7 @@ public interface EnergyComponentsCatalog extends EObject {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Inverters</em>' containment reference list.
-	 * @see demo.catalog.democatalog.democatalogPackage#getEnergyComponentsCatalog_Inverters()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getEnergyComponentsCatalog_Inverters()
 	 * @model containment="true"
 	 * @generated
 	 */
@@ -104,7 +104,7 @@ public interface EnergyComponentsCatalog extends EObject {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Manufacturers</em>' containment reference list.
-	 * @see demo.catalog.democatalog.democatalogPackage#getEnergyComponentsCatalog_Manufacturers()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getEnergyComponentsCatalog_Manufacturers()
 	 * @model containment="true"
 	 * @generated
 	 */

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Inverter.java

@@ -14,7 +14,7 @@ package demo.catalog.democatalog;
  *   <li>{@link demo.catalog.democatalog.Inverter#getNominalPower <em>Nominal Power</em>}</li>
  * </ul>
  *
- * @see demo.catalog.democatalog.democatalogPackage#getInverter()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getInverter()
  * @model
  * @generated
  */
@@ -25,7 +25,7 @@ public interface Inverter extends EnergyComponent {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Nominal Power</em>' attribute.
 	 * @see #setNominalPower(double)
-	 * @see demo.catalog.democatalog.democatalogPackage#getInverter_NominalPower()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getInverter_NominalPower()
 	 * @model required="true"
 	 * @generated
 	 */

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Manufacturer.java

@@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link demo.catalog.democatalog.Manufacturer#getName <em>Name</em>}</li>
  * </ul>
  *
- * @see demo.catalog.democatalog.democatalogPackage#getManufacturer()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getManufacturer()
  * @model
  * @generated
  */
@@ -27,7 +27,7 @@ public interface Manufacturer extends EObject {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
-	 * @see demo.catalog.democatalog.democatalogPackage#getManufacturer_Name()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getManufacturer_Name()
 	 * @model required="true"
 	 * @generated
 	 */

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/SolarPanel.java

@@ -14,7 +14,7 @@ package demo.catalog.democatalog;
  *   <li>{@link demo.catalog.democatalog.SolarPanel#getNominalPower <em>Nominal Power</em>}</li>
  * </ul>
  *
- * @see demo.catalog.democatalog.democatalogPackage#getSolarPanel()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getSolarPanel()
  * @model
  * @generated
  */
@@ -25,7 +25,7 @@ public interface SolarPanel extends EnergyComponent {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Nominal Power</em>' attribute.
 	 * @see #setNominalPower(double)
-	 * @see demo.catalog.democatalog.democatalogPackage#getSolarPanel_NominalPower()
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#getSolarPanel_NominalPower()
 	 * @model required="true"
 	 * @generated
 	 */

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/democatalogFactory.java

@@ -9,17 +9,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see demo.catalog.democatalog.democatalogPackage
+ * @see demo.catalog.democatalog.DemoCatalogPackage
  * @generated
  */
-public interface democatalogFactory extends EFactory {
+public interface DemoCatalogFactory extends EFactory {
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	democatalogFactory eINSTANCE = demo.catalog.democatalog.impl.democatalogFactoryImpl.init();
+	DemoCatalogFactory eINSTANCE = demo.catalog.democatalog.impl.DemoCatalogFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Energy Components Catalog</em>'.
@@ -82,6 +82,6 @@ public interface democatalogFactory extends EFactory {
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
-	democatalogPackage getdemocatalogPackage();
+	DemoCatalogPackage getDemoCatalogPackage();
 
-} //democatalogFactory
+} //DemoCatalogFactory

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/democatalogPackage.java

@@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see demo.catalog.democatalog.democatalogFactory
+ * @see demo.catalog.democatalog.DemoCatalogFactory
  * @model kind="package"
  * @generated
  */
-public interface democatalogPackage extends EPackage {
+public interface DemoCatalogPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
@@ -55,14 +55,14 @@ public interface democatalogPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	democatalogPackage eINSTANCE = demo.catalog.democatalog.impl.democatalogPackageImpl.init();
+	DemoCatalogPackage eINSTANCE = demo.catalog.democatalog.impl.DemoCatalogPackageImpl.init();
 
 	/**
 	 * The meta object id for the '{@link demo.catalog.democatalog.impl.EnergyComponentsCatalogImpl <em>Energy Components Catalog</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see demo.catalog.democatalog.impl.EnergyComponentsCatalogImpl
-	 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getEnergyComponentsCatalog()
+	 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getEnergyComponentsCatalog()
 	 * @generated
 	 */
 	int ENERGY_COMPONENTS_CATALOG = 0;
@@ -144,7 +144,7 @@ public interface democatalogPackage extends EPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see demo.catalog.democatalog.impl.EnergyComponentImpl
-	 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getEnergyComponent()
+	 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getEnergyComponent()
 	 * @generated
 	 */
 	int ENERGY_COMPONENT = 7;
@@ -199,7 +199,7 @@ public interface democatalogPackage extends EPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see demo.catalog.democatalog.impl.ChemicalEnergyDeviceImpl
-	 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getChemicalEnergyDevice()
+	 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getChemicalEnergyDevice()
 	 * @generated
 	 */
 	int CHEMICAL_ENERGY_DEVICE = 6;
@@ -263,7 +263,7 @@ public interface democatalogPackage extends EPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see demo.catalog.democatalog.impl.BoilerImpl
-	 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getBoiler()
+	 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getBoiler()
 	 * @generated
 	 */
 	int BOILER = 1;
@@ -336,7 +336,7 @@ public interface democatalogPackage extends EPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see demo.catalog.democatalog.impl.CombinedHeatPowerImpl
-	 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getCombinedHeatPower()
+	 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getCombinedHeatPower()
 	 * @generated
 	 */
 	int COMBINED_HEAT_POWER = 2;
@@ -409,7 +409,7 @@ public interface democatalogPackage extends EPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see demo.catalog.democatalog.impl.SolarPanelImpl
-	 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getSolarPanel()
+	 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getSolarPanel()
 	 * @generated
 	 */
 	int SOLAR_PANEL = 3;
@@ -473,7 +473,7 @@ public interface democatalogPackage extends EPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see demo.catalog.democatalog.impl.InverterImpl
-	 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getInverter()
+	 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getInverter()
 	 * @generated
 	 */
 	int INVERTER = 4;
@@ -537,7 +537,7 @@ public interface democatalogPackage extends EPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see demo.catalog.democatalog.impl.ManufacturerImpl
-	 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getManufacturer()
+	 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getManufacturer()
 	 * @generated
 	 */
 	int MANUFACTURER = 5;
@@ -574,7 +574,7 @@ public interface democatalogPackage extends EPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see demo.catalog.democatalog.BoilerType
-	 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getBoilerType()
+	 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getBoilerType()
 	 * @generated
 	 */
 	int BOILER_TYPE = 8;
@@ -841,7 +841,7 @@ public interface democatalogPackage extends EPackage {
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
-	democatalogFactory getdemocatalogFactory();
+	DemoCatalogFactory getDemoCatalogFactory();
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -862,7 +862,7 @@ public interface democatalogPackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @see demo.catalog.democatalog.impl.EnergyComponentsCatalogImpl
-		 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getEnergyComponentsCatalog()
+		 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getEnergyComponentsCatalog()
 		 * @generated
 		 */
 		EClass ENERGY_COMPONENTS_CATALOG = eINSTANCE.getEnergyComponentsCatalog();
@@ -920,7 +920,7 @@ public interface democatalogPackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @see demo.catalog.democatalog.impl.BoilerImpl
-		 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getBoiler()
+		 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getBoiler()
 		 * @generated
 		 */
 		EClass BOILER = eINSTANCE.getBoiler();
@@ -938,7 +938,7 @@ public interface democatalogPackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @see demo.catalog.democatalog.impl.CombinedHeatPowerImpl
-		 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getCombinedHeatPower()
+		 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getCombinedHeatPower()
 		 * @generated
 		 */
 		EClass COMBINED_HEAT_POWER = eINSTANCE.getCombinedHeatPower();
@@ -956,7 +956,7 @@ public interface democatalogPackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @see demo.catalog.democatalog.impl.SolarPanelImpl
-		 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getSolarPanel()
+		 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getSolarPanel()
 		 * @generated
 		 */
 		EClass SOLAR_PANEL = eINSTANCE.getSolarPanel();
@@ -974,7 +974,7 @@ public interface democatalogPackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @see demo.catalog.democatalog.impl.InverterImpl
-		 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getInverter()
+		 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getInverter()
 		 * @generated
 		 */
 		EClass INVERTER = eINSTANCE.getInverter();
@@ -992,7 +992,7 @@ public interface democatalogPackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @see demo.catalog.democatalog.impl.ManufacturerImpl
-		 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getManufacturer()
+		 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getManufacturer()
 		 * @generated
 		 */
 		EClass MANUFACTURER = eINSTANCE.getManufacturer();
@@ -1010,7 +1010,7 @@ public interface democatalogPackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @see demo.catalog.democatalog.impl.ChemicalEnergyDeviceImpl
-		 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getChemicalEnergyDevice()
+		 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getChemicalEnergyDevice()
 		 * @generated
 		 */
 		EClass CHEMICAL_ENERGY_DEVICE = eINSTANCE.getChemicalEnergyDevice();
@@ -1029,7 +1029,7 @@ public interface democatalogPackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @see demo.catalog.democatalog.impl.EnergyComponentImpl
-		 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getEnergyComponent()
+		 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getEnergyComponent()
 		 * @generated
 		 */
 		EClass ENERGY_COMPONENT = eINSTANCE.getEnergyComponent();
@@ -1063,11 +1063,11 @@ public interface democatalogPackage extends EPackage {
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 * @see demo.catalog.democatalog.BoilerType
-		 * @see demo.catalog.democatalog.impl.democatalogPackageImpl#getBoilerType()
+		 * @see demo.catalog.democatalog.impl.DemoCatalogPackageImpl#getBoilerType()
 		 * @generated
 		 */
 		EEnum BOILER_TYPE = eINSTANCE.getBoilerType();
 
 	}
 
-} //democatalogPackage
+} //DemoCatalogPackage

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/BoilerImpl.java

@@ -4,7 +4,7 @@ package demo.catalog.democatalog.impl;
 
 import demo.catalog.democatalog.Boiler;
 import demo.catalog.democatalog.BoilerType;
-import demo.catalog.democatalog.democatalogPackage;
+import demo.catalog.democatalog.DemoCatalogPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -62,7 +62,7 @@ public class BoilerImpl extends ChemicalEnergyDeviceImpl implements Boiler {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return democatalogPackage.Literals.BOILER;
+		return DemoCatalogPackage.Literals.BOILER;
 	}
 
 	/**
@@ -83,7 +83,7 @@ public class BoilerImpl extends ChemicalEnergyDeviceImpl implements Boiler {
 		BoilerType oldBoilerType = boilerType;
 		boilerType = newBoilerType == null ? BOILER_TYPE_EDEFAULT : newBoilerType;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, democatalogPackage.BOILER__BOILER_TYPE, oldBoilerType,
+			eNotify(new ENotificationImpl(this, Notification.SET, DemoCatalogPackage.BOILER__BOILER_TYPE, oldBoilerType,
 					boilerType));
 	}
 
@@ -95,7 +95,7 @@ public class BoilerImpl extends ChemicalEnergyDeviceImpl implements Boiler {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case democatalogPackage.BOILER__BOILER_TYPE:
+		case DemoCatalogPackage.BOILER__BOILER_TYPE:
 			return getBoilerType();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -109,7 +109,7 @@ public class BoilerImpl extends ChemicalEnergyDeviceImpl implements Boiler {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case democatalogPackage.BOILER__BOILER_TYPE:
+		case DemoCatalogPackage.BOILER__BOILER_TYPE:
 			setBoilerType((BoilerType) newValue);
 			return;
 		}
@@ -124,7 +124,7 @@ public class BoilerImpl extends ChemicalEnergyDeviceImpl implements Boiler {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.BOILER__BOILER_TYPE:
+		case DemoCatalogPackage.BOILER__BOILER_TYPE:
 			setBoilerType(BOILER_TYPE_EDEFAULT);
 			return;
 		}
@@ -139,7 +139,7 @@ public class BoilerImpl extends ChemicalEnergyDeviceImpl implements Boiler {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.BOILER__BOILER_TYPE:
+		case DemoCatalogPackage.BOILER__BOILER_TYPE:
 			return boilerType != BOILER_TYPE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/ChemicalEnergyDeviceImpl.java

@@ -3,7 +3,7 @@
 package demo.catalog.democatalog.impl;
 
 import demo.catalog.democatalog.ChemicalEnergyDevice;
-import demo.catalog.democatalog.democatalogPackage;
+import demo.catalog.democatalog.DemoCatalogPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -61,7 +61,7 @@ public abstract class ChemicalEnergyDeviceImpl extends EnergyComponentImpl imple
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return democatalogPackage.Literals.CHEMICAL_ENERGY_DEVICE;
+		return DemoCatalogPackage.Literals.CHEMICAL_ENERGY_DEVICE;
 	}
 
 	/**
@@ -83,7 +83,7 @@ public abstract class ChemicalEnergyDeviceImpl extends EnergyComponentImpl imple
 		installedThermalPower = newInstalledThermalPower;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-					democatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER, oldInstalledThermalPower,
+					DemoCatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER, oldInstalledThermalPower,
 					installedThermalPower));
 	}
 
@@ -95,7 +95,7 @@ public abstract class ChemicalEnergyDeviceImpl extends EnergyComponentImpl imple
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case democatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
+		case DemoCatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
 			return getInstalledThermalPower();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -109,7 +109,7 @@ public abstract class ChemicalEnergyDeviceImpl extends EnergyComponentImpl imple
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case democatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
+		case DemoCatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
 			setInstalledThermalPower((Double) newValue);
 			return;
 		}
@@ -124,7 +124,7 @@ public abstract class ChemicalEnergyDeviceImpl extends EnergyComponentImpl imple
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
+		case DemoCatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
 			setInstalledThermalPower(INSTALLED_THERMAL_POWER_EDEFAULT);
 			return;
 		}
@@ -139,7 +139,7 @@ public abstract class ChemicalEnergyDeviceImpl extends EnergyComponentImpl imple
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
+		case DemoCatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
 			return installedThermalPower != INSTALLED_THERMAL_POWER_EDEFAULT;
 		}
 		return super.eIsSet(featureID);

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/CombinedHeatPowerImpl.java

@@ -3,7 +3,7 @@
 package demo.catalog.democatalog.impl;
 
 import demo.catalog.democatalog.CombinedHeatPower;
-import demo.catalog.democatalog.democatalogPackage;
+import demo.catalog.democatalog.DemoCatalogPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -61,7 +61,7 @@ public class CombinedHeatPowerImpl extends ChemicalEnergyDeviceImpl implements C
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return democatalogPackage.Literals.COMBINED_HEAT_POWER;
+		return DemoCatalogPackage.Literals.COMBINED_HEAT_POWER;
 	}
 
 	/**
@@ -83,7 +83,7 @@ public class CombinedHeatPowerImpl extends ChemicalEnergyDeviceImpl implements C
 		thermalEfficiency = newThermalEfficiency;
 		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET,
-					democatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY, oldThermalEfficiency,
+					DemoCatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY, oldThermalEfficiency,
 					thermalEfficiency));
 	}
 
@@ -95,7 +95,7 @@ public class CombinedHeatPowerImpl extends ChemicalEnergyDeviceImpl implements C
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case democatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
+		case DemoCatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
 			return getThermalEfficiency();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -109,7 +109,7 @@ public class CombinedHeatPowerImpl extends ChemicalEnergyDeviceImpl implements C
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case democatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
+		case DemoCatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
 			setThermalEfficiency((Double) newValue);
 			return;
 		}
@@ -124,7 +124,7 @@ public class CombinedHeatPowerImpl extends ChemicalEnergyDeviceImpl implements C
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
+		case DemoCatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
 			setThermalEfficiency(THERMAL_EFFICIENCY_EDEFAULT);
 			return;
 		}
@@ -139,7 +139,7 @@ public class CombinedHeatPowerImpl extends ChemicalEnergyDeviceImpl implements C
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
+		case DemoCatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
 			return thermalEfficiency != THERMAL_EFFICIENCY_EDEFAULT;
 		}
 		return super.eIsSet(featureID);

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/EnergyComponentImpl.java

@@ -2,9 +2,9 @@
  */
 package demo.catalog.democatalog.impl;
 
+import demo.catalog.democatalog.DemoCatalogPackage;
 import demo.catalog.democatalog.EnergyComponent;
 import demo.catalog.democatalog.Manufacturer;
-import demo.catalog.democatalog.democatalogPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -96,7 +96,7 @@ public abstract class EnergyComponentImpl extends MinimalEObjectImpl.Container i
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return democatalogPackage.Literals.ENERGY_COMPONENT;
+		return DemoCatalogPackage.Literals.ENERGY_COMPONENT;
 	}
 
 	/**
@@ -117,7 +117,7 @@ public abstract class EnergyComponentImpl extends MinimalEObjectImpl.Container i
 		String oldModelName = modelName;
 		modelName = newModelName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, democatalogPackage.ENERGY_COMPONENT__MODEL_NAME,
+			eNotify(new ENotificationImpl(this, Notification.SET, DemoCatalogPackage.ENERGY_COMPONENT__MODEL_NAME,
 					oldModelName, modelName));
 	}
 
@@ -139,7 +139,7 @@ public abstract class EnergyComponentImpl extends MinimalEObjectImpl.Container i
 		int oldRevisionYear = revisionYear;
 		revisionYear = newRevisionYear;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, democatalogPackage.ENERGY_COMPONENT__REVISION_YEAR,
+			eNotify(new ENotificationImpl(this, Notification.SET, DemoCatalogPackage.ENERGY_COMPONENT__REVISION_YEAR,
 					oldRevisionYear, revisionYear));
 	}
 
@@ -155,7 +155,7 @@ public abstract class EnergyComponentImpl extends MinimalEObjectImpl.Container i
 			if (producedBy != oldProducedBy) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							democatalogPackage.ENERGY_COMPONENT__PRODUCED_BY, oldProducedBy, producedBy));
+							DemoCatalogPackage.ENERGY_COMPONENT__PRODUCED_BY, oldProducedBy, producedBy));
 			}
 		}
 		return producedBy;
@@ -179,7 +179,7 @@ public abstract class EnergyComponentImpl extends MinimalEObjectImpl.Container i
 		Manufacturer oldProducedBy = producedBy;
 		producedBy = newProducedBy;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, democatalogPackage.ENERGY_COMPONENT__PRODUCED_BY,
+			eNotify(new ENotificationImpl(this, Notification.SET, DemoCatalogPackage.ENERGY_COMPONENT__PRODUCED_BY,
 					oldProducedBy, producedBy));
 	}
 
@@ -191,11 +191,11 @@ public abstract class EnergyComponentImpl extends MinimalEObjectImpl.Container i
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case democatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
+		case DemoCatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
 			return getModelName();
-		case democatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
+		case DemoCatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
 			return getRevisionYear();
-		case democatalogPackage.ENERGY_COMPONENT__PRODUCED_BY:
+		case DemoCatalogPackage.ENERGY_COMPONENT__PRODUCED_BY:
 			if (resolve)
 				return getProducedBy();
 			return basicGetProducedBy();
@@ -211,13 +211,13 @@ public abstract class EnergyComponentImpl extends MinimalEObjectImpl.Container i
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case democatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
+		case DemoCatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
 			setModelName((String) newValue);
 			return;
-		case democatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
+		case DemoCatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
 			setRevisionYear((Integer) newValue);
 			return;
-		case democatalogPackage.ENERGY_COMPONENT__PRODUCED_BY:
+		case DemoCatalogPackage.ENERGY_COMPONENT__PRODUCED_BY:
 			setProducedBy((Manufacturer) newValue);
 			return;
 		}
@@ -232,13 +232,13 @@ public abstract class EnergyComponentImpl extends MinimalEObjectImpl.Container i
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
+		case DemoCatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
 			setModelName(MODEL_NAME_EDEFAULT);
 			return;
-		case democatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
+		case DemoCatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
 			setRevisionYear(REVISION_YEAR_EDEFAULT);
 			return;
-		case democatalogPackage.ENERGY_COMPONENT__PRODUCED_BY:
+		case DemoCatalogPackage.ENERGY_COMPONENT__PRODUCED_BY:
 			setProducedBy((Manufacturer) null);
 			return;
 		}
@@ -253,11 +253,11 @@ public abstract class EnergyComponentImpl extends MinimalEObjectImpl.Container i
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
+		case DemoCatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
 			return MODEL_NAME_EDEFAULT == null ? modelName != null : !MODEL_NAME_EDEFAULT.equals(modelName);
-		case democatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
+		case DemoCatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
 			return revisionYear != REVISION_YEAR_EDEFAULT;
-		case democatalogPackage.ENERGY_COMPONENT__PRODUCED_BY:
+		case DemoCatalogPackage.ENERGY_COMPONENT__PRODUCED_BY:
 			return producedBy != null;
 		}
 		return super.eIsSet(featureID);

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/EnergyComponentsCatalogImpl.java

@@ -4,11 +4,11 @@ package demo.catalog.democatalog.impl;
 
 import demo.catalog.democatalog.Boiler;
 import demo.catalog.democatalog.CombinedHeatPower;
+import demo.catalog.democatalog.DemoCatalogPackage;
 import demo.catalog.democatalog.EnergyComponentsCatalog;
 import demo.catalog.democatalog.Inverter;
 import demo.catalog.democatalog.Manufacturer;
 import demo.catalog.democatalog.SolarPanel;
-import demo.catalog.democatalog.democatalogPackage;
 
 import java.util.Collection;
 
@@ -131,7 +131,7 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG;
+		return DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG;
 	}
 
 	/**
@@ -152,7 +152,7 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 		String oldAuthor = author;
 		author = newAuthor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, democatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR,
+			eNotify(new ENotificationImpl(this, Notification.SET, DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR,
 					oldAuthor, author));
 	}
 
@@ -164,7 +164,7 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 	public EList<Boiler> getBoilers() {
 		if (boilers == null) {
 			boilers = new EObjectContainmentEList<Boiler>(Boiler.class, this,
-					democatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS);
+					DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS);
 		}
 		return boilers;
 	}
@@ -177,7 +177,7 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 	public EList<CombinedHeatPower> getChps() {
 		if (chps == null) {
 			chps = new EObjectContainmentEList<CombinedHeatPower>(CombinedHeatPower.class, this,
-					democatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS);
+					DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS);
 		}
 		return chps;
 	}
@@ -190,7 +190,7 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 	public EList<SolarPanel> getSolarpanels() {
 		if (solarpanels == null) {
 			solarpanels = new EObjectContainmentEList<SolarPanel>(SolarPanel.class, this,
-					democatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS);
+					DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS);
 		}
 		return solarpanels;
 	}
@@ -203,7 +203,7 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 	public EList<Inverter> getInverters() {
 		if (inverters == null) {
 			inverters = new EObjectContainmentEList<Inverter>(Inverter.class, this,
-					democatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS);
+					DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS);
 		}
 		return inverters;
 	}
@@ -216,7 +216,7 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 	public EList<Manufacturer> getManufacturers() {
 		if (manufacturers == null) {
 			manufacturers = new EObjectContainmentEList<Manufacturer>(Manufacturer.class, this,
-					democatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS);
+					DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS);
 		}
 		return manufacturers;
 	}
@@ -229,15 +229,15 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
 			return ((InternalEList<?>) getBoilers()).basicRemove(otherEnd, msgs);
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
 			return ((InternalEList<?>) getChps()).basicRemove(otherEnd, msgs);
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
 			return ((InternalEList<?>) getSolarpanels()).basicRemove(otherEnd, msgs);
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
 			return ((InternalEList<?>) getInverters()).basicRemove(otherEnd, msgs);
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
 			return ((InternalEList<?>) getManufacturers()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -251,17 +251,17 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
 			return getAuthor();
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
 			return getBoilers();
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
 			return getChps();
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
 			return getSolarpanels();
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
 			return getInverters();
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
 			return getManufacturers();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -276,26 +276,26 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
 			setAuthor((String) newValue);
 			return;
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
 			getBoilers().clear();
 			getBoilers().addAll((Collection<? extends Boiler>) newValue);
 			return;
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
 			getChps().clear();
 			getChps().addAll((Collection<? extends CombinedHeatPower>) newValue);
 			return;
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
 			getSolarpanels().clear();
 			getSolarpanels().addAll((Collection<? extends SolarPanel>) newValue);
 			return;
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
 			getInverters().clear();
 			getInverters().addAll((Collection<? extends Inverter>) newValue);
 			return;
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
 			getManufacturers().clear();
 			getManufacturers().addAll((Collection<? extends Manufacturer>) newValue);
 			return;
@@ -311,22 +311,22 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
 			setAuthor(AUTHOR_EDEFAULT);
 			return;
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
 			getBoilers().clear();
 			return;
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
 			getChps().clear();
 			return;
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
 			getSolarpanels().clear();
 			return;
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
 			getInverters().clear();
 			return;
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
 			getManufacturers().clear();
 			return;
 		}
@@ -341,17 +341,17 @@ public class EnergyComponentsCatalogImpl extends MinimalEObjectImpl.Container im
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
 			return AUTHOR_EDEFAULT == null ? author != null : !AUTHOR_EDEFAULT.equals(author);
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
 			return boilers != null && !boilers.isEmpty();
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
 			return chps != null && !chps.isEmpty();
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
 			return solarpanels != null && !solarpanels.isEmpty();
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
 			return inverters != null && !inverters.isEmpty();
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
 			return manufacturers != null && !manufacturers.isEmpty();
 		}
 		return super.eIsSet(featureID);

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/InverterImpl.java

@@ -2,8 +2,8 @@
  */
 package demo.catalog.democatalog.impl;
 
+import demo.catalog.democatalog.DemoCatalogPackage;
 import demo.catalog.democatalog.Inverter;
-import demo.catalog.democatalog.democatalogPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -61,7 +61,7 @@ public class InverterImpl extends EnergyComponentImpl implements Inverter {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return democatalogPackage.Literals.INVERTER;
+		return DemoCatalogPackage.Literals.INVERTER;
 	}
 
 	/**
@@ -82,7 +82,7 @@ public class InverterImpl extends EnergyComponentImpl implements Inverter {
 		double oldNominalPower = nominalPower;
 		nominalPower = newNominalPower;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, democatalogPackage.INVERTER__NOMINAL_POWER,
+			eNotify(new ENotificationImpl(this, Notification.SET, DemoCatalogPackage.INVERTER__NOMINAL_POWER,
 					oldNominalPower, nominalPower));
 	}
 
@@ -94,7 +94,7 @@ public class InverterImpl extends EnergyComponentImpl implements Inverter {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case democatalogPackage.INVERTER__NOMINAL_POWER:
+		case DemoCatalogPackage.INVERTER__NOMINAL_POWER:
 			return getNominalPower();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -108,7 +108,7 @@ public class InverterImpl extends EnergyComponentImpl implements Inverter {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case democatalogPackage.INVERTER__NOMINAL_POWER:
+		case DemoCatalogPackage.INVERTER__NOMINAL_POWER:
 			setNominalPower((Double) newValue);
 			return;
 		}
@@ -123,7 +123,7 @@ public class InverterImpl extends EnergyComponentImpl implements Inverter {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.INVERTER__NOMINAL_POWER:
+		case DemoCatalogPackage.INVERTER__NOMINAL_POWER:
 			setNominalPower(NOMINAL_POWER_EDEFAULT);
 			return;
 		}
@@ -138,7 +138,7 @@ public class InverterImpl extends EnergyComponentImpl implements Inverter {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.INVERTER__NOMINAL_POWER:
+		case DemoCatalogPackage.INVERTER__NOMINAL_POWER:
 			return nominalPower != NOMINAL_POWER_EDEFAULT;
 		}
 		return super.eIsSet(featureID);

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/ManufacturerImpl.java

@@ -2,8 +2,8 @@
  */
 package demo.catalog.democatalog.impl;
 
+import demo.catalog.democatalog.DemoCatalogPackage;
 import demo.catalog.democatalog.Manufacturer;
-import demo.catalog.democatalog.democatalogPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -62,7 +62,7 @@ public class ManufacturerImpl extends MinimalEObjectImpl.Container implements Ma
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return democatalogPackage.Literals.MANUFACTURER;
+		return DemoCatalogPackage.Literals.MANUFACTURER;
 	}
 
 	/**
@@ -83,7 +83,7 @@ public class ManufacturerImpl extends MinimalEObjectImpl.Container implements Ma
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, democatalogPackage.MANUFACTURER__NAME, oldName,
+			eNotify(new ENotificationImpl(this, Notification.SET, DemoCatalogPackage.MANUFACTURER__NAME, oldName,
 					name));
 	}
 
@@ -95,7 +95,7 @@ public class ManufacturerImpl extends MinimalEObjectImpl.Container implements Ma
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case democatalogPackage.MANUFACTURER__NAME:
+		case DemoCatalogPackage.MANUFACTURER__NAME:
 			return getName();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -109,7 +109,7 @@ public class ManufacturerImpl extends MinimalEObjectImpl.Container implements Ma
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case democatalogPackage.MANUFACTURER__NAME:
+		case DemoCatalogPackage.MANUFACTURER__NAME:
 			setName((String) newValue);
 			return;
 		}
@@ -124,7 +124,7 @@ public class ManufacturerImpl extends MinimalEObjectImpl.Container implements Ma
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.MANUFACTURER__NAME:
+		case DemoCatalogPackage.MANUFACTURER__NAME:
 			setName(NAME_EDEFAULT);
 			return;
 		}
@@ -139,7 +139,7 @@ public class ManufacturerImpl extends MinimalEObjectImpl.Container implements Ma
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.MANUFACTURER__NAME:
+		case DemoCatalogPackage.MANUFACTURER__NAME:
 			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		}
 		return super.eIsSet(featureID);

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/SolarPanelImpl.java

@@ -2,8 +2,8 @@
  */
 package demo.catalog.democatalog.impl;
 
+import demo.catalog.democatalog.DemoCatalogPackage;
 import demo.catalog.democatalog.SolarPanel;
-import demo.catalog.democatalog.democatalogPackage;
 
 import org.eclipse.emf.common.notify.Notification;
 
@@ -61,7 +61,7 @@ public class SolarPanelImpl extends EnergyComponentImpl implements SolarPanel {
 	 */
 	@Override
 	protected EClass eStaticClass() {
-		return democatalogPackage.Literals.SOLAR_PANEL;
+		return DemoCatalogPackage.Literals.SOLAR_PANEL;
 	}
 
 	/**
@@ -82,7 +82,7 @@ public class SolarPanelImpl extends EnergyComponentImpl implements SolarPanel {
 		double oldNominalPower = nominalPower;
 		nominalPower = newNominalPower;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, democatalogPackage.SOLAR_PANEL__NOMINAL_POWER,
+			eNotify(new ENotificationImpl(this, Notification.SET, DemoCatalogPackage.SOLAR_PANEL__NOMINAL_POWER,
 					oldNominalPower, nominalPower));
 	}
 
@@ -94,7 +94,7 @@ public class SolarPanelImpl extends EnergyComponentImpl implements SolarPanel {
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case democatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
+		case DemoCatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
 			return getNominalPower();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -108,7 +108,7 @@ public class SolarPanelImpl extends EnergyComponentImpl implements SolarPanel {
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case democatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
+		case DemoCatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
 			setNominalPower((Double) newValue);
 			return;
 		}
@@ -123,7 +123,7 @@ public class SolarPanelImpl extends EnergyComponentImpl implements SolarPanel {
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
+		case DemoCatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
 			setNominalPower(NOMINAL_POWER_EDEFAULT);
 			return;
 		}
@@ -138,7 +138,7 @@ public class SolarPanelImpl extends EnergyComponentImpl implements SolarPanel {
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case democatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
+		case DemoCatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
 			return nominalPower != NOMINAL_POWER_EDEFAULT;
 		}
 		return super.eIsSet(featureID);

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/democatalogFactoryImpl.java

@@ -19,24 +19,24 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
  * <!-- end-user-doc -->
  * @generated
  */
-public class democatalogFactoryImpl extends EFactoryImpl implements democatalogFactory {
+public class DemoCatalogFactoryImpl extends EFactoryImpl implements DemoCatalogFactory {
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static democatalogFactory init() {
+	public static DemoCatalogFactory init() {
 		try {
-			democatalogFactory thedemocatalogFactory = (democatalogFactory) EPackage.Registry.INSTANCE
-					.getEFactory(democatalogPackage.eNS_URI);
-			if (thedemocatalogFactory != null) {
-				return thedemocatalogFactory;
+			DemoCatalogFactory theDemoCatalogFactory = (DemoCatalogFactory) EPackage.Registry.INSTANCE
+					.getEFactory(DemoCatalogPackage.eNS_URI);
+			if (theDemoCatalogFactory != null) {
+				return theDemoCatalogFactory;
 			}
 		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
-		return new democatalogFactoryImpl();
+		return new DemoCatalogFactoryImpl();
 	}
 
 	/**
@@ -45,7 +45,7 @@ public class democatalogFactoryImpl extends EFactoryImpl implements democatalogF
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public democatalogFactoryImpl() {
+	public DemoCatalogFactoryImpl() {
 		super();
 	}
 
@@ -57,17 +57,17 @@ public class democatalogFactoryImpl extends EFactoryImpl implements democatalogF
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG:
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG:
 			return createEnergyComponentsCatalog();
-		case democatalogPackage.BOILER:
+		case DemoCatalogPackage.BOILER:
 			return createBoiler();
-		case democatalogPackage.COMBINED_HEAT_POWER:
+		case DemoCatalogPackage.COMBINED_HEAT_POWER:
 			return createCombinedHeatPower();
-		case democatalogPackage.SOLAR_PANEL:
+		case DemoCatalogPackage.SOLAR_PANEL:
 			return createSolarPanel();
-		case democatalogPackage.INVERTER:
+		case DemoCatalogPackage.INVERTER:
 			return createInverter();
-		case democatalogPackage.MANUFACTURER:
+		case DemoCatalogPackage.MANUFACTURER:
 			return createManufacturer();
 		default:
 			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
@@ -82,7 +82,7 @@ public class democatalogFactoryImpl extends EFactoryImpl implements democatalogF
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-		case democatalogPackage.BOILER_TYPE:
+		case DemoCatalogPackage.BOILER_TYPE:
 			return createBoilerTypeFromString(eDataType, initialValue);
 		default:
 			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
@@ -97,7 +97,7 @@ public class democatalogFactoryImpl extends EFactoryImpl implements democatalogF
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
-		case democatalogPackage.BOILER_TYPE:
+		case DemoCatalogPackage.BOILER_TYPE:
 			return convertBoilerTypeToString(eDataType, instanceValue);
 		default:
 			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
@@ -191,8 +191,8 @@ public class democatalogFactoryImpl extends EFactoryImpl implements democatalogF
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public democatalogPackage getdemocatalogPackage() {
-		return (democatalogPackage) getEPackage();
+	public DemoCatalogPackage getDemoCatalogPackage() {
+		return (DemoCatalogPackage) getEPackage();
 	}
 
 	/**
@@ -202,8 +202,8 @@ public class democatalogFactoryImpl extends EFactoryImpl implements democatalogF
 	 * @generated
 	 */
 	@Deprecated
-	public static democatalogPackage getPackage() {
-		return democatalogPackage.eINSTANCE;
+	public static DemoCatalogPackage getPackage() {
+		return DemoCatalogPackage.eINSTANCE;
 	}
 
-} //democatalogFactoryImpl
+} //DemoCatalogFactoryImpl

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/democatalogPackageImpl.java

@@ -6,13 +6,13 @@ import demo.catalog.democatalog.Boiler;
 import demo.catalog.democatalog.BoilerType;
 import demo.catalog.democatalog.ChemicalEnergyDevice;
 import demo.catalog.democatalog.CombinedHeatPower;
+import demo.catalog.democatalog.DemoCatalogFactory;
+import demo.catalog.democatalog.DemoCatalogPackage;
 import demo.catalog.democatalog.EnergyComponent;
 import demo.catalog.democatalog.EnergyComponentsCatalog;
 import demo.catalog.democatalog.Inverter;
 import demo.catalog.democatalog.Manufacturer;
 import demo.catalog.democatalog.SolarPanel;
-import demo.catalog.democatalog.democatalogFactory;
-import demo.catalog.democatalog.democatalogPackage;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
  * <!-- end-user-doc -->
  * @generated
  */
-public class democatalogPackageImpl extends EPackageImpl implements democatalogPackage {
+public class DemoCatalogPackageImpl extends EPackageImpl implements DemoCatalogPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -103,12 +103,12 @@ public class democatalogPackageImpl extends EPackageImpl implements democatalogP
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see demo.catalog.democatalog.democatalogPackage#eNS_URI
+	 * @see demo.catalog.democatalog.DemoCatalogPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
-	private democatalogPackageImpl() {
-		super(eNS_URI, democatalogFactory.eINSTANCE);
+	private DemoCatalogPackageImpl() {
+		super(eNS_URI, DemoCatalogFactory.eINSTANCE);
 	}
 
 	/**
@@ -121,7 +121,7 @@ public class democatalogPackageImpl extends EPackageImpl implements democatalogP
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 *
-	 * <p>This method is used to initialize {@link democatalogPackage#eINSTANCE} when that field is accessed.
+	 * <p>This method is used to initialize {@link DemoCatalogPackage#eINSTANCE} when that field is accessed.
 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -130,30 +130,30 @@ public class democatalogPackageImpl extends EPackageImpl implements democatalogP
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
-	public static democatalogPackage init() {
+	public static DemoCatalogPackage init() {
 		if (isInited)
-			return (democatalogPackage) EPackage.Registry.INSTANCE.getEPackage(democatalogPackage.eNS_URI);
+			return (DemoCatalogPackage) EPackage.Registry.INSTANCE.getEPackage(DemoCatalogPackage.eNS_URI);
 
 		// Obtain or create and register package
-		Object registereddemocatalogPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
-		democatalogPackageImpl thedemocatalogPackage = registereddemocatalogPackage instanceof democatalogPackageImpl
-				? (democatalogPackageImpl) registereddemocatalogPackage
-				: new democatalogPackageImpl();
+		Object registeredDemoCatalogPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+		DemoCatalogPackageImpl theDemoCatalogPackage = registeredDemoCatalogPackage instanceof DemoCatalogPackageImpl
+				? (DemoCatalogPackageImpl) registeredDemoCatalogPackage
+				: new DemoCatalogPackageImpl();
 
 		isInited = true;
 
 		// Create package meta-data objects
-		thedemocatalogPackage.createPackageContents();
+		theDemoCatalogPackage.createPackageContents();
 
 		// Initialize created meta-data
-		thedemocatalogPackage.initializePackageContents();
+		theDemoCatalogPackage.initializePackageContents();
 
 		// Mark meta-data to indicate it can't be changed
-		thedemocatalogPackage.freeze();
+		theDemoCatalogPackage.freeze();
 
 		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(democatalogPackage.eNS_URI, thedemocatalogPackage);
-		return thedemocatalogPackage;
+		EPackage.Registry.INSTANCE.put(DemoCatalogPackage.eNS_URI, theDemoCatalogPackage);
+		return theDemoCatalogPackage;
 	}
 
 	/**
@@ -377,8 +377,8 @@ public class democatalogPackageImpl extends EPackageImpl implements democatalogP
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public democatalogFactory getdemocatalogFactory() {
-		return (democatalogFactory) getEFactoryInstance();
+	public DemoCatalogFactory getDemoCatalogFactory() {
+		return (DemoCatalogFactory) getEFactoryInstance();
 	}
 
 	/**
@@ -547,4 +547,4 @@ public class democatalogPackageImpl extends EPackageImpl implements democatalogP
 		createResource(eNS_URI);
 	}
 
-} //democatalogPackageImpl
+} //DemoCatalogPackageImpl

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/util/democatalogAdapterFactory.java

@@ -16,17 +16,17 @@ import org.eclipse.emf.ecore.EObject;
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see demo.catalog.democatalog.democatalogPackage
+ * @see demo.catalog.democatalog.DemoCatalogPackage
  * @generated
  */
-public class democatalogAdapterFactory extends AdapterFactoryImpl {
+public class DemoCatalogAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static democatalogPackage modelPackage;
+	protected static DemoCatalogPackage modelPackage;
 
 	/**
 	 * Creates an instance of the adapter factory.
@@ -34,9 +34,9 @@ public class democatalogAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public democatalogAdapterFactory() {
+	public DemoCatalogAdapterFactory() {
 		if (modelPackage == null) {
-			modelPackage = democatalogPackage.eINSTANCE;
+			modelPackage = DemoCatalogPackage.eINSTANCE;
 		}
 	}
 
@@ -65,7 +65,7 @@ public class democatalogAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected democatalogSwitch<Adapter> modelSwitch = new democatalogSwitch<Adapter>() {
+	protected DemoCatalogSwitch<Adapter> modelSwitch = new DemoCatalogSwitch<Adapter>() {
 		@Override
 		public Adapter caseEnergyComponentsCatalog(EnergyComponentsCatalog object) {
 			return createEnergyComponentsCatalogAdapter();
@@ -249,4 +249,4 @@ public class democatalogAdapterFactory extends AdapterFactoryImpl {
 		return null;
 	}
 
-} //democatalogAdapterFactory
+} //DemoCatalogAdapterFactory

EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/util/democatalogSwitch.java

@@ -19,17 +19,17 @@ import org.eclipse.emf.ecore.util.Switch;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see demo.catalog.democatalog.democatalogPackage
+ * @see demo.catalog.democatalog.DemoCatalogPackage
  * @generated
  */
-public class democatalogSwitch<T> extends Switch<T> {
+public class DemoCatalogSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected static democatalogPackage modelPackage;
+	protected static DemoCatalogPackage modelPackage;
 
 	/**
 	 * Creates an instance of the switch.
@@ -37,9 +37,9 @@ public class democatalogSwitch<T> extends Switch<T> {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public democatalogSwitch() {
+	public DemoCatalogSwitch() {
 		if (modelPackage == null) {
-			modelPackage = democatalogPackage.eINSTANCE;
+			modelPackage = DemoCatalogPackage.eINSTANCE;
 		}
 	}
 
@@ -66,14 +66,14 @@ public class democatalogSwitch<T> extends Switch<T> {
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-		case democatalogPackage.ENERGY_COMPONENTS_CATALOG: {
+		case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG: {
 			EnergyComponentsCatalog energyComponentsCatalog = (EnergyComponentsCatalog) theEObject;
 			T result = caseEnergyComponentsCatalog(energyComponentsCatalog);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case democatalogPackage.BOILER: {
+		case DemoCatalogPackage.BOILER: {
 			Boiler boiler = (Boiler) theEObject;
 			T result = caseBoiler(boiler);
 			if (result == null)
@@ -84,7 +84,7 @@ public class democatalogSwitch<T> extends Switch<T> {
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case democatalogPackage.COMBINED_HEAT_POWER: {
+		case DemoCatalogPackage.COMBINED_HEAT_POWER: {
 			CombinedHeatPower combinedHeatPower = (CombinedHeatPower) theEObject;
 			T result = caseCombinedHeatPower(combinedHeatPower);
 			if (result == null)
@@ -95,7 +95,7 @@ public class democatalogSwitch<T> extends Switch<T> {
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case democatalogPackage.SOLAR_PANEL: {
+		case DemoCatalogPackage.SOLAR_PANEL: {
 			SolarPanel solarPanel = (SolarPanel) theEObject;
 			T result = caseSolarPanel(solarPanel);
 			if (result == null)
@@ -104,7 +104,7 @@ public class democatalogSwitch<T> extends Switch<T> {
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case democatalogPackage.INVERTER: {
+		case DemoCatalogPackage.INVERTER: {
 			Inverter inverter = (Inverter) theEObject;
 			T result = caseInverter(inverter);
 			if (result == null)
@@ -113,14 +113,14 @@ public class democatalogSwitch<T> extends Switch<T> {
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case democatalogPackage.MANUFACTURER: {
+		case DemoCatalogPackage.MANUFACTURER: {
 			Manufacturer manufacturer = (Manufacturer) theEObject;
 			T result = caseManufacturer(manufacturer);
 			if (result == null)
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case democatalogPackage.CHEMICAL_ENERGY_DEVICE: {
+		case DemoCatalogPackage.CHEMICAL_ENERGY_DEVICE: {
 			ChemicalEnergyDevice chemicalEnergyDevice = (ChemicalEnergyDevice) theEObject;
 			T result = caseChemicalEnergyDevice(chemicalEnergyDevice);
 			if (result == null)
@@ -129,7 +129,7 @@ public class democatalogSwitch<T> extends Switch<T> {
 				result = defaultCase(theEObject);
 			return result;
 		}
-		case democatalogPackage.ENERGY_COMPONENT: {
+		case DemoCatalogPackage.ENERGY_COMPONENT: {
 			EnergyComponent energyComponent = (EnergyComponent) theEObject;
 			T result = caseEnergyComponent(energyComponent);
 			if (result == null)
@@ -277,4 +277,4 @@ public class democatalogSwitch<T> extends Switch<T> {
 		return null;
 	}
 
-} //democatalogSwitch
+} //DemoCatalogSwitch