diff options
| author | Maxime Porhel | 2016-01-29 14:45:56 +0000 |
|---|---|---|
| committer | Maxime Porhel | 2016-02-08 14:33:09 +0000 |
| commit | e85a9ea51011e9fa0bf25f81afc2769e4f7b18c3 (patch) | |
| tree | 464a4fdfe5309b13c72e0ad6fcbcaa316d769d01 | |
| parent | 03beb97df006574cb829aab4ec37bb71b02610e3 (diff) | |
| download | org.eclipse.sirius-e85a9ea51011e9fa0bf25f81afc2769e4f7b18c3.tar.gz org.eclipse.sirius-e85a9ea51011e9fa0bf25f81afc2769e4f7b18c3.tar.xz org.eclipse.sirius-e85a9ea51011e9fa0bf25f81afc2769e4f7b18c3.zip | |
[486828] Add UIState image
Set UIState.edit.image = true in viewpoint.genmodel.
This property had an inconsistent value compared to the value of
DRepresentation.uiState.edit.createChild which set to true.
This caused several NPEs on the selection of a DRepresentation from an
aird opened in the Sample Reflective Ecore Model Editor (for debugging
reasons)
Bug: 486828
Change-Id: I0c30694e77568f66362e7a79044e3ba3d334c731
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
3 files changed, 11 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.ui/icons/full/obj16/UIState.gif b/plugins/org.eclipse.sirius.ui/icons/full/obj16/UIState.gif Binary files differnew file mode 100644 index 0000000000..e4bc22dd17 --- /dev/null +++ b/plugins/org.eclipse.sirius.ui/icons/full/obj16/UIState.gif diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/UIStateItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/UIStateItemProvider.java index c6babae82a..f4f34c86a3 100644 --- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/UIStateItemProvider.java +++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/provider/UIStateItemProvider.java @@ -92,6 +92,16 @@ public class UIStateItemProvider extends ItemProviderAdapter implements IEditing } /** + * This returns UIState.gif. <!-- begin-user-doc --> <!-- end-user-doc --> + * + * @generated + */ + @Override + public Object getImage(Object object) { + return overlayImage(object, getResourceLocator().getImage("full/obj16/UIState")); //$NON-NLS-1$ + } + + /** * This returns the label text for the adapted class. <!-- begin-user-doc * --> <!-- end-user-doc --> * diff --git a/plugins/org.eclipse.sirius/model/viewpoint.genmodel b/plugins/org.eclipse.sirius/model/viewpoint.genmodel index a3f2a5203f..c7f93df8e8 100644 --- a/plugins/org.eclipse.sirius/model/viewpoint.genmodel +++ b/plugins/org.eclipse.sirius/model/viewpoint.genmodel @@ -121,7 +121,7 @@ <genClasses image="false" ecoreClass="viewpoint.ecore#//Customizable"> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EAttribute viewpoint.ecore#//Customizable/customFeatures"/> </genClasses> - <genClasses image="false" ecoreClass="viewpoint.ecore#//UIState"> + <genClasses ecoreClass="viewpoint.ecore#//UIState"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute viewpoint.ecore#//UIState/inverseSelectionOrder"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference viewpoint.ecore#//UIState/elementsToSelect"/> </genClasses> |
