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 20:50:23 UTC
svn commit: r1346085 - in
/rave/branches/model_interfaces/rave-components/rave-core/src:
main/java/org/apache/rave/portal/model/
main/java/org/apache/rave/portal/model/conversion/
main/java/org/apache/rave/portal/model/impl/ test/java/org/apache/rave/p...
Author: mfranklin
Date: Mon Jun 4 18:50:22 2012
New Revision: 1346085
URL: http://svn.apache.org/viewvc?rev=1346085&view=rev
Log:
Added PageTemplateRegionConverter (RAVE-648)
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
- copied, changed from r1346080, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java
- copied, changed from r1346080, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java
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/impl/PageTemplateWidgetImpl.java
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.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?rev=1346085&r1=1346084&r2=1346085&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java Mon Jun 4 18:50:22 2012
@@ -73,6 +73,11 @@ public class JpaPageTemplateWidget imple
}
@Override
+ public Long getId() {
+ return this.getEntityId();
+ }
+
+ @Override
public PageTemplateRegion getPageTemplateRegion() {
return pageTemplateRegion;
}
Modified: 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=1346085&r1=1346084&r2=1346085&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/PageTemplateWidget.java Mon Jun 4 18:50:22 2012
@@ -3,6 +3,9 @@ package org.apache.rave.portal.model;
/**
*/
public interface PageTemplateWidget {
+
+ Long getId();
+
PageTemplateRegion getPageTemplateRegion();
void setPageTemplateRegion(PageTemplateRegion pageTemplateRegion);
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java (from r1346080, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java&r1=1346080&r2=1346085&rev=1346085&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java Mon Jun 4 18:50:22 2012
@@ -19,44 +19,43 @@
package org.apache.rave.portal.model.conversion;
import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.JpaPageTemplateRegion;
-import org.apache.rave.portal.model.PageTemplateRegion;
+import org.apache.rave.portal.model.JpaPageTemplateWidget;
+import org.apache.rave.portal.model.PageTemplateWidget;
import org.springframework.stereotype.Component;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@Component
-public class JpaPageTemplateRegionConverter implements ModelConverter<PageTemplateRegion, JpaPageTemplateRegion> {
+public class JpaPageTemplateWidgetConverter implements ModelConverter<PageTemplateWidget, JpaPageTemplateWidget> {
@PersistenceContext
private EntityManager manager;
@Override
- public Class<PageTemplateRegion> getSourceType() {
- return PageTemplateRegion.class;
+ public Class<PageTemplateWidget> getSourceType() {
+ return PageTemplateWidget.class;
}
@Override
- public JpaPageTemplateRegion convert(PageTemplateRegion source) {
- return source instanceof JpaPageTemplateRegion ? (JpaPageTemplateRegion) source : createEntity(source);
+ public JpaPageTemplateWidget convert(PageTemplateWidget source) {
+ return source instanceof JpaPageTemplateWidget ? (JpaPageTemplateWidget) source : createEntity(source);
}
- private JpaPageTemplateRegion createEntity(PageTemplateRegion source) {
- JpaPageTemplateRegion converted = manager.find(JpaPageTemplateRegion.class, source.getId());
-
+ private JpaPageTemplateWidget createEntity(PageTemplateWidget source) {
+ JpaPageTemplateWidget converted = manager.find(JpaPageTemplateWidget.class, source.getId());
if (converted == null) {
- converted = new JpaPageTemplateRegion();
+ converted = new JpaPageTemplateWidget();
}
updateProperties(source, converted);
-
return converted;
}
- private void updateProperties(PageTemplateRegion source, JpaPageTemplateRegion converted) {
+ private void updateProperties(PageTemplateWidget source, JpaPageTemplateWidget converted) {
converted.setEntityId(source.getId());
- converted.setRenderSequence(source.getRenderSequence());
- converted.setPageTemplateWidgets(source.getPageTemplateWidgets());
- converted.setPageTemplate(source.getPageTemplate());
+ converted.setHideChrome(source.isHideChrome());
+ converted.setPageTemplateRegion(source.getPageTemplateRegion());
+ converted.setRenderSeq(source.getRenderSeq());
+ converted.setWidget(source.getWidget());
converted.setLocked(source.isLocked());
}
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java?rev=1346085&r1=1346084&r2=1346085&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java Mon Jun 4 18:50:22 2012
@@ -4,12 +4,21 @@ package org.apache.rave.portal.model.imp
import org.apache.rave.portal.model.*;
public class PageTemplateWidgetImpl implements PageTemplateWidget {
+ private Long id;
private PageTemplateRegion pageTemplateRegion;
private long renderSequence;
private Widget widget;
private boolean locked;
private boolean hideChrome;
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
public PageTemplateRegion getPageTemplateRegion() {
return pageTemplateRegion;
}
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java (from r1346080, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java&r1=1346080&r2=1346085&rev=1346085&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java Mon Jun 4 18:50:22 2012
@@ -18,12 +18,12 @@
*/
package org.apache.rave.portal.model.conversion;
-import org.apache.rave.portal.model.JpaPageTemplate;
import org.apache.rave.portal.model.JpaPageTemplateRegion;
-import org.apache.rave.portal.model.PageTemplateRegion;
+import org.apache.rave.portal.model.JpaPageTemplateWidget;
import org.apache.rave.portal.model.PageTemplateWidget;
-import org.apache.rave.portal.model.impl.PageTemplateImpl;
+import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.model.impl.PageTemplateRegionImpl;
+import org.apache.rave.portal.model.impl.PageTemplateWidgetImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,17 +31,15 @@ import org.springframework.beans.factory
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import java.util.ArrayList;
-
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = {"classpath:test-applicationContext.xml", "classpath:test-dataContext.xml"})
-public class JpaPageTemplateRegionConverterTest {
+public class JpaPageTemplateWidgetConverterTest {
@Autowired
- JpaPageTemplateRegionConverter converter;
+ JpaPageTemplateWidgetConverter converter;
@Before
public void setup() {
@@ -50,26 +48,30 @@ public class JpaPageTemplateRegionConver
@Test
public void testNoConversion() {
- JpaPageTemplateRegion template = new JpaPageTemplateRegion();
+ JpaPageTemplateWidget template = new JpaPageTemplateWidget();
assertThat(converter.convert(template), is(sameInstance(template)));
}
@Test
public void convertValid() {
- PageTemplateRegion template = new PageTemplateRegionImpl();
- template.setRenderSequence(1);
- template.setPageTemplateWidgets(new ArrayList<PageTemplateWidget>());
- template.setPageTemplate(new PageTemplateImpl());
+ Widget widget = new Widget();
+ PageTemplateWidget template = new PageTemplateWidgetImpl();
template.setLocked(true);
+ template.setHideChrome(true);
+ template.setPageTemplateRegion(new PageTemplateRegionImpl());
+ template.setRenderSeq(1);
+ template.setWidget(widget);
- JpaPageTemplateRegion jpaTemplate = converter.convert(template);
+ JpaPageTemplateWidget jpaTemplate = converter.convert(template);
assertThat(jpaTemplate, is(not(sameInstance(template))));
- assertThat(jpaTemplate, is(instanceOf(JpaPageTemplateRegion.class)));
- assertThat(jpaTemplate.getRenderSequence(), is(equalTo(template.getRenderSequence())));
- assertThat(jpaTemplate.getPageTemplate(), is(instanceOf(JpaPageTemplate.class)));
- assertThat(jpaTemplate.getPageTemplateWidgets(), is(equalTo(template.getPageTemplateWidgets())));
+ assertThat(jpaTemplate, is(instanceOf(JpaPageTemplateWidget.class)));
+ assertThat(jpaTemplate.isLocked(), is(equalTo(template.isLocked())));
+ assertThat(jpaTemplate.getPageTemplateRegion(), is(instanceOf(JpaPageTemplateRegion.class)));
+ assertThat(jpaTemplate.getRenderSeq(), is(equalTo(template.getRenderSeq())));
+ assertThat(jpaTemplate.getWidget(), is(equalTo(template.getWidget())));
assertThat(jpaTemplate.isLocked(), is(equalTo(template.isLocked())));
+ assertThat(jpaTemplate.isHideChrome(), is(equalTo(template.isHideChrome())));
}
}