Author: simoneg
Date: Wed Oct 21 12:14:19 2009
New Revision: 827981
URL: http://svn.apache.org/viewvc?rev=827981&view=rev
Log:
LABS-492: unified @MagView annotation, applying to fragments
Added:
labs/magma/trunk/fragment-banner-domain/src/test/
labs/magma/trunk/fragment-banner-domain/src/test/java/
labs/magma/trunk/fragment-banner-domain/src/test/resources/
Modified:
labs/magma/trunk/fragment-banner-domain/src/main/java/org/apache/magma/domain/banner/Banner.java
labs/magma/trunk/fragment-banner-domain/src/main/java/org/apache/magma/domain/banner/BannerCategory.java
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/Content.java
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/ContentCategory.java
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/ContentImage.java
labs/magma/trunk/fragment-content-main-domain/src/main/java/org/apache/magma/domain/content/AddMainContent.aj
labs/magma/trunk/fragment-content-order-domain/src/main/java/org/apache/magma/domain/content/AddOrder.aj
Modified:
labs/magma/trunk/fragment-banner-domain/src/main/java/org/apache/magma/domain/banner/Banner.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-banner-domain/src/main/java/org/apache/magma/domain/banner/Banner.java?rev=827981&r1=827980&r2=827981&view=diff
==============================================================================
---
labs/magma/trunk/fragment-banner-domain/src/main/java/org/apache/magma/domain/banner/Banner.java
(original)
+++
labs/magma/trunk/fragment-banner-domain/src/main/java/org/apache/magma/domain/banner/Banner.java
Wed Oct 21 12:14:19 2009
@@ -11,9 +11,8 @@
import org.apache.magma.beans.MagmaBean;
import org.apache.magma.validation.validators.Length;
-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;
import org.apache.magma.database.MagPersistent;
@Entity
@@ -31,9 +30,7 @@
private boolean uploadedImage;
private BannerCategory category;
- @View
- @Order(1)
- @Listed
+ @MagView(order=1, layers=MagDefaultLayers.LIST)
@Length(min=2, max=90)
public String getName() {
return name;
@@ -42,8 +39,7 @@
this.name = name;
}
- @View
- @Order(2.5f)
+ @MagView(order=2.5f)
public String getTextual() {
return textual;
}
@@ -51,8 +47,7 @@
this.textual = textual;
}
- @View
- @Order(2)
+ @MagView(order=2)
public String getLink() {
return link;
}
@@ -69,8 +64,7 @@
this.image = image;
}
- @View
- @Order(3)
+ @MagView(order=3)
public long getMaxViews() {
return maxViews;
}
@@ -78,8 +72,7 @@
this.maxViews = maxViews;
}
- @View
- @Order(4)
+ @MagView(order=4)
public long getActualViews() {
return actualViews;
}
@@ -87,8 +80,7 @@
this.actualViews = actualViews;
}
- @View
- @Order(5)
+ @MagView(order=5)
public Date getStartDate() {
return startDate;
}
@@ -96,8 +88,7 @@
this.startDate = startDate;
}
- @View
- @Order(6)
+ @MagView(order=6)
public Date getEndDate() {
return endDate;
}
@@ -105,8 +96,7 @@
this.endDate = endDate;
}
- @View
- @Order(7)
+ @MagView(order=7)
public boolean isArchived() {
return archived;
}
@@ -122,8 +112,7 @@
}
@ManyToOne
- @View
- @Order(1.5f)
+ @MagView(order=1.5f)
public BannerCategory getCategory() {
return category;
}
@@ -131,7 +120,4 @@
this.category = category;
}
-
-
-
}
Modified:
labs/magma/trunk/fragment-banner-domain/src/main/java/org/apache/magma/domain/banner/BannerCategory.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-banner-domain/src/main/java/org/apache/magma/domain/banner/BannerCategory.java?rev=827981&r1=827980&r2=827981&view=diff
==============================================================================
---
labs/magma/trunk/fragment-banner-domain/src/main/java/org/apache/magma/domain/banner/BannerCategory.java
(original)
+++
labs/magma/trunk/fragment-banner-domain/src/main/java/org/apache/magma/domain/banner/BannerCategory.java
Wed Oct 21 12:14:19 2009
@@ -12,6 +12,8 @@
import org.apache.magma.database.LogicallyNamed;
import org.apache.magma.validation.validators.Required;
import org.apache.magma.view.Listed;
+import org.apache.magma.view.MagDefaultLayers;
+import org.apache.magma.view.MagView;
import org.apache.magma.view.Order;
import org.apache.magma.view.View;
@@ -21,9 +23,7 @@
private String name;
private List<Banner> contents;
- @View
- @Order(1)
- @Listed
+ @MagView(order=1, layers=MagDefaultLayers.LIST)
@Required
public String getName() {
return name;
Modified:
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/Content.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/Content.java?rev=827981&r1=827980&r2=827981&view=diff
==============================================================================
---
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/Content.java
(original)
+++
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/Content.java
Wed Oct 21 12:14:19 2009
@@ -32,12 +32,15 @@
import org.apache.magma.beans.MagmaBean;
import org.apache.magma.beans.RichTextString;
import org.apache.magma.database.LogicallyNamed;
+import org.apache.magma.database.MagPersistent;
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.MagDefaultLayers;
+import org.apache.magma.view.MagView;
import org.apache.magma.view.Order;
import org.apache.magma.view.Side;
import org.apache.magma.view.View;
@@ -51,12 +54,10 @@
private String content;
private Date date = new Date();
private boolean archived;
-
+
+ // TODO different orders for list and non list, was @ListOrder(3)
@ManyToOne
- @View
- @Order(1)
- @Listed
- @ListOrder(3)
+ @MagView(order=1, layers=MagDefaultLayers.LIST)
@Required
public ContentCategory getCategory() {
return category;
@@ -65,10 +66,8 @@
this.category = category;
}
- @View
- @Order(2)
- @Listed
- @ListOrder(1)
+ // TODO different orders for list and non list, was @ListOrder(1)
+ @MagView(order=2, layers=MagDefaultLayers.LIST)
@Length(min=2, max=50)
public String getTitle() {
return title;
@@ -77,10 +76,8 @@
this.title = title;
}
- @View
- @Zone(side=Side.OutsideRight, of="archived")
- @Listed
- @ListOrder(2)
+ // TODO different orders for list and non list, was @ListOrder(2)
+ @MagView(side=Side.OutsideRight, of="archived")
@Format(format="short,short")
public Date getDate() {
return date;
@@ -89,8 +86,7 @@
this.date = date;
}
- @View
- @Order(3)
+ @MagView(order=3)
@Required
@Lob
@Column(length=50000)
@@ -103,8 +99,7 @@
this.content = content;
}
- @View
- @Order(4)
+ @MagView(order=4)
public boolean isArchived() {
return archived;
}
Modified:
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/ContentCategory.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/ContentCategory.java?rev=827981&r1=827980&r2=827981&view=diff
==============================================================================
---
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/ContentCategory.java
(original)
+++
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/ContentCategory.java
Wed Oct 21 12:14:19 2009
@@ -20,8 +20,6 @@
import java.util.List;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
import javax.persistence.OneToMany;
import org.apache.magma.beans.MagmaBean;
@@ -29,9 +27,8 @@
import org.apache.magma.database.LogicallyNamed;
import org.apache.magma.validation.validators.Length;
import org.apache.magma.validation.validators.Required;
-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
@@ -40,9 +37,7 @@
private List<Content> contents;
private List<ContentImage> images;
- @View
- @Order(1)
- @Listed
+ @MagView(order=1, layers=MagDefaultLayers.LIST)
@Required
@Length(min=2, max=50)
public String getName() {
Modified:
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/ContentImage.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/ContentImage.java?rev=827981&r1=827980&r2=827981&view=diff
==============================================================================
---
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/ContentImage.java
(original)
+++
labs/magma/trunk/fragment-content-domain/src/main/java/org/apache/magma/domain/content/ContentImage.java
Wed Oct 21 12:14:19 2009
@@ -22,24 +22,17 @@
import javax.persistence.Column;
import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
import javax.persistence.ManyToOne;
-
import org.apache.magma.beans.MagmaBean;
import org.apache.magma.database.LogicallyNamed;
import org.apache.magma.database.MagPersistent;
import org.apache.magma.i18n.Format;
-
import org.apache.magma.validation.validators.Length;
import org.apache.magma.validation.validators.Required;
-import org.apache.magma.view.ListOrder;
-import org.apache.magma.view.Listed;
-import org.apache.magma.view.Order;
+import org.apache.magma.view.MagDefaultLayers;
+import org.apache.magma.view.MagView;
import org.apache.magma.view.Side;
-import org.apache.magma.view.View;
-import org.apache.magma.view.Zone;
@Entity
@MagmaBean
@@ -52,11 +45,9 @@
private InputStream image;
private boolean uploadedImage;
+ // TODO different orders for list and non list, was @ListOrder(3)
@ManyToOne
- @View
- @Order(1)
- @Listed
- @ListOrder(3)
+ @MagView(order=1, layers=MagDefaultLayers.LIST)
@Required
public ContentCategory getCategory() {
return category;
@@ -65,10 +56,8 @@
this.category = category;
}
- @View
- @Order(2)
- @Listed
- @ListOrder(1)
+ // TODO different orders for list and non list, was @ListOrder(1)
+ @MagView(order=2, layers=MagDefaultLayers.LIST)
@Length(min=2, max=50)
public String getTitle() {
return title;
@@ -77,10 +66,8 @@
this.title = title;
}
- @View
- @Zone(side=Side.OutsideRight, of="archived")
- @Listed
- @ListOrder(2)
+ // TODO different orders for list and non list, was @ListOrder(2)
+ @MagView(side=Side.OutsideRight, of="archived")
@Format(format="short,short")
public Date getDate() {
return date;
@@ -89,8 +76,7 @@
this.date = date;
}
- @View
- @Order(3)
+ @MagView(order=3)
public String getLink() {
return link;
}
@@ -114,8 +100,7 @@
this.uploadedImage = uploadedImage;
}
- @View
- @Order(4)
+ @MagView(order=4)
public boolean isArchived() {
return archived;
}
Modified:
labs/magma/trunk/fragment-content-main-domain/src/main/java/org/apache/magma/domain/content/AddMainContent.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-main-domain/src/main/java/org/apache/magma/domain/content/AddMainContent.aj?rev=827981&r1=827980&r2=827981&view=diff
==============================================================================
---
labs/magma/trunk/fragment-content-main-domain/src/main/java/org/apache/magma/domain/content/AddMainContent.aj
(original)
+++
labs/magma/trunk/fragment-content-main-domain/src/main/java/org/apache/magma/domain/content/AddMainContent.aj
Wed Oct 21 12:14:19 2009
@@ -18,14 +18,13 @@
import javax.persistence.OneToOne;
-import org.apache.magma.view.Listed;
-import org.apache.magma.view.View;
+import org.apache.magma.view.MagDefaultLayers;
+import org.apache.magma.view.MagView;
public aspect AddMainContent {
private Content ContentCategory.mainContent;
- @View
- @Listed
+ @MagView(after="name", layers=MagDefaultLayers.LIST)
@OneToOne
public Content ContentCategory.getMainContent(){
return this.mainContent;
Modified:
labs/magma/trunk/fragment-content-order-domain/src/main/java/org/apache/magma/domain/content/AddOrder.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/fragment-content-order-domain/src/main/java/org/apache/magma/domain/content/AddOrder.aj?rev=827981&r1=827980&r2=827981&view=diff
==============================================================================
---
labs/magma/trunk/fragment-content-order-domain/src/main/java/org/apache/magma/domain/content/AddOrder.aj
(original)
+++
labs/magma/trunk/fragment-content-order-domain/src/main/java/org/apache/magma/domain/content/AddOrder.aj
Wed Oct 21 12:14:19 2009
@@ -16,20 +16,16 @@
*/
package org.apache.magma.domain.content;
-import javax.persistence.Column;
-
import org.apache.magma.domain.content.Content;
import org.apache.magma.domain.content.ContentImage;
-import org.apache.magma.view.Listed;
-import org.apache.magma.view.View;
+import org.apache.magma.view.MagDefaultLayers;
+import org.apache.magma.view.MagView;
public aspect AddOrder {
private double Content.position;
private double ContentImage.position;
- @View
- @Listed
- @Column
+ @MagView(after="category", layers=MagDefaultLayers.LIST)
public double Content.getPosition() {
return this.position;
}
@@ -37,9 +33,7 @@
this.position = position;
}
- @View
- @Listed
- @Column
+ @MagView(after="category", layers=MagDefaultLayers.LIST)
public double ContentImage.getPosition() {
return this.position;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
