[releng] Fix property view GridData cannot be cast to FillData issue

Change-Id: Ibb2d28cbd131601424a513743b9d4937e6fe26a9 Signed-off-by: Sandu Postaru <[email protected]>
eclipse-capella · Dec 6, 2019 · a03c673 · a03c673
1 parent 1a2e291
commit a03c673
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/...c/org/polarsys/capella/filtering/properties/sections/CapellaFilteringPropertySection.java b/...c/org/polarsys/capella/filtering/properties/sections/CapellaFilteringPropertySection.java
@@ -71,8 +71,8 @@ public boolean select(Object toTest) {
   public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage) {
     super.createControls(parent, aTabbedPropertySheetPage);
 
-    rootParentComposite.setLayout(new GridLayout());
-    rootParentComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+    parent.setLayout(new GridLayout());
+    parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
     criteria = new IndirectCapellaElementCriteriaMultipleSemanticField(getReferencesGroup(), Messages.PropertySection_filteringLabel,
         getWidgetFactory(), new CapellaElementCriteria());
@@ -111,17 +111,17 @@ public void setInput(IWorkbenchPart part, ISelection selection) {
       if (selected instanceof CapellaElement) {
         if (selected.eClass().equals(CsPackage.eINSTANCE.getPart())) {
           boolean allowMultiplePart = TriStateBoolean.True
-              .equals(CapellaProjectHelper.isReusableComponentsDriven((Part) selected));
+              .equals(CapellaProjectHelper.isReusableComponentsDriven(selected));
           if (!allowMultiplePart) {
             AbstractType type = ((Part) selected).getAbstractType();
             if ((type != null) && !(type instanceof ConfigurationItem)) {
               super.setInput(part, new StructuredSelection(type));
-              loadData((CapellaElement) type);
+              loadData(type);
               return;
             }
           }
         }
-        loadData((CapellaElement) selected);
+        loadData(selected);
       }
     }
     super.setInput(part, selection);

diff --git a/.../org/polarsys/capella/filtering/properties/sections/ComposedResultSetPropertySection.java b/.../org/polarsys/capella/filtering/properties/sections/ComposedResultSetPropertySection.java
@@ -49,8 +49,8 @@ public boolean select(Object toTest) {
   public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage) {
     super.createControls(parent, aTabbedPropertySheetPage);
 
-    rootParentComposite.setLayout(new GridLayout());
-    rootParentComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+    parent.setLayout(new GridLayout());
+    parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
     filteringResults = new MultipleSemanticField(getReferencesGroup(),
         Messages.PropertySection_filteringResults, getWidgetFactory(), new AbstractMultipleSemanticFieldController() {

diff --git a/...s/src/org/polarsys/capella/filtering/properties/sections/CriterionSetPropertySection.java b/...s/src/org/polarsys/capella/filtering/properties/sections/CriterionSetPropertySection.java
@@ -50,8 +50,8 @@ public boolean select(Object toTest) {
   public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage) {
     super.createControls(parent, aTabbedPropertySheetPage);
 
-    rootParentComposite.setLayout(new GridLayout());
-    rootParentComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+    parent.setLayout(new GridLayout());
+    parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
     criteria = new CriteriaMultipleSemanticField(getReferencesGroup(), Messages.PropertySection_filteringLabel, getWidgetFactory(),
         new CriterionSetFilteringCriteriaController());
     criteria.setDisplayedInWizard(isDisplayedInWizard());