Commit c49a802b authored by Kai-Holger Brassel's avatar Kai-Holger Brassel
Browse files

Correct package name and Java compliance level for code generation

parent aedbdea1
...@@ -2,6 +2,6 @@ ...@@ -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" <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" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="quantities" nsURI="https://www.hft-stuttgart.de/quantities"
nsPrefix="quant"> nsPrefix="quant">
<eClassifiers xsi:type="ecore:EDataType" name="QuantityDouble" 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.NullableQuantity"/> <eClassifiers xsi:type="ecore:EDataType" name="QuantityLong" instanceClassName="de.hftstuttgart.cityunits.model.NullableQuantity"/>
</ecore:EPackage> </ecore:EPackage>
<?xml version="1.0" encoding="UTF-8"?> <?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" <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" 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"> operationReflection="true" importOrganizing="true">
<foreignModel>Quantities.ecore</foreignModel> <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#/"> ecorePackage="Quantities.ecore#/">
<genDataTypes ecoreDataType="Quantities.ecore#//QuantityDouble"/> <genDataTypes ecoreDataType="Quantities.ecore#//QuantityDouble"/>
<genDataTypes ecoreDataType="Quantities.ecore#//QuantityLong"/> <genDataTypes ecoreDataType="Quantities.ecore#//QuantityLong"/>
......
...@@ -58,8 +58,8 @@ public interface QuantitiesPackage extends EPackage { ...@@ -58,8 +58,8 @@ public interface QuantitiesPackage extends EPackage {
* The meta object id for the '<em>Quantity Double</em>' data type. * The meta object id for the '<em>Quantity Double</em>' data type.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see de.hft-stuttgart.cityunits.NullableQuantity * @see de.hftstuttgart.cityunits.model.NullableQuantity
* @see de.hft-stuttgart.cityunits.quantities.impl.QuantitiesPackageImpl#getQuantityDouble() * @see de.hftstuttgart.cityunits.model.quantities.impl.QuantitiesPackageImpl#getQuantityDouble()
* @generated * @generated
*/ */
int QUANTITY_DOUBLE = 0; int QUANTITY_DOUBLE = 0;
...@@ -68,31 +68,31 @@ public interface QuantitiesPackage extends EPackage { ...@@ -68,31 +68,31 @@ public interface QuantitiesPackage extends EPackage {
* The meta object id for the '<em>Quantity Long</em>' data type. * The meta object id for the '<em>Quantity Long</em>' data type.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see de.hft-stuttgart.cityunits.NullableQuantity * @see de.hftstuttgart.cityunits.model.NullableQuantity
* @see de.hft-stuttgart.cityunits.quantities.impl.QuantitiesPackageImpl#getQuantityLong() * @see de.hftstuttgart.cityunits.model.quantities.impl.QuantitiesPackageImpl#getQuantityLong()
* @generated * @generated
*/ */
int QUANTITY_LONG = 1; 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 --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the meta object for data type '<em>Quantity Double</em>'. * @return the meta object for data type '<em>Quantity Double</em>'.
* @see de.hft-stuttgart.cityunits.NullableQuantity * @see de.hftstuttgart.cityunits.model.NullableQuantity
* @model instanceClass="de.hft-stuttgart.cityunits.NullableQuantity" * @model instanceClass="de.hftstuttgart.cityunits.model.NullableQuantity"
* @generated * @generated
*/ */
EDataType getQuantityDouble(); 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 --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @return the meta object for data type '<em>Quantity Long</em>'. * @return the meta object for data type '<em>Quantity Long</em>'.
* @see de.hft-stuttgart.cityunits.NullableQuantity * @see de.hftstuttgart.cityunits.model.NullableQuantity
* @model instanceClass="de.hft-stuttgart.cityunits.NullableQuantity" * @model instanceClass="de.hftstuttgart.cityunits.model.NullableQuantity"
* @generated * @generated
*/ */
EDataType getQuantityLong(); EDataType getQuantityLong();
...@@ -124,8 +124,8 @@ public interface QuantitiesPackage extends EPackage { ...@@ -124,8 +124,8 @@ public interface QuantitiesPackage extends EPackage {
* The meta object literal for the '<em>Quantity Double</em>' data type. * The meta object literal for the '<em>Quantity Double</em>' data type.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see de.hft-stuttgart.cityunits.NullableQuantity * @see de.hftstuttgart.cityunits.model.NullableQuantity
* @see de.hft-stuttgart.cityunits.quantities.impl.QuantitiesPackageImpl#getQuantityDouble() * @see de.hftstuttgart.cityunits.model.quantities.impl.QuantitiesPackageImpl#getQuantityDouble()
* @generated * @generated
*/ */
EDataType QUANTITY_DOUBLE = eINSTANCE.getQuantityDouble(); EDataType QUANTITY_DOUBLE = eINSTANCE.getQuantityDouble();
...@@ -134,8 +134,8 @@ public interface QuantitiesPackage extends EPackage { ...@@ -134,8 +134,8 @@ public interface QuantitiesPackage extends EPackage {
* The meta object literal for the '<em>Quantity Long</em>' data type. * The meta object literal for the '<em>Quantity Long</em>' data type.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see de.hft-stuttgart.cityunits.NullableQuantity * @see de.hftstuttgart.cityunits.model.NullableQuantity
* @see de.hft-stuttgart.cityunits.quantities.impl.QuantitiesPackageImpl#getQuantityLong() * @see de.hftstuttgart.cityunits.model.quantities.impl.QuantitiesPackageImpl#getQuantityLong()
* @generated * @generated
*/ */
EDataType QUANTITY_LONG = eINSTANCE.getQuantityLong(); EDataType QUANTITY_LONG = eINSTANCE.getQuantityLong();
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
package de.hftstuttgart.cityunits.model.quantities.impl; package de.hftstuttgart.cityunits.model.quantities.impl;
import de.hftstuttgart.cityunits.model.NullableQuantity; import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.*; import de.hftstuttgart.cityunits.model.quantities.*;
import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClass;
...@@ -139,6 +138,7 @@ public class QuantitiesFactoryImpl extends EFactoryImpl implements QuantitiesFac ...@@ -139,6 +138,7 @@ public class QuantitiesFactoryImpl extends EFactoryImpl implements QuantitiesFac
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
@Override
public QuantitiesPackage getQuantitiesPackage() { public QuantitiesPackage getQuantitiesPackage() {
return (QuantitiesPackage)getEPackage(); return (QuantitiesPackage)getEPackage();
} }
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
package de.hftstuttgart.cityunits.model.quantities.impl; package de.hftstuttgart.cityunits.model.quantities.impl;
import de.hftstuttgart.cityunits.model.NullableQuantity; import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory; import de.hftstuttgart.cityunits.model.quantities.QuantitiesFactory;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage; import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
...@@ -44,7 +43,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac ...@@ -44,7 +43,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @see org.eclipse.emf.ecore.EPackage.Registry * @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() * @see #init()
* @generated * @generated
*/ */
...@@ -99,6 +98,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac ...@@ -99,6 +98,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
@Override
public EDataType getQuantityDouble() { public EDataType getQuantityDouble() {
return quantityDoubleEDataType; return quantityDoubleEDataType;
} }
...@@ -108,6 +108,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac ...@@ -108,6 +108,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
@Override
public EDataType getQuantityLong() { public EDataType getQuantityLong() {
return quantityLongEDataType; return quantityLongEDataType;
} }
...@@ -117,6 +118,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac ...@@ -117,6 +118,7 @@ public class QuantitiesPackageImpl extends EPackageImpl implements QuantitiesPac
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
@Override
public QuantitiesFactory getQuantitiesFactory() { public QuantitiesFactory getQuantitiesFactory() {
return (QuantitiesFactory)getEFactoryInstance(); return (QuantitiesFactory)getEFactoryInstance();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment