From ce9e0434aa50ad343ec2829262fa7a95ff5d39a7 Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Wed, 30 Jul 2014 23:32:13 +0200 Subject: Stupid bug --- .../src/org/uscxml/tests/ioprocessor/console/ConsoleFrame.java | 8 ++++++-- .../src/org/uscxml/tests/ioprocessor/console/ConsoleIOProc.java | 2 +- src/uscxml/Interpreter.cpp | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/embedding/java/src/org/uscxml/tests/ioprocessor/console/ConsoleFrame.java b/embedding/java/src/org/uscxml/tests/ioprocessor/console/ConsoleFrame.java index b44c05e..0e2388f 100644 --- a/embedding/java/src/org/uscxml/tests/ioprocessor/console/ConsoleFrame.java +++ b/embedding/java/src/org/uscxml/tests/ioprocessor/console/ConsoleFrame.java @@ -29,10 +29,13 @@ public class ConsoleFrame extends Frame { + " " + " " + + " " + " " - + " " + + " " + + " " + + " " + " " + " " + " " @@ -40,6 +43,7 @@ public class ConsoleFrame extends Frame { + " " + " " + " " + + " " + ""); diff --git a/embedding/java/src/org/uscxml/tests/ioprocessor/console/ConsoleIOProc.java b/embedding/java/src/org/uscxml/tests/ioprocessor/console/ConsoleIOProc.java index f0ad491..7dca28d 100644 --- a/embedding/java/src/org/uscxml/tests/ioprocessor/console/ConsoleIOProc.java +++ b/embedding/java/src/org/uscxml/tests/ioprocessor/console/ConsoleIOProc.java @@ -17,7 +17,7 @@ public class ConsoleIOProc extends IOProcessor implements KeyListener { public IOProcessor create(Interpreter interpreter) { ConsoleIOProc ioProc = new ConsoleIOProc(); ioProc.swigReleaseOwnership(); - + if (ConsoleFrame.perInterpreter.containsKey(interpreter)) { ConsoleFrame.perInterpreter.get(interpreter).addKeyListener(ioProc); } else { diff --git a/src/uscxml/Interpreter.cpp b/src/uscxml/Interpreter.cpp index 438aec3..5fcc3f7 100644 --- a/src/uscxml/Interpreter.cpp +++ b/src/uscxml/Interpreter.cpp @@ -2500,7 +2500,7 @@ void InterpreterImpl::setupIOProcessors() { std::list::iterator nameIter = names.begin(); while(nameIter != names.end()) { // do not override - if (!boost::equal(*nameIter, ioProcIter->first) && _ioProcessors.find(*nameIter) != _ioProcessors.end()) + if (!boost::equal(*nameIter, ioProcIter->first) && _ioProcessors.find(*nameIter) == _ioProcessors.end()) _ioProcessors[*nameIter] = _ioProcessors[ioProcIter->first]; nameIter++; } -- cgit v0.12