From fad55ce5384e931f47a61605b5d8fcb04256515b Mon Sep 17 00:00:00 2001 From: Adam Megacz Date: Sat, 29 Aug 2009 17:10:26 -0700 Subject: [PATCH] Log.java: use Packet.toString() --- src/edu/berkeley/fleet/interpreter/Log.java | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/edu/berkeley/fleet/interpreter/Log.java b/src/edu/berkeley/fleet/interpreter/Log.java index 914e524..e9237a2 100644 --- a/src/edu/berkeley/fleet/interpreter/Log.java +++ b/src/edu/berkeley/fleet/interpreter/Log.java @@ -24,25 +24,7 @@ public class Log { } public static void packet(Packet p) { - BitVector data = p.getValue(); - Dock source = p.getSource(); - Destination dest = p.getDestination(); - if (dest.getDock().getInstructionDestination()==dest) { - if (p.isToken()) { - println(ANSI.yellow(ANSI.bold(" torpedo: ")) + (source + " -> " + ANSI.yellow(ANSI.bold(dest+"")))); - } else { - Instruction d = source.getShip().getFleet().decodeInstruction(data, source); - println(ANSI.red("dispatch: " + indent(d+"", " "))); - } - } else { - if (p.isToken()) { - println(ANSI.blue(ANSI.bold(" token: ")) + (source + " -> " + ANSI.blue(ANSI.bold(dest+"")))); - } else { - println(indent(ANSI.cyan(" data: "+data) + - (source==null ? "" : - (" : " + source))+(" -> "+ANSI.cyan(""+dest)), " ")); - } - } + println(p.toString()); } public static void error(Object o) { println(ANSI.red(o)); } -- 1.7.10.4