portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r414636 - in /portals/jetspeed-2/trunk/components: page-manager/src/java/JETSPEED-INF/castor/ page-manager/src/java/org/apache/jetspeed/om/page/impl/ page-manager/src/java/org/apache/jetspeed/om/page/psml/ page-manager/src/java/org/apache/j...
Date Thu, 15 Jun 2006 16:56:15 GMT
Author: rwatler
Date: Thu Jun 15 09:56:14 2006
New Revision: 414636

URL: http://svn.apache.org/viewvc?rev=414636&view=rev
Log:
move castor fragment preference impl to page manager component; implement required Pluto interfaces
in DB fragment preference impl

Added:
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentPreferenceImpl.java
      - copied, changed from r414304, portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/FragmentPreferenceImpl.java
Removed:
    portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/FragmentPreferenceImpl.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/impl/FragmentImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml?rev=414636&r1=414635&r2=414636&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
Thu Jun 15 09:56:14 2006
@@ -123,7 +123,7 @@
     </field>
     
     <field name="preferences"
-           type="org.apache.jetspeed.om.preference.impl.FragmentPreferenceImpl" collection="arraylist">
+           type="org.apache.jetspeed.om.page.psml.FragmentPreferenceImpl" collection="arraylist">
       <bind-xml name="preference"/>
     </field>
   </class>
@@ -493,7 +493,7 @@
   </class>
   
 
-  <class name="org.apache.jetspeed.om.preference.impl.FragmentPreferenceImpl">
+  <class name="org.apache.jetspeed.om.page.psml.FragmentPreferenceImpl">
     <map-to xml="preference"/>
 
     <field name="name" type="string">

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java?rev=414636&r1=414635&r2=414636&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
Thu Jun 15 09:56:14 2006
@@ -29,7 +29,6 @@
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.om.page.PageSecurity;
 import org.apache.jetspeed.om.preference.FragmentPreference;
-import org.apache.jetspeed.om.preference.impl.FragmentPreferenceImpl;
 import org.apache.jetspeed.security.FragmentPermission;
 
 /**

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java?rev=414636&r1=414635&r2=414636&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java
Thu Jun 15 09:56:14 2006
@@ -16,17 +16,20 @@
 package org.apache.jetspeed.om.page.impl;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.jetspeed.om.preference.FragmentPreference;
+import org.apache.pluto.om.common.Preference;
+import org.apache.pluto.om.common.PreferenceCtrl;
 
 /**
- * FragmentPreference
+ * FragmentPreferenceImpl
  *
  * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
  * @version $Id$
  */
-public class FragmentPreferenceImpl implements FragmentPreference
+public class FragmentPreferenceImpl implements Preference, PreferenceCtrl, FragmentPreference
 {
     private int id;
     private String name;
@@ -54,6 +57,7 @@
 
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.preference.FragmentPreference#getName()
+     * @see org.apache.pluto.om.common.Preference#getName()
      */
     public String getName()
     {
@@ -62,6 +66,7 @@
 
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.preference.FragmentPreference#setName(java.lang.String)
+     * @see org.apache.pluto.om.common.PreferenceCtrl#setName(java.lang.String)
      */
     public void setName(String name)
     {
@@ -70,6 +75,7 @@
 
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.preference.FragmentPreference#isReadOnly()
+     * @see org.apache.pluto.om.common.Preference#isReadOnly()
      */
     public boolean isReadOnly()
     {
@@ -116,6 +122,38 @@
                 preferenceValues.addAll(values);
             }
         }
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.pluto.om.common.Preference#getValues()
+     */
+    public Iterator getValues()
+    {
+        return getValueList().iterator();
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.pluto.om.common.Preference#isValueSet()
+     */
+    public boolean isValueSet()
+    {
+        return !getValueList().isEmpty();
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.pluto.om.common.PreferenceCtrl#setValues(java.util.List)
+     */
+    public void setValues(List values)
+    {
+        setValueList(values);
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.pluto.om.common.PreferenceCtrl#setReadOnly(java.lang.String)
+     */
+    public void setReadOnly(String readOnly)
+    {
+        setReadOnly(new Boolean(readOnly).booleanValue());
     }
 
     /* (non-Javadoc)

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentPreferenceImpl.java
(from r414304, portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/FragmentPreferenceImpl.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentPreferenceImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentPreferenceImpl.java&p1=portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/FragmentPreferenceImpl.java&r1=414304&r2=414636&rev=414636&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/FragmentPreferenceImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentPreferenceImpl.java
Thu Jun 15 09:56:14 2006
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.apache.jetspeed.om.preference.impl;
+package org.apache.jetspeed.om.page.psml;
 
 import java.util.Iterator;
 import java.util.List;

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java?rev=414636&r1=414635&r2=414636&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
(original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
Thu Jun 15 09:56:14 2006
@@ -47,13 +47,13 @@
 import org.apache.jetspeed.om.page.PageSecurity;
 import org.apache.jetspeed.om.page.SecurityConstraintImpl;
 import org.apache.jetspeed.om.page.psml.FragmentImpl;
+import org.apache.jetspeed.om.page.psml.FragmentPreferenceImpl;
 import org.apache.jetspeed.om.page.psml.LinkImpl;
 import org.apache.jetspeed.om.page.psml.PageImpl;
 import org.apache.jetspeed.om.page.psml.PageSecurityImpl;
 import org.apache.jetspeed.om.page.psml.SecurityConstraintsDefImpl;
 import org.apache.jetspeed.om.page.psml.SecurityConstraintsImpl;
 import org.apache.jetspeed.om.preference.FragmentPreference;
-import org.apache.jetspeed.om.preference.impl.FragmentPreferenceImpl;
 import org.apache.jetspeed.page.AbstractPageManager;
 import org.apache.jetspeed.page.FolderNotUpdatedException;
 import org.apache.jetspeed.page.PageManager;



---------------------------------------------------------------------
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