[2099] Adapt the Capella code to the removing of refresh() operation.

Bug: 2099 Change-Id: I081404d313fb46d56b1c92c023cf507d09e05767 Signed-off-by: Florian Barbin <florian.barbin@obeo.fr>
eclipse-capella · Jun 13, 2018 · 617223b · 617223b
1 parent 11f7a92
commit 617223b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/.../org/polarsys/capella/core/flexibility/commands/dynamic/tools/DiagramActionsProvider.java b/.../org/polarsys/capella/core/flexibility/commands/dynamic/tools/DiagramActionsProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2016 THALES GLOBAL SERVICES.
+ * Copyright (c) 2006, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -797,7 +797,7 @@ private boolean process(DDiagram object) {
             new EmbeddedMessage(NLS.bind("Edges on diagram ''{0}'' have recovered default color.", object.getName()), IReportManagerDefaultComponents.UI, //$NON-NLS-1$
                 object));
         try {
-          object.refresh();
+                    DialectManager.INSTANCE.refresh(object, new NullProgressMonitor());
         } catch (Exception exceptionP) {
           getLogger().warn(
               new EmbeddedMessage(NLS.bind("An error occured while refreshing diagram ''{0}''.", object.getName()), IReportManagerDefaultComponents.UI, //$NON-NLS-1$

diff --git a/.../polarsys/capella/core/platform/sirius/clipboard/commands/GraphicalAdjustmentCommand.java b/.../polarsys/capella/core/platform/sirius/clipboard/commands/GraphicalAdjustmentCommand.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2017 THALES GLOBAL SERVICES.
+ * Copyright (c) 2006, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.gmf.runtime.notation.Diagram;
@@ -23,6 +24,7 @@
 import org.eclipse.gmf.runtime.notation.Location;
 import org.eclipse.gmf.runtime.notation.Node;
 import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.sirius.business.api.dialect.DialectManager;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
 import org.eclipse.sirius.diagram.tools.api.layout.PinHelper;
@@ -152,7 +154,9 @@ protected void refresh(Collection<? extends Node> roots) {
       if (diagElement instanceof DDiagram)
         diagram = (DDiagram)diagElement;
     }
-    if (diagram != null) diagram.refresh();
+    if (diagram != null) {
+      DialectManager.INSTANCE.refresh(diagram, new NullProgressMonitor());
+    }
   }
 
   /**

diff --git a/...capella/core/sequencediag/specific/tool/internal/edit/policy/ChooseServiceEditPolicy.java b/...capella/core/sequencediag/specific/tool/internal/edit/policy/ChooseServiceEditPolicy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2006, 2018 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature.Setting;
 import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
@@ -32,6 +33,7 @@
 import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.sirius.business.api.dialect.DialectManager;
 import org.eclipse.sirius.common.tools.api.util.TreeItemWrapper;
 import org.eclipse.sirius.common.ui.tools.api.selection.EObjectSelectionWizard;
 import org.eclipse.sirius.diagram.ui.graphical.edit.policies.AbstractSiriusEditPolicy;
@@ -121,7 +123,7 @@ public void execute() {
             new ICommandProxy(new GMFCommandWrapper(getEditingDomain(), new RecordingCommand(getEditingDomain()) {
               @Override
               protected void doExecute() {
-                getSirius().refresh();
+                  DialectManager.INSTANCE.refresh(getSirius(), new NullProgressMonitor());
               }
             })).execute();
             // Do not call RefreshDiagramCommand anymore since Sirius 4.18.

diff --git a/...irius.analysis/src/org/polarsys/capella/core/sirius/analysis/FunctionalChainServices.java b/...irius.analysis/src/org/polarsys/capella/core/sirius/analysis/FunctionalChainServices.java
@@ -37,6 +37,7 @@
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.style.BorderedStyleDescription;
 import org.eclipse.sirius.diagram.description.style.EdgeStyleDescription;
+import org.eclipse.sirius.diagram.tools.api.command.view.RefreshSiriusElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.RGBValues;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
@@ -342,7 +343,7 @@ public void updateFunctionalChainStyles(DDiagram diagram) {
 					incompleteFC.add(me.getKey());
 				}
 			}
-			me.getValue().refresh();
+            RefreshSiriusElement.refresh(me.getValue());
 		}
 
 		// destroy old internal links

diff --git a/....core.sirius.analysis/src/org/polarsys/capella/core/sirius/analysis/PhysicalServices.java b/....core.sirius.analysis/src/org/polarsys/capella/core/sirius/analysis/PhysicalServices.java
@@ -21,10 +21,8 @@
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.eclipse.core.runtime.Assert;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.sirius.diagram.AbstractDNode;
 import org.eclipse.sirius.diagram.DDiagram;
 import org.eclipse.sirius.diagram.DDiagramElement;
@@ -41,6 +39,7 @@
 import org.eclipse.sirius.diagram.description.EdgeMapping;
 import org.eclipse.sirius.diagram.description.NodeMapping;
 import org.eclipse.sirius.diagram.description.style.EdgeStyleDescription;
+import org.eclipse.sirius.diagram.tools.api.command.view.RefreshSiriusElement;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.RGBValues;
 import org.eclipse.sirius.viewpoint.SiriusPlugin;
@@ -826,7 +825,7 @@ public void updatePhysicalPathStyles(DDiagram diagram) {
           }
         }
       }
-      me.getValue().refresh();
+      RefreshSiriusElement.refresh(me.getValue());
     }
 
     // Destroy old internal links