From c49a802beeaee65bf096184f444512059f38d04c Mon Sep 17 00:00:00 2001
From: Kai Brassel <mail@khbrassel.de>
Date: Sat, 9 Jan 2021 13:43:32 +0100
Subject: [PATCH] Correct package name and Java compliance level for code
generation
---
.../model/Quantities.ecore | 4 +--
.../model/Quantities.genmodel | 6 ++--
.../model/quantities/QuantitiesPackage.java | 28 +++++++++----------
.../impl/QuantitiesFactoryImpl.java | 2 +-
.../impl/QuantitiesPackageImpl.java | 6 ++--
5 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/de.hft-stuttgart.cityunits.model/model/Quantities.ecore b/de.hft-stuttgart.cityunits.model/model/Quantities.ecore
index 578b48c..a26cc48 100644
--- a/de.hft-stuttgart.cityunits.model/model/Quantities.ecore
+++ b/de.hft-stuttgart.cityunits.model/model/Quantities.ecore
@@ -2,6 +2,6 @@
<ecore:EPackage 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" name="quantities" nsURI="https://www.hft-stuttgart.de/quantities"
nsPrefix="quant">
- <eClassifiers xsi:type="ecore:EDataType" name="QuantityDouble" instanceClassName="de.hftstuttgart.cityunits.NullableQuantity"/>
- <eClassifiers xsi:type="ecore:EDataType" name="QuantityLong" instanceClassName="de.hftstuttgart.cityunits.NullableQuantity"/>
+ <eClassifiers xsi:type="ecore:EDataType" name="QuantityDouble" instanceClassName="de.hftstuttgart.cityunits.model.NullableQuantity"/>
+ <eClassifiers xsi:type="ecore:EDataType" name="QuantityLong" instanceClassName="de.hftstuttgart.cityunits.model.NullableQuantity"/>
</ecore:EPackage>
diff --git a/de.hft-stuttgart.cityunits.model/model/Quantities.genmodel b/de.hft-stuttgart.cityunits.model/model/Quantities.genmodel
index 4a9abe2..28dff20 100644
--- a/de.hft-stuttgart.cityunits.model/model/Quantities.genmodel
+++ b/de.hft-stuttgart.cityunits.model/model/Quantities.genmodel
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
- modelDirectory="/de.hft-stuttgart.cityunits/src" modelPluginID="de.hft-stuttgart.cityunits"
+ modelDirectory="/de.hft-stuttgart.cityunits.model/src" modelPluginID="de.hft-stuttgart.cityunits.model"
modelName="Quantities" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
- importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+ importerID="org.eclipse.emf.importer.ecore" complianceLevel="15.0" copyrightFields="false"
operationReflection="true" importOrganizing="true">
<foreignModel>Quantities.ecore</foreignModel>
- <genPackages prefix="Quantities" basePackage="de.hftstuttgart.cityunits" disposableProviderFactory="true"
+ <genPackages prefix="Quantities" basePackage="de.hftstuttgart.cityunits.model" disposableProviderFactory="true"
ecorePackage="Quantities.ecore#/">
<genDataTypes ecoreDataType="Quantities.ecore#//QuantityDouble"/>
<genDataTypes ecoreDataType="Quantities.ecore#//QuantityLong"/>
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesPackage.java b/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesPackage.java
index caa925b..441bc70 100644
--- a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesPackage.java
+++ b/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesPackage.java
@@ -58,8 +58,8 @@ public interface QuantitiesPackage extends EPackage {
* The meta object id for the '<em>Quantity Double</em>' data type.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see de.hft-stuttgart.cityunits.NullableQuantity
- * @see de.hft-stuttgart.cityunits.quantities.impl.QuantitiesPackageImpl#getQuantityDouble()
+ * @see de.hftstuttgart.cityunits.model.NullableQuantity
+ * @see de.hftstuttgart.cityunits.model.quantities.impl.QuantitiesPackageImpl#getQuantityDouble()
* @generated
*/
int QUANTITY_DOUBLE = 0;
@@ -68,31 +68,31 @@ public interface QuantitiesPackage extends EPackage {
* The meta object id for the '<em>Quantity Long</em>' data type.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see de.hft-stuttgart.cityunits.NullableQuantity
- * @see de.hft-stuttgart.cityunits.quantities.impl.QuantitiesPackageImpl#getQuantityLong()
+ * @see de.hftstuttgart.cityunits.model.NullableQuantity
+ * @see de.hftstuttgart.cityunits.model.quantities.impl.QuantitiesPackageImpl#getQuantityLong()
* @generated
*/
int QUANTITY_LONG = 1;
/**
- * Returns the meta object for data type '{@link de.hft-stuttgart.cityunits.NullableQuantity <em>Quantity Double</em>}'.
+ * Returns the meta object for data type '{@link de.hftstuttgart.cityunits.model.NullableQuantity <em>Quantity Double</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for data type '<em>Quantity Double</em>'.
- * @see de.hft-stuttgart.cityunits.NullableQuantity
- * @model instanceClass="de.hft-stuttgart.cityunits.NullableQuantity"
+ * @see de.hftstuttgart.cityunits.model.NullableQuantity
+ * @model instanceClass="de.hftstuttgart.cityunits.model.NullableQuantity"
* @generated
*/
EDataType getQuantityDouble();
/**
- * Returns the meta object for data type '{@link de.hft-stuttgart.cityunits.NullableQuantity <em>Quantity Long</em>}'.
+ * Returns the meta object for data type '{@link de.hftstuttgart.cityunits.model.NullableQuantity <em>Quantity Long</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for data type '<em>Quantity Long</em>'.
- * @see de.hft-stuttgart.cityunits.NullableQuantity
- * @model instanceClass="de.hft-stuttgart.cityunits.NullableQuantity"
+ * @see de.hftstuttgart.cityunits.model.NullableQuantity
+ * @model instanceClass="de.hftstuttgart.cityunits.model.NullableQuantity"
* @generated
*/
EDataType getQuantityLong();
@@ -124,8 +124,8 @@ public interface QuantitiesPackage extends EPackage {
* The meta object literal for the '<em>Quantity Double</em>' data type.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see de.hft-stuttgart.cityunits.NullableQuantity
- * @see de.hft-stuttgart.cityunits.quantities.impl.QuantitiesPackageImpl#getQuantityDouble()
+ * @see de.hftstuttgart.cityunits.model.NullableQuantity
+ * @see de.hftstuttgart.cityunits.model.quantities.impl.QuantitiesPackageImpl#getQuantityDouble()
* @generated
*/
EDataType QUANTITY_DOUBLE = eINSTANCE.getQuantityDouble();
@@ -134,8 +134,8 @@ public interface QuantitiesPackage extends EPackage {
* The meta object literal for the '<em>Quantity Long</em>' data type.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see de.hft-stuttgart.cityunits.NullableQuantity
- * @see de.hft-stuttgart.cityunits.quantities.impl.QuantitiesPackageImpl#getQuantityLong()
+ * @see de.hftstuttgart.cityunits.model.NullableQuantity
+ * @see de.hftstuttgart.cityunits.model.quantities.impl.QuantitiesPackageImpl#getQuantityLong()
* @generated
*/
EDataType QUANTITY_LONG = eINSTANCE.getQuantityLong();
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java b/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java
index 6f2934b..9e3118e 100644
--- a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java
+++ b/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java
@@ -3,7 +3,6 @@
package de.hftstuttgart.cityunits.model.quantities.impl;
import de.hftstuttgart.cityunits.model.NullableQuantity;
-
import de.hftstuttgart.cityunits.model.quantities.*;
import org.eclipse.emf.ecore.EClass;
@@ -139,6 +138,7 @@ public class QuantitiesFactoryImpl extends EFactoryImpl implements QuantitiesFac
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public QuantitiesPackage getQuantitiesPackage() {
return (QuantitiesPackage)getEPackage();
}
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesPackageImpl.java b/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesPackageImpl.java
index 7978cee..fdee812 100644
--- a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesPackageImpl.java
+++ b/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesPackageImpl.java
@@ -3,7 +3,6 @@
package de.hftstuttgart.cityunits.model.quantities.impl;
import de.hftstuttgart.cityunits.model.NullableQuantity;
-
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
@@ -44,7 +43,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry
- * @see de.hftstuttgart.cityunits.quantities.QuantitiesPackage#eNS_URI
+ * @see de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage#eNS_URI
* @see #init()
* @generated
*/
@@ -99,6 +98,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EDataType getQuantityDouble() {
return quantityDoubleEDataType;
}
@@ -108,6 +108,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public EDataType getQuantityLong() {
return quantityLongEDataType;
}
@@ -117,6 +118,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac
* <!-- end-user-doc -->
* @generated
*/
+ @Override
public QuantitiesFactory getQuantitiesFactory() {
return (QuantitiesFactory)getEFactoryInstance();
}
--
GitLab