author comparator implemented

model/src/main/java/lcsb/mapviewer/model/map/model/AuthorComparator.java

+package lcsb.mapviewer.model.map.model;
+
+import org.apache.log4j.Logger;
+
+import lcsb.mapviewer.common.Comparator;
+import lcsb.mapviewer.common.comparator.StringComparator;
+
+/**
+ * This class implements comparator interface for {@link Author}.
+ * 
+ * @author Piotr Gawron
+ * 
+ */
+public class AuthorComparator extends Comparator<Author> {
+
+  /**
+   * Default class logger.
+   */
+  private static Logger logger = Logger.getLogger(AuthorComparator.class);
+
+  /**
+   * Default constructor.
+   */
+  public AuthorComparator() {
+    super(Author.class);
+  }
+
+  @Override
+  protected int internalCompare(Author arg0, Author arg1) {
+    StringComparator stringComparator = new StringComparator();
+    int status = stringComparator.compare(arg0.getEmail(), arg1.getEmail());
+    if (status != 0) {
+      logger.debug("email different: " + arg0.getEmail() + ", " + arg1.getEmail());
+      return status;
+    }
+    status = stringComparator.compare(arg0.getFirstName(), arg1.getFirstName());
+    if (status != 0) {
+      logger.debug("first name different: " + arg0.getFirstName() + ", " + arg1.getFirstName());
+      return status;
+    }
+    status = stringComparator.compare(arg0.getLastName(), arg1.getLastName());
+    if (status != 0) {
+      logger.debug("last name different: " + arg0.getLastName() + ", " + arg1.getLastName());
+      return status;
+    }
+    status = stringComparator.compare(arg0.getOrganisation(), arg1.getOrganisation());
+    if (status != 0) {
+      logger.debug("organisation different: " + arg0.getOrganisation() + ", " + arg1.getOrganisation());
+      return status;
+    }
+    return 0;
+  }
+
+}

model/src/main/java/lcsb/mapviewer/model/map/model/ModelComparator.java

@@ -161,6 +161,14 @@ public class ModelComparator extends Comparator<Model> {
       return status;
     }
 
+    SetComparator<Author> authorSetComparator = new SetComparator<>(new AuthorComparator());
+
+    status = authorSetComparator.compare(arg0.getAuthors(), arg1.getAuthors());
+    if (status != 0) {
+      logger.debug("authors different");
+      return status;
+    }
+
     return 0;
   }
 

model/src/test/java/lcsb/mapviewer/model/map/model/ModelComparatorTest.java

@@ -432,4 +432,21 @@ public class ModelComparatorTest {
     }
   }
 
+  @Test
+  public void testCompareAuthors() throws Exception {
+    try {
+      Model model1 = getModel();
+      Model model2 = getModel();
+      model1.addAuthor(new Author("x", "y"));
+      assertTrue("Models have different authors", comparator.compare(model1, model2) != 0);
+      assertTrue(comparator.compare(model2, model1) != 0);
+      model2.addAuthor(new Author(model1.getAuthors().iterator().next()));
+      assertEquals(0, comparator.compare(model1, model2));
+      assertEquals(0, comparator.compare(model2, model1));
+    } catch (Exception e) {
+      e.printStackTrace();
+      throw e;
+    }
+  }
+
 }