portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r387462 - in /portals/jetspeed-2/trunk: components/page-manager/src/java/JETSPEED-INF/castor/ components/page-manager/src/java/JETSPEED-INF/ojb/ components/page-manager/src/java/org/apache/jetspeed/om/page/ components/page-manager/src/java/...
Date Tue, 21 Mar 2006 09:00:50 GMT
Author: rwatler
Date: Tue Mar 21 01:00:46 2006
New Revision: 387462

URL: http://svn.apache.org/viewcvs?rev=387462&view=rev
Log:
add mode, x, y, z, width, and height standard properties for Fragments to support persistent desktop like portlet window layouts

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/JETSPEED-INF/ojb/page-manager-repository.xml
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java
    portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
    portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
    portals/jetspeed-2/trunk/components/page-manager/testdata/pages/test001.psml
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorFragmentImpl.java
    portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java
    portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml
    portals/jetspeed-2/trunk/etc/sql/derby/schema/phase2-schema.sql
    portals/jetspeed-2/trunk/etc/sql/mssql/schema/phase2-schema.sql
    portals/jetspeed-2/trunk/etc/sql/postgres/schema/phase2-schema.sql
    portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/Fragment.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=387462&r1=387461&r2=387462&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 Tue Mar 21 01:00:46 2006
@@ -90,6 +90,10 @@
       <bind-xml name="state" node="attribute"/>
     </field>
 
+    <field name="mode" type="java.lang.String">
+      <bind-xml name="mode" node="attribute"/>
+    </field>
+
     <field name="decorator" type="java.lang.String">
       <bind-xml name="decorator" node="attribute"/>
     </field>

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml Tue Mar 21 01:00:46 2006
@@ -1620,6 +1620,12 @@
       />
 
       <field-descriptor
+         name="mode"
+         column="MODE"
+         jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
          name="layoutRowProperty"
          column="LAYOUT_ROW"
          jdbc-type="INTEGER"
@@ -1635,6 +1641,36 @@
          name="layoutSizesProperty"
          column="LAYOUT_SIZES"
          jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
+         name="layoutXProperty"
+         column="LAYOUT_X"
+         jdbc-type="REAL"
+      />
+
+      <field-descriptor
+         name="layoutYProperty"
+         column="LAYOUT_Y"
+         jdbc-type="REAL"
+      />
+
+      <field-descriptor
+         name="layoutZProperty"
+         column="LAYOUT_Z"
+         jdbc-type="REAL"
+      />
+
+      <field-descriptor
+         name="layoutWidthProperty"
+         column="LAYOUT_WIDTH"
+         jdbc-type="REAL"
+      />
+
+      <field-descriptor
+         name="layoutHeightProperty"
+         column="LAYOUT_HEIGHT"
+         jdbc-type="REAL"
       />
 
       <field-descriptor

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java Tue Mar 21 01:00:46 2006
@@ -167,6 +167,15 @@
     }
 
     /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String)
+     */
+    public float getFloatProperty(String propName)
+    {
+        
+        return fragment.getFloatProperty(propName);
+    }
+
+    /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Fragment#getSkin()
      */
     public String getSkin()
@@ -185,6 +194,15 @@
     }
 
     /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getMode()
+     */
+    public String getMode()
+    {
+        
+        return fragment.getMode();
+    }
+
+    /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Fragment#getType()
      */
     public String getType()
@@ -244,22 +262,111 @@
         return fragment.getLayoutSizes();
     }
 
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutX()
+     */
+    public float getLayoutX()
+    {
+        return fragment.getLayoutX();
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutY()
+     */
+    public float getLayoutY()
+    {
+        return fragment.getLayoutY();
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutZ()
+     */
+    public float getLayoutZ()
+    {
+        return fragment.getLayoutZ();
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutWidth()
+     */
+    public float getLayoutWidth()
+    {
+        return fragment.getLayoutWidth();
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutHeight()
+     */
+    public float getLayoutHeight()
+    {
+        return fragment.getLayoutHeight();
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutRow(int)
+     */
     public void setLayoutRow(int row)
     {
         fragment.setLayoutRow(row);
     }
     
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutColumn(int)
+     */
     public void setLayoutColumn(int column)
     {
         fragment.setLayoutColumn(column);
     }
     
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String)
+     */
     public void setLayoutSizes(String sizes)
     {
         fragment.setLayoutSizes(sizes);
     }
     
     /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutX(float)
+     */
+    public void setLayoutX(float x)
+    {
+        fragment.setLayoutX(x);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutY(float)
+     */
+    public void setLayoutY(float y)
+    {
+        fragment.setLayoutY(y);
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutZ(float)
+     */
+    public void setLayoutZ(float z)
+    {
+        fragment.setLayoutZ(z);
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutWidth(float)
+     */
+    public void setLayoutWidth(float width)
+    {
+        fragment.setLayoutWidth(width);
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutHeight(float)
+     */
+    public void setLayoutHeight(float height)
+    {
+        fragment.setLayoutHeight(height);
+    }
+
+    /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Fragment#setSkin(java.lang.String)
      */
     public void setSkin(String skinName)
@@ -275,6 +382,15 @@
     {
         
         fragment.setState(state);
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setMode(java.lang.String)
+     */
+    public void setMode(String mode)
+    {
+        
+        fragment.setMode(mode);
     }
 
     /* (non-Javadoc)

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java Tue Mar 21 01:00:46 2006
@@ -45,9 +45,15 @@
     private String skin;
     private String decorator;
     private String state;
+    private String mode;
     private int layoutRowProperty = -1;
     private int layoutColumnProperty = -1;
     private String layoutSizesProperty;
+    private float layoutXProperty = -1.0F;
+    private float layoutYProperty = -1.0F;
+    private float layoutZProperty = -1.0F;
+    private float layoutWidthProperty = -1.0F;
+    private float layoutHeightProperty = -1.0F;
     private String extendedPropertyName1;
     private String extendedPropertyValue1;
     private String extendedPropertyName2;
@@ -267,6 +273,26 @@
         {
             keys.add(SIZES_PROPERTY_NAME);
         }
+        if (layoutXProperty >= 0.0F)
+        {
+            keys.add(X_PROPERTY_NAME);
+        }
+        if (layoutYProperty >= 0.0F)
+        {
+            keys.add(Y_PROPERTY_NAME);
+        }
+        if (layoutZProperty >= 0.0F)
+        {
+            keys.add(Z_PROPERTY_NAME);
+        }
+        if (layoutWidthProperty >= 0.0F)
+        {
+            keys.add(WIDTH_PROPERTY_NAME);
+        }
+        if (layoutHeightProperty >= 0.0F)
+        {
+            keys.add(HEIGHT_PROPERTY_NAME);
+        }
         if ((extendedPropertyName1 != null) && (extendedPropertyValue1 != null))
         {
             keys.add(extendedPropertyName1);
@@ -307,6 +333,41 @@
         {
             return layoutSizesProperty;
         }
+        else if (key.equals(X_PROPERTY_NAME))
+        {
+            if (layoutXProperty >= 0.0F)
+            {
+                return String.valueOf(layoutXProperty);
+            }
+        }
+        else if (key.equals(Y_PROPERTY_NAME))
+        {
+            if (layoutYProperty >= 0.0F)
+            {
+                return String.valueOf(layoutYProperty);
+            }
+        }
+        else if (key.equals(Z_PROPERTY_NAME))
+        {
+            if (layoutZProperty >= 0.0F)
+            {
+                return String.valueOf(layoutZProperty);
+            }
+        }
+        else if (key.equals(WIDTH_PROPERTY_NAME))
+        {
+            if (layoutWidthProperty >= 0.0F)
+            {
+                return String.valueOf(layoutWidthProperty);
+            }
+        }
+        else if (key.equals(HEIGHT_PROPERTY_NAME))
+        {
+            if (layoutHeightProperty >= 0.0F)
+            {
+                return String.valueOf(layoutHeightProperty);
+            }
+        }
         else if (key.equals(extendedPropertyName1))
         {
             return extendedPropertyValue1;
@@ -341,6 +402,26 @@
         {
             layoutSizesProperty = value;
         }
+        else if (key.equals(X_PROPERTY_NAME))
+        {
+            layoutXProperty = Float.parseFloat(value);
+        }
+        else if (key.equals(Y_PROPERTY_NAME))
+        {
+            layoutYProperty = Float.parseFloat(value);
+        }
+        else if (key.equals(Z_PROPERTY_NAME))
+        {
+            layoutZProperty = Float.parseFloat(value);
+        }
+        else if (key.equals(WIDTH_PROPERTY_NAME))
+        {
+            layoutWidthProperty = Float.parseFloat(value);
+        }
+        else if (key.equals(HEIGHT_PROPERTY_NAME))
+        {
+            layoutHeightProperty = Float.parseFloat(value);
+        }
         else if (key.equals(extendedPropertyName1))
         {
             extendedPropertyValue1 = value;
@@ -386,6 +467,26 @@
         {
             layoutSizesProperty = null;
         }
+        else if (key.equals(X_PROPERTY_NAME))
+        {
+            layoutXProperty = -1.0F;
+        }
+        else if (key.equals(Y_PROPERTY_NAME))
+        {
+            layoutYProperty = -1.0F;
+        }
+        else if (key.equals(Z_PROPERTY_NAME))
+        {
+            layoutZProperty = -1.0F;
+        }
+        else if (key.equals(WIDTH_PROPERTY_NAME))
+        {
+            layoutWidthProperty = -1.0F;
+        }
+        else if (key.equals(HEIGHT_PROPERTY_NAME))
+        {
+            layoutHeightProperty = -1.0F;
+        }
         else if (key.equals(extendedPropertyName1))
         {
             extendedPropertyName1 = null;
@@ -553,6 +654,22 @@
     }
 
     /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getMode()
+     */
+    public String getMode()
+    {
+        return mode;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setMode(java.lang.String)
+     */
+    public void setMode(String mode)
+    {
+        this.mode = mode;
+    }
+
+    /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Fragment#getFragments()
      */
     public List getFragments()
@@ -588,6 +705,19 @@
     }
     
     /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String)
+     */
+    public float getFloatProperty(String propName)
+    {
+        String propValue = (String)getProperties().get(propName);
+        if (propValue != null)
+        {
+            return Float.parseFloat(propValue);
+        }
+        return -1.0F;
+    }
+    
+    /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Fragment#getProperties()
      */
     public Map getProperties()
@@ -675,6 +805,131 @@
         }
     }
     
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutX()
+     */
+    public float getLayoutX()
+    {
+        // get standard float property
+        return getFloatProperty(X_PROPERTY_NAME);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutX(float)
+     */
+    public void setLayoutX(float x)
+    {
+        // set standard float property
+        if (x >= 0.0F)
+        {
+            getProperties().put(X_PROPERTY_NAME, String.valueOf(x));
+        }
+        else
+        {
+            getProperties().remove(X_PROPERTY_NAME);
+        }
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutY()
+     */
+    public float getLayoutY()
+    {
+        // get standard float property
+        return getFloatProperty(Y_PROPERTY_NAME);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutY(float)
+     */
+    public void setLayoutY(float y)
+    {
+        // set standard float property
+        if (y >= 0.0F)
+        {
+            getProperties().put(Y_PROPERTY_NAME, String.valueOf(y));
+        }
+        else
+        {
+            getProperties().remove(Y_PROPERTY_NAME);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutZ()
+     */
+    public float getLayoutZ()
+    {
+        // get standard float property
+        return getFloatProperty(Z_PROPERTY_NAME);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutZ(float)
+     */
+    public void setLayoutZ(float z)
+    {
+        // set standard float property
+        if (z >= 0.0F)
+        {
+            getProperties().put(Z_PROPERTY_NAME, String.valueOf(z));
+        }
+        else
+        {
+            getProperties().remove(Z_PROPERTY_NAME);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutWidth()
+     */
+    public float getLayoutWidth()
+    {
+        // get standard float property
+        return getFloatProperty(WIDTH_PROPERTY_NAME);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutWidth(float)
+     */
+    public void setLayoutWidth(float width)
+    {
+        // set standard float property
+        if (width >= 0.0F)
+        {
+            getProperties().put(WIDTH_PROPERTY_NAME, String.valueOf(width));
+        }
+        else
+        {
+            getProperties().remove(WIDTH_PROPERTY_NAME);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutHeight()
+     */
+    public float getLayoutHeight()
+    {
+        // get standard float property
+        return getFloatProperty(HEIGHT_PROPERTY_NAME);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutHeight(float)
+     */
+    public void setLayoutHeight(float height)
+    {
+        // set standard float property
+        if (height >= 0.0F)
+        {
+            getProperties().put(HEIGHT_PROPERTY_NAME, String.valueOf(height));
+        }
+        else
+        {
+            getProperties().remove(HEIGHT_PROPERTY_NAME);
+        }
+    }
+
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Fragment#isReference()
      */

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java Tue Mar 21 01:00:46 2006
@@ -40,6 +40,8 @@
 
     private String state = null;
 
+    private String mode = null;
+
     private String decorator = null;
 
     private String skin = null;
@@ -87,6 +89,16 @@
         this.state = state;
     }
 
+    public String getMode()
+    {
+        return this.mode;
+    }
+
+    public void setMode( String mode )
+    {
+        this.mode = mode;
+    }
+
     public String getDecorator()
     {
         return this.decorator;
@@ -155,6 +167,19 @@
     }
     
     /**
+     * @see org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String)
+     */
+    public float getFloatProperty(String propName)
+    {
+        String prop = (String)propertiesMap.get(propName);
+        if (prop != null)
+        {
+            return Float.parseFloat(prop);
+        }
+        return -1.0F;
+    }
+    
+    /**
      * @see org.apache.jetspeed.om.page.Fragment#getProperties()
      */
     public Map getProperties()
@@ -167,12 +192,7 @@
      */
     public int getLayoutRow()
     {
-        String prop = (String)propertiesMap.get(ROW_PROPERTY_NAME);
-        if (prop != null)
-        {
-            return Integer.parseInt(prop);
-        }
-        return -1;
+        return getIntProperty(ROW_PROPERTY_NAME);
     }
 
     /**
@@ -195,12 +215,7 @@
      */
     public int getLayoutColumn()
     {
-        String prop = (String)propertiesMap.get(COLUMN_PROPERTY_NAME);
-        if (prop != null)
-        {
-            return Integer.parseInt(prop);
-        }
-        return -1;
+        return getIntProperty(COLUMN_PROPERTY_NAME);
     }
 
     /**
@@ -240,7 +255,122 @@
             propertiesMap.remove(SIZES_PROPERTY_NAME);
         }
     }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutX()
+     */
+    public float getLayoutX()
+    {
+        return getFloatProperty(X_PROPERTY_NAME);
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutX(float)
+     */
+    public void setLayoutX(float x)
+    {
+        if (x >= 0.0F)
+        {
+            propertiesMap.put(X_PROPERTY_NAME, String.valueOf(x));
+        }
+        else
+        {
+            propertiesMap.remove(X_PROPERTY_NAME);
+        }
+    }
     
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutY()
+     */
+    public float getLayoutY()
+    {
+        return getFloatProperty(Y_PROPERTY_NAME);
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutY(float)
+     */
+    public void setLayoutY(float y)
+    {
+        if (y >= 0.0F)
+        {
+            propertiesMap.put(Y_PROPERTY_NAME, String.valueOf(y));
+        }
+        else
+        {
+            propertiesMap.remove(Y_PROPERTY_NAME);
+        }
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutZ()
+     */
+    public float getLayoutZ()
+    {
+        return getFloatProperty(Z_PROPERTY_NAME);
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutZ(float)
+     */
+    public void setLayoutZ(float z)
+    {
+        if (z >= 0.0F)
+        {
+            propertiesMap.put(Z_PROPERTY_NAME, String.valueOf(z));
+        }
+        else
+        {
+            propertiesMap.remove(Z_PROPERTY_NAME);
+        }
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutWidth()
+     */
+    public float getLayoutWidth()
+    {
+        return getFloatProperty(WIDTH_PROPERTY_NAME);
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutWidth(float)
+     */
+    public void setLayoutWidth(float width)
+    {
+        if (width >= 0.0F)
+        {
+            propertiesMap.put(WIDTH_PROPERTY_NAME, String.valueOf(width));
+        }
+        else
+        {
+            propertiesMap.remove(WIDTH_PROPERTY_NAME);
+        }
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutHeight()
+     */
+    public float getLayoutHeight()
+    {
+        return getFloatProperty(HEIGHT_PROPERTY_NAME);
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutHeight(float)
+     */
+    public void setLayoutHeight(float height)
+    {
+        if (height >= 0.0F)
+        {
+            propertiesMap.put(HEIGHT_PROPERTY_NAME, String.valueOf(height));
+        }
+        else
+        {
+            propertiesMap.remove(HEIGHT_PROPERTY_NAME);
+        }
+    }
+
     /**
      * <p>
      * equals

Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java Tue Mar 21 01:00:46 2006
@@ -225,6 +225,17 @@
                     {
                         try
                         {
+                            // reset page manager to initial state
+                            try
+                            {
+                                Folder removeRootFolder = pageManager.getFolder("/");
+                                pageManager.removeFolder(removeRootFolder);
+                                pageManager.reset();
+                            }
+                            catch (FolderNotFoundException e)
+                            {
+                            }
+
                             // create test documents and folders
                             Folder folder = pageManager.newFolder("/");
                             SecurityConstraints constraints = pageManager.newSecurityConstraints();

Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java Tue Mar 21 01:00:46 2006
@@ -199,9 +199,20 @@
 
         Map properties = f.getProperties();
         assertNotNull(properties);
-        assertTrue(properties.size() == 2);
+        assertTrue(properties.size() == 7);
         assertEquals("0", f.getProperty(Fragment.ROW_PROPERTY_NAME));
         assertEquals(0, f.getIntProperty(Fragment.COLUMN_PROPERTY_NAME));
+        assertEquals(0, f.getLayoutRow());
+        assertEquals(0, f.getLayoutColumn());
+        assertNotNull(f.getProperty(Fragment.X_PROPERTY_NAME));
+        assertTrue(f.getProperty(Fragment.X_PROPERTY_NAME).startsWith("11.1"));
+        assertTrue((f.getLayoutX() > 11.0F) && (f.getLayoutX() < 12.0F));
+        assertTrue((f.getFloatProperty(Fragment.X_PROPERTY_NAME) > 11.0F) &&
+                   (f.getFloatProperty(Fragment.X_PROPERTY_NAME) < 12.0F));
+        assertTrue((f.getLayoutY() > 22.0F) && (f.getLayoutY() < 23.0F));
+        assertTrue((f.getLayoutZ() > 33.0F) && (f.getLayoutZ() < 34.0F));
+        assertTrue((f.getLayoutWidth() > 44.0F) && (f.getLayoutWidth() < 45.0F));
+        assertTrue((f.getLayoutHeight() > 55.0F) && (f.getLayoutWidth() < 56.0F));
 
         List preferences = f.getPreferences();
         assertNotNull(preferences);

Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java Tue Mar 21 01:00:46 2006
@@ -86,8 +86,19 @@
             context = ctx;
             lastTestRun = false;
 
-            // lookup page manager in context
+            // lookup page manager in context and reset to initial state
             pageManager = (PageManager)context.getBean("pageManager");
+            try
+            {
+                Folder removeRootFolder = pageManager.getFolder("/");
+                pageManager.removeFolder(removeRootFolder);
+                pageManager.reset();
+            }
+            catch (FolderNotFoundException e)
+            {
+            }
+
+            // setup page manager listener
             pageManager.addListener(this);
         }
         else
@@ -305,6 +316,11 @@
         portlet.setState("Normal");
         portlet.setLayoutRow(88);
         portlet.setLayoutColumn(99);
+        portlet.setLayoutX(12.34F);
+        portlet.setLayoutY(23.45F);
+        portlet.setLayoutZ(34.56F);
+        portlet.setLayoutWidth(45.67F);
+        portlet.setLayoutHeight(56.78F);
         List preferences = new ArrayList(2);
         FragmentPreference preference = pageManager.newFragmentPreference();
         preference.setName("pref0");
@@ -329,6 +345,11 @@
         portlet.setState("Normal");
         portlet.setLayoutRow(22);
         portlet.setLayoutColumn(11);
+        portlet.setLayoutX(11.11F);
+        portlet.setLayoutY(22.22F);
+        portlet.setLayoutZ(33.33F);
+        portlet.setLayoutWidth(44.44F);
+        portlet.setLayoutHeight(55.55F);
         SecurityConstraints fragmentConstraints = portlet.newSecurityConstraints();
         fragmentConstraints.setOwner("user");
         portlet.setSecurityConstraints(fragmentConstraints);
@@ -636,6 +657,15 @@
             assertEquals(88, check0.getLayoutRow());
             assertEquals(88, check0.getIntProperty(Fragment.ROW_PROPERTY_NAME));
             assertEquals(99, check0.getLayoutColumn());
+            assertNotNull(check0.getProperty(Fragment.X_PROPERTY_NAME));
+            assertTrue(check0.getProperty(Fragment.X_PROPERTY_NAME).startsWith("12.3"));
+            assertTrue((check0.getLayoutX() > 12.0F) && (check0.getLayoutX() < 13.0F));
+            assertTrue((check0.getFloatProperty(Fragment.X_PROPERTY_NAME) > 12.0F) &&
+                       (check0.getFloatProperty(Fragment.X_PROPERTY_NAME) < 13.0F));
+            assertTrue((check0.getLayoutY() > 23.0F) && (check0.getLayoutY() < 24.0F));
+            assertTrue((check0.getLayoutZ() > 34.0F) && (check0.getLayoutZ() < 35.0F));
+            assertTrue((check0.getLayoutWidth() > 45.0F) && (check0.getLayoutWidth() < 46.0F));
+            assertTrue((check0.getLayoutHeight() > 56.0F) && (check0.getLayoutWidth() < 57.0F));
             assertNotNull(check0.getPreferences());
             assertEquals(2, check0.getPreferences().size());
             assertEquals("pref0", ((FragmentPreference)check0.getPreferences().get(0)).getName());
@@ -656,6 +686,11 @@
             assertEquals("Normal", check1.getState());
             assertEquals(22, check1.getLayoutRow());
             assertEquals(11, check1.getLayoutColumn());
+            assertTrue((check1.getLayoutX() > 11.0F) && (check1.getLayoutX() < 12.0F));
+            assertTrue((check1.getLayoutY() > 22.0F) && (check1.getLayoutY() < 23.0F));
+            assertTrue((check1.getLayoutZ() > 33.0F) && (check1.getLayoutZ() < 34.0F));
+            assertTrue((check1.getLayoutWidth() > 44.0F) && (check1.getLayoutWidth() < 45.0F));
+            assertTrue((check1.getLayoutHeight() > 55.0F) && (check1.getLayoutWidth() < 56.0F));
             assertNotNull(check1.getSecurityConstraints());
             assertEquals("user", check1.getSecurityConstraints().getOwner());
             assertNotNull(check.getFragmentById(check0.getId()));

Modified: portals/jetspeed-2/trunk/components/page-manager/testdata/pages/test001.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/testdata/pages/test001.psml?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
Binary files - no diff available.

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorFragmentImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorFragmentImpl.java?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorFragmentImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorFragmentImpl.java Tue Mar 21 01:00:46 2006
@@ -37,6 +37,7 @@
     private String type;
     private String decorator;
     private String state;
+    private String mode;
     
     public PortletAggregatorFragmentImpl(String id)
     {
@@ -229,6 +230,22 @@
     }
     
     /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getMode()
+     */
+    public String getMode()
+    {
+        return mode;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setMode(java.lang.String)
+     */
+    public void setMode(String mode)
+    {
+        this.mode = mode;
+    }
+    
+    /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Fragment#getFragments()
      */
     public List getFragments()
@@ -261,7 +278,15 @@
     }
     
     /* (non-Javadoc)
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutWidths()
+     * @see org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String)
+     */
+    public float getFloatProperty(String propName)
+    {
+        return -1.0F;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutRow()
      */
     public int getLayoutRow()
     {
@@ -269,7 +294,7 @@
     }
     
     /* (non-Javadoc)
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutWidths()
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutColumn()
      */
     public int getLayoutColumn()
     {
@@ -285,10 +310,43 @@
     }
     
     /* (non-Javadoc)
-     * @see org.apache.jetspeed.om.page.Fragment#setLayoutColumn(int)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutX()
      */
-    public void setLayoutColumn(int column)
+    public float getLayoutX()
     {
+        return -1.0F;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutY()
+     */
+    public float getLayoutY()
+    {
+        return -1.0F;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutZ()
+     */
+    public float getLayoutZ()
+    {
+        return -1.0F;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutWidth()
+     */
+    public float getLayoutWidth()
+    {
+        return -1.0F;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutHeight()
+     */
+    public float getLayoutHeight()
+    {
+        return -1.0F;
     }
     
     /* (non-Javadoc)
@@ -299,12 +357,54 @@
     }
     
     /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutColumn(int)
+     */
+    public void setLayoutColumn(int column)
+    {
+    }
+    
+    /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String)
      */
     public void setLayoutSizes(String sizes)
     {
     }
 
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutX(float)
+     */
+    public void setLayoutX(float x)
+    {
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutY(float)
+     */
+    public void setLayoutY(float y)
+    {
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutZ(float)
+     */
+    public void setLayoutZ(float z)
+    {
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutWidth(float)
+     */
+    public void setLayoutWidth(float width)
+    {
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutHeight(float)
+     */
+    public void setLayoutHeight(float height)
+    {
+    }
+    
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Fragment#isReference()
      */

Modified: portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java Tue Mar 21 01:00:46 2006
@@ -179,6 +179,14 @@
     }
 
     /**
+     * @return state string
+     */
+    public String getMode()
+    {
+        return f.getMode();
+    }
+
+    /**
      * @return title
      */
     public String getTitle()
@@ -259,6 +267,14 @@
     }
 
     /**
+     * @param mode
+     */
+    public void setMode(String mode)
+    {
+        f.setMode(mode);
+    }
+
+    /**
      * @param title
      */
     public void setTitle(String title)
@@ -313,19 +329,19 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutColumn()
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutRow()
      */
-    public int getLayoutColumn()
+    public int getLayoutRow()
     {
-        return 0;
+        return -1;
     }
 
     /**
-     * @see org.apache.jetspeed.om.page.Fragment#getLayoutRow()
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutColumn()
      */
-    public int getLayoutRow()
+    public int getLayoutColumn()
     {
-        return 0;
+        return -1;
     }
 
     /**
@@ -337,10 +353,43 @@
     }
 
     /**
-     * @see org.apache.jetspeed.om.page.Fragment#setLayoutColumn(int)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutX()
      */
-    public void setLayoutColumn(int column)
-    {            
+    public float getLayoutX()
+    {
+        return -1.0F;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutY()
+     */
+    public float getLayoutY()
+    {
+        return -1.0F;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutZ()
+     */
+    public float getLayoutZ()
+    {
+        return -1.0F;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutWidth()
+     */
+    public float getLayoutWidth()
+    {
+        return -1.0F;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutHeight()
+     */
+    public float getLayoutHeight()
+    {
+        return -1.0F;
     }
 
     /**
@@ -351,6 +400,13 @@
     }
 
     /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutColumn(int)
+     */
+    public void setLayoutColumn(int column)
+    {            
+    }
+
+    /**
      * @see org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String)
      */
     public void setLayoutSizes(String sizes)
@@ -358,11 +414,54 @@
     }
 
     /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutX(float)
+     */
+    public void setLayoutX(float x)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutY(float)
+     */
+    public void setLayoutY(float y)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutZ(float)
+     */
+    public void setLayoutZ(float z)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutWidth(float)
+     */
+    public void setLayoutWidth(float width)
+    {            
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#setLayoutHeight(float)
+     */
+    public void setLayoutHeight(float height)
+    {            
+    }
+
+    /**
      * @see org.apache.jetspeed.om.page.Fragment#getIntProperty(java.lang.String)
      */
     public int getIntProperty(String propName)
     {
-        return 0;
+        return -1;
+    }
+
+    /**
+     * @see org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String)
+     */
+    public float getFloatProperty(String propName)
+    {
+        return -1.0F;
     }
 
     /**

Modified: portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml (original)
+++ portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml Tue Mar 21 01:00:46 2006
@@ -332,10 +332,16 @@
         <column name="TYPE" size="40" type="VARCHAR"/>
         <column name="SKIN" size="80" type="VARCHAR"/>
         <column name="DECORATOR" size="80" type="VARCHAR"/>
-        <column name="STATE" size="40" type="VARCHAR"/>
+        <column name="STATE" size="10" type="VARCHAR"/>
+        <column name="MODE" size="10" type="VARCHAR"/>
         <column name="LAYOUT_ROW" type="INTEGER"/>
         <column name="LAYOUT_COLUMN" type="INTEGER"/>
         <column name="LAYOUT_SIZES" size="20" type="VARCHAR"/>
+        <column name="LAYOUT_X" type="REAL"/>
+        <column name="LAYOUT_Y" type="REAL"/>
+        <column name="LAYOUT_Z" type="REAL"/>
+        <column name="LAYOUT_WIDTH" type="REAL"/>
+        <column name="LAYOUT_HEIGHT" type="REAL"/>
         <column name="EXT_PROP_NAME_1" size="40" type="VARCHAR"/>
         <column name="EXT_PROP_VALUE_1" size="80" type="VARCHAR"/>
         <column name="EXT_PROP_NAME_2" size="40" type="VARCHAR"/>

Modified: portals/jetspeed-2/trunk/etc/sql/derby/schema/phase2-schema.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/derby/schema/phase2-schema.sql?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/derby/schema/phase2-schema.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/derby/schema/phase2-schema.sql Tue Mar 21 01:00:46 2006
@@ -308,10 +308,16 @@
     TYPE VARCHAR(40),
     SKIN VARCHAR(80),
     DECORATOR VARCHAR(80),
-    STATE VARCHAR(40),
+    STATE VARCHAR(10),
+    MODE VARCHAR(10),
     LAYOUT_ROW INTEGER,
     LAYOUT_COLUMN INTEGER,
     LAYOUT_SIZES VARCHAR(20),
+    LAYOUT_X REAL,
+    LAYOUT_Y REAL,
+    LAYOUT_Z REAL,
+    LAYOUT_WIDTH REAL,
+    LAYOUT_HEIGHT REAL,
     EXT_PROP_NAME_1 VARCHAR(40),
     EXT_PROP_VALUE_1 VARCHAR(80),
     EXT_PROP_NAME_2 VARCHAR(40),

Modified: portals/jetspeed-2/trunk/etc/sql/mssql/schema/phase2-schema.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/mssql/schema/phase2-schema.sql?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/mssql/schema/phase2-schema.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/mssql/schema/phase2-schema.sql Tue Mar 21 01:00:46 2006
@@ -725,10 +725,16 @@
             TYPE VARCHAR (40) NULL,
             SKIN VARCHAR (80) NULL,
             DECORATOR VARCHAR (80) NULL,
-            STATE VARCHAR (40) NULL,
+            STATE VARCHAR (10) NULL,
+            MODE VARCHAR (10) NULL,
             LAYOUT_ROW INT NULL,
             LAYOUT_COLUMN INT NULL,
             LAYOUT_SIZES VARCHAR (20) NULL,
+            LAYOUT_X REAL NULL,
+            LAYOUT_Y REAL NULL,
+            LAYOUT_Z REAL NULL,
+            LAYOUT_WIDTH REAL NULL,
+            LAYOUT_HEIGHT REAL NULL,
             EXT_PROP_NAME_1 VARCHAR (40) NULL,
             EXT_PROP_VALUE_1 VARCHAR (80) NULL,
             EXT_PROP_NAME_2 VARCHAR (40) NULL,

Modified: portals/jetspeed-2/trunk/etc/sql/postgres/schema/phase2-schema.sql
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/sql/postgres/schema/phase2-schema.sql?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/sql/postgres/schema/phase2-schema.sql (original)
+++ portals/jetspeed-2/trunk/etc/sql/postgres/schema/phase2-schema.sql Tue Mar 21 01:00:46 2006
@@ -376,10 +376,16 @@
     TYPE varchar(40),
     SKIN varchar(80),
     DECORATOR varchar(80),
-    STATE varchar(40),
+    STATE varchar(10),
+    MODE varchar(10),
     LAYOUT_ROW int4,
     LAYOUT_COLUMN int4,
     LAYOUT_SIZES varchar(20),
+    LAYOUT_X real,
+    LAYOUT_Y real,
+    LAYOUT_Z real,
+    LAYOUT_WIDTH real,
+    LAYOUT_HEIGHT real,
     EXT_PROP_NAME_1 varchar(40),
     EXT_PROP_VALUE_1 varchar(80),
     EXT_PROP_NAME_2 varchar(40),

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/Fragment.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/Fragment.java?rev=387462&r1=387461&r2=387462&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/Fragment.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/Fragment.java Tue Mar 21 01:00:46 2006
@@ -68,11 +68,36 @@
      public String COLUMN_PROPERTY_NAME = "column";
 
     /**
-     * widths standard layout property name
+     * sizes standard layout property name
      */
      public String SIZES_PROPERTY_NAME = "sizes";
 
     /**
+     * x coordinate standard layout property name
+     */
+     public String X_PROPERTY_NAME = "x";
+
+    /**
+     * y coordinate standard layout property name
+     */
+     public String Y_PROPERTY_NAME = "y";
+
+    /**
+     * z coordinate standard layout property name
+     */
+     public String Z_PROPERTY_NAME = "z";
+
+    /**
+     * width standard layout property name
+     */
+     public String WIDTH_PROPERTY_NAME = "width";
+
+    /**
+     * height standard layout property name
+     */
+     public String HEIGHT_PROPERTY_NAME = "height";
+
+    /**
      * Returns the administrative name of this fragment. This name should map
      * to a component name in the component repository defined by the type
      * attribute.
@@ -129,21 +154,34 @@
     public void setDecorator(String decoratorName);
 
     /**
-     * Returns the display state of this fragment. This state may have the
-     * following values:
-     * "Normal","Minimized","Maximized","Hidden".
+     * Returns the display state of this fragment. The state may have the
+     * following values: "Normal","Minimized","Maximized","Hidden"
      */
     public String getState();
 
     /**
      * Sets the display state of this fragment.
-     * Valid states are: "Normal","Minimzed","Maximized","Hidden"
+     * Valid states are: "Normal","Minimized","Maximized","Hidden"
      *
-     * @param decoratorName the name of the decorator applied to this fragment
+     * @param state the new fragment state
      */
     public void setState(String state);
 
     /**
+     * Returns the display mode of this fragment. The mode may have the
+     * following values: "View","Edit","Help","Config","Print","Custom"
+     */
+    public String getMode();
+
+    /**
+     * Sets the display mode of this fragment.
+     * Valid modes are: "View","Edit","Help","Config","Print","Custom"
+     *
+     * @param mode the new fragment mode
+     */
+    public void setMode(String mode);
+
+    /**
      * Returns all fragments used in this node. This may be
      * a page fragment or even directly a portlet fragment
      *
@@ -172,6 +210,16 @@
     public int getIntProperty(String propName);
     
     /**
+     * getFloatProperty
+     * 
+     * Get named property value as float.
+     *
+     * @param propName property name
+     * @return float value
+     */
+    public float getFloatProperty(String propName);
+    
+    /**
      * getProperties
      * 
      * Get writable Map of properties by name.
@@ -222,6 +270,76 @@
      */
     public void setLayoutSizes(String sizes);
     
+    /**
+     * get layout x coordinate property
+     *
+     * @return the x coordinate value
+     **/
+    public float getLayoutX();
+
+    /**
+     * set the layout x coordinate property
+     *
+     * @param x the coordinate value
+     */
+    public void setLayoutX(float x);
+
+    /**
+     * get layout y coordinate property
+     *
+     * @return the y coordinate value
+     **/
+    public float getLayoutY();
+
+    /**
+     * set the layout y coordinate property
+     *
+     * @param y the coordinate value
+     */
+    public void setLayoutY(float y);
+
+    /**
+     * get layout z coordinate property
+     *
+     * @return the z coordinate value
+     **/
+    public float getLayoutZ();
+
+    /**
+     * set the layout z coordinate property
+     *
+     * @param z the coordinate value
+     */
+    public void setLayoutZ(float z);
+
+    /**
+     * get layout width property
+     *
+     * @return the width value
+     **/
+    public float getLayoutWidth();
+
+    /**
+     * set the layout width property
+     *
+     * @param width the value
+     */
+    public void setLayoutWidth(float width);
+
+    /**
+     * get layout height property
+     *
+     * @return the height value
+     **/
+    public float getLayoutHeight();
+
+    /**
+     * set the layout height property
+     *
+     * @param height the value
+     */
+    public void setLayoutHeight(float height);
+
     /**
      * Test if this fragment is actually a reference to an external fragment.
      *



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message