Repository: isis Updated Branches: refs/heads/master 0bca9b01b -> d15cec100
ISIS-947 Todo webapp throws exception when logging in DEBUG mode Conflicting changes to ServiceInstantiator NOT committed, equivalent changes already committed. Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7c766320 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7c766320 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7c766320 Branch: refs/heads/master Commit: 7c766320e35c29dfe8870cac42a39218022cc750 Parents: 0bca9b0 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Nov 12 16:20:41 2014 +0200 Committer: Dan Haywood <[email protected]> Committed: Thu Nov 13 07:26:46 2014 +0000 ---------------------------------------------------------------------- .../core/commons/lang/ObjectExtensions.java | 13 ++++++++---- .../apache/isis/core/commons/util/ToString.java | 22 ++++++++++++-------- 2 files changed, 22 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/7c766320/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ObjectExtensions.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ObjectExtensions.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ObjectExtensions.java index cab2498..ff1d7cc 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ObjectExtensions.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/lang/ObjectExtensions.java @@ -19,6 +19,7 @@ package org.apache.isis.core.commons.lang; +import java.io.IOException; import java.lang.reflect.Method; import java.util.Collection; import java.util.Enumeration; @@ -114,10 +115,14 @@ public final class ObjectExtensions { return name.substring(name.lastIndexOf('.') + 1); } - public static void appendToString(final Object extendee, final StringBuffer buf) { - buf.append(classBaseName(extendee)); - buf.append("@"); - buf.append(Integer.toHexString(extendee.hashCode())); + public static void appendToString(final Object extendee, final Appendable buf) { + try { + buf.append(classBaseName(extendee)); + buf.append('@'); + buf.append(Integer.toHexString(extendee.hashCode())); + } catch (IOException iox) { + throw new RuntimeException("A problem occurred while appending an object to an appendable", iox); + } } } http://git-wip-us.apache.org/repos/asf/isis/blob/7c766320/core/metamodel/src/main/java/org/apache/isis/core/commons/util/ToString.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/util/ToString.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/util/ToString.java index ffac19a..7797ff8 100644 --- a/core/metamodel/src/main/java/org/apache/isis/core/commons/util/ToString.java +++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/util/ToString.java @@ -26,36 +26,35 @@ import org.apache.isis.core.commons.lang.ObjectExtensions; public final class ToString { - public static ToString createAnonymous(final Object object) { final ToString string = new ToString(); string.append(ObjectExtensions.classBaseName(object)); - string.append("["); + string.append('['); return string; } // ////////////////////////////////////// private boolean addComma = false; - private final StringBuffer buf; + private final StringBuilder buf; private boolean useLineBreaks; private ToString() { - buf = new StringBuffer(); + buf = new StringBuilder(); } public ToString(final Object forObject) { - buf = new StringBuffer(); + buf = new StringBuilder(); ObjectExtensions.appendToString(forObject, buf); - buf.append("["); + buf.append('['); } public ToString(final Object forObject, final int id) { - buf = new StringBuffer(); + buf = new StringBuilder(); buf.append(ObjectExtensions.classBaseName(forObject)); - buf.append("#"); + buf.append('#'); buf.append(id); - buf.append("["); + buf.append('['); } public ToString(final Object forObject, final String text) { @@ -66,6 +65,11 @@ public final class ToString { // ////////////////////////////////////// + public ToString append(final char c) { + buf.append(c); + return this; + } + public ToString append(final String text) { buf.append(text); return this;
