diff --git a/de.hftstuttgart.energycomponents.application/.classpath b/de.hftstuttgart.energycomponents.application/.classpath index 751c8f2e504c40d1c41ebbd87d8f8968529e9c30..1f0469022c306ea5fefe4b29b6d0eee95d3db009 100644 --- a/de.hftstuttgart.energycomponents.application/.classpath +++ b/de.hftstuttgart.energycomponents.application/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/de.hftstuttgart.energycomponents.application/.project b/de.hftstuttgart.energycomponents.application/.project index 306ac6bba4ceea3009036ccbad5ba9b20e23a114..bc5b42b229c8b704f3692f4944e0eca48952dd95 100644 --- a/de.hftstuttgart.energycomponents.application/.project +++ b/de.hftstuttgart.energycomponents.application/.project @@ -20,8 +20,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> </natures> diff --git a/de.hftstuttgart.energycomponents.application/Application.e4xmi b/de.hftstuttgart.energycomponents.application/Application.e4xmi index 6b960af16bd4af0a9a24982a0ec6b76d94e0dca1..8a6e73f435a020f770611e73bcd0d952c78ea5d3 100644 --- a/de.hftstuttgart.energycomponents.application/Application.e4xmi +++ b/de.hftstuttgart.energycomponents.application/Application.e4xmi @@ -4,8 +4,8 @@ <mainMenu xmi:id="_6wlLicgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.main.menu"> <children xsi:type="menu:Menu" xmi:id="_6wlLisgZEeSyMNYR5xypkQ" elementId="file" label="File"> <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLi8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handleditem.file.new" label="New" iconURI="" command="_CqNHQBeZEeudKqin_4DG9g"/> - <children xsi:type="menu:HandledMenuItem" xmi:id="_RhHRIBeZEeudKqin_4DG9g" elementId="de.hftstuttgart.energycomponents.app.handleditem.file.open" label="Open" iconURI="platform:/plugin/de.hftstuttgart.energycomponents.app/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/> - <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handleditem.save" label="Save" iconURI="platform:/plugin/de.hftstuttgart.energycomponents.app/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/> + <children xsi:type="menu:HandledMenuItem" xmi:id="_RhHRIBeZEeudKqin_4DG9g" elementId="de.hftstuttgart.energycomponents.app.handleditem.file.open" label="Open" iconURI="platform:/plugin/de.hftstuttgart.energycomponents.application/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/> + <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handleditem.save" label="Save" iconURI="platform:/plugin/de.hftstuttgart.energycomponents.application/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/> <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjcgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handleditem.quit" label="Quit" command="_6wlLfMgZEeSyMNYR5xypkQ"/> </children> <children xsi:type="menu:Menu" xmi:id="_6wlLjsgZEeSyMNYR5xypkQ" elementId="help" label="Help"> @@ -15,16 +15,16 @@ <trimBars xmi:id="_6wlLlcgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.trimbar.top"> <children xsi:type="menu:ToolBar" xmi:id="_6wlLlsgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.main.toolbar"> <children xsi:type="menu:HandledToolItem" xmi:id="_hhBDYBeZEeudKqin_4DG9g" elementId="de.hftstuttgart.energycomponents.app.handleditem.trimbar.top.open" label="New" iconURI="" command="_CqNHQBeZEeudKqin_4DG9g"/> - <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLl8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handleditem.trimbar.top.open" iconURI="platform:/plugin/de.hftstuttgart.energycomponents.app/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/> - <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLmMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handleditem.trimbar.top.save" iconURI="platform:/plugin/de.hftstuttgart.energycomponents.app/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/> + <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLl8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handleditem.trimbar.top.open" iconURI="platform:/plugin/de.hftstuttgart.energycomponents.application/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/> + <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLmMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handleditem.trimbar.top.save" iconURI="platform:/plugin/de.hftstuttgart.energycomponents.application/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/> </children> </trimBars> </children> - <handlers xmi:id="_Fn8DsBeZEeudKqin_4DG9g" elementId="de.hftstuttgart.energycomponents.app.handler.newCommand" contributionURI="bundleclass://de.hftstuttgart.energycomponents.app/de.hftstuttgart.energycomponents.app.handlers.NewHandler" command="_CqNHQBeZEeudKqin_4DG9g"/> - <handlers xmi:id="_6wlLgcgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handler.openCommand" contributionURI="bundleclass://de.hftstuttgart.energycomponents.app/de.hftstuttgart.energycomponents.app.handlers.OpenHandler" command="_6wlLgMgZEeSyMNYR5xypkQ"/> - <handlers xmi:id="_6wlLhMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handler.saveCommand" contributionURI="bundleclass://de.hftstuttgart.energycomponents.app/de.hftstuttgart.energycomponents.app.handlers.SaveHandler" command="_6wlLg8gZEeSyMNYR5xypkQ"/> - <handlers xmi:id="_6wlLh8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handler.aboutCommand" contributionURI="bundleclass://de.hftstuttgart.energycomponents.app/de.hftstuttgart.energycomponents.app.handlers.AboutHandler" command="_6wlLhsgZEeSyMNYR5xypkQ"/> - <handlers xmi:id="_6wlLfcgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handler.quitCommand" contributionURI="bundleclass://de.hftstuttgart.energycomponents.app/de.hftstuttgart.energycomponents.app.handlers.QuitHandler" command="_6wlLfMgZEeSyMNYR5xypkQ"/> + <handlers xmi:id="_Fn8DsBeZEeudKqin_4DG9g" elementId="de.hftstuttgart.energycomponents.app.handler.newCommand" contributionURI="bundleclass://de.hftstuttgart.energycomponents.application/de.hftstuttgart.energycomponents.app.handlers.NewHandler" command="_CqNHQBeZEeudKqin_4DG9g"/> + <handlers xmi:id="_6wlLgcgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handler.openCommand" contributionURI="bundleclass://de.hftstuttgart.energycomponents.application/de.hftstuttgart.energycomponents.app.handlers.OpenHandler" command="_6wlLgMgZEeSyMNYR5xypkQ"/> + <handlers xmi:id="_6wlLhMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handler.saveCommand" contributionURI="bundleclass://de.hftstuttgart.energycomponents.application/de.hftstuttgart.energycomponents.app.handlers.SaveHandler" command="_6wlLg8gZEeSyMNYR5xypkQ"/> + <handlers xmi:id="_6wlLh8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handler.aboutCommand" contributionURI="bundleclass://de.hftstuttgart.energycomponents.application/de.hftstuttgart.energycomponents.app.handlers.AboutHandler" command="_6wlLhsgZEeSyMNYR5xypkQ"/> + <handlers xmi:id="_6wlLfcgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.handler.quitCommand" contributionURI="bundleclass://de.hftstuttgart.energycomponents.application/de.hftstuttgart.energycomponents.app.handlers.QuitHandler" command="_6wlLfMgZEeSyMNYR5xypkQ"/> <bindingTables xmi:id="_6wlLfsgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.bindingtable" bindingContext="_6wlLecgZEeSyMNYR5xypkQ"> <bindings xmi:id="_6wlLf8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.keybinding.m1q" keySequence="M1+Q" command="_6wlLfMgZEeSyMNYR5xypkQ"/> <bindings xmi:id="_6wlLgsgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.energycomponents.app.keybinding.m1o" keySequence="M1+O" command="_6wlLgMgZEeSyMNYR5xypkQ"/> @@ -35,7 +35,7 @@ <children xmi:id="_6wlLesgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.contexts.window" name="In Windows"/> <children xmi:id="_6wlLe8gZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.contexts.dialog" name="In Dialogs"/> </rootContext> - <descriptors xmi:id="_JPM6kBdzEeuSnr5xc-g2BA" elementId="de.hftstuttgart.energycomponents.app.partdescriptor.catalog" iconURI="platform:/plugin/de.hftstuttgart.energycomponents.app/icons/home.png" allowMultiple="true" closeable="true" contributionURI="bundleclass://de.hftstuttgart.energycomponents.app/de.hftstuttgart.energycomponents.app.parts.CatalogPart"/> + <descriptors xmi:id="_JPM6kBdzEeuSnr5xc-g2BA" elementId="de.hftstuttgart.energycomponents.app.partdescriptor.catalog" iconURI="platform:/plugin/de.hftstuttgart.energycomponents.application/icons/home.png" allowMultiple="true" closeable="true" contributionURI="bundleclass://de.hftstuttgart.energycomponents.application/de.hftstuttgart.energycomponents.app.parts.CatalogPart"/> <commands xmi:id="_CqNHQBeZEeudKqin_4DG9g" elementId="org.eclipse.ui.file.new" commandName="newCommand"/> <commands xmi:id="_6wlLgMgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.file.open" commandName="openCommand"/> <commands xmi:id="_6wlLg8gZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.file.save" commandName="saveCommand"/> diff --git a/de.hftstuttgart.energycomponents.application/META-INF/MANIFEST.MF b/de.hftstuttgart.energycomponents.application/META-INF/MANIFEST.MF index 69ef69fcfe40fd3d38b16ef0242d921a86f5b569..f1528719f51c3d8023aba69e5a1f5299a56dfb26 100644 --- a/de.hftstuttgart.energycomponents.application/META-INF/MANIFEST.MF +++ b/de.hftstuttgart.energycomponents.application/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Energy Components Catalog App -Bundle-SymbolicName: de.hftstuttgart.energycomponents.app;singleton:=true +Bundle-Name: Energy Components Catalog Application +Bundle-SymbolicName: de.hftstuttgart.energycomponents.application;singleton:=true Bundle-Version: 1.0.0 Bundle-Vendor: HfT Stuttgart Require-Bundle: javax.inject;bundle-version="1.0.0", @@ -26,6 +26,7 @@ Require-Bundle: javax.inject;bundle-version="1.0.0", de.hftstuttgart.cityunits.ui.renderer;bundle-version="1.0.1", tech.units.indriya;bundle-version="2.1.1" Import-Package: javax.annotation;version="1.3.5" -Automatic-Module-Name: de.hftstuttgart.energycomponents.app +Automatic-Module-Name: de.hftstuttgart.energycomponents.application Export-Package: de.hftstuttgart.energycomponents.app.handlers, de.hftstuttgart.energycomponents.app.parts;x-internal:=true +Bundle-RequiredExecutionEnvironment: JavaSE-15 diff --git a/de.hftstuttgart.energycomponents.application/build.properties b/de.hftstuttgart.energycomponents.application/build.properties index 04ab1e9b8f3cd4339dc61f93907610aecbd48895..7747874db96bfdc6a21686774cdc9876a263c41f 100644 --- a/de.hftstuttgart.energycomponents.application/build.properties +++ b/de.hftstuttgart.energycomponents.application/build.properties @@ -1,5 +1,4 @@ source.. = src/ -output.. = bin/ bin.includes = plugin.xml,\ META-INF/,\ .,\ diff --git a/de.hftstuttgart.energycomponents.application/de.hftstuttgart.energycomponents.app.product b/de.hftstuttgart.energycomponents.application/de.hftstuttgart.energycomponents.app.product deleted file mode 100644 index e8924e48d4c691fdcaaa12be32f483813cf3b2ad..0000000000000000000000000000000000000000 --- a/de.hftstuttgart.energycomponents.application/de.hftstuttgart.energycomponents.app.product +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?pde version="3.5"?> - -<product name="Energy Components Catalog" uid="de.hftstuttgart.energycomponents.app.product" id="de.hftstuttgart.energycomponents.app.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true"> - - <configIni use="default"> - </configIni> - - <launcherArgs> - <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts - </vmArgsMac> - </launcherArgs> - - <windowImages/> - - <launcher name="EnergCatalog"> - <macosx icon="/de.hftstuttgart.energycomponents.app/icons/cyberduck-application.icns"/> - <win useIco="false"> - <bmp/> - </win> - </launcher> - - <vm> - <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14</macos> - </vm> - - <plugins> - </plugins> - - <features> - <feature id="de.hftstuttgart.energycomponents.feature"/> - <feature id="org.eclipse.e4.rcp"/> - <feature id="org.eclipse.emf.ecp.emfforms.runtime.feature"/> - <feature id="org.eclipse.emf.common"/> - <feature id="org.eclipse.emf.common.ui"/> - <feature id="org.eclipse.emf.databinding"/> - <feature id="org.eclipse.emf.databinding.edit"/> - <feature id="org.eclipse.emf.ecore"/> - <feature id="org.eclipse.emf.ecore.edit"/> - <feature id="org.eclipse.emf.edit"/> - <feature id="org.eclipse.emf.edit.ui"/> - </features> - - - <preferencesInfo> - <targetfile overwrite="false"/> - </preferencesInfo> - - <cssInfo> - </cssInfo> - -</product> diff --git a/de.hftstuttgart.energycomponents.application/pom.xml b/de.hftstuttgart.energycomponents.application/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..638e83dc530911e9040afec6269ea5d11b7007f4 --- /dev/null +++ b/de.hftstuttgart.energycomponents.application/pom.xml @@ -0,0 +1,17 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <artifactId>de.hftstuttgart.energycomponents.application</artifactId> + <packaging>eclipse-plugin</packaging> + + <name>Energy Components Catalog Application</name> + <parent> + <groupId>de.hftstuttgart</groupId> + <artifactId>energycomponents.parent</artifactId> + <version>1.0.0</version> + <relativePath>../de.hftstuttgart.energycomponents.parent</relativePath> + </parent> + + +</project> \ No newline at end of file diff --git a/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/handlers/OpenHandler.java b/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/handlers/OpenHandler.java index fc37d08e0cf06efce8292db8842ae5f796942890..04b6ae87cb237327ed2037976fe979041c0ee619 100644 --- a/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/handlers/OpenHandler.java +++ b/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/handlers/OpenHandler.java @@ -2,20 +2,14 @@ package de.hftstuttgart.energycomponents.app.handlers; import javax.inject.Named; -import org.eclipse.e4.core.contexts.IEclipseContext; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.MApplication; import org.eclipse.e4.ui.services.IServiceConstants; import org.eclipse.e4.ui.workbench.modeling.EPartService; -import org.eclipse.emf.common.command.BasicCommandStack; -import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; -import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.swt.widgets.Shell; -import de.hftstuttgart.energycomponents.EnergyComponentsCatalog; - public class OpenHandler { @Execute public void execute(MApplication application, @Named(IServiceConstants.ACTIVE_SHELL) Shell shell, diff --git a/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/parts/CatalogPart.java b/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/parts/CatalogPart.java index f90d3b1ba15307257f7eed69d1cc6b6d13c09845..b4cb118c6d17405eaa7ad39fc1ace2a8d7db2024 100644 --- a/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/parts/CatalogPart.java +++ b/de.hftstuttgart.energycomponents.application/src/de/hftstuttgart/energycomponents/app/parts/CatalogPart.java @@ -6,22 +6,14 @@ import javax.annotation.PostConstruct; import org.eclipse.e4.ui.di.Persist; import org.eclipse.e4.ui.model.application.MApplication; -import org.eclipse.emf.common.command.BasicCommandStack; -import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecp.ui.view.ECPRendererException; import org.eclipse.emf.ecp.ui.view.swt.ECPSWTViewRenderer; -import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; -import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; -import de.hftstuttgart.energycomponents.EnCompPackage; -import de.hftstuttgart.energycomponents.EnergyComponentsCatalog; - /** * Part for displaying a Forms Editor for an EnergyComponentsCatalog. * See https://www.vogella.com/tutorials/Eclipse4Services/article.html#implementing-editor-like-behavior diff --git a/de.hftstuttgart.energycomponents.edit/.classpath b/de.hftstuttgart.energycomponents.edit/.classpath index 8e001f780d1583ea6dde810158da647d3cc15a56..bfd99b5fdccaedbf7019c1ecf728ea1e9452bf00 100644 --- a/de.hftstuttgart.energycomponents.edit/.classpath +++ b/de.hftstuttgart.energycomponents.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-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="src" path="src-gen/"/> + <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/de.hftstuttgart.energycomponents.edit/.project b/de.hftstuttgart.energycomponents.edit/.project index af0b502fb91da5e16e41cb9c6bfb0675d9825a48..9c616dd6d912e6ca82bb2bf7c0ddd16827a42e9d 100644 --- a/de.hftstuttgart.energycomponents.edit/.project +++ b/de.hftstuttgart.energycomponents.edit/.project @@ -20,8 +20,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> </natures> diff --git a/de.hftstuttgart.energycomponents.edit/build.properties b/de.hftstuttgart.energycomponents.edit/build.properties index a3c4e32afd5c06df8bd4f0d371e56479e0822559..bbc3e772f9b46c3f833add9747208aad8149a9cd 100644 --- a/de.hftstuttgart.energycomponents.edit/build.properties +++ b/de.hftstuttgart.energycomponents.edit/build.properties @@ -7,4 +7,3 @@ bin.includes = .,\ plugin.properties jars.compile.order = . source.. = src-gen/ -output.. = bin/ diff --git a/de.hftstuttgart.energycomponents.edit/pom.xml b/de.hftstuttgart.energycomponents.edit/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..917b008b4d1b4fb4df1b019a88fd7651469d123f --- /dev/null +++ b/de.hftstuttgart.energycomponents.edit/pom.xml @@ -0,0 +1,16 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <artifactId>de.hftstuttgart.energycomponents.edit</artifactId> + <packaging>eclipse-plugin</packaging> + <name>Energy Components Catalog Edit</name> + + <parent> + <groupId>de.hftstuttgart</groupId> + <artifactId>energycomponents.parent</artifactId> + <version>1.0.0</version> + <relativePath>../de.hftstuttgart.energycomponents.parent</relativePath> + </parent> + +</project> \ No newline at end of file diff --git a/de.hftstuttgart.energycomponents.feature/.project b/de.hftstuttgart.energycomponents.feature/.project index 0d70d9daea6b48d17326334924bd9d1e1288889e..f142cc59bc8352b02dece66d206e68db2ff0ecc4 100644 --- a/de.hftstuttgart.energycomponents.feature/.project +++ b/de.hftstuttgart.energycomponents.feature/.project @@ -10,8 +10,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.FeatureNature</nature> </natures> </projectDescription> diff --git a/de.hftstuttgart.energycomponents.feature/feature.xml b/de.hftstuttgart.energycomponents.feature/feature.xml index 67eb5893678809dd404b7e0f5f13a7f6b76e01d9..129d0516b6dc6661d10c78a2a452694a4b3b56ef 100644 --- a/de.hftstuttgart.energycomponents.feature/feature.xml +++ b/de.hftstuttgart.energycomponents.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="de.hftstuttgart.energycomponents.feature" label="Energy Components Feature" - version="1.0.0.qualifier" + version="1.0.0" provider-name="HfT Stuttgart"> <description url="http://www.example.com/description"> @@ -30,26 +30,6 @@ version="0.0.0" unpack="false"/> - <plugin - id="de.hftstuttgart.units" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="de.hftstuttgart.units.ui.renderer" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="de.hftstuttgart.indriya.osgiplugin" - download-size="0" - install-size="0" - version="0.0.0"/> - <plugin id="org.eclipse.ui" download-size="0" @@ -107,7 +87,7 @@ unpack="false"/> <plugin - id="de.hftstuttgart.energycomponents.app" + id="de.hftstuttgart.energycomponents.application" download-size="0" install-size="0" version="0.0.0" diff --git a/de.hftstuttgart.energycomponents.feature/pom.xml b/de.hftstuttgart.energycomponents.feature/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..e67e5649fd9e0e762b9b41341896c501aac3c8e9 --- /dev/null +++ b/de.hftstuttgart.energycomponents.feature/pom.xml @@ -0,0 +1,15 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <artifactId>de.hftstuttgart.energycomponents.feature</artifactId> + <packaging>eclipse-feature</packaging> + <name>Energy Components Catalog Feature</name> + + <parent> + <groupId>de.hftstuttgart</groupId> + <artifactId>energycomponents.parent</artifactId> + <version>1.0.0</version> + <relativePath>../de.hftstuttgart.energycomponents.parent</relativePath> + </parent> +</project> \ No newline at end of file diff --git a/de.hftstuttgart.energycomponents.model/.classpath b/de.hftstuttgart.energycomponents.model/.classpath index af08aa696f0db5ea8d27d261f4cb6f76ac3a3c46..0a41b4aef648381e9cb27065c0ea108bf33246c3 100644 --- a/de.hftstuttgart.energycomponents.model/.classpath +++ b/de.hftstuttgart.energycomponents.model/.classpath @@ -1,11 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src-gen"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> - <attributes> - <attribute name="module" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="output" path="bin"/> -</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-1.8"> + <attributes> + <attribute name="module" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src-gen/"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> diff --git a/de.hftstuttgart.energycomponents.model/.project b/de.hftstuttgart.energycomponents.model/.project index 6c45ab73ffc7ab045e9178bfbf00df0dc5332aee..1409b21c08492d54ea6100bcae499230d7e2d512 100644 --- a/de.hftstuttgart.energycomponents.model/.project +++ b/de.hftstuttgart.energycomponents.model/.project @@ -20,8 +20,14 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.sirius.nature.modelingproject</nature> <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.pde.PluginNature</nature> diff --git a/de.hftstuttgart.energycomponents.model/build.properties b/de.hftstuttgart.energycomponents.model/build.properties index 0e10ab4ffe9c6ffaf083fd3e7b4668ca8be8339d..883e98962d182d091e9a401251e189264ae1049f 100644 --- a/de.hftstuttgart.energycomponents.model/build.properties +++ b/de.hftstuttgart.energycomponents.model/build.properties @@ -7,4 +7,3 @@ bin.includes = .,\ plugin.properties jars.compile.order = . source.. = src-gen/ -output.. = bin/ diff --git a/de.hftstuttgart.energycomponents.model/pom.xml b/de.hftstuttgart.energycomponents.model/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..aebccd0f0a2419c46c9eb6f9bbf518cc21e02897 --- /dev/null +++ b/de.hftstuttgart.energycomponents.model/pom.xml @@ -0,0 +1,16 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <artifactId>de.hftstuttgart.energycomponents.model</artifactId> + <packaging>eclipse-plugin</packaging> + <name>Energy Components Catalog Model</name> + + <parent> + <groupId>de.hftstuttgart</groupId> + <artifactId>energycomponents.parent</artifactId> + <version>1.0.0</version> + <relativePath>../de.hftstuttgart.energycomponents.parent</relativePath> + </parent> + +</project> \ No newline at end of file diff --git a/de.hftstuttgart.energycomponents.parent/.project b/de.hftstuttgart.energycomponents.parent/.project new file mode 100644 index 0000000000000000000000000000000000000000..45d567ed65449a17431ed08bf4fe6b336b5e3e2d --- /dev/null +++ b/de.hftstuttgart.energycomponents.parent/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>de.hftstuttgart.energycomponents.parent</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> diff --git a/de.hftstuttgart.energycomponents.parent/pom.xml b/de.hftstuttgart.energycomponents.parent/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..f3c4c9fb02a67ec8af0615d5def9c24f85de9da6 --- /dev/null +++ b/de.hftstuttgart.energycomponents.parent/pom.xml @@ -0,0 +1,77 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>de.hftstuttgart</groupId> + <artifactId>energycomponents.parent</artifactId> + <version>1.0.0</version> + <packaging>pom</packaging> + <name>Energy Components Catalog Parent</name> + <description>Maven parent and aggregator project for Energy Components Catalog Model and Editor</description> + + <properties> + <tycho-version>2.2.0</tycho-version> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <source>15</source> + <target>15</target> + <encoding>UTF-8</encoding> + </configuration> + <extensions>true</extensions> + </plugin> + + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <executionEnvironment>JavaSE-15</executionEnvironment> + <target> + <artifact> + <groupId>de.hftstuttgart</groupId> + <artifactId>de.hftstuttgart.energycomponents.target</artifactId> + <version>1.0.0</version> + </artifact> + </target> + <resolveWithExecutionEnvironmentConstraints>false</resolveWithExecutionEnvironmentConstraints> + <environments> + <!-- environment> <os>linux</os> <ws>gtk</ws> <arch>x86</arch> </environment --> + <environment> + <os>linux</os> + <ws>gtk</ws> + <arch>x86_64</arch> + </environment> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86_64</arch> + </environment> + <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + </plugins> + </build> + + <modules> + <module>../de.hftstuttgart.energycomponents.model</module> + <module>../de.hftstuttgart.energycomponents.edit</module> + <module>../de.hftstuttgart.energycomponents.viewmodel</module> + <module>../de.hftstuttgart.energycomponents.application</module> + <module>../de.hftstuttgart.energycomponents.feature</module> + <module>../de.hftstuttgart.energycomponents.product</module> + <module>../de.hftstuttgart.energycomponents.target</module> + </modules> + +</project> \ No newline at end of file diff --git a/de.hftstuttgart.energycomponents.product/.project b/de.hftstuttgart.energycomponents.product/.project new file mode 100644 index 0000000000000000000000000000000000000000..385030b056b6a4429ba2cf24202d1e332f2fb9a7 --- /dev/null +++ b/de.hftstuttgart.energycomponents.product/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>de.hftstuttgart.energycomponents.product</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> diff --git a/de.hftstuttgart.energycomponents.product/de.hftstuttgart.energycomponents.app.product b/de.hftstuttgart.energycomponents.product/de.hftstuttgart.energycomponents.app.product new file mode 100644 index 0000000000000000000000000000000000000000..f05452853b28e357c050d2e57e2f70e933ac62a8 --- /dev/null +++ b/de.hftstuttgart.energycomponents.product/de.hftstuttgart.energycomponents.app.product @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?pde version="3.5"?> + +<product name="Energy Components Catalog Editor" uid="de.hftstuttgart.energycomponents.application.product" + id="de.hftstuttgart.energycomponents.application.product" + application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0" + useFeatures="true" includeLaunchers="true"> + + <configIni use="default"> + </configIni> + + <launcherArgs> + <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + </vmArgsMac> + </launcherArgs> + + <windowImages/> + + <launcher name="EnergyCompCatalogs"> + <win useIco="false"> + <bmp/> + </win> + </launcher> + + <vm> + </vm> + + <plugins> + <plugin id="org.eclipse.emf.ecp.ui.view.swt"/> + <plugin id="org.eclipse.emf.ecp.view.model.provider.xmi"/> + </plugins> + + <features> + <feature id="de.hftstuttgart.energycomponents.feature"/> + <feature id="org.eclipse.emf.ecp.viewmodel.feature" installMode="root"/> + <feature id="org.eclipse.emf.ecp.view.categorization.feature" installMode="root"/> + <feature id="org.eclipse.emf.ecp.view.group.feature" installMode="root"/> + <feature id="org.eclipse.emf.ecp.view.label.feature" installMode="root"/> + <feature id="org.eclipse.emf.ecp.view.table.feature" installMode="root"/> + <feature id="org.eclipse.equinox.sdk" installMode="root"/> + <feature id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped" installMode="root"/> + </features> + + <configurations> + <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" /> + <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" /> + <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"/> + </preferencesInfo> + + <cssInfo> + </cssInfo> + +</product> diff --git a/de.hftstuttgart.energycomponents.product/pom.xml b/de.hftstuttgart.energycomponents.product/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..5b27b0ff9e18db848797e84e6d6a75dc280f0267 --- /dev/null +++ b/de.hftstuttgart.energycomponents.product/pom.xml @@ -0,0 +1,46 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <artifactId>de.hftstuttgart.energycomponents.product</artifactId> + <packaging>eclipse-repository</packaging> + <name>Energy Components Catalog Product</name> + + <parent> + <groupId>de.hftstuttgart</groupId> + <artifactId>energycomponents.parent</artifactId> + <version>1.0.0</version> + <relativePath>../de.hftstuttgart.energycomponents.parent</relativePath> + </parent> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-director-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <formats> + <win32>zip</win32> + <linux>tar.gz</linux> + <macosx>zip</macosx> + </formats> + </configuration> + <executions> + <execution> + <id>materialize-products</id> + <goals> + <goal>materialize-products</goal> + </goals> + </execution> + <execution> + <id>archive-products</id> + <goals> + <goal>archive-products</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file diff --git a/de.hftstuttgart.energycomponents.target/.project b/de.hftstuttgart.energycomponents.target/.project index 201c174e553ec58b9cbb36efd852801849eebb7b..1a97e8db37d97204d065e23bbdfb0efa5dd93c39 100644 --- a/de.hftstuttgart.energycomponents.target/.project +++ b/de.hftstuttgart.energycomponents.target/.project @@ -5,7 +5,13 @@ <projects> </projects> <buildSpec> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> </natures> </projectDescription> diff --git a/de.hftstuttgart.energycomponents.target/energycomponents.target.target b/de.hftstuttgart.energycomponents.target/energycomponents.target.target index f8387251eda947f03464de65afa9ead72a39f65a..29a4420bd7c606afee9a0c7cf0a25f3cb96dd40e 100644 --- a/de.hftstuttgart.energycomponents.target/energycomponents.target.target +++ b/de.hftstuttgart.energycomponents.target/energycomponents.target.target @@ -24,4 +24,5 @@ <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.stripped.feature.group" version="15.0.2.v20210201-0955"/> </location> </locations> + <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/OpenJDK 15"/> </target> \ No newline at end of file diff --git a/de.hftstuttgart.energycomponents.target/pom.xml b/de.hftstuttgart.energycomponents.target/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..f0cd5332bde7956b857a40624f8f7cd218d96191 --- /dev/null +++ b/de.hftstuttgart.energycomponents.target/pom.xml @@ -0,0 +1,16 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <artifactId>de.hftstuttgart.energycomponents.target</artifactId> + <packaging>eclipse-target-definition</packaging> + <name>Energy Components Catalog Target Definition</name> + + <parent> + <groupId>de.hftstuttgart</groupId> + <artifactId>energycomponents.parent</artifactId> + <version>1.0.0</version> + <relativePath>../de.hftstuttgart.energycomponents.parent</relativePath> + </parent> + +</project> \ No newline at end of file diff --git a/de.hftstuttgart.energycomponents.viewmodel/.classpath b/de.hftstuttgart.energycomponents.viewmodel/.classpath new file mode 100644 index 0000000000000000000000000000000000000000..a9f4be78775fb2ba0b07e158301ada9c3be319a1 --- /dev/null +++ b/de.hftstuttgart.energycomponents.viewmodel/.classpath @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> diff --git a/de.hftstuttgart.energycomponents.viewmodel/.project b/de.hftstuttgart.energycomponents.viewmodel/.project index d673eb348a40a823399412b0d66bb598f5592cb2..ef7b6a079009fdec256b1241141a97070a9fee24 100644 --- a/de.hftstuttgart.energycomponents.viewmodel/.project +++ b/de.hftstuttgart.energycomponents.viewmodel/.project @@ -5,6 +5,11 @@ <projects> </projects> <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> <buildCommand> <name>org.eclipse.pde.ManifestBuilder</name> <arguments> @@ -20,9 +25,16 @@ <arguments> </arguments> </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> <nature>org.eclipse.pde.PluginNature</nature> <nature>org.eclipse.emfforms.ide.builder.viewModelNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> </natures> </projectDescription> diff --git a/de.hftstuttgart.energycomponents.viewmodel/META-INF/MANIFEST.MF b/de.hftstuttgart.energycomponents.viewmodel/META-INF/MANIFEST.MF index 3be854e3ece9f093f564de665c82d67d67ce8f51..8c857993d38dff1b56dd8084a186b73c37db76b9 100644 --- a/de.hftstuttgart.energycomponents.viewmodel/META-INF/MANIFEST.MF +++ b/de.hftstuttgart.energycomponents.viewmodel/META-INF/MANIFEST.MF @@ -2,5 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: de.hftstuttgart.energycomponents.viewmodel Bundle-SymbolicName: de.hftstuttgart.energycomponents.viewmodel;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.0 Require-Bundle: org.eclipse.emf.ecp.view.model.provider.xmi +Bundle-RequiredExecutionEnvironment: JavaSE-15 +Automatic-Module-Name: de.hftstuttgart.energycomponents.viewmodel diff --git a/de.hftstuttgart.energycomponents.viewmodel/pom.xml b/de.hftstuttgart.energycomponents.viewmodel/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..ee7c180a73a73130c47795f13118a5c910a30110 --- /dev/null +++ b/de.hftstuttgart.energycomponents.viewmodel/pom.xml @@ -0,0 +1,16 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <artifactId>de.hftstuttgart.energycomponents.viewmodel</artifactId> + <packaging>eclipse-plugin</packaging> + <name>Energy Components Catalog View Model</name> + + <parent> + <groupId>de.hftstuttgart</groupId> + <artifactId>energycomponents.parent</artifactId> + <version>1.0.0</version> + <relativePath>../de.hftstuttgart.energycomponents.parent</relativePath> + </parent> + +</project> \ No newline at end of file