Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @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.
* <!-- begin-user-doc -->
Expand Down Expand Up @@ -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;
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @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.
* <!-- begin-user-doc -->
Expand Down Expand Up @@ -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;
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,21 @@

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.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @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.
* <!-- begin-user-doc -->
Expand All @@ -69,33 +54,10 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);

addSymbolPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}

/**
* This adds a property descriptor for the Symbol feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @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.
* <!-- begin-user-doc -->
Expand Down Expand Up @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,11 @@ protected void collectNewChildDescriptors(Collection<Object> 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,
Expand Down Expand Up @@ -724,6 +729,11 @@ protected void collectNewChildDescriptors(Collection<Object> 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,
Expand Down Expand Up @@ -769,6 +779,11 @@ protected void collectNewChildDescriptors(Collection<Object> 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,
Expand Down
5 changes: 1 addition & 4 deletions java/org.eclipse.set.model.planpro/model/PlanPro.genmodel
Original file line number Diff line number Diff line change
Expand Up @@ -15908,10 +15908,7 @@
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//OzPZB2000Hz"/>
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//OzPZBBUE"/>
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//OzZf"/>
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//OzZugl">
<genFeatures createChild="false"
ecoreFeature="ecore:EAttribute Signalbegriffe_Ril_301.ecore#//OzZugl/symbol"/>
</genClasses>
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//OzZugl"/>
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//Pf2"/>
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//Ra10"/>
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//Ra11"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation"
Expand Down Expand Up @@ -253,12 +253,13 @@
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass"
name="BueATZusatz">
name="BueATZusatz"
eSuperTypes="Signalbegriffe_Struktur.ecore#//Signalbegriff_ID_TypeClass">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name"
value="Bue_AT_Zusatz"/>
<details key="kind"
value="empty"/>
value="elementOnly"/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass"
Expand Down Expand Up @@ -1966,12 +1967,13 @@
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass"
name="OzFak">
name="OzFak"
eSuperTypes="Signalbegriffe_Struktur.ecore#//Signalbegriff_ID_TypeClass">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name"
value="Oz_Fak"/>
<details key="kind"
value="empty"/>
value="elementOnly"/>
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass"
Expand Down Expand Up @@ -2065,24 +2067,14 @@
</eAnnotations>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass"
name="OzZugl">
name="OzZugl"
eSuperTypes="Signalbegriffe_Struktur.ecore#//Signalbegriff_ID_TypeClass">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name"
value="Oz_Zugl"/>
<details key="kind"
value="elementOnly"/>
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EAttribute"
name="symbol"
lowerBound="1"
eType="#//Oz_Zugl_Symbol_Type">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="kind"
value="element"/>
<details key="name"
value="Symbol"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass"
name="Pf2"
Expand Down
Loading