Correct plug-in ID in genmodel

de.hftstuttgart.energycomponents.edit/META-INF/MANIFEST.MF

@@ -15,4 +15,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,
  de.hftstuttgart.cityunits.model;visibility:=reexport,
  de.hftstuttgart.cityunits.model.edit;visibility:=reexport
+Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy

de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/FuelCellItemProvider.java

@@ -9,7 +9,6 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**

de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/InverterItemProvider.java

@@ -9,7 +9,6 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**

de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/PolynomialCharacteristicItemProvider.java

@@ -13,7 +13,6 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 

de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/PowerCharacteristicItemProvider.java

@@ -13,7 +13,6 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 

de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/WindTurbineItemProvider.java

@@ -9,7 +9,6 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**

de.hftstuttgart.energycomponents.model/META-INF/MANIFEST.MF

@@ -7,10 +7,12 @@ Bundle-Version: 1.0.0
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: de.hftstuttgart.energycomponents,
  de.hftstuttgart.energycomponents.impl,
  de.hftstuttgart.energycomponents.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  de.hftstuttgart.cityunits.model;bundle-version="0.0.0";visibility:=reexport
+Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy

de.hftstuttgart.energycomponents.model/model/EnergyComponents.genmodel

@@ -5,8 +5,8 @@
     creationIcons="false" editDirectory="/de.hftstuttgart.energycomponents.edit/src-gen"
     editorDirectory="/de.hftstuttgart.energycomponents.editor/src-gen" modelPluginID="de.hftstuttgart.energycomponents.model"
     modelName="EnergyComponents" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
-    copyrightFields="false" usedGenPackages="../../de.hftstuttgart.cityunits.model/model/Quantities.genmodel#//quantities"
+    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="15.0"
+    copyrightFields="false" editPluginID="de.hftstuttgart.energycomponents.edit" usedGenPackages="../../de.hftstuttgart.cityunits.model/model/Quantities.genmodel#//quantities"
     operationReflection="true" importOrganizing="true">
   <foreignModel>EnergyComponents.ecore</foreignModel>
   <testsDirectory xsi:nil="true"/>

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/BoilerTypes.java

@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum BoilerTypes implements Enumerator {
 	 * @ordered
 	 */
 	CONDENSING_BOILER(0, "condensingBoiler", "condensingBoiler"),
-
 	/**
 	 * The '<em><b>Lowtemperature Boiler</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -203,5 +201,4 @@ public enum BoilerTypes implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //BoilerTypes
+}

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/CollectorTypes.java

@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum CollectorTypes implements Enumerator {
 	 * @ordered
 	 */
 	FLAT_PLANE_COLLECTOR(0, "flatPlaneCollector", "flatPlaneCollector"),
-
 	/**
 	 * The '<em><b>Evacuated Tube Collector</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -204,5 +202,4 @@ public enum CollectorTypes implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //CollectorTypes
+}

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ElectricalStorageTypes.java

@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -30,7 +29,6 @@ public enum ElectricalStorageTypes implements Enumerator {
 	 * @ordered
 	 */
 	LITHIUM_ION(0, "lithiumIon", "lithiumIon"),
-
 	/**
 	 * The '<em><b>Lead Acid</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -40,7 +38,6 @@ public enum ElectricalStorageTypes implements Enumerator {
 	 * @ordered
 	 */
 	LEAD_ACID(1, "leadAcid", "leadAcid"),
-
 	/**
 	 * The '<em><b>Ni MH</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -53,7 +50,6 @@ public enum ElectricalStorageTypes implements Enumerator {
 	 * @ordered
 	 */
 	NI_MH(2, "niMH", "niMH"),
-
 	/**
 	 * The '<em><b>Lithium Polymer</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -268,5 +264,4 @@ public enum ElectricalStorageTypes implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //ElectricalStorageTypes
+}

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/FuelTypes.java

@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	NATURAL_GAS(0, "naturalGas", "naturalGas"),
-
 	/**
 	 * The '<em><b>Oil</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -37,7 +35,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	OIL(1, "oil", "oil"),
-
 	/**
 	 * The '<em><b>Diesel</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -47,7 +44,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	DIESEL(2, "diesel", "diesel"),
-
 	/**
 	 * The '<em><b>Bio Gas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -57,7 +53,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	BIO_GAS(0, "bioGas", "bioGas"),
-
 	/**
 	 * The '<em><b>Synthetic Gas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -67,7 +62,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	SYNTHETIC_GAS(1, "syntheticGas", "syntheticGas"),
-
 	/**
 	 * The '<em><b>Wood Pellets</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -77,7 +71,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	WOOD_PELLETS(2, "woodPellets", "woodPellets"),
-
 	/**
 	 * The '<em><b>Wood Chips</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -87,7 +80,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	WOOD_CHIPS(3, "woodChips", "woodChips"),
-
 	/**
 	 * The '<em><b>Sewage Gas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -97,7 +89,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	SEWAGE_GAS(4, "sewageGas", "sewageGas"),
-
 	/**
 	 * The '<em><b>Electricity</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -359,5 +350,4 @@ public enum FuelTypes implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //FuelTypes
+}

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/HeatSources.java

@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum HeatSources implements Enumerator {
 	 * @ordered
 	 */
 	AIR(0, "air", "air"),
-
 	/**
 	 * The '<em><b>Ground</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -37,7 +35,6 @@ public enum HeatSources implements Enumerator {
 	 * @ordered
 	 */
 	GROUND(0, "ground", "ground"),
-
 	/**
 	 * The '<em><b>Water</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -222,5 +219,4 @@ public enum HeatSources implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //HeatSources
+}

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ThermalStorageTypes.java

@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum ThermalStorageTypes implements Enumerator {
 	 * @ordered
 	 */
 	SENSIBLE(0, "sensible", "sensible"),
-
 	/**
 	 * The '<em><b>Latent</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -203,5 +201,4 @@ public enum ThermalStorageTypes implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //ThermalStorageTypes
+}

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/TypeOfHeatSource.java

@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	NATURAL_GAS(0, "naturalGas", "naturalGas"),
-
 	/**
 	 * The '<em><b>Biogas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -37,7 +35,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	BIOGAS(1, "biogas", "biogas"),
-
 	/**
 	 * The '<em><b>Oil</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -47,7 +44,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	OIL(2, "oil", "oil"),
-
 	/**
 	 * The '<em><b>Diesel</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -57,7 +53,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	DIESEL(3, "diesel", "diesel"),
-
 	/**
 	 * The '<em><b>Synthetic Gas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -67,7 +62,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	SYNTHETIC_GAS(4, "syntheticGas", "syntheticGas"),
-
 	/**
 	 * The '<em><b>Wood Pellets</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -77,7 +71,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	WOOD_PELLETS(5, "woodPellets", "woodPellets"),
-
 	/**
 	 * The '<em><b>Wood Chips</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -87,7 +80,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	WOOD_CHIPS(6, "woodChips", "woodChips"),
-
 	/**
 	 * The '<em><b>Sewage Gas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -97,7 +89,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	SEWAGE_GAS(7, "sewageGas", "sewageGas"),
-
 	/**
 	 * The '<em><b>LNG</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -107,7 +98,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	LNG(8, "LNG", "LNG"),
-
 	/**
 	 * The '<em><b>CNG</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -117,7 +107,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	CNG(9, "CNG", "CNG"),
-
 	/**
 	 * The '<em><b>Water</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -127,7 +116,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	WATER(10, "water", "water"),
-
 	/**
 	 * The '<em><b>Air</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -137,7 +125,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	AIR(11, "air", "air"),
-
 	/**
 	 * The '<em><b>Soil</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -147,7 +134,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	SOIL(12, "soil", "soil"),
-
 	/**
 	 * The '<em><b>None</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -480,5 +466,4 @@ public enum TypeOfHeatSource implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //TypeOfHeatSource
+}

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/cellTypesElectrolyzer.java

@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -180,5 +179,4 @@ public enum cellTypesElectrolyzer implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //cellTypesElectrolyzer
+}

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/ExponentialFunctionImpl.java

@@ -4,13 +4,9 @@ package de.hftstuttgart.energycomponents.impl;
 
 import de.hftstuttgart.energycomponents.EnCompPackage;
 import de.hftstuttgart.energycomponents.ExponentialFunction;
-
 import java.lang.reflect.InvocationTargetException;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/LinearFunctionImpl.java

@@ -4,13 +4,9 @@ package de.hftstuttgart.energycomponents.impl;
 
 import de.hftstuttgart.energycomponents.EnCompPackage;
 import de.hftstuttgart.energycomponents.LinearFunction;
-
 import java.lang.reflect.InvocationTargetException;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/PolynomialFunctionImpl.java

@@ -4,13 +4,9 @@ package de.hftstuttgart.energycomponents.impl;
 
 import de.hftstuttgart.energycomponents.EnCompPackage;
 import de.hftstuttgart.energycomponents.PolynomialFunction;
-
 import java.lang.reflect.InvocationTargetException;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/PowerFunctionImpl.java

@@ -4,13 +4,9 @@ package de.hftstuttgart.energycomponents.impl;
 
 import de.hftstuttgart.energycomponents.EnCompPackage;
 import de.hftstuttgart.energycomponents.PowerFunction;
-
 import java.lang.reflect.InvocationTargetException;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;