Author: rwatler
Date: Sun Mar 28 21:33:24 2010
New Revision: 928497
URL: http://svn.apache.org/viewvc?rev=928497&view=rev
Log:
correct page fragment list owning page maintenance logic to include new
fragment references and page fragments
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentList.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentList.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentList.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/FragmentList.java?rev=928497&r1=928496&r2=928497&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentList.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentList.java
Sun Mar 28 21:33:24 2010
@@ -42,9 +42,9 @@ class FragmentList extends AbstractList
// implement for modifiable AbstractList:
// add and maintain page implementation reference
fragment.accessFragments().add(index, element);
- if ((fragment.getBaseFragmentsElement() != null) && (element
instanceof FragmentImpl))
+ if ((fragment.getBaseFragmentsElement() != null) && (element
instanceof BaseFragmentElementImpl))
{
-
((FragmentImpl)element).setBaseFragmentsElement(fragment.getBaseFragmentsElement());
+
((BaseFragmentElementImpl)element).setBaseFragmentsElement(fragment.getBaseFragmentsElement());
}
}
@@ -74,9 +74,9 @@ class FragmentList extends AbstractList
// implement for modifiable AbstractList:
// set and maintain page implementation reference
Object o = fragment.accessFragments().set(index, element);
- if ((fragment.getBaseFragmentsElement() != null) && (element
instanceof FragmentImpl))
+ if ((fragment.getBaseFragmentsElement() != null) && (element
instanceof BaseFragmentElementImpl))
{
-
((FragmentImpl)element).setBaseFragmentsElement(fragment.getBaseFragmentsElement());
+
((BaseFragmentElementImpl)element).setBaseFragmentsElement(fragment.getBaseFragmentsElement());
}
return o;
}
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentList.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/FragmentList.java?rev=928497&r1=928496&r2=928497&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentList.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentList.java
Sun Mar 28 21:33:24 2010
@@ -42,9 +42,9 @@ class FragmentList extends AbstractList
// implement for modifiable AbstractList:
// add and maintain base fragments implementation reference
fragment.accessFragments().add(index, element);
- if ((fragment.getBaseFragmentsElement() != null) && (element
instanceof FragmentImpl))
+ if ((fragment.getBaseFragmentsElement() != null) && (element
instanceof AbstractBaseFragmentElement))
{
-
((FragmentImpl)element).setBaseFragmentsElement(fragment.getBaseFragmentsElement());
+
((AbstractBaseFragmentElement)element).setBaseFragmentsElement(fragment.getBaseFragmentsElement());
}
}
@@ -74,9 +74,9 @@ class FragmentList extends AbstractList
// implement for modifiable AbstractList:
// set and maintain base fragments implementation reference
Object o = fragment.accessFragments().set(index, element);
- if ((fragment.getBaseFragmentsElement() != null) && (element
instanceof FragmentImpl))
+ if ((fragment.getBaseFragmentsElement() != null) && (element
instanceof AbstractBaseFragmentElement))
{
-
((FragmentImpl)element).setBaseFragmentsElement(fragment.getBaseFragmentsElement());
+
((AbstractBaseFragmentElement)element).setBaseFragmentsElement(fragment.getBaseFragmentsElement());
}
return o;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
