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

Merge pull request #469 from eberlin/cooja-tab-char

Browse source 
Fix: preserving blank characters (tabulator and space) in Cooja serial output
This commit is contained in:
Fredrik Österlind 2013-11-27 00:45:39 -08:00
parent 0d04db2b03 a415c2bb1b
commit c99a76747c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/cooja/java/org/contikios/cooja/dialogs/SerialUI.java
View file

@ -102,7 +102,7 @@ public abstract class SerialUI extends Log implements SerialPort {
if (data == '\n') { if (data == '\n') {
/* Notify observers of new log */ /* Notify observers of new log */
lastLogMessage = newMessage.toString(); lastLogMessage = newMessage.toString();
lastLogMessage = lastLogMessage.replaceAll("[^\\p{Print}]", ""); lastLogMessage = lastLogMessage.replaceAll("[^\\p{Print}\\p{Blank}]", "");
newMessage.setLength(0); newMessage.setLength(0);
this.setChanged(); this.setChanged();
this.notifyObservers(getMote()); this.notifyObservers(getMote());
@ -111,7 +111,7 @@ public abstract class SerialUI extends Log implements SerialPort {
if (newMessage.length() > MAX_LENGTH) { if (newMessage.length() > MAX_LENGTH) {
/*logger.warn("Dropping too large log message (>" + MAX_LENGTH + " bytes).");*/ /*logger.warn("Dropping too large log message (>" + MAX_LENGTH + " bytes).");*/
lastLogMessage = "# [1024 bytes, no line ending]: " + newMessage.substring(0, 20) + "..."; lastLogMessage = "# [1024 bytes, no line ending]: " + newMessage.substring(0, 20) + "...";
lastLogMessage = lastLogMessage.replaceAll("[^\\p{Print}]", ""); lastLogMessage = lastLogMessage.replaceAll("[^\\p{Print}\\p{Blank}]", "");
newMessage.setLength(0); newMessage.setLength(0);
this.setChanged(); this.setChanged();
this.notifyObservers(getMote()); this.notifyObservers(getMote());