You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/06/04 18:48:23 UTC
svn commit: r1346032 - in
/rave/branches/model_interfaces/rave-components/rave-core/src/main:
java/org/apache/rave/portal/model/ resources/META-INF/
Author: mfranklin
Date: Mon Jun 4 16:48:22 2012
New Revision: 1346032
URL: http://svn.apache.org/viewvc?rev=1346032&view=rev
Log:
Refactored PageTemplateWidget (RAVE-648)
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java
- copied, changed from r1346018, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java (from r1346018, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java&r1=1346018&r2=1346032&rev=1346032&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java Mon Jun 4 16:48:22 2012
@@ -30,7 +30,7 @@ import java.io.Serializable;
@NamedQuery(name = "PageTemplateGadget.findByPageTemplateGadgetId", query = "SELECT p FROM PageTemplateWidget p WHERE p.entityId = :id")
})
@Access(AccessType.FIELD)
-public class PageTemplateWidget implements BasicEntity, Serializable {
+public class JpaPageTemplateWidget implements BasicEntity, Serializable, PageTemplateWidget {
private static final long serialVersionUID = 1L;
@@ -71,42 +71,52 @@ public class PageTemplateWidget implemen
this.entityId = entityId;
}
+ @Override
public PageTemplateRegion getPageTemplateRegion() {
return pageTemplateRegion;
}
+ @Override
public void setPageTemplateRegion(PageTemplateRegion pageTemplateRegion) {
this.pageTemplateRegion = pageTemplateRegion;
}
+ @Override
public long getRenderSeq() {
return renderSequence;
}
+ @Override
public void setRenderSeq(long renderSeq) {
this.renderSequence = renderSeq;
}
+ @Override
public Widget getWidget() {
return widget;
}
+ @Override
public void setWidget(Widget widget) {
this.widget = widget;
}
+ @Override
public boolean isLocked() {
return locked;
}
+ @Override
public void setLocked(boolean locked) {
this.locked = locked;
}
+ @Override
public boolean isHideChrome() {
return hideChrome;
}
+ @Override
public void setHideChrome(boolean hideChrome) {
this.hideChrome = hideChrome;
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java?rev=1346032&r1=1346031&r2=1346032&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java Mon Jun 4 16:48:22 2012
@@ -20,9 +20,11 @@
package org.apache.rave.portal.model;
import org.apache.rave.persistence.BasicEntity;
+import org.apache.rave.portal.model.conversion.ConvertingListProxyFactory;
import javax.persistence.*;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
@Entity
@@ -53,7 +55,7 @@ public class PageTemplateRegion implemen
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
@OrderBy("renderSequence")
@JoinColumn(name = "page_template_region_id")
- private List<PageTemplateWidget> pageTemplateWidgets;
+ private List<JpaPageTemplateWidget> pageTemplateWidgets;
@Basic(optional = false)
@Column(name = "locked")
@@ -86,11 +88,17 @@ public class PageTemplateRegion implemen
}
public List<PageTemplateWidget> getPageTemplateWidgets() {
- return pageTemplateWidgets;
+ return ConvertingListProxyFactory.createProxyList(PageTemplateWidget.class, this.pageTemplateWidgets);
}
public void setPageTemplateWidgets(List<PageTemplateWidget> pageTemplateWidgets) {
- this.pageTemplateWidgets = pageTemplateWidgets;
+ if(this.pageTemplateWidgets == null) {
+ this.pageTemplateWidgets = new ArrayList<JpaPageTemplateWidget>();
+ }
+ this.getPageTemplateWidgets().clear();
+ if(pageTemplateWidgets != null) {
+ this.getPageTemplateWidgets().addAll(pageTemplateWidgets);
+ }
}
public boolean isLocked() {
Added: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java?rev=1346032&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java Mon Jun 4 16:48:22 2012
@@ -0,0 +1,25 @@
+package org.apache.rave.portal.model;
+
+/**
+ */
+public interface PageTemplateWidget {
+ PageTemplateRegion getPageTemplateRegion();
+
+ void setPageTemplateRegion(PageTemplateRegion pageTemplateRegion);
+
+ long getRenderSeq();
+
+ void setRenderSeq(long renderSeq);
+
+ Widget getWidget();
+
+ void setWidget(Widget widget);
+
+ boolean isLocked();
+
+ void setLocked(boolean locked);
+
+ boolean isHideChrome();
+
+ void setHideChrome(boolean hideChrome);
+}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml?rev=1346032&r1=1346031&r2=1346032&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml Mon Jun 4 16:48:22 2012
@@ -38,7 +38,7 @@
<class>org.apache.rave.portal.model.PortalPreference</class>
<class>org.apache.rave.portal.model.PageTemplate</class>
<class>org.apache.rave.portal.model.PageTemplateRegion</class>
- <class>org.apache.rave.portal.model.PageTemplateWidget</class>
+ <class>org.apache.rave.portal.model.JpaPageTemplateWidget</class>
<class>org.apache.rave.portal.model.PageUser</class>
<class>org.apache.rave.portal.model.JpaCategory</class>
</persistence-unit>