Author: rwatler
Date: Tue Dec 22 00:29:22 2009
New Revision: 893046
URL: http://svn.apache.org/viewvc?rev=893046&view=rev
Log:
removed recycling of root fragments special case since fragments not recycled
in general
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java
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=893046&r1=893045&r2=893046&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 Dec 22 00:29:22 2009
@@ -38,8 +38,6 @@
private String ojbConcreteClass = getClass().getName();
private Collection fragment;
- private BaseFragmentElementImpl removedFragment;
-
/**
* Default constructor to specify security constraints
*/
@@ -84,72 +82,12 @@
}
else if (!this.fragment.isEmpty())
{
- removedFragment =
(BaseFragmentElementImpl)this.fragment.iterator().next();
this.fragment.clear();
}
// add new or reuse singleton fragment
BaseFragmentElementImpl addFragment =
(BaseFragmentElementImpl)fragment;
BaseFragmentElementImpl reuseFragment = null;
- if (fragment instanceof FragmentImpl)
- {
- // add new fragment or copy configuration
- // from previously removed fragment
- if (removedFragment instanceof FragmentImpl)
- {
- // reuse previously removed fragment
- reuseFragment = removedFragment;
- addFragment = reuseFragment;
- removedFragment = null;
- // TODO: move this logic to copy methods on implementations
- FragmentImpl fragmentImpl = (FragmentImpl)fragment;
- FragmentImpl reuseFragmentImpl =
(FragmentImpl)reuseFragment;
- reuseFragmentImpl.setName(fragmentImpl.getName());
- reuseFragmentImpl.setType(fragmentImpl.getType());
- reuseFragmentImpl.getFragments().clear();
-
reuseFragmentImpl.getFragments().addAll(fragmentImpl.getFragments());
- }
- }
- else if (fragment instanceof FragmentReferenceImpl)
- {
- // add new fragment or copy configuration
- // from previously removed fragment
- if (removedFragment instanceof FragmentReferenceImpl)
- {
- // reuse previously removed fragment
- reuseFragment = removedFragment;
- addFragment = reuseFragment;
- removedFragment = null;
- // TODO: move this logic to copy methods on implementations
- FragmentReferenceImpl fragmentImpl =
(FragmentReferenceImpl)fragment;
- FragmentReferenceImpl reuseFragmentImpl =
(FragmentReferenceImpl)reuseFragment;
- reuseFragmentImpl.setRefId(fragmentImpl.getRefId());
- }
- }
- else if (fragment instanceof PageFragmentImpl)
- {
- // add new fragment or copy configuration
- // from previously removed fragment
- if (removedFragment instanceof PageFragmentImpl)
- {
- // reuse previously removed fragment
- reuseFragment = removedFragment;
- addFragment = reuseFragment;
- removedFragment = null;
- }
- }
- if (reuseFragment != null)
- {
- // TODO: move this logic to copy methods on implementations
- reuseFragment.setTitle(baseFragmentImpl.getTitle());
- reuseFragment.setShortTitle(baseFragmentImpl.getShortTitle());
- reuseFragment.setSkin(baseFragmentImpl.getSkin());
- reuseFragment.setDecorator(baseFragmentImpl.getDecorator());
- reuseFragment.setState(baseFragmentImpl.getState());
-
reuseFragment.setSecurityConstraints(baseFragmentImpl.getSecurityConstraints());
- reuseFragment.setProperties(baseFragmentImpl.getProperties());
-
reuseFragment.setPreferences(baseFragmentImpl.getPreferences());
- }
this.fragment.add(addFragment);
// set base fragments implementation in root and children fragments
@@ -161,7 +99,6 @@
// removed fragment for later reuse
if ((this.fragment != null) && !this.fragment.isEmpty())
{
- removedFragment =
(BaseFragmentElementImpl)this.fragment.iterator().next();
this.fragment.clear();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
