Commit f213adfa authored by Dominique Marcadet's avatar Dominique Marcadet

Merge branch '41-extref-should-point-to-do-or-sdo-not-dotype' into 'master'

Resolve "ExtRef should point to DO or SDO, not DOType"

Closes #41

See merge request RiseClipseGroup/RiseClipseMetamodel_SCL2003!37
parents 49304014 0c9d5a86
...@@ -1271,3 +1271,20 @@ _UI_SecPerSamples_ParentSMVSettings_feature = Parent SMV Settings ...@@ -1271,3 +1271,20 @@ _UI_SecPerSamples_ParentSMVSettings_feature = Parent SMV Settings
_UI_McSecurity_ParentClientServices_feature = Parent Client Services _UI_McSecurity_ParentClientServices_feature = Parent Client Services
_UI_McSecurity_ParentGSESettings_feature = Parent GSE Settings _UI_McSecurity_ParentGSESettings_feature = Parent GSE Settings
_UI_McSecurity_ParentSMVSettings_feature = Parent SMV Settings _UI_McSecurity_ParentSMVSettings_feature = Parent SMV Settings
_UI_AbstractDataObject_type = Abstract Data Object
_UI_DOType_ReferredByAbstractDataObject_feature = Referred By Abstract Data Object
_UI_ExtRef_RefersToAbstractDataObject_feature = Refers To Abstract Data Object
_UI_AbstractDataObject_name_feature = Name
_UI_AbstractDataObject_type_feature = Type
_UI_AbstractDataObject_RefersToDOType_feature = Refers To DO Type
_UI_AbstractDataObject_ReferredByExtRef_feature = Referred By Ext Ref
_UI_DO_ReferredByDOI_feature = Referred By DOI
_UI_DOI_RefersToDO_feature = Refers To DO
_UI_DA_ReferredByDAI_feature = Referred By DAI
_UI_DAI_RefersToDA_feature = Refers To DA
_UI_AbstractDataAttribute_ReferredByDAI_feature = Referred By DAI
_UI_AbstractDataAttribute_ReferredBySDI_feature = Referred By SDI
_UI_SDO_ReferredBySDI_feature = Referred By SDI
_UI_DAI_RefersToAbstractDataAttribute_feature = Refers To Abstract Data Attribute
_UI_SDI_RefersToSDO_feature = Refers To SDO
_UI_SDI_RefersToAbstractDataAttribute_feature = Refers To Abstract Data Attribute
...@@ -39,7 +39,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; ...@@ -39,7 +39,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider { public class AbstractDataAttributeItemProvider extends UnNamingItemProvider {
/** /**
* This constructs an instance from a factory and a notifier. * This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
...@@ -71,6 +71,9 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider ...@@ -71,6 +71,9 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider
addRefersToDATypePropertyDescriptor(object); addRefersToDATypePropertyDescriptor(object);
addReferredByFCDAPropertyDescriptor(object); addReferredByFCDAPropertyDescriptor(object);
addReferredByExtRefPropertyDescriptor(object); addReferredByExtRefPropertyDescriptor(object);
addNamePropertyDescriptor(object);
addReferredByDAIPropertyDescriptor(object);
addReferredBySDIPropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -295,6 +298,72 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider ...@@ -295,6 +298,72 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider
null)); null));
} }
/**
* This adds a property descriptor for the Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AbstractDataAttribute_name_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_name_feature", "_UI_AbstractDataAttribute_type"),
SclPackage.eINSTANCE.getAbstractDataAttribute_Name(),
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null));
}
/**
* This adds a property descriptor for the Referred By DAI feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByDAIPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AbstractDataAttribute_ReferredByDAI_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_ReferredByDAI_feature", "_UI_AbstractDataAttribute_type"),
SclPackage.eINSTANCE.getAbstractDataAttribute_ReferredByDAI(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the Referred By SDI feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredBySDIPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AbstractDataAttribute_ReferredBySDI_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataAttribute_ReferredBySDI_feature", "_UI_AbstractDataAttribute_type"),
SclPackage.eINSTANCE.getAbstractDataAttribute_ReferredBySDI(),
true,
false,
true,
null,
null,
null));
}
/** /**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
...@@ -369,6 +438,7 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider ...@@ -369,6 +438,7 @@ public class AbstractDataAttributeItemProvider extends DataAttributeItemProvider
case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE: case SclPackage.ABSTRACT_DATA_ATTRIBUTE__TYPE:
case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT: case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_IMPORT:
case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND: case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL_KIND:
case SclPackage.ABSTRACT_DATA_ATTRIBUTE__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL: case SclPackage.ABSTRACT_DATA_ATTRIBUTE__VAL:
......
...@@ -15,10 +15,14 @@ ...@@ -15,10 +15,14 @@
* aurelie.dehouck-neveu@edf.fr * aurelie.dehouck-neveu@edf.fr
* Web site: * Web site:
* http://wdi.supelec.fr/software/RiseClipse/ * http://wdi.supelec.fr/software/RiseClipse/
*
*/ */
package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider; package fr.centralesupelec.edf.riseclipse.iec61850.scl.provider;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataObject;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
...@@ -30,23 +34,20 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; ...@@ -30,23 +34,20 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.emf.edit.provider.ViewerNotification;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.DataObject;
import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
/** /**
* This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.DataObject} object. * This is the item provider adapter for a {@link fr.centralesupelec.edf.riseclipse.iec61850.scl.AbstractDataObject} object.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
public class DataObjectItemProvider extends UnNamingItemProvider { public class AbstractDataObjectItemProvider extends UnNamingItemProvider {
/** /**
* This constructs an instance from a factory and a notifier. * This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
public DataObjectItemProvider(AdapterFactory adapterFactory) { public AbstractDataObjectItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory); super(adapterFactory);
} }
...@@ -61,26 +62,28 @@ public class DataObjectItemProvider extends UnNamingItemProvider { ...@@ -61,26 +62,28 @@ public class DataObjectItemProvider extends UnNamingItemProvider {
if (itemPropertyDescriptors == null) { if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object); super.getPropertyDescriptors(object);
addAccessControlPropertyDescriptor(object);
addNamePropertyDescriptor(object); addNamePropertyDescriptor(object);
addTypePropertyDescriptor(object);
addRefersToDOTypePropertyDescriptor(object);
addReferredByExtRefPropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
/** /**
* This adds a property descriptor for the Access Control feature. * This adds a property descriptor for the Name feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected void addAccessControlPropertyDescriptor(Object object) { protected void addNamePropertyDescriptor(Object object) {
itemPropertyDescriptors.add itemPropertyDescriptors.add
(createItemPropertyDescriptor (createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(), getResourceLocator(),
getString("_UI_DataObject_accessControl_feature"), getString("_UI_AbstractDataObject_name_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DataObject_accessControl_feature", "_UI_DataObject_type"), getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataObject_name_feature", "_UI_AbstractDataObject_type"),
SclPackage.eINSTANCE.getDataObject_AccessControl(), SclPackage.eINSTANCE.getAbstractDataObject_Name(),
true, true,
false, false,
false, false,
...@@ -90,19 +93,19 @@ public class DataObjectItemProvider extends UnNamingItemProvider { ...@@ -90,19 +93,19 @@ public class DataObjectItemProvider extends UnNamingItemProvider {
} }
/** /**
* This adds a property descriptor for the Name feature. * This adds a property descriptor for the Type feature.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
protected void addNamePropertyDescriptor(Object object) { protected void addTypePropertyDescriptor(Object object) {
itemPropertyDescriptors.add itemPropertyDescriptors.add
(createItemPropertyDescriptor (createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(), getResourceLocator(),
getString("_UI_DataObject_name_feature"), getString("_UI_AbstractDataObject_type_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DataObject_name_feature", "_UI_DataObject_type"), getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataObject_type_feature", "_UI_AbstractDataObject_type"),
SclPackage.eINSTANCE.getDataObject_Name(), SclPackage.eINSTANCE.getAbstractDataObject_Type(),
true, true,
false, false,
false, false,
...@@ -111,6 +114,50 @@ public class DataObjectItemProvider extends UnNamingItemProvider { ...@@ -111,6 +114,50 @@ public class DataObjectItemProvider extends UnNamingItemProvider {
null)); null));
} }
/**
* This adds a property descriptor for the Refers To DO Type feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToDOTypePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AbstractDataObject_RefersToDOType_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataObject_RefersToDOType_feature", "_UI_AbstractDataObject_type"),
SclPackage.eINSTANCE.getAbstractDataObject_RefersToDOType(),
true,
false,
true,
null,
null,
null));
}
/**
* This adds a property descriptor for the Referred By Ext Ref feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addReferredByExtRefPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_AbstractDataObject_ReferredByExtRef_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_AbstractDataObject_ReferredByExtRef_feature", "_UI_AbstractDataObject_type"),
SclPackage.eINSTANCE.getAbstractDataObject_ReferredByExtRef(),
true,
false,
true,
null,
null,
null));
}
/** /**
* This returns the label text for the adapted class. * This returns the label text for the adapted class.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
...@@ -119,10 +166,10 @@ public class DataObjectItemProvider extends UnNamingItemProvider { ...@@ -119,10 +166,10 @@ public class DataObjectItemProvider extends UnNamingItemProvider {
*/ */
@Override @Override
public String getText(Object object) { public String getText(Object object) {
String label = ((DataObject)object).getName(); String label = ((AbstractDataObject)object).getName();
return label == null || label.length() == 0 ? return label == null || label.length() == 0 ?
getString("_UI_DataObject_type") : getString("_UI_AbstractDataObject_type") :
getString("_UI_DataObject_type") + " " + label; getString("_UI_AbstractDataObject_type") + " " + label;
} }
...@@ -137,9 +184,9 @@ public class DataObjectItemProvider extends UnNamingItemProvider { ...@@ -137,9 +184,9 @@ public class DataObjectItemProvider extends UnNamingItemProvider {
public void notifyChanged(Notification notification) { public void notifyChanged(Notification notification) {
updateChildren(notification); updateChildren(notification);
switch (notification.getFeatureID(DataObject.class)) { switch (notification.getFeatureID(AbstractDataObject.class)) {
case SclPackage.DATA_OBJECT__ACCESS_CONTROL: case SclPackage.ABSTRACT_DATA_OBJECT__NAME:
case SclPackage.DATA_OBJECT__NAME: case SclPackage.ABSTRACT_DATA_OBJECT__TYPE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
} }
......
...@@ -39,7 +39,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; ...@@ -39,7 +39,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
public class DAIItemProvider extends DataAttributeItemProvider { public class DAIItemProvider extends UnNamingItemProvider {
/** /**
* This constructs an instance from a factory and a notifier. * This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
...@@ -65,6 +65,8 @@ public class DAIItemProvider extends DataAttributeItemProvider { ...@@ -65,6 +65,8 @@ public class DAIItemProvider extends DataAttributeItemProvider {
addSAddrPropertyDescriptor(object); addSAddrPropertyDescriptor(object);
addValImportPropertyDescriptor(object); addValImportPropertyDescriptor(object);
addValKindPropertyDescriptor(object); addValKindPropertyDescriptor(object);
addNamePropertyDescriptor(object);
addRefersToAbstractDataAttributePropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -157,6 +159,50 @@ public class DAIItemProvider extends DataAttributeItemProvider { ...@@ -157,6 +159,50 @@ public class DAIItemProvider extends DataAttributeItemProvider {
null)); null));
} }
/**
* This adds a property descriptor for the Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_DAI_name_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DAI_name_feature", "_UI_DAI_type"),
SclPackage.eINSTANCE.getDAI_Name(),
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null));
}
/**
* This adds a property descriptor for the Refers To Abstract Data Attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToAbstractDataAttributePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_DAI_RefersToAbstractDataAttribute_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DAI_RefersToAbstractDataAttribute_feature", "_UI_DAI_type"),
SclPackage.eINSTANCE.getDAI_RefersToAbstractDataAttribute(),
true,
false,
true,
null,
null,
null));
}
/** /**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
...@@ -229,6 +275,7 @@ public class DAIItemProvider extends DataAttributeItemProvider { ...@@ -229,6 +275,7 @@ public class DAIItemProvider extends DataAttributeItemProvider {
case SclPackage.DAI__SADDR: case SclPackage.DAI__SADDR:
case SclPackage.DAI__VAL_IMPORT: case SclPackage.DAI__VAL_IMPORT:
case SclPackage.DAI__VAL_KIND: case SclPackage.DAI__VAL_KIND:
case SclPackage.DAI__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
case SclPackage.DAI__VAL: case SclPackage.DAI__VAL:
......
...@@ -39,7 +39,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; ...@@ -39,7 +39,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
public class DOIItemProvider extends DataObjectItemProvider { public class DOIItemProvider extends UnNamingItemProvider {
/** /**
* This constructs an instance from a factory and a notifier. * This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
...@@ -62,6 +62,9 @@ public class DOIItemProvider extends DataObjectItemProvider { ...@@ -62,6 +62,9 @@ public class DOIItemProvider extends DataObjectItemProvider {
super.getPropertyDescriptors(object); super.getPropertyDescriptors(object);
addIxPropertyDescriptor(object); addIxPropertyDescriptor(object);
addAccessControlPropertyDescriptor(object);
addNamePropertyDescriptor(object);
addRefersToDOPropertyDescriptor(object);
} }
return itemPropertyDescriptors; return itemPropertyDescriptors;
} }
...@@ -88,6 +91,72 @@ public class DOIItemProvider extends DataObjectItemProvider { ...@@ -88,6 +91,72 @@ public class DOIItemProvider extends DataObjectItemProvider {
null)); null));
} }
/**
* This adds a property descriptor for the Access Control feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addAccessControlPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_DOI_accessControl_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DOI_accessControl_feature", "_UI_DOI_type"),
SclPackage.eINSTANCE.getDOI_AccessControl(),
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null));
}
/**
* This adds a property descriptor for the Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_DOI_name_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DOI_name_feature", "_UI_DOI_type"),
SclPackage.eINSTANCE.getDOI_Name(),
true,
false,
false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
null,
null));
}
/**
* This adds a property descriptor for the Refers To DO feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void addRefersToDOPropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_DOI_RefersToDO_feature"),
getString("_UI_PropertyDescriptor_description", "_UI_DOI_RefersToDO_feature", "_UI_DOI_type"),
SclPackage.eINSTANCE.getDOI_RefersToDO(),
true,
false,
true,
null,
null,
null));
}
/** /**
* This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
...@@ -158,6 +227,8 @@ public class DOIItemProvider extends DataObjectItemProvider { ...@@ -158,6 +227,8 @@ public class DOIItemProvider extends DataObjectItemProvider {
switch (notification.getFeatureID(DOI.class)) { switch (notification.getFeatureID(DOI.class)) {
case SclPackage.DOI__IX: case SclPackage.DOI__IX:
case SclPackage.DOI__ACCESS_CONTROL:
case SclPackage.DOI__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return; return;
case SclPackage.DOI__DAI: case SclPackage.DOI__DAI:
......
...@@ -37,7 +37,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage; ...@@ -37,7 +37,7 @@ import fr.centralesupelec.edf.riseclipse.iec61850.scl.SclPackage;
* <!-- end-user-doc --> * <!-- end-user-doc -->
* @generated * @generated
*/ */
public class DOItemProvider extends DataObjectItemProvider { public class DOItemProvider extends AbstractDataObjectItemProvider {
/** /**
* This constructs an instance from a factory and a notifier. * This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
...@@ -60,8 +60,8 @@ public class DOItemProvider extends DataObjectItemProvider { ...@@ -60,8 +60,8 @@ public class DOItemProvider extends DataObjectItemProvider {
super.getPropertyDescriptors(object); super.getPropertyDescriptors(object);
addTransientPropertyDescriptor(object); addTransientPropertyDescriptor(object);
addTypePropertyDescriptor(object);