Return-Path: Delivered-To: apmail-labs-commits-archive@minotaur.apache.org Received: (qmail 19618 invoked from network); 24 Feb 2009 17:00:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Feb 2009 17:00:52 -0000 Received: (qmail 74938 invoked by uid 500); 24 Feb 2009 17:00:52 -0000 Delivered-To: apmail-labs-commits-archive@labs.apache.org Received: (qmail 74808 invoked by uid 500); 24 Feb 2009 17:00:52 -0000 Mailing-List: contact commits-help@labs.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: labs@labs.apache.org Delivered-To: mailing list commits@labs.apache.org Received: (qmail 74799 invoked by uid 99); 24 Feb 2009 17:00:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2009 09:00:52 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 24 Feb 2009 17:00:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 365F32388A3D; Tue, 24 Feb 2009 17:00:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r747430 - in /labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview: BeanFormProducer.java ShowList.java SmartListProducer.java Date: Tue, 24 Feb 2009 17:00:30 -0000 To: commits@labs.apache.org From: simoneg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090224170031.365F32388A3D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: simoneg Date: Tue Feb 24 17:00:28 2009 New Revision: 747430 URL: http://svn.apache.org/viewvc?rev=747430&view=rev Log: LABS-303 : small fixes to generated XHTML Modified: labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartListProducer.java Modified: labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java?rev=747430&r1=747429&r2=747430&view=diff ============================================================================== --- labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java (original) +++ labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/BeanFormProducer.java Tue Feb 24 17:00:28 2009 @@ -67,7 +67,7 @@ @Override public void produce(Writer out) throws IOException { try { - out.write("
"); + out.write("
"); out.write(""); out.flush(); super.produce(out); @@ -116,12 +116,15 @@ out.append("*"); } if (errs.size() > 0) { - createErrorsOutput(node, out, errs); + createInlineErrorsOutput(node, out, errs); } out.append(""); + if (errs.size() > 0) { + createBlockErrorsOutput(node, out, errs); + } } - private void createErrorsOutput(LabelNode node, Writer out, List errs) throws IOException { + private void createInlineErrorsOutput(LabelNode node, Writer out, List errs) throws IOException { StringBuilder sb = new StringBuilder(); for (LocalizableString err : errs) { sb.append(err.toString()); @@ -130,11 +133,19 @@ out.append("!"); + } + + private void createBlockErrorsOutput(LabelNode node, Writer out, List errs) throws IOException { + StringBuilder sb = new StringBuilder(); + for (LocalizableString err : errs) { + sb.append(err.toString()); + sb.append("\n"); + } out.append("
"); out.append(sb); - out.append("
"); - + out.append("
"); } + protected List findErrors(PropertyInfo property) { List errs = new ArrayList(); @@ -357,7 +368,7 @@ out.append(Integer.toString(maxSize)); out.append('\"'); } - out.append("\"/>"); + out.append("/>"); } Modified: labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java URL: http://svn.apache.org/viewvc/labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java?rev=747430&r1=747429&r2=747430&view=diff ============================================================================== --- labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java (original) +++ labs/magma/trunk/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java Tue Feb 24 17:00:28 2009 @@ -54,6 +54,7 @@ protected Converter converter; protected String caption; protected String summary; + protected String gototitle; public ShowList(Class myclass, Collection list, ViewCustomizer filter, String link) { this.list = list; @@ -81,6 +82,7 @@ @Override public void produce(Writer tables) throws IOException { + this.gototitle = new LocalizableString("Show element").toString(); if (this.link != null) { GenericClass gc = GenericClass.forClass(getCreatingHandler().getClass()); List methods = gc.findMethods(this.link, new Class[] { this.myclass }); @@ -147,7 +149,7 @@ if (this.linkUrl != null) { tables.write(""); + tables.write("\" title=\"" + gototitle + "\">"); } Object value = ViewUtils.getNodeValue(fldn, bean); String string = fldn.getProperty().toUser(value); @@ -204,7 +206,7 @@ } protected void openOuterTable(Node root, Writer tables) throws IOException { - tables.write(" "); } else { - ret.append(" "); + ret.append(" "); ret.append(Integer.toString(currentpage + po + 1)); ret.append(" "); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org For additional commands, e-mail: commits-help@labs.apache.org