[499886] Use the real UiCallback for properties operations

Bug: 499886
Change-Id: I0c6749ec4dcd264e67eb04ad7568561fb8ab6c38
Cherry-picks: aa51d4c1b575c56bd2c6d9351bed5d8467a96f6b
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

2 files changed, 4 insertions, 3 deletions

diff --git a/incubation/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF b/incubation/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF
index 976f1a4734..922da1ede7 100644
--- a/incubation/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF
+++ b/incubation/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF
@@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.eef;bundle-version="1.6.0",
  org.eclipse.eef.common.ui;bundle-version="[1.6.0,2.0.0)",
  org.eclipse.eef.ide.ui.properties;bundle-version="[1.6.0,2.0.0)",
  org.eclipse.sirius.ext.emf.edit;bundle-version="4.0.0",
- org.eclipse.eef.properties.ui.legacy;bundle-version="1.6.0"
+ org.eclipse.eef.properties.ui.legacy;bundle-version="1.6.0",
+ org.eclipse.sirius.ui;bundle-version="4.0.0"
 Import-Package: com.ibm.icu.util,
  org.eclipse.sirius.ui.business.api.dialect;version="3.1.0",
  org.eclipse.sirius.ui.tools.api.properties;version="2.1.0"
diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java
index 59fa74a4d6..adf558f3f7 100644
--- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java
+++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusToolServices.java
@@ -29,13 +29,13 @@ import org.eclipse.sirius.ext.base.Option;
 import org.eclipse.sirius.ext.emf.edit.EditingDomainServices;
 import org.eclipse.sirius.properties.ViewExtensionDescription;
 import org.eclipse.sirius.tools.api.command.SiriusCommand;
-import org.eclipse.sirius.tools.api.command.ui.NoUICallback;
 import org.eclipse.sirius.ui.properties.internal.tabprovider.SiriusTabDescriptorProvider;
 import org.eclipse.sirius.viewpoint.DRepresentation;
 import org.eclipse.sirius.viewpoint.DSemanticDecorator;
 import org.eclipse.sirius.viewpoint.description.Viewpoint;
 import org.eclipse.sirius.viewpoint.description.tool.InitialOperation;
 import org.eclipse.sirius.viewpoint.description.tool.ModelOperation;
+import org.eclipse.sirius.viewpoint.provider.SiriusEditPlugin;
 
 /**
  * This class contains various services provided by the Sirius UI Properties
@@ -121,7 +121,7 @@ public class SiriusToolServices {
         ModelOperation modelOperation = findModelOperation(initialCommandUri, session);
         if (modelOperation != null) {
             ModelAccessor modelAccessor = session.getModelAccessor();
-            ICommandTask task = new TaskHelper(modelAccessor, new NoUICallback()).buildTaskFromModelOperation(eObject, modelOperation);
+            ICommandTask task = new TaskHelper(modelAccessor, SiriusEditPlugin.getPlugin().getUiCallback()).buildTaskFromModelOperation(eObject, modelOperation);
             SiriusCommand command = new SiriusCommand(session.getTransactionalEditingDomain(), "SiriusToolServices#executeOperation");
             command.getTasks().add(task);
             session.getTransactionalEditingDomain().getCommandStack().execute(command);