From fd85a1636337c6489011051dd7613ff929e27c64 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Mon, 21 Nov 2011 10:15:19 +0000 Subject: [PATCH] Move GUI warning counter reset so it catches model build warnings too. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4185 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/userinterface/properties/GUIMultiProperties.java | 4 ++++ .../properties/computation/ModelCheckThread.java | 1 - .../properties/computation/SimulateModelCheckThread.java | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/prism/src/userinterface/properties/GUIMultiProperties.java b/prism/src/userinterface/properties/GUIMultiProperties.java index 601766d7..44aaaf95 100644 --- a/prism/src/userinterface/properties/GUIMultiProperties.java +++ b/prism/src/userinterface/properties/GUIMultiProperties.java @@ -792,6 +792,8 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List error("None of the selected properties are suitable for simulation"); return; } + // Reset warnings counter + getPrism().getMainLog().resetNumberOfWarnings(); // Request a parse simulateAfterReceiveParseNotification = true; notifyEventListeners(new GUIPropertiesEvent(GUIPropertiesEvent.REQUEST_MODEL_PARSE)); @@ -822,6 +824,8 @@ public class GUIMultiProperties extends GUIPlugin implements MouseListener, List error("None of the selected properties are suitable for verification. The model was not built"); return; } + // Reset warnings counter + getPrism().getMainLog().resetNumberOfWarnings(); // Request a parse verifyAfterReceiveParseNotification = true; notifyEventListeners(new GUIPropertiesEvent(GUIPropertiesEvent.REQUEST_MODEL_PARSE)); diff --git a/prism/src/userinterface/properties/computation/ModelCheckThread.java b/prism/src/userinterface/properties/computation/ModelCheckThread.java index eb3abb8a..5ee102a0 100644 --- a/prism/src/userinterface/properties/computation/ModelCheckThread.java +++ b/prism/src/userinterface/properties/computation/ModelCheckThread.java @@ -188,7 +188,6 @@ public class ModelCheckThread extends GUIComputationThread gp.setMethodString("Verification"); gp.setConstants(definedMFConstants, definedPFConstants); gp.setNumberOfWarnings(prism.getMainLog().getNumberOfWarnings()); - prism.getMainLog().resetNumberOfWarnings(); parent.repaintList(); } diff --git a/prism/src/userinterface/properties/computation/SimulateModelCheckThread.java b/prism/src/userinterface/properties/computation/SimulateModelCheckThread.java index 2a746966..5e2948c3 100644 --- a/prism/src/userinterface/properties/computation/SimulateModelCheckThread.java +++ b/prism/src/userinterface/properties/computation/SimulateModelCheckThread.java @@ -165,7 +165,6 @@ public class SimulateModelCheckThread extends GUIComputationThread gp.setMethodString("Simulation"); gp.setConstants(definedMFConstants, definedPFConstants); gp.setNumberOfWarnings(prism.getMainLog().getNumberOfWarnings()); - prism.getMainLog().resetNumberOfWarnings(); } } // do each property individually