Return-Path: Delivered-To: apmail-incubator-isis-commits-archive@minotaur.apache.org Received: (qmail 87057 invoked from network); 9 Mar 2011 15:09:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Mar 2011 15:09:52 -0000 Received: (qmail 27614 invoked by uid 500); 9 Mar 2011 15:09:52 -0000 Delivered-To: apmail-incubator-isis-commits-archive@incubator.apache.org Received: (qmail 27598 invoked by uid 500); 9 Mar 2011 15:09:52 -0000 Mailing-List: contact isis-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: isis-dev@incubator.apache.org Delivered-To: mailing list isis-commits@incubator.apache.org Received: (qmail 27591 invoked by uid 99); 9 Mar 2011 15:09:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2011 15:09:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Mar 2011 15:09:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CEE6C23888CD; Wed, 9 Mar 2011 15:09:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1079825 - in /incubator/isis/trunk: core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/ core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/ runtimes/dflt/runtime/src/main/java... Date: Wed, 09 Mar 2011 15:09:31 -0000 To: isis-commits@incubator.apache.org From: rmatthews@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110309150931.CEE6C23888CD@eris.apache.org> Author: rmatthews Date: Wed Mar 9 15:09:31 2011 New Revision: 1079825 URL: http://svn.apache.org/viewvc?rev=1079825&view=rev Log: Made failures in title methods more visible (rather then than being hidden) Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetViaMethodTest.java incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java?rev=1079825&r1=1079824&r2=1079825&view=diff ============================================================================== --- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java (original) +++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java Wed Mar 9 15:09:31 2011 @@ -30,10 +30,12 @@ import org.apache.isis.core.metamodel.ad import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facets.ImperativeFacet; import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract; +import org.apache.log4j.Logger; public class TitleFacetViaTitleMethod extends TitleFacetAbstract implements ImperativeFacet { + private static final Logger LOG = Logger.getLogger(TitleFacetViaTitleMethod.class); private final Method method; public TitleFacetViaTitleMethod( @@ -62,7 +64,8 @@ public class TitleFacetViaTitleMethod ex try { return (String) AdapterInvokeUtils.invoke(method, owningAdapter); } catch (RuntimeException ex) { - return null; + LOG.warn("title failure", ex); + return "Failed Title"; } } Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetViaMethodTest.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetViaMethodTest.java?rev=1079825&r1=1079824&r2=1079825&view=diff ============================================================================== --- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetViaMethodTest.java (original) +++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/object/ident/title/TitleFacetViaMethodTest.java Wed Mar 9 15:09:31 2011 @@ -80,7 +80,7 @@ public class TitleFacetViaMethodTest { @Test public void testTitleThrowsException() { String title = facet.title(mockOwningAdapter, null); - assertThat(title, is(nullValue())); + assertThat(title, is("Failed Title")); } } Modified: incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java URL: http://svn.apache.org/viewvc/incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java?rev=1079825&r1=1079824&r2=1079825&view=diff ============================================================================== --- incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java (original) +++ incubator/isis/trunk/runtimes/dflt/runtime/src/main/java/org/apache/isis/runtimes/dflt/runtime/persistence/adapterfactory/pojo/PojoAdapter.java Wed Mar 9 15:09:31 2011 @@ -282,6 +282,9 @@ public class PojoAdapter extends Instanc if (resolveState.isNew()) { return ""; } else { + if (getObject() instanceof String) { + return (String) getObject(); + } final ObjectSpecification specification = getSpecification(); Localization localization = IsisContext.getUserProfile().getLocalization(); String title = specification.getTitle(this, localization);