#9 Add quickfix to remove references to out of scope elements

Signed-off-by: Felix Dorner <[email protected]>
eclipse-capella · Jun 2, 2021 · 83d84e0 · 83d84e0
1 parent 30f7c9e
commit 83d84e0
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/plugins/org.polarsys.capella.vp.ms.validation/META-INF/MANIFEST.MF b/plugins/org.polarsys.capella.vp.ms.validation/META-INF/MANIFEST.MF
@@ -7,5 +7,6 @@ Automatic-Module-Name: org.polarsys.capella.vp.ms.validation
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.emf.validation;bundle-version="1.8.0",
  org.polarsys.capella.core.validation;bundle-version="[1.4.0,1.5.0)",
- org.polarsys.capella.vp.ms
+ org.polarsys.capella.vp.ms,
+ org.polarsys.capella.core.validation.ui.ide
 Export-Package: org.polarsys.capella.vp.ms.validation
diff --git a/plugins/org.polarsys.capella.vp.ms.validation/plugin.xml b/plugins/org.polarsys.capella.vp.ms.validation/plugin.xml
@@ -49,5 +49,16 @@
          </constraints>
       </constraintProvider>
    </extension>
+   <extension
+         point="org.polarsys.capella.core.validation.ui.ide.capellaQuickFix">
+      <resolver
+            class="org.polarsys.capella.vp.ms.validation.ConfigurationElementsInScope$Quickfix"
+            desc="Remove the reference to the element not in scope"
+            label="Remove reference to element">
+         <rules
+               ruleId="ElementsMustBeInScope">
+         </rules>
+      </resolver>
+   </extension>
 
 </plugin>
diff --git a/...ms.validation/src/org/polarsys/capella/vp/ms/validation/ConfigurationElementsInScope.java b/...ms.validation/src/org/polarsys/capella/vp/ms/validation/ConfigurationElementsInScope.java
@@ -15,13 +15,19 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 
+import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.util.TransactionUtil;
 import org.eclipse.emf.validation.EMFEventType;
 import org.eclipse.emf.validation.IValidationContext;
 import org.eclipse.emf.validation.model.ConstraintStatus;
 import org.polarsys.capella.core.validation.rule.AbstractValidationRule;
+import org.polarsys.capella.core.validation.ui.ide.quickfix.AbstractCapellaMarkerResolution;
 import org.polarsys.capella.vp.ms.CSConfiguration;
 
 public class ConfigurationElementsInScope extends AbstractValidationRule {
@@ -53,4 +59,22 @@ public IStatus validate(IValidationContext ctx) {
     return ctx.createSuccessStatus();
   }
 
+  public static class Quickfix extends AbstractCapellaMarkerResolution {
+    @Override
+    public void run(IMarker marker) {
+      List<EObject> e = getModelElements(marker);
+      CSConfiguration c = (CSConfiguration) e.remove(0);
+      TransactionalEditingDomain d = TransactionUtil.getEditingDomain(c);
+      d.getCommandStack().execute(new RecordingCommand(d) {        
+        @Override
+        protected void doExecute() {
+          c.getIncluded().removeAll(e);
+          c.getExcluded().removeAll(e);
+        }
+      });
+      deleteMarker(marker);
+    }
+
+  }
+
 }