Issue highsource#11. Unit tests now passing for Lists

laurentschoelens · Dec 1, 2014 · 0c2d698 · 0c2d698
1 parent 14ebccd
commit 0c2d698
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/...va/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ListHashCodeCodeGenerator.java b/...va/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ListHashCodeCodeGenerator.java
@@ -39,6 +39,10 @@ protected void generate(JBlock block, JVar currentHashCode, JType exposedType,
  getCodeModel().ref(Iterator.class).narrow(elementType), value.name() + "Iterator",
  value.invoke("iterator"));
 
+ final JVar listHashCode = block.decl(JMod.NONE,
+ getCodeModel().INT, "listHashCode",
+ JExpr.lit(1));
+
  final JBlock elementBlock = block._while(iterator.invoke("hasNext"))
  .body();
  final JVar elementValue = elementBlock.decl(JMod.FINAL, elementType,
@@ -48,8 +52,10 @@ protected void generate(JBlock block, JVar currentHashCode, JType exposedType,
  final JExpression hasSetValue = isAlwaysSet ? JExpr.TRUE : elementValue
  .ne(JExpr._null());
  getFactory().getCodeGenerator(elementType).generate(elementBlock,
- currentHashCode, elementType, possibleTypes, elementValue,
+ listHashCode, elementType, possibleTypes, elementValue,
  hasSetValue, isAlwaysSet);
-
+ block.assign(currentHashCode,
+ currentHashCode.mul(JExpr.lit(getFactory().getMultiplier()))
+ .plus(listHashCode));
  }
 }
diff --git a/...quals-01/src/test/java/org/jvnet/jaxb2_commons/tests/SimpleHashCode_Gwt_01/Customer2.java b/...quals-01/src/test/java/org/jvnet/jaxb2_commons/tests/SimpleHashCode_Gwt_01/Customer2.java
@@ -2,7 +2,7 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.11.30 at 10:33:12 PM GMT 
+// Generated on: 2014.12.01 at 12:03:43 AM GMT 
 //
 
 
@@ -291,10 +291,12 @@ public int hashCode2() {
  theMiddleInitials = (this.isSetMiddleInitials()?this.getMiddleInitials():null);
  if (this.isSetMiddleInitials()) {
  final Iterator<String> theMiddleInitialsIterator = theMiddleInitials.iterator();
+ int listHashCode = 1;
  while (theMiddleInitialsIterator.hasNext()) {
  final String theMiddleInitialsElement = theMiddleInitialsIterator.next();
- currentHashCode = ((currentHashCode* 31)+((theMiddleInitialsElement!= null)?theMiddleInitialsElement.hashCode(): 0));
+ listHashCode = ((listHashCode* 31)+((theMiddleInitialsElement!= null)?theMiddleInitialsElement.hashCode(): 0));
  }
+ currentHashCode = ((currentHashCode* 31)+ listHashCode);
  } else {
  currentHashCode = (currentHashCode* 31);
  }
@@ -339,7 +341,7 @@ public boolean equals(Object obj) {
  return false;
  if (getClass() != obj.getClass())
  return false;
- Customer other = (Customer) obj;
+ Customer2 other = (Customer2) obj;
  if (address == null) {
  if (other.address != null)
  return false;