Rename org.example.democatalog and project setup (2)

org.example.democatalog.application/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>

org.example.democatalog.application/META-INF/MANIFEST.MF

@@ -20,6 +20,6 @@ Require-Bundle: javax.inject;bundle-version="0.0.0",
  org.example.democatalog;bundle-version="1.0.0",
  org.example.democatalog.edit;bundle-version="1.0.0",
  org.example.democatalog.viewmodel;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-14
+Bundle-RequiredExecutionEnvironment: JavaSE-15
 Import-Package: javax.annotation;version="0.0.0"
 Automatic-Module-Name: org.example.democatalog.application

org.example.democatalog.application/org.example.democatalog.application.product

 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Demo Catalog" uid="org.example.democatalog.application.product" id="org.example.democatalog.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Demo Catalog" uid="org.example.democatalog.application.product" id="org.example.democatalog.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="false">
 
    <configIni use="default">
    </configIni>
@@ -39,8 +39,16 @@
       <feature id="org.eclipse.emf.ecore.edit"/>
       <feature id="org.eclipse.emf.edit"/>
       <feature id="org.eclipse.emf.edit.ui"/>
+      <feature id="org.eclipse.rcp" installMode="root"/>
    </features>
 
+   <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+   </configurations>
 
    <preferencesInfo>
       <targetfile overwrite="false"/>

org.example.democatalog.edit/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.example.democatalog.edit/META-INF/MANIFEST.MF

@@ -8,9 +8,9 @@ Bundle-ClassPath: .
 Bundle-Activator: org.example.democatalog.provider.DemocatalogEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-15
 Export-Package: org.example.democatalog.provider
 Require-Bundle: org.eclipse.core.runtime,
- org.example.democatalog;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.example.democatalog.model;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy

org.example.democatalog.edit/src-gen/org/example/democatalog/provider/DemocatalogItemProviderAdapterFactory.java

@@ -216,6 +216,7 @@ public class DemocatalogItemProviderAdapterFactory extends DemocatalogAdapterFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -226,6 +227,7 @@ public class DemocatalogItemProviderAdapterFactory extends DemocatalogAdapterFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
@@ -274,6 +276,7 @@ public class DemocatalogItemProviderAdapterFactory extends DemocatalogAdapterFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -284,6 +287,7 @@ public class DemocatalogItemProviderAdapterFactory extends DemocatalogAdapterFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -294,6 +298,7 @@ public class DemocatalogItemProviderAdapterFactory extends DemocatalogAdapterFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -308,6 +313,7 @@ public class DemocatalogItemProviderAdapterFactory extends DemocatalogAdapterFac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void dispose() {
 		if (energyComponentCatalogItemProvider != null)
 			energyComponentCatalogItemProvider.dispose();

org.example.democatalog/.classpath → org.example.democatalog.model/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>

org.example.democatalog/.project → org.example.democatalog.model/.project

 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.example.democatalog</name>
+	<name>org.example.democatalog.model</name>
 	<comment></comment>
 	<projects>
 	</projects>

org.example.democatalog/META-INF/MANIFEST.MF → org.example.democatalog.model/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.example.democatalog;singleton:=true
+Bundle-SymbolicName: org.example.democatalog.model;singleton:=true
 Automatic-Module-Name: org.example.democatalog
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-15
 Export-Package: org.example.democatalog,
  org.example.democatalog.impl,
  org.example.democatalog.util

org.example.democatalog/model/democatalog.genmodel → org.example.democatalog.model/model/democatalog.genmodel

 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel 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:genmodel="http://www.eclipse.org/emf/2002/GenModel"
-    modelDirectory="/org.example.democatalog/src-gen" creationIcons="false"
+    modelDirectory="/org.example.democatalog.model/src-gen" creationIcons="false"
     editDirectory="/org.example.democatalog.edit/src-gen" editorDirectory="/org.example.democatalog.editor/src-gen"
     modelPluginID="org.example.democatalog" modelName="Democatalog" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="15.0"
     copyrightFields="false" operationReflection="true" importOrganizing="true">
   <foreignModel>democatalog.ecore</foreignModel>
   <testsDirectory xsi:nil="true"/>

org.example.democatalog/src-gen/org/example/democatalog/BoilerType.java → org.example.democatalog.model/src-gen/org/example/democatalog/BoilerType.java

@@ -168,6 +168,7 @@ public enum BoilerType implements Enumerator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public int getValue() {
 		return value;
 	}
@@ -177,6 +178,7 @@ public enum BoilerType implements Enumerator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -186,6 +188,7 @@ public enum BoilerType implements Enumerator {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public String getLiteral() {
 		return literal;
 	}