JBoss Portal SVN: r10419 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-30 20:55:17 -0400 (Sun, 30 Mar 2008)
New Revision: 10419
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.2.1. *-object.xml Descriptors
revising, adding content...
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-29 12:13:39 UTC (rev 10418)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-31 00:55:17 UTC (rev 10419)
@@ -1046,7 +1046,7 @@
<programlisting><![CDATA[<window-name>...</window-name>]]></programlisting>
</para>
<para>
- A <emphasis role="bold">unique name</emphasis> given to the portlet window. This can be named anything.
+ The <computeroutput><window-name></computeroutput> element defines the <emphasis role="bold">unique name</emphasis> given to a portlet window. This can be named anything.
</para>
</listitem>
<listitem>
@@ -1054,7 +1054,7 @@
<programlisting><![CDATA[<instance-ref>...</instance-ref>]]></programlisting>
</para>
<para>
- The portlet instance that the window will represent. This value is the ID of a portlet instance, and must match the value of one of the <computeroutput><instance-id></computeroutput> elements in the <filename>WEB-INF/portlet-instances.xml</filename> file.
+ The <computeroutput><instance-ref></computeroutput> elements defines the portlet instances that windows represent. This value is the ID of a portlet instance, and must match the value of one of the <computeroutput><instance-id></computeroutput> elements in the <filename>WEB-INF/portlet-instances.xml</filename> file.
</para>
</listitem>
<listitem>
@@ -1064,13 +1064,14 @@
<height>...</height>]]></programlisting>
</para>
<para>
- Specifies where the window will appear within the page layout. The <computeroutput><region></computeroutput> element specifies where the window will appear on the page. The <computeroutput><region></computeroutput> element often depends on other regions defined in the portal layout. The <computeroutput><height></computeroutput> element can be assigned a value between one and <replaceable>X</replaceable>.
+ The <computeroutput><region></computeroutput> and <computeroutput><height></computeroutput> elements define where the window appears within the page layout. The <computeroutput><region></computeroutput> element specifies where the window appears on the page. The <computeroutput><region></computeroutput> element often depends on other regions defined in the portal layout. The <computeroutput><height></computeroutput> element can be assigned a value between one and <replaceable>X</replaceable>.
</para>
</listitem>
</itemizedlist>
</para>
- <para>The example *-object.xml, above, makes reference to items found in other descriptor files. To
- help with this topic, we have included a sample image that depicts the relationship:
+ <para>The previous <filename>*-object.xml</filename> example makes reference to items found in other descriptor files. The following diagram illustrates the relationship between the <filename>portlet.xml</filename>, <filename>portlet-instances.xml</filename>, and <filename>helloworld-object.xml</filename> descriptors:
+ </para>
+ <para>
<mediaobject>
<imageobject>
<imagedata align="center" fileref="images/tutorials/first_portlet/desc_relationship.gif"
@@ -1078,7 +1079,6 @@
</imageobject>
</mediaobject>
</para>
-
<para>
<note>
<title>Are <filename>*-object.xml</filename> descriptors necessary?</title>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10418 - in modules/web/tags/JBP_WEB_1_2_0_BETA3: build and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-29 08:13:39 -0400 (Sat, 29 Mar 2008)
New Revision: 10418
Modified:
modules/web/tags/JBP_WEB_1_2_0_BETA3/build/pom.xml
modules/web/tags/JBP_WEB_1_2_0_BETA3/pom.xml
modules/web/tags/JBP_WEB_1_2_0_BETA3/web/pom.xml
Log:
updating web module poms to 1.2.0.Beta3 and consume non snapshot artifacts
Modified: modules/web/tags/JBP_WEB_1_2_0_BETA3/build/pom.xml
===================================================================
--- modules/web/tags/JBP_WEB_1_2_0_BETA3/build/pom.xml 2008-03-29 11:54:17 UTC (rev 10417)
+++ modules/web/tags/JBP_WEB_1_2_0_BETA3/build/pom.xml 2008-03-29 12:13:39 UTC (rev 10418)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.web</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0.Beta3</version>
<packaging>pom</packaging>
<name>JBoss Portal Test Module</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -30,7 +30,7 @@
<version.apache.tomcat>5.5.12</version.apache.tomcat>
<version.jboss-logging>2.0.3.GA</version.jboss-logging>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common>
+ <version.jboss.portal.common>1.2.0.Beta3</version.jboss.portal.common>
<version.jboss.unit>1.2.0.Beta2</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
Modified: modules/web/tags/JBP_WEB_1_2_0_BETA3/pom.xml
===================================================================
--- modules/web/tags/JBP_WEB_1_2_0_BETA3/pom.xml 2008-03-29 11:54:17 UTC (rev 10417)
+++ modules/web/tags/JBP_WEB_1_2_0_BETA3/pom.xml 2008-03-29 12:13:39 UTC (rev 10418)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Web Module</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0.Beta3</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/web/tags/JBP_WEB_1_2_0_BETA3/web/pom.xml
===================================================================
--- modules/web/tags/JBP_WEB_1_2_0_BETA3/web/pom.xml 2008-03-29 11:54:17 UTC (rev 10417)
+++ modules/web/tags/JBP_WEB_1_2_0_BETA3/web/pom.xml 2008-03-29 12:13:39 UTC (rev 10418)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.web</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0.Beta3</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10417 - modules/web/tags.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-29 07:54:17 -0400 (Sat, 29 Mar 2008)
New Revision: 10417
Added:
modules/web/tags/JBP_WEB_1_2_0_BETA3/
Log:
tagging web module 1.2.0.Beta3
Copied: modules/web/tags/JBP_WEB_1_2_0_BETA3 (from rev 10416, modules/web/trunk)
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10416 - in modules/common/tags/JBP_COMMON_1_2_0_BETA3: build and 3 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-29 07:53:13 -0400 (Sat, 29 Mar 2008)
New Revision: 10416
Modified:
modules/common/tags/JBP_COMMON_1_2_0_BETA3/build/pom.xml
modules/common/tags/JBP_COMMON_1_2_0_BETA3/common/pom.xml
modules/common/tags/JBP_COMMON_1_2_0_BETA3/mc/pom.xml
modules/common/tags/JBP_COMMON_1_2_0_BETA3/pom.xml
modules/common/tags/JBP_COMMON_1_2_0_BETA3/portal/pom.xml
Log:
updating poms to 1.2.0.Beta3
Modified: modules/common/tags/JBP_COMMON_1_2_0_BETA3/build/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_0_BETA3/build/pom.xml 2008-03-29 11:44:13 UTC (rev 10415)
+++ modules/common/tags/JBP_COMMON_1_2_0_BETA3/build/pom.xml 2008-03-29 11:53:13 UTC (rev 10416)
@@ -10,7 +10,7 @@
<artifactId>module-parent</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0.Beta3</version>
<url>http://labs.jboss.com/jbossportal</url>
<properties>
Modified: modules/common/tags/JBP_COMMON_1_2_0_BETA3/common/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_0_BETA3/common/pom.xml 2008-03-29 11:44:13 UTC (rev 10415)
+++ modules/common/tags/JBP_COMMON_1_2_0_BETA3/common/pom.xml 2008-03-29 11:53:13 UTC (rev 10416)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0.Beta3</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/common/tags/JBP_COMMON_1_2_0_BETA3/mc/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_0_BETA3/mc/pom.xml 2008-03-29 11:44:13 UTC (rev 10415)
+++ modules/common/tags/JBP_COMMON_1_2_0_BETA3/mc/pom.xml 2008-03-29 11:53:13 UTC (rev 10416)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0.Beta3</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/common/tags/JBP_COMMON_1_2_0_BETA3/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_0_BETA3/pom.xml 2008-03-29 11:44:13 UTC (rev 10415)
+++ modules/common/tags/JBP_COMMON_1_2_0_BETA3/pom.xml 2008-03-29 11:53:13 UTC (rev 10416)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common (aggregator)</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0.Beta3</version>
<distributionManagement>
<repository>
Modified: modules/common/tags/JBP_COMMON_1_2_0_BETA3/portal/pom.xml
===================================================================
--- modules/common/tags/JBP_COMMON_1_2_0_BETA3/portal/pom.xml 2008-03-29 11:44:13 UTC (rev 10415)
+++ modules/common/tags/JBP_COMMON_1_2_0_BETA3/portal/pom.xml 2008-03-29 11:53:13 UTC (rev 10416)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.0.Beta3</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10415 - modules/common/tags.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-29 07:44:13 -0400 (Sat, 29 Mar 2008)
New Revision: 10415
Added:
modules/common/tags/JBP_COMMON_1_2_0_BETA3/
Log:
tagging 1.2.0.Beta3
Copied: modules/common/tags/JBP_COMMON_1_2_0_BETA3 (from rev 10414, modules/common/trunk)
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10414 - in branches/JBoss_Portal_2_6_4_JBPB: core/src/resources/portal-core-war/WEB-INF/jsp/content and 1 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-03-28 22:47:23 -0400 (Fri, 28 Mar 2008)
New Revision: 10414
Modified:
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml
branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
admin portlet migration
Modified: branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-03-29 02:15:13 UTC (rev 10413)
+++ branches/JBoss_Portal_2_6_4_JBPB/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-03-29 02:47:23 UTC (rev 10414)
@@ -103,7 +103,6 @@
protected void getContent(RenderRequest req, RenderResponse resp, boolean newContent) throws PortletException, PortletSecurityException, IOException
{
String selectedURI = req.getParameter("content.uri");
- System.out.println("--getContent------------" + req.getParameter("content.uri"));
//
PortletURL actionURL = resp.createActionURL();
Modified: branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-29 02:15:13 UTC (rev 10413)
+++ branches/JBoss_Portal_2_6_4_JBPB/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-29 02:47:23 UTC (rev 10414)
@@ -142,7 +142,7 @@
<td >
<img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/>
<span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a href="<%= test %>" id="portlet-instance-link"><%= displayName %></a></span>
- w-<%=test%></td>
+ </td>
</tr>
<%
}
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml 2008-03-29 02:15:13 UTC (rev 10413)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml 2008-03-29 02:47:23 UTC (rev 10414)
@@ -24,7 +24,7 @@
<br/>
<div class="portlet-msg">
- <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div>
+ <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt=""/></div>
<div class="portlet-msg-body">
<h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10413 - in branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war: WEB-INF and 2 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-03-28 22:15:13 -0400 (Fri, 28 Mar 2008)
New Revision: 10413
Added:
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/
Removed:
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/
Modified:
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml
branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml
Log:
admin portlet migration
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-03-29 01:04:13 UTC (rev 10412)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-03-29 02:15:13 UTC (rev 10413)
@@ -394,105 +394,105 @@
<navigation-rule>
<navigation-case>
<from-outcome>index</from-outcome>
- <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id>
+ <to-view-id>/jsf/objects.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>advancedMode</from-outcome>
- <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id>
+ <to-view-id>/jsf/objects.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>wizardMode</from-outcome>
- <to-view-id>/WEB-INF/jsf/wizard/selectPortlet.xhtml</to-view-id>
+ <to-view-id>/jsf/wizard/selectPortlet.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>objects</from-outcome>
- <to-view-id>/WEB-INF/jsf/objects.xhtml</to-view-id>
+ <to-view-id>/jsf/objects.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editPortalSecurity</from-outcome>
- <to-view-id>/WEB-INF/jsf/editPortalSecurity.xhtml</to-view-id>
+ <to-view-id>/jsf/editPortalSecurity.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editPortalTheme</from-outcome>
- <to-view-id>/WEB-INF/jsf/editPortalTheme.xhtml</to-view-id>
+ <to-view-id>/jsf/editPortalTheme.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editPageLayout</from-outcome>
- <to-view-id>/WEB-INF/jsf/editPageLayout.xhtml</to-view-id>
+ <to-view-id>/jsf/editPageLayout.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editPageSecurity</from-outcome>
- <to-view-id>/WEB-INF/jsf/editPageSecurity.xhtml</to-view-id>
+ <to-view-id>/jsf/editPageSecurity.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editProperties</from-outcome>
- <to-view-id>/WEB-INF/jsf/editProperties.xhtml</to-view-id>
+ <to-view-id>/jsf/editProperties.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editPageTheme</from-outcome>
- <to-view-id>/WEB-INF/jsf/editPageTheme.xhtml</to-view-id>
+ <to-view-id>/jsf/editPageTheme.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editWindowSecurity</from-outcome>
- <to-view-id>/WEB-INF/jsf/editWindowSecurity.xhtml</to-view-id>
+ <to-view-id>/jsf/editWindowSecurity.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>renameObject</from-outcome>
- <to-view-id>/WEB-INF/jsf/renameObject.xhtml</to-view-id>
+ <to-view-id>/jsf/renameObject.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editDisplayNames</from-outcome>
- <to-view-id>/WEB-INF/jsf/displayNameObject.xhtml</to-view-id>
+ <to-view-id>/jsf/displayNameObject.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>editWindowTheme</from-outcome>
- <to-view-id>/WEB-INF/jsf/editWindowTheme.xhtml</to-view-id>
+ <to-view-id>/jsf/editWindowTheme.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>instances</from-outcome>
- <to-view-id>/WEB-INF/jsf/instances.xhtml</to-view-id>
+ <to-view-id>/jsf/instances.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>portlets</from-outcome>
- <to-view-id>/WEB-INF/jsf/portlets.xhtml</to-view-id>
+ <to-view-id>/jsf/portlets.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>selectPortlet</from-outcome>
- <to-view-id>/WEB-INF/jsf/wizard/selectPortlet.xhtml</to-view-id>
+ <to-view-id>/jsf/wizard/selectPortlet.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>selectPortal</from-outcome>
- <to-view-id>/WEB-INF/jsf/wizard/selectPortal.xhtml</to-view-id>
+ <to-view-id>/jsf/wizard/selectPortal.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>selectPage</from-outcome>
- <to-view-id>/WEB-INF/jsf/wizard/selectPage.xhtml</to-view-id>
+ <to-view-id>/jsf/wizard/selectPage.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>selectRegion</from-outcome>
- <to-view-id>/WEB-INF/jsf/wizard/selectRegion.xhtml</to-view-id>
+ <to-view-id>/jsf/wizard/selectRegion.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>newWindowWizardConfirm</from-outcome>
- <to-view-id>/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml</to-view-id>
+ <to-view-id>/jsf/wizard/newWindowWizardConfirm.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>dashboards</from-outcome>
- <to-view-id>/WEB-INF/jsf/dashboards.xhtml</to-view-id>
+ <to-view-id>/jsf/dashboards.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>dashboard</from-outcome>
- <to-view-id>/WEB-INF/jsf/dashboard/dashboard.xhtml</to-view-id>
+ <to-view-id>/jsf/dashboard/dashboard.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>confirm</from-outcome>
- <to-view-id>/WEB-INF/jsf/common/confirm.xhtml</to-view-id>
+ <to-view-id>/jsf/common/confirm.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>confirmDeleteInstance</from-outcome>
- <to-view-id>/WEB-INF/jsf/confirmDeleteInstance.xhtml</to-view-id>
+ <to-view-id>/jsf/confirmDeleteInstance.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-03-29 01:04:13 UTC (rev 10412)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-03-29 02:15:13 UTC (rev 10413)
@@ -34,7 +34,7 @@
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
- <value>/WEB-INF/jsf/objects.xhtml</value>
+ <value>/jsf/objects.xhtml</value>
</init-param>
<init-param>
<name>javax.portlet.faces.preserveActionParams</name>
@@ -56,7 +56,7 @@
<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
<init-param>
<name>javax.portlet.faces.defaultViewId.view</name>
- <value>/WEB-INF/jsf/dashboard/dashboard.xhtml</value>
+ <value>/jsf/dashboard/dashboard.xhtml</value>
</init-param>
<init-param>
<name>javax.portlet.faces.preserveActionParams</name>
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-03-29 01:04:13 UTC (rev 10412)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-03-29 02:15:13 UTC (rev 10413)
@@ -35,7 +35,7 @@
<context-param>
<param-name>javax.portlet.faces.renderPolicy</param-name>
- <param-value>DEFAULT</param-value>
+ <param-value>ALWAYS_DELEGATE</param-value>
</context-param>
<context-param>
Copied: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf (from rev 10412, branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf)
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2008-03-29 01:04:13 UTC (rev 10412)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2008-03-29 02:15:13 UTC (rev 10413)
@@ -132,7 +132,7 @@
<tr>
<td>
<div class="admin-ui">
- <ui:include src="/WEB-INF/jsf/common/editPageLayout.xhtml">
+ <ui:include src="/jsf/common/editPageLayout.xhtml">
<ui:param name="pageManager" value="#{dashboard.pageManager}"/>
</ui:include>
</div>
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2008-03-29 01:04:13 UTC (rev 10412)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2008-03-29 02:15:13 UTC (rev 10413)
@@ -4,7 +4,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
- <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
+ <ui:composition template="/jsf/objectTemplate.xhtml">
<ui:param name="portalObjectScreen" value="Display Names"/>
<ui:define name="content">
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2008-03-29 01:04:13 UTC (rev 10412)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2008-03-29 02:15:13 UTC (rev 10413)
@@ -7,7 +7,7 @@
<ui:param name="portalObjectScreen" value="Security"/>
<ui:define name="content">
<h3>Please set the page permissions</h3>
- <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
+ <ui:decorate template="/jsf/common/editSecurity.xhtml">
<ui:param name="auth" value="#{portalobjectmgr.auth}"/>
</ui:decorate>
</ui:define>
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2008-03-29 01:04:13 UTC (rev 10412)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2008-03-29 02:15:13 UTC (rev 10413)
@@ -3,11 +3,11 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
- <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
+ <ui:composition template="/jsf/objectTemplate.xhtml">
<ui:param name="portalObjectScreen" value="Security"/>
<ui:define name="content">
<h3>Please set the portal permissions</h3>
- <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
+ <ui:decorate template="/jsf/common/editSecurity.xhtml">
<ui:param name="auth" value="#{portalobjectmgr.auth}"/>
</ui:decorate>
</ui:define>
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2008-03-29 01:04:13 UTC (rev 10412)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-03-29 02:15:13 UTC (rev 10413)
@@ -142,7 +142,7 @@
</h:form>
<br/>
<div class="property-container">
- <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml">
+ <ui:decorate template="/jsf/common/editSecurity.xhtml">
<ui:param name="auth" value="#{instancemgr.auth}"/>
</ui:decorate>
</div>
Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml
===================================================================
--- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2008-03-29 01:04:13 UTC (rev 10412)
+++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-03-29 02:15:13 UTC (rev 10413)
@@ -4,7 +4,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jstl/core">
- <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml">
+ <ui:composition template="/jsf/objectTemplate.xhtml">
<ui:param name="portalObjectScreen" value="Rename"/>
<ui:define name="content">
<h3>Rename #{portalobjectmgr.selectedObjectType}</h3>
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10412 - in branches/presentation/presentation/src/main/org/jboss/portal/presentation: impl/model2/diff and 5 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-28 21:04:13 -0400 (Fri, 28 Mar 2008)
New Revision: 10412
Added:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/ui/
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIAction.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIContainer.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIContext.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIObject.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIWindow.java
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/CreateDiffPhase.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/ObjectVisit.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/CreateUpdatePhase.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/ObjectUpdate.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortScope.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/CustomScope.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/UIObjectNode.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/UIObjectTree.java
Log:
move differnet obejct subclasses to a ui package for better visibility
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/CreateDiffPhase.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/CreateDiffPhase.java 2008-03-29 01:00:35 UTC (rev 10411)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/CreateDiffPhase.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -25,7 +25,7 @@
import org.jboss.portal.presentation.model2.ViewPortScope;
import org.jboss.portal.presentation.model2.ViewPortContext;
import org.jboss.portal.presentation.model2.ObjectTraversalType;
-import org.jboss.portal.presentation.impl.model2.UIObjectImpl;
+import org.jboss.portal.presentation.impl.model2.ui.UIObjectImpl;
import org.jboss.portal.presentation.model.state.structural.StructuralStateContext;
import org.jboss.portal.presentation.model.state.structural.StructuralObject;
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/ObjectVisit.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/ObjectVisit.java 2008-03-29 01:00:35 UTC (rev 10411)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/diff/ObjectVisit.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.presentation.impl.model2.diff;
-import org.jboss.portal.presentation.impl.model2.UIObjectImpl;
+import org.jboss.portal.presentation.impl.model2.ui.UIObjectImpl;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java (from rev 10406, branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java)
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/ui/UIObjectImpl.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -0,0 +1,110 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.impl.model2.ui;
+
+import org.jboss.portal.presentation.model2.ui.UIObject;
+import org.jboss.portal.presentation.model.state.StateException;
+import org.jboss.portal.presentation.model.state.structural.StructuralObject;
+import org.jboss.portal.presentation.impl.model2.UIObjectRef;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class UIObjectImpl implements UIObject
+{
+
+ /** . */
+ public StructuralObject structuralObject;
+
+ /** We keep track of what was loaded by the scope. */
+ public Map<String, UIObjectRef> childRefs;
+
+ public UIObjectImpl(StructuralObject structuralObject)
+ {
+ this.structuralObject = structuralObject;
+ }
+
+ public String getId()
+ {
+ return structuralObject.getId();
+ }
+
+ public String getName()
+ {
+ return structuralObject.getState().getName();
+ }
+
+ public <T> T getProperty(String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException
+ {
+ return safeCast(getProperty(propertyName), propertyType);
+ }
+
+ public Set<String> getPropertyNames()
+ {
+ return structuralObject.getState().getProperties().keySet();
+ }
+
+ public Object getProperty(String propertyName) throws IllegalArgumentException, StateException
+ {
+ if (propertyName == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ return structuralObject.getState().getProperties().get(propertyName);
+ }
+
+ /**
+ * Attempt to cast the value argument to the provided type argument. If the value argument type is assignable
+ * to the provided type, the value is returned, otherwise if it is not or the value is null, null is returned.
+ *
+ * @param value the value to cast
+ * @param type the type to downcast
+ * @return the casted value or null
+ */
+ private <T> T safeCast(Object value, Class<T> type)
+ {
+ if (type == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (value == null)
+ {
+ return null;
+ }
+ else
+ {
+ if (type.isAssignableFrom(value.getClass()))
+ {
+ return type.cast(value);
+ }
+ else
+ {
+ return null;
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/CreateUpdatePhase.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/CreateUpdatePhase.java 2008-03-29 01:00:35 UTC (rev 10411)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/CreateUpdatePhase.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -25,7 +25,7 @@
import org.jboss.portal.presentation.model2.ViewPortContext;
import org.jboss.portal.presentation.impl.model2.diff.ObjectVisit;
import org.jboss.portal.presentation.impl.model2.diff.ChildrenVisit;
-import org.jboss.portal.presentation.impl.model2.UIObjectImpl;
+import org.jboss.portal.presentation.impl.model2.ui.UIObjectImpl;
import org.jboss.portal.presentation.impl.model2.UIObjectRef;
import java.util.List;
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/ObjectUpdate.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/ObjectUpdate.java 2008-03-29 01:00:35 UTC (rev 10411)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/impl/model2/update/ObjectUpdate.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.presentation.impl.model2.update;
-import org.jboss.portal.presentation.impl.model2.UIObjectImpl;
+import org.jboss.portal.presentation.impl.model2.ui.UIObjectImpl;
import org.jboss.portal.presentation.impl.model2.UIObjectRef;
import org.jboss.portal.presentation.model2.ViewPortContext;
import org.jboss.portal.presentation.model.state.structural.StructuralObject;
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java 2008-03-29 01:00:35 UTC (rev 10411)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.presentation.model2;
+import org.jboss.portal.presentation.model2.ui.UIObject;
+
/**
* This interface defines read-write access to the structural information of a viewport.
*
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortScope.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortScope.java 2008-03-29 01:00:35 UTC (rev 10411)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortScope.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.presentation.model2;
+import org.jboss.portal.presentation.model2.ui.UIObject;
+
/**
* Defines the scope of a viewport. This interface is separated from the viewport context in order to
* really affirm the split between the concern between the scope implementation that is used by the viewport
Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIAction.java (from rev 10411, branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIAction.java)
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIAction.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIAction.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -0,0 +1,57 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model2.ui;
+
+import org.jboss.portal.presentation.model.UIObject;
+
+/**
+ * An action that can be triggered.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public interface UIAction extends UIObject
+{
+
+ /**
+ * Returns the action display name.
+ *
+ * @return the display name
+ */
+ String getDisplayName();
+
+ /**
+ * Returns the action icon URL.
+ *
+ * @return the icon URL
+ */
+ String getIconURL();
+
+ /**
+ * Returns the action URL.
+ *
+ * @return the url
+ */
+ String getURL();
+
+}
\ No newline at end of file
Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIContainer.java (from rev 10411, branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIContainer.java)
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIContainer.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIContainer.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model2.ui;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface UIContainer extends UIObject
+{
+}
\ No newline at end of file
Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIContext.java (from rev 10411, branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIContext.java)
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIContext.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIContext.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model2.ui;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface UIContext extends UIObject
+{
+}
\ No newline at end of file
Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIObject.java (from rev 10410, branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIObject.java)
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIObject.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIObject.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -0,0 +1,70 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model2.ui;
+
+import org.jboss.portal.presentation.model.state.StateException;
+
+import java.util.Set;
+
+/**
+ * A wrapper of a structural object. The main goal of this object is to let the viewport add custom payload
+ * in addition of the structural state.
+ *
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public interface UIObject
+{
+
+ /**
+ * Returns the id.
+ *
+ * @return the id
+ */
+ String getId();
+
+ /**
+ * Returns the name.
+ *
+ * @return the name
+ */
+ String getName();
+
+ /**
+ * Returns a property value or null if it does not exist.
+ *
+ * @param propertyName the property name
+ * @param propertyType the expected property type
+ * @return the property value
+ * @throws IllegalArgumentException if any argument is null or not valid
+ * @throws org.jboss.portal.presentation.model.state.StateException any state exception
+ */
+ <T> T getProperty(String propertyName, Class<T> propertyType) throws IllegalArgumentException, StateException;
+
+ /**
+ * Returns the set of property names of this object
+ *
+ * @return the property names
+ */
+ Set<String> getPropertyNames();
+}
Copied: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIWindow.java (from rev 10411, branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIWindow.java)
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIWindow.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ui/UIWindow.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -0,0 +1,61 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model2.ui;
+
+import org.jboss.portal.WindowState;
+import org.jboss.portal.Mode;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface UIWindow extends UIObject
+{
+ /**
+ * Returns the window state of the window or null if it does not exist.
+ *
+ * @return the window state
+ */
+ WindowState getWindowState();
+
+ /**
+ * Update the window state of the window.
+ *
+ * @param windowState the new window state
+ */
+ void setWindowState(WindowState windowState);
+
+ /**
+ * Returns the mode of the window or null if it does not exist.
+ *
+ * @return the mode
+ */
+ Mode getMode();
+
+ /**
+ * Update the mode of the window.
+ *
+ * @param mode the new mode
+ */
+ void setMode(Mode mode);
+}
\ No newline at end of file
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/CustomScope.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/CustomScope.java 2008-03-29 01:00:35 UTC (rev 10411)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/CustomScope.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -24,7 +24,7 @@
import org.jboss.portal.presentation.model2.ViewPortScope;
import org.jboss.portal.presentation.model2.ObjectTraversalType;
-import org.jboss.portal.presentation.model2.UIObject;
+import org.jboss.portal.presentation.model2.ui.UIObject;
import org.jboss.portal.presentation.model2.UIModel;
/**
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/UIObjectNode.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-03-29 01:00:35 UTC (rev 10411)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/UIObjectNode.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.presentation.test.model3;
-import org.jboss.portal.presentation.model2.UIObject;
+import org.jboss.portal.presentation.model2.ui.UIObject;
import java.util.Map;
import java.util.HashMap;
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/UIObjectTree.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/UIObjectTree.java 2008-03-29 01:00:35 UTC (rev 10411)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/test/model3/UIObjectTree.java 2008-03-29 01:04:13 UTC (rev 10412)
@@ -23,7 +23,7 @@
package org.jboss.portal.presentation.test.model3;
import org.jboss.portal.presentation.model2.ViewPortContext;
-import org.jboss.portal.presentation.model2.UIObject;
+import org.jboss.portal.presentation.model2.ui.UIObject;
import java.util.Map;
import java.util.HashMap;
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10411 - branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-28 21:00:35 -0400 (Fri, 28 Mar 2008)
New Revision: 10411
Added:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIAction.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIContainer.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIContext.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIPage.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIWindow.java
Log:
added usual uiobject subclasses
Added: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIAction.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIAction.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIAction.java 2008-03-29 01:00:35 UTC (rev 10411)
@@ -0,0 +1,57 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model2;
+
+import org.jboss.portal.presentation.model.UIObject;
+
+/**
+ * An action that can be triggered.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public interface UIAction extends UIObject
+{
+
+ /**
+ * Returns the action display name.
+ *
+ * @return the display name
+ */
+ String getDisplayName();
+
+ /**
+ * Returns the action icon URL.
+ *
+ * @return the icon URL
+ */
+ String getIconURL();
+
+ /**
+ * Returns the action URL.
+ *
+ * @return the url
+ */
+ String getURL();
+
+}
\ No newline at end of file
Added: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIContainer.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIContainer.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIContainer.java 2008-03-29 01:00:35 UTC (rev 10411)
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model2;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface UIContainer extends UIObject
+{
+}
\ No newline at end of file
Added: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIContext.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIContext.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIContext.java 2008-03-29 01:00:35 UTC (rev 10411)
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model2;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface UIContext extends UIObject
+{
+}
\ No newline at end of file
Added: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIPage.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIPage.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIPage.java 2008-03-29 01:00:35 UTC (rev 10411)
@@ -0,0 +1,33 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model2;
+
+import org.jboss.portal.presentation.model.UIObject;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface UIPage extends UIObject
+{
+}
\ No newline at end of file
Added: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIWindow.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIWindow.java (rev 0)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIWindow.java 2008-03-29 01:00:35 UTC (rev 10411)
@@ -0,0 +1,61 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model2;
+
+import org.jboss.portal.WindowState;
+import org.jboss.portal.Mode;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface UIWindow extends UIObject
+{
+ /**
+ * Returns the window state of the window or null if it does not exist.
+ *
+ * @return the window state
+ */
+ WindowState getWindowState();
+
+ /**
+ * Update the window state of the window.
+ *
+ * @param windowState the new window state
+ */
+ void setWindowState(WindowState windowState);
+
+ /**
+ * Returns the mode of the window or null if it does not exist.
+ *
+ * @return the mode
+ */
+ Mode getMode();
+
+ /**
+ * Update the mode of the window.
+ *
+ * @param mode the new mode
+ */
+ void setMode(Mode mode);
+}
\ No newline at end of file
16 years, 1 month
- 1
- 0
JBoss Portal SVN: r10410 - branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-28 17:23:51 -0400 (Fri, 28 Mar 2008)
New Revision: 10410
Modified:
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIModel.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIObject.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPort.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java
branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortScope.java
Log:
javadoc for new model impl
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIModel.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIModel.java 2008-03-28 20:57:24 UTC (rev 10409)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIModel.java 2008-03-28 21:23:51 UTC (rev 10410)
@@ -23,14 +23,28 @@
package org.jboss.portal.presentation.model2;
/**
+ * The user interface model
+ *
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
public interface UIModel
{
+ /**
+ * The root id of the model.
+ *
+ * @return the root id
+ */
String getRootId();
+ /**
+ * Creates a viewport from the specified context and scope.
+ *
+ * @param context the context
+ * @param scope the scope
+ * @return the viewport
+ */
ViewPort createViewPort(ViewPortContext context, ViewPortScope scope);
}
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIObject.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIObject.java 2008-03-28 20:57:24 UTC (rev 10409)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/UIObject.java 2008-03-28 21:23:51 UTC (rev 10410)
@@ -27,6 +27,9 @@
import java.util.Set;
/**
+ * A wrapper of a structural object. The main goal of this object is to let the viewport add custom payload
+ * in addition of the structural state.
+ *
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPort.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPort.java 2008-03-28 20:57:24 UTC (rev 10409)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPort.java 2008-03-28 21:23:51 UTC (rev 10410)
@@ -23,6 +23,11 @@
package org.jboss.portal.presentation.model2;
/**
+ * A viewport is a view of a subset of the structural state presented by the structural state context.
+ * It does not provide access to the information but rather provides a way to populate a viewport context
+ * using a viewport scope because the presentation client implementation is the party responsible for
+ * defining the scope of the view port as well as the storage of the viewport informations.
+ *
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
@@ -30,7 +35,11 @@
{
/**
- * Performs a refresh operation.
+ * Performs a refresh operation. The viewport uses the viewport scope object to navigate the structural
+ * state and perform updates to the viewport scope. If the viewport context is not yet populated, the
+ * refresh operation populates the context with the viewport defined the viewport scope. If the viewport
+ * already contains structural information then the viewport proceeds to a merge of the actual state held
+ * by the viewport context and the refreshed state provided by the structural state context.
*/
void refresh();
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java 2008-03-28 20:57:24 UTC (rev 10409)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortContext.java 2008-03-28 21:23:51 UTC (rev 10410)
@@ -23,26 +23,73 @@
package org.jboss.portal.presentation.model2;
/**
+ * This interface defines read-write access to the structural information of a viewport.
+ *
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
public interface ViewPortContext
{
+ /**
+ * Returns the specified object or null if it does not exist
+ *
+ * @param objectId the object id
+ * @return the specified object
+ */
UIObject getObject(String objectId);
- void removeObject(String objectId);
+ /**
+ * Populate the context with the specified object.
+ *
+ * @param object the object
+ */
+ void addObject(UIObject object);
+ /**
+ * Signals the context that the object state has been updated.
+ *
+ * @param objectId the object id
+ */
void updateObject(String objectId);
- void addObject(UIObject object);
+ /**
+ * Removes the specified object from the context.
+ *
+ * @param objectId the object id
+ */
+ void removeObject(String objectId);
+ /**
+ * Initialize the children of a specified object.
+ *
+ * @param parentId the object id
+ */
void createChildren(String parentId);
+ /**
+ * Destroys the children of a specified object.
+ *
+ * @param parentId the object id
+ */
void destroyChildren(String parentId);
+ /**
+ * Create a relationship between a parent and one of its children. When this callback occurs the context
+ * should already be populated with the specified parent object and child object.
+ *
+ * @param parentId the parent id
+ * @param childId the child id
+ */
void addChild(String parentId, String childId);
+ /**
+ * Destroys a relationship between a parent and one of its children. When this callback occurs the context
+ * should be populated with the specified parent object and child object.
+ *
+ * @param parentId the parent id
+ * @param childId the child id
+ */
void removeChild(String parentId, String childId);
}
Modified: branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortScope.java
===================================================================
--- branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortScope.java 2008-03-28 20:57:24 UTC (rev 10409)
+++ branches/presentation/presentation/src/main/org/jboss/portal/presentation/model2/ViewPortScope.java 2008-03-28 21:23:51 UTC (rev 10410)
@@ -23,6 +23,10 @@
package org.jboss.portal.presentation.model2;
/**
+ * Defines the scope of a viewport. This interface is separated from the viewport context in order to
+ * really affirm the split between the concern between the scope implementation that is used by the viewport
+ * to populate the viewport context during a refresh operation.
+ *
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
@@ -44,7 +48,8 @@
ObjectTraversalType enterObject(UIObject object);
/**
- * Callback to signal that an object visit is terminated
+ * Callback to signal that an object visit is terminated. It can be used by the scope to maintain a data
+ * structure of the traversed model.
*
* @param object the object
*/
16 years, 1 month
- 1
- 0