Issue highsource#11. Minor fix.

laurentschoelens · Dec 7, 2014 · c70d481 · c70d481
1 parent 3a1de27
commit c70d481
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeArguments.java
@@ -59,6 +59,8 @@ private HashCodeArguments spawn(JVar value, JExpression hasSetValue) {
  public HashCodeArguments property(JBlock block, String propertyName,
  String propertyMethod, JType declarablePropertyType,
  JType propertyType, Collection<JType> possiblePropertyTypes) {
+ block.assign(currentHashCode(),
+ currentHashCode().mul(JExpr.lit(multiplier()))); 
  final JVar propertyValue = block.decl(JMod.FINAL,
  declarablePropertyType, value().name() + propertyName, value()
  .invoke(propertyMethod));

diff --git a/...java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java b/...java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerationImplementor.java
@@ -15,16 +15,9 @@
 public class HashCodeCodeGenerationImplementor extends
  AbstractCodeGenerationImplementor<HashCodeArguments> {
 
- private int multiplier;
 
- public HashCodeCodeGenerationImplementor(JCodeModel codeModel,
- int multiplier) {
+ public HashCodeCodeGenerationImplementor(JCodeModel codeModel) {
  super(codeModel);
- this.multiplier = multiplier;
- }
-
- public int getMultiplier() {
- return multiplier;
  }
 
  private void ifHasSetValueAssignPlusValueHashCode(

diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/HashCodeCodeGenerator.java
@@ -8,10 +8,10 @@
 public class HashCodeCodeGenerator extends
  CodeGenerationAbstraction<HashCodeArguments> {
 
- public HashCodeCodeGenerator(JCodeModel codeModel, int multiplier) {
+ public HashCodeCodeGenerator(JCodeModel codeModel) {
  super(
  new HashCodeCodeGenerationImplementor(
- Validate.notNull(codeModel), multiplier));
+ Validate.notNull(codeModel)));
  }
 
 }
diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/SimpleHashCodePlugin.java
@@ -52,7 +52,7 @@ private int getMultiplier() {
  @Override
  protected CodeGenerator<HashCodeArguments> createCodeGenerator(
  JCodeModel codeModel) {
- return new HashCodeCodeGenerator(codeModel, getMultiplier());
+ return new HashCodeCodeGenerator(codeModel);
  }
 
  @Override