From effd467bbfeecb62ca2859048f4cba68107a333f Mon Sep 17 00:00:00 2001 From: senft-lap Date: Tue, 4 Dec 2012 16:49:07 +0100 Subject: [PATCH] spawn() throws no exception... --- ws2012/P2P/uebungen/4/src/Main.java | 9 +++++++ .../P2P/uebungen/4/src/RandomGenerator2.java | 25 ++++++++----------- ws2012/P2P/uebungen/4/src/node/Node.java | 4 +-- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ws2012/P2P/uebungen/4/src/Main.java b/ws2012/P2P/uebungen/4/src/Main.java index fa0fd23f..905d2918 100644 --- a/ws2012/P2P/uebungen/4/src/Main.java +++ b/ws2012/P2P/uebungen/4/src/Main.java @@ -5,6 +5,8 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.LogManager; +import analysis.NetworkDumper; + import node.Node; public class Main { @@ -42,6 +44,13 @@ public class Main { switch (cmd) { case "br": nodes.get(node).gatherInformationOfNetwork(); + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + } + NetworkDumper dumper = new NetworkDumper(nodes.get(node)); + dumper.write(dumper.networkToDot(nodes.get(node) + .getNetwork())); break; case "spawn": if (splitted.length > 2) { diff --git a/ws2012/P2P/uebungen/4/src/RandomGenerator2.java b/ws2012/P2P/uebungen/4/src/RandomGenerator2.java index 45d37a67..43dda700 100644 --- a/ws2012/P2P/uebungen/4/src/RandomGenerator2.java +++ b/ws2012/P2P/uebungen/4/src/RandomGenerator2.java @@ -55,20 +55,17 @@ public class RandomGenerator2 { } private void spawn() { - try { - if (nodes.isEmpty()) { - nodes.add(new Node()); - } else { - Node randomNode = getRandomNode(); - Node newNode = randomNode.spawn(); - nodes.add(newNode); - } - numSpawned++; - if (maxNodes < nodes.size()) { - maxNodes = nodes.size(); - } - } catch (IOException e) { - } + if (nodes.isEmpty()) { + nodes.add(new Node()); + } else { + Node randomNode = getRandomNode(); + Node newNode = randomNode.spawn(); + nodes.add(newNode); + } + numSpawned++; + if (maxNodes < nodes.size()) { + maxNodes = nodes.size(); + } } private void kill() { diff --git a/ws2012/P2P/uebungen/4/src/node/Node.java b/ws2012/P2P/uebungen/4/src/node/Node.java index 4bb626da..0f945850 100644 --- a/ws2012/P2P/uebungen/4/src/node/Node.java +++ b/ws2012/P2P/uebungen/4/src/node/Node.java @@ -66,10 +66,8 @@ public class Node { * Create another peer, mutually link creator and spawn. * * @return the spawned Node - * @throws IOException - * if no connection could be established to the new node */ - public Node spawn() throws IOException { + public Node spawn() { LOGGER.log(Level.FINE, "Name: " + getName() + ", Spawning new node."); Node newNode = new Node(); addNeighbor(newNode.getAddress());