Author: simoneg
Date: Wed Oct 21 12:54:13 2009
New Revision: 827995
URL: http://svn.apache.org/viewvc?rev=827995&view=rev
Log:
LABS-492: reimplementing filters as layers
Modified:
labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/ContentWebHandler.java
labs/magma/trunk/fragment-messaging-domain/src/main/java/org/apache/magma/domain/messaging/PrivateMessage.java
labs/magma/trunk/fragment-messaging-web/src/main/java/org/apache/magma/web/messaging/MessagingWebHandler.java
Modified:
labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/ContentWebHandler.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/ContentWebHandler.java?rev=827995&r1=827994&r2=827995&view=diff
==============================================================================
---
labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/ContentWebHandler.java
(original)
+++
labs/magma/trunk/fragment-content-web/src/main/java/org/apache/magma/web/content/ContentWebHandler.java
Wed Oct 21 12:54:13 2009
@@ -34,7 +34,8 @@
import org.apache.magma.website.producers.TemplatingProducer;
public class ContentWebHandler extends WebHandler{
-protected ViewCustomizer listAll = new SimpleViewFilter("-category");
+ // TODO reimplement this with layers
+ //protected ViewCustomizer listAll = new SimpleViewFilter("-category");
public HtmlProducer doLastBoxWithDate(int limit, ContentCategory
category){
if (category == null) return null;
@@ -101,7 +102,9 @@
public SmartList handleListAll(ContentCategory c) {
HtmlProducer header = new
TemplatingProducer("listHeader").addParameter(new LocalizableString("List All "
+ c.getName()).toString());
- SmartList sl = new SmartList(Content.class, "where
x.category=?1", c).setFilter(listAll);
+ SmartList sl = new SmartList(Content.class, "where
x.category=?1", c);
+ // TODO reimplement this with layers
+ //.setFilter(listAll);
sl.addSortable("date").addSortable("title");
sl.setSortingField("date", false);
sl.setHeader(header);
Modified:
labs/magma/trunk/fragment-messaging-domain/src/main/java/org/apache/magma/domain/messaging/PrivateMessage.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-messaging-domain/src/main/java/org/apache/magma/domain/messaging/PrivateMessage.java?rev=827995&r1=827994&r2=827995&view=diff
==============================================================================
---
labs/magma/trunk/fragment-messaging-domain/src/main/java/org/apache/magma/domain/messaging/PrivateMessage.java
(original)
+++
labs/magma/trunk/fragment-messaging-domain/src/main/java/org/apache/magma/domain/messaging/PrivateMessage.java
Wed Oct 21 12:54:13 2009
@@ -18,6 +18,13 @@
@Entity
@MagmaBean
public class PrivateMessage implements LogicallyNamed{
+
+
+ public static final String
+ LAYER_INBOX = "inbox",
+ LAYER_OUTBOX = "outbox",
+ LAYER_EDIT_NEW = "editnew";
+
private String title;
private String text;
private User sender;
@@ -25,7 +32,7 @@
private Date date = new Date();
private boolean alreadyRead = false;
- @MagView(order=1, layers=MagDefaultLayers.LIST)
+ @MagView(order=1, layers={MagDefaultLayers.LIST, LAYER_INBOX,
LAYER_OUTBOX, LAYER_EDIT_NEW})
@Required
@Length(min=2, max=120)
public String getTitle() {
@@ -34,7 +41,7 @@
public void setTitle(String title) {
this.title = title;
}
- @MagView(order=4)
+ @MagView(order=4, layers=LAYER_EDIT_NEW)
@Required
@Column(length=50000)
public String getText() {
@@ -45,7 +52,7 @@
}
// TODO different orders for list and non list, was @ListOrder(3)
- @MagView(order=2, layers=MagDefaultLayers.LIST)
+ @MagView(order=2, layers={MagDefaultLayers.LIST, LAYER_INBOX})
@ManyToOne
public User getSender() {
return sender;
@@ -55,7 +62,7 @@
}
// TODO different orders for list and non list, was @ListOrder(2)
- @MagView(order=3, layers=MagDefaultLayers.LIST)
+ @MagView(order=3, layers={MagDefaultLayers.LIST, LAYER_OUTBOX,
LAYER_EDIT_NEW})
@Required
@ManyToOne
public User getReceiver() {
@@ -65,7 +72,7 @@
this.receiver = receiver;
}
// TODO different orders for list and non list, was @ListOrder(4)
- @MagView(order=5, layers=MagDefaultLayers.LIST)
+ @MagView(order=5, layers={MagDefaultLayers.LIST, LAYER_INBOX,
LAYER_OUTBOX})
@Required
@Format(format="short,short")
public Date getDate() {
@@ -74,7 +81,7 @@
public void setDate(Date date) {
this.date = date;
}
- @MagView(order=5, defaultLayer=false, layers=MagDefaultLayers.LIST)
+ @MagView(order=5, defaultLayer=false, layers={MagDefaultLayers.LIST,
LAYER_INBOX, LAYER_OUTBOX})
public boolean isAlreadyRead() {
return alreadyRead;
}
Modified:
labs/magma/trunk/fragment-messaging-web/src/main/java/org/apache/magma/web/messaging/MessagingWebHandler.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-messaging-web/src/main/java/org/apache/magma/web/messaging/MessagingWebHandler.java?rev=827995&r1=827994&r2=827995&view=diff
==============================================================================
---
labs/magma/trunk/fragment-messaging-web/src/main/java/org/apache/magma/web/messaging/MessagingWebHandler.java
(original)
+++
labs/magma/trunk/fragment-messaging-web/src/main/java/org/apache/magma/web/messaging/MessagingWebHandler.java
Wed Oct 21 12:54:13 2009
@@ -18,10 +18,6 @@
public class MessagingWebHandler extends WebHandler{
private User sessionUser;
- protected ViewCustomizer newMessage = new SimpleViewFilter("-sender",
"-date", "-read");
- protected ViewCustomizer inbox = new SimpleViewFilter ("-receiver");
- protected ViewCustomizer outbox = new SimpleViewFilter ("-sender");
- protected ViewCustomizer reply = new SimpleViewFilter
("-receiver","-sender", "-date", "-read");
public SmartForm handleNewMessage(){
if (this.sessionUser == null) {
@@ -30,7 +26,7 @@
PrivateMessage pm = new PrivateMessage();
pm.setSender(sessionUser);
HtmlProducer header = new
TemplatingProducer("newPMHeader");
- return new SmartForm(pm, "hiddenNewMessage",
header).setFilter(newMessage);
+ return new SmartForm(pm, "hiddenNewMessage",
header).setLayers(PrivateMessage.LAYER_EDIT_NEW);
}
}
public HtmlProducer hiddenNewMessage(PrivateMessage pm){
@@ -59,7 +55,7 @@
pm.setReceiver(message.getSender());
pm.setTitle("RE : " + message.getTitle());
HtmlProducer header = new
TemplatingProducer("replyHeader").addParameter("user", message.getSender());
- return new SmartForm(pm, "hiddenReply",
header).setFilter(reply);
+ return new SmartForm(pm, "hiddenReply",
header).setLayers(PrivateMessage.LAYER_EDIT_NEW);
}
public HtmlProducer hiddenReply(PrivateMessage pm){
sessionUser.getOutbox().add(pm);
@@ -74,7 +70,7 @@
sl.setLink("doShowMessage");
sl.addSortable("date");
sl.setHeader(header);
- sl.setFilter(outbox);
+ sl.setLayers(PrivateMessage.LAYER_OUTBOX);
return sl;
}
public SmartList handleInbox(){
@@ -83,7 +79,7 @@
sl.setLink("doShowMessage");
sl.addSortable("date");
sl.setHeader(header);
- sl.setFilter(inbox);
+ sl.setLayers(PrivateMessage.LAYER_INBOX);
return sl;
}
public SmartList handleNotRead(){
@@ -92,7 +88,7 @@
sl.setLink("doShowMessage");
sl.addSortable("date");
sl.setHeader(header);
- sl.setFilter(inbox);
+ sl.setLayers(PrivateMessage.LAYER_INBOX);
return sl;
}
public HtmlProducer doUnreadMessageBox(){
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
