From 684c91d0fd9655b15da2b3be67415b5ca698158f Mon Sep 17 00:00:00 2001 From: nifi Date: Wed, 13 Jan 2010 15:04:47 +0000 Subject: [PATCH] Changed separator for concatenated mote id and log message for filtering to a space character. --- tools/cooja/config/quickhelp.txt | 2 +- tools/cooja/java/se/sics/cooja/plugins/LogListener.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/cooja/config/quickhelp.txt b/tools/cooja/config/quickhelp.txt index 23970a2f0..7c50b6a98 100644 --- a/tools/cooja/config/quickhelp.txt +++ b/tools/cooja/config/quickhelp.txt @@ -27,7 +27,7 @@ Filtering is performed on both the Mote and the Data columns.\

^[CR]
logs starting either a C or an R\

Hello$
logs ending with 'Hello'\

^ID:[2-5]$
logs from motes 2 to 5\ -

^ID:[2-5]§Contiki
logs from motes 2 to 5 starting with 'Contiki' +

^ID:[2-5] Contiki
logs from motes 2 to 5 starting with 'Contiki' se.sics.cooja.plugins.TimeLine = \ Timeline\ diff --git a/tools/cooja/java/se/sics/cooja/plugins/LogListener.java b/tools/cooja/java/se/sics/cooja/plugins/LogListener.java index 43b2280a4..868927d68 100644 --- a/tools/cooja/java/se/sics/cooja/plugins/LogListener.java +++ b/tools/cooja/java/se/sics/cooja/plugins/LogListener.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: LogListener.java,v 1.22 2010/01/12 15:42:08 nifi Exp $ + * $Id: LogListener.java,v 1.23 2010/01/13 15:04:47 nifi Exp $ */ package se.sics.cooja.plugins; @@ -146,7 +146,7 @@ public class LogListener extends VisPlugin { } else if (col == COLUMN_DATA) { return log.ev.getMessage(); } else if (col == COLUMN_CONCAT) { - return log.strID + '§' + log.ev.getMessage(); + return log.strID + ' ' + log.ev.getMessage(); } return null; }