Author: simoneg
Date: Wed Oct 21 12:40:14 2009
New Revision: 827987
URL: http://svn.apache.org/viewvc?rev=827987&view=rev
Log:
LABS-492: unified @MagView annotation, applying to fragments
Modified:
labs/magma/trunk/fragment-gallery-domain/src/main/java/org/apache/magma/domain/gallery/Gallery.java
labs/magma/trunk/fragment-gallery-domain/src/main/java/org/apache/magma/domain/gallery/GalleryItem.java
labs/magma/trunk/fragment-messaging-domain/src/main/java/org/apache/magma/domain/messaging/PrivateMessage.java
labs/magma/trunk/fragment-newsletter-domain/src/main/java/org/apache/magma/domain/newsletter/Newsletter.java
labs/magma/trunk/fragment-newsletter-domain/src/main/java/org/apache/magma/domain/newsletter/UserAdditions.aj
labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginRequest.java
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/PasswordRequest.java
labs/magma/trunk/magma-domain-archetype/src/main/resources/archetype-resources/src/main/java/Person.java
Modified:
labs/magma/trunk/fragment-gallery-domain/src/main/java/org/apache/magma/domain/gallery/Gallery.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-gallery-domain/src/main/java/org/apache/magma/domain/gallery/Gallery.java?rev=827987&r1=827986&r2=827987&view=diff
==============================================================================
---
labs/magma/trunk/fragment-gallery-domain/src/main/java/org/apache/magma/domain/gallery/Gallery.java
(original)
+++
labs/magma/trunk/fragment-gallery-domain/src/main/java/org/apache/magma/domain/gallery/Gallery.java
Wed Oct 21 12:40:14 2009
@@ -13,8 +13,6 @@
import javax.persistence.CascadeType;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.OrderBy;
@@ -22,9 +20,8 @@
import org.apache.magma.beans.MagmaBean;
import org.apache.magma.database.LogicallyNamed;
import org.apache.magma.i18n.Format;
-import org.apache.magma.view.Listed;
-import org.apache.magma.view.Order;
-import org.apache.magma.view.View;
+import org.apache.magma.view.MagDefaultLayers;
+import org.apache.magma.view.MagView;
@Entity
@@ -45,25 +42,21 @@
private Date date = new Date();
private List<GalleryItem> items = new ArrayList<GalleryItem>();
- @View
- @Order(1)
- @Listed
+ @MagView(order=1, layers=MagDefaultLayers.LIST)
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
- @View
- @Order(2)
+ @MagView(order=2)
public String getCaption() {
return caption;
}
public void setCaption(String caption) {
this.caption = caption;
}
- @View
- @Order(3)
+ @MagView(order=3)
@Format(format="short,short")
public Date getDate() {
return date;
Modified:
labs/magma/trunk/fragment-gallery-domain/src/main/java/org/apache/magma/domain/gallery/GalleryItem.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-gallery-domain/src/main/java/org/apache/magma/domain/gallery/GalleryItem.java?rev=827987&r1=827986&r2=827987&view=diff
==============================================================================
---
labs/magma/trunk/fragment-gallery-domain/src/main/java/org/apache/magma/domain/gallery/GalleryItem.java
(original)
+++
labs/magma/trunk/fragment-gallery-domain/src/main/java/org/apache/magma/domain/gallery/GalleryItem.java
Wed Oct 21 12:40:14 2009
@@ -4,14 +4,11 @@
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
import javax.persistence.ManyToOne;
import org.apache.magma.database.MagPersistent;
-import org.apache.magma.view.Listed;
-import org.apache.magma.view.Order;
-import org.apache.magma.view.View;
+import org.apache.magma.view.MagDefaultLayers;
+import org.apache.magma.view.MagView;
@Entity
public class GalleryItem {
@@ -24,8 +21,7 @@
private Gallery gallery;
- @Order(1)
- @Listed
+ @MagView(order=1, layers=MagDefaultLayers.LIST)
public String getFileName(){
return fileName;
}
@@ -41,8 +37,7 @@
this.image = image;
}
- @View
- @Order(3)
+ @MagView(order=3)
public String getCaption() {
return caption;
}
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=827987&r1=827986&r2=827987&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:40:14 2009
@@ -1,27 +1,19 @@
package org.apache.magma.domain.messaging;
import java.util.Date;
-import java.util.List;
-import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import org.apache.magma.beans.Consider;
import org.apache.magma.beans.MagmaBean;
-import org.apache.magma.beans.RichTextString;
import org.apache.magma.database.LogicallyNamed;
import org.apache.magma.domain.user.User;
import org.apache.magma.i18n.Format;
import org.apache.magma.validation.validators.Length;
import org.apache.magma.validation.validators.Required;
-import org.apache.magma.validation.validators.RichText;
-import org.apache.magma.view.ListOrder;
-import org.apache.magma.view.Listed;
-import org.apache.magma.view.Order;
-import org.apache.magma.view.View;
+import org.apache.magma.view.MagDefaultLayers;
+import org.apache.magma.view.MagView;
@Entity
@MagmaBean
@@ -33,10 +25,7 @@
private Date date = new Date();
private boolean alreadyRead = false;
- @View
- @Listed
- @Order(1)
- @ListOrder(1)
+ @MagView(order=1, layers=MagDefaultLayers.LIST)
@Required
@Length(min=2, max=120)
public String getTitle() {
@@ -45,22 +34,19 @@
public void setTitle(String title) {
this.title = title;
}
- @View
- @Order(4)
+ @MagView(order=4)
@Required
@Column(length=50000)
- @Length(min=2, max=50000)
public String getText() {
return text;
}
public void setText(String text) {
this.text = text;
}
- @View
- @Order(2)
+
+ // TODO different orders for list and non list, was @ListOrder(3)
+ @MagView(order=2, layers=MagDefaultLayers.LIST)
@ManyToOne
- @Listed
- @ListOrder(3)
public User getSender() {
return sender;
}
@@ -68,10 +54,8 @@
this.sender = sender;
}
- @View
- @Order(3)
- @Listed
- @ListOrder(2)
+ // TODO different orders for list and non list, was @ListOrder(2)
+ @MagView(order=3, layers=MagDefaultLayers.LIST)
@Required
@ManyToOne
public User getReceiver() {
@@ -80,11 +64,9 @@
public void setReceiver(User receiver) {
this.receiver = receiver;
}
- @View
+ // TODO different orders for list and non list, was @ListOrder(4)
+ @MagView(order=5, layers=MagDefaultLayers.LIST)
@Required
- @Order(5)
- @Listed
- @ListOrder(4)
@Format(format="short,short")
public Date getDate() {
return date;
@@ -92,8 +74,7 @@
public void setDate(Date date) {
this.date = date;
}
- @Listed
- @ListOrder(5)
+ @MagView(order=5, defaultLayer=false, layers=MagDefaultLayers.LIST)
public boolean isAlreadyRead() {
return alreadyRead;
}
Modified:
labs/magma/trunk/fragment-newsletter-domain/src/main/java/org/apache/magma/domain/newsletter/Newsletter.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-newsletter-domain/src/main/java/org/apache/magma/domain/newsletter/Newsletter.java?rev=827987&r1=827986&r2=827987&view=diff
==============================================================================
---
labs/magma/trunk/fragment-newsletter-domain/src/main/java/org/apache/magma/domain/newsletter/Newsletter.java
(original)
+++
labs/magma/trunk/fragment-newsletter-domain/src/main/java/org/apache/magma/domain/newsletter/Newsletter.java
Wed Oct 21 12:40:14 2009
@@ -6,6 +6,7 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.Lob;
import org.apache.magma.beans.Consider;
import org.apache.magma.beans.MagmaBean;
@@ -13,10 +14,8 @@
import org.apache.magma.validation.validators.Length;
import org.apache.magma.validation.validators.Required;
import org.apache.magma.validation.validators.RichText;
-import org.apache.magma.view.ListOrder;
-import org.apache.magma.view.Listed;
-import org.apache.magma.view.Order;
-import org.apache.magma.view.View;
+import org.apache.magma.view.MagDefaultLayers;
+import org.apache.magma.view.MagView;
@MagmaBean
@Entity
@@ -28,10 +27,7 @@
private Date date = new Date();
private ProgressStatus progress = ProgressStatus.EDITING;
- @View
- @Order(1)
- @Listed
- @ListOrder(1)
+ @MagView(order=1, layers=MagDefaultLayers.LIST)
@Length(min=2, max=120)
@Required
public String getTitle() {
@@ -41,11 +37,10 @@
this.title = title;
}
- @View
- @Order(2)
+ @MagView(order=2)
@Consider(RichTextString.class)
@Column(length=50000)
- @Length(min=2, max=50000)
+ @Lob
@Required
public String getContent() {
return content;
@@ -54,10 +49,8 @@
this.content = content;
}
- @View
- @Order(3)
- @Listed
- @ListOrder(2)
+ // TODO different orders for list and non list, was @ListOrder(2)
+ @MagView(order=3, layers=MagDefaultLayers.LIST)
@Required
public Date getDate() {
return date;
@@ -66,8 +59,8 @@
this.date = date;
}
- @Listed
- @ListOrder(3)
+ // TODO different orders for list and non list, was @ListOrder(3)
+ @MagView(order=4, defaultLayer=false, layers=MagDefaultLayers.LIST)
public ProgressStatus getProgress() {
return progress;
}
Modified:
labs/magma/trunk/fragment-newsletter-domain/src/main/java/org/apache/magma/domain/newsletter/UserAdditions.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-newsletter-domain/src/main/java/org/apache/magma/domain/newsletter/UserAdditions.aj?rev=827987&r1=827986&r2=827987&view=diff
==============================================================================
---
labs/magma/trunk/fragment-newsletter-domain/src/main/java/org/apache/magma/domain/newsletter/UserAdditions.aj
(original)
+++
labs/magma/trunk/fragment-newsletter-domain/src/main/java/org/apache/magma/domain/newsletter/UserAdditions.aj
Wed Oct 21 12:40:14 2009
@@ -1,14 +1,12 @@
package org.apache.magma.domain.newsletter;
import org.apache.magma.domain.user.User;
-import org.apache.magma.view.After;
-import org.apache.magma.view.View;
+import org.apache.magma.view.MagView;
public aspect UserAdditions {
public boolean User.newsletter;
- @View
- @After("email")
+ @MagView(after="email")
public boolean User.isNewsletter() {
return newsletter;
}
Modified:
labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java?rev=827987&r1=827986&r2=827987&view=diff
==============================================================================
---
labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java
(original)
+++
labs/magma/trunk/fragment-user-domain/src/main/java/org/apache/magma/domain/user/User.java
Wed Oct 21 12:40:14 2009
@@ -30,12 +30,8 @@
import org.apache.magma.validation.validators.Email;
import org.apache.magma.validation.validators.Length;
import org.apache.magma.validation.validators.Required;
-import org.apache.magma.view.After;
-import org.apache.magma.view.ListOrder;
-import org.apache.magma.view.Listed;
-import org.apache.magma.view.Order;
-import org.apache.magma.view.View;
-
+import org.apache.magma.view.MagDefaultLayers;
+import org.apache.magma.view.MagView;
@MagmaBean
@Entity
@@ -49,11 +45,8 @@
private boolean active;
private boolean admin;
- @View
- @Order(1)
+ @MagView(order=1, layers=MagDefaultLayers.LIST)
@Required
- @Listed
- @ListOrder(1)
public String getName() {
return name;
}
@@ -61,11 +54,8 @@
this.name = name;
}
- @View
- @After("name")
+ @MagView(after="name", layers=MagDefaultLayers.LIST)
@Required
- @Listed
- @ListOrder(2)
public String getSurname() {
return surname;
}
@@ -73,8 +63,7 @@
this.surname = surname;
}
- @View
- @Order(3)
+ @MagView(order=3)
@Required
@Column(unique=true)
@Email
@@ -85,8 +74,7 @@
this.email = email;
}
- @View(password=true)
- @Order(4)
+ @MagView(order=4,password=true)
@Required
@Length(min=4)
public String getPassword() {
@@ -96,9 +84,8 @@
this.password = password;
}
- @View(password=true)
+ @MagView(order=5,password=true)
@Transient
- @Order(5)
@Required
@Length(min=4)
public String getConfirmPassword() {
@@ -109,16 +96,14 @@
}
- @View
- @Order(6)
+ @MagView(order=6, defaultLayer=false)
public boolean isActive() {
return active;
}
public void setActive(boolean active) {
this.active = active;
}
- @View
- @Order(7)
+ @MagView(order=7, defaultLayer=false)
public boolean isAdmin() {
return admin;
}
Modified:
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginRequest.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginRequest.java?rev=827987&r1=827986&r2=827987&view=diff
==============================================================================
---
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginRequest.java
(original)
+++
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/LoginRequest.java
Wed Oct 21 12:40:14 2009
@@ -20,8 +20,7 @@
import org.apache.magma.beans.MagmaBean;
import org.apache.magma.validation.validators.Email;
import org.apache.magma.validation.validators.Required;
-import org.apache.magma.view.Order;
-import org.apache.magma.view.View;
+import org.apache.magma.view.MagView;
@MagmaBean
public class LoginRequest {
@@ -30,8 +29,7 @@
private boolean rememberme;
- @View
- @Order(1)
+ @MagView(order=1)
@Required
@Email
public String getEmail() {
@@ -41,8 +39,7 @@
this.email = email;
}
- @View(password=true)
- @Order(2)
+ @MagView(order=2, password=true)
@Required
public String getPassword() {
return password;
@@ -52,8 +49,7 @@
}
- @View
- @Order(3)
+ @MagView(order=3)
public boolean isRememberme() {
return rememberme;
}
Modified:
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/PasswordRequest.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/PasswordRequest.java?rev=827987&r1=827986&r2=827987&view=diff
==============================================================================
---
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/PasswordRequest.java
(original)
+++
labs/magma/trunk/fragment-user-web/src/main/java/org/apache/magma/web/user/PasswordRequest.java
Wed Oct 21 12:40:14 2009
@@ -16,19 +16,15 @@
*/
package org.apache.magma.web.user;
-import javax.persistence.Entity;
-
import org.apache.magma.beans.MagmaBean;
import org.apache.magma.validation.validators.Required;
-import org.apache.magma.view.Order;
-import org.apache.magma.view.View;
+import org.apache.magma.view.MagView;
@MagmaBean
public class PasswordRequest {
private String email;
- @View
- @Order(1)
+ @MagView(order=1)
@Required
public String getEmail() {
return email;
Modified:
labs/magma/trunk/magma-domain-archetype/src/main/resources/archetype-resources/src/main/java/Person.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/magma-domain-archetype/src/main/resources/archetype-resources/src/main/java/Person.java?rev=827987&r1=827986&r2=827987&view=diff
==============================================================================
---
labs/magma/trunk/magma-domain-archetype/src/main/resources/archetype-resources/src/main/java/Person.java
(original)
+++
labs/magma/trunk/magma-domain-archetype/src/main/resources/archetype-resources/src/main/java/Person.java
Wed Oct 21 12:40:14 2009
@@ -17,8 +17,7 @@
package ${package};
import org.apache.magma.beans.MagmaBean;
-import org.apache.magma.view.Order;
-import org.apache.magma.view.View;
+import org.apache.magma.view.MagView;
import org.apache.magma.validation.validators.Length;
import org.apache.magma.validation.validators.Required;
import javax.persistence.Entity;
@@ -39,24 +38,20 @@
private String name;
private String surname;
- @View
- @Order(1)
+ @MagView(order=1)
public String getName() {
return this.name;
}
-
@Required
@Length(min=3, max=50)
public void setName(String name) {
this.name = name;
}
- @View
- @Order(2)
+ @MagView(order=2)
public String getSursurname() {
return this.surname;
}
-
@Required
@Length(min=3, max=50)
public void setSursurname(String surname) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
