cancel operation bug has been fixed.

ModelWriter · Jul 12, 2016 · 0fbd9c0 · 0fbd9c0
1 parent 7af38d2
commit 0fbd9c0
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 59 deletions.
diff --git a/...iter.configuration/src/eu/modelwriter/configuration/alloy/discovery/AlloyDiscovering.java b/...iter.configuration/src/eu/modelwriter/configuration/alloy/discovery/AlloyDiscovering.java
@@ -55,8 +55,16 @@ public static int addStrayedAtom2Sig(final DocumentRoot documentRoot, final Stri
       InstanceTranslatorDiscovering.baseFileDirectory + "discovering.xml";
 
   public void discovering() {
-    if (AlloyValidator.isCanceled)
+    if (!AlloyValidator.validate()) {
+      JOptionPane.showMessageDialog(null,
+          "There is not any discovering. Because instance is inconsistent.", "Discovering on Atoms",
+          JOptionPane.INFORMATION_MESSAGE);
       return;
+    }
+
+    if (AlloyValidator.isCanceled) {
+      return;
+    }
 
     final File discoveringXml = new File(this.xmlPath);
     if (discoveringXml.exists()) {
@@ -66,14 +74,6 @@ public void discovering() {
     if (discoveringAls.exists()) {
       discoveringAls.delete();
     }
-    if (!AlloyValidator.validate()) {
-      JOptionPane.showMessageDialog(null,
-          "There is not any discovering. Because instance is inconsistent.", "Discovering on Atoms",
-          JOptionPane.INFORMATION_MESSAGE);
-    }
-
-    if (AlloyValidator.isCanceled)
-      return;
 
     AlloyValidatorDiscovering.validate();
     final Map<String, Integer> discoverSigs = AlloyValidatorDiscovering.discoverSigs;
@@ -85,8 +85,9 @@ public void discovering() {
       return;
     }
 
-    if (AlloyValidator.isCanceled)
+    if (AlloyValidator.isCanceled) {
       return;
+    }
 
     final String moduleName = AlloyUtilities.getOriginalModuleName();
 
@@ -127,14 +128,16 @@ public void discovering() {
         }
       }
 
-      if (AlloyValidator.isCanceled)
+      if (AlloyValidator.isCanceled) {
         return;
+      }
     }
 
     final Map<String, Integer> label2AtomIndex = new HashMap<>();
 
-    if (AlloyValidator.isCanceled)
+    if (AlloyValidator.isCanceled) {
       return;
+    }
 
     for (final Entry<AtomType, String> entry : discoveredAtoms_D.entrySet()) {
       final AtomType atomType_D = entry.getKey();
@@ -143,8 +146,9 @@ public void discovering() {
       label2AtomIndex.put(atomType_D.getLabel(), index);
     }
 
-    if (AlloyValidator.isCanceled)
+    if (AlloyValidator.isCanceled) {
       return;
+    }
 
     for (final Entry<TupleType, String> entry : reasonedTuples_D.entrySet()) {
       documentRootOriginal = AlloyUtilities.getDocumentRoot(); // R
@@ -198,15 +202,17 @@ public void discovering() {
             }
           }
 
-          if (AlloyValidator.isCanceled)
+          if (AlloyValidator.isCanceled) {
             return;
+          }
 
           AlloyUtilities.writeDocumentRoot(documentRootOriginal); // W
         }
       }
 
-      if (AlloyValidator.isCanceled)
+      if (AlloyValidator.isCanceled) {
         return;
+      }
     }
 
     final int discoveredAtoms = discoverSigs.values().stream().mapToInt(Integer::intValue).sum();

diff --git a/...writer.configuration/src/eu/modelwriter/configuration/alloy/reasoning/AlloyReasoning.java b/...writer.configuration/src/eu/modelwriter/configuration/alloy/reasoning/AlloyReasoning.java
@@ -33,6 +33,13 @@ public static void main(final String[] args) {
   }
 
   public void reasoning() {
+    if (!AlloyValidator.validate()) {
+      JOptionPane.showMessageDialog(null,
+          "There is not any reasoning. Because instance is inconsistent.", "Reason on Relations",
+          JOptionPane.INFORMATION_MESSAGE);
+      return;
+    }
+
     if (AlloyValidator.isCanceled) {
       return;
     }
@@ -47,15 +54,6 @@ public void reasoning() {
     if (reasoningAls.exists()) {
       reasoningAls.delete();
     }
-    if (!AlloyValidator.validate()) {
-      JOptionPane.showMessageDialog(null,
-          "There is not any reasoning. Because instance is inconsistent.", "Reason on Relations",
-          JOptionPane.INFORMATION_MESSAGE);
-    }
-
-    if (AlloyValidator.isCanceled) {
-      return;
-    }
 
     AlloyValidatorReasoning.validate();
     final List<String> reasonRelations = AlloyValidatorReasoning.reasonRelations;

diff --git a/...riter.configuration/src/eu/modelwriter/configuration/alloy/validation/AlloyValidator.java b/...riter.configuration/src/eu/modelwriter/configuration/alloy/validation/AlloyValidator.java
@@ -47,18 +47,14 @@ public void warning(final ErrorWarning msg) {
         A4Solution ans = null;
         ans = TranslateAlloyToKodkod.execute_command(rep, world.getAllReachableSigs(), command,
             options);
-
         if (ans.satisfiable()) {
           return true;
         }
       }
 
     } catch (final Err e) {
-      // TODO Auto-generated catch block
       e.printStackTrace();
     }
-
     return false;
   }
-
 }
diff --git a/Source/eu.modelwriter.marker.command/plugin.xml b/Source/eu.modelwriter.marker.command/plugin.xml
@@ -746,7 +746,7 @@
           </enabledWhen>
     </handler>
     <handler
-          class="eu.modelwriter.marker.command.visualization.VizDiscoveryAtomHandler"
+          class="eu.modelwriter.marker.command.visualization.VizDiscoveringHandler"
           commandId="eu.modelwriter.marker.command.discovery">
           <enabledWhen>
           	<with

diff --git a/...isualization/VizDiscoveryAtomHandler.java → .../visualization/VizDiscoveringHandler.java b/...isualization/VizDiscoveryAtomHandler.java → .../visualization/VizDiscoveringHandler.java
@@ -9,10 +9,9 @@
 
 import eu.modelwriter.configuration.alloy.analysis.provider.AnalysisSourceProvider;
 import eu.modelwriter.configuration.alloy.discovery.AlloyDiscovering;
-import eu.modelwriter.configuration.alloy.validation.AlloyValidator;
 import eu.modelwriter.marker.ui.internal.views.visualizationview.Visualization;
 
-public class VizDiscoveryAtomHandler extends AbstractHandler {
+public class VizDiscoveringHandler extends AbstractHandler {
 
   @Override
   public Object execute(final ExecutionEvent event) throws ExecutionException {
@@ -27,16 +26,10 @@ public Object execute(final ExecutionEvent event) throws ExecutionException {
     final Thread thread = new Thread(new Runnable() {
       @Override
       public void run() {
-        if (AlloyValidator.validate()) {
-          if (AlloyValidator.isCanceled) {
-            Visualization.showViz();
-            return;
-          }
-          final AlloyDiscovering alloyDiscovering = new AlloyDiscovering();
-          alloyDiscovering.discovering();
+        final AlloyDiscovering alloyDiscovering = new AlloyDiscovering();
+        alloyDiscovering.discovering();
 
-          Visualization.showViz();
-        }
+        Visualization.showViz();
       }
     });
     thread.start();

diff --git a/...r.marker.command/src/eu/modelwriter/marker/command/visualization/VizReasoningHandler.java b/...r.marker.command/src/eu/modelwriter/marker/command/visualization/VizReasoningHandler.java
@@ -9,7 +9,6 @@
 
 import eu.modelwriter.configuration.alloy.analysis.provider.AnalysisSourceProvider;
 import eu.modelwriter.configuration.alloy.reasoning.AlloyReasoning;
-import eu.modelwriter.configuration.alloy.validation.AlloyValidator;
 import eu.modelwriter.marker.ui.internal.views.visualizationview.Visualization;
 
 public class VizReasoningHandler extends AbstractHandler {
@@ -27,16 +26,10 @@ public Object execute(final ExecutionEvent event) throws ExecutionException {
     final Thread thread = new Thread(new Runnable() {
       @Override
       public void run() {
-        if (AlloyValidator.validate()) {
-          if (AlloyValidator.isCanceled) {
-            Visualization.showViz();
-            return;
-          }
-          final AlloyReasoning alloyReasoning = new AlloyReasoning();
-          alloyReasoning.reasoning();
+        final AlloyReasoning alloyReasoning = new AlloyReasoning();
+        alloyReasoning.reasoning();
 
-          Visualization.showViz();
-        }
+        Visualization.showViz();
       }
     });
     thread.start();

diff --git a/...er.marker.command/src/eu/modelwriter/marker/command/visualization/VizStopNextHandler.java b/...er.marker.command/src/eu/modelwriter/marker/command/visualization/VizStopNextHandler.java
@@ -9,6 +9,7 @@
 
 import eu.modelwriter.configuration.alloy.analysis.provider.AnalysisSourceProvider;
 import eu.modelwriter.configuration.alloy.reasoning.AlloyNextSolution;
+import eu.modelwriter.configuration.alloy.validation.AlloyValidator;
 import eu.modelwriter.marker.ui.internal.views.visualizationview.Visualization;
 
 public class VizStopNextHandler extends AbstractHandler {
@@ -26,7 +27,7 @@ public Object execute(final ExecutionEvent event) throws ExecutionException {
     final Thread thread = new Thread(new Runnable() {
       @Override
       public void run() {
-        // AlloyValidator.isCanceled = true;
+        AlloyValidator.isCanceled = true;
         AlloyNextSolution.getInstance().finishNext();
         Visualization.showViz();
       }

diff --git a/...arker.ui/src/eu/modelwriter/marker/ui/internal/views/visualizationview/Visualization.java b/...arker.ui/src/eu/modelwriter/marker/ui/internal/views/visualizationview/Visualization.java
@@ -565,11 +565,11 @@ public void actionPerformed(final ActionEvent e) {
     reasonMenuItem.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(final ActionEvent e) {
+        setToolbar("analysis");
+
         final AlloyReasoning alloyReasoning = new AlloyReasoning();
         alloyReasoning.reasoning();
         Visualization.showViz();
-
-        setToolbar("analysis");
       }
     });
 
@@ -593,31 +593,31 @@ public void actionPerformed(final ActionEvent e) {
     discoverMenuItem.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(final ActionEvent e) {
+        setToolbar("analysis");
+
         final AlloyDiscovering alloyDiscovering = new AlloyDiscovering();
         alloyDiscovering.discovering();
         Visualization.showViz();
-
-        setToolbar("analysis");
       }
     });
 
     nextSolution.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(final ActionEvent e) {
+        setToolbar("next");
+
         AlloyNextSolution.getInstance().next();
         Visualization.showViz();
-
-        setToolbar("next");
       }
     });
 
     stopAnalysis.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(final ActionEvent e) {
+        setToolbar("stop");
+
         AlloyNextSolution.getInstance().finishNext();
         Visualization.showViz();
-
-        setToolbar("stop");
       }
     });