Re-assembled the topology subsystem.

@@ -36,6 +36,7 @@ public class SimpleHostStore {
 
 
     // hosts sorted based on their location
     // hosts sorted based on their location
     private final Multimap<ConnectPoint, Host> locations = HashMultimap.create();
     private final Multimap<ConnectPoint, Host> locations = HashMultimap.create();
+
     /**
     /**
      * Creates a new host or updates the existing one based on the specified
      * Creates a new host or updates the existing one based on the specified
      * description.
      * description.
@@ -62,7 +63,7 @@ public class SimpleHostStore {
                                               descr.vlan(),
                                               descr.vlan(),
                                               descr.location(),
                                               descr.location(),
                                               descr.ipAddresses());
                                               descr.ipAddresses());
-        synchronized(this) {
+        synchronized (this) {
             hosts.put(hostId, newhost);
             hosts.put(hostId, newhost);
             locations.put(descr.location(), newhost);
             locations.put(descr.location(), newhost);
         }
         }
@@ -104,7 +105,7 @@ public class SimpleHostStore {
      * @return remove even or null if host was not found
      * @return remove even or null if host was not found
      */
      */
     HostEvent removeHost(HostId hostId) {
     HostEvent removeHost(HostId hostId) {
-        synchronized(this) {
+        synchronized (this) {
             Host host = hosts.remove(hostId);
             Host host = hosts.remove(hostId);
             if (host != null) {
             if (host != null) {
                 locations.remove((host.location()), host);
                 locations.remove((host.location()), host);