Skip to content

Commit adb94c7

Browse files
marcadetdmarcadetd
committed
still more changes from B5, all should be done
Also use Java objects for required attributes, basic types for other with default values
1 parent 7dba879 commit adb94c7

File tree

72 files changed

+5947
-2064
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+5947
-2064
lines changed

‎fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateConstructedAttributes_constructedAttribute_ServiceTypeRealization.gif‎

223 Bytes
Loading

‎fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/icons/full/ctool16/CreateServiceTypeRealizations_serviceTypeRealization_ServiceTypeRealization.gif‎

223 Bytes
Loading

‎fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/plugin.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,3 +641,9 @@ _UI_PubStage_draftTR_literal = draftTR
641641
_UI_PubStage_draftIS_literal = draftIS
642642
_UI_PubStage_PAS_literal = PAS
643643
_UI_DefinedAttributeTypeKind_SCSM_literal = SCSM
644+
_UI_Changes_mergedNamespaces_feature = Merged Namespaces
645+
_UI_AgNSIdentification_deprecated_feature = Deprecated
646+
_UI_AgUnderlyingType_underlyingControlType_feature = Underlying Control Type
647+
_UI_AgUML_appVersion_feature = App Version
648+
_UI_ServiceTypeRealization_realize_feature = Realize
649+
_UI_ServiceTypeRealization_parentServiceTypeRealizations_feature = Parent Service Type Realizations

‎fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgArrayItemProvider.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
** are made available under the terms of the Eclipse Public License v2.0
66
** which accompanies this distribution, and is available at
77
** https://www.eclipse.org/legal/epl-v20.html
8-
**
8+
**
99
** This file is part of the RiseClipse tool
10-
**
10+
**
1111
** Contributors:
1212
** Computer Science Department, CentraleSupélec
1313
** EDF R&D
@@ -20,17 +20,12 @@
2020
*/
2121
package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
2222

23-
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgArray;
24-
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
25-
2623
import java.util.Collection;
2724
import java.util.List;
2825

2926
import org.eclipse.emf.common.notify.AdapterFactory;
3027
import org.eclipse.emf.common.notify.Notification;
31-
3228
import org.eclipse.emf.common.util.ResourceLocator;
33-
3429
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
3530
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
3631
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -42,6 +37,9 @@
4237
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
4338
import org.eclipse.emf.edit.provider.ViewerNotification;
4439

40+
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgArray;
41+
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
42+
4543
/**
4644
* This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgArray} object.
4745
* <!-- begin-user-doc -->

‎fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgNSIdentificationItemProvider.java‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,13 @@ public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
6969
if( itemPropertyDescriptors == null ) {
7070
super.getPropertyDescriptors( object );
7171

72-
addReleasePropertyDescriptor( object );
73-
addVersionPropertyDescriptor( object );
7472
addIdPropertyDescriptor( object );
73+
addVersionPropertyDescriptor( object );
7574
addRevisionPropertyDescriptor( object );
75+
addReleasePropertyDescriptor( object );
7676
addPublicationStagePropertyDescriptor( object );
7777
addNamespaceTypePropertyDescriptor( object );
78+
addDeprecatedPropertyDescriptor( object );
7879
}
7980
return itemPropertyDescriptors;
8081
}
@@ -96,7 +97,7 @@ protected void addReleasePropertyDescriptor( Object object ) {
9697
true,
9798
false,
9899
false,
99-
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
100+
ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
100101
null,
101102
null ) );
102103
}
@@ -211,6 +212,28 @@ protected void addNamespaceTypePropertyDescriptor( Object object ) {
211212
null ) );
212213
}
213214

215+
/**
216+
* This adds a property descriptor for the Deprecated feature.
217+
* <!-- begin-user-doc -->
218+
* <!-- end-user-doc -->
219+
* @generated
220+
*/
221+
protected void addDeprecatedPropertyDescriptor( Object object ) {
222+
itemPropertyDescriptors.add(
223+
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
224+
getResourceLocator(),
225+
getString( "_UI_AgNSIdentification_deprecated_feature" ),
226+
getString( "_UI_PropertyDescriptor_description", "_UI_AgNSIdentification_deprecated_feature",
227+
"_UI_AgNSIdentification_type" ),
228+
NsdPackage.Literals.AG_NS_IDENTIFICATION__DEPRECATED,
229+
true,
230+
false,
231+
false,
232+
ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
233+
null,
234+
null ) );
235+
}
236+
214237
/**
215238
* This returns the label text for the adapted class.
216239
* <!-- begin-user-doc -->
@@ -236,12 +259,13 @@ public void notifyChanged( Notification notification ) {
236259
updateChildren( notification );
237260

238261
switch( notification.getFeatureID( AgNSIdentification.class ) ) {
239-
case NsdPackage.AG_NS_IDENTIFICATION__RELEASE:
240-
case NsdPackage.AG_NS_IDENTIFICATION__VERSION:
241262
case NsdPackage.AG_NS_IDENTIFICATION__ID:
263+
case NsdPackage.AG_NS_IDENTIFICATION__VERSION:
242264
case NsdPackage.AG_NS_IDENTIFICATION__REVISION:
265+
case NsdPackage.AG_NS_IDENTIFICATION__RELEASE:
243266
case NsdPackage.AG_NS_IDENTIFICATION__PUBLICATION_STAGE:
244267
case NsdPackage.AG_NS_IDENTIFICATION__NAMESPACE_TYPE:
268+
case NsdPackage.AG_NS_IDENTIFICATION__DEPRECATED:
245269
fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
246270
return;
247271
}

‎fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgTrgOpItemProvider.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
** are made available under the terms of the Eclipse Public License v2.0
66
** which accompanies this distribution, and is available at
77
** https://www.eclipse.org/legal/epl-v20.html
8-
**
8+
**
99
** This file is part of the RiseClipse tool
10-
**
10+
**
1111
** Contributors:
1212
** Computer Science Department, CentraleSupélec
1313
** EDF R&D
@@ -20,17 +20,12 @@
2020
*/
2121
package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
2222

23-
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgTrgOp;
24-
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
25-
2623
import java.util.Collection;
2724
import java.util.List;
2825

2926
import org.eclipse.emf.common.notify.AdapterFactory;
3027
import org.eclipse.emf.common.notify.Notification;
31-
3228
import org.eclipse.emf.common.util.ResourceLocator;
33-
3429
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
3530
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
3631
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -42,6 +37,9 @@
4237
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
4338
import org.eclipse.emf.edit.provider.ViewerNotification;
4439

40+
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgTrgOp;
41+
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
42+
4543
/**
4644
* This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgTrgOp} object.
4745
* <!-- begin-user-doc -->

‎fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgUMLItemProvider.java‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
** are made available under the terms of the Eclipse Public License v2.0
66
** which accompanies this distribution, and is available at
77
** https://www.eclipse.org/legal/epl-v20.html
8-
**
8+
**
99
** This file is part of the RiseClipse tool
10-
**
10+
**
1111
** Contributors:
1212
** Computer Science Department, CentraleSupélec
1313
** EDF R&D
@@ -20,19 +20,14 @@
2020
*/
2121
package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
2222

23-
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgUML;
24-
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
25-
2623
import java.util.Collection;
2724
import java.util.List;
2825

2926
import javax.xml.datatype.XMLGregorianCalendar;
3027

3128
import org.eclipse.emf.common.notify.AdapterFactory;
3229
import org.eclipse.emf.common.notify.Notification;
33-
3430
import org.eclipse.emf.common.util.ResourceLocator;
35-
3631
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
3732
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
3833
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -44,6 +39,9 @@
4439
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
4540
import org.eclipse.emf.edit.provider.ViewerNotification;
4641

42+
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgUML;
43+
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
44+
4745
/**
4846
* This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgUML} object.
4947
* <!-- begin-user-doc -->
@@ -75,6 +73,7 @@ public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
7573

7674
addUmlDatePropertyDescriptor( object );
7775
addUmlVersionPropertyDescriptor( object );
76+
addAppVersionPropertyDescriptor( object );
7877
}
7978
return itemPropertyDescriptors;
8079
}
@@ -123,6 +122,28 @@ protected void addUmlVersionPropertyDescriptor( Object object ) {
123122
null ) );
124123
}
125124

125+
/**
126+
* This adds a property descriptor for the App Version feature.
127+
* <!-- begin-user-doc -->
128+
* <!-- end-user-doc -->
129+
* @generated
130+
*/
131+
protected void addAppVersionPropertyDescriptor( Object object ) {
132+
itemPropertyDescriptors.add(
133+
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
134+
getResourceLocator(),
135+
getString( "_UI_AgUML_appVersion_feature" ),
136+
getString( "_UI_PropertyDescriptor_description", "_UI_AgUML_appVersion_feature",
137+
"_UI_AgUML_type" ),
138+
NsdPackage.Literals.AG_UML__APP_VERSION,
139+
true,
140+
false,
141+
false,
142+
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
143+
null,
144+
null ) );
145+
}
146+
126147
/**
127148
* This returns the label text for the adapted class.
128149
* <!-- begin-user-doc -->
@@ -151,6 +172,7 @@ public void notifyChanged( Notification notification ) {
151172
switch( notification.getFeatureID( AgUML.class ) ) {
152173
case NsdPackage.AG_UML__UML_DATE:
153174
case NsdPackage.AG_UML__UML_VERSION:
175+
case NsdPackage.AG_UML__APP_VERSION:
154176
fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
155177
return;
156178
}

‎fr.centralesupelec.edf.riseclipse.iec61850.nsd.edit/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/provider/AgUnderlyingTypeItemProvider.java‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
** are made available under the terms of the Eclipse Public License v2.0
66
** which accompanies this distribution, and is available at
77
** https://www.eclipse.org/legal/epl-v20.html
8-
**
8+
**
99
** This file is part of the RiseClipse tool
10-
**
10+
**
1111
** Contributors:
1212
** Computer Science Department, CentraleSupélec
1313
** EDF R&D
@@ -20,17 +20,12 @@
2020
*/
2121
package fr.centralesupelec.edf.riseclipse.iec61850.nsd.provider;
2222

23-
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgUnderlyingType;
24-
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
25-
2623
import java.util.Collection;
2724
import java.util.List;
2825

2926
import org.eclipse.emf.common.notify.AdapterFactory;
3027
import org.eclipse.emf.common.notify.Notification;
31-
3228
import org.eclipse.emf.common.util.ResourceLocator;
33-
3429
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
3530
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
3631
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -42,6 +37,9 @@
4237
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
4338
import org.eclipse.emf.edit.provider.ViewerNotification;
4439

40+
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgUnderlyingType;
41+
import fr.centralesupelec.edf.riseclipse.iec61850.nsd.NsdPackage;
42+
4543
/**
4644
* This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgUnderlyingType} object.
4745
* <!-- begin-user-doc -->
@@ -76,6 +74,7 @@ public List< IItemPropertyDescriptor > getPropertyDescriptors( Object object ) {
7674
addRefersToUnderlyingBasicTypePropertyDescriptor( object );
7775
addRefersToUnderlyingConstructedAttributePropertyDescriptor( object );
7876
addRefersToUnderlyingEnumerationPropertyDescriptor( object );
77+
addUnderlyingControlTypePropertyDescriptor( object );
7978
}
8079
return itemPropertyDescriptors;
8180
}
@@ -191,6 +190,28 @@ protected void addRefersToUnderlyingEnumerationPropertyDescriptor( Object object
191190
null ) );
192191
}
193192

193+
/**
194+
* This adds a property descriptor for the Underlying Control Type feature.
195+
* <!-- begin-user-doc -->
196+
* <!-- end-user-doc -->
197+
* @generated
198+
*/
199+
protected void addUnderlyingControlTypePropertyDescriptor( Object object ) {
200+
itemPropertyDescriptors.add(
201+
createItemPropertyDescriptor( ( ( ComposeableAdapterFactory ) adapterFactory ).getRootAdapterFactory(),
202+
getResourceLocator(),
203+
getString( "_UI_AgUnderlyingType_underlyingControlType_feature" ),
204+
getString( "_UI_PropertyDescriptor_description",
205+
"_UI_AgUnderlyingType_underlyingControlType_feature", "_UI_AgUnderlyingType_type" ),
206+
NsdPackage.Literals.AG_UNDERLYING_TYPE__UNDERLYING_CONTROL_TYPE,
207+
true,
208+
false,
209+
false,
210+
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
211+
null,
212+
null ) );
213+
}
214+
194215
/**
195216
* This returns the label text for the adapted class.
196217
* <!-- begin-user-doc -->
@@ -218,6 +239,7 @@ public void notifyChanged( Notification notification ) {
218239
switch( notification.getFeatureID( AgUnderlyingType.class ) ) {
219240
case NsdPackage.AG_UNDERLYING_TYPE__UNDERLYING_TYPE:
220241
case NsdPackage.AG_UNDERLYING_TYPE__UNDERLYING_TYPE_KIND:
242+
case NsdPackage.AG_UNDERLYING_TYPE__UNDERLYING_CONTROL_TYPE:
221243
fireNotifyChanged( new ViewerNotification( notification, notification.getNotifier(), false, true ) );
222244
return;
223245
}

0 commit comments

Comments
 (0)