diff --git a/EclipseDemoCatalog/demo.catalog.edit/.classpath b/EclipseDemoCatalog/demo.catalog.edit/.classpath
index 8e001f780d1583ea6dde810158da647d3cc15a56..004db3fba2030fa6e0a7da16a467101b8a4f95d6 100644
--- a/EclipseDemoCatalog/demo.catalog.edit/.classpath
+++ b/EclipseDemoCatalog/demo.catalog.edit/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src-gen"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/EclipseDemoCatalog/demo.catalog.edit/plugin.xml b/EclipseDemoCatalog/demo.catalog.edit/plugin.xml
index 29d66677ca8bdeb5754dd46a713a7edbd9b677c6..c341919eb4136d0a6c32323e97f5d295d50bc7e4 100644
--- a/EclipseDemoCatalog/demo.catalog.edit/plugin.xml
+++ b/EclipseDemoCatalog/demo.catalog.edit/plugin.xml
@@ -7,10 +7,10 @@
<plugin>
<extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
- <!-- @generated democatalog -->
+ <!-- @generated DemoCatalog -->
<factory
uri="http://www.example.org/democatalog"
- class="demo.catalog.democatalog.provider.democatalogItemProviderAdapterFactory"
+ class="demo.catalog.democatalog.provider.DemoCatalogItemProviderAdapterFactory"
supportedTypes=
"org.eclipse.emf.edit.provider.IEditingDomainItemProvider
org.eclipse.emf.edit.provider.IStructuredItemContentProvider
diff --git a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/BoilerItemProvider.java b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/BoilerItemProvider.java
index d8bf2cba8d2347b08d4caef28f38f2c962badc31..b3006c9b2969e59c7ac7e058c9b4705df5def4df 100644
--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/BoilerItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/BoilerItemProvider.java
@@ -3,7 +3,7 @@
package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.Boiler;
-import demo.catalog.democatalog.democatalogPackage;
+import demo.catalog.democatalog.DemoCatalogPackage;
import java.util.Collection;
import java.util.List;
@@ -61,7 +61,7 @@ public class BoilerItemProvider extends ChemicalEnergyDeviceItemProvider {
getResourceLocator(), getString("_UI_Boiler_boilerType_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Boiler_boilerType_feature",
"_UI_Boiler_type"),
- democatalogPackage.Literals.BOILER__BOILER_TYPE, true, false, false,
+ DemoCatalogPackage.Literals.BOILER__BOILER_TYPE, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
@@ -111,7 +111,7 @@ public class BoilerItemProvider extends ChemicalEnergyDeviceItemProvider {
updateChildren(notification);
switch (notification.getFeatureID(Boiler.class)) {
- case democatalogPackage.BOILER__BOILER_TYPE:
+ case DemoCatalogPackage.BOILER__BOILER_TYPE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ChemicalEnergyDeviceItemProvider.java b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ChemicalEnergyDeviceItemProvider.java
index 5ed6974d1418145a39a6b9b257f6eef59de3f201..2dd1faec5cbf48bda74f9d52f61ada54499193e0 100644
--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ChemicalEnergyDeviceItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ChemicalEnergyDeviceItemProvider.java
@@ -3,7 +3,7 @@
package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.ChemicalEnergyDevice;
-import demo.catalog.democatalog.democatalogPackage;
+import demo.catalog.democatalog.DemoCatalogPackage;
import java.util.Collection;
import java.util.List;
@@ -61,7 +61,7 @@ public class ChemicalEnergyDeviceItemProvider extends EnergyComponentItemProvide
getString("_UI_ChemicalEnergyDevice_installedThermalPower_feature"),
getString("_UI_PropertyDescriptor_description",
"_UI_ChemicalEnergyDevice_installedThermalPower_feature", "_UI_ChemicalEnergyDevice_type"),
- democatalogPackage.Literals.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER, true, false, false,
+ DemoCatalogPackage.Literals.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER, true, false, false,
ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
@@ -100,7 +100,7 @@ public class ChemicalEnergyDeviceItemProvider extends EnergyComponentItemProvide
updateChildren(notification);
switch (notification.getFeatureID(ChemicalEnergyDevice.class)) {
- case democatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
+ case DemoCatalogPackage.CHEMICAL_ENERGY_DEVICE__INSTALLED_THERMAL_POWER:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/CombinedHeatPowerItemProvider.java b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/CombinedHeatPowerItemProvider.java
index 8e70f33c6d5221dc6ecb60be3f6d2c454f0d70f2..8aba891a7a4544c4ff9f89f44648200fb8802b45 100644
--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/CombinedHeatPowerItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/CombinedHeatPowerItemProvider.java
@@ -3,7 +3,7 @@
package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.CombinedHeatPower;
-import demo.catalog.democatalog.democatalogPackage;
+import demo.catalog.democatalog.DemoCatalogPackage;
import java.util.Collection;
import java.util.List;
@@ -61,7 +61,7 @@ public class CombinedHeatPowerItemProvider extends ChemicalEnergyDeviceItemProvi
getResourceLocator(), getString("_UI_CombinedHeatPower_thermalEfficiency_feature"),
getString("_UI_PropertyDescriptor_description",
"_UI_CombinedHeatPower_thermalEfficiency_feature", "_UI_CombinedHeatPower_type"),
- democatalogPackage.Literals.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY, true, false, false,
+ DemoCatalogPackage.Literals.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY, true, false, false,
ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
@@ -111,7 +111,7 @@ public class CombinedHeatPowerItemProvider extends ChemicalEnergyDeviceItemProvi
updateChildren(notification);
switch (notification.getFeatureID(CombinedHeatPower.class)) {
- case democatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
+ case DemoCatalogPackage.COMBINED_HEAT_POWER__THERMAL_EFFICIENCY:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentItemProvider.java b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentItemProvider.java
index 60fa9be187d9ca3e49045c40e97fa6ecb424d2c7..92fe13d28aa7c05d9e7f1f37c9578ba1ebf2b863 100644
--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentItemProvider.java
@@ -2,8 +2,8 @@
*/
package demo.catalog.democatalog.provider;
+import demo.catalog.democatalog.DemoCatalogPackage;
import demo.catalog.democatalog.EnergyComponent;
-import demo.catalog.democatalog.democatalogPackage;
import java.util.Collection;
import java.util.List;
@@ -72,7 +72,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
getResourceLocator(), getString("_UI_EnergyComponent_modelName_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_modelName_feature",
"_UI_EnergyComponent_type"),
- democatalogPackage.Literals.ENERGY_COMPONENT__MODEL_NAME, true, false, false,
+ DemoCatalogPackage.Literals.ENERGY_COMPONENT__MODEL_NAME, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
@@ -88,7 +88,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
getString("_UI_EnergyComponent_revisionYear_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_revisionYear_feature",
"_UI_EnergyComponent_type"),
- democatalogPackage.Literals.ENERGY_COMPONENT__REVISION_YEAR, true, false, false,
+ DemoCatalogPackage.Literals.ENERGY_COMPONENT__REVISION_YEAR, true, false, false,
ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
@@ -104,7 +104,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
getResourceLocator(), getString("_UI_EnergyComponent_producedBy_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_producedBy_feature",
"_UI_EnergyComponent_type"),
- democatalogPackage.Literals.ENERGY_COMPONENT__PRODUCED_BY, true, false, true, null, null,
+ DemoCatalogPackage.Literals.ENERGY_COMPONENT__PRODUCED_BY, true, false, true, null, null,
null));
}
@@ -143,8 +143,8 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
updateChildren(notification);
switch (notification.getFeatureID(EnergyComponent.class)) {
- case democatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
- case democatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
+ case DemoCatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
+ case DemoCatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentsCatalogItemProvider.java b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentsCatalogItemProvider.java
index 5b21dab88e4bf263db54a2e86edef60ba27e089a..7eb817b2463b43caa44f6f5fc034053cb57e76bc 100644
--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentsCatalogItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/EnergyComponentsCatalogItemProvider.java
@@ -2,9 +2,9 @@
*/
package demo.catalog.democatalog.provider;
+import demo.catalog.democatalog.DemoCatalogFactory;
+import demo.catalog.democatalog.DemoCatalogPackage;
import demo.catalog.democatalog.EnergyComponentsCatalog;
-import demo.catalog.democatalog.democatalogFactory;
-import demo.catalog.democatalog.democatalogPackage;
import java.util.Collection;
import java.util.List;
@@ -73,7 +73,7 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
getResourceLocator(), getString("_UI_EnergyComponentsCatalog_author_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponentsCatalog_author_feature",
"_UI_EnergyComponentsCatalog_type"),
- democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__AUTHOR, true, false, false,
+ DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__AUTHOR, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
@@ -89,11 +89,11 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) {
super.getChildrenFeatures(object);
- childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS);
- childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS);
- childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS);
- childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS);
- childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS);
+ childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS);
+ childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS);
+ childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS);
+ childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS);
+ childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS);
}
return childrenFeatures;
}
@@ -157,14 +157,14 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
updateChildren(notification);
switch (notification.getFeatureID(EnergyComponentsCatalog.class)) {
- case democatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
+ case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__AUTHOR:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case democatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
- case democatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
- case democatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
- case democatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
- case democatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
+ case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
+ case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
+ case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
+ case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
+ case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
@@ -182,21 +182,21 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS,
- democatalogFactory.eINSTANCE.createBoiler()));
+ newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS,
+ DemoCatalogFactory.eINSTANCE.createBoiler()));
- newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS,
- democatalogFactory.eINSTANCE.createCombinedHeatPower()));
+ newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS,
+ DemoCatalogFactory.eINSTANCE.createCombinedHeatPower()));
- newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS,
- democatalogFactory.eINSTANCE.createSolarPanel()));
+ newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS,
+ DemoCatalogFactory.eINSTANCE.createSolarPanel()));
- newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS,
- democatalogFactory.eINSTANCE.createInverter()));
+ newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS,
+ DemoCatalogFactory.eINSTANCE.createInverter()));
newChildDescriptors
- .add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS,
- democatalogFactory.eINSTANCE.createManufacturer()));
+ .add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS,
+ DemoCatalogFactory.eINSTANCE.createManufacturer()));
}
/**
diff --git a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/InverterItemProvider.java b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/InverterItemProvider.java
index 1029ea9755391449d29fa329c33511b7b9104a35..ad0a0123aa3940fcfd21f950b2cb74309dea7299 100644
--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/InverterItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/InverterItemProvider.java
@@ -2,8 +2,8 @@
*/
package demo.catalog.democatalog.provider;
+import demo.catalog.democatalog.DemoCatalogPackage;
import demo.catalog.democatalog.Inverter;
-import demo.catalog.democatalog.democatalogPackage;
import java.util.Collection;
import java.util.List;
@@ -61,7 +61,7 @@ public class InverterItemProvider extends EnergyComponentItemProvider {
getResourceLocator(), getString("_UI_Inverter_nominalPower_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Inverter_nominalPower_feature",
"_UI_Inverter_type"),
- democatalogPackage.Literals.INVERTER__NOMINAL_POWER, true, false, false,
+ DemoCatalogPackage.Literals.INVERTER__NOMINAL_POWER, true, false, false,
ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
@@ -111,7 +111,7 @@ public class InverterItemProvider extends EnergyComponentItemProvider {
updateChildren(notification);
switch (notification.getFeatureID(Inverter.class)) {
- case democatalogPackage.INVERTER__NOMINAL_POWER:
+ case DemoCatalogPackage.INVERTER__NOMINAL_POWER:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ManufacturerItemProvider.java b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ManufacturerItemProvider.java
index f9d11d3c923abf8e661d87ac3857520280bcf156..c8f68445a7359956545f76bfacf83c419482d456 100644
--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ManufacturerItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/ManufacturerItemProvider.java
@@ -2,8 +2,8 @@
*/
package demo.catalog.democatalog.provider;
+import demo.catalog.democatalog.DemoCatalogPackage;
import demo.catalog.democatalog.Manufacturer;
-import demo.catalog.democatalog.democatalogPackage;
import java.util.Collection;
import java.util.List;
@@ -12,6 +12,7 @@ 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.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -69,7 +70,7 @@ public class ManufacturerItemProvider extends ItemProviderAdapter implements IEd
getResourceLocator(), getString("_UI_Manufacturer_name_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Manufacturer_name_feature",
"_UI_Manufacturer_type"),
- democatalogPackage.Literals.MANUFACTURER__NAME, true, false, false,
+ DemoCatalogPackage.Literals.MANUFACTURER__NAME, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
@@ -119,7 +120,7 @@ public class ManufacturerItemProvider extends ItemProviderAdapter implements IEd
updateChildren(notification);
switch (notification.getFeatureID(Manufacturer.class)) {
- case democatalogPackage.MANUFACTURER__NAME:
+ case DemoCatalogPackage.MANUFACTURER__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/SolarPanelItemProvider.java b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/SolarPanelItemProvider.java
index bfe694360c459db5c9cd3640b80b8e79e55153ca..c15fc78cb3443daa9f2b23c12b11e4fe483549fc 100644
--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/SolarPanelItemProvider.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/SolarPanelItemProvider.java
@@ -2,8 +2,8 @@
*/
package demo.catalog.democatalog.provider;
+import demo.catalog.democatalog.DemoCatalogPackage;
import demo.catalog.democatalog.SolarPanel;
-import demo.catalog.democatalog.democatalogPackage;
import java.util.Collection;
import java.util.List;
@@ -61,7 +61,7 @@ public class SolarPanelItemProvider extends EnergyComponentItemProvider {
getResourceLocator(), getString("_UI_SolarPanel_nominalPower_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_SolarPanel_nominalPower_feature",
"_UI_SolarPanel_type"),
- democatalogPackage.Literals.SOLAR_PANEL__NOMINAL_POWER, true, false, false,
+ DemoCatalogPackage.Literals.SOLAR_PANEL__NOMINAL_POWER, true, false, false,
ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
}
@@ -111,7 +111,7 @@ public class SolarPanelItemProvider extends EnergyComponentItemProvider {
updateChildren(notification);
switch (notification.getFeatureID(SolarPanel.class)) {
- case democatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
+ case DemoCatalogPackage.SOLAR_PANEL__NOMINAL_POWER:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/democatalogItemProviderAdapterFactory.java b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/democatalogItemProviderAdapterFactory.java
index 627fa4752861d663c9526e9e3a2740427a1ce929..a8ca851e79cb7c0306a3510469f6799bb8d2f1f1 100644
--- a/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/democatalogItemProviderAdapterFactory.java
+++ b/EclipseDemoCatalog/demo.catalog.edit/src-gen/demo/catalog/democatalog/provider/democatalogItemProviderAdapterFactory.java
@@ -2,7 +2,7 @@
*/
package demo.catalog.democatalog.provider;
-import demo.catalog.democatalog.util.democatalogAdapterFactory;
+import demo.catalog.democatalog.util.DemoCatalogAdapterFactory;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,7 +32,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* <!-- end-user-doc -->
* @generated
*/
-public class democatalogItemProviderAdapterFactory extends democatalogAdapterFactory
+public class DemoCatalogItemProviderAdapterFactory extends DemoCatalogAdapterFactory
implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
@@ -64,7 +64,7 @@ public class democatalogItemProviderAdapterFactory extends democatalogAdapterFac
* <!-- end-user-doc -->
* @generated
*/
- public democatalogItemProviderAdapterFactory() {
+ public DemoCatalogItemProviderAdapterFactory() {
supportedTypes.add(IEditingDomainItemProvider.class);
supportedTypes.add(IStructuredItemContentProvider.class);
supportedTypes.add(ITreeItemContentProvider.class);
diff --git a/EclipseDemoCatalog/demo.catalog.viewmodel/viewmodels/EnergyComponentsCatalog.view b/EclipseDemoCatalog/demo.catalog.viewmodel/viewmodels/EnergyComponentsCatalog.view
index d969adfa0dd5a58e14df4f1968dc15f2694f1101..334556fcd960a9aaa04a6bfb152ff7602ab834e5 100644
--- a/EclipseDemoCatalog/demo.catalog.viewmodel/viewmodels/EnergyComponentsCatalog.view
+++ b/EclipseDemoCatalog/demo.catalog.viewmodel/viewmodels/EnergyComponentsCatalog.view
@@ -2,7 +2,7 @@
<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.categorization.model="http://org/eclipse/emf/ecp/view/categorization/model" 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="_OiObUAuqEeuYGOU2ZFiRgg" name="EnergyComponentsCatalog">
<rootEClass href="http://www.example.org/democatalog#//EnergyComponentsCatalog"/>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_OiVwEAuqEeuYGOU2ZFiRgg" name="Control author">
- <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_OiVwEQuqEeuYGOU2ZFiRgg">
+ <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_ibEMMBz8EeuZNsASxyzjLQ">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.example.org/democatalog#//EnergyComponentsCatalog/author"/>
</domainModelReference>
</children>
diff --git a/EclipseDemoCatalog/demo.catalog/model/democatalog.aird b/EclipseDemoCatalog/demo.catalog/model/DemoCatalog.aird
similarity index 93%
rename from EclipseDemoCatalog/demo.catalog/model/democatalog.aird
rename to EclipseDemoCatalog/demo.catalog/model/DemoCatalog.aird
index 484aa45d2d7bf85267a2e872166810387199d5c5..8f146d1e1f0703237e96ca750d744388aaa74ae8 100644
--- a/EclipseDemoCatalog/demo.catalog/model/democatalog.aird
+++ b/EclipseDemoCatalog/demo.catalog/model/DemoCatalog.aird
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.3/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
<viewpoint:DAnalysis uid="_SE4_MPHfEeqpzsE1UYXTlQ" selectedViews="_SGBAkPHfEeqpzsE1UYXTlQ" version="14.3.1.202003261200">
- <semanticResources>democatalog.genmodel</semanticResources>
- <semanticResources>democatalog.ecore</semanticResources>
+ <semanticResources>DemoCatalog.genmodel</semanticResources>
+ <semanticResources>DemoCatalog.ecore</semanticResources>
<ownedViews xmi:type="viewpoint:DView" uid="_SGBAkPHfEeqpzsE1UYXTlQ">
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
- <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_SGYM8PHfEeqpzsE1UYXTlQ" name="democatalog" repPath="#_SGOb8PHfEeqpzsE1UYXTlQ" changeId="c23738b8-8873-4b1c-a69c-8cf98bdb72c3">
+ <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_SGYM8PHfEeqpzsE1UYXTlQ" name="Demo Catalog Class Diagram" repPath="#_SGOb8PHfEeqpzsE1UYXTlQ" changeId="c23738b8-8873-4b1c-a69c-8cf98bdb72c3">
<description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
- <target xmi:type="ecore:EPackage" href="democatalog.ecore#/"/>
+ <target xmi:type="ecore:EPackage" href="DemoCatalog.ecore#/"/>
</ownedRepresentationDescriptors>
</ownedViews>
</viewpoint:DAnalysis>
@@ -348,8 +348,8 @@
</data>
</ownedAnnotationEntries>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_jloKUPQJEeqpzsE1UYXTlQ" name="EnergyComponentsCatalog" tooltipText="" outgoingEdges="_VvGioPgrEeqWp_4Vt6rljA _dZqak_grEeqWp_4Vt6rljA _nPGOoPgrEeqWp_4Vt6rljA _FYHQr_gsEeqWp_4Vt6rljA _J3T_5fgsEeqWp_4Vt6rljA" width="12" height="10">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//EnergyComponentsCatalog"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//EnergyComponentsCatalog"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//EnergyComponentsCatalog"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//EnergyComponentsCatalog"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -358,8 +358,8 @@
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_BtBScPUMEeqpzsE1UYXTlQ" name="author : EString" tooltipText="">
- <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponentsCatalog/author"/>
- <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponentsCatalog/author"/>
+ <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponentsCatalog/author"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponentsCatalog/author"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_OiLzjPgsEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
<labelFormat>bold</labelFormat>
</ownedStyle>
@@ -367,8 +367,8 @@
</ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_JkJeIPgqEeqWp_4Vt6rljA" name="BoilerType" tooltipText="" width="12" height="10">
- <target xmi:type="ecore:EEnum" href="democatalog.ecore#//BoilerType"/>
- <semanticElements xmi:type="ecore:EEnum" href="democatalog.ecore#//BoilerType"/>
+ <target xmi:type="ecore:EEnum" href="DemoCatalog.ecore#//BoilerType"/>
+ <semanticElements xmi:type="ecore:EEnum" href="DemoCatalog.ecore#//BoilerType"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -377,16 +377,16 @@
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_L6PLwPgqEeqWp_4Vt6rljA" name="LowTemperature" tooltipText="">
- <target xmi:type="ecore:EEnumLiteral" href="democatalog.ecore#//BoilerType/LowTemperature"/>
- <semanticElements xmi:type="ecore:EEnumLiteral" href="democatalog.ecore#//BoilerType/LowTemperature"/>
+ <target xmi:type="ecore:EEnumLiteral" href="DemoCatalog.ecore#//BoilerType/LowTemperature"/>
+ <semanticElements xmi:type="ecore:EEnumLiteral" href="DemoCatalog.ecore#//BoilerType/LowTemperature"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_L6Py0PgqEeqWp_4Vt6rljA" labelAlignment="LEFT">
<description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>
</ownedElements>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_Q7k-sPgqEeqWp_4Vt6rljA" name="Condensing" tooltipText="">
- <target xmi:type="ecore:EEnumLiteral" href="democatalog.ecore#//BoilerType/Condensing"/>
- <semanticElements xmi:type="ecore:EEnumLiteral" href="democatalog.ecore#//BoilerType/Condensing"/>
+ <target xmi:type="ecore:EEnumLiteral" href="DemoCatalog.ecore#//BoilerType/Condensing"/>
+ <semanticElements xmi:type="ecore:EEnumLiteral" href="DemoCatalog.ecore#//BoilerType/Condensing"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_Q7llwPgqEeqWp_4Vt6rljA" labelAlignment="LEFT">
<description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>
</ownedStyle>
@@ -394,8 +394,8 @@
</ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_VPPMQPgqEeqWp_4Vt6rljA" name="Boiler" tooltipText="" outgoingEdges="_eW4bUPgsEeqWp_4Vt6rljA" incomingEdges="_VvGioPgrEeqWp_4Vt6rljA" width="12" height="10">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//Boiler"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//Boiler"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Boiler"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Boiler"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -404,8 +404,8 @@
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_-D7t0fgqEeqWp_4Vt6rljA" name="boilerType : BoilerType = LowTemperature" tooltipText="">
- <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//Boiler/boilerType"/>
- <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//Boiler/boilerType"/>
+ <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Boiler/boilerType"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Boiler/boilerType"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_-D8U4fgqEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
<labelFormat>bold</labelFormat>
</ownedStyle>
@@ -413,8 +413,8 @@
</ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Vo_JAPgqEeqWp_4Vt6rljA" name="CombinedHeatPower" tooltipText="" outgoingEdges="_fu9olvgsEeqWp_4Vt6rljA" incomingEdges="_dZqak_grEeqWp_4Vt6rljA" width="12" height="10">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//CombinedHeatPower"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//CombinedHeatPower"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//CombinedHeatPower"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//CombinedHeatPower"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -423,8 +423,8 @@
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_I69hwfgrEeqWp_4Vt6rljA" name="thermalEfficiency : EDouble = 0.0" tooltipText="">
- <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
- <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
+ <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_I69hwvgrEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
<labelFormat>bold</labelFormat>
</ownedStyle>
@@ -432,8 +432,8 @@
</ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_V5wI4PgqEeqWp_4Vt6rljA" name="SolarPanel" tooltipText="" outgoingEdges="_-YCDpvgsEeqWp_4Vt6rljA" incomingEdges="_nPGOoPgrEeqWp_4Vt6rljA" width="12" height="10">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//SolarPanel"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//SolarPanel"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//SolarPanel"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//SolarPanel"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -442,8 +442,8 @@
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_zq-V8_gqEeqWp_4Vt6rljA" name="nominalPower : EDouble = 0.0" tooltipText="">
- <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//SolarPanel/nominalPower"/>
- <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//SolarPanel/nominalPower"/>
+ <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//SolarPanel/nominalPower"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//SolarPanel/nominalPower"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_OzKEM_grEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
<labelFormat>bold</labelFormat>
</ownedStyle>
@@ -451,8 +451,8 @@
</ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_WG2JsPgqEeqWp_4Vt6rljA" name="Inverter" tooltipText="" outgoingEdges="_J5vMWPgtEeqWp_4Vt6rljA" incomingEdges="_FYHQr_gsEeqWp_4Vt6rljA" width="12" height="10">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//Inverter"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//Inverter"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Inverter"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Inverter"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -461,8 +461,8 @@
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_vQWkwPgqEeqWp_4Vt6rljA" name="nominalPower : EDouble = 0.0" tooltipText="">
- <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//Inverter/nominalPower"/>
- <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//Inverter/nominalPower"/>
+ <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Inverter/nominalPower"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Inverter/nominalPower"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_QIYKs_grEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
<labelFormat>bold</labelFormat>
</ownedStyle>
@@ -470,8 +470,8 @@
</ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_X7xD8PgqEeqWp_4Vt6rljA" name="Manufacturer" tooltipText="" incomingEdges="_J3T_5fgsEeqWp_4Vt6rljA _Xn1T8PgtEeqWp_4Vt6rljA" width="12" height="10">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//Manufacturer"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//Manufacturer"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Manufacturer"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Manufacturer"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -480,8 +480,8 @@
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_qL_TAPgqEeqWp_4Vt6rljA" name="name : EString" tooltipText="">
- <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//Manufacturer/name"/>
- <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//Manufacturer/name"/>
+ <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Manufacturer/name"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//Manufacturer/name"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_RPaEM_grEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
<labelFormat>bold</labelFormat>
</ownedStyle>
@@ -489,8 +489,8 @@
</ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_VvGioPgrEeqWp_4Vt6rljA" name="[0..*] boilers" sourceNode="_jloKUPQJEeqpzsE1UYXTlQ" targetNode="_VPPMQPgqEeqWp_4Vt6rljA">
- <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/boilers"/>
- <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/boilers"/>
+ <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/boilers"/>
+ <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/boilers"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_VvIX0PgrEeqWp_4Vt6rljA" description="_VvHJsPgrEeqWp_4Vt6rljA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
<customFeatures>routingStyle</customFeatures>
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_VvI-4fgrEeqWp_4Vt6rljA" showIcon="false">
@@ -503,8 +503,8 @@
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_dZqak_grEeqWp_4Vt6rljA" name="[0..*] chps" sourceNode="_jloKUPQJEeqpzsE1UYXTlQ" targetNode="_Vo_JAPgqEeqWp_4Vt6rljA">
- <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/chps"/>
- <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/chps"/>
+ <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/chps"/>
+ <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/chps"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_dZrBoPgrEeqWp_4Vt6rljA" description="_VvHJsPgrEeqWp_4Vt6rljA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dZrBovgrEeqWp_4Vt6rljA" showIcon="false">
<customFeatures>labelSize</customFeatures>
@@ -516,8 +516,8 @@
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_nPGOoPgrEeqWp_4Vt6rljA" name="[0..*] solarpanels" sourceNode="_jloKUPQJEeqpzsE1UYXTlQ" targetNode="_V5wI4PgqEeqWp_4Vt6rljA">
- <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
- <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
+ <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
+ <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_nPGOofgrEeqWp_4Vt6rljA" description="_VvHJsPgrEeqWp_4Vt6rljA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_nPGOo_grEeqWp_4Vt6rljA" showIcon="false">
<customFeatures>labelSize</customFeatures>
@@ -529,8 +529,8 @@
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_FYHQr_gsEeqWp_4Vt6rljA" name="[0..*] inverters" sourceNode="_jloKUPQJEeqpzsE1UYXTlQ" targetNode="_WG2JsPgqEeqWp_4Vt6rljA">
- <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/inverters"/>
- <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/inverters"/>
+ <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/inverters"/>
+ <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/inverters"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_FYH3sPgsEeqWp_4Vt6rljA" description="_VvHJsPgrEeqWp_4Vt6rljA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_FYH3svgsEeqWp_4Vt6rljA" showIcon="false">
<customFeatures>labelSize</customFeatures>
@@ -542,8 +542,8 @@
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_J3T_5fgsEeqWp_4Vt6rljA" name="[0..*] manufacturers" sourceNode="_jloKUPQJEeqpzsE1UYXTlQ" targetNode="_X7xD8PgqEeqWp_4Vt6rljA">
- <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
- <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
+ <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
+ <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_J3Um4PgsEeqWp_4Vt6rljA" description="_VvHJsPgrEeqWp_4Vt6rljA" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_J3Um4vgsEeqWp_4Vt6rljA" showIcon="false">
<customFeatures>labelSize</customFeatures>
@@ -555,8 +555,8 @@
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Ukla0PgsEeqWp_4Vt6rljA" name="ChemicalEnergyDevice" tooltipText="" outgoingEdges="_DLbhQvgtEeqWp_4Vt6rljA" incomingEdges="_eW4bUPgsEeqWp_4Vt6rljA _fu9olvgsEeqWp_4Vt6rljA" width="12" height="10">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//ChemicalEnergyDevice"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//ChemicalEnergyDevice"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//ChemicalEnergyDevice"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//ChemicalEnergyDevice"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -566,8 +566,8 @@
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_YWmT4PgsEeqWp_4Vt6rljA" name="installedThermalPower : EDouble = 0.0" tooltipText="">
- <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
- <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
+ <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_hELvFPgsEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
<labelFormat>bold</labelFormat>
</ownedStyle>
@@ -575,8 +575,8 @@
</ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_eW4bUPgsEeqWp_4Vt6rljA" sourceNode="_VPPMQPgqEeqWp_4Vt6rljA" targetNode="_Ukla0PgsEeqWp_4Vt6rljA">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//Boiler"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//Boiler"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Boiler"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Boiler"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_eW5CYPgsEeqWp_4Vt6rljA" targetArrow="InputClosedArrow" routingStyle="tree">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
<beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_eW5CYfgsEeqWp_4Vt6rljA" showIcon="false">
@@ -587,8 +587,8 @@
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_fu9olvgsEeqWp_4Vt6rljA" sourceNode="_Vo_JAPgqEeqWp_4Vt6rljA" targetNode="_Ukla0PgsEeqWp_4Vt6rljA">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//CombinedHeatPower"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//CombinedHeatPower"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//CombinedHeatPower"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//CombinedHeatPower"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_fu-PoPgsEeqWp_4Vt6rljA" targetArrow="InputClosedArrow" routingStyle="tree">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
<beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_fu-PofgsEeqWp_4Vt6rljA" showIcon="false">
@@ -599,8 +599,8 @@
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ktLPAPgsEeqWp_4Vt6rljA" name="EnergyComponent" tooltipText="" outgoingEdges="_Xn1T8PgtEeqWp_4Vt6rljA" incomingEdges="_-YCDpvgsEeqWp_4Vt6rljA _DLbhQvgtEeqWp_4Vt6rljA _J5vMWPgtEeqWp_4Vt6rljA" width="12" height="10">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//EnergyComponent"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//EnergyComponent"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//EnergyComponent"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//EnergyComponent"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -610,16 +610,16 @@
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_nhOD8PgsEeqWp_4Vt6rljA" name="modelName : EString" tooltipText="">
- <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponent/modelName"/>
- <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponent/modelName"/>
+ <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponent/modelName"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponent/modelName"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_pYd5cvgsEeqWp_4Vt6rljA" labelAlignment="LEFT" description="_-D8U4PgqEeqWp_4Vt6rljA">
<labelFormat>bold</labelFormat>
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
</ownedElements>
<ownedElements xmi:type="diagram:DNodeListElement" uid="_q90GoPgsEeqWp_4Vt6rljA" name="revisionYear : EInt" tooltipText="">
- <target xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponent/revisionYear"/>
- <semanticElements xmi:type="ecore:EAttribute" href="democatalog.ecore#//EnergyComponent/revisionYear"/>
+ <target xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponent/revisionYear"/>
+ <semanticElements xmi:type="ecore:EAttribute" href="DemoCatalog.ecore#//EnergyComponent/revisionYear"/>
<ownedStyle xmi:type="diagram:BundledImage" uid="_IIbr8grfEeunxsCBJoWsPQ" labelAlignment="LEFT">
<description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
</ownedStyle>
@@ -627,8 +627,8 @@
</ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_-YCDpvgsEeqWp_4Vt6rljA" sourceNode="_V5wI4PgqEeqWp_4Vt6rljA" targetNode="_ktLPAPgsEeqWp_4Vt6rljA">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//SolarPanel"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//SolarPanel"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//SolarPanel"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//SolarPanel"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_BmdugPgtEeqWp_4Vt6rljA" targetArrow="InputClosedArrow" routingStyle="tree">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
<beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_BmdugfgtEeqWp_4Vt6rljA" showIcon="false">
@@ -639,8 +639,8 @@
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_DLbhQvgtEeqWp_4Vt6rljA" sourceNode="_Ukla0PgsEeqWp_4Vt6rljA" targetNode="_ktLPAPgsEeqWp_4Vt6rljA">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//ChemicalEnergyDevice"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//ChemicalEnergyDevice"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//ChemicalEnergyDevice"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//ChemicalEnergyDevice"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_DLcIQPgtEeqWp_4Vt6rljA" targetArrow="InputClosedArrow" routingStyle="tree">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
<beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_DLcIQfgtEeqWp_4Vt6rljA" showIcon="false">
@@ -651,8 +651,8 @@
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_J5vMWPgtEeqWp_4Vt6rljA" sourceNode="_WG2JsPgqEeqWp_4Vt6rljA" targetNode="_ktLPAPgsEeqWp_4Vt6rljA">
- <target xmi:type="ecore:EClass" href="democatalog.ecore#//Inverter"/>
- <semanticElements xmi:type="ecore:EClass" href="democatalog.ecore#//Inverter"/>
+ <target xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Inverter"/>
+ <semanticElements xmi:type="ecore:EClass" href="DemoCatalog.ecore#//Inverter"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_J5vzUPgtEeqWp_4Vt6rljA" targetArrow="InputClosedArrow" routingStyle="tree">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
<beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_J5vzUfgtEeqWp_4Vt6rljA" showIcon="false">
@@ -663,8 +663,8 @@
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_Xn1T8PgtEeqWp_4Vt6rljA" name="[1..1] producedBy" sourceNode="_ktLPAPgsEeqWp_4Vt6rljA" targetNode="_X7xD8PgqEeqWp_4Vt6rljA">
- <target xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponent/producedBy"/>
- <semanticElements xmi:type="ecore:EReference" href="democatalog.ecore#//EnergyComponent/producedBy"/>
+ <target xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponent/producedBy"/>
+ <semanticElements xmi:type="ecore:EReference" href="DemoCatalog.ecore#//EnergyComponent/producedBy"/>
<ownedStyle xmi:type="diagram:EdgeStyle" uid="_ajdXn_gtEeqWp_4Vt6rljA" description="_ajdXnPgtEeqWp_4Vt6rljA" routingStyle="manhattan" strokeColor="0,0,0">
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ajdXofgtEeqWp_4Vt6rljA" showIcon="false">
<labelFormat>bold</labelFormat>
@@ -678,6 +678,6 @@
<activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
<activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
<activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
- <target xmi:type="ecore:EPackage" href="democatalog.ecore#/"/>
+ <target xmi:type="ecore:EPackage" href="DemoCatalog.ecore#/"/>
</diagram:DSemanticDiagram>
</xmi:XMI>
diff --git a/EclipseDemoCatalog/demo.catalog/model/democatalog.ecore b/EclipseDemoCatalog/demo.catalog/model/DemoCatalog.ecore
similarity index 100%
rename from EclipseDemoCatalog/demo.catalog/model/democatalog.ecore
rename to EclipseDemoCatalog/demo.catalog/model/DemoCatalog.ecore
diff --git a/EclipseDemoCatalog/demo.catalog/model/democatalog.genmodel b/EclipseDemoCatalog/demo.catalog/model/DemoCatalog.genmodel
similarity index 56%
rename from EclipseDemoCatalog/demo.catalog/model/democatalog.genmodel
rename to EclipseDemoCatalog/demo.catalog/model/DemoCatalog.genmodel
index 1fe98acbba58d6f85e373582d0ec2785d7e4aba0..ff2d553f135652b23fdc26e94b6344ab89ce30c8 100644
--- a/EclipseDemoCatalog/demo.catalog/model/democatalog.genmodel
+++ b/EclipseDemoCatalog/demo.catalog/model/DemoCatalog.genmodel
@@ -6,44 +6,44 @@
rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
operationReflection="true" importOrganizing="true">
- <foreignModel>democatalog.ecore</foreignModel>
+ <foreignModel>DemoCatalog.ecore</foreignModel>
<testsDirectory xsi:nil="true"/>
- <genPackages prefix="democatalog" basePackage="demo.catalog" disposableProviderFactory="true"
- ecorePackage="democatalog.ecore#/">
- <genEnums typeSafeEnumCompatible="false" ecoreEnum="democatalog.ecore#//BoilerType">
- <genEnumLiterals ecoreEnumLiteral="democatalog.ecore#//BoilerType/LowTemperature"/>
- <genEnumLiterals ecoreEnumLiteral="democatalog.ecore#//BoilerType/Condensing"/>
+ <genPackages prefix="DemoCatalog" basePackage="demo.catalog" disposableProviderFactory="true"
+ ecorePackage="DemoCatalog.ecore#/">
+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="DemoCatalog.ecore#//BoilerType">
+ <genEnumLiterals ecoreEnumLiteral="DemoCatalog.ecore#//BoilerType/LowTemperature"/>
+ <genEnumLiterals ecoreEnumLiteral="DemoCatalog.ecore#//BoilerType/Condensing"/>
</genEnums>
- <genClasses ecoreClass="democatalog.ecore#//EnergyComponentsCatalog">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//EnergyComponentsCatalog/author"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponentsCatalog/boilers"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponentsCatalog/chps"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponentsCatalog/inverters"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
+ <genClasses ecoreClass="DemoCatalog.ecore#//EnergyComponentsCatalog">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//EnergyComponentsCatalog/author"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponentsCatalog/boilers"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponentsCatalog/chps"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponentsCatalog/solarpanels"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponentsCatalog/inverters"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
</genClasses>
- <genClasses ecoreClass="democatalog.ecore#//Boiler">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//Boiler/boilerType"/>
+ <genClasses ecoreClass="DemoCatalog.ecore#//Boiler">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//Boiler/boilerType"/>
</genClasses>
- <genClasses ecoreClass="democatalog.ecore#//CombinedHeatPower">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
+ <genClasses ecoreClass="DemoCatalog.ecore#//CombinedHeatPower">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
</genClasses>
- <genClasses ecoreClass="democatalog.ecore#//SolarPanel">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//SolarPanel/nominalPower"/>
+ <genClasses ecoreClass="DemoCatalog.ecore#//SolarPanel">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//SolarPanel/nominalPower"/>
</genClasses>
- <genClasses ecoreClass="democatalog.ecore#//Inverter">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//Inverter/nominalPower"/>
+ <genClasses ecoreClass="DemoCatalog.ecore#//Inverter">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//Inverter/nominalPower"/>
</genClasses>
- <genClasses ecoreClass="democatalog.ecore#//Manufacturer">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//Manufacturer/name"/>
+ <genClasses ecoreClass="DemoCatalog.ecore#//Manufacturer">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//Manufacturer/name"/>
</genClasses>
- <genClasses image="false" ecoreClass="democatalog.ecore#//ChemicalEnergyDevice">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
+ <genClasses image="false" ecoreClass="DemoCatalog.ecore#//ChemicalEnergyDevice">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
</genClasses>
- <genClasses image="false" ecoreClass="democatalog.ecore#//EnergyComponent">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//EnergyComponent/modelName"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//EnergyComponent/revisionYear"/>
- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponent/producedBy"/>
+ <genClasses image="false" ecoreClass="DemoCatalog.ecore#//EnergyComponent">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//EnergyComponent/modelName"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//EnergyComponent/revisionYear"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponent/producedBy"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/EclipseDemoCatalog/demo.catalog/plugin.xml b/EclipseDemoCatalog/demo.catalog/plugin.xml
index be4d99ebabba2d54b36610e2b74d472cc01f2b95..b2de20cc3e594c70ee3112d33eb6e8fd503154f8 100644
--- a/EclipseDemoCatalog/demo.catalog/plugin.xml
+++ b/EclipseDemoCatalog/demo.catalog/plugin.xml
@@ -11,7 +11,15 @@
<package
uri="http://www.example.org/democatalog"
class="demo.catalog.democatalog.democatalogPackage"
- genModel="model/democatalog.genmodel"/>
+ genModel="model/DemoCatalog.genmodel"/>
+ </extension>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <!-- @generated DemoCatalog -->
+ <package
+ uri="http://www.example.org/democatalog"
+ class="demo.catalog.democatalog.DemoCatalogPackage"
+ genModel="model/DemoCatalog.genmodel"/>
</extension>
</plugin>
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Boiler.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Boiler.java
index cfb21078984599e8ad5b904d413ffe85031eadd5..0d903019dd7e29f561a941f79f042ff7dd883013 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Boiler.java
+++ b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Boiler.java
@@ -14,7 +14,7 @@ package demo.catalog.democatalog;
* <li>{@link demo.catalog.democatalog.Boiler#getBoilerType <em>Boiler Type</em>}</li>
* </ul>
*
- * @see demo.catalog.democatalog.democatalogPackage#getBoiler()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getBoiler()
* @model
* @generated
*/
@@ -27,7 +27,7 @@ public interface Boiler extends ChemicalEnergyDevice {
* @return the value of the '<em>Boiler Type</em>' attribute.
* @see demo.catalog.democatalog.BoilerType
* @see #setBoilerType(BoilerType)
- * @see demo.catalog.democatalog.democatalogPackage#getBoiler_BoilerType()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getBoiler_BoilerType()
* @model required="true"
* @generated
*/
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/BoilerType.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/BoilerType.java
index 428301900f5ee112b21ddb62929bac4638c773b9..ccf23ae6d2b5bad98f6b2dbbeb2821f3a9973ba1 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/BoilerType.java
+++ b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/BoilerType.java
@@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.Enumerator;
* A representation of the literals of the enumeration '<em><b>Boiler Type</b></em>',
* and utility methods for working with them.
* <!-- end-user-doc -->
- * @see demo.catalog.democatalog.democatalogPackage#getBoilerType()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getBoilerType()
* @model
* @generated
*/
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/ChemicalEnergyDevice.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/ChemicalEnergyDevice.java
index b897d4f29680fac808c90d20e1fb3d40674b3706..4010f17bd6fe323d1f90113c59b17fb2920e7798 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/ChemicalEnergyDevice.java
+++ b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/ChemicalEnergyDevice.java
@@ -14,7 +14,7 @@ package demo.catalog.democatalog;
* <li>{@link demo.catalog.democatalog.ChemicalEnergyDevice#getInstalledThermalPower <em>Installed Thermal Power</em>}</li>
* </ul>
*
- * @see demo.catalog.democatalog.democatalogPackage#getChemicalEnergyDevice()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getChemicalEnergyDevice()
* @model abstract="true"
* @generated
*/
@@ -25,7 +25,7 @@ public interface ChemicalEnergyDevice extends EnergyComponent {
* <!-- end-user-doc -->
* @return the value of the '<em>Installed Thermal Power</em>' attribute.
* @see #setInstalledThermalPower(double)
- * @see demo.catalog.democatalog.democatalogPackage#getChemicalEnergyDevice_InstalledThermalPower()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getChemicalEnergyDevice_InstalledThermalPower()
* @model required="true"
* @generated
*/
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/CombinedHeatPower.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/CombinedHeatPower.java
index c7b04169162a146bd6ee57f2ed79bb2284d63743..eef11286bff5704bd7087738a8a2198e52d00e4e 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/CombinedHeatPower.java
+++ b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/CombinedHeatPower.java
@@ -14,7 +14,7 @@ package demo.catalog.democatalog;
* <li>{@link demo.catalog.democatalog.CombinedHeatPower#getThermalEfficiency <em>Thermal Efficiency</em>}</li>
* </ul>
*
- * @see demo.catalog.democatalog.democatalogPackage#getCombinedHeatPower()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getCombinedHeatPower()
* @model
* @generated
*/
@@ -25,7 +25,7 @@ public interface CombinedHeatPower extends ChemicalEnergyDevice {
* <!-- end-user-doc -->
* @return the value of the '<em>Thermal Efficiency</em>' attribute.
* @see #setThermalEfficiency(double)
- * @see demo.catalog.democatalog.democatalogPackage#getCombinedHeatPower_ThermalEfficiency()
+ * @see demo.catalog.democatalog.DemoCatalogPackage#getCombinedHeatPower_ThermalEfficiency()
* @model required="true"
* @generated
*/
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/EnergyComponent.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/EnergyComponent.java
index e49fc1402cc6485b5dda34ba4a9cf11ef306e138..916b871e0122bbd81e40f1947c25c0243a4f8bcb 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/EnergyComponent.java
+++ b/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
*/
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/EnergyComponentsCatalog.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/EnergyComponentsCatalog.java
index f2ce193b9282c86868cd43c35d75862ce0026fd7..89cafb0c12a6ce345fc91a402605bfd9d1b2045a 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/EnergyComponentsCatalog.java
+++ b/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
*/
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Inverter.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Inverter.java
index 5ea998331bcbcc41d6f69428ff75f4599ea88fac..e2cffaa7c91aa41420350c80cfbe8ad7c6f1867f 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Inverter.java
+++ b/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
*/
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Manufacturer.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Manufacturer.java
index db9abe440807cf5b582f4c7d9522e8ee6284e47d..8f465c6d107ffeb5256fdc35a38975fae0f8d3bb 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/Manufacturer.java
+++ b/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
*/
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/SolarPanel.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/SolarPanel.java
index e3b4c487de21e1328ac506fb36f683d76c44f792..4aa46ec5d9ed3c9a199fa14ee36bf79715254ce8 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/SolarPanel.java
+++ b/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
*/
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/democatalogFactory.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/democatalogFactory.java
index 8a800a0aa7893afb4e18dfb5941e8f8dd3cbc8f9..dcb010293133e8b06b72d6804708a47c00827f2c 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/democatalogFactory.java
+++ b/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
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/democatalogPackage.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/democatalogPackage.java
index 3f5d86f18c6d9f47464d4d8eace8a18850a6138a..5eff36adc8cd86e9e086dc6323020f3a080fc89f 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/democatalogPackage.java
+++ b/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
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/BoilerImpl.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/BoilerImpl.java
index dabdf566107ef733fe6c07e0842bb0076ace2258..93afc4fc74b1416d74c832ca2626ca88f945cd25 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/BoilerImpl.java
+++ b/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);
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/ChemicalEnergyDeviceImpl.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/ChemicalEnergyDeviceImpl.java
index afeabfd7617d85c45fb21091a1581c39cdf92956..2349e98e199f4e661654b70b5c4a846b297f9051 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/ChemicalEnergyDeviceImpl.java
+++ b/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);
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/CombinedHeatPowerImpl.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/CombinedHeatPowerImpl.java
index f6c74d16d7d27a46901fc84e0c6a62f14b88ffcb..57734adf61a48475b3c84a81b3ebd5caa73f0e6a 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/CombinedHeatPowerImpl.java
+++ b/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);
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/EnergyComponentImpl.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/EnergyComponentImpl.java
index f9574841898d116a4e848d016edd5e24dfe779bb..48f516abe4c428c7b95a7d3539a4449261b83c76 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/EnergyComponentImpl.java
+++ b/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);
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/EnergyComponentsCatalogImpl.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/EnergyComponentsCatalogImpl.java
index 4a9e60bcbd5adb79d927d45c89a0f173cf723cf8..35623dd1aae81a6d26ea7df42a91f3da0f6c593f 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/EnergyComponentsCatalogImpl.java
+++ b/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);
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/InverterImpl.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/InverterImpl.java
index 19137f0ee0919900072e1bde1529a2e51a00b0ca..51a7fa8ecd4ac31c9012594a11882b4632e55fa2 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/InverterImpl.java
+++ b/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);
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/ManufacturerImpl.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/ManufacturerImpl.java
index b8b9e6a42c7943d42532e44ba904eab0f28a8094..48cbe1c555ce3648632fd93bfe2f6b0fef562bd1 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/ManufacturerImpl.java
+++ b/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);
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/SolarPanelImpl.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/SolarPanelImpl.java
index 7d770a10c2324b8fb37f28ccb618ec550bf819e7..be23649e4d8a9c80be9428b7b2fb7dc7b7d700e8 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/SolarPanelImpl.java
+++ b/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);
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/democatalogFactoryImpl.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/democatalogFactoryImpl.java
index 1de19a2dea6a3b01d3bf9f18050aa5eac1a530f0..e9ab76ca9bdda2d9abdc28b8989ffedd5a637365 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/democatalogFactoryImpl.java
+++ b/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
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/democatalogPackageImpl.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/democatalogPackageImpl.java
index 22a0437e8a868f516f0666a034e497a8a9a3781a..853bb082056be52711c4b515f5a3158c498ae0a8 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/impl/democatalogPackageImpl.java
+++ b/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
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/util/democatalogAdapterFactory.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/util/democatalogAdapterFactory.java
index 6203cfda1c52cf3cd44f04b96b2f94b80aa11a5d..2e4f46397f3d950528d6daa1b814c4cd6b900f27 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/util/democatalogAdapterFactory.java
+++ b/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
diff --git a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/util/democatalogSwitch.java b/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/util/democatalogSwitch.java
index d8f3935e99630be124ec269160f2b54751d32c54..dc6b4d2987af85df78845b216d88c04646bc5430 100644
--- a/EclipseDemoCatalog/demo.catalog/src-gen/demo/catalog/democatalog/util/democatalogSwitch.java
+++ b/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