portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r1576488 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/ components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ components/jetspeed-page-manager/...
Date Tue, 11 Mar 2014 20:05:43 GMT
Author: rwatler
Date: Tue Mar 11 20:05:43 2014
New Revision: 1576488

URL: http://svn.apache.org/r1576488
Log:
JS2-874: more generics for om APIs.

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentPreferenceImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentElementImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BasePageElementImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsDefImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentElement.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentsElement.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBasePageElement.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentPreferenceImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsDefImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BaseFragmentElement.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BaseFragmentsElement.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BasePageElement.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/Fragment.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/PageSecurity.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsDef.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/preference/FragmentPreference.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java Tue Mar 11 20:05:43 2014
@@ -1646,7 +1646,7 @@ public class PageLayoutComponentImpl imp
     /* (non-Javadoc)
      * @see org.apache.jetspeed.layout.PageLayoutComponent#updatePreferences(org.apache.jetspeed.om.page.ContentFragment, java.util.Map)
      */
-    public void updatePreferences(ContentFragment contentFragment, Map<String, Object> preferences)
+    public void updatePreferences(ContentFragment contentFragment, Map<String,?> preferences)
     {
         log.debug("PageLayoutComponentImpl.updatePreferences() invoked");
         try

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentImpl.java Tue Mar 11 20:05:43 2014
@@ -16,15 +16,6 @@
  */
 package org.apache.jetspeed.om.page.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.jetspeed.aggregator.PortletContent;
 import org.apache.jetspeed.decoration.Decoration;
 import org.apache.jetspeed.layout.PageLayoutComponent;
@@ -38,10 +29,18 @@ import org.apache.jetspeed.om.page.Fragm
 import org.apache.jetspeed.om.page.FragmentReference;
 import org.apache.jetspeed.om.preference.FragmentPreference;
 import org.apache.pluto.container.PortletPreference;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * Immutable content fragment implementation.
  * 
@@ -395,7 +394,7 @@ public class ContentFragmentImpl impleme
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.ContentFragment#getPreferences()
      */
-    public List getPreferences()
+    public List<FragmentPreference> getPreferences()
     {
         if (preferences == null)
         {
@@ -407,7 +406,7 @@ public class ContentFragmentImpl impleme
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.ContentFragment#getProperties()
      */
-    public List getProperties()
+    public List<FragmentProperty> getProperties()
     {
         if (properties == null)
         {
@@ -419,10 +418,10 @@ public class ContentFragmentImpl impleme
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.ContentFragment#getPropertiesMap()
      */
-    public Map getPropertiesMap()
+    public Map<String,String> getPropertiesMap()
     {
         // get property names
-        Set propertyNames = new HashSet();
+        Set<String> propertyNames = new HashSet<String>();
         Iterator propertiesIter = getProperties().iterator();
         while (propertiesIter.hasNext())
         {
@@ -431,7 +430,7 @@ public class ContentFragmentImpl impleme
         }
         
         // construct and return properties map 
-        Map propertiesMap = new HashMap();
+        Map<String,String> propertiesMap = new HashMap<String,String>();
         Iterator propertyNamesIter = propertyNames.iterator();
         while (propertyNamesIter.hasNext())
         {
@@ -829,7 +828,7 @@ public class ContentFragmentImpl impleme
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.ContentFragment#updatePreferences(java.util.Map)
      */
-    public void updatePreferences(Map preferences)
+    public void updatePreferences(Map<String,?> preferences)
     {
         if (pageLayoutComponent != null)
         {
@@ -1006,7 +1005,7 @@ public class ContentFragmentImpl impleme
      * Get content fragment and parent by id.
      * 
      * @param id content fragment id
-     * @param parent returned parent content fragment
+     * @param parentFragment returned parent content fragment
      * @return content fragment
      */
     public ContentFragmentImpl getFragmentById(String id, ContentFragmentImpl [] parentFragment)
@@ -1474,7 +1473,7 @@ public class ContentFragmentImpl impleme
     /**
      * Set property.
      * 
-     * @param name property name
+     * @param propName property name
      * @param scope property scope
      * @param scopeValue property scope value
      * @param value property value

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentPreferenceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentPreferenceImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentPreferenceImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentFragmentPreferenceImpl.java Tue Mar 11 20:05:43 2014
@@ -16,11 +16,11 @@
  */
 package org.apache.jetspeed.om.page.impl;
 
+import org.apache.jetspeed.om.preference.FragmentPreference;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.jetspeed.om.preference.FragmentPreference;
-
 /**
  * Immutable content fragment preferences element implementation.
  * 
@@ -58,11 +58,11 @@ public class ContentFragmentPreferenceIm
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.preference.FragmentPreference#getValueList()
      */
-    public List getValueList()
+    public List<String> getValueList()
     {
         if (this.valueList == null)
         {
-            this.valueList = new ArrayList();            
+            this.valueList = new ArrayList();
         }
         return this.valueList;
     }
@@ -94,7 +94,7 @@ public class ContentFragmentPreferenceIm
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.preference.FragmentPreference#setValueList(java.util.List)
      */
-    public void setValueList(List values)
+    public void setValueList(List<String> values)
     {
         throw new UnsupportedOperationException("FragmentPreference.setValueList()");
     }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/om/page/impl/ContentPageImpl.java Tue Mar 11 20:05:43 2014
@@ -26,6 +26,7 @@ import org.apache.jetspeed.layout.impl.P
 import org.apache.jetspeed.om.page.BaseFragmentsElement;
 import org.apache.jetspeed.om.page.ContentFragment;
 import org.apache.jetspeed.om.page.ContentPage;
+import org.apache.jetspeed.om.page.FragmentDefinition;
 import org.apache.jetspeed.om.page.PageTemplate;
 import org.apache.jetspeed.om.portlet.GenericMetadata;
 
@@ -41,7 +42,7 @@ public class ContentPageImpl implements 
     private String id;
     private BaseFragmentsElement pageOrTemplate;
     private PageTemplate pageTemplate;
-    private Map fragmentDefinitions;
+    private Map<String,FragmentDefinition> fragmentDefinitions;
 
     private ContentFragmentImpl rootContentFragment;
     private GenericMetadata metadata;
@@ -86,7 +87,7 @@ public class ContentPageImpl implements 
      * @param pageTemplate PSML page template
      * @param fragmentDefinitions PSML fragment definitions
      */
-    public ContentPageImpl(PageLayoutComponent pageLayoutComponent, String id, BaseFragmentsElement pageOrTemplate, PageTemplate pageTemplate, Map fragmentDefinitions)
+    public ContentPageImpl(PageLayoutComponent pageLayoutComponent, String id, BaseFragmentsElement pageOrTemplate, PageTemplate pageTemplate, Map<String,FragmentDefinition> fragmentDefinitions)
     {
         this.pageLayoutComponent = pageLayoutComponent;
         this.id = id;
@@ -155,7 +156,7 @@ public class ContentPageImpl implements 
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.ContentPage#getFragmentDefinitions()
      */
-    public Map getFragmentDefinitions()
+    public Map<String,FragmentDefinition> getFragmentDefinitions()
     {
         return fragmentDefinitions;
     }
@@ -187,7 +188,7 @@ public class ContentPageImpl implements 
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.ContentPage#getFragmentsByName(java.lang.String)
      */
-    public List getFragmentsByName(String name)
+    public List<ContentFragment> getFragmentsByName(String name)
     {
         if (rootContentFragment != null)
         {
@@ -376,7 +377,7 @@ public class ContentPageImpl implements 
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.ContentPage#getFragmentsByName(java.lang.String, boolean)
      */
-    public List getFragmentsByName(String name, boolean nonTemplate)
+    public List<ContentFragment> getFragmentsByName(String name, boolean nonTemplate)
     {
         if (rootContentFragment != null)
         {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentElementImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentElementImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentElementImpl.java Tue Mar 11 20:05:43 2014
@@ -16,21 +16,22 @@
  */
 package org.apache.jetspeed.om.page.impl;
 
-import java.security.AccessController;
-import java.security.Permission;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.jetspeed.om.page.BaseFragmentElement;
 import org.apache.jetspeed.om.page.BaseFragmentValidationListener;
 import org.apache.jetspeed.om.page.FragmentProperty;
 import org.apache.jetspeed.om.page.PageSecurity;
+import org.apache.jetspeed.om.preference.FragmentPreference;
 import org.apache.jetspeed.page.FragmentPropertyList;
 import org.apache.jetspeed.page.PageManager;
 import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
 import org.apache.ojb.broker.PersistenceBroker;
 import org.apache.ojb.broker.PersistenceBrokerAware;
 
+import java.security.AccessController;
+import java.security.Permission;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * BaseFragmentElementImpl
  *
@@ -773,7 +774,7 @@ public abstract class BaseFragmentElemen
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.BaseFragmentElement#getProperties()
      */
-    public List getProperties()
+    public List<FragmentProperty> getProperties()
     {
         // get properties for this fragment from page manager
         // if fragment is not newly constructed
@@ -798,12 +799,12 @@ public abstract class BaseFragmentElemen
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.BaseFragmentElement#setProperties(java.util.List)
      */
-    public void setProperties(List properties)
+    public void setProperties(List<FragmentProperty> properties)
     {
         // set properties by replacing existing
         // entries with new elements if new collection
         // is specified
-        List fragmentProperties = getProperties();
+        List<FragmentProperty> fragmentProperties = getProperties();
         if (properties != fragmentProperties)
         {
             // replace all preferences
@@ -1034,7 +1035,7 @@ public abstract class BaseFragmentElemen
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.BaseFragmentElement#getPreferences()
      */
-    public List getPreferences()
+    public List<FragmentPreference> getPreferences()
     {
         // return mutable preferences list
         // by using list wrapper to manage
@@ -1049,12 +1050,12 @@ public abstract class BaseFragmentElemen
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.BaseFragmentElement#setPreferences(java.util.List)
      */
-    public void setPreferences(List preferences)
+    public void setPreferences(List<FragmentPreference> preferences)
     {
         // set preferences by replacing existing
         // entries with new elements if new collection
         // is specified
-        List fragmentPreferences = getPreferences();
+        List<FragmentPreference> fragmentPreferences = getPreferences();
         if (preferences != fragmentPreferences)
         {
             // replace all preferences

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java Tue Mar 11 20:05:43 2014
@@ -16,10 +16,6 @@
  */
 package org.apache.jetspeed.om.page.impl;
 
-import java.util.Collection;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.om.page.BaseFragmentElement;
 import org.apache.jetspeed.om.page.BaseFragmentValidationListener;
@@ -28,6 +24,10 @@ import org.apache.jetspeed.om.page.PageM
 import org.apache.jetspeed.page.document.impl.DocumentImpl;
 import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 /**
  * BaseFragmentsElementImpl
  *
@@ -198,7 +198,7 @@ public abstract class BaseFragmentsEleme
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.BaseFragmentsElement#getFragmentsByInterface(java.lang.Class)
      */
-    public List getFragmentsByInterface(Class interfaceFilter)
+    public List<BaseFragmentElement> getFragmentsByInterface(Class interfaceFilter)
     {
         // get fragments by interface and filter by access
         BaseFragmentElementImpl rootFragment = (BaseFragmentElementImpl)getRootFragment();
@@ -217,7 +217,7 @@ public abstract class BaseFragmentsEleme
                     // check access
                     rootFragment.checkAccess(JetspeedActions.VIEW);
                     // return immutable filtered fragment list
-                    List fragmentsList = new ArrayList();
+                    List<BaseFragmentElement> fragmentsList = new ArrayList<BaseFragmentElement>();
                     fragmentsList.add(rootFragment);
                     return fragmentsList;
                 }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BasePageElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BasePageElementImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BasePageElementImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BasePageElementImpl.java Tue Mar 11 20:05:43 2014
@@ -16,8 +16,6 @@
  */
 package org.apache.jetspeed.om.page.impl;
 
-import java.util.List;
-
 import org.apache.jetspeed.om.folder.MenuDefinition;
 import org.apache.jetspeed.om.folder.MenuExcludeDefinition;
 import org.apache.jetspeed.om.folder.MenuIncludeDefinition;
@@ -27,6 +25,8 @@ import org.apache.jetspeed.om.page.BaseP
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
 
+import java.util.List;
+
 /**
  * BasePageElementImpl
  *
@@ -131,7 +131,7 @@ public abstract class BasePageElementImp
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Page#getMenuDefinitions()
      */
-    public List getMenuDefinitions()
+    public List<MenuDefinition> getMenuDefinitions()
     {
         // return mutable menu definition list
         // by using list wrapper to manage
@@ -186,12 +186,12 @@ public abstract class BasePageElementImp
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Page#setMenuDefinitions(java.util.List)
      */
-    public void setMenuDefinitions(List definitions)
+    public void setMenuDefinitions(List<MenuDefinition> definitions)
     {
         // set menu definitions by replacing
         // existing entries with new elements if
         // new collection is specified
-        List menuDefinitions = getMenuDefinitions();
+        List<MenuDefinition> menuDefinitions = getMenuDefinitions();
         if (definitions != menuDefinitions)
         {
             // replace all menu definitions

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java Tue Mar 11 20:05:43 2014
@@ -16,9 +16,6 @@
  */
 package org.apache.jetspeed.om.page.impl;
 
-import java.util.Iterator;
-import java.util.List;
-
 import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.om.folder.Folder;
 import org.apache.jetspeed.om.page.BaseFragmentElement;
@@ -26,6 +23,10 @@ import org.apache.jetspeed.om.page.BaseF
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * FragmentImpl
  *
@@ -266,7 +267,7 @@ public class FragmentImpl extends BaseFr
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.Fragment#getFragments()
      */
-    public List getFragments()
+    public List<BaseFragmentElement> getFragments()
     {
         // create and return mutable fragments collection
         // filtered by view access
@@ -307,17 +308,17 @@ public class FragmentImpl extends BaseFr
      *
      * Filter fragments list for view access.
      *
-     * @param nodes list containing fragments to check
+     * @param fragments list containing fragments to check
      * @param mutable make returned list mutable
      * @return original list if all elements viewable, a filtered
      *         partial list, or null if all filtered for view access
      */
-    List filterFragmentsByAccess(List fragments, boolean mutable)
+    List<BaseFragmentElement> filterFragmentsByAccess(List<BaseFragmentElement> fragments, boolean mutable)
     {
         if ((fragments != null) && !fragments.isEmpty())
         {
             // check permissions and constraints, filter fragments as required
-            List filteredFragments = null;
+            List<BaseFragmentElement> filteredFragments = null;
             Iterator checkAccessIter = fragments.iterator();
             while (checkAccessIter.hasNext())
             {
@@ -341,7 +342,7 @@ public class FragmentImpl extends BaseFr
                     {
                         // not permitted, copy previously permitted fragments
                         // to new filteredFragments node set with same comparator
-                        filteredFragments = DatabasePageManagerUtils.createList();
+                        filteredFragments = new ArrayList<BaseFragmentElement>(fragments.size());
                         Iterator copyIter = fragments.iterator();
                         while (copyIter.hasNext())
                         {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java Tue Mar 11 20:05:43 2014
@@ -16,11 +16,11 @@
  */
 package org.apache.jetspeed.om.page.impl;
 
-import java.util.List;
-
 import org.apache.jetspeed.om.preference.FragmentPreference;
 import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
 
+import java.util.List;
+
 /**
  * FragmentPreferenceImpl
  *
@@ -91,7 +91,7 @@ public class FragmentPreferenceImpl impl
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.preference.FragmentPreference#getValueList()
      */
-    public List getValueList()
+    public List<String> getValueList()
     {
         // return mutable preference value list
         // using list wrapper to manage value order
@@ -105,12 +105,12 @@ public class FragmentPreferenceImpl impl
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.preference.FragmentPreference#setValueList(java.util.List)
      */
-    public void setValueList(List values)
+    public void setValueList(List<String> values)
     {
         // set preference values by replacing existing
         // entries with new elements if new collection
         // is specified
-        List preferenceValues = getValueList();
+        List<String> preferenceValues = getValueList();
         if (values != preferenceValues)
         {
             // replace all values

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java Tue Mar 11 20:05:43 2014
@@ -16,17 +16,17 @@
  */
 package org.apache.jetspeed.om.page.impl;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.jetspeed.om.common.SecurityConstraint;
 import org.apache.jetspeed.om.page.PageSecurity;
 import org.apache.jetspeed.om.page.SecurityConstraintsDef;
 import org.apache.jetspeed.page.document.impl.DocumentImpl;
 import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
 
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 /**
  * PageSecurityImpl
  *
@@ -103,7 +103,7 @@ public class PageSecurityImpl extends Do
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.PageSecurity#getSecurityConstraintsDefs()
      */
-    public List getSecurityConstraintsDefs()
+    public List<SecurityConstraintsDef> getSecurityConstraintsDefs()
     {
         // return mutable constraints defs list
         // by using list wrapper to manage
@@ -127,12 +127,12 @@ public class PageSecurityImpl extends Do
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.PageSecurity#setSecurityConstraintsDefs(java.util.List)
      */
-    public void setSecurityConstraintsDefs(List definitions)
+    public void setSecurityConstraintsDefs(List<SecurityConstraintsDef> definitions)
     {
         // set constraints defs by replacing existing
         // entries with new elements if new collection
         // is specified
-        List securityConstraintsDefs = getSecurityConstraintsDefs();
+        List<SecurityConstraintsDef> securityConstraintsDefs = getSecurityConstraintsDefs();
         if (definitions != securityConstraintsDefs)
         {
             // replace all constraints definitions
@@ -178,7 +178,7 @@ public class PageSecurityImpl extends Do
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.PageSecurity#getGlobalSecurityConstraintsRefs()
      */
-    public List getGlobalSecurityConstraintsRefs()
+    public List<String> getGlobalSecurityConstraintsRefs()
     {
         // return mutable constraints refs list
         // by using list wrapper to manage apply
@@ -193,12 +193,12 @@ public class PageSecurityImpl extends Do
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.PageSecurity#setGlobalSecurityConstraintsRefs(java.util.List)
      */
-    public void setGlobalSecurityConstraintsRefs(List constraintsRefs)
+    public void setGlobalSecurityConstraintsRefs(List<String> constraintsRefs)
     {
         // set constraints refs using ordered ref
         // names by replacing existing entries with
         // new elements if new collection is specified
-        List globalSecurityConstraintsRefs = getGlobalSecurityConstraintsRefs();
+        List<String> globalSecurityConstraintsRefs = getGlobalSecurityConstraintsRefs();
         if (constraintsRefs != globalSecurityConstraintsRefs)
         {
             // replace all constraints ref names

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsDefImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsDefImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsDefImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsDefImpl.java Tue Mar 11 20:05:43 2014
@@ -16,11 +16,12 @@
  */
 package org.apache.jetspeed.om.page.impl;
 
-import java.util.List;
-
+import org.apache.jetspeed.om.common.SecurityConstraint;
 import org.apache.jetspeed.om.page.SecurityConstraintsDef;
 import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
 
+import java.util.List;
+
 /**
  * SecurityConstraintsDefImpl
  *
@@ -71,7 +72,7 @@ public class SecurityConstraintsDefImpl 
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.SecurityConstraintsDef#getSecurityConstraints()
      */
-    public List getSecurityConstraints()
+    public List<SecurityConstraint> getSecurityConstraints()
     {
         // return mutable constraint def list
         // by using list wrapper to manage apply order
@@ -85,12 +86,12 @@ public class SecurityConstraintsDefImpl 
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.SecurityConstraintsDef#setSecurityConstraints(java.util.List)
      */
-    public void setSecurityConstraints(List constraints)
+    public void setSecurityConstraints(List<SecurityConstraint> constraints)
     {
         // set constraint defs by replacing existing
         // entries with new elements if new collection
         // is specified
-        List securityConstraintDefs = getSecurityConstraints();
+        List<SecurityConstraint> securityConstraintDefs = getSecurityConstraints();
         if (constraints != securityConstraintDefs)
         {
             // replace all constraints

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentElement.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentElement.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentElement.java Tue Mar 11 20:05:43 2014
@@ -17,16 +17,17 @@
 
 package org.apache.jetspeed.om.page.psml;
 
-import java.security.AccessController;
-import java.security.Permission;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.jetspeed.idgenerator.IdGenerator;
 import org.apache.jetspeed.om.page.BaseFragmentElement;
 import org.apache.jetspeed.om.page.BaseFragmentValidationListener;
 import org.apache.jetspeed.om.page.FragmentProperty;
 import org.apache.jetspeed.om.page.PageSecurity;
+import org.apache.jetspeed.om.preference.FragmentPreference;
+
+import java.security.AccessController;
+import java.security.Permission;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * AbstractBaseFragmentElement
@@ -373,7 +374,7 @@ public abstract class AbstractBaseFragme
     /**
      * @see org.apache.jetspeed.om.page.BaseFragmentElement#getProperties()
      */
-    public List getProperties()
+    public List<FragmentProperty> getProperties()
     {
         return new PropertiesList(PropertyImpl.filterFragmentProperties(propertyImpls), propertyImpls);
     }
@@ -381,11 +382,11 @@ public abstract class AbstractBaseFragme
     /**
      * @see org.apache.jetspeed.om.page.BaseFragmentElement#setProperties(java.util.List)
      */
-    public void setProperties(List properties)
+    public void setProperties(List<FragmentProperty> properties)
     {
         // get and remove all filtered properties and replace
         // with new specified properties
-        List propertiesList = getProperties();
+        List<FragmentProperty> propertiesList = getProperties();
         propertiesList.clear();
         propertiesList.addAll(properties);
     } 
@@ -632,7 +633,7 @@ public abstract class AbstractBaseFragme
      * 
      * @see org.apache.jetspeed.om.page.BaseFragmentElement#getPreferences()
      */
-    public List getPreferences()
+    public List<FragmentPreference> getPreferences()
     {
         return preferences;
     }
@@ -645,7 +646,7 @@ public abstract class AbstractBaseFragme
      * @see org.apache.jetspeed.om.page.BaseFragmentElement#setPreferences(java.util.List)
      * @param preferences
      */
-    public void setPreferences(List preferences)
+    public void setPreferences(List<FragmentPreference> preferences)
     {
         if (preferences == null)
         {
@@ -667,7 +668,7 @@ public abstract class AbstractBaseFragme
     /**
      * Set owning base fragments element.
      * 
-     * @param base fragments element
+     * @param baseFragmentsElement fragments element
      */
     void setBaseFragmentsElement(AbstractBaseFragmentsElement baseFragmentsElement)
     {
@@ -819,7 +820,7 @@ public abstract class AbstractBaseFragme
     /**
      * Castor raw property member access.
      * 
-     * @param decorator property value
+     * @param skin property value
      */
     public void setSkinPropertyField(String skin)
     {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentsElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentsElement.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentsElement.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentsElement.java Tue Mar 11 20:05:43 2014
@@ -17,6 +17,12 @@
 
 package org.apache.jetspeed.om.page.psml;
 
+import org.apache.jetspeed.idgenerator.IdGenerator;
+import org.apache.jetspeed.om.page.BaseFragmentElement;
+import org.apache.jetspeed.om.page.BaseFragmentValidationListener;
+import org.apache.jetspeed.om.page.BaseFragmentsElement;
+import org.apache.jetspeed.om.page.Fragment;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -24,12 +30,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
-import org.apache.jetspeed.idgenerator.IdGenerator;
-import org.apache.jetspeed.om.page.BaseFragmentElement;
-import org.apache.jetspeed.om.page.BaseFragmentValidationListener;
-import org.apache.jetspeed.om.page.BaseFragmentsElement;
-import org.apache.jetspeed.om.page.Fragment;
-
 /**
  * AbstractBaseFragmentsElement
  *
@@ -232,9 +232,9 @@ public abstract class AbstractBaseFragme
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.BaseFragmentsElement#getFragmentsByName(java.lang.String)
      */
-    public List getFragmentsByName( String name )
+    public List<BaseFragmentElement> getFragmentsByName( String name )
     {
-        List fragments = new ArrayList();
+        List<BaseFragmentElement> fragments = new ArrayList<BaseFragmentElement>();
 
         Stack stack = new Stack();
         if (getRootFragment() != null)
@@ -278,9 +278,9 @@ public abstract class AbstractBaseFragme
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.page.BaseFragmentsElement#getFragmentsByInterface(java.lang.Class)
      */
-    public List getFragmentsByInterface( Class interfaceFilter )
+    public List<BaseFragmentElement> getFragmentsByInterface( Class interfaceFilter )
     {
-        List fragments = new ArrayList();
+        List<BaseFragmentElement> fragments = new ArrayList<BaseFragmentElement>();
 
         Stack stack = new Stack();
         if (getRootFragment() != null)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBasePageElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBasePageElement.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBasePageElement.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBasePageElement.java Tue Mar 11 20:05:43 2014
@@ -17,9 +17,6 @@
 
 package org.apache.jetspeed.om.page.psml;
 
-import java.util.Iterator;
-import java.util.List;
-
 import org.apache.jetspeed.idgenerator.IdGenerator;
 import org.apache.jetspeed.om.folder.MenuDefinition;
 import org.apache.jetspeed.om.folder.MenuExcludeDefinition;
@@ -33,6 +30,9 @@ import org.apache.jetspeed.om.folder.psm
 import org.apache.jetspeed.om.folder.psml.MenuSeparatorDefinitionImpl;
 import org.apache.jetspeed.om.page.BasePageElement;
 
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * AbstractBasePageElement
  *
@@ -84,7 +84,7 @@ public abstract class AbstractBasePageEl
      *
      * @return definition list
      */
-    public List getMenuDefinitions()
+    public List<MenuDefinition> getMenuDefinitions()
     {
         return menuDefinitions;
     }
@@ -144,7 +144,7 @@ public abstract class AbstractBasePageEl
      *
      * @param definitions definition list
      */
-    public void setMenuDefinitions(List definitions)
+    public void setMenuDefinitions(List<MenuDefinition> definitions)
     {
         menuDefinitions = definitions;
     }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java Tue Mar 11 20:05:43 2014
@@ -17,13 +17,6 @@
 
 package org.apache.jetspeed.om.page.psml;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
 import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.idgenerator.IdGenerator;
 import org.apache.jetspeed.om.folder.Folder;
@@ -31,6 +24,13 @@ import org.apache.jetspeed.om.page.BaseF
 import org.apache.jetspeed.om.page.BaseFragmentValidationListener;
 import org.apache.jetspeed.om.page.Fragment;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
 /**
  * @version $Id$
  */
@@ -70,7 +70,7 @@ public class FragmentImpl extends Abstra
         return fragments;
     }
 
-    public List getFragments()
+    public List<BaseFragmentElement> getFragments()
     {
         // create and return mutable fragments collection
         // filtered by view access
@@ -357,16 +357,16 @@ public class FragmentImpl extends Abstra
      *
      * Filter fragments list for view access.
      *
-     * @param nodes list containing fragments to check
+     * @param fragments list containing fragments to check
      * @return original list if all elements viewable, a filtered
      *         partial list, or null if all filtered for view access
      */
-    List filterFragmentsByAccess(List fragments)
+    List<BaseFragmentElement> filterFragmentsByAccess(List<BaseFragmentElement> fragments)
     {
         if ((fragments != null) && !fragments.isEmpty())
         {
             // check permissions and constraints, filter fragments as required
-            List filteredFragments = null;
+            List<BaseFragmentElement> filteredFragments = null;
             Iterator checkAccessIter = fragments.iterator();
             while (checkAccessIter.hasNext())
             {
@@ -390,7 +390,7 @@ public class FragmentImpl extends Abstra
                     {
                         // not permitted, copy previously permitted fragments
                         // to new filteredFragments node set with same comparator
-                        filteredFragments = new ArrayList(fragments.size());
+                        filteredFragments = new ArrayList<BaseFragmentElement>(fragments.size());
                         Iterator copyIter = fragments.iterator();
                         while (copyIter.hasNext())
                         {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentPreferenceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentPreferenceImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentPreferenceImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentPreferenceImpl.java Tue Mar 11 20:05:43 2014
@@ -16,11 +16,11 @@
  */
 package org.apache.jetspeed.om.page.psml;
 
+import org.apache.jetspeed.om.preference.FragmentPreference;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.jetspeed.om.preference.FragmentPreference;
-
 /**
  * 
  * Preference implementation to be used with Fragment-based
@@ -55,7 +55,7 @@ public class FragmentPreferenceImpl impl
         this.readOnly = readOnly;
     }
     
-    public List getValueList()
+    public List<String> getValueList()
     {
         if (this.values == null)
         {
@@ -64,7 +64,7 @@ public class FragmentPreferenceImpl impl
         return this.values;
     }
     
-    public void setValueList(List values)
+    public void setValueList(List<String> values)
     {
         this.values = values;
     }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java Tue Mar 11 20:05:43 2014
@@ -16,14 +16,14 @@
  */
 package org.apache.jetspeed.om.page.psml;
 
+import org.apache.jetspeed.om.page.PageSecurity;
+import org.apache.jetspeed.om.page.SecurityConstraintsDef;
+
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.jetspeed.om.page.PageSecurity;
-import org.apache.jetspeed.om.page.SecurityConstraintsDef;
-
 /**
  * <p>
  * SecurityImpl
@@ -64,7 +64,7 @@ public class PageSecurityImpl extends Do
      * @see org.apache.jetspeed.om.page.PageSecurity#getSecurityConstraintsDefs()
      * @return
      */
-    public List getSecurityConstraintsDefs()
+    public List<SecurityConstraintsDef> getSecurityConstraintsDefs()
     {
         return constraintsDefsList;
     }
@@ -75,9 +75,9 @@ public class PageSecurityImpl extends Do
      * </p>
      *
      * @see org.apache.jetspeed.om.page.PageSecurity#setSecurityConstraintsDefs(java.util.List)
-     * @param defintions
+     * @param definitions
      */
-    public void setSecurityConstraintsDefs(List definitions)
+    public void setSecurityConstraintsDefs(List<SecurityConstraintsDef> definitions)
     {
         constraintsDefsList = definitions;
         constraintsDefsMap = null;

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsDefImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsDefImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsDefImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsDefImpl.java Tue Mar 11 20:05:43 2014
@@ -19,6 +19,7 @@ package org.apache.jetspeed.om.page.psml
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.jetspeed.om.common.SecurityConstraint;
 import org.apache.jetspeed.om.page.SecurityConstraintsDef;
 
 /**
@@ -43,7 +44,7 @@ public class SecurityConstraintsDefImpl 
      * getName
      * </p>
      *
-     * @see org.apache.jetspeed.om.common.SecurityConstraintsDef#getName()
+     * @see org.apache.jetspeed.om.page.SecurityConstraintsDef#getName()
      * @return
      */
     public String getName()
@@ -56,7 +57,7 @@ public class SecurityConstraintsDefImpl 
      * setName
      * </p>
      *
-     * @see org.apache.jetspeed.om.common.SecurityConstraintsDef#setName(java.lang.String)
+     * @see org.apache.jetspeed.om.page.SecurityConstraintsDef#setName(java.lang.String)
      * @param name
      */
     public void setName(String name)
@@ -69,10 +70,10 @@ public class SecurityConstraintsDefImpl 
      * getSecurityConstraints
      * </p>
      *
-     * @see org.apache.jetspeed.om.common.SecurityConstraintsDef#getSecurityConstraints()
+     * @see org.apache.jetspeed.om.page.SecurityConstraintsDef#getSecurityConstraints()
      * @return
      */
-    public List getSecurityConstraints()
+    public List<SecurityConstraint> getSecurityConstraints()
     {
         return constraints;
     }
@@ -82,10 +83,10 @@ public class SecurityConstraintsDefImpl 
      * setSecurityConstraint
      * </p>
      *
-     * @see org.apache.jetspeed.om.common.SecurityConstraintsDef#setSecurityConstraints(java.util.List)
+     * @see org.apache.jetspeed.om.page.SecurityConstraintsDef#setSecurityConstraints(java.util.List)
      * @param constraints
      */
-    public void setSecurityConstraints(List constraints)
+    public void setSecurityConstraints(List<SecurityConstraint> constraints)
     {
         this.constraints = constraints;
     }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java Tue Mar 11 20:05:43 2014
@@ -16,16 +16,6 @@
  */
 package org.apache.jetspeed.portalsite.impl;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Locale;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.apache.jetspeed.om.folder.Folder;
 import org.apache.jetspeed.om.folder.MenuDefinition;
 import org.apache.jetspeed.om.folder.MenuExcludeDefinition;
@@ -44,6 +34,16 @@ import org.apache.jetspeed.portalsite.me
 import org.apache.jetspeed.portalsite.menu.DefaultMenuOptionsDefinition;
 import org.apache.jetspeed.portalsite.view.AbstractSiteView;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Locale;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * This class implements the portal-site menu elements
  * constructed and returned to decorators.
@@ -75,7 +75,6 @@ public class MenuImpl extends MenuElemen
     /**
      * MenuImpl - request/session context dependent constructor
      *
-     * @param view site view used to construct menu
      * @param definition menu definition
      * @param path menu definition path
      * @param context request context

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesServiceImpl.java Tue Mar 11 20:05:43 2014
@@ -16,20 +16,6 @@
  */
 package org.apache.jetspeed.components.portletpreferences;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Map.Entry;
-
-import javax.portlet.PortletRequest;
-import javax.portlet.PreferencesValidator;
-import javax.portlet.ValidatorException;
-
 import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.cache.CacheElement;
 import org.apache.jetspeed.cache.JetspeedCache;
@@ -51,6 +37,19 @@ import org.apache.pluto.container.Portle
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 import org.springframework.orm.ojb.support.PersistenceBrokerDaoSupport;
 
+import javax.portlet.PortletRequest;
+import javax.portlet.PreferencesValidator;
+import javax.portlet.ValidatorException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+
 /**
  * <p>
  * Pluto Preferences Service. This service is designed to work with an existing
@@ -568,7 +567,6 @@ public class PortletPreferencesServiceIm
     /**
      * Jetspeed: PortletPreferencesProvider
      */        
-    @SuppressWarnings("unchecked")
     public void storeEntityPreferences(Map<String, PortletPreference> map, PortletWindow window)
             throws PreferencesException
     {

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/layout/PageLayoutComponent.java Tue Mar 11 20:05:43 2014
@@ -392,7 +392,7 @@ public interface PageLayoutComponent
      * @param contentFragment content fragment context
      * @param preferences map of new preferences set.
      */
-    void updatePreferences(ContentFragment contentFragment, Map<String, Object> preferences);
+    void updatePreferences(ContentFragment contentFragment, Map<String,?> preferences);
 
     /**
      * Update global fragment property.

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BaseFragmentElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BaseFragmentElement.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BaseFragmentElement.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BaseFragmentElement.java Tue Mar 11 20:05:43 2014
@@ -17,6 +17,8 @@
 
 package org.apache.jetspeed.om.page;
 
+import org.apache.jetspeed.om.preference.FragmentPreference;
+
 import java.util.List;
 
 /**
@@ -339,14 +341,14 @@ public interface BaseFragmentElement ext
      *
      * @return list of FragmentProperty instances
      */
-    List getProperties();
+    List<FragmentProperty> getProperties();
 
     /**
      * Set collection of fragment property objects
      * 
-     * @param preferences list of FragmentPreference objects
+     * @param properties list of FragmentPreference objects
      */
-    void setProperties(List properties);
+    void setProperties(List<FragmentProperty> properties);
 
     /**
      * Get layout row property.
@@ -578,12 +580,12 @@ public interface BaseFragmentElement ext
      * 
      * @return list of FragmentPreference objects
      */
-    List getPreferences();
+    List<FragmentPreference> getPreferences();
 
     /**
      * Set collection of fragment preference objects
      * 
      * @param preferences list of FragmentPreference objects
      */
-    void setPreferences(List preferences);
+    void setPreferences(List<FragmentPreference> preferences);
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BaseFragmentsElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BaseFragmentsElement.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BaseFragmentsElement.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BaseFragmentsElement.java Tue Mar 11 20:05:43 2014
@@ -67,7 +67,7 @@ public interface BaseFragmentsElement ex
      * @param name the fragment name to look for
      * @return the list of found Fragment objects or null if not found
      */
-    List getFragmentsByName(String name);
+    List<BaseFragmentElement> getFragmentsByName(String name);
 
     /**
      * Retrieves the fragments contained within this page, with the
@@ -76,5 +76,5 @@ public interface BaseFragmentsElement ex
      * @param interfaceFilter the fragment interface to match or null for all
      * @return the list of found Fragment objects or null if not found
      */
-    List getFragmentsByInterface(Class interfaceFilter);
+    List<BaseFragmentElement> getFragmentsByInterface(Class interfaceFilter);
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BasePageElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BasePageElement.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BasePageElement.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/BasePageElement.java Tue Mar 11 20:05:43 2014
@@ -16,14 +16,14 @@
  */
 package org.apache.jetspeed.om.page;
 
-import java.util.List;
-
 import org.apache.jetspeed.om.folder.MenuDefinition;
 import org.apache.jetspeed.om.folder.MenuExcludeDefinition;
 import org.apache.jetspeed.om.folder.MenuIncludeDefinition;
 import org.apache.jetspeed.om.folder.MenuOptionsDefinition;
 import org.apache.jetspeed.om.folder.MenuSeparatorDefinition;
 
+import java.util.List;
+
 /**
  * This interface represents a generic page document used by Jetspeed
  * to layout a portal page.
@@ -70,7 +70,7 @@ public interface BasePageElement extends
      *
      * @return definition list
      */
-    List getMenuDefinitions();
+    List<MenuDefinition> getMenuDefinitions();
 
     /**
      * newMenuDefinition - creates a new empty menu definition
@@ -112,5 +112,5 @@ public interface BasePageElement extends
      *
      * @param definitions definition list
      */
-    void setMenuDefinitions(List definitions);    
+    void setMenuDefinitions(List<MenuDefinition> definitions);
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentFragment.java Tue Mar 11 20:05:43 2014
@@ -21,6 +21,7 @@ import org.apache.jetspeed.decoration.De
 import org.apache.jetspeed.layout.PageLayoutComponent;
 import org.apache.jetspeed.om.common.SecurityConstraint;
 import org.apache.jetspeed.om.common.SecurityConstraints;
+import org.apache.jetspeed.om.preference.FragmentPreference;
 
 import java.util.List;
 import java.util.Map;
@@ -278,7 +279,7 @@ public interface ContentFragment
      *
      * @return list of FragmentProperty instances
      */
-    List getProperties();
+    List<FragmentProperty> getProperties();
 
     /**
      * Get named property value map. Property values are returned
@@ -287,7 +288,7 @@ public interface ContentFragment
      *
      * @return map of fragment property values
      */
-    Map getPropertiesMap();
+    Map<String,String> getPropertiesMap();
 
     /**
      * Get layout row property.
@@ -367,7 +368,7 @@ public interface ContentFragment
      * 
      * @return list of FragmentPreference objects
      */
-    List getPreferences();    
+    List<FragmentPreference> getPreferences();
     
     /************** Fragment **************/
     
@@ -618,7 +619,7 @@ public interface ContentFragment
      * 
      * @param preferences map of new preferences set.
      */
-    void updatePreferences(Map preferences);
+    void updatePreferences(Map<String,?> preferences);
 
     /**
      * Update fragment property. The default, (Global), scope value

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/ContentPage.java Tue Mar 11 20:05:43 2014
@@ -16,13 +16,13 @@
 */
 package org.apache.jetspeed.om.page;
 
+import org.apache.jetspeed.layout.PageLayoutComponent;
+import org.apache.jetspeed.om.portlet.GenericMetadata;
+
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.jetspeed.layout.PageLayoutComponent;
-import org.apache.jetspeed.om.portlet.GenericMetadata;
-
 /**
  * ContentPage is a read-only version of the {@link org.apache.jetspeed.om.page.Page}
  * object for use in rendering. <code>Page</code> objects are persistent, single-instance 
@@ -173,7 +173,7 @@ public interface ContentPage
      * @param name name of the ContentFragments we want to retrieve.
      * @return list of ContentFragment
      */
-    List getFragmentsByName(String name);
+    List<ContentFragment> getFragmentsByName(String name);
     
     /************** BaseConcretePageElement **************/
 
@@ -238,7 +238,7 @@ public interface ContentPage
      * 
      * @return persistent fragment definitions or null
      */
-    Map getFragmentDefinitions();
+    Map<String,FragmentDefinition> getFragmentDefinitions();
     
     /**
      * Returns the PageLayoutComponent that generated this ContentPage
@@ -271,7 +271,7 @@ public interface ContentPage
      * @param nonTemplate return only non-template matching fragments
      * @return list of matching content fragments
      */
-    List getFragmentsByName(String name, boolean nonTemplate);
+    List<ContentFragment> getFragmentsByName(String name, boolean nonTemplate);
     
     /**
      * Returns the root layout fragment which is not merged

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/Fragment.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/Fragment.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/Fragment.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/Fragment.java Tue Mar 11 20:05:43 2014
@@ -94,7 +94,7 @@ public interface Fragment extends BaseFr
      *
      * @return a collection containing BaseFragmentElement objects
      */
-    List getFragments();
+    List<BaseFragmentElement> getFragments();
     
     /**
      * Retrieves the fragment contained within this fragment, with the

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/PageSecurity.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/PageSecurity.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/PageSecurity.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/PageSecurity.java Tue Mar 11 20:05:43 2014
@@ -41,7 +41,7 @@ public interface PageSecurity extends Do
      *
      * @return security constraints definitions of type SecurityConstraintsDef
      */
-    List getSecurityConstraintsDefs();
+    List<SecurityConstraintsDef> getSecurityConstraintsDefs();
     
     /**
      * <p>
@@ -57,9 +57,9 @@ public interface PageSecurity extends Do
      * setSecurityConstraintsDefs
      * </p>
      *
-     * @param defintions security constraints definitions
+     * @param definitions security constraints definitions
      */
-    void setSecurityConstraintsDefs(List definitions);
+    void setSecurityConstraintsDefs(List<SecurityConstraintsDef> definitions);
 
     /**
      * <p>
@@ -78,7 +78,7 @@ public interface PageSecurity extends Do
      *
      * @return global security constraints references of element type String
      */
-    List getGlobalSecurityConstraintsRefs();
+    List<String> getGlobalSecurityConstraintsRefs();
     
     /**
      * <p>
@@ -87,5 +87,5 @@ public interface PageSecurity extends Do
      *
      * @param constraintsRefs global security constraints references
      */
-    void setGlobalSecurityConstraintsRefs(List constraintsRefs);
+    void setGlobalSecurityConstraintsRefs(List<String> constraintsRefs);
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsDef.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsDef.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsDef.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsDef.java Tue Mar 11 20:05:43 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.jetspeed.om.page;
 
+import org.apache.jetspeed.om.common.SecurityConstraint;
+
 import java.util.List;
 
 /**
@@ -57,7 +59,7 @@ public interface SecurityConstraintsDef
      *
      * @return security constraints list for resource
      */
-    List getSecurityConstraints();
+    List<SecurityConstraint> getSecurityConstraints();
     
     /**
      * <p>
@@ -66,5 +68,5 @@ public interface SecurityConstraintsDef
      *
      * @param constraints security constraints for resource
      */
-    void setSecurityConstraints(List constraints);
+    void setSecurityConstraints(List<SecurityConstraint> constraints);
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/preference/FragmentPreference.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/preference/FragmentPreference.java?rev=1576488&r1=1576487&r2=1576488&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/preference/FragmentPreference.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/preference/FragmentPreference.java Tue Mar 11 20:05:43 2014
@@ -59,12 +59,12 @@ public interface FragmentPreference
      *
      * @return list of String preference values
      */
-    List getValueList();
+    List<String> getValueList();
     
     /**
      * setValueList
      *
      * @param values list of String preference values
      */
-    void setValueList(List values);
+    void setValueList(List<String> values);
 }



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