[496058] Fix CCE with default rules' category handling

Bug: 496058
Change-Id: Ic4cfc84fcdfa72eae34800c4ff323cf683c1d881
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

2 files changed, 8 insertions, 3 deletions

diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/EEFViewCategory.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/EEFViewCategory.java
index 2056a3a312..3f63408827 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/EEFViewCategory.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/EEFViewCategory.java
@@ -54,6 +54,10 @@ public class EEFViewCategory implements InternalEObject {
         this.eObject = eObject;
         this.category = category;
     }
+    
+    public EObject getWrappedEObject() {
+        return eObject;
+    }
 
     @Override
     public EList<Adapter> eAdapters() {
diff --git a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java
index fd47377ce4..651621f3b1 100644
--- a/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java
+++ b/plugins/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java
@@ -242,9 +242,10 @@ public class SiriusToolServices {
         // Get all the features associated to the eObject and filtered by
         // category
         if (eObject instanceof EEFViewCategory) {
-            String groupCategory = ((EEFViewCategory) eObject).getCategory();
-            for (EStructuralFeature eStructuralFeature : getVisibleEStructuralFeatures(eObject)) {
-                String featureCategory = this.editServices.getPropertyDescriptorCategory(eObject, eStructuralFeature.getName(), Messages.SiriusToolServices_DefaultCategoryName);
+            EEFViewCategory category = (EEFViewCategory) eObject;
+            String groupCategory = category.getCategory();
+            for (EStructuralFeature eStructuralFeature : getVisibleEStructuralFeatures(category.getWrappedEObject())) {
+                String featureCategory = this.editServices.getPropertyDescriptorCategory(category.getWrappedEObject(), eStructuralFeature.getName(), Messages.SiriusToolServices_DefaultCategoryName);
                 if (groupCategory.equals(featureCategory)) {
                     result.add(eStructuralFeature);
                 }