deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

no error dialog for mspsim breakpoints

Browse source
This commit is contained in:
fros4943 2010-08-13 09:53:33 +00:00
parent 885fee3561
commit bcc62fbb65
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tools/cooja/java/se/sics/cooja/Simulation.java
View file

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: Simulation.java,v 1.64 2010/03/26 09:26:22 fros4943 Exp $ * $Id: Simulation.java,v 1.65 2010/08/13 09:53:33 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -277,14 +277,19 @@ public class Simulation extends Observable implements Runnable {
} }
} }
} catch (RuntimeException e) { } catch (RuntimeException e) {
logger.fatal("Simulation stopped due to error: " + e.getMessage(), e); if ("MSPSim requested simulation stop".equals(e.getMessage())) {
/* XXX Should be*/
logger.info("Simulation stopped due to MSPSim breakpoint");
} else {
if (!GUI.isVisualized()) { logger.fatal("Simulation stopped due to error: " + e.getMessage(), e);
/* Quit simulator if in test mode */ if (!GUI.isVisualized()) {
System.exit(1); /* Quit simulator if in test mode */
} else { System.exit(1);
GUI.showErrorDialog(GUI.getTopParentContainer(), "Simulation error", e, false); } else {
} GUI.showErrorDialog(GUI.getTopParentContainer(), "Simulation error", e, false);
}
}
} }
isRunning = false; isRunning = false;
simulationThread = null; simulationThread = null;