Added some todos.

@@ -41,7 +41,7 @@ public final class HostToHostIntent extends ConnectivityIntent {
     }
     }
 
 
     private static HostId max(HostId one, HostId two) {
     private static HostId max(HostId one, HostId two) {
-        return one.hashCode() > two.hashCode() ? one : two;
+        return one.hashCode() >= two.hashCode() ? one : two;
     }
     }
 
 
     /**
     /**

@@ -37,8 +37,8 @@ public abstract class Intent implements BatchOperationTarget {
      */
      */
     protected Intent(IntentId id, ApplicationId appId,
     protected Intent(IntentId id, ApplicationId appId,
                      Collection<NetworkResource> resources) {
                      Collection<NetworkResource> resources) {
+        this.id = checkNotNull(id, "Intent ID cannot be null");
         this.appId = checkNotNull(appId, "Application ID cannot be null");
         this.appId = checkNotNull(appId, "Application ID cannot be null");
-        this.id = checkNotNull(id, "Fingerprint cannot be null");
         this.resources = resources;
         this.resources = resources;
     }
     }
 
 
@@ -77,6 +77,7 @@ public abstract class Intent implements BatchOperationTarget {
      * @return intent identifier
      * @return intent identifier
      */
      */
     protected static IntentId id(Object... fields) {
     protected static IntentId id(Object... fields) {
+        // FIXME: spread the bits across the full long spectrum
         return IntentId.valueOf(Objects.hash(fields));
         return IntentId.valueOf(Objects.hash(fields));
     }
     }
 
 
@@ -90,12 +91,12 @@ public abstract class Intent implements BatchOperationTarget {
     }
     }
 
 
     @Override
     @Override
-    public int hashCode() {
+    public final int hashCode() {
         return Objects.hash(id);
         return Objects.hash(id);
     }
     }
 
 
     @Override
     @Override
-    public boolean equals(Object obj) {
+    public final boolean equals(Object obj) {
         if (this == obj) {
         if (this == obj) {
             return true;
             return true;
         }
         }