From 7c45bf2aebbd7ced77cc209d69e20336cc619c75 Mon Sep 17 00:00:00 2001 From: Sarah Tattersall Date: Sun, 23 Feb 2014 17:40:27 +0000 Subject: [PATCH] Fixes #25 * Passed null into ExpressionEvaluator, replaced with Petri net * Tested manually, seems to work --- .../main/java/pipe/gui/widgets/TransitionFunctionEditor.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pipe-gui/src/main/java/pipe/gui/widgets/TransitionFunctionEditor.java b/pipe-gui/src/main/java/pipe/gui/widgets/TransitionFunctionEditor.java index df027dba..a91f4eb9 100644 --- a/pipe-gui/src/main/java/pipe/gui/widgets/TransitionFunctionEditor.java +++ b/pipe-gui/src/main/java/pipe/gui/widgets/TransitionFunctionEditor.java @@ -33,7 +33,7 @@ public TransitionFunctionEditor(TransitionEditorPanel transitionEditorPanel, init(petriNet); } - private void init(PetriNet petriNet) { + private void init(final PetriNet petriNet) { final JTextArea function = new JTextArea(); function.setText(transitionController.getRateExpr()); @@ -80,8 +80,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { exit(); return; } - //TODD: DONT PASS NULL - ExprEvaluator parser = new ExprEvaluator(null); + ExprEvaluator parser = new ExprEvaluator(petriNet); if (parser.parseAndEvalExprForTransition(func) != null) { _editor.setRate(func); //transitionController.setRate(func);