Author: julien_viet Date: 2009-11-10 19:30:04 -0500 (Tue, 10 Nov 2009) New Revision: 555 Removed: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/gadget/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/portlet/ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/wsrp/ Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Application.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ModelObject.java portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java portal/trunk/component/portal/src/main/resources/binding.xml portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java Log: removed Application subclasses that were not anymore a necessity Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Application.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Application.java 2009-11-10 23:45:49 UTC (rev 554) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/Application.java 2009-11-11 00:30:04 UTC (rev 555) @@ -22,6 +22,9 @@ import org.exoplatform.portal.pom.config.Utils; import org.exoplatform.portal.pom.data.ApplicationData; import org.exoplatform.portal.pom.data.ModelData; +import org.exoplatform.portal.pom.spi.gadget.Gadget; +import org.exoplatform.portal.pom.spi.portlet.Preferences; +import org.exoplatform.portal.pom.spi.wsrp.WSRP; /** * May 13, 2004 @@ -29,7 +32,7 @@ * @email: tuan08(a)users.sourceforge.net * @version: $Id: Portlet.java,v 1.7 2004/09/30 01:00:05 tuan08 Exp $ **/ -public abstract class Application<S> extends ModelObject +public class Application<S> extends ModelObject { /** The application state. */ @@ -61,6 +64,9 @@ private boolean isModifiable; + /** We cannot allow the type to change once the object is created. */ + private final ApplicationType<S> type; + public Application(ApplicationData<S> data) { super(data.getStorageId()); @@ -83,19 +89,29 @@ this.height = data.getHeight(); this.properties = new Properties(data.getProperties()); this.accessPermissions = data.getAccessPermissions().toArray(new String[data.getAccessPermissions().size()]); + this.type = data.getType(); } - public Application(String storageId) + public Application(ApplicationType<S> type, String storageId) { super(storageId); + + // + this.type = type; } - public Application() + public Application(ApplicationType<S> type) { super(); + + // + this.type = type; } - public abstract ApplicationType<S> getType(); + public ApplicationType<S> getType() + { + return type; + } public String getWidth() { @@ -261,4 +277,49 @@ Utils.safeImmutableList(accessPermissions) ); } + + public static Application<Gadget> createGadgetApplication(ApplicationData<Gadget> data) + { + return new Application<Gadget>(data); + } + + public static Application<Gadget> createGadgetApplication(String storageId) + { + return new Application<Gadget>(ApplicationType.GADGET, storageId); + } + + public static Application<Gadget> createGadgetApplication() + { + return new Application<Gadget>(ApplicationType.GADGET); + } + + public static Application<Preferences> createPortletApplication(ApplicationData<Preferences> data) + { + return new Application<Preferences>(data); + } + + public static Application<Preferences> createPortletApplication(String storageId) + { + return new Application<Preferences>(ApplicationType.PORTLET, storageId); + } + + public static Application<Preferences> createPortletApplication() + { + return new Application<Preferences>(ApplicationType.PORTLET); + } + + public static Application<WSRP> createWSRPApplication(ApplicationData<WSRP> wsrpwsrpIdApplicationData) + { + return new Application<WSRP>(wsrpwsrpIdApplicationData); + } + + public static Application<WSRP> createWSRPApplication() + { + return new Application<WSRP>(ApplicationType.WSRP_PORTLET); + } + + public static Application<WSRP> createWSRPApplication(String storageId) + { + return new Application<WSRP>(ApplicationType.WSRP_PORTLET, storageId); + } } \ No newline at end of file Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ModelObject.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ModelObject.java 2009-11-10 23:45:49 UTC (rev 554) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ModelObject.java 2009-11-11 00:30:04 UTC (rev 555) @@ -19,9 +19,6 @@ package org.exoplatform.portal.config.model; -import org.exoplatform.portal.config.model.gadget.GadgetApplication; -import org.exoplatform.portal.config.model.portlet.PortletApplication; -import org.exoplatform.portal.config.model.wsrp.WSRPApplication; import org.exoplatform.portal.pom.data.ApplicationData; import org.exoplatform.portal.pom.data.BodyData; import org.exoplatform.portal.pom.data.ContainerData; @@ -105,15 +102,15 @@ ApplicationType type = applicationData.getType(); if (ApplicationType.PORTLET == type) { - return new PortletApplication((ApplicationData<Preferences>)applicationData); + return Application.createPortletApplication((ApplicationData<Preferences>)applicationData); } else if (ApplicationType.GADGET == type) { - return new GadgetApplication((ApplicationData<Gadget>)applicationData); + return Application.createGadgetApplication((ApplicationData<Gadget>)applicationData); } else if (ApplicationType.WSRP_PORTLET == type) { - return new WSRPApplication((ApplicationData<WSRP>)applicationData); + return Application.createWSRPApplication((ApplicationData<WSRP>)applicationData); } else { Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java =================================================================== --- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java 2009-11-10 23:45:49 UTC (rev 554) +++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/serialize/AbstractApplicationHandler.java 2009-11-11 00:30:04 UTC (rev 555) @@ -23,9 +23,9 @@ import org.exoplatform.portal.application.Preference; import org.exoplatform.portal.config.NewPortalConfigListener; +import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.Properties; import org.exoplatform.portal.config.model.TransientApplicationState; -import org.exoplatform.portal.config.model.portlet.PortletApplication; import org.exoplatform.portal.pom.spi.portlet.Preferences; import org.exoplatform.portal.pom.spi.portlet.PreferencesBuilder; import org.jibx.runtime.IAliasable; @@ -100,7 +100,7 @@ ctx.parsePastStartTag(m_uri, m_name); // - PortletApplication app; + Application<Preferences> app; if ("application".equals(m_name)) { String instanceId = ctx.parseElementText(m_uri, "instance-id"); @@ -130,7 +130,7 @@ ownerId, persistenceChunks[2]); } - app = new PortletApplication(); + app = Application.createPortletApplication(); app.setState(state); } else @@ -155,7 +155,7 @@ { state = new TransientApplicationState<Preferences>(applicationName + "/" + portletName, null); } - app = new PortletApplication(); + app = Application.createPortletApplication(); app.setState(state); ctx.parsePastEndTag(m_uri, "portlet"); } Modified: portal/trunk/component/portal/src/main/resources/binding.xml =================================================================== --- portal/trunk/component/portal/src/main/resources/binding.xml 2009-11-10 23:45:49 UTC (rev 554) +++ portal/trunk/component/portal/src/main/resources/binding.xml 2009-11-11 00:30:04 UTC (rev 555) @@ -60,7 +60,7 @@ <mapping name="portlet-application" label="portlet-application" - class="org.exoplatform.portal.config.model.portlet.PortletApplication" + class="org.exoplatform.portal.config.serialize.PortletApplication" marshaller="org.exoplatform.portal.config.serialize.PortletApplicationHandler" unmarshaller="org.exoplatform.portal.config.serialize.PortletApplicationHandler"> <!-- @@ -129,7 +129,7 @@ <structure map-as="org.exoplatform.portal.config.model.Application" usage="optional"/> <structure map-as="org.exoplatform.portal.config.model.PageBody" usage="optional"/> <structure map-as="org.exoplatform.portal.config.model.SiteBody" usage="optional"/> - <structure map-as="org.exoplatform.portal.config.model.portlet.PortletApplication" usage="optional"/> + <structure map-as="org.exoplatform.portal.config.serialize.PortletApplication" usage="optional"/> </collection> </mapping> @@ -149,7 +149,7 @@ <structure map-as="org.exoplatform.portal.config.model.Container" usage="optional"/> <structure map-as="org.exoplatform.portal.config.model.Application" usage="optional"/> <structure map-as="org.exoplatform.portal.config.model.PageBody" usage="optional"/> - <structure map-as="org.exoplatform.portal.config.model.portlet.PortletApplication" usage="optional"/> + <structure map-as="org.exoplatform.portal.config.serialize.PortletApplication" usage="optional"/> </collection> </mapping> Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2009-11-10 23:45:49 UTC (rev 554) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestDataStorage.java 2009-11-11 00:30:04 UTC (rev 555) @@ -26,6 +26,7 @@ import org.exoplatform.portal.application.Preference; import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.ApplicationState; +import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.Dashboard; import org.exoplatform.portal.config.model.ModelChange; @@ -33,8 +34,6 @@ import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.config.model.TransientApplicationState; -import org.exoplatform.portal.config.model.gadget.GadgetApplication; -import org.exoplatform.portal.config.model.portlet.PortletApplication; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.portal.pom.spi.gadget.Gadget; import org.exoplatform.portal.pom.spi.portlet.Preferences; @@ -295,12 +294,12 @@ Page page = new Page(); page.setPageId("portal::test::foo"); TransientApplicationState<Preferences> state = new TransientApplicationState<Preferences>("web/BannerPortlet", new PreferencesBuilder().add("template", "bar").build()); - PortletApplication app = new PortletApplication(); + Application<Preferences> app = Application.createPortletApplication(); app.setState(state); page.getChildren().add(app); storage_.save(page); page = storage_.getPage(page.getPageId()); - app = (PortletApplication)page.getChildren().get(0); + app = (Application<Preferences>)page.getChildren().get(0); assertEquals("web/BannerPortlet", storage_.getId(app.getState())); } @@ -315,7 +314,7 @@ String app3Id = container.getChildren().get(1).getStorageId(); // Add an application - PortletApplication groovyApp = create("portal#test:/web/GroovyPortlet/groovyportlet"); + Application<Preferences> groovyApp = create("portal#test:/web/GroovyPortlet/groovyportlet"); ((Container)page.getChildren().get(1)).getChildren().add(1, groovyApp); // Save @@ -376,7 +375,7 @@ // Get cloned page Page clone = storage_.getPage("portal::test::_test4"); assertEquals(2, clone.getChildren().size()); - PortletApplication banner1 = (PortletApplication)clone.getChildren().get(0); + Application<Preferences> banner1 = (Application<Preferences>)clone.getChildren().get(0); ApplicationState<Preferences> instanceId = banner1.getState(); // Check instance id format @@ -393,7 +392,7 @@ // Get cloned page clone = storage_.getPage("portal::test::_test4"); assertEquals(2, clone.getChildren().size()); - banner1 = (PortletApplication)clone.getChildren().get(0); + banner1 = (Application<Preferences>)clone.getChildren().get(0); instanceId = banner1.getState(); // Check instance id format @@ -443,7 +442,7 @@ // page = storage_.getPage("portal::test::foo"); assertEquals(1, page.getChildren().size()); - PortletApplication dashboardPortlet = (PortletApplication)page.getChildren().get(0); + Application<Preferences> dashboardPortlet = (Application<Preferences>)page.getChildren().get(0); String dashboardId = dashboardPortlet.getStorageId(); assertNotNull(dashboardId); assertNotNull(dashboardPortlet.getStorageName()); @@ -452,7 +451,7 @@ // Configures the dashboard Dashboard dashboard = new Dashboard(dashboardId); TransientApplicationState<Preferences> state = new TransientApplicationState<Preferences>("foo/bar"); - PortletApplication app = new PortletApplication(); + Application<Preferences> app = Application.createPortletApplication(); app.setState(state); dashboard.getChildren().add(app); @@ -462,18 +461,18 @@ // Test that load page does not load the children page = storage_.getPage("portal::test::foo"); assertEquals(1, page.getChildren().size()); - assertTrue(page.getChildren().get(0) instanceof PortletApplication); + assertTrue(((Application)page.getChildren().get(0)).getType() == ApplicationType.PORTLET); // Now check we have the state on the dashboard dashboard = storage_.loadDashboard(dashboardId); assertEquals(1, dashboard.getChildren().size()); - app = (PortletApplication)dashboard.getChildren().get(0); + app = (Application<Preferences>)dashboard.getChildren().get(0); assertEquals("foo/bar", storage_.getId(app.getState())); } public void _testDashboardLayout() throws Exception { - PortletApplication dashboardPortlet = new PortletApplication(); + Application<Preferences> dashboardPortlet = Application.createPortletApplication(); ApplicationState<Preferences> state = new TransientApplicationState<Preferences>("dashboard/DashboardPortlet"); dashboardPortlet.setState(state); @@ -503,7 +502,7 @@ { Page page = new Page(); page.setPageId("portal::test::foo"); - PortletApplication app = new PortletApplication(); + Application<Preferences> app = Application.createPortletApplication(); app.setState(new TransientApplicationState<Preferences>("dashboard/DashboardPortlet")); page.getChildren().add(app); storage_.save(page); @@ -515,7 +514,7 @@ // Put a gadget in one container Container row0 = (Container)dashboard.getChildren().get(0); - GadgetApplication gadgetApp = new GadgetApplication(); + Application<Gadget> gadgetApp = Application.createGadgetApplication(); gadgetApp.setState(new TransientApplicationState<Gadget>("foo")); row0.getChildren().add(gadgetApp); @@ -539,7 +538,7 @@ row1 = (Container)dashboard.getChildren().get(1); assertEquals(0, row0.getChildren().size()); assertEquals(1, row1.getChildren().size()); - gadgetApp = (GadgetApplication)row1.getChildren().get(0); + gadgetApp = (Application<Gadget>)row1.getChildren().get(0); assertEquals("foo", storage_.getId(gadgetApp.getState())); } @@ -547,7 +546,7 @@ { Page page = new Page(); page.setPageId("portal::test::foo"); - PortletApplication app = new PortletApplication(); + Application<Preferences> app = Application.createPortletApplication(); app.setState(new TransientApplicationState<Preferences>("dashboard/DashboardPortlet")); page.getChildren().add(app); storage_.save(page); @@ -559,7 +558,7 @@ // Put a gadget in one container Container row1 = (Container)dashboard.getChildren().get(1); - GadgetApplication gadgetApp = new GadgetApplication(); + Application<Gadget> gadgetApp = Application.createGadgetApplication(); gadgetApp.setState(new TransientApplicationState<Gadget>("foo")); row1.getChildren().add(gadgetApp); @@ -583,11 +582,11 @@ row1 = (Container)dashboard.getChildren().get(1); assertEquals(0, row1.getChildren().size()); assertEquals(1, row0.getChildren().size()); - gadgetApp = (GadgetApplication)row0.getChildren().get(0); + gadgetApp = (Application<Gadget>)row0.getChildren().get(0); assertEquals("foo", storage_.getId(gadgetApp.getState())); } - private PortletApplication create(String instanceId) + private Application<Preferences> create(String instanceId) { int i0 = instanceId.indexOf("#"); int i1 = instanceId.indexOf(":/", i0 + 1); @@ -601,7 +600,7 @@ ownerType, ownerId, persistenceChunks[2]); - PortletApplication portletApp = new PortletApplication(); + Application<Preferences> portletApp = Application.createPortletApplication(); portletApp.setState(state); return portletApp; } Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java 2009-11-10 23:45:49 UTC (rev 554) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestGadget.java 2009-11-11 00:30:04 UTC (rev 555) @@ -20,9 +20,9 @@ package org.exoplatform.portal.config; import org.exoplatform.container.PortalContainer; +import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.TransientApplicationState; -import org.exoplatform.portal.config.model.gadget.GadgetApplication; import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.portal.pom.spi.gadget.Gadget; @@ -66,7 +66,7 @@ Gadget gadget = new Gadget(); gadget.setUserPref("user_pref"); TransientApplicationState<Gadget> state = new TransientApplicationState<Gadget>("bar", gadget); - GadgetApplication gadgetApplication = new GadgetApplication(); + Application<Gadget> gadgetApplication = Application.createGadgetApplication(); gadgetApplication.setState(state); Page container = new Page(); @@ -76,7 +76,7 @@ storage_.create(container); container = storage_.getPage("portal::test::gadget_page"); - gadgetApplication = (GadgetApplication)container.getChildren().get(0); + gadgetApplication = (Application<Gadget>)container.getChildren().get(0); gadget = storage_.load(gadgetApplication.getState()); assertNotNull(gadget); Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java 2009-11-10 23:45:49 UTC (rev 554) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestJIBXXmlMapping.java 2009-11-11 00:30:04 UTC (rev 555) @@ -20,12 +20,12 @@ package org.exoplatform.portal.config; import org.exoplatform.portal.application.PortletPreferences.PortletPreferencesSet; +import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.config.model.TransientApplicationState; import org.exoplatform.portal.config.model.Page.PageSet; -import org.exoplatform.portal.config.model.portlet.PortletApplication; import org.exoplatform.portal.pom.spi.portlet.Preferences; import org.exoplatform.portal.pom.spi.portlet.PreferencesBuilder; import org.exoplatform.test.BasicTestCase; @@ -110,8 +110,8 @@ { IBindingFactory bfact = BindingDirectory.getFactory(PortalConfig.class); IUnmarshallingContext uctx = bfact.createUnmarshallingContext(); - PortletApplication app = - (PortletApplication)uctx.unmarshalDocument(new FileInputStream( + Application<Preferences> app = + (Application<Preferences>)uctx.unmarshalDocument(new FileInputStream( "src/test/resources/jibx/portlet-application.xml"), null); TransientApplicationState portletState = (TransientApplicationState)app.getState(); assertNotNull(portletState); Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java 2009-11-10 23:45:49 UTC (rev 554) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestPortletPreferences.java 2009-11-11 00:30:04 UTC (rev 555) @@ -20,9 +20,9 @@ package org.exoplatform.portal.config; import org.exoplatform.container.PortalContainer; +import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PersistentApplicationState; -import org.exoplatform.portal.config.model.portlet.PortletApplication; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.portal.pom.spi.portlet.Preferences; import org.exoplatform.portal.pom.spi.portlet.PreferencesBuilder; @@ -65,7 +65,7 @@ public void testSiteScopedPreferences() throws Exception { Page page = storage_.getPage("portal::test::test4"); - PortletApplication app = (PortletApplication)page.getChildren().get(0); + Application<Preferences> app = (Application<Preferences>)page.getChildren().get(0); PersistentApplicationState<Preferences> state = (PersistentApplicationState)app.getState(); // Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2009-11-10 23:45:49 UTC (rev 554) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestUserPortalConfigService.java 2009-11-11 00:30:04 UTC (rev 555) @@ -23,13 +23,14 @@ import org.exoplatform.container.PortalContainer; import org.exoplatform.portal.application.PortletPreferences; +import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.ApplicationState; +import org.exoplatform.portal.config.model.ApplicationType; import org.exoplatform.portal.config.model.Container; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.PageBody; import org.exoplatform.portal.config.model.PageNavigation; import org.exoplatform.portal.config.model.PortalConfig; -import org.exoplatform.portal.config.model.portlet.PortletApplication; import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.portal.pom.spi.portlet.Preferences; @@ -607,7 +608,7 @@ assertEquals("test5", clone.getName()); // - PortletApplication app = (PortletApplication)clone.getChildren().get(0); + Application<Preferences> app = (Application<Preferences>)clone.getChildren().get(0); Preferences prefs2 = storage_.load(app.getState()); assertEquals(new PreferencesBuilder().add("template", "par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl").build(), prefs2); @@ -640,7 +641,7 @@ assertEquals(1, clone.getChildren().size()); // - PortletApplication app = (PortletApplication)clone.getChildren().get(0); + Application<Preferences> app = (Application<Preferences>)clone.getChildren().get(0); assertEquals("Dashboard", app.getTitle()); assertNotNull(app.getState()); assertEquals("dashboard/DashboardPortlet", storage_.getId(app.getState())); @@ -664,8 +665,8 @@ assertNotNull(container); assertEquals(2, container.getChildren().size()); assertTrue(container.getChildren().get(0) instanceof PageBody); - assertTrue(container.getChildren().get(1) instanceof PortletApplication); - PortletApplication pa = (PortletApplication)container.getChildren().get(1); + assertTrue(((Application)container.getChildren().get(1)).getType() == ApplicationType.PORTLET); + Application<Preferences> pa = (Application<Preferences>)container.getChildren().get(1); ApplicationState state = pa.getState(); assertEquals("overwrite_application_ref/overwrite_portlet_ref", storage_.getId(pa.getState())); } @@ -697,8 +698,8 @@ assertNotNull(container); assertEquals(2, container.getChildren().size()); assertTrue(container.getChildren().get(0) instanceof PageBody); - assertTrue(container.getChildren().get(1) instanceof PortletApplication); - PortletApplication pa = (PortletApplication)container.getChildren().get(1); + assertTrue(((Application)container.getChildren().get(1)).getType() == ApplicationType.PORTLET); + Application<Preferences> pa = (Application<Preferences>)container.getChildren().get(1); ApplicationState state = pa.getState(); assertEquals("foo/bar", storage_.getId(pa.getState())); } Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java =================================================================== --- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java 2009-11-10 23:45:49 UTC (rev 554) +++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/WSRPTest.java 2009-11-11 00:30:04 UTC (rev 555) @@ -20,9 +20,9 @@ package org.exoplatform.portal.config; import org.exoplatform.container.PortalContainer; +import org.exoplatform.portal.config.model.Application; import org.exoplatform.portal.config.model.Page; import org.exoplatform.portal.config.model.TransientApplicationState; -import org.exoplatform.portal.config.model.wsrp.WSRPApplication; import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; import org.exoplatform.portal.pom.spi.wsrp.WSRP; @@ -68,7 +68,7 @@ String id = "portlet id"; wsrp.setPortletId(id); TransientApplicationState<WSRP> state = new TransientApplicationState<WSRP>("test", wsrp); - WSRPApplication wsrpApplication = new WSRPApplication(); + Application<WSRP> wsrpApplication = Application.createWSRPApplication(); wsrpApplication.setState(state); Page container = new Page(); @@ -79,7 +79,7 @@ storage_.create(container); container = storage_.getPage(pageId); - wsrpApplication = (WSRPApplication)container.getChildren().get(0); + wsrpApplication = (Application<WSRP>)container.getChildren().get(0); wsrp = storage_.load(wsrpApplication.getState()); assertNotNull(wsrp); Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2009-11-10 23:45:49 UTC (rev 554) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/util/PortalDataMapper.java 2009-11-11 00:30:04 UTC (rev 555) @@ -29,9 +29,7 @@ import org.exoplatform.portal.config.model.PageBody; import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.config.model.SiteBody; -import org.exoplatform.portal.config.model.gadget.GadgetApplication; -import org.exoplatform.portal.config.model.portlet.PortletApplication; -import org.exoplatform.portal.config.model.wsrp.WSRPApplication; +import org.exoplatform.portal.pom.spi.gadget.Gadget; import org.exoplatform.portal.webui.application.PortletState; import org.exoplatform.portal.webui.application.UIGadget; import org.exoplatform.portal.webui.application.UIPortlet; @@ -93,9 +91,9 @@ return model; } - private static GadgetApplication toGadget(UIGadget uiGadget) + private static Application<Gadget> toGadget(UIGadget uiGadget) { - GadgetApplication app = new GadgetApplication(uiGadget.getStorageId()); + Application<Gadget> app = Application.createGadgetApplication(uiGadget.getStorageId()); app.setState(uiGadget.getState()); app.setProperties(uiGadget.getProperties()); app.setStorageName(uiGadget.getStorageName()); @@ -135,15 +133,15 @@ ApplicationType<S> type = state.getApplicationType(); if (type == ApplicationType.PORTLET) { - model = (Application<S>)new PortletApplication(uiPortlet.getStorageId()); + model = (Application<S>)Application.createPortletApplication(uiPortlet.getStorageId()); } else if (type == ApplicationType.GADGET) { - model = (Application<S>)new GadgetApplication(uiPortlet.getStorageId()); + model = (Application<S>)Application.createGadgetApplication(uiPortlet.getStorageId()); } else if (type == ApplicationType.WSRP_PORTLET) { - model = (Application<S>)new WSRPApplication(uiPortlet.getStorageId()); + model = (Application<S>)Application.createWSRPApplication(uiPortlet.getStorageId()); } else { @@ -224,7 +222,7 @@ return model; } - static public void toUIGadget(UIGadget uiGadget, GadgetApplication model) throws Exception + static public void toUIGadget(UIGadget uiGadget, Application<Gadget> model) throws Exception { uiGadget.setProperties(model.getProperties()); uiGadget.setState(model.getState()); @@ -395,9 +393,9 @@ { Application application = (Application)model; - if (dashboard && application instanceof GadgetApplication) + if (dashboard && application.getType() == ApplicationType.GADGET) { - GadgetApplication ga = (GadgetApplication)application; + Application<Gadget> ga = (Application<Gadget>)application; UIGadget uiGadget = uiContainer.createUIComponent(context, UIGadget.class, null, null); uiGadget.setStorageId(application.getStorageId()); toUIGadget(uiGadget, ga);