Moved and renamed ...energycomponents to ...energycomponents.model

01673354 · Kai-Holger Brassel · b2abc6df · 01673354 · 01673354 · 01673354
Commit 01673354 authored 4 years ago by Kai-Holger Brassel
Hide whitespace changes
Inline Side-by-side

Showing

with 8 additions and 9 deletions
+8 -9
--- a/de.hftstuttgart.energycomponents/src-gen/de/hftstuttgart/energycomponents/util/EnCompAdapterFactory.java
+++ b/de.hftstuttgart.energycomponents/src-gen/de/hftstuttgart/energycomponents/util/EnCompAdapterFactory.java
--- a/de.hftstuttgart.energycomponents/src-gen/de/hftstuttgart/energycomponents/util/EnCompSwitch.java
+++ b/de.hftstuttgart.energycomponents/src-gen/de/hftstuttgart/energycomponents/util/EnCompSwitch.java
--- a/de.hftstuttgart.energycomponents.viewmodel/viewmodels/EnergyComponentsCatalog.view
+++ b/de.hftstuttgart.energycomponents.viewmodel/viewmodels/EnergyComponentsCatalog.view
@@ -565,5 +565,5 @@
      </categorizations>
    </categorizations>
  </children>
-  <ecorePaths>/de.hftstuttgart.energycomponents/model/EnergyComponents.ecore</ecorePaths>
+  <ecorePaths>/de.hftstuttgart.energycomponents.model/model/EnergyComponents.ecore</ecorePaths>
 </org.eclipse.emf.ecp.view.model:View>
--- a/de.hftstuttgart.energycomponents.viewmodel/viewmodels/ExponentionalCharacteristic.view
+++ b/de.hftstuttgart.energycomponents.viewmodel/viewmodels/ExponentionalCharacteristic.view
@@ -6,5 +6,5 @@
      <domainModelEFeature xsi:type="ecore:EReference" href="https://www.hft-stuttgart.de/energycomponents#//ExponentionalCharacteristic/functions"/>
    </domainModelReference>
  </children>
-  <ecorePaths>/de.hftstuttgart.energycomponents/model/EnergyComponents.ecore</ecorePaths>
+  <ecorePaths>/de.hftstuttgart.energycomponents.model/model/EnergyComponents.ecore</ecorePaths>
 </org.eclipse.emf.ecp.view.model:View>
--- a/de.hftstuttgart.energycomponents.viewmodel/viewmodels/LinearCharacteristic.view
+++ b/de.hftstuttgart.energycomponents.viewmodel/viewmodels/LinearCharacteristic.view
@@ -6,5 +6,5 @@
      <domainModelEFeature xsi:type="ecore:EReference" href="https://www.hft-stuttgart.de/energycomponents#//LinearCharacteristic/functions"/>
    </domainModelReference>
  </children>
-  <ecorePaths>/de.hftstuttgart.energycomponents/model/EnergyComponents.ecore</ecorePaths>
+  <ecorePaths>/de.hftstuttgart.energycomponents.model/model/EnergyComponents.ecore</ecorePaths>
 </org.eclipse.emf.ecp.view.model:View>
--- a/de.hftstuttgart.energycomponents.viewmodel/viewmodels/PolynomialCharacteristic.view
+++ b/de.hftstuttgart.energycomponents.viewmodel/viewmodels/PolynomialCharacteristic.view
@@ -6,5 +6,5 @@
      <domainModelEFeature xsi:type="ecore:EReference" href="https://www.hft-stuttgart.de/energycomponents#//PolynomialCharacteristic/functions"/>
    </domainModelReference>
  </children>
-  <ecorePaths>/de.hftstuttgart.energycomponents/model/EnergyComponents.ecore</ecorePaths>
+  <ecorePaths>/de.hftstuttgart.energycomponents.model/model/EnergyComponents.ecore</ecorePaths>
 </org.eclipse.emf.ecp.view.model:View>
--- a/de.hftstuttgart.energycomponents.viewmodel/viewmodels/PowerCharacteristic.view
+++ b/de.hftstuttgart.energycomponents.viewmodel/viewmodels/PowerCharacteristic.view
@@ -6,5 +6,5 @@
      <domainModelEFeature xsi:type="ecore:EReference" href="https://www.hft-stuttgart.de/energycomponents#//PowerCharacteristic/functions"/>
    </domainModelReference>
  </children>
-  <ecorePaths>/de.hftstuttgart.energycomponents/model/EnergyComponents.ecore</ecorePaths>
+  <ecorePaths>/de.hftstuttgart.energycomponents.model/model/EnergyComponents.ecore</ecorePaths>
 </org.eclipse.emf.ecp.view.model:View>
--- a/de.hftstuttgart.energycomponents.viewmodel/viewmodels/TableCharacteristic.view
+++ b/de.hftstuttgart.energycomponents.viewmodel/viewmodels/TableCharacteristic.view
@@ -6,5 +6,5 @@
      <domainModelEFeature xsi:type="ecore:EReference" href="https://www.hft-stuttgart.de/energycomponents#//TableCharacteristic/functions"/>
    </domainModelReference>
  </children>
-  <ecorePaths>/de.hftstuttgart.energycomponents/model/EnergyComponents.ecore</ecorePaths>
+  <ecorePaths>/de.hftstuttgart.energycomponents.model/model/EnergyComponents.ecore</ecorePaths>
 </org.eclipse.emf.ecp.view.model:View>
--- a/de.hftstuttgart.energycomponents.viewmodel/viewmodels/TableFunction.view
+++ b/de.hftstuttgart.energycomponents.viewmodel/viewmodels/TableFunction.view
@@ -13,5 +13,5 @@
      </domainModelReference>
    </domainModelReference>
  </children>
-  <ecorePaths>/de.hftstuttgart.energycomponents/model/EnergyComponents.ecore</ecorePaths>
+  <ecorePaths>/de.hftstuttgart.energycomponents.model/model/EnergyComponents.ecore</ecorePaths>
 </org.eclipse.emf.ecp.view.model:View>
--- a/de.hftstuttgart.indriya.osgiplugin/build.properties
+++ b/de.hftstuttgart.indriya.osgiplugin/build.properties
 bin.includes = META-INF/,\
               indriya-2.0.2.jar,\
-               javax.inject-1.jar,\
               unit-api-2.0.jar,\
               uom-lib-common-2.0.jar
--- a/de.hftstuttgart.units.ui.renderer/META-INF/MANIFEST.MF
+++ b/de.hftstuttgart.units.ui.renderer/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.emf.ecp.edit.swt;bundle-version="1.23.0",
 org.eclipse.emfforms.core.services.editsupport;bundle-version="1.23.0",
 org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
 org.eclipse.emfforms.swt.core.di;bundle-version="1.23.0",
- de.hftstuttgart.energycomponents;bundle-version="1.0.0",
+ de.hftstuttgart.energycomponents.model;bundle-version="1.0.0",
 de.hftstuttgart.units;bundle-version="1.0.0",
 de.hftstuttgart.indriya.osgiplugin;bundle-version="1.0.0",
 org.eclipse.emfforms.localization,