Issue highsource#11. Building the bridge.

laurentschoelens · Dec 5, 2014 · 6438f4b · 6438f4b
1 parent b8eb9f7
commit 6438f4b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
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
@@ -183,8 +183,8 @@ protected void processClassOutline(ClassOutline classOutline) {
  currentHashCode,
  currentHashCode
  .mul(JExpr.lit(getCodeGeneratorFactory().getMultiplier())));
- codeGenerator.append(block, currentHashCode, exposedType,
- possibleTypes, value, hasSetValue, isAlwaysSet);
+ codeGenerator.append(block, exposedType, possibleTypes,
+ isAlwaysSet, currentHashCode, value, hasSetValue);
  }
  }
  body._return(currentHashCode);

diff --git a/...a/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/BlockHashCodeCodeGenerator.java b/...a/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/BlockHashCodeCodeGenerator.java
@@ -18,9 +18,9 @@ public BlockHashCodeCodeGenerator(
  }
 
  @Override
- public void append(JBlock block, JVar currentHashCode, JType type,
- Collection<JType> possibleTypes, JVar value,
- JExpression hasSetValue, boolean isAlwaysSet) {
+ public void append(JBlock block, JType type, Collection<JType> possibleTypes,
+ boolean isAlwaysSet, JVar currentHashCode,
+ JVar value, JExpression hasSetValue) {
  final JBlock subBlock;
  if (isAlwaysSet) {
  subBlock = block;

diff --git a/...n/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/HashCodeCodeGenerator.java b/...n/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/HashCodeCodeGenerator.java
@@ -11,7 +11,7 @@
 
 public interface HashCodeCodeGenerator extends CodeGenerator {
 
- public void append(JBlock block, JVar currentHashCode, JType type,
- Collection<JType> possibleTypes, JVar value,
- JExpression hasSetValue, boolean isAlwaysSet);
+ public void append(JBlock block, JType type, Collection<JType> possibleTypes,
+ boolean isAlwaysSet, JVar currentHashCode,
+ JVar value, JExpression hasSetValue);
 }
diff --git a/...jvnet/jaxb2_commons/plugin/simplehashcode/generator/JAXBElementHashCodeCodeGenerator.java b/...jvnet/jaxb2_commons/plugin/simplehashcode/generator/JAXBElementHashCodeCodeGenerator.java
@@ -140,7 +140,7 @@ private void append(JBlock block, JVar currentHashCode, JVar value,
  .ne(JExpr._null());
  block.assign(currentHashCode, currentHashCode.mul(JExpr
  .lit(getCodeGeneratorFactory().getMultiplier())));
- codeGenerator.append(block, currentHashCode, valueType,
- possibleValueTypes, subValue, hasSetValue, isAlwaysSet);
+ codeGenerator.append(block, valueType, possibleValueTypes,
+ isAlwaysSet, currentHashCode, subValue, hasSetValue);
  }
 }
diff --git a/...va/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ListHashCodeCodeGenerator.java b/...va/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ListHashCodeCodeGenerator.java
@@ -76,8 +76,8 @@ private void appendElement(final JBlock subBlock, JVar currentHashCode,
  final JExpression hasSetValue = isAlwaysSet ? JExpr.TRUE : value
  .ne(JExpr._null());
  getCodeGeneratorFactory().getCodeGenerator(type).append(subBlock,
- currentHashCode, type, possibleTypes, value, hasSetValue,
- isAlwaysSet);
+ type, possibleTypes, isAlwaysSet, currentHashCode, value,
+ hasSetValue);
  }
 
  private JClass getElementType(final JClass _class) {

diff --git a/.../org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ObjectHashCodeCodeGenerator.java b/.../org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ObjectHashCodeCodeGenerator.java
@@ -75,9 +75,9 @@ protected void append(JBlock block, JVar currentHashCode,
  JExpr.cast(jaxbElement, value));
  valueJAXBElement.annotate(SuppressWarnings.class).param(
  "value", "unchecked");
- codeGenerator.append(subBlock, currentHashCode, jaxbElement,
- new HashSet<JType>(jaxbElements), valueJAXBElement,
- JExpr.TRUE, true);
+ codeGenerator.append(subBlock, jaxbElement, new HashSet<JType>(jaxbElements),
+ true, currentHashCode,
+ valueJAXBElement, JExpr.TRUE);
  }
 
  if (!arrays.isEmpty()) {
@@ -106,9 +106,9 @@ private void appendArray(final JBlock block, JVar currentHashCode,
  // "unchecked");
  final HashCodeCodeGenerator codeGenerator = getCodeGeneratorFactory()
  .getCodeGenerator(type);
- codeGenerator.append(block, currentHashCode, type,
- Collections.singleton(type), valueArray,
- JExpr.TRUE, true);
+ codeGenerator.append(block, type, Collections.singleton(type),
+ true, currentHashCode,
+ valueArray, JExpr.TRUE);
  }
 
  private JType getValueType(final Set<JType> valueTypes) {

diff --git a/...t/jaxb2_commons/plugin/simplehashcode/generator/ValueBasedBlockHashCodeCodeGenerator.java b/...t/jaxb2_commons/plugin/simplehashcode/generator/ValueBasedBlockHashCodeCodeGenerator.java
@@ -19,9 +19,9 @@ public ValueBasedBlockHashCodeCodeGenerator(
  }
 
  @Override
- public void append(JBlock block, JVar currentHashCode, JType exposedType,
- Collection<JType> possibleTypes, JVar value,
- JExpression hasSetValue, boolean isAlwaysSet) {
+ public void append(JBlock block, JType exposedType, Collection<JType> possibleTypes,
+ boolean isAlwaysSet, JVar currentHashCode,
+ JVar value, JExpression hasSetValue) {
 
  final JExpression valueHashCode = generateHashCode(block, exposedType,
  value);