You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/02/18 02:48:12 UTC

svn commit: r745356 - in /labs/magma/branches/0.0.1/website-beansview/src: main/java/org/apache/magma/website/beansview/ test/java/org/apache/magma/website/beansview/

Author: simoneg
Date: Wed Feb 18 01:48:11 2009
New Revision: 745356

URL: http://svn.apache.org/viewvc?rev=745356&view=rev
Log:
LABS-297 : Support for caption and summary

Modified:
    labs/magma/branches/0.0.1/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java
    labs/magma/branches/0.0.1/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartList.java
    labs/magma/branches/0.0.1/website-beansview/src/test/java/org/apache/magma/website/beansview/ShowListTest.java

Modified: labs/magma/branches/0.0.1/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.1/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java?rev=745356&r1=745355&r2=745356&view=diff
==============================================================================
--- labs/magma/branches/0.0.1/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java (original)
+++ labs/magma/branches/0.0.1/website-beansview/src/main/java/org/apache/magma/website/beansview/ShowList.java Wed Feb 18 01:48:11 2009
@@ -52,6 +52,8 @@
 	protected String linkUrl = null;
 	protected Class<?> myclass;
 	protected Converter converter;
+	protected String caption;
+	protected String summary;
 	
 	public <T> ShowList(Class<T> myclass, Collection<? extends T> list, ViewCustomizer filter, String link) {
 		this.list = list;
@@ -204,7 +206,18 @@
 	}
 
 	protected void openOuterTable(Node root, Writer tables) throws IOException {
-		tables.write("<table id=\"ShowList-" + this.myclass.getSimpleName() +"\" class=\"MagmaList ShowList\">");
+		tables.write("<table id=\"ShowList-" + this.myclass.getSimpleName() +"\" class=\"MagmaList ShowList\"");
+		if (summary != null) {
+			tables.write(" summary=\"");
+			tables.write(summary);
+			tables.write("\"");
+		}
+		tables.write(">");
+		if (caption != null) {
+			tables.write("<caption>");
+			tables.write(caption);
+			tables.write("</caption>");
+		}
 	}
 
 	public ViewCustomizer getFilter() {
@@ -221,6 +234,24 @@
 		head.addCss("magma:/common/beansview/magmaBeansview.css");
 	}
 
+	public String getCaption() {
+		return caption;
+	}
+
+	public ShowList setCaption(String caption) {
+		this.caption = caption;
+		return this;
+	}
+
+	public String getSummary() {
+		return summary;
+	}
+
+	public ShowList setSummary(String summary) {
+		this.summary = summary;
+		return this;
+	}
+
 	
 	
 }

Modified: labs/magma/branches/0.0.1/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartList.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.1/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartList.java?rev=745356&r1=745355&r2=745356&view=diff
==============================================================================
--- labs/magma/branches/0.0.1/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartList.java (original)
+++ labs/magma/branches/0.0.1/website-beansview/src/main/java/org/apache/magma/website/beansview/SmartList.java Wed Feb 18 01:48:11 2009
@@ -49,6 +49,9 @@
 	private String linkUrl;
 	private Class<?> myclass;
 	
+	private String caption;
+	private String summary;
+	
 	
 	public SmartList(Class<?> beanClass, String query, Object... queryParams) {
 		this.myclass = beanClass;
@@ -137,6 +140,7 @@
 		producer.setSortables(sortables);
 		producer.setLink("../" + this.linkUrl);
 		producer.setFilter(filter);
+		producer.setCaption(caption).setSummary(summary);
 		return new CompoundHtmlProducer(header, producer, footer);
 	}
 	
@@ -241,5 +245,23 @@
 		this.len = len;
 		return this;
 	}
+
+	public String getCaption() {
+		return caption;
+	}
+
+	public SmartList setCaption(String caption) {
+		this.caption = caption;
+		return this;
+	}
+
+	public String getSummary() {
+		return summary;
+	}
+
+	public SmartList setSummary(String summary) {
+		this.summary = summary;
+		return this;
+	}
 	
 }

Modified: labs/magma/branches/0.0.1/website-beansview/src/test/java/org/apache/magma/website/beansview/ShowListTest.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.1/website-beansview/src/test/java/org/apache/magma/website/beansview/ShowListTest.java?rev=745356&r1=745355&r2=745356&view=diff
==============================================================================
--- labs/magma/branches/0.0.1/website-beansview/src/test/java/org/apache/magma/website/beansview/ShowListTest.java (original)
+++ labs/magma/branches/0.0.1/website-beansview/src/test/java/org/apache/magma/website/beansview/ShowListTest.java Wed Feb 18 01:48:11 2009
@@ -23,6 +23,7 @@
 import java.util.List;
 
 import org.junit.Test;
+import static org.apache.magma.website.beansview.AssertStringStructure.assertStructure;
 
 
 public class ShowListTest {
@@ -45,6 +46,7 @@
 		
 		String result = new String(baos.toByteArray());
 
+		assertStructure(result, "<table","<tr","<td", "Simone", "</td", "<td", "Gianni", "</table");
 		System.out.println(result);
 		
 	}



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org