Fix stereotypes feature

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>it.unibz.inf.ontouml</groupId>
     <artifactId>ontouml-vp-plugin</artifactId>
-    <version>0.5.3</version>
+    <version>0.5.4</version>
 
     <name>OntoUML 2 Plugin for Visual Paradigm</name>
 

src/main/java/it/unibz/inf/ontouml/vp/OntoUMLPlugin.java

@@ -16,7 +16,7 @@
  */
 public class OntoUMLPlugin implements VPPlugin {
 
-  public static final String PLUGIN_VERSION_RELEASE = "0.5.3";
+  public static final String PLUGIN_VERSION_RELEASE = "0.5.4";
   public static final String PLUGIN_ID = "it.unibz.inf.ontouml.vp";
   public static final String PLUGIN_NAME = "OntoUML Plugin";
   public static final String PLUGIN_REPO = "https://github.com/OntoUML/ontouml-vp-plugin/";

src/main/java/it/unibz/inf/ontouml/vp/controllers/ApplyAssociationStereotypeMenuManager.java

@@ -3,6 +3,7 @@
 import com.vp.plugin.action.VPAction;
 import com.vp.plugin.action.VPContext;
 import com.vp.plugin.model.IAssociation;
+import com.vp.plugin.model.IAssociationEnd;
 import com.vp.plugin.model.IModelElement;
 import it.unibz.inf.ontouml.vp.model.uml.Association;
 import it.unibz.inf.ontouml.vp.utils.OntoUMLConstraintsManager;
@@ -49,7 +50,7 @@ public void performAction() {
     boolean shouldProceed = true;
 
     if (shouldWarnAboutInvertingAssociations())
-      shouldProceed = ViewManagerUtils.associationInvertionWarningDialog();
+      shouldProceed = ViewManagerUtils.showInvertAssociationWarningDialog();
 
     if (!shouldProceed) return;
 
@@ -58,11 +59,19 @@ public void performAction() {
         .filter(Association::holdsBetweenClasses)
         .forEach(
             association -> {
-              if (doesRequireInverting(association))
-                Association.invertAssociation(association, true);
-
-              StereotypesManager.applyStereotype(
-                  association, associationStereotypeId.getStereotype());
+              String stereotype = associationStereotypeId.getStereotype();
+              StereotypesManager.applyStereotype(association, stereotype);
+              IAssociationEnd sourceEnd =
+                  !doesRequireInverting(association)
+                      ? Association.getSourceEnd(association)
+                      : Association.getTargetEnd(association);
+              IAssociationEnd targetEnd =
+                  !doesRequireInverting(association)
+                      ? Association.getTargetEnd(association)
+                      : Association.getSourceEnd(association);
+
+              Association.setSourceEndProperties(association, sourceEnd);
+              Association.setTargetEndProperties(association, targetEnd);
             });
   }
 

src/main/java/it/unibz/inf/ontouml/vp/controllers/ModelActionController.java → src/main/java/it/unibz/inf/ontouml/vp/controllers/InvertAssociationController.java

@@ -12,7 +12,7 @@
 import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils;
 import java.awt.event.ActionEvent;
 
-public class ModelActionController implements VPContextActionController {
+public class InvertAssociationController implements VPContextActionController {
 
   @Override
   public void performAction(VPAction action, VPContext context, ActionEvent event) {
@@ -37,7 +37,7 @@ public void performAction(VPAction action, VPContext context, ActionEvent event)
       case ActionIdManager.ASSOCIATION_ACTION_INVERT_ASSOCIATION:
         ModelElement.forEachSelectedElement(
             clickedAssociation,
-            selectedAssociation -> Association.invertAssociation(selectedAssociation, false));
+            selectedAssociation -> Association.invertAssociation(selectedAssociation));
         break;
     }
   }

src/main/java/it/unibz/inf/ontouml/vp/controllers/ModelSanitizeController.java

@@ -0,0 +1,49 @@
+package it.unibz.inf.ontouml.vp.controllers;
+
+import com.vp.plugin.action.VPAction;
+import com.vp.plugin.action.VPActionController;
+import it.unibz.inf.ontouml.vp.utils.SimpleServiceWorker;
+import it.unibz.inf.ontouml.vp.utils.ViewManagerUtils;
+import java.util.List;
+
+public class ModelSanitizeController implements VPActionController {
+
+  private static final String MESSAGE_MODEL_SANITIZE_SUCCESS =
+      "Model sanitize executed successfully.";
+  private static final String MESSAGE_MODEL_IMPORT_UNEXPECTED_ERROR =
+      "Unexpected error performing model sanitize.";
+
+  private boolean shouldProceed = false;
+
+  @Override
+  public void update(VPAction vpAction) {}
+
+  @Override
+  public void performAction(VPAction vpAction) {
+    showFixStereotypesWarning();
+
+    if (!shouldProceed) return;
+
+    new SimpleServiceWorker(this::sanitizeModelTask).execute();
+  }
+
+  private void showFixStereotypesWarning() {
+    shouldProceed = ViewManagerUtils.showFixStereotypesWarningDialog();
+  }
+
+  private List<String> sanitizeModelTask(SimpleServiceWorker context) {
+    try {
+      if (!context.isCancelled()) {
+        ModelSanitizeManager.run();
+        ViewManagerUtils.log(MESSAGE_MODEL_SANITIZE_SUCCESS);
+        return List.of(MESSAGE_MODEL_SANITIZE_SUCCESS);
+      }
+
+      return List.of();
+    } catch (Exception e) {
+      e.printStackTrace();
+      ViewManagerUtils.log(MESSAGE_MODEL_IMPORT_UNEXPECTED_ERROR);
+      return List.of(MESSAGE_MODEL_IMPORT_UNEXPECTED_ERROR);
+    }
+  }
+}