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.
@@ -56,13 +57,13 @@ public class SimpleHostStore {
 
 
     // creates a new host and sends HOST_ADDED
     // creates a new host and sends HOST_ADDED
     private HostEvent createHost(ProviderId providerId, HostId hostId,
     private HostEvent createHost(ProviderId providerId, HostId hostId,
-            HostDescription descr) {
+                                 HostDescription descr) {
         DefaultHost newhost = new DefaultHost(providerId, hostId,
         DefaultHost newhost = new DefaultHost(providerId, hostId,
-                descr.hwAddress(),
-                descr.vlan(),
-                descr.location(),
-                descr.ipAddresses());
-        synchronized(this) {
+                                              descr.hwAddress(),
+                                              descr.vlan(),
+                                              descr.location(),
+                                              descr.ipAddresses());
+        synchronized (this) {
             hosts.put(hostId, newhost);
             hosts.put(hostId, newhost);
             locations.put(descr.location(), newhost);
             locations.put(descr.location(), newhost);
         }
         }
@@ -71,22 +72,22 @@ public class SimpleHostStore {
 
 
     // checks for type of update to host, sends appropriate event
     // checks for type of update to host, sends appropriate event
     private HostEvent updateHost(ProviderId providerId, Host host,
     private HostEvent updateHost(ProviderId providerId, Host host,
-            HostDescription descr) {
+                                 HostDescription descr) {
         DefaultHost updated;
         DefaultHost updated;
         HostEvent event;
         HostEvent event;
         if (host.location().equals(descr.location())) {
         if (host.location().equals(descr.location())) {
             updated = new DefaultHost(providerId, host.id(),
             updated = new DefaultHost(providerId, host.id(),
-                    host.mac(),
-                    host.vlan(),
-                    host.location(),
-                    descr.ipAddresses());
+                                      host.mac(),
+                                      host.vlan(),
+                                      host.location(),
+                                      descr.ipAddresses());
             event = new HostEvent(HOST_UPDATED, updated);
             event = new HostEvent(HOST_UPDATED, updated);
         } else {
         } else {
             updated = new DefaultHost(providerId, host.id(),
             updated = new DefaultHost(providerId, host.id(),
-                    host.mac(),
-                    host.vlan(),
-                    descr.location(),
-                    host.ipAddresses());
+                                      host.mac(),
+                                      host.vlan(),
+                                      descr.location(),
+                                      host.ipAddresses());
             event = new HostEvent(HOST_MOVED, updated);
             event = new HostEvent(HOST_MOVED, updated);
         }
         }
         synchronized (this) {
         synchronized (this) {
@@ -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);
@@ -216,4 +217,4 @@ public class SimpleHostStore {
         return hostset;
         return hostset;
     }
     }
 
 
-}
\ No newline at end of file
+}