Commit 92c8b79f authored by Kai-Holger Brassel's avatar Kai-Holger Brassel
Browse files

Camel case names for model files genmodel prefix

parent fa0d7069
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src-gen"/> <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="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<plugin> <plugin>
<extension point="org.eclipse.emf.edit.itemProviderAdapterFactories"> <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
<!-- @generated democatalog --> <!-- @generated DemoCatalog -->
<factory <factory
uri="http://www.example.org/democatalog" uri="http://www.example.org/democatalog"
class="demo.catalog.democatalog.provider.democatalogItemProviderAdapterFactory" class="demo.catalog.democatalog.provider.DemoCatalogItemProviderAdapterFactory"
supportedTypes= supportedTypes=
"org.eclipse.emf.edit.provider.IEditingDomainItemProvider "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
org.eclipse.emf.edit.provider.IStructuredItemContentProvider org.eclipse.emf.edit.provider.IStructuredItemContentProvider
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
package demo.catalog.democatalog.provider; package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.Boiler; import demo.catalog.democatalog.Boiler;
import demo.catalog.democatalog.democatalogPackage; import demo.catalog.democatalog.DemoCatalogPackage;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -61,7 +61,7 @@ public class BoilerItemProvider extends ChemicalEnergyDeviceItemProvider { ...@@ -61,7 +61,7 @@ public class BoilerItemProvider extends ChemicalEnergyDeviceItemProvider {
getResourceLocator(), getString("_UI_Boiler_boilerType_feature"), getResourceLocator(), getString("_UI_Boiler_boilerType_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Boiler_boilerType_feature", getString("_UI_PropertyDescriptor_description", "_UI_Boiler_boilerType_feature",
"_UI_Boiler_type"), "_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)); ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
} }
...@@ -111,7 +111,7 @@ public class BoilerItemProvider extends ChemicalEnergyDeviceItemProvider { ...@@ -111,7 +111,7 @@ public class BoilerItemProvider extends ChemicalEnergyDeviceItemProvider {
updateChildren(notification); updateChildren(notification);
switch (notification.getFeatureID(Boiler.class)) { switch (notification.getFeatureID(Boiler.class)) {
case democatalogPackage.BOILER__BOILER_TYPE: case DemoCatalogPackage.BOILER__BOILER_TYPE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
package demo.catalog.democatalog.provider; package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.ChemicalEnergyDevice; import demo.catalog.democatalog.ChemicalEnergyDevice;
import demo.catalog.democatalog.democatalogPackage; import demo.catalog.democatalog.DemoCatalogPackage;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -61,7 +61,7 @@ public class ChemicalEnergyDeviceItemProvider extends EnergyComponentItemProvide ...@@ -61,7 +61,7 @@ public class ChemicalEnergyDeviceItemProvider extends EnergyComponentItemProvide
getString("_UI_ChemicalEnergyDevice_installedThermalPower_feature"), getString("_UI_ChemicalEnergyDevice_installedThermalPower_feature"),
getString("_UI_PropertyDescriptor_description", getString("_UI_PropertyDescriptor_description",
"_UI_ChemicalEnergyDevice_installedThermalPower_feature", "_UI_ChemicalEnergyDevice_type"), "_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)); ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
} }
...@@ -100,7 +100,7 @@ public class ChemicalEnergyDeviceItemProvider extends EnergyComponentItemProvide ...@@ -100,7 +100,7 @@ public class ChemicalEnergyDeviceItemProvider extends EnergyComponentItemProvide
updateChildren(notification); updateChildren(notification);
switch (notification.getFeatureID(ChemicalEnergyDevice.class)) { 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)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
package demo.catalog.democatalog.provider; package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.CombinedHeatPower; import demo.catalog.democatalog.CombinedHeatPower;
import demo.catalog.democatalog.democatalogPackage; import demo.catalog.democatalog.DemoCatalogPackage;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -61,7 +61,7 @@ public class CombinedHeatPowerItemProvider extends ChemicalEnergyDeviceItemProvi ...@@ -61,7 +61,7 @@ public class CombinedHeatPowerItemProvider extends ChemicalEnergyDeviceItemProvi
getResourceLocator(), getString("_UI_CombinedHeatPower_thermalEfficiency_feature"), getResourceLocator(), getString("_UI_CombinedHeatPower_thermalEfficiency_feature"),
getString("_UI_PropertyDescriptor_description", getString("_UI_PropertyDescriptor_description",
"_UI_CombinedHeatPower_thermalEfficiency_feature", "_UI_CombinedHeatPower_type"), "_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)); ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
} }
...@@ -111,7 +111,7 @@ public class CombinedHeatPowerItemProvider extends ChemicalEnergyDeviceItemProvi ...@@ -111,7 +111,7 @@ public class CombinedHeatPowerItemProvider extends ChemicalEnergyDeviceItemProvi
updateChildren(notification); updateChildren(notification);
switch (notification.getFeatureID(CombinedHeatPower.class)) { 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)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
} }
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
*/ */
package demo.catalog.democatalog.provider; package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.DemoCatalogPackage;
import demo.catalog.democatalog.EnergyComponent; import demo.catalog.democatalog.EnergyComponent;
import demo.catalog.democatalog.democatalogPackage;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -72,7 +72,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements ...@@ -72,7 +72,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
getResourceLocator(), getString("_UI_EnergyComponent_modelName_feature"), getResourceLocator(), getString("_UI_EnergyComponent_modelName_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_modelName_feature", getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_modelName_feature",
"_UI_EnergyComponent_type"), "_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)); ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
} }
...@@ -88,7 +88,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements ...@@ -88,7 +88,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
getString("_UI_EnergyComponent_revisionYear_feature"), getString("_UI_EnergyComponent_revisionYear_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_revisionYear_feature", getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_revisionYear_feature",
"_UI_EnergyComponent_type"), "_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)); ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
} }
...@@ -104,7 +104,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements ...@@ -104,7 +104,7 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
getResourceLocator(), getString("_UI_EnergyComponent_producedBy_feature"), getResourceLocator(), getString("_UI_EnergyComponent_producedBy_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_producedBy_feature", getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponent_producedBy_feature",
"_UI_EnergyComponent_type"), "_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)); null));
} }
...@@ -143,8 +143,8 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements ...@@ -143,8 +143,8 @@ public class EnergyComponentItemProvider extends ItemProviderAdapter implements
updateChildren(notification); updateChildren(notification);
switch (notification.getFeatureID(EnergyComponent.class)) { switch (notification.getFeatureID(EnergyComponent.class)) {
case democatalogPackage.ENERGY_COMPONENT__MODEL_NAME: case DemoCatalogPackage.ENERGY_COMPONENT__MODEL_NAME:
case democatalogPackage.ENERGY_COMPONENT__REVISION_YEAR: case DemoCatalogPackage.ENERGY_COMPONENT__REVISION_YEAR:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
} }
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
*/ */
package demo.catalog.democatalog.provider; package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.DemoCatalogFactory;
import demo.catalog.democatalog.DemoCatalogPackage;
import demo.catalog.democatalog.EnergyComponentsCatalog; import demo.catalog.democatalog.EnergyComponentsCatalog;
import demo.catalog.democatalog.democatalogFactory;
import demo.catalog.democatalog.democatalogPackage;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -73,7 +73,7 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp ...@@ -73,7 +73,7 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
getResourceLocator(), getString("_UI_EnergyComponentsCatalog_author_feature"), getResourceLocator(), getString("_UI_EnergyComponentsCatalog_author_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponentsCatalog_author_feature", getString("_UI_PropertyDescriptor_description", "_UI_EnergyComponentsCatalog_author_feature",
"_UI_EnergyComponentsCatalog_type"), "_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)); ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
} }
...@@ -89,11 +89,11 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp ...@@ -89,11 +89,11 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) { public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
if (childrenFeatures == null) { if (childrenFeatures == null) {
super.getChildrenFeatures(object); super.getChildrenFeatures(object);
childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS); childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS);
childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS); childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS);
childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS); childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS);
childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS); childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS);
childrenFeatures.add(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS); childrenFeatures.add(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS);
} }
return childrenFeatures; return childrenFeatures;
} }
...@@ -157,14 +157,14 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp ...@@ -157,14 +157,14 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
updateChildren(notification); updateChildren(notification);
switch (notification.getFeatureID(EnergyComponentsCatalog.class)) { 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)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
case democatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS: case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__BOILERS:
case democatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS: case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__CHPS:
case democatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS: case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__SOLARPANELS:
case democatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS: case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__INVERTERS:
case democatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS: case DemoCatalogPackage.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return; return;
} }
...@@ -182,21 +182,21 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp ...@@ -182,21 +182,21 @@ public class EnergyComponentsCatalogItemProvider extends ItemProviderAdapter imp
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) { protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object); super.collectNewChildDescriptors(newChildDescriptors, object);
newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS, newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__BOILERS,
democatalogFactory.eINSTANCE.createBoiler())); DemoCatalogFactory.eINSTANCE.createBoiler()));
newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS, newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__CHPS,
democatalogFactory.eINSTANCE.createCombinedHeatPower())); DemoCatalogFactory.eINSTANCE.createCombinedHeatPower()));
newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS, newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__SOLARPANELS,
democatalogFactory.eINSTANCE.createSolarPanel())); DemoCatalogFactory.eINSTANCE.createSolarPanel()));
newChildDescriptors.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS, newChildDescriptors.add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__INVERTERS,
democatalogFactory.eINSTANCE.createInverter())); DemoCatalogFactory.eINSTANCE.createInverter()));
newChildDescriptors newChildDescriptors
.add(createChildParameter(democatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS, .add(createChildParameter(DemoCatalogPackage.Literals.ENERGY_COMPONENTS_CATALOG__MANUFACTURERS,
democatalogFactory.eINSTANCE.createManufacturer())); DemoCatalogFactory.eINSTANCE.createManufacturer()));
} }
/** /**
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
*/ */
package demo.catalog.democatalog.provider; package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.DemoCatalogPackage;
import demo.catalog.democatalog.Inverter; import demo.catalog.democatalog.Inverter;
import demo.catalog.democatalog.democatalogPackage;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -61,7 +61,7 @@ public class InverterItemProvider extends EnergyComponentItemProvider { ...@@ -61,7 +61,7 @@ public class InverterItemProvider extends EnergyComponentItemProvider {
getResourceLocator(), getString("_UI_Inverter_nominalPower_feature"), getResourceLocator(), getString("_UI_Inverter_nominalPower_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Inverter_nominalPower_feature", getString("_UI_PropertyDescriptor_description", "_UI_Inverter_nominalPower_feature",
"_UI_Inverter_type"), "_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)); ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
} }
...@@ -111,7 +111,7 @@ public class InverterItemProvider extends EnergyComponentItemProvider { ...@@ -111,7 +111,7 @@ public class InverterItemProvider extends EnergyComponentItemProvider {
updateChildren(notification); updateChildren(notification);
switch (notification.getFeatureID(Inverter.class)) { switch (notification.getFeatureID(Inverter.class)) {
case democatalogPackage.INVERTER__NOMINAL_POWER: case DemoCatalogPackage.INVERTER__NOMINAL_POWER:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
} }
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
*/ */
package demo.catalog.democatalog.provider; package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.DemoCatalogPackage;
import demo.catalog.democatalog.Manufacturer; import demo.catalog.democatalog.Manufacturer;
import demo.catalog.democatalog.democatalogPackage;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -12,6 +12,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; ...@@ -12,6 +12,7 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider;
...@@ -69,7 +70,7 @@ public class ManufacturerItemProvider extends ItemProviderAdapter implements IEd ...@@ -69,7 +70,7 @@ public class ManufacturerItemProvider extends ItemProviderAdapter implements IEd
getResourceLocator(), getString("_UI_Manufacturer_name_feature"), getResourceLocator(), getString("_UI_Manufacturer_name_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_Manufacturer_name_feature", getString("_UI_PropertyDescriptor_description", "_UI_Manufacturer_name_feature",
"_UI_Manufacturer_type"), "_UI_Manufacturer_type"),
democatalogPackage.Literals.MANUFACTURER__NAME, true, false, false, DemoCatalogPackage.Literals.MANUFACTURER__NAME, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
} }
...@@ -119,7 +120,7 @@ public class ManufacturerItemProvider extends ItemProviderAdapter implements IEd ...@@ -119,7 +120,7 @@ public class ManufacturerItemProvider extends ItemProviderAdapter implements IEd
updateChildren(notification); updateChildren(notification);
switch (notification.getFeatureID(Manufacturer.class)) { switch (notification.getFeatureID(Manufacturer.class)) {
case democatalogPackage.MANUFACTURER__NAME: case DemoCatalogPackage.MANUFACTURER__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
} }
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
*/ */
package demo.catalog.democatalog.provider; package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.DemoCatalogPackage;
import demo.catalog.democatalog.SolarPanel; import demo.catalog.democatalog.SolarPanel;
import demo.catalog.democatalog.democatalogPackage;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -61,7 +61,7 @@ public class SolarPanelItemProvider extends EnergyComponentItemProvider { ...@@ -61,7 +61,7 @@ public class SolarPanelItemProvider extends EnergyComponentItemProvider {
getResourceLocator(), getString("_UI_SolarPanel_nominalPower_feature"), getResourceLocator(), getString("_UI_SolarPanel_nominalPower_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_SolarPanel_nominalPower_feature", getString("_UI_PropertyDescriptor_description", "_UI_SolarPanel_nominalPower_feature",
"_UI_SolarPanel_type"), "_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)); ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
} }
...@@ -111,7 +111,7 @@ public class SolarPanelItemProvider extends EnergyComponentItemProvider { ...@@ -111,7 +111,7 @@ public class SolarPanelItemProvider extends EnergyComponentItemProvider {
updateChildren(notification); updateChildren(notification);
switch (notification.getFeatureID(SolarPanel.class)) { 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)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
*/ */
package demo.catalog.democatalog.provider; package demo.catalog.democatalog.provider;
import demo.catalog.democatalog.util.democatalogAdapterFactory; import demo.catalog.democatalog.util.DemoCatalogAdapterFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
...@@ -32,7 +32,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider; ...@@ -32,7 +32,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
public class democatalogItemProviderAdapterFactory extends democatalogAdapterFactory public class DemoCatalogItemProviderAdapterFactory extends DemoCatalogAdapterFactory
implements ComposeableAdapterFactory, IChangeNotifier, IDisposable { implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/** /**
* This keeps track of the root adapter factory that delegates to this adapter factory. * This keeps track of the root adapter factory that delegates to this adapter factory.
...@@ -64,7 +64,7 @@ public class democatalogItemProviderAdapterFactory extends democatalogAdapterFac ...@@ -64,7 +64,7 @@ public class democatalogItemProviderAdapterFactory extends democatalogAdapterFac
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
public democatalogItemProviderAdapterFactory() { public DemoCatalogItemProviderAdapterFactory() {
supportedTypes.add(IEditingDomainItemProvider.class); supportedTypes.add(IEditingDomainItemProvider.class);
supportedTypes.add(IStructuredItemContentProvider.class); supportedTypes.add(IStructuredItemContentProvider.class);
supportedTypes.add(ITreeItemContentProvider.class); supportedTypes.add(ITreeItemContentProvider.class);
......
...@@ -2,7 +2,7 @@ ...@@ -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"> <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"/> <rootEClass href="http://www.example.org/democatalog#//EnergyComponentsCatalog"/>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_OiVwEAuqEeuYGOU2ZFiRgg" name="Control author"> <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"/> <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.example.org/democatalog#//EnergyComponentsCatalog/author"/>
</domainModelReference> </domainModelReference>
</children> </children>
......
...@@ -6,44 +6,44 @@ ...@@ -6,44 +6,44 @@
rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" codeFormatting="true"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
operationReflection="true" importOrganizing="true"> operationReflection="true" importOrganizing="true">
<foreignModel>democatalog.ecore</foreignModel> <foreignModel>DemoCatalog.ecore</foreignModel>
<testsDirectory xsi:nil="true"/> <testsDirectory xsi:nil="true"/>
<genPackages prefix="democatalog" basePackage="demo.catalog" disposableProviderFactory="true" <genPackages prefix="DemoCatalog" basePackage="demo.catalog" disposableProviderFactory="true"
ecorePackage="democatalog.ecore#/"> ecorePackage="DemoCatalog.ecore#/">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="democatalog.ecore#//BoilerType"> <genEnums typeSafeEnumCompatible="false" ecoreEnum="DemoCatalog.ecore#//BoilerType">
<genEnumLiterals ecoreEnumLiteral="democatalog.ecore#//BoilerType/LowTemperature"/> <genEnumLiterals ecoreEnumLiteral="DemoCatalog.ecore#//BoilerType/LowTemperature"/>
<genEnumLiterals ecoreEnumLiteral="democatalog.ecore#//BoilerType/Condensing"/> <genEnumLiterals ecoreEnumLiteral="DemoCatalog.ecore#//BoilerType/Condensing"/>
</genEnums> </genEnums>
<genClasses ecoreClass="democatalog.ecore#//EnergyComponentsCatalog"> <genClasses ecoreClass="DemoCatalog.ecore#//EnergyComponentsCatalog">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//EnergyComponentsCatalog/author"/> <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/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/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/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/inverters"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponentsCatalog/manufacturers"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponentsCatalog/manufacturers"/>
</genClasses> </genClasses>
<genClasses ecoreClass="democatalog.ecore#//Boiler"> <genClasses ecoreClass="DemoCatalog.ecore#//Boiler">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//Boiler/boilerType"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//Boiler/boilerType"/>
</genClasses> </genClasses>
<genClasses ecoreClass="democatalog.ecore#//CombinedHeatPower"> <genClasses ecoreClass="DemoCatalog.ecore#//CombinedHeatPower">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//CombinedHeatPower/thermalEfficiency"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//CombinedHeatPower/thermalEfficiency"/>
</genClasses> </genClasses>
<genClasses ecoreClass="democatalog.ecore#//SolarPanel"> <genClasses ecoreClass="DemoCatalog.ecore#//SolarPanel">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//SolarPanel/nominalPower"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//SolarPanel/nominalPower"/>
</genClasses> </genClasses>
<genClasses ecoreClass="democatalog.ecore#//Inverter"> <genClasses ecoreClass="DemoCatalog.ecore#//Inverter">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//Inverter/nominalPower"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//Inverter/nominalPower"/>
</genClasses> </genClasses>
<genClasses ecoreClass="democatalog.ecore#//Manufacturer"> <genClasses ecoreClass="DemoCatalog.ecore#//Manufacturer">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//Manufacturer/name"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//Manufacturer/name"/>
</genClasses> </genClasses>
<genClasses image="false" ecoreClass="democatalog.ecore#//ChemicalEnergyDevice"> <genClasses image="false" ecoreClass="DemoCatalog.ecore#//ChemicalEnergyDevice">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//ChemicalEnergyDevice/installedThermalPower"/>
</genClasses> </genClasses>
<genClasses image="false" ecoreClass="democatalog.ecore#//EnergyComponent"> <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/modelName"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute democatalog.ecore#//EnergyComponent/revisionYear"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DemoCatalog.ecore#//EnergyComponent/revisionYear"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference democatalog.ecore#//EnergyComponent/producedBy"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference DemoCatalog.ecore#//EnergyComponent/producedBy"/>
</genClasses> </genClasses>
</genPackages> </genPackages>
</genmodel:GenModel> </genmodel:GenModel>
...@@ -11,7 +11,15 @@ ...@@ -11,7 +11,15 @@
<package <package
uri="http://www.example.org/democatalog" uri="http://www.example.org/democatalog"
class="demo.catalog.democatalog.democatalogPackage" 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> </extension>
</plugin> </plugin>
...@@ -14,7 +14,7 @@ package demo.catalog.democatalog; ...@@ -14,7 +14,7 @@ package demo.catalog.democatalog;
* <li>{@link demo.catalog.democatalog.Boiler#getBoilerType <em>Boiler Type</em>}</li> * <li>{@link demo.catalog.democatalog.Boiler#getBoilerType <em>Boiler Type</em>}</li>
* </ul> * </ul>
* *
* @see demo.catalog.democatalog.democatalogPackage#getBoiler() * @see demo.catalog.democatalog.DemoCatalogPackage#getBoiler()
* @model * @model
* @generated * @generated
*/ */
...@@ -27,7 +27,7 @@ public interface Boiler extends ChemicalEnergyDevice { ...@@ -27,7 +27,7 @@ public interface Boiler extends ChemicalEnergyDevice {
* @return the value of the '<em>Boiler Type</em>' attribute. * @return the value of the '<em>Boiler Type</em>' attribute.
* @see demo.catalog.democatalog.BoilerType * @see demo.catalog.democatalog.BoilerType
* @see #setBoilerType(BoilerType) * @see #setBoilerType(BoilerType)
* @see demo.catalog.democatalog.democatalogPackage#getBoiler_BoilerType() * @see demo.catalog.democatalog.DemoCatalogPackage#getBoiler_BoilerType()
* @model required="true" * @model required="true"
* @generated * @generated
*/ */
......
...@@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.Enumerator; ...@@ -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>', * A representation of the literals of the enumeration '<em><b>Boiler Type</b></em>',
* and utility methods for working with them. * and utility methods for working with them.
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see demo.catalog.democatalog.democatalogPackage#getBoilerType() * @see demo.catalog.democatalog.DemoCatalogPackage#getBoilerType()
* @model * @model
* @generated * @generated
*/ */
......
...@@ -14,7 +14,7 @@ package demo.catalog.democatalog; ...@@ -14,7 +14,7 @@ package demo.catalog.democatalog;
* <li>{@link demo.catalog.democatalog.ChemicalEnergyDevice#getInstalledThermalPower <em>Installed Thermal Power</em>}</li> * <li>{@link demo.catalog.democatalog.ChemicalEnergyDevice#getInstalledThermalPower <em>Installed Thermal Power</em>}</li>
* </ul> * </ul>
* *
* @see demo.catalog.democatalog.democatalogPackage#getChemicalEnergyDevice() * @see demo.catalog.democatalog.DemoCatalogPackage#getChemicalEnergyDevice()
* @model abstract="true" * @model abstract="true"
* @generated * @generated
*/ */
...@@ -25,7 +25,7 @@ public interface ChemicalEnergyDevice extends EnergyComponent { ...@@ -25,7 +25,7 @@ public interface ChemicalEnergyDevice extends EnergyComponent {
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Installed Thermal Power</em>' attribute. * @return the value of the '<em>Installed Thermal Power</em>' attribute.
* @see #setInstalledThermalPower(double) * @see #setInstalledThermalPower(double)
* @see demo.catalog.democatalog.democatalogPackage#getChemicalEnergyDevice_InstalledThermalPower() * @see demo.catalog.democatalog.DemoCatalogPackage#getChemicalEnergyDevice_InstalledThermalPower()
* @model required="true" * @model required="true"
* @generated * @generated
*/ */
......
...@@ -14,7 +14,7 @@ package demo.catalog.democatalog; ...@@ -14,7 +14,7 @@ package demo.catalog.democatalog;
* <li>{@link demo.catalog.democatalog.CombinedHeatPower#getThermalEfficiency <em>Thermal Efficiency</em>}</li> * <li>{@link demo.catalog.democatalog.CombinedHeatPower#getThermalEfficiency <em>Thermal Efficiency</em>}</li>
* </ul> * </ul>
* *
* @see demo.catalog.democatalog.democatalogPackage#getCombinedHeatPower() * @see demo.catalog.democatalog.DemoCatalogPackage#getCombinedHeatPower()
* @model * @model
* @generated * @generated
*/ */
...@@ -25,7 +25,7 @@ public interface CombinedHeatPower extends ChemicalEnergyDevice { ...@@ -25,7 +25,7 @@ public interface CombinedHeatPower extends ChemicalEnergyDevice {
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the value of the '<em>Thermal Efficiency</em>' attribute. * @return the value of the '<em>Thermal Efficiency</em>' attribute.
* @see #setThermalEfficiency(double) * @see #setThermalEfficiency(double)
* @see demo.catalog.democatalog.democatalogPackage#getCombinedHeatPower_ThermalEfficiency() * @see demo.catalog.democatalog.DemoCatalogPackage#getCombinedHeatPower_ThermalEfficiency()
* @model required="true" * @model required="true"
* @generated * @generated
*/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment