Skip to content

Commit 625484f

Browse files
TruongQuangSBTruongQuangSB
authored
Add SignalBegriffe_Ril_301 1.10.0.4 (#55)
* Add SignalBegriffe_Ril_301 1.10.0.4 * Update Ecore model
1 parent 706256f commit 625484f

17 files changed

Lines changed: 4829 additions & 311 deletions

File tree

‎java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/BueATZusatzItemProvider.java‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,21 @@
1818

1919
import org.eclipse.emf.common.util.ResourceLocator;
2020

21-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
22-
import org.eclipse.emf.edit.provider.IItemLabelProvider;
2321
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
24-
import org.eclipse.emf.edit.provider.IItemPropertySource;
25-
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
26-
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
27-
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
2822

2923
import org.eclipse.set.model.planpro.PlanPro.provider.PlanProEditPlugin;
3024

25+
import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.BueATZusatz;
26+
27+
import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.provider.Signalbegriff_ID_TypeClassItemProvider;
28+
3129
/**
3230
* This is the item provider adapter for a {@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.BueATZusatz} object.
3331
* <!-- begin-user-doc -->
3432
* <!-- end-user-doc -->
3533
* @generated
3634
*/
37-
public class BueATZusatzItemProvider
38-
extends ItemProviderAdapter
39-
implements
40-
IEditingDomainItemProvider,
41-
IStructuredItemContentProvider,
42-
ITreeItemContentProvider,
43-
IItemLabelProvider,
44-
IItemPropertySource {
35+
public class BueATZusatzItemProvider extends Signalbegriff_ID_TypeClassItemProvider {
4536
/**
4637
* This constructs an instance from a factory and a notifier.
4738
* <!-- begin-user-doc -->
@@ -96,7 +87,10 @@ protected boolean shouldComposeCreationImage() {
9687
*/
9788
@Override
9889
public String getText(Object object) {
99-
return getString("_UI_BueATZusatz_type");
90+
String label = ((BueATZusatz)object).getSymbol();
91+
return label == null || label.length() == 0 ?
92+
getString("_UI_BueATZusatz_type") :
93+
getString("_UI_BueATZusatz_type") + " " + label;
10094
}
10195

10296

‎java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/OzFakItemProvider.java‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,21 @@
1818

1919
import org.eclipse.emf.common.util.ResourceLocator;
2020

21-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
22-
import org.eclipse.emf.edit.provider.IItemLabelProvider;
2321
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
24-
import org.eclipse.emf.edit.provider.IItemPropertySource;
25-
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
26-
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
27-
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
2822

2923
import org.eclipse.set.model.planpro.PlanPro.provider.PlanProEditPlugin;
3024

25+
import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzFak;
26+
27+
import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.provider.Signalbegriff_ID_TypeClassItemProvider;
28+
3129
/**
3230
* This is the item provider adapter for a {@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzFak} object.
3331
* <!-- begin-user-doc -->
3432
* <!-- end-user-doc -->
3533
* @generated
3634
*/
37-
public class OzFakItemProvider
38-
extends ItemProviderAdapter
39-
implements
40-
IEditingDomainItemProvider,
41-
IStructuredItemContentProvider,
42-
ITreeItemContentProvider,
43-
IItemLabelProvider,
44-
IItemPropertySource {
35+
public class OzFakItemProvider extends Signalbegriff_ID_TypeClassItemProvider {
4536
/**
4637
* This constructs an instance from a factory and a notifier.
4738
* <!-- begin-user-doc -->
@@ -96,7 +87,10 @@ protected boolean shouldComposeCreationImage() {
9687
*/
9788
@Override
9889
public String getText(Object object) {
99-
return getString("_UI_OzFak_type");
90+
String label = ((OzFak)object).getSymbol();
91+
return label == null || label.length() == 0 ?
92+
getString("_UI_OzFak_type") :
93+
getString("_UI_OzFak_type") + " " + label;
10094
}
10195

10296

‎java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signalbegriffe_Ril_301/provider/OzZuglItemProvider.java‎

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,21 @@
1818

1919
import org.eclipse.emf.common.util.ResourceLocator;
2020

21-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
22-
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
23-
import org.eclipse.emf.edit.provider.IItemLabelProvider;
2421
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
25-
import org.eclipse.emf.edit.provider.IItemPropertySource;
26-
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
27-
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
28-
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
29-
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
30-
import org.eclipse.emf.edit.provider.ViewerNotification;
3122

3223
import org.eclipse.set.model.planpro.PlanPro.provider.PlanProEditPlugin;
3324

3425
import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzZugl;
35-
import org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.Signalbegriffe_Ril_301Package;
26+
27+
import org.eclipse.set.model.planpro.Signalbegriffe_Struktur.provider.Signalbegriff_ID_TypeClassItemProvider;
3628

3729
/**
3830
* This is the item provider adapter for a {@link org.eclipse.set.model.planpro.Signalbegriffe_Ril_301.OzZugl} object.
3931
* <!-- begin-user-doc -->
4032
* <!-- end-user-doc -->
4133
* @generated
4234
*/
43-
public class OzZuglItemProvider
44-
extends ItemProviderAdapter
45-
implements
46-
IEditingDomainItemProvider,
47-
IStructuredItemContentProvider,
48-
ITreeItemContentProvider,
49-
IItemLabelProvider,
50-
IItemPropertySource {
35+
public class OzZuglItemProvider extends Signalbegriff_ID_TypeClassItemProvider {
5136
/**
5237
* This constructs an instance from a factory and a notifier.
5338
* <!-- begin-user-doc -->
@@ -69,33 +54,10 @@ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
6954
if (itemPropertyDescriptors == null) {
7055
super.getPropertyDescriptors(object);
7156

72-
addSymbolPropertyDescriptor(object);
7357
}
7458
return itemPropertyDescriptors;
7559
}
7660

77-
/**
78-
* This adds a property descriptor for the Symbol feature.
79-
* <!-- begin-user-doc -->
80-
* <!-- end-user-doc -->
81-
* @generated
82-
*/
83-
protected void addSymbolPropertyDescriptor(Object object) {
84-
itemPropertyDescriptors.add
85-
(createItemPropertyDescriptor
86-
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
87-
getResourceLocator(),
88-
getString("_UI_OzZugl_symbol_feature"),
89-
getString("_UI_PropertyDescriptor_description", "_UI_OzZugl_symbol_feature", "_UI_OzZugl_type"),
90-
Signalbegriffe_Ril_301Package.eINSTANCE.getOzZugl_Symbol(),
91-
true,
92-
false,
93-
false,
94-
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
95-
null,
96-
null));
97-
}
98-
9961
/**
10062
* This returns OzZugl.gif.
10163
* <!-- begin-user-doc -->
@@ -142,12 +104,6 @@ public String getText(Object object) {
142104
@Override
143105
public void notifyChanged(Notification notification) {
144106
updateChildren(notification);
145-
146-
switch (notification.getFeatureID(OzZugl.class)) {
147-
case Signalbegriffe_Ril_301Package.OZ_ZUGL__SYMBOL:
148-
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
149-
return;
150-
}
151107
super.notifyChanged(notification);
152108
}
153109

‎java/org.eclipse.set.model.planpro.edit/src/org/eclipse/set/model/planpro/Signale/provider/Signal_SignalbegriffItemProvider.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,11 @@ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors
289289
(SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID,
290290
Signalbegriffe_Ril_301Factory.eINSTANCE.createBueAT()));
291291

292+
newChildDescriptors.add
293+
(createChildParameter
294+
(SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID,
295+
Signalbegriffe_Ril_301Factory.eINSTANCE.createBueATZusatz()));
296+
292297
newChildDescriptors.add
293298
(createChildParameter
294299
(SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID,
@@ -724,6 +729,11 @@ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors
724729
(SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID,
725730
Signalbegriffe_Ril_301Factory.eINSTANCE.createOzFa()));
726731

732+
newChildDescriptors.add
733+
(createChildParameter
734+
(SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID,
735+
Signalbegriffe_Ril_301Factory.eINSTANCE.createOzFak()));
736+
727737
newChildDescriptors.add
728738
(createChildParameter
729739
(SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID,
@@ -769,6 +779,11 @@ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors
769779
(SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID,
770780
Signalbegriffe_Ril_301Factory.eINSTANCE.createOzZf()));
771781

782+
newChildDescriptors.add
783+
(createChildParameter
784+
(SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID,
785+
Signalbegriffe_Ril_301Factory.eINSTANCE.createOzZugl()));
786+
772787
newChildDescriptors.add
773788
(createChildParameter
774789
(SignalePackage.Literals.SIGNAL_SIGNALBEGRIFF__SIGNALBEGRIFF_ID,

‎java/org.eclipse.set.model.planpro/model/PlanPro.genmodel‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15908,10 +15908,7 @@
1590815908
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//OzPZB2000Hz"/>
1590915909
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//OzPZBBUE"/>
1591015910
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//OzZf"/>
15911-
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//OzZugl">
15912-
<genFeatures createChild="false"
15913-
ecoreFeature="ecore:EAttribute Signalbegriffe_Ril_301.ecore#//OzZugl/symbol"/>
15914-
</genClasses>
15911+
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//OzZugl"/>
1591515912
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//Pf2"/>
1591615913
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//Ra10"/>
1591715914
<genClasses ecoreClass="Signalbegriffe_Ril_301.ecore#//Ra11"/>

‎java/org.eclipse.set.model.planpro/model/Signalbegriffe_Ril_301.ecore‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
55
xmi:version="2.0"
66
name="Signalbegriffe_Ril_301"
7-
nsURI="http://www.plan-pro.org/modell/Signalbegriffe_Ril_301/1.10.0.3"
7+
nsURI="http://www.plan-pro.org/modell/Signalbegriffe_Ril_301/1.10.0.4"
88
nsPrefix="nsSignalbegriffe_Ril_301">
99
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
1010
<details key="documentation"
@@ -253,12 +253,13 @@
253253
</eAnnotations>
254254
</eClassifiers>
255255
<eClassifiers xsi:type="ecore:EClass"
256-
name="BueATZusatz">
256+
name="BueATZusatz"
257+
eSuperTypes="Signalbegriffe_Struktur.ecore#//Signalbegriff_ID_TypeClass">
257258
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
258259
<details key="name"
259260
value="Bue_AT_Zusatz"/>
260261
<details key="kind"
261-
value="empty"/>
262+
value="elementOnly"/>
262263
</eAnnotations>
263264
</eClassifiers>
264265
<eClassifiers xsi:type="ecore:EClass"
@@ -1966,12 +1967,13 @@
19661967
</eAnnotations>
19671968
</eClassifiers>
19681969
<eClassifiers xsi:type="ecore:EClass"
1969-
name="OzFak">
1970+
name="OzFak"
1971+
eSuperTypes="Signalbegriffe_Struktur.ecore#//Signalbegriff_ID_TypeClass">
19701972
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
19711973
<details key="name"
19721974
value="Oz_Fak"/>
19731975
<details key="kind"
1974-
value="empty"/>
1976+
value="elementOnly"/>
19751977
</eAnnotations>
19761978
</eClassifiers>
19771979
<eClassifiers xsi:type="ecore:EClass"
@@ -2065,24 +2067,14 @@
20652067
</eAnnotations>
20662068
</eClassifiers>
20672069
<eClassifiers xsi:type="ecore:EClass"
2068-
name="OzZugl">
2070+
name="OzZugl"
2071+
eSuperTypes="Signalbegriffe_Struktur.ecore#//Signalbegriff_ID_TypeClass">
20692072
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
20702073
<details key="name"
20712074
value="Oz_Zugl"/>
20722075
<details key="kind"
20732076
value="elementOnly"/>
20742077
</eAnnotations>
2075-
<eStructuralFeatures xsi:type="ecore:EAttribute"
2076-
name="symbol"
2077-
lowerBound="1"
2078-
eType="#//Oz_Zugl_Symbol_Type">
2079-
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
2080-
<details key="kind"
2081-
value="element"/>
2082-
<details key="name"
2083-
value="Symbol"/>
2084-
</eAnnotations>
2085-
</eStructuralFeatures>
20862078
</eClassifiers>
20872079
<eClassifiers xsi:type="ecore:EClass"
20882080
name="Pf2"

0 commit comments

Comments
 (0)