You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2005/08/17 20:04:11 UTC
svn commit: r233224 - in
/portals/jetspeed-2/trunk/components/page-manager/src/java:
JETSPEED-INF/castor/ org/apache/jetspeed/om/page/psml/
Author: weaver
Date: Wed Aug 17 11:04:08 2005
New Revision: 233224
URL: http://svn.apache.org/viewcvs?rev=233224&view=rev
Log:
- Extracted Defaults into an interface.
- Added ability to access Defaults from the Page interface
Added:
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/DefaultsImpl.java
- copied, changed from r232284, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Defaults.java
Removed:
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Defaults.java
Modified:
portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml?rev=233224&r1=233223&r2=233224&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml Wed Aug 17 11:04:08 2005
@@ -25,7 +25,7 @@
</field>
<field name="defaults"
- type="org.apache.jetspeed.om.page.psml.Defaults">
+ type="org.apache.jetspeed.om.page.psml.DefaultsImpl">
<bind-xml name="defaults"/>
</field>
@@ -356,7 +356,7 @@
</field>
</class>
- <class name="org.apache.jetspeed.om.page.psml.Defaults">
+ <class name="org.apache.jetspeed.om.page.psml.DefaultsImpl">
<map-to xml="defaults"/>
<field name="skin" type="java.lang.String">
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java?rev=233224&r1=233223&r2=233224&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java Wed Aug 17 11:04:08 2005
@@ -1,14 +1,15 @@
package org.apache.jetspeed.om.page.psml;
import java.util.HashMap;
-import java.util.Locale;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.ContentPage;
+import org.apache.jetspeed.om.page.Defaults;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.document.Node;
@@ -373,5 +374,10 @@
public Page getPage()
{
return page;
+ }
+
+ public Defaults getDefaults()
+ {
+ return page.getDefaults();
}
}
Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/DefaultsImpl.java (from r232284, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Defaults.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/DefaultsImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/DefaultsImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Defaults.java&r1=232284&r2=233224&rev=233224&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/Defaults.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/DefaultsImpl.java Wed Aug 17 11:04:08 2005
@@ -20,19 +20,24 @@
import java.util.Map;
import java.util.HashMap;
+import org.apache.jetspeed.om.page.Defaults;
+
/**
* @version $Id$
*/
-public class Defaults
+public class DefaultsImpl implements Defaults
{
private String skin = null;
private Map decoratorMap = new HashMap();
- public Defaults()
+ public DefaultsImpl()
{
}
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.page.psml.DefaultsIf#getSkin()
+ */
public String getSkin()
{
return this.skin;
@@ -43,6 +48,9 @@
this.skin = skin;
}
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.page.psml.DefaultsIf#getDecorator(java.lang.String)
+ */
public String getDecorator(String type)
{
return (String)decoratorMap.get(type);
@@ -53,6 +61,9 @@
decoratorMap.put(type,decorator);
}
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.page.psml.DefaultsIf#getLayoutDecorator()
+ */
public String getLayoutDecorator()
{
return getDecorator("layout");
@@ -63,6 +74,9 @@
setDecorator("layout",decorator);
}
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.page.psml.DefaultsIf#getPortletDecorator()
+ */
public String getPortletDecorator()
{
return getDecorator("portlet");
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java?rev=233224&r1=233223&r2=233224&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java Wed Aug 17 11:04:08 2005
@@ -21,6 +21,7 @@
import java.util.Stack;
import org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl;
+import org.apache.jetspeed.om.page.Defaults;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.document.AbstractNode;
@@ -30,7 +31,7 @@
*/
public class PageImpl extends AbstractNode implements Page
{
- private Defaults defaults = new Defaults();
+ private DefaultsImpl defaults = new DefaultsImpl();
private Fragment root = null;
@@ -166,7 +167,7 @@
return this.defaults;
}
- public void setDefaults( Defaults defaults )
+ public void setDefaults( DefaultsImpl defaults )
{
this.defaults = defaults;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org