Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2016-05-30 13:35:29 +0000
committerPierre-Charles David2016-05-30 13:54:57 +0000
commita62c4268a5452b7c35ba2d8b86ed9d6ad29cc066 (patch)
tree69a12994e7a5b0d4ef92858af70851dfa3432238
parent9f8ca427badbaf2892a3e0e51a64deb0fe44828b (diff)
downloadorg.eclipse.sirius-a62c4268a5452b7c35ba2d8b86ed9d6ad29cc066.tar.gz
org.eclipse.sirius-a62c4268a5452b7c35ba2d8b86ed9d6ad29cc066.tar.xz
org.eclipse.sirius-a62c4268a5452b7c35ba2d8b86ed9d6ad29cc066.zip
[482528] Set initial value for Page and Group labelExpressions
Empty values for these cause bad crashes in SWT's GC class. Bug: 482528 Change-Id: I6c56cf118470f4fca39ce4ba5576baef0cfa9596 Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java2
-rw-r--r--incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java12
2 files changed, 11 insertions, 3 deletions
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
index dfbf0fbb63..4b03fa7cb0 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/PropertiesItemProviderAdapterFactory.java
@@ -1541,8 +1541,10 @@ public class PropertiesItemProviderAdapterFactory extends PropertiesAdapterFacto
public Object caseGroup(Group object) {
ViewExtensionDescription ved = PropertiesFactory.eINSTANCE.createViewExtensionDescription();
PageDescription page = PropertiesFactory.eINSTANCE.createPageDescription();
+ page.setLabelExpression("Page"); //$NON-NLS-1$
ved.getPages().add(page);
GroupDescription group = PropertiesFactory.eINSTANCE.createGroupDescription();
+ group.setLabelExpression("Group"); //$NON-NLS-1$
ved.getGroups().add(group);
page.getGroups().add(group);
newChildDescriptors.add(createChildParameter(DescriptionPackage.Literals.GROUP__EXTENSIONS, ved));
diff --git a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
index 66af5b688b..de34863f6e 100644
--- a/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
+++ b/incubation/org.eclipse.sirius.properties.edit/src-gen/org/eclipse/sirius/properties/provider/ViewExtensionDescriptionItemProvider.java
@@ -28,6 +28,8 @@ 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.sirius.properties.GroupDescription;
+import org.eclipse.sirius.properties.PageDescription;
import org.eclipse.sirius.properties.PropertiesFactory;
import org.eclipse.sirius.properties.PropertiesPackage;
import org.eclipse.sirius.properties.ViewExtensionDescription;
@@ -181,15 +183,19 @@ public class ViewExtensionDescriptionItemProvider extends ItemProviderAdapter
* describing the children that can be created under this object. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
- * @generated
+ * @generated NOT
*/
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__PAGES, PropertiesFactory.eINSTANCE.createPageDescription()));
+ PageDescription page = PropertiesFactory.eINSTANCE.createPageDescription();
+ page.setLabelExpression("Page"); //$NON-NLS-1$
+ newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__PAGES, page));
- newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__GROUPS, PropertiesFactory.eINSTANCE.createGroupDescription()));
+ GroupDescription group = PropertiesFactory.eINSTANCE.createGroupDescription();
+ group.setLabelExpression("Group"); //$NON-NLS-1$
+ newChildDescriptors.add(createChildParameter(PropertiesPackage.Literals.VIEW_EXTENSION_DESCRIPTION__GROUPS, group));
}
/**

Back to the top