diff options
Diffstat (limited to 'sca-java-2.x/trunk/modules/assembly/src/main')
2 files changed, 16 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java index f0f46dd41e..7af12bb7d0 100644 --- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java +++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java @@ -216,6 +216,7 @@ public class InterfaceContractMapperImpl implements InterfaceContractMapper { source.getName() + " target = " + target.getName()); + audit.appendSeperator(); } return false; } @@ -226,6 +227,7 @@ public class InterfaceContractMapperImpl implements InterfaceContractMapper { source.getName() + " target = " + target.getName()); + audit.appendSeperator(); } return false; } @@ -236,6 +238,7 @@ public class InterfaceContractMapperImpl implements InterfaceContractMapper { source.isNonBlocking() + " target = " + target.isNonBlocking()); + audit.appendSeperator(); } return false; } @@ -276,6 +279,7 @@ public class InterfaceContractMapperImpl implements InterfaceContractMapper { if (!isCompatible(targetOutputType, sourceOutputType, passByValue, audit)) { if (audit != null){ audit.append(" output types"); + audit.appendSeperator(); } return false; } @@ -283,6 +287,7 @@ public class InterfaceContractMapperImpl implements InterfaceContractMapper { if (sourceInputType.size() != targetInputType.size()) { if (audit != null){ audit.append("different number of input types"); + audit.appendSeperator(); } return false; } @@ -292,6 +297,7 @@ public class InterfaceContractMapperImpl implements InterfaceContractMapper { if (!isCompatible(sourceInputType.get(i), targetInputType.get(i), passByValue, audit)) { if (audit != null){ audit.append(" input types"); + audit.appendSeperator(); } return false; } @@ -313,6 +319,7 @@ public class InterfaceContractMapperImpl implements InterfaceContractMapper { if (!found) { if (audit != null){ audit.append("Fault types incompatible"); + audit.appendSeperator(); } return false; } @@ -377,8 +384,10 @@ public class InterfaceContractMapperImpl implements InterfaceContractMapper { .isRemotable()) { if (!silent) { audit.append("Remotable settings do not match: "+ source + "," + target); // TODO see if serialization is sufficient + audit.appendSeperator(); throw new IncompatibleInterfaceContractException( "Remotable settings do not match", source, target); + } else { return false; } diff --git a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/Audit.java b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/Audit.java index 0830860409..343d369fdb 100644 --- a/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/Audit.java +++ b/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/Audit.java @@ -25,13 +25,19 @@ package org.apache.tuscany.sca.interfacedef.util; * */ public class Audit { + + public static final String seperator = "|||"; private StringBuffer buf; public Audit() { this.buf = new StringBuffer(); } public void append(String str) { - buf.append("||| " + str); + buf.append(str); + } + + public void appendSeperator() { + buf.append(seperator); } public String toString() { return buf.toString(); |