From 6438f4bcf1d59a90b0495787b626fae051e46f09 Mon Sep 17 00:00:00 2001 From: highsource Date: Fri, 5 Dec 2014 08:51:07 +0100 Subject: [PATCH] Issue #11. Building the bridge. --- .../plugin/simplehashcode/SimpleHashCodePlugin.java | 4 ++-- .../generator/BlockHashCodeCodeGenerator.java | 6 +++--- .../generator/HashCodeCodeGenerator.java | 6 +++--- .../generator/JAXBElementHashCodeCodeGenerator.java | 4 ++-- .../generator/ListHashCodeCodeGenerator.java | 4 ++-- .../generator/ObjectHashCodeCodeGenerator.java | 12 ++++++------ .../ValueBasedBlockHashCodeCodeGenerator.java | 6 +++--- 7 files changed, 21 insertions(+), 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 index 21ae6ad40..6ea5e0893 100644 --- 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/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/BlockHashCodeCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/BlockHashCodeCodeGenerator.java index aad85c73e..0a754b29b 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/BlockHashCodeCodeGenerator.java +++ b/basic/src/main/java/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 possibleTypes, JVar value, - JExpression hasSetValue, boolean isAlwaysSet) { + public void append(JBlock block, JType type, Collection possibleTypes, + boolean isAlwaysSet, JVar currentHashCode, + JVar value, JExpression hasSetValue) { final JBlock subBlock; if (isAlwaysSet) { subBlock = block; diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/HashCodeCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/HashCodeCodeGenerator.java index 9677933b4..a9c7f1763 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/HashCodeCodeGenerator.java +++ b/basic/src/main/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 possibleTypes, JVar value, - JExpression hasSetValue, boolean isAlwaysSet); + public void append(JBlock block, JType type, Collection possibleTypes, + boolean isAlwaysSet, JVar currentHashCode, + JVar value, JExpression hasSetValue); } diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/JAXBElementHashCodeCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/JAXBElementHashCodeCodeGenerator.java index dd29798a2..cd06c8bc7 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/JAXBElementHashCodeCodeGenerator.java +++ b/basic/src/main/java/org/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/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ListHashCodeCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ListHashCodeCodeGenerator.java index f7b52ebe0..69e4b0a00 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ListHashCodeCodeGenerator.java +++ b/basic/src/main/java/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/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ObjectHashCodeCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ObjectHashCodeCodeGenerator.java index 04a992fab..1d1bfac00 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ObjectHashCodeCodeGenerator.java +++ b/basic/src/main/java/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(jaxbElements), valueJAXBElement, - JExpr.TRUE, true); + codeGenerator.append(subBlock, jaxbElement, new HashSet(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 valueTypes) { diff --git a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ValueBasedBlockHashCodeCodeGenerator.java b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ValueBasedBlockHashCodeCodeGenerator.java index ca78d1623..362d5e24c 100644 --- a/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ValueBasedBlockHashCodeCodeGenerator.java +++ b/basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simplehashcode/generator/ValueBasedBlockHashCodeCodeGenerator.java @@ -19,9 +19,9 @@ public ValueBasedBlockHashCodeCodeGenerator( } @Override - public void append(JBlock block, JVar currentHashCode, JType exposedType, - Collection possibleTypes, JVar value, - JExpression hasSetValue, boolean isAlwaysSet) { + public void append(JBlock block, JType exposedType, Collection possibleTypes, + boolean isAlwaysSet, JVar currentHashCode, + JVar value, JExpression hasSetValue) { final JExpression valueHashCode = generateHashCode(block, exposedType, value);