Author: cziegeler Date: Mon Dec 27 05:51:59 2004 New Revision: 123407 URL: http://svn.apache.org/viewcvs?view=rev&rev=123407 Log: Formatting Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/ActionRequest.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AspectUtil.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/Basket.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketEvent.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/CleanBasketEvent.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/RefreshBasketEvent.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/SaveBasketEvent.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletDataEvent.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/Event.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/LayoutEvent.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionListImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowListImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionListImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletMapping.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/Support.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/UnmodifiableSet.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/servlet/ServletResponseImpl.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSource.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSourceFactory.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletBaseDataReferenceFieldHandler.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletDataReferenceFieldHandler.java cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletInstanceDataReferenceFieldHandler.java
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/ActionRequest.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/ActionRequest.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/ActionRequest.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/ActionRequest.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/ActionRequest.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/environment/portlet/ActionRequest.java Mon Dec 27 05:51:59 2004 @@ -44,9 +44,8 @@ public String getCharacterEncoding() { if (super.getCharacterEncoding() == null) { return getActionRequest().getCharacterEncoding(); - } else { - return super.getCharacterEncoding(); } + return super.getCharacterEncoding(); } /** @@ -55,6 +54,7 @@ public String getMethod() { return "POST"; } + // ActionRequest API methods Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/LinkService.java Mon Dec 27 05:51:59 2004 @@ -48,7 +48,7 @@ /** * Get the uri for this coplet containing the additional events. - * @param events The events to add: These can either be [EMAIL PROTECTED] Event}s or [EMAIL PROTECTED] ParameterDescription}s. + * @param events The events to add: These can either be [EMAIL PROTECTED] Event}s or [EMAIL PROTECTED] #ParameterDescription}s. * @return A URI */ String getLinkURI(List events); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AspectUtil.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AspectUtil.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AspectUtil.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AspectUtil.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AspectUtil.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/AspectUtil.java Mon Dec 27 05:51:59 2004 @@ -27,7 +27,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: AspectUtil.java,v 1.5 2004/03/05 13:02:10 bdelacretaz Exp $ + * @version CVS $Id$ */ public class AspectUtil { @@ -41,13 +41,12 @@ Constructor constructor = clazz.getConstructor(new Class[] {String.class}); String value = (desc.getDefaultValue() == null ? "0" : desc.getDefaultValue()); return constructor.newInstance(new String[] {value}); - } else { - if ( desc.getDefaultValue() != null ) { - Constructor constructor = clazz.getConstructor(new Class[] {String.class}); - return constructor.newInstance(new String[] {desc.getDefaultValue()}); - } - return clazz.newInstance(); } + if ( desc.getDefaultValue() != null ) { + Constructor constructor = clazz.getConstructor(new Class[] {String.class}); + return constructor.newInstance(new String[] {desc.getDefaultValue()}); + } + return clazz.newInstance(); } catch (Exception ignore) { return null; } @@ -60,16 +59,14 @@ if ( !clazz.equals(value.getClass())) { Constructor constructor = clazz.getConstructor(new Class[] {String.class}); return constructor.newInstance(new String[] {value.toString()}); - } else { - return value; - } - } else { - if ( !value.getClass().equals(clazz) ) { - // FIXME - this is catch by "ignore" - throw new RuntimeException("Class of aspect doesn't match description."); } return value; } + if ( !value.getClass().equals(clazz) ) { + // FIXME - this is catch by "ignore" + throw new RuntimeException("Class of aspect doesn't match description."); + } + return value; } catch (Exception ignore) { // if we can't convert, well we don't do it :) return value; Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java Mon Dec 27 05:51:59 2004 @@ -99,8 +99,8 @@ while (iterator.hasNext()) { entry = (Map.Entry) iterator.next(); AttributedMapItem item = new AttributedMapItem(); - item.setKey((String) entry.getKey()); - item.setValue((String) entry.getValue()); + item.setKey(entry.getKey()); + item.setValue(entry.getValue()); set.add(item); } return set; @@ -189,5 +189,4 @@ return null; } } - -} \ No newline at end of file +} Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/Basket.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/Basket.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/Basket.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/Basket.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/Basket.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/Basket.java Mon Dec 27 05:51:59 2004 @@ -27,7 +27,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: Basket.java,v 1.2 2004/03/05 13:02:11 bdelacretaz Exp $ + * @version CVS $Id$ */ public class Basket implements Serializable { @@ -38,6 +38,7 @@ * The constructor */ public Basket() { + // nothing to do } /** Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketEvent.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketEvent.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketEvent.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketEvent.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketEvent.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketEvent.java Mon Dec 27 05:51:59 2004 @@ -22,8 +22,9 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: BasketEvent.java,v 1.2 2004/03/05 13:02:11 bdelacretaz Exp $ + * @version CVS $Id$ */ public abstract class BasketEvent implements Event { + // just a marker interface } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java Mon Dec 27 05:51:59 2004 @@ -67,7 +67,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: BasketManagerImpl.java,v 1.3 2004/03/05 13:02:11 bdelacretaz Exp $ + * @version CVS $Id$ */ public class BasketManagerImpl extends AbstractLogEnabled @@ -194,6 +194,7 @@ ci.setContent(c); basket.addItem(ci); } catch (Exception ignore) { + // ignore it } if ( file instanceof PartOnDisk) { ((PartOnDisk)file).getFile().delete(); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java Mon Dec 27 05:51:59 2004 @@ -151,4 +151,5 @@ } } + } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/CleanBasketEvent.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/CleanBasketEvent.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/CleanBasketEvent.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/CleanBasketEvent.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/CleanBasketEvent.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/CleanBasketEvent.java Mon Dec 27 05:51:59 2004 @@ -21,7 +21,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: CleanBasketEvent.java,v 1.2 2004/03/05 13:02:11 bdelacretaz Exp $ + * @version CVS $Id$ */ public class CleanBasketEvent extends BasketEvent { @@ -33,6 +33,7 @@ * If this constructor is used all baskets will be cleaned */ public CleanBasketEvent() { + // nothing to do } /** Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/RefreshBasketEvent.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/RefreshBasketEvent.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/RefreshBasketEvent.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/RefreshBasketEvent.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/RefreshBasketEvent.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/RefreshBasketEvent.java Mon Dec 27 05:51:59 2004 @@ -21,7 +21,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: RefreshBasketEvent.java,v 1.2 2004/03/05 13:02:11 bdelacretaz Exp $ + * @version CVS $Id$ */ public class RefreshBasketEvent extends BasketEvent { @@ -29,6 +29,7 @@ * Constructor */ public RefreshBasketEvent() { + // nothing to do } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/SaveBasketEvent.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/SaveBasketEvent.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/SaveBasketEvent.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/SaveBasketEvent.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/SaveBasketEvent.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/SaveBasketEvent.java Mon Dec 27 05:51:59 2004 @@ -21,7 +21,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: SaveBasketEvent.java,v 1.2 2004/03/05 13:02:11 bdelacretaz Exp $ + * @version CVS $Id$ */ public class SaveBasketEvent extends BasketEvent { @@ -30,6 +30,7 @@ * */ public SaveBasketEvent() { + // nothing to do } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletDataEvent.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletDataEvent.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletDataEvent.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletDataEvent.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletDataEvent.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletDataEvent.java Mon Dec 27 05:51:59 2004 @@ -22,9 +22,10 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: CopletDataEvent.java,v 1.2 2004/03/05 13:02:11 bdelacretaz Exp $ + * @version CVS $Id$ */ public interface CopletDataEvent extends ActionEvent { + // just a marker interface } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/CopletInstanceEvent.java Mon Dec 27 05:51:59 2004 @@ -21,9 +21,10 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: CopletInstanceEvent.java,v 1.3 2004/03/05 13:02:11 bdelacretaz Exp $ + * @version CVS $Id$ */ public interface CopletInstanceEvent extends ActionEvent { + // just a marker interface } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/Event.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/Event.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/Event.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/Event.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/Event.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/Event.java Mon Dec 27 05:51:59 2004 @@ -21,8 +21,9 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * @author <a href="mailto:[EMAIL PROTECTED]">Volker Schmitt</a> * - * @version CVS $Id: Event.java,v 1.2 2004/03/05 13:02:11 bdelacretaz Exp $ + * @version CVS $Id$ */ public interface Event { + // just a marker interface } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/LayoutEvent.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/LayoutEvent.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/LayoutEvent.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/LayoutEvent.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/LayoutEvent.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/LayoutEvent.java Mon Dec 27 05:51:59 2004 @@ -22,8 +22,9 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * @author <a href="mailto:[EMAIL PROTECTED]">Volker Schmitt</a> * - * @version CVS $Id: LayoutEvent.java,v 1.4 2004/03/05 13:02:11 bdelacretaz Exp $ + * @version CVS $Id$ */ public interface LayoutEvent extends ActionEvent { + // just a marker interface } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/PageLabelEventConverter.java Mon Dec 27 05:51:59 2004 @@ -122,5 +122,6 @@ * @see org.apache.cocoon.portal.event.EventConverter#finish() */ public void finish() { + // nothing to do } -} \ No newline at end of file +} Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaulCopletDataEventSubscriber.java Mon Dec 27 05:51:59 2004 @@ -38,7 +38,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: DefaulCopletDataEventSubscriber.java,v 1.2 2004/03/05 13:02:12 bdelacretaz Exp $ + * @version CVS $Id$ */ public final class DefaulCopletDataEventSubscriber implements Subscriber, Serviceable { @@ -50,6 +50,7 @@ * Constructor */ public DefaulCopletDataEventSubscriber() { + // nothing to do } /* (non-Javadoc) @@ -85,6 +86,7 @@ ProfileManager profileManager = service.getComponentManager().getProfileManager(); instances = profileManager.getCopletInstanceData(data); } catch (Exception ignore) { + // ignore exception } finally { this.manager.release(service); } @@ -95,6 +97,7 @@ eventManager = (EventManager) this.manager.lookup(EventManager.ROLE); publisher = eventManager.getPublisher(); } catch (Exception ignore) { + // ignore exception } finally { this.manager.release(eventManager); } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java Mon Dec 27 05:51:59 2004 @@ -25,12 +25,13 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: DefaultChangeAspectDataEventSubscriber.java,v 1.6 2004/03/05 13:02:12 bdelacretaz Exp $ + * @version CVS $Id$ */ public final class DefaultChangeAspectDataEventSubscriber implements Subscriber { public DefaultChangeAspectDataEventSubscriber() { + // nothing to do } /* (non-Javadoc) Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultJXPathEventSubscriber.java Mon Dec 27 05:51:59 2004 @@ -25,12 +25,13 @@ * This subscriber processes JXPath events * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: DefaultJXPathEventSubscriber.java,v 1.3 2004/03/05 13:02:12 bdelacretaz Exp $ + * @version CVS $Id$ */ public final class DefaultJXPathEventSubscriber implements Subscriber { public DefaultJXPathEventSubscriber() { + // nothing to do } /* (non-Javadoc) Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java Mon Dec 27 05:51:59 2004 @@ -43,6 +43,9 @@ protected ServiceManager manager; + /* (non-Javadoc) + * @see org.apache.cocoon.portal.PortalManager#process() + */ public void process() throws ProcessingException { EventManager eventManager = null; Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/PortletPortalManager.java Mon Dec 27 05:51:59 2004 @@ -62,7 +62,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: PortletPortalManager.java,v 1.5 2004/03/05 13:02:13 bdelacretaz Exp $ + * @version CVS $Id$ */ public class PortletPortalManager extends PortalManagerImpl @@ -119,6 +119,17 @@ * @see org.apache.avalon.framework.activity.Disposable#dispose() */ public void dispose() { + if ( this.manager != null ) { + EventManager eventManager = null; + try { + eventManager = (EventManager)this.manager.lookup(EventManager.ROLE); + eventManager.getRegister().unsubscribe(this); + } catch (Exception ignore) { + // let's ignore it + } finally { + this.manager.release(eventManager); + } + } try { if (this.portletContainer != null ) { this.portletContainer.shutdown(); @@ -133,6 +144,7 @@ this.servletConfig.getServletContext().removeAttribute(PortalManager.ROLE); this.servletConfig = null; } + this.manager = null; } /* (non-Javadoc) Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractActionAspect.java Mon Dec 27 05:51:59 2004 @@ -26,7 +26,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: AbstractActionAspect.java,v 1.2 2004/03/05 13:02:13 bdelacretaz Exp $ + * @version CVS $Id$ */ public abstract class AbstractActionAspect extends AbstractAspect @@ -49,6 +49,7 @@ eventManager = (EventManager)this.manager.lookup(EventManager.ROLE); eventManager.getRegister().unsubscribe( this ); } catch (Exception ignore) { + // ignore exceptions } finally { this.manager.release( eventManager ); } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java Mon Dec 27 05:51:59 2004 @@ -37,7 +37,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * @author <a href="mailto:[EMAIL PROTECTED]">Volker Schmitt</a> * - * @version CVS $Id: AbstractAspect.java,v 1.8 2004/04/25 20:09:34 haul Exp $ + * @version CVS $Id$ */ public abstract class AbstractAspect extends AbstractLogEnabled @@ -61,6 +61,7 @@ PortalService service, ContentHandler handler) throws SAXException { + // empty implementation } /** Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java Mon Dec 27 05:51:59 2004 @@ -27,7 +27,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: AbstractFactory.java,v 1.3 2004/03/05 13:02:14 bdelacretaz Exp $ + * @version CVS $Id$ */ public abstract class AbstractFactory extends AbstractLogEnabled @@ -52,5 +52,6 @@ * @see org.apache.pluto.factory.Factory#destroy() */ public void destroy() throws Exception { + // nothing to do } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java Mon Dec 27 05:51:59 2004 @@ -137,8 +137,7 @@ if ( this.portlet == null ) { throw new PortletException("Unable to instantiate portlet from class " + this.portletDefinition.getClassName()); } - try - { + try { request.setAttribute(org.apache.pluto.Constants.METHOD_ID, org.apache.pluto.Constants.METHOD_RENDER); request.setAttribute(org.apache.pluto.Constants.PORTLET_REQUEST, request); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java Mon Dec 27 05:51:59 2004 @@ -138,6 +138,7 @@ * @see org.apache.cocoon.portal.pluto.om.common.Support#postBuild(java.lang.Object) */ public void postBuild(Object parameter) throws Exception { + // nothing to do } /* (non-Javadoc) Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java Mon Dec 27 05:51:59 2004 @@ -50,7 +50,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: PortletDefinitionImpl.java,v 1.3 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class PortletDefinitionImpl implements PortletDefinition, PortletDefinitionCtrl, java.io.Serializable, Support { @@ -61,24 +61,24 @@ // contains String objects private ArrayList castorSupportedLocales = new ArrayList(); - private ClassLoader classLoader = null; - private String className = null; + private ClassLoader classLoader; + private String className; private ContentTypeSet contentTypes = new ContentTypeSetImpl(); private DescriptionSet descriptions = new DescriptionSetImpl(); private DisplayNameSet displayNames = new DisplayNameSetImpl(); - private String expirationCache = null; + private String expirationCache; public String id = ""; private ParameterSet initParams = new ParameterSetImpl(); private SecurityRoleRefSet initSecurityRoleRefs = new SecurityRoleRefSetImpl(); - private String name = null; + private String name; - private ObjectID objectId = null; + private ObjectID objectId; private PreferenceSet preferences = new PreferenceSetImpl(); // private PortletInfoImpl portletInfo = null; - private String resourceBundle = null; - private ServletDefinition servlet = null; + private String resourceBundle; + private ServletDefinition servlet; // contains Locale objects private ArrayList supportedLocales = new ArrayList(); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionListImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionListImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionListImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionListImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionListImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionListImpl.java Mon Dec 27 05:51:59 2004 @@ -32,15 +32,14 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: PortletDefinitionListImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class PortletDefinitionListImpl extends AbstractSupportSet implements PortletDefinitionList, java.io.Serializable, Support { // PortletDefinitionList implementation. - public PortletDefinition get(ObjectID objectId) - { + public PortletDefinition get(ObjectID objectId) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { PortletDefinition portletDefinition = (PortletDefinition)iterator.next(); @@ -53,8 +52,7 @@ // Support implementation. - public void preBuild(Object parameter) throws Exception - { + public void preBuild(Object parameter) throws Exception { Vector structure = (Vector)parameter; PortletApplicationDefinition portletApplication = (PortletApplicationDefinition)structure.get(0); Map servletMap = (Map)structure.get(1); @@ -77,6 +75,7 @@ public void postBuild(Object parameter) throws Exception { + // nothing to do } public void postLoad(Object parameter) throws Exception { @@ -87,15 +86,16 @@ } public void postStore(Object parameter) throws Exception { + // nothing to do } public void preStore(Object parameter) throws Exception { + // nothing to do } // additional methods. - public PortletDefinition get(String objectId) - { + public PortletDefinition get(String objectId) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { PortletDefinition portletDefinition = (PortletDefinition)iterator.next(); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java Mon Dec 27 05:51:59 2004 @@ -26,7 +26,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: PortletWindowImpl.java,v 1.5 2004/03/16 15:56:43 cziegeler Exp $ + * @version CVS $Id$ */ public class PortletWindowImpl implements PortletWindow, PortletWindowCtrl { @@ -47,10 +47,8 @@ * * @return the object identifier **/ - public ObjectID getId() - { - if (objectId==null) - { + public ObjectID getId() { + if (objectId==null) { objectId = org.apache.cocoon.portal.pluto.om.common.ObjectIDImpl.createFromString(id); } return objectId; @@ -61,8 +59,7 @@ * * @return the portlet entity **/ - public PortletEntity getPortletEntity() - { + public PortletEntity getPortletEntity() { return portletEntity; } @@ -72,8 +69,7 @@ * * @param id the new identifier */ - public void setId(String id) - { + public void setId(String id) { this.id = id; objectId = null; } @@ -94,4 +90,4 @@ public void setLayout(CopletLayout layout) { this.layout = layout; } -} \ No newline at end of file +} Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowListImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowListImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowListImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowListImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowListImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/PortletWindowListImpl.java Mon Dec 27 05:51:59 2004 @@ -27,12 +27,12 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: PortletWindowListImpl.java,v 1.4 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class PortletWindowListImpl implements PortletWindowList, PortletWindowListCtrl { - HashMap windows = null; + private final HashMap windows; public PortletWindowListImpl() { windows = new HashMap(); @@ -59,8 +59,7 @@ * @return the portlet window object or null if the list does not * contain a portlet window with the given id **/ - public PortletWindow get(ObjectID id) - { + public PortletWindow get(ObjectID id) { return (PortletWindow)windows.get(id.toString()); } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionImpl.java Mon Dec 27 05:51:59 2004 @@ -42,7 +42,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: ServletDefinitionImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class ServletDefinitionImpl implements ServletDefinition, ServletDefinitionCtrl, java.io.Serializable, Support { @@ -51,38 +51,35 @@ private DisplayNameSet displayNames = new DisplayNameSetImpl(); // not used variables - only for castor - public String icon = null; + public String icon; private String id = ""; private ParameterSet initParams = new ParameterSetImpl(); private SecurityRoleRefSet initSecurityRoleRefs = new SecurityRoleRefSetImpl(); - public String jspFile = null; - public String loadOnStartup = null; - private ObjectID objectId = null; - public String securityRoleRef = null; - private String servletClass = null; - private ServletMapping servletMapping = null; - private String servletName = null; + public String jspFile; + public String loadOnStartup; + private ObjectID objectId; + public String securityRoleRef; + private String servletClass; + private ServletMapping servletMapping; + private String servletName; private long available = 0; - private WebApplicationDefinition webApplication = null; + private WebApplicationDefinition webApplication; // ServletDefinition implementation. - public ObjectID getId() - { + public ObjectID getId() { if (objectId==null) { objectId = org.apache.cocoon.portal.pluto.om.common.ObjectIDImpl.createFromString(id); } return objectId; } - public String getServletName() - { + public String getServletName() { return servletName; } - public DisplayName getDisplayName(Locale locale) - { + public DisplayName getDisplayName(Locale locale) { return displayNames.get(locale); } @@ -93,23 +90,19 @@ return descriptions.get(locale); } - public String getServletClass() - { + public String getServletClass() { return servletClass; } - public ParameterSet getInitParameterSet() - { + public ParameterSet getInitParameterSet() { return initParams; } - public WebApplicationDefinition getWebApplicationDefinition() - { + public WebApplicationDefinition getWebApplicationDefinition() { return webApplication; } - public RequestDispatcher getRequestDispatcher(ServletContext servletContext) - { + public RequestDispatcher getRequestDispatcher(ServletContext servletContext) { ServletContext newContext = webApplication.getServletContext(servletContext); if (newContext==null) { return null; @@ -134,98 +127,82 @@ // Support implementation. - public void postBuild(Object parameter) throws Exception - { + public void postBuild(Object parameter) throws Exception { setServletMapping((ServletMapping)parameter); } - public void postLoad(Object parameter) throws Exception - { + public void postLoad(Object parameter) throws Exception { ((Support)descriptions).postLoad(parameter); ((Support)displayNames).postLoad(parameter); } - public void postStore(Object parameter) throws Exception - { + + public void postStore(Object parameter) throws Exception { + // nothing to do } - public void preBuild(Object parameter) throws Exception - { + + public void preBuild(Object parameter) throws Exception { setWebApplicationDefinition((WebApplicationDefinition)parameter); } - public void preStore(Object parameter) throws Exception - { + + public void preStore(Object parameter) throws Exception { + // nothing to do } // additional methods. public String getCastorId() { - if (id.length() > 0) + if (id.length() > 0) { return getId().toString(); - else + } return null; } - public Collection getCastorInitParams() - { + public Collection getCastorInitParams() { return(ParameterSetImpl)initParams; } - public SecurityRoleRefSet getCastorInitSecurityRoleRefs() - { + public SecurityRoleRefSet getCastorInitSecurityRoleRefs() { return initSecurityRoleRefs; } - public Collection getCastorDisplayNames() - { + public Collection getCastorDisplayNames() { return(DisplayNameSetImpl)displayNames; } - public Collection getCastorDescriptions() - { + public Collection getCastorDescriptions() { return(DescriptionSetImpl)descriptions; } - public Collection getDescriptions() - { + public Collection getDescriptions() { return(DescriptionSetImpl)descriptions; } - - - public SecurityRoleRefSet getInitSecurityRoleRefSet() - { + public SecurityRoleRefSet getInitSecurityRoleRefSet() { return initSecurityRoleRefs; } - - - public String getJspFile() - { + public String getJspFile() { return jspFile; } - public void setCastorId(String id) { setId(id); } - public void setCastorInitSecurityRoleRefs(SecurityRoleRefSet castorInitSecurityRoleRefs) - { + public void setCastorInitSecurityRoleRefs(SecurityRoleRefSet castorInitSecurityRoleRefs) { this.initSecurityRoleRefs = castorInitSecurityRoleRefs; } - public void setCastorDisplayNames(DisplayNameSet castorDisplayNames) - { + public void setCastorDisplayNames(DisplayNameSet castorDisplayNames) { this.displayNames = castorDisplayNames; } - public void setCastorDescriptions(DescriptionSet castorDescriptions) - { + public void setCastorDescriptions(DescriptionSet castorDescriptions) { this.descriptions = castorDescriptions; } - public void setDisplayNames(DisplayNameSet displayNames) - { + public void setDisplayNames(DisplayNameSet displayNames) { this.displayNames = displayNames; } @@ -233,14 +210,12 @@ this.descriptions = descriptions; } - public void setId(String id) - { + public void setId(String id) { this.id = id; - objectId = null; + this.objectId = null; } - public void setServletClass(String servletClass) - { + public void setServletClass(String servletClass) { this.servletClass = servletClass; } @@ -252,23 +227,19 @@ } } - public void setJspFile(String jspFile) - { + public void setJspFile(String jspFile) { this.jspFile = jspFile; } - protected void setServletMapping(ServletMapping servletMapping) - { + protected void setServletMapping(ServletMapping servletMapping) { this.servletMapping = servletMapping; } - public void setServletName(String servletName) - { + public void setServletName(String servletName) { this.servletName = servletName; } - protected void setWebApplicationDefinition(WebApplicationDefinition webApplication) - { + protected void setWebApplicationDefinition(WebApplicationDefinition webApplication) { this.webApplication = webApplication; } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionListImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionListImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionListImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionListImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionListImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletDefinitionListImpl.java Mon Dec 27 05:51:59 2004 @@ -33,15 +33,14 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: ServletDefinitionListImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class ServletDefinitionListImpl extends AbstractSupportSet implements ServletDefinitionList, ServletDefinitionListCtrl, java.io.Serializable, Support { // ServletDefinitionList implementation. - public ServletDefinition get(String name) - { + public ServletDefinition get(String name) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { ServletDefinition servletDefinition = (ServletDefinition)iterator.next(); @@ -54,8 +53,7 @@ // ServletDefinitionListCtrl implementation. - public ServletDefinition add(String name, String className) - { + public ServletDefinition add(String name, String className) { ServletDefinitionImpl servletDefinition = new ServletDefinitionImpl(); servletDefinition.setServletName(name); servletDefinition.setServletClass(className); @@ -65,8 +63,7 @@ return servletDefinition; } - public ServletDefinition remove(String name) - { + public ServletDefinition remove(String name) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { ServletDefinition servletDefinition = (ServletDefinition)iterator.next(); @@ -78,15 +75,13 @@ return null; } - public void remove(ServletDefinition servletDefinition) - { + public void remove(ServletDefinition servletDefinition) { super.remove(servletDefinition); } // Support implementation. - public void preBuild(Object parameter) throws Exception - { + public void preBuild(Object parameter) throws Exception { Vector structure = (Vector)parameter; WebApplicationDefinition webApplicationDefinition = (WebApplicationDefinition)structure.get(0); Collection servletMappings = (Collection)structure.get(1); @@ -123,6 +118,7 @@ } public void postBuild(Object parameter) throws Exception { + // nothing to do } public void postLoad(Object parameter) throws Exception { @@ -134,9 +130,11 @@ } public void postStore(Object parameter) throws Exception { + // nothing to do } public void preStore(Object parameter) throws Exception { + // nothing to do } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletMapping.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletMapping.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletMapping.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletMapping.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletMapping.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/ServletMapping.java Mon Dec 27 05:51:59 2004 @@ -21,47 +21,41 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: ServletMapping.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class ServletMapping implements java.io.Serializable { - private String id = null; - private String servletName = null; - private String urlPattern = null; + private String id; + private String servletName; + private String urlPattern; - public ServletMapping() - { + public ServletMapping() { + // nothing to do } // additional methods. - public String getId() - { + public String getId() { return id; } - public void setId(String id) - { + public void setId(String id) { this.id = id; } - public String getServletName() - { + public String getServletName() { return servletName; } - public void setServletName(String servletName) - { + public void setServletName(String servletName) { this.servletName = servletName; } - public String getUrlPattern() - { + public String getUrlPattern() { return urlPattern; } - public void setUrlPattern(String urlPattern) - { + public void setUrlPattern(String urlPattern) { this.urlPattern = urlPattern; } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/WebApplicationDefinitionImpl.java Mon Dec 27 05:51:59 2004 @@ -207,9 +207,8 @@ public String getCastorId() { if (id.length() > 0) { return getId().toString(); - } else { - return null; } + return null; } public Collection getCastorInitParams() { Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java Mon Dec 27 05:51:59 2004 @@ -23,44 +23,40 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: AbstractSupportSet.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ -public abstract class AbstractSupportSet extends HashSet implements java.io.Serializable, Support { +public abstract class AbstractSupportSet + extends HashSet + implements java.io.Serializable, Support { - public AbstractSupportSet() - { + public AbstractSupportSet() { + // nothing to do } // support implemenation. - public void postLoad(Object parameter) throws Exception - { + public void postLoad(Object parameter) throws Exception { dispatch(parameter, POST_LOAD); } - public void preBuild(Object parameter) throws Exception - { + public void preBuild(Object parameter) throws Exception { dispatch(parameter, PRE_BUILD); } - public void postBuild(Object parameter) throws Exception - { + public void postBuild(Object parameter) throws Exception { dispatch(parameter, POST_BUILD); } - public void preStore(Object parameter) throws Exception - { + public void preStore(Object parameter) throws Exception { dispatch(parameter, PRE_STORE); } - public void postStore(Object parameter) throws Exception - { + public void postStore(Object parameter) throws Exception { dispatch(parameter, POST_STORE); } // additional methods. - protected void dispatch(Object parameter, int id) throws Exception - { + protected void dispatch(Object parameter, int id) throws Exception { Iterator iterator = this.iterator(); while (iterator.hasNext()) { Support support = (Support)iterator.next(); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java Mon Dec 27 05:51:59 2004 @@ -27,35 +27,38 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: ContentTypeImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class ContentTypeImpl implements ContentType, java.io.Serializable, Support { - private String contentType = null; + private String contentType; private Collection portletModes = new ArrayList(); private Collection castorPortletModes = new ArrayList(); - public ContentTypeImpl() - { + public ContentTypeImpl() { + // nothing to do } - // ContentType implementation. - - public String getContentType() - { + /* (non-Javadoc) + * @see org.apache.pluto.om.portlet.ContentType#getContentType() + */ + public String getContentType() { return contentType; } - public Iterator getPortletModes() - { + /* (non-Javadoc) + * @see org.apache.pluto.om.portlet.ContentType#getPortletModes() + */ + public Iterator getPortletModes() { return portletModes.iterator(); } - // Support implementation. - public void postLoad(Object parameter) throws Exception - { + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postLoad(java.lang.Object) + */ + public void postLoad(Object parameter) throws Exception { portletModes.clear(); Iterator iterator = castorPortletModes.iterator(); while (iterator.hasNext()) { @@ -67,16 +70,24 @@ } } - public void preBuild(Object parameter) throws Exception - { - } - - public void postBuild(Object parameter) throws Exception - { - } - - public void preStore(Object parameter) throws Exception - { + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#preBuild(java.lang.Object) + */ + public void preBuild(Object parameter) throws Exception { + // nothing to do + } + + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postBuild(java.lang.Object) + */ + public void postBuild(Object parameter) throws Exception { + // nothing to do + } + + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#preStore(java.lang.Object) + */ + public void preStore(Object parameter) throws Exception { castorPortletModes.clear(); Iterator iterator = portletModes.iterator(); while (iterator.hasNext()) { @@ -85,34 +96,35 @@ } } - public void postStore(Object parameter) throws Exception - { + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postStore(java.lang.Object) + */ + public void postStore(Object parameter) throws Exception { + // nothing to do } // additional methods. - public void setContentType(String contentType) - { + public void setContentType(String contentType) { this.contentType = contentType; } - public void setPortletModes(Collection portletModes) - { + public void setPortletModes(Collection portletModes) { this.portletModes = portletModes; } - public boolean supportsPortletMode(javax.portlet.PortletMode portletMode) - { + public boolean supportsPortletMode(javax.portlet.PortletMode portletMode) { return portletModes.contains(portletMode); } - public String toString() - { + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); buffer.append(":"); @@ -135,8 +147,7 @@ return buffer.toString(); } - public Collection getCastorPortletModes() - { + public Collection getCastorPortletModes() { return castorPortletModes; } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java Mon Dec 27 05:51:59 2004 @@ -28,18 +28,18 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: ContentTypeSetImpl.java,v 1.3 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class ContentTypeSetImpl extends AbstractSupportSet implements ContentTypeSet, java.io.Serializable { - // special content type that represents the union of all supported markups private ContentType anyContentType; - // ContentTypeSet implementation. - public ContentType get(String contentType) - { + /* (non-Javadoc) + * @see org.apache.pluto.om.portlet.ContentTypeSet#get(java.lang.String) + */ + public ContentType get(String contentType) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { ContentType _contentType = (ContentType)iterator.next(); @@ -50,9 +50,10 @@ return null; } - // support implemenation - public void postLoad(Object parameter) throws Exception - { + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postLoad(java.lang.Object) + */ + public void postLoad(Object parameter) throws Exception { super.postLoad(parameter); Collection allPortletModes = new ArrayList(); @@ -76,15 +77,14 @@ } - // additional methods. - - public String toString() - { + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java Mon Dec 27 05:51:59 2004 @@ -25,63 +25,67 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: DescriptionImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class DescriptionImpl implements Description, java.io.Serializable, Support { - private String description = null; - private Locale locale = null; // default locale; - private String castorLocale = null; + private String description; + private Locale locale; // default locale; + private String castorLocale; - public DescriptionImpl() - { + public DescriptionImpl() { + // nothing to do } // Description implementation. - public String getDescription() - { + public String getDescription() { return description; } - public Locale getLocale() - { + public Locale getLocale() { return locale; } - // Support implementation. - - public void postBuild(Object parameter) throws Exception - { + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postBuild(java.lang.Object) + */ + public void postBuild(Object parameter) throws Exception { + // nothing to do } - public void postLoad(Object parameter) throws Exception - { + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postLoad(java.lang.Object) + */ + public void postLoad(Object parameter) throws Exception { if (castorLocale == null) { locale = Locale.ENGLISH; } else { locale = new Locale(castorLocale, ""); } } - public void postStore(Object parameter) throws Exception - { + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postStore(java.lang.Object) + */ + public void postStore(Object parameter) throws Exception { + // nothing to do } - public void preBuild(Object parameter) throws Exception - { + public void preBuild(Object parameter) throws Exception { + // nothing to do } - public void preStore(Object parameter) throws Exception - { + public void preStore(Object parameter) throws Exception { + // nothing to do } - // additional methods. - public String toString() - { + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); @@ -94,13 +98,11 @@ } - public void setDescription(String description) - { + public void setDescription(String description) { this.description = description; } - public void setLocale(Locale locale) - { + public void setLocale(Locale locale) { this.locale = locale; } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java Mon Dec 27 05:51:59 2004 @@ -26,13 +26,16 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: DescriptionSetImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ -public class DescriptionSetImpl extends AbstractSupportSet implements DescriptionSet, java.io.Serializable, Support { - - // DescriptionSet implemenation. - public Description get(Locale locale) - { +public class DescriptionSetImpl + extends AbstractSupportSet + implements DescriptionSet, java.io.Serializable, Support { + + /* (non-Javadoc) + * @see org.apache.pluto.om.common.DescriptionSet#get(java.util.Locale) + */ + public Description get(Locale locale) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { Description desc = (Description)iterator.next(); @@ -43,11 +46,16 @@ return null; } - // Support implementation. - + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postBuild(java.lang.Object) + */ public void postBuild(Object parameter) throws Exception { + // nothing to do } + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postLoad(java.lang.Object) + */ public void postLoad(Object parameter) throws Exception { Iterator iterator = this.iterator(); while (iterator.hasNext()) { @@ -55,13 +63,25 @@ } } + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postStore(java.lang.Object) + */ public void postStore(Object parameter) throws Exception { + // nothing to do } + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#preBuild(java.lang.Object) + */ public void preBuild(Object parameter) throws Exception { + // nothing to do } + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#preStore(java.lang.Object) + */ public void preStore(Object parameter) throws Exception { + // nothing to do } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java Mon Dec 27 05:51:59 2004 @@ -25,7 +25,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: DisplayNameImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class DisplayNameImpl implements DisplayName, java.io.Serializable, Support { @@ -33,54 +33,70 @@ private Locale locale; // default locale private String castorLocale; - public DisplayNameImpl() - { + public DisplayNameImpl() { + // nothing to do } - // DisplayName implementation. - public String getDisplayName() - { + /* (non-Javadoc) + * @see org.apache.pluto.om.common.DisplayName#getDisplayName() + */ + public String getDisplayName() { return displayName; } - public Locale getLocale() - { + /* (non-Javadoc) + * @see org.apache.pluto.om.common.DisplayName#getLocale() + */ + public Locale getLocale() { return locale; } - // Support implementation. - - public void postLoad(Object parameter) throws Exception - { + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postLoad(java.lang.Object) + */ + public void postLoad(Object parameter) throws Exception { if (castorLocale == null) { locale = Locale.ENGLISH; } else { locale = new Locale(castorLocale, ""); } } - public void postStore(Object parameter) throws Exception - { - } - - public void preBuild(Object parameter) throws Exception - { - } - - public void preStore(Object parameter) throws Exception - { - } - + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postStore(java.lang.Object) + */ + public void postStore(Object parameter) throws Exception { + // nothing to do + } + + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#preBuild(java.lang.Object) + */ + public void preBuild(Object parameter) throws Exception { + // nothing to do + } + + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#preStore(java.lang.Object) + */ + public void preStore(Object parameter) throws Exception { + // nothing to do + } + + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postBuild(java.lang.Object) + */ public void postBuild(Object parameter) throws Exception { + // nothing to do } - // additional methods. - public String toString() - { + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); @@ -92,13 +108,11 @@ return buffer.toString(); } - public void setDisplayName(String displayName) - { + public void setDisplayName(String displayName) { this.displayName = displayName; } - public void setLocale(Locale locale) - { + public void setLocale(Locale locale) { this.locale = locale; } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java Mon Dec 27 05:51:59 2004 @@ -27,14 +27,14 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: DisplayNameSetImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class DisplayNameSetImpl extends AbstractSupportSet implements DisplayNameSet, java.io.Serializable, Support { - // DisplayNameSet implementation. - - public DisplayName get(Locale locale) - { + /* (non-Javadoc) + * @see org.apache.pluto.om.common.DisplayNameSet#get(java.util.Locale) + */ + public DisplayName get(Locale locale) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { DisplayName displayName = (DisplayName)iterator.next(); @@ -46,9 +46,11 @@ } - // Support implementation. - + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postBuild(java.lang.Object) + */ public void postBuild(Object parameter) throws Exception { + // nothing to do } public void postLoad(Object parameter) throws Exception { @@ -58,24 +60,35 @@ } } + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postStore(java.lang.Object) + */ public void postStore(Object parameter) throws Exception { + // nothing to do } + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#preBuild(java.lang.Object) + */ public void preBuild(Object parameter) throws Exception { + // nothing to do } + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#preStore(java.lang.Object) + */ public void preStore(Object parameter) throws Exception { + // nothing to do } - // additional methods. - - public String toString() - { + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); @@ -86,6 +99,5 @@ } return buffer.toString(); } - } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java Mon Dec 27 05:51:59 2004 @@ -157,13 +157,11 @@ return keywords; } - public String toString() - { + public String toString() { return toString(0); } - public String toString(final int indent) - { + public String toString(final int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); buffer.append(":"); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java Mon Dec 27 05:51:59 2004 @@ -51,14 +51,12 @@ private String title; - public LanguageSetImpl() - { + public LanguageSetImpl() { locales = new Vector(); } // create Language object with data from this class (title, short-title, description, keywords) - private Language createLanguage(Locale locale, ResourceBundle bundle) - { + private Language createLanguage(Locale locale, ResourceBundle bundle) { LanguageImpl lang = new LanguageImpl(locale, bundle, title, shortTitle, castorKeywords); return lang; @@ -87,27 +85,23 @@ } */ - // AbstractSupportSet implementation. - - public Language get(Locale locale) - { - if (resources!=null && resourceBundleInitialized==false) - { + /* (non-Javadoc) + * @see org.apache.pluto.om.common.LanguageSet#get(java.util.Locale) + */ + public Language get(Locale locale) { + if (resources != null && !resourceBundleInitialized) { initResourceBundle(); this.resourceBundleInitialized = true; } - if (!locales.contains(locale)) - { + if (!locales.contains(locale)) { locale = matchLocale(locale); } Iterator iterator = this.iterator(); - while (iterator.hasNext()) - { + while (iterator.hasNext()) { Language language = (Language)iterator.next(); - if (language.getLocale().equals(locale) || size()==1) - { + if (language.getLocale().equals(locale) || size()==1) { return language; } } @@ -115,27 +109,27 @@ return null; } - public Iterator getLocales() - { + /* (non-Javadoc) + * @see org.apache.pluto.om.common.LanguageSet#getLocales() + */ + public Iterator getLocales() { return locales.iterator(); } - public Locale getDefaultLocale() - { + /* (non-Javadoc) + * @see org.apache.pluto.om.common.LanguageSet#getDefaultLocale() + */ + public Locale getDefaultLocale() { Locale defLoc = null; - if (locales != null && locales.size() > 0) - { + if (locales != null && locales.size() > 0) { defLoc = (Locale)locales.firstElement(); - if (defLoc == null) - { + if (defLoc == null) { defLoc = new Locale("en",""); locales.add(defLoc); } - } - else - { + } else { defLoc = new Locale("en",""); locales.add(defLoc); } @@ -143,69 +137,72 @@ return defLoc; } - // Support implementation. - - public void postBuild(Object parameter) throws Exception - { + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postBuild(java.lang.Object) + */ + public void postBuild(Object parameter) throws Exception { + // nothing to do } - - public void postLoad(Object parameter) throws Exception - { + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postLoad(java.lang.Object) + */ + public void postLoad(Object parameter) throws Exception { locales.addAll((Collection)parameter); initInlinedInfos(); } - public void postStore(Object parameter) throws Exception - { - } - - public void preBuild(Object parameter) throws Exception - { - } - - public void preStore(Object parameter) throws Exception - { + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#postStore(java.lang.Object) + */ + public void postStore(Object parameter) throws Exception { + // nothing to do + } + + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#preBuild(java.lang.Object) + */ + public void preBuild(Object parameter) throws Exception { + // nothing to do + } + + /* (non-Javadoc) + * @see org.apache.cocoon.portal.pluto.om.common.Support#preStore(java.lang.Object) + */ + public void preStore(Object parameter) throws Exception { + // nothing to do } // internal methods. - private void initInlinedInfos() throws Exception - { + private void initInlinedInfos() throws Exception { // if resource-bundle is given // must be initialized later when classloader is known by initResourceBundle() - if (locales.isEmpty()) - { + if (locales.isEmpty()) { getDefaultLocale(); //the defualt gets automaticaly added to the locals } - if (castorKeywords == null) - { + if (castorKeywords == null) { castorKeywords=""; } - if (shortTitle == null) - { + if (shortTitle == null) { shortTitle=""; } - if (title == null) - { + if (title == null) { title=""; } add(createLanguage(getDefaultLocale(), null)); } // create and add all resource bundle information as Language objects to this set - private void initResourceBundle() - { + private void initResourceBundle() { Iterator iter = locales.iterator(); - while (iter.hasNext()) - { + while (iter.hasNext()) { Locale locale = (Locale)iter.next(); ResourceBundle bundle = null; bundle = loadResourceBundle(locale); - if (bundle != null) - { + if (bundle != null) { /*String title; String shortTitle; String keywords; @@ -236,26 +233,21 @@ } // try to match the given locale to a supported locale - private Locale matchLocale(Locale locale) - { + private Locale matchLocale(Locale locale) { String variant = locale.getVariant(); - if (variant != null && variant.length() > 0) - { + if (variant != null && variant.length() > 0) { locale = new Locale(locale.getLanguage(), locale.getCountry()); } - if (! locales.contains(locale)) - { + if (! locales.contains(locale)) { String country = locale.getCountry(); - if (country != null && country.length() > 0) - { + if (country != null && country.length() > 0) { locale = new Locale(locale.getLanguage(), ""); } } - if (! locales.contains(locale)) - { + if (! locales.contains(locale)) { locale = getDefaultLocale(); } @@ -264,85 +256,70 @@ // additional methods. - public String getCastorKeywords() - { + public String getCastorKeywords() { return this.castorKeywords; } // additional methods - public String getResources() - { + public String getResources() { return resources; } - public String getShortTitle() - { + public String getShortTitle() { return this.shortTitle; } // internal methods used by castor - public String getTitle() - { + public String getTitle() { return this.title; } // loads resource bundle files from WEB-INF/classes directory - protected ResourceBundle loadResourceBundle(Locale locale) - { + protected ResourceBundle loadResourceBundle(Locale locale) { ResourceBundle resourceBundle = null; - try - { - if (classLoader != null) - { + try { + if (classLoader != null) { resourceBundle=ResourceBundle.getBundle(resources, locale, classLoader); - } - else - { + } else { resourceBundle=ResourceBundle.getBundle(resources, locale, Thread.currentThread().getContextClassLoader()); } - } - catch (MissingResourceException x) - { + } catch (MissingResourceException x) { return null; } return resourceBundle; } - public void setCastorKeywords(String keywords) - { + public void setCastorKeywords(String keywords) { this.castorKeywords = keywords; } // end castor methods - public void setClassLoader(ClassLoader loader) - { + public void setClassLoader(ClassLoader loader) { this.classLoader = loader; } - public void setResources(String resources) - { + public void setResources(String resources) { this.resources = resources; } - public void setShortTitle(String shortTitle) - { + public void setShortTitle(String shortTitle) { this.shortTitle = shortTitle; } - public void setTitle(String title) - { + public void setTitle(String title) { this.title = title; } - public String toString() - { + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java Mon Dec 27 05:51:59 2004 @@ -26,71 +26,69 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: ObjectIDImpl.java,v 1.5 2004/03/19 14:21:06 cziegeler Exp $ + * @version CVS $Id$ */ -public class ObjectIDImpl implements org.apache.pluto.om.common.ObjectID, java.io.Serializable -{ +public class ObjectIDImpl +implements org.apache.pluto.om.common.ObjectID, java.io.Serializable { private String stringOID; private int intOID; - private ObjectIDImpl (int oid, String stringOID) - { + private ObjectIDImpl (int oid, String stringOID) { this.stringOID = stringOID; intOID = oid; } // internal methods. - private void readObject (ObjectInputStream stream) throws IOException - { + private void readObject (ObjectInputStream stream) throws IOException { intOID = stream.readInt (); stringOID = String.valueOf (intOID); } - private void writeObject (ObjectOutputStream stream) throws IOException - { + private void writeObject (ObjectOutputStream stream) throws IOException { stream.write (intOID); } // addtional methods. - public boolean equals (Object object) - { + public boolean equals (Object object) { boolean result = false; - if (object instanceof ObjectIDImpl) + if (object instanceof ObjectIDImpl) { result = (intOID == ((ObjectIDImpl) object).intOID); - else if (object instanceof String) + } else if (object instanceof String) { result = stringOID.equals (object); - else if (object instanceof Integer) + } else if (object instanceof Integer) { result = (intOID == ((Integer)object).intValue()); + } return (result); } - public int hashCode () - { - return (intOID); + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + public int hashCode () { + return intOID; } - public String toString () - { - return (stringOID); + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + public String toString () { + return stringOID; } - public int intValue () - { + public int intValue () { return (intOID); } - static public ObjectIDImpl createFromString(String idStr) - { + static public ObjectIDImpl createFromString(String idStr) { char[] id = idStr.toCharArray(); int _id = 1; - for (int i=0; i<id.length; i++) - { + for (int i=0; i<id.length; i++) { if ((i%2)==0) _id *= id[i]; else _id ^= id[i]; _id = Math.abs(_id); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java Mon Dec 27 05:51:59 2004 @@ -31,60 +31,51 @@ private String value; private DescriptionSet descriptions; - public ParameterImpl() - { + public ParameterImpl() { descriptions = new DescriptionSetImpl(); } // Parameter implementation. - public String getName() - { + public String getName() { return name; } - public String getValue() - { + public String getValue() { return value; } /* (non-Javadoc) * @see org.apache.pluto.om.common.Parameter#getDescription(Locale) */ - public Description getDescription(Locale locale) - { + public Description getDescription(Locale locale) { return descriptions.get(locale); } // ParameterCtrl implementation. - public void setName(String name) - { + public void setName(String name) { this.name = name; } - public void setValue(String value) - { + public void setValue(String value) { this.value = value; } /* (non-Javadoc) * @see org.apache.pluto.om.common.ParameterCtrl#setDescriptionSet(DescriptionSet) */ - public void setDescriptionSet(DescriptionSet descriptions) - { + public void setDescriptionSet(DescriptionSet descriptions) { this.descriptions = descriptions; } // additional methods. - public String toString() - { + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); @@ -98,13 +89,11 @@ return buffer.toString(); } - public Collection getCastorDescriptions() - { + public Collection getCastorDescriptions() { return(DescriptionSetImpl)descriptions; } - public void setCastorDescriptions(DescriptionSet castorDescriptions) - { + public void setCastorDescriptions(DescriptionSet castorDescriptions) { this.descriptions = castorDescriptions; } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java Mon Dec 27 05:51:59 2004 @@ -26,14 +26,13 @@ public class ParameterSetImpl extends HashSet implements ParameterSet, ParameterSetCtrl, java.io.Serializable { - public ParameterSetImpl() - { + public ParameterSetImpl() { + // nothing to do } // ParameterSet implementation. - public Parameter get(String name) - { + public Parameter get(String name) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { Parameter parameter = (Parameter)iterator.next(); @@ -46,8 +45,7 @@ // ParameterSetCtrl implementation. - public Parameter add(String name, String value) - { + public Parameter add(String name, String value) { ParameterImpl parameter = new ParameterImpl(); parameter.setName(name); parameter.setValue(value); @@ -57,8 +55,7 @@ return parameter; } - public Parameter remove(String name) - { + public Parameter remove(String name) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { Parameter parameter = (Parameter)iterator.next(); @@ -70,20 +67,17 @@ return null; } - public void remove(Parameter parameter) - { + public void remove(Parameter parameter) { super.remove(parameter); } // additional methods. - public String toString() - { + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java Mon Dec 27 05:51:59 2004 @@ -32,6 +32,7 @@ * @version CVS $Id$ */ public class PreferenceImpl implements Preference, PreferenceCtrl, java.io.Serializable { + private final static String NULL_VALUE = "#*!0_NULL_0!*#"; private final static String NULL_ARRAYENTRY = "#*!1_NULL_1!*#"; @@ -39,19 +40,17 @@ private ArrayList value; private Boolean readOnly; - public PreferenceImpl() - { + public PreferenceImpl() { + // nothing to do } // Preference implementation. - public String getName() - { + public String getName() { return name; } - public Iterator getValues() - { + public Iterator getValues() { // replace the NULL_VALUE String by NULL if (value.contains(NULL_VALUE)) { return null; @@ -70,8 +69,7 @@ return returnValue.iterator(); } - public boolean isReadOnly() - { + public boolean isReadOnly() { if (readOnly == null) { return false; } @@ -84,13 +82,11 @@ // PreferenceCtrl implementation. - public void setName(String name) - { + public void setName(String name) { this.name = name; } - public void setValues(java.util.List _value) - { + public void setValues(java.util.List _value) { if (this.value == null) { this.value = new ArrayList(); } else { @@ -117,8 +113,7 @@ this.value.addAll(addValue); } - public void setReadOnly(String readOnly) - { + public void setReadOnly(String readOnly) { this.readOnly = new Boolean(readOnly); } @@ -126,21 +121,18 @@ // internal methods only used by castor - public String getReadOnly() - { + public String getReadOnly() { if (readOnly == null) { return Boolean.FALSE.toString(); } return readOnly.toString(); } - public Collection getCastorValues() - { + public Collection getCastorValues() { return value; } - public void setCastorValues(Collection _value) - { + public void setCastorValues(Collection _value) { if (value == null) { value = new ArrayList(); } else { @@ -149,8 +141,7 @@ value.addAll(_value); } - protected List getClonedCastorValuesAsList() - { + protected List getClonedCastorValuesAsList() { List returnValue = new ArrayList(value.size()); Iterator iter = value.iterator(); @@ -161,13 +152,11 @@ return returnValue; } - public String toString() - { + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java Mon Dec 27 05:51:59 2004 @@ -44,8 +44,7 @@ // PreferenceSet implementation. - public Preference get(String name) - { + public Preference get(String name) { Iterator iterator = this.preferences.iterator(); while (iterator.hasNext()) { Preference preference = (Preference)iterator.next(); @@ -60,8 +59,7 @@ return this.preferences.iterator(); } - public PreferencesValidator getPreferencesValidator() - { + public PreferencesValidator getPreferencesValidator() { if (this.classLoader == null) throw new IllegalStateException("Portlet class loader not yet available to load preferences validator."); @@ -73,6 +71,7 @@ if (validator instanceof PreferencesValidator) return(PreferencesValidator)validator; } catch (Exception ignore) { + // ignore it } return null; @@ -80,8 +79,7 @@ // PreferenceSetCtrl implementation. - public Preference add(String name, List values) - { + public Preference add(String name, List values) { PreferenceImpl preference = new PreferenceImpl(); preference.setName(name); preference.setValues(values); @@ -96,8 +94,7 @@ } - public Preference remove(String name) - { + public Preference remove(String name) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { Preference preference = (Preference)iterator.next(); @@ -109,20 +106,17 @@ return null; } - public void remove(Preference preference) - { + public void remove(Preference preference) { this.preferences.remove(preference); } // additional methods. - public String toString() - { + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); @@ -137,23 +131,19 @@ // additional internal methods - public String getCastorPreferencesValidator() - { + public String getCastorPreferencesValidator() { return castorPreferencesValidator; } - public void setCastorPreferencesValidator(String castorPreferencesValidator) - { + public void setCastorPreferencesValidator(String castorPreferencesValidator) { this.castorPreferencesValidator = castorPreferencesValidator; } - public Set getPreferences() - { + public Set getPreferences() { return this.preferences; } - public void setClassLoader(ClassLoader loader) - { + public void setClassLoader(ClassLoader loader) { this.classLoader = loader; } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java Mon Dec 27 05:51:59 2004 @@ -26,7 +26,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: PreferenceUtil.java,v 1.3 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class PreferenceUtil { @@ -37,8 +37,7 @@ * @param preferences the preferences to be converted * @return the preferences as map */ - static public HashMap createPreferenceMap(Collection preferences) - { + static public HashMap createPreferenceMap(Collection preferences) { HashMap returnValue = new HashMap(); Iterator iterator = preferences.iterator(); while (iterator.hasNext()) { Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java Mon Dec 27 05:51:59 2004 @@ -23,48 +23,42 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: SecurityRoleImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class SecurityRoleImpl implements SecurityRole, java.io.Serializable { private String description; private String roleName; - public SecurityRoleImpl() - { + public SecurityRoleImpl() { + // nothing to do } // SecurityRole implementation. - public String getDescription() - { + public String getDescription() { return description; } - public String getRoleName() - { + public String getRoleName() { return roleName; } // additional methods. - public void setDescription(String description) - { + public void setDescription(String description) { this.description = description; } - public void setRoleName(String roleName) - { + public void setRoleName(String roleName) { this.roleName = roleName; } - public String toString() - { + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java Mon Dec 27 05:51:59 2004 @@ -27,7 +27,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: SecurityRoleRefImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class SecurityRoleRefImpl implements SecurityRoleRef, java.io.Serializable { @@ -36,61 +36,51 @@ private String roleLink; private DescriptionSet descriptions; - public SecurityRoleRefImpl() - { + public SecurityRoleRefImpl() { descriptions = new DescriptionSetImpl(); } // SecurityRoleRef implementation. - public String getRoleName() - { + public String getRoleName() { return roleName; } - public String getRoleLink() - { + public String getRoleLink() { return roleLink; } /* (non-Javadoc) * @see org.apache.pluto.om.common.SecurityRoleRef#getDescription(Locale) */ - public Description getDescription(Locale locale) - { + public Description getDescription(Locale locale) { return descriptions.get(locale); } - public void setRoleName(String roleName) - { + public void setRoleName(String roleName) { this.roleName = roleName; } // additional methods. - public void setRoleLink(String roleLink) - { + public void setRoleLink(String roleLink) { this.roleLink = roleLink; } - public DescriptionSet getDescriptionSet() - { + public DescriptionSet getDescriptionSet() { return descriptions; } - public void setDescriptionSet(DescriptionSet descriptions) - { + public void setDescriptionSet(DescriptionSet descriptions) { this.descriptions = descriptions; } - public Collection getCastorDescriptions() - { + public Collection getCastorDescriptions() { return(DescriptionSetImpl)descriptions; } - public void setCastorDescriptions(DescriptionSet castorDescriptions) - { + public void setCastorDescriptions(DescriptionSet castorDescriptions) { this.descriptions = castorDescriptions; } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java Mon Dec 27 05:51:59 2004 @@ -28,18 +28,17 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: SecurityRoleRefSetImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class SecurityRoleRefSetImpl extends HashSet implements SecurityRoleRefSet, SecurityRoleRefSetCtrl, java.io.Serializable { - public SecurityRoleRefSetImpl() - { + public SecurityRoleRefSetImpl() { + // nothing to do } // SecurityRoleRefSet implementation. - public SecurityRoleRef get(String roleName) - { + public SecurityRoleRef get(String roleName) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { SecurityRoleRef securityRoleRef = (SecurityRoleRef)iterator.next(); @@ -52,8 +51,7 @@ // SecurityRoleRefSetCtrl implementation. - public SecurityRoleRef add(SecurityRoleRef securityRoleRef) - { + public SecurityRoleRef add(SecurityRoleRef securityRoleRef) { SecurityRoleRefImpl newSecurityRoleRef = new SecurityRoleRefImpl(); newSecurityRoleRef.setRoleName(securityRoleRef.getRoleName()); newSecurityRoleRef.setRoleLink(securityRoleRef.getRoleLink()); @@ -64,8 +62,7 @@ return newSecurityRoleRef; } - public SecurityRoleRef remove(String roleName) - { + public SecurityRoleRef remove(String roleName) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { SecurityRoleRef securityRoleRef = (SecurityRoleRef)iterator.next(); @@ -77,15 +74,13 @@ return null; } - public void remove(SecurityRoleRef securityRoleRef) - { + public void remove(SecurityRoleRef securityRoleRef) { super.remove(securityRoleRef); } // additional methods. - public SecurityRoleRef add(String roleName, String roleLink, DescriptionSet descriptions) - { + public SecurityRoleRef add(String roleName, String roleLink, DescriptionSet descriptions) { SecurityRoleRefImpl securityRoleRef = new SecurityRoleRefImpl(); securityRoleRef.setRoleName(roleName); securityRoleRef.setRoleLink(roleLink); @@ -101,15 +96,13 @@ public static class Unmodifiable extends UnmodifiableSet implements SecurityRoleRefSet { - public Unmodifiable(SecurityRoleRefSet c) - { + public Unmodifiable(SecurityRoleRefSet c) { super(c); } // additional methods. - public SecurityRoleRef get(String roleName) - { + public SecurityRoleRef get(String roleName) { return((SecurityRoleRefSet)c).get(roleName); } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java Mon Dec 27 05:51:59 2004 @@ -27,7 +27,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: SecurityRoleSetImpl.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class SecurityRoleSetImpl extends HashSet implements SecurityRoleSet, java.io.Serializable { @@ -36,29 +36,25 @@ public static class Unmodifiable extends UnmodifiableSet - implements SecurityRoleSet - { + implements SecurityRoleSet { - public Unmodifiable(SecurityRoleSet c) - { + public Unmodifiable(SecurityRoleSet c) { super(c); } - public SecurityRole get(String roleName) - { + public SecurityRole get(String roleName) { return ((SecurityRoleSet)c).get(roleName); } } - public SecurityRoleSetImpl() - { + public SecurityRoleSetImpl() { + // nothing to do } // SecurityRoleSet implementation. - public SecurityRole get(String roleName) - { + public SecurityRole get(String roleName) { Iterator iterator = this.iterator(); while (iterator.hasNext()) { SecurityRole securityRole = (SecurityRole)iterator.next(); @@ -71,8 +67,7 @@ // additional methods. - public SecurityRole add(SecurityRole securityRole) - { + public SecurityRole add(SecurityRole securityRole) { SecurityRoleImpl newSecurityRole = new SecurityRoleImpl(); newSecurityRole.setRoleName(securityRole.getRoleName()); newSecurityRole.setDescription(securityRole.getDescription()); @@ -82,8 +77,7 @@ return newSecurityRole; } - public SecurityRole add(String roleName, String description) - { + public SecurityRole add(String roleName, String description) { SecurityRoleImpl securityRole = new SecurityRoleImpl(); securityRole.setRoleName(roleName); securityRole.setDescription(description); @@ -93,19 +87,15 @@ return securityRole; } - public void remove(SecurityRole securityRole) - { + public void remove(SecurityRole securityRole) { super.remove(securityRole); } - public SecurityRole remove(String roleName) - { + public SecurityRole remove(String roleName) { Iterator iterator = this.iterator(); - while (iterator.hasNext()) - { + while (iterator.hasNext()) { SecurityRole securityRole = (SecurityRole)iterator.next(); - if (securityRole.getRoleName().equals(roleName)) - { + if (securityRole.getRoleName().equals(roleName)) { super.remove(securityRole); return securityRole; } @@ -113,13 +103,11 @@ return null; } - public String toString() - { + public String toString() { return toString(0); } - public String toString(int indent) - { + public String toString(int indent) { StringBuffer buffer = new StringBuffer(50); StringUtils.newLine(buffer,indent); buffer.append(getClass().toString()); Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/Support.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/Support.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/Support.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/Support.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/Support.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/Support.java Mon Dec 27 05:51:59 2004 @@ -20,23 +20,21 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: Support.java,v 1.2 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public interface Support { - public static final int POST_LOAD = 2; - public static final int PRE_BUILD = 3; - public static final int POST_BUILD = 4; - public static final int PRE_STORE = 5; - public static final int POST_STORE = 6; + int POST_LOAD = 2; + int PRE_BUILD = 3; + int POST_BUILD = 4; + int PRE_STORE = 5; + int POST_STORE = 6; - // public void preLoad(Object parameter) throws Exception; // not possible, because we use castor + void postLoad(Object parameter) throws Exception; - public void postLoad(Object parameter) throws Exception; + void preBuild(Object parameter) throws Exception; + void postBuild(Object parameter) throws Exception; - public void preBuild(Object parameter) throws Exception; - public void postBuild(Object parameter) throws Exception; - - public void preStore(Object parameter) throws Exception; - public void postStore(Object parameter) throws Exception; + void preStore(Object parameter) throws Exception; + void postStore(Object parameter) throws Exception; } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/UnmodifiableSet.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/UnmodifiableSet.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/UnmodifiableSet.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/UnmodifiableSet.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/UnmodifiableSet.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/UnmodifiableSet.java Mon Dec 27 05:51:59 2004 @@ -25,7 +25,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: UnmodifiableSet.java,v 1.3 2004/03/05 13:02:15 bdelacretaz Exp $ + * @version CVS $Id$ */ public class UnmodifiableSet implements Set, Serializable { @@ -34,109 +34,88 @@ protected Set c; - public UnmodifiableSet(Set c) - { + public UnmodifiableSet(Set c) { if (c == null) { throw new NullPointerException(); } this.c = c; } - public int size() - { + public int size() { return c.size(); } - public boolean isEmpty() - { + public boolean isEmpty() { return c.isEmpty(); } - public boolean contains(Object o) - { + public boolean contains(Object o) { return c.contains(o); } - public Object[] toArray() - { + public Object[] toArray() { return c.toArray(); } - public Object[] toArray(Object[] a) - { + public Object[] toArray(Object[] a) { return c.toArray(a); } - public String toString() - { + public String toString() { return c.toString(); } - public Iterator iterator() - { - return new Iterator() - { + public Iterator iterator() { + return new Iterator() { Iterator i = c.iterator(); - public boolean hasNext() - { + public boolean hasNext() { return i.hasNext(); } - public Object next() - { + public Object next() { return i.next(); } - public void remove() - { + public void remove() { throw new UnsupportedOperationException(); } }; } - public boolean add(Object o) - { + public boolean add(Object o) { throw new UnsupportedOperationException(); } - public boolean remove(Object o) - { + public boolean remove(Object o) { throw new UnsupportedOperationException(); } - public boolean containsAll(Collection coll) - { + public boolean containsAll(Collection coll) { return c.containsAll(coll); } - public boolean addAll(Collection coll) - { + public boolean addAll(Collection coll) { throw new UnsupportedOperationException(); } - public boolean removeAll(Collection coll) - { + public boolean removeAll(Collection coll) { throw new UnsupportedOperationException(); } - public boolean retainAll(Collection coll) - { + public boolean retainAll(Collection coll) { throw new UnsupportedOperationException(); } - public void clear() - { + public void clear() { throw new UnsupportedOperationException(); } - public boolean equals(Object o) - { + public boolean equals(Object o) { return c.equals(o); } - public int hashCode() - { + public int hashCode() { return c.hashCode(); } @@ -149,8 +128,7 @@ * * @return the modifiable set */ - public Set getModifiableSet() - { + public Set getModifiableSet() { return c; } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java Mon Dec 27 05:51:59 2004 @@ -75,7 +75,7 @@ * @see Factory * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * - * @version CVS $Id: FactoryManagerServiceImpl.java,v 1.5 2004/03/05 13:02:16 bdelacretaz Exp $ + * @version CVS $Id$ */ public class FactoryManagerServiceImpl extends AbstractLogEnabled @@ -172,6 +172,7 @@ try { factory.destroy (); } catch (Exception exc) { + // ignore it } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/servlet/ServletResponseImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/servlet/ServletResponseImpl.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/servlet/ServletResponseImpl.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/servlet/ServletResponseImpl.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/servlet/ServletResponseImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/servlet/ServletResponseImpl.java Mon Dec 27 05:51:59 2004 @@ -55,6 +55,7 @@ try { this.stream.flush(); } catch (IOException ignore) { + // just ignore it } final String value = new String(this.stream.stream.toByteArray()); this.stream = new MyOutputStream(); @@ -330,6 +331,7 @@ * @see javax.servlet.ServletResponse#setContentLength(int) */ public void setContentLength(int arg0) { + // nothing to do } /* @@ -338,6 +340,7 @@ * @see javax.servlet.ServletResponse#setContentType(java.lang.String) */ public void setContentType(String arg0) { + // nothing to do } /* @@ -346,6 +349,7 @@ * @see javax.servlet.ServletResponse#setLocale(java.util.Locale) */ public void setLocale(Locale arg0) { + // nothing to do } /* @@ -354,6 +358,7 @@ * @see javax.servlet.ServletResponse#resetBuffer() */ public void resetBuffer() { + // nothing to do } } @@ -363,7 +368,7 @@ ByteArrayOutputStream stream = new ByteArrayOutputStream(); public MyOutputStream() { - + // nothing to do } /* @@ -385,4 +390,4 @@ this.stream.flush(); } -} \ No newline at end of file +} Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSource.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSource.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSource.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSource.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSource.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSource.java Mon Dec 27 05:51:59 2004 @@ -45,7 +45,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * @author <a href="mailto:[EMAIL PROTECTED]">Volker Schmitt</a> * - * @version CVS $Id: CopletSource.java,v 1.8 2004/04/19 14:47:31 cziegeler Exp $ + * @version CVS $Id$ */ public class CopletSource implements Source, XMLizable, Serviceable, Contextualizable { @@ -131,6 +131,7 @@ * @see org.apache.excalibur.source.Source#refresh() */ public void refresh() { + // nothing to do } /** Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSourceFactory.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSourceFactory.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSourceFactory.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSourceFactory.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSourceFactory.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/source/CopletSourceFactory.java Mon Dec 27 05:51:59 2004 @@ -39,7 +39,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a> * @author <a href="mailto:[EMAIL PROTECTED]">Volker Schmitt</a> * - * @version CVS $Id: CopletSourceFactory.java,v 1.8 2004/04/28 13:58:16 cziegeler Exp $ + * @version CVS $Id$ */ public class CopletSourceFactory extends AbstractLogEnabled @@ -103,6 +103,7 @@ * @see org.apache.excalibur.source.SourceFactory#release(Source) */ public void release(Source source) { + // nothing to do } } Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java Mon Dec 27 05:51:59 2004 @@ -31,16 +31,15 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Björn Lütkemeier</a> * - * @version CVS $Id: AttributesFieldHandler.java,v 1.7 2004/03/05 13:02:17 bdelacretaz Exp $ + * @version CVS $Id$ */ public class AttributesFieldHandler extends AbstractFieldHandler { protected Map getAttributes(Object object) { if (object instanceof CopletData) { return ((CopletData) object).getAttributes(); - } else { - return ((CopletInstanceData) object).getAttributes(); } + return ((CopletInstanceData) object).getAttributes(); } public Object getValue(Object object) { Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletBaseDataReferenceFieldHandler.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletBaseDataReferenceFieldHandler.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletBaseDataReferenceFieldHandler.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletBaseDataReferenceFieldHandler.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletBaseDataReferenceFieldHandler.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletBaseDataReferenceFieldHandler.java Mon Dec 27 05:51:59 2004 @@ -23,7 +23,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Björn Lütkemeier</a> * - * @version CVS $Id: CopletBaseDataReferenceFieldHandler.java,v 1.7 2004/03/05 13:02:17 bdelacretaz Exp $ + * @version CVS $Id$ */ public class CopletBaseDataReferenceFieldHandler extends ReferenceFieldHandler { @@ -32,9 +32,8 @@ CopletBaseData copletBaseData = ((CopletData) object).getCopletBaseData(); if (copletBaseData != null) { return copletBaseData.getId(); - } else { - return null; } + return null; } public Object newInstance(Object parent) { Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletDataReferenceFieldHandler.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletDataReferenceFieldHandler.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletDataReferenceFieldHandler.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletDataReferenceFieldHandler.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletDataReferenceFieldHandler.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletDataReferenceFieldHandler.java Mon Dec 27 05:51:59 2004 @@ -23,7 +23,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Björn Lütkemeier</a> * - * @version CVS $Id: CopletDataReferenceFieldHandler.java,v 1.7 2004/03/05 13:02:17 bdelacretaz Exp $ + * @version CVS $Id$ */ public class CopletDataReferenceFieldHandler extends ReferenceFieldHandler { @@ -31,9 +31,8 @@ CopletData copletData = ((CopletInstanceData) object).getCopletData(); if (copletData != null) { return copletData.getId(); - } else { - return null; } + return null; } public Object newInstance(Object parent) { Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletInstanceDataReferenceFieldHandler.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletInstanceDataReferenceFieldHandler.java?view=diff&rev=123407&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletInstanceDataReferenceFieldHandler.java&r1=123406&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletInstanceDataReferenceFieldHandler.java&r2=123407 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletInstanceDataReferenceFieldHandler.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletInstanceDataReferenceFieldHandler.java Mon Dec 27 05:51:59 2004 @@ -23,7 +23,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Björn Lütkemeier</a> * - * @version CVS $Id: CopletInstanceDataReferenceFieldHandler.java,v 1.6 2004/03/05 13:02:17 bdelacretaz Exp $ + * @version CVS $Id$ */ public class CopletInstanceDataReferenceFieldHandler extends ReferenceFieldHandler { @@ -32,9 +32,8 @@ CopletInstanceData copletInstanceData = ((CopletLayout)object).getCopletInstanceData(); if (copletInstanceData != null) { return copletInstanceData.getId(); - } else { - return null; } + return null; } public Object newInstance(Object parent) {
