diff --git a/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/BueATZusatzItemProvider.java b/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/BueATZusatzItemProvider.java index ef886baa..c9e1e884 100644 --- a/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/BueATZusatzItemProvider.java +++ b/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/BueATZusatzItemProvider.java @@ -18,30 +18,21 @@ import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.set.model.planpro.PlanPro.provider.PlanProEditPlugin; +import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.BueATZusatz; + +import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.provider.Signalbegriff_ID_TypeClassItemProvider; + /** * This is the item provider adapter for a {@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.BueATZusatz} object. * * * @generated */ -public class BueATZusatzItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { +public class BueATZusatzItemProvider extends Signalbegriff_ID_TypeClassItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -96,7 +87,10 @@ protected boolean shouldComposeCreationImage() { */ @Override public String getText(Object object) { - return getString("_UI_BueATZusatz_type"); + String label = ((BueATZusatz)object).getSymbol(); + return label == null || label.length() == 0 ? + getString("_UI_BueATZusatz_type") : + getString("_UI_BueATZusatz_type") + " " + label; } diff --git a/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/OzFakItemProvider.java b/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/OzFakItemProvider.java index 103d09cb..0c818950 100644 --- a/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/OzFakItemProvider.java +++ b/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/OzFakItemProvider.java @@ -18,30 +18,21 @@ import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.set.model.planpro.PlanPro.provider.PlanProEditPlugin; +import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzFak; + +import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.provider.Signalbegriff_ID_TypeClassItemProvider; + /** * This is the item provider adapter for a {@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzFak} object. * * * @generated */ -public class OzFakItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { +public class OzFakItemProvider extends Signalbegriff_ID_TypeClassItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -96,7 +87,10 @@ protected boolean shouldComposeCreationImage() { */ @Override public String getText(Object object) { - return getString("_UI_OzFak_type"); + String label = ((OzFak)object).getSymbol(); + return label == null || label.length() == 0 ? + getString("_UI_OzFak_type") : + getString("_UI_OzFak_type") + " " + label; } diff --git a/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/OzZuglItemProvider.java b/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/OzZuglItemProvider.java index 6a7eb606..86c7ed02 100644 --- a/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/OzZuglItemProvider.java +++ b/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/OzZuglItemProvider.java @@ -18,21 +18,13 @@ import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; -import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; -import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.set.model.planpro.PlanPro.provider.PlanProEditPlugin; import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzZugl; -import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.Signalbegriffe_Ril_301Package; + +import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.provider.Signalbegriff_ID_TypeClassItemProvider; /** * This is the item provider adapter for a {@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzZugl} object. @@ -40,14 +32,7 @@ * * @generated */ -public class OzZuglItemProvider - extends ItemProviderAdapter - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { +public class OzZuglItemProvider extends Signalbegriff_ID_TypeClassItemProvider { /** * This constructs an instance from a factory and a notifier. * @@ -69,33 +54,10 @@ public List getPropertyDescriptors(Object object) { if (itemPropertyDescriptors == null) { super.getPropertyDescriptors(object); - addSymbolPropertyDescriptor(object); } return itemPropertyDescriptors; } - /** - * This adds a property descriptor for the Symbol feature. - * - * - * @generated - */ - protected void addSymbolPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_OzZugl_symbol_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_OzZugl_symbol_feature", "_UI_OzZugl_type"), - Signalbegriffe_Ril_301Package.eINSTANCE.getOzZugl_Symbol(), - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); - } - /** * This returns OzZugl.gif. * @@ -142,12 +104,6 @@ public String getText(Object object) { @Override public void notifyChanged(Notification notification) { updateChildren(notification); - - switch (notification.getFeatureID(OzZugl.class)) { - case Signalbegriffe_Ril_301Package.OZ_ZUGL__SYMBOL: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } super.notifyChanged(notification); } diff --git a/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signale/provider/Signal_SignalbegriffItemProvider.java b/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signale/provider/Signal_SignalbegriffItemProvider.java index 4012fdc2..2bd5888c 100644 --- a/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signale/provider/Signal_SignalbegriffItemProvider.java +++ b/java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signale/provider/Signal_SignalbegriffItemProvider.java @@ -289,6 +289,11 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors (SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID, Signalbegriffe_Ril_301Factory.eINSTANCE.createBueAT())); + newChildDescriptors.add + (createChildParameter + (SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID, + Signalbegriffe_Ril_301Factory.eINSTANCE.createBueATZusatz())); + newChildDescriptors.add (createChildParameter (SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID, @@ -724,6 +729,11 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors (SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID, Signalbegriffe_Ril_301Factory.eINSTANCE.createOzFa())); + newChildDescriptors.add + (createChildParameter + (SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID, + Signalbegriffe_Ril_301Factory.eINSTANCE.createOzFak())); + newChildDescriptors.add (createChildParameter (SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID, @@ -769,6 +779,11 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors (SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID, Signalbegriffe_Ril_301Factory.eINSTANCE.createOzZf())); + newChildDescriptors.add + (createChildParameter + (SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID, + Signalbegriffe_Ril_301Factory.eINSTANCE.createOzZugl())); + newChildDescriptors.add (createChildParameter (SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID, diff --git a/java/org.eclipse.set.model.planpro/model/PlanPro.genmodel b/java/org.eclipse.set.model.planpro/model/PlanPro.genmodel index b36bd0c7..6b616f4a 100644 --- a/java/org.eclipse.set.model.planpro/model/PlanPro.genmodel +++ b/java/org.eclipse.set.model.planpro/model/PlanPro.genmodel @@ -15908,10 +15908,7 @@ - - - + diff --git a/java/org.eclipse.set.model.planpro/model/Signalbegriffe_Ril_301.ecore b/java/org.eclipse.set.model.planpro/model/Signalbegriffe_Ril_301.ecore index 0e54b4e4..613f2424 100644 --- a/java/org.eclipse.set.model.planpro/model/Signalbegriffe_Ril_301.ecore +++ b/java/org.eclipse.set.model.planpro/model/Signalbegriffe_Ril_301.ecore @@ -4,7 +4,7 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmi:version="2.0" name="Signalbegriffe_Ril_301" - nsURI="http://www.plan-pro.org/modell/Signalbegriffe_Ril_301/1.10.0.3" + nsURI="http://www.plan-pro.org/modell/Signalbegriffe_Ril_301/1.10.0.4" nsPrefix="nsSignalbegriffe_Ril_301">
+ name="BueATZusatz" + eSuperTypes="Signalbegriffe_Struktur.ecore#//Signalbegriff_ID_TypeClass">
+ value="elementOnly"/> + name="OzFak" + eSuperTypes="Signalbegriffe_Struktur.ecore#//Signalbegriff_ID_TypeClass">
+ value="elementOnly"/> + name="OzZugl" + eSuperTypes="Signalbegriffe_Struktur.ecore#//Signalbegriff_ID_TypeClass">
- - -
-
- - + + + Dieses Werk ist lizenziert unter der Open Source Lizenz RailPL V1.1. + +Weitere Informationen zur Lizenz finden Sie auf +http://www.dbinfrago.com/planpro + +Inhalt der Datei: +XML Schema für PlanPro Schnittstelle. + +Bei Fragen zum Schema wenden Sie sich bitte an planpro@deutschebahn.com + +-------------------------------------------------------------------------------- + +This Document is licensed under the open source license RailPL V1.1. + +More information about the license can be found on +http://www.dbinfrago.com/planpro + +Contents of the file: +XML Schema for PlanPro interface. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/BueATZusatz.java b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/BueATZusatz.java index 70fe9954..96c856f4 100644 --- a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/BueATZusatz.java +++ b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/BueATZusatz.java @@ -9,7 +9,7 @@ */ package org.eclipse.set.model.planpro.Signalbegriffe_Ril_301; -import org.eclipse.emf.ecore.EObject; +import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.Signalbegriff_ID_TypeClass; /** * @@ -18,8 +18,8 @@ * * * @see org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.Signalbegriffe_Ril_301Package#getBueATZusatz() - * @model extendedMetaData="name='Bue_AT_Zusatz' kind='empty'" + * @model extendedMetaData="name='Bue_AT_Zusatz' kind='elementOnly'" * @generated */ -public interface BueATZusatz extends EObject { +public interface BueATZusatz extends Signalbegriff_ID_TypeClass { } // BueATZusatz diff --git a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/OzFak.java b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/OzFak.java index c140d778..94d9b105 100644 --- a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/OzFak.java +++ b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/OzFak.java @@ -9,7 +9,7 @@ */ package org.eclipse.set.model.planpro.Signalbegriffe_Ril_301; -import org.eclipse.emf.ecore.EObject; +import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.Signalbegriff_ID_TypeClass; /** * @@ -18,8 +18,8 @@ * * * @see org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.Signalbegriffe_Ril_301Package#getOzFak() - * @model extendedMetaData="name='Oz_Fak' kind='empty'" + * @model extendedMetaData="name='Oz_Fak' kind='elementOnly'" * @generated */ -public interface OzFak extends EObject { +public interface OzFak extends Signalbegriff_ID_TypeClass { } // OzFak diff --git a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/OzZugl.java b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/OzZugl.java index 7cd9a1d6..52997ebc 100644 --- a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/OzZugl.java +++ b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/OzZugl.java @@ -9,46 +9,17 @@ */ package org.eclipse.set.model.planpro.Signalbegriffe_Ril_301; -import org.eclipse.emf.ecore.EObject; +import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.Signalbegriff_ID_TypeClass; /** * * A representation of the model object 'Oz Zugl'. * * - *

- * The following features are supported: - *

- *
    - *
  • {@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzZugl#getSymbol Symbol}
    • - *
* * @see org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.Signalbegriffe_Ril_301Package#getOzZugl() * @model extendedMetaData="name='Oz_Zugl' kind='elementOnly'" * @generated */ -public interface OzZugl extends EObject { - /** - * Returns the value of the 'Symbol' attribute. - * - * - * @return the value of the 'Symbol' attribute. - * @see #setSymbol(String) - * @see org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.Signalbegriffe_Ril_301Package#getOzZugl_Symbol() - * @model dataType="org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.Oz_Zugl_Symbol_Type" required="true" - * extendedMetaData="kind='element' name='Symbol'" - * @generated - */ - String getSymbol(); - - /** - * Sets the value of the '{@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzZugl#getSymbol Symbol}' attribute. - * - * - * @param value the new value of the 'Symbol' attribute. - * @see #getSymbol() - * @generated - */ - void setSymbol(String value); - +public interface OzZugl extends Signalbegriff_ID_TypeClass { } // OzZugl diff --git a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/Signalbegriffe_Ril_301Package.java b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/Signalbegriffe_Ril_301Package.java index 9a672754..107e9779 100644 --- a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/Signalbegriffe_Ril_301Package.java +++ b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/Signalbegriffe_Ril_301Package.java @@ -9,7 +9,6 @@ */ package org.eclipse.set.model.planpro.Signalbegriffe_Ril_301; -import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EDataType; import org.eclipse.emf.ecore.EEnum; @@ -87,7 +86,7 @@ public interface Signalbegriffe_Ril_301Package extends EPackage { * * @generated */ - String eNS_URI = "http://www.plan-pro.org/modell/Signalbegriffe_Ril_301/1.10.0.3"; + String eNS_URI = "http://www.plan-pro.org/modell/Signalbegriffe_Ril_301/1.10.0.4"; /** * The package namespace name. @@ -3657,6 +3656,141 @@ public interface Signalbegriffe_Ril_301Package extends EPackage { */ int BUE_AT_ZUSATZ = 23; + /** + * The feature id for the 'Symbol' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__SYMBOL = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__SYMBOL; + + /** + * The feature id for the 'Anmerkungen' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__ANMERKUNGEN = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__ANMERKUNGEN; + + /** + * The feature id for the 'Beleuchtbar' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__BELEUCHTBAR = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__BELEUCHTBAR; + + /** + * The feature id for the 'Beschreibung' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__BESCHREIBUNG = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__BESCHREIBUNG; + + /** + * The feature id for the 'Geltungsbereich DS' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__GELTUNGSBEREICH_DS = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_DS; + + /** + * The feature id for the 'Geltungsbereich DV' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__GELTUNGSBEREICH_DV = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_DV; + + /** + * The feature id for the 'Geltungsbereich SBahn B' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__GELTUNGSBEREICH_SBAHN_B = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_SBAHN_B; + + /** + * The feature id for the 'Geltungsbereich SBahn HH' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__GELTUNGSBEREICH_SBAHN_HH = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_SBAHN_HH; + + /** + * The feature id for the 'Gueltig Ab' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__GUELTIG_AB = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GUELTIG_AB; + + /** + * The feature id for the 'Gueltig Bis' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__GUELTIG_BIS = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GUELTIG_BIS; + + /** + * The feature id for the 'Kurzbezeichnung DS' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__KURZBEZEICHNUNG_DS = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__KURZBEZEICHNUNG_DS; + + /** + * The feature id for the 'Kurzbezeichnung DV' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__KURZBEZEICHNUNG_DV = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__KURZBEZEICHNUNG_DV; + + /** + * The feature id for the 'Langbezeichnung' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__LANGBEZEICHNUNG = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__LANGBEZEICHNUNG; + + /** + * The feature id for the 'Schaltbar' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__SCHALTBAR = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__SCHALTBAR; + + /** + * The feature id for the 'Zusatz Moeglich' attribute. + * + * + * @generated + * @ordered + */ + int BUE_AT_ZUSATZ__ZUSATZ_MOEGLICH = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__ZUSATZ_MOEGLICH; + /** * The number of structural features of the 'Bue AT Zusatz' class. * @@ -3664,7 +3798,7 @@ public interface Signalbegriffe_Ril_301Package extends EPackage { * @generated * @ordered */ - int BUE_AT_ZUSATZ_FEATURE_COUNT = 0; + int BUE_AT_ZUSATZ_FEATURE_COUNT = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.impl.BueKTImpl Bue KT}' class. @@ -17074,6 +17208,141 @@ public interface Signalbegriffe_Ril_301Package extends EPackage { */ int OZ_FAK = 111; + /** + * The feature id for the 'Symbol' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__SYMBOL = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__SYMBOL; + + /** + * The feature id for the 'Anmerkungen' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__ANMERKUNGEN = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__ANMERKUNGEN; + + /** + * The feature id for the 'Beleuchtbar' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__BELEUCHTBAR = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__BELEUCHTBAR; + + /** + * The feature id for the 'Beschreibung' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__BESCHREIBUNG = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__BESCHREIBUNG; + + /** + * The feature id for the 'Geltungsbereich DS' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__GELTUNGSBEREICH_DS = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_DS; + + /** + * The feature id for the 'Geltungsbereich DV' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__GELTUNGSBEREICH_DV = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_DV; + + /** + * The feature id for the 'Geltungsbereich SBahn B' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__GELTUNGSBEREICH_SBAHN_B = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_SBAHN_B; + + /** + * The feature id for the 'Geltungsbereich SBahn HH' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__GELTUNGSBEREICH_SBAHN_HH = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_SBAHN_HH; + + /** + * The feature id for the 'Gueltig Ab' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__GUELTIG_AB = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GUELTIG_AB; + + /** + * The feature id for the 'Gueltig Bis' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__GUELTIG_BIS = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GUELTIG_BIS; + + /** + * The feature id for the 'Kurzbezeichnung DS' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__KURZBEZEICHNUNG_DS = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__KURZBEZEICHNUNG_DS; + + /** + * The feature id for the 'Kurzbezeichnung DV' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__KURZBEZEICHNUNG_DV = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__KURZBEZEICHNUNG_DV; + + /** + * The feature id for the 'Langbezeichnung' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__LANGBEZEICHNUNG = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__LANGBEZEICHNUNG; + + /** + * The feature id for the 'Schaltbar' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__SCHALTBAR = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__SCHALTBAR; + + /** + * The feature id for the 'Zusatz Moeglich' attribute. + * + * + * @generated + * @ordered + */ + int OZ_FAK__ZUSATZ_MOEGLICH = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__ZUSATZ_MOEGLICH; + /** * The number of structural features of the 'Oz Fak' class. * @@ -17081,7 +17350,7 @@ public interface Signalbegriffe_Ril_301Package extends EPackage { * @generated * @ordered */ - int OZ_FAK_FEATURE_COUNT = 0; + int OZ_FAK_FEATURE_COUNT = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.impl.OzGSMRImpl Oz GSMR}' class. @@ -18486,7 +18755,133 @@ public interface Signalbegriffe_Ril_301Package extends EPackage { * @generated * @ordered */ - int OZ_ZUGL__SYMBOL = 0; + int OZ_ZUGL__SYMBOL = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__SYMBOL; + + /** + * The feature id for the 'Anmerkungen' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__ANMERKUNGEN = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__ANMERKUNGEN; + + /** + * The feature id for the 'Beleuchtbar' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__BELEUCHTBAR = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__BELEUCHTBAR; + + /** + * The feature id for the 'Beschreibung' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__BESCHREIBUNG = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__BESCHREIBUNG; + + /** + * The feature id for the 'Geltungsbereich DS' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__GELTUNGSBEREICH_DS = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_DS; + + /** + * The feature id for the 'Geltungsbereich DV' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__GELTUNGSBEREICH_DV = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_DV; + + /** + * The feature id for the 'Geltungsbereich SBahn B' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__GELTUNGSBEREICH_SBAHN_B = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_SBAHN_B; + + /** + * The feature id for the 'Geltungsbereich SBahn HH' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__GELTUNGSBEREICH_SBAHN_HH = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GELTUNGSBEREICH_SBAHN_HH; + + /** + * The feature id for the 'Gueltig Ab' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__GUELTIG_AB = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GUELTIG_AB; + + /** + * The feature id for the 'Gueltig Bis' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__GUELTIG_BIS = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__GUELTIG_BIS; + + /** + * The feature id for the 'Kurzbezeichnung DS' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__KURZBEZEICHNUNG_DS = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__KURZBEZEICHNUNG_DS; + + /** + * The feature id for the 'Kurzbezeichnung DV' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__KURZBEZEICHNUNG_DV = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__KURZBEZEICHNUNG_DV; + + /** + * The feature id for the 'Langbezeichnung' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__LANGBEZEICHNUNG = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__LANGBEZEICHNUNG; + + /** + * The feature id for the 'Schaltbar' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__SCHALTBAR = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__SCHALTBAR; + + /** + * The feature id for the 'Zusatz Moeglich' attribute. + * + * + * @generated + * @ordered + */ + int OZ_ZUGL__ZUSATZ_MOEGLICH = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS__ZUSATZ_MOEGLICH; /** * The number of structural features of the 'Oz Zugl' class. @@ -18495,7 +18890,7 @@ public interface Signalbegriffe_Ril_301Package extends EPackage { * @generated * @ordered */ - int OZ_ZUGL_FEATURE_COUNT = 1; + int OZ_ZUGL_FEATURE_COUNT = Signalbegriffe_StrukturPackage.SIGNALBEGRIFF_ID_TYPE_CLASS_FEATURE_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.impl.Pf2Impl Pf2}' class. @@ -30758,17 +31153,6 @@ public interface Signalbegriffe_Ril_301Package extends EPackage { */ EClass getOzZugl(); - /** - * Returns the meta object for the attribute '{@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzZugl#getSymbol Symbol}'. - * - * - * @return the meta object for the attribute 'Symbol'. - * @see org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzZugl#getSymbol() - * @see #getOzZugl() - * @generated - */ - EAttribute getOzZugl_Symbol(); - /** * Returns the meta object for class '{@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.Pf2 Pf2}'. * diff --git a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/BueATZusatzImpl.java b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/BueATZusatzImpl.java index 97e086c2..e86f45e0 100644 --- a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/BueATZusatzImpl.java +++ b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/BueATZusatzImpl.java @@ -11,11 +11,11 @@ import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.EObjectImpl; - import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.BueATZusatz; import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.Signalbegriffe_Ril_301Package; +import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.impl.Signalbegriff_ID_TypeClassImpl; + /** * * An implementation of the model object 'Bue AT Zusatz'. @@ -23,7 +23,7 @@ * * @generated */ -public class BueATZusatzImpl extends EObjectImpl implements BueATZusatz { +public class BueATZusatzImpl extends Signalbegriff_ID_TypeClassImpl implements BueATZusatz { /** * * diff --git a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/OzFakImpl.java b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/OzFakImpl.java index efdb318f..2073b648 100644 --- a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/OzFakImpl.java +++ b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/OzFakImpl.java @@ -11,11 +11,11 @@ import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.EObjectImpl; - import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzFak; import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.Signalbegriffe_Ril_301Package; +import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.impl.Signalbegriff_ID_TypeClassImpl; + /** * * An implementation of the model object 'Oz Fak'. @@ -23,7 +23,7 @@ * * @generated */ -public class OzFakImpl extends EObjectImpl implements OzFak { +public class OzFakImpl extends Signalbegriff_ID_TypeClassImpl implements OzFak { /** * * diff --git a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/OzZuglImpl.java b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/OzZuglImpl.java index efe1d31c..f39c81a0 100644 --- a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/OzZuglImpl.java +++ b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/OzZuglImpl.java @@ -9,50 +9,21 @@ */ package org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.impl; -import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.EObjectImpl; - import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzZugl; import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.Signalbegriffe_Ril_301Package; +import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.impl.Signalbegriff_ID_TypeClassImpl; + /** * * An implementation of the model object 'Oz Zugl'. * - *

- * The following features are implemented: - *

- *
    - *
  • {@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.impl.OzZuglImpl#getSymbol Symbol}
    • - *
* * @generated */ -public class OzZuglImpl extends EObjectImpl implements OzZugl { - /** - * The default value of the '{@link #getSymbol() Symbol}' attribute. - * - * - * @see #getSymbol() - * @generated - * @ordered - */ - protected static final String SYMBOL_EDEFAULT = null; - - /** - * The cached value of the '{@link #getSymbol() Symbol}' attribute. - * - * - * @see #getSymbol() - * @generated - * @ordered - */ - protected String symbol = SYMBOL_EDEFAULT; - +public class OzZuglImpl extends Signalbegriff_ID_TypeClassImpl implements OzZugl { /** * * @@ -72,101 +43,4 @@ protected EClass eStaticClass() { return Signalbegriffe_Ril_301Package.eINSTANCE.getOzZugl(); } - /** - * - * - * @generated - */ - @Override - public String getSymbol() { - return symbol; - } - - /** - * - * - * @generated - */ - @Override - public void setSymbol(String newSymbol) { - String oldSymbol = symbol; - symbol = newSymbol; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, Signalbegriffe_Ril_301Package.OZ_ZUGL__SYMBOL, oldSymbol, symbol)); - } - - /** - * - * - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) { - switch (featureID) { - case Signalbegriffe_Ril_301Package.OZ_ZUGL__SYMBOL: - return getSymbol(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * - * - * @generated - */ - @Override - public void eSet(int featureID, Object newValue) { - switch (featureID) { - case Signalbegriffe_Ril_301Package.OZ_ZUGL__SYMBOL: - setSymbol((String)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * - * - * @generated - */ - @Override - public void eUnset(int featureID) { - switch (featureID) { - case Signalbegriffe_Ril_301Package.OZ_ZUGL__SYMBOL: - setSymbol(SYMBOL_EDEFAULT); - return; - } - super.eUnset(featureID); - } - - /** - * - * - * @generated - */ - @Override - public boolean eIsSet(int featureID) { - switch (featureID) { - case Signalbegriffe_Ril_301Package.OZ_ZUGL__SYMBOL: - return SYMBOL_EDEFAULT == null ? symbol != null : !SYMBOL_EDEFAULT.equals(symbol); - } - return super.eIsSet(featureID); - } - - /** - * - * - * @generated - */ - @Override - public String toString() { - if (eIsProxy()) return super.toString(); - - StringBuilder result = new StringBuilder(super.toString()); - result.append(" (symbol: "); - result.append(symbol); - result.append(')'); - return result.toString(); - } - } //OzZuglImpl diff --git a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/Signalbegriffe_Ril_301.ecore b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/Signalbegriffe_Ril_301.ecore index ba5eb958..70b46617 100644 --- a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/Signalbegriffe_Ril_301.ecore +++ b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/Signalbegriffe_Ril_301.ecore @@ -1,6 +1,6 @@
@@ -150,10 +150,10 @@
- +
-
+
@@ -1027,10 +1027,10 @@
- +
-
+
@@ -1087,18 +1087,11 @@
- +
- - -
-
- - diff --git a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/Signalbegriffe_Ril_301PackageImpl.java b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/Signalbegriffe_Ril_301PackageImpl.java index 8aeb4151..5ba3fa02 100644 --- a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/Signalbegriffe_Ril_301PackageImpl.java +++ b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/impl/Signalbegriffe_Ril_301PackageImpl.java @@ -16,7 +16,6 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.common.util.WrappedException; -import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.ecore.EDataType; @@ -3451,16 +3450,6 @@ public EClass getOzZugl() { return ozZuglEClass; } - /** - * - * - * @generated - */ - @Override - public EAttribute getOzZugl_Symbol() { - return (EAttribute)getOzZugl().getEStructuralFeatures().get(0); - } - /** * * diff --git a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/util/Signalbegriffe_Ril_301Switch.java b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/util/Signalbegriffe_Ril_301Switch.java index e4f4375e..57d86046 100644 --- a/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/util/Signalbegriffe_Ril_301Switch.java +++ b/java/org.eclipse.set.model.planpro/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/util/Signalbegriffe_Ril_301Switch.java @@ -239,6 +239,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { case Signalbegriffe_Ril_301Package.BUE_AT_ZUSATZ: { BueATZusatz bueATZusatz = (BueATZusatz)theEObject; T result = caseBueATZusatz(bueATZusatz); + if (result == null) result = caseSignalbegriff_ID_TypeClass(bueATZusatz); if (result == null) result = defaultCase(theEObject); return result; } @@ -854,6 +855,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { case Signalbegriffe_Ril_301Package.OZ_FAK: { OzFak ozFak = (OzFak)theEObject; T result = caseOzFak(ozFak); + if (result == null) result = caseSignalbegriff_ID_TypeClass(ozFak); if (result == null) result = defaultCase(theEObject); return result; } @@ -923,6 +925,7 @@ protected T doSwitch(int classifierID, EObject theEObject) { case Signalbegriffe_Ril_301Package.OZ_ZUGL: { OzZugl ozZugl = (OzZugl)theEObject; T result = caseOzZugl(ozZugl); + if (result == null) result = caseSignalbegriff_ID_TypeClass(ozZugl); if (result == null) result = defaultCase(theEObject); return result; }