You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2007/12/18 21:29:30 UTC
svn commit: r605322 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/
cocoon-portal-portlet-impl/src/main/java/org/apache/coco...
Author: cziegeler
Date: Tue Dec 18 12:29:29 2007
New Revision: 605322
URL: http://svn.apache.org/viewvc?rev=605322&view=rev
Log:
Clean up object model - objects are currently not serializable. Remove support for cloning.
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/AbstractParameters.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletDefinition.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletInstance.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletType.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Item.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Layout.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/NamedItem.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultCopletFactory.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/AbstractParameters.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/AbstractParameters.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/AbstractParameters.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/AbstractParameters.java Tue Dec 18 12:29:29 2007
@@ -16,7 +16,6 @@
*/
package org.apache.cocoon.portal.om;
-import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -27,8 +26,7 @@
*
* @version $Id$
*/
-public abstract class AbstractParameters
- implements Cloneable, Serializable {
+public abstract class AbstractParameters {
protected Map parameters = Collections.EMPTY_MAP;
@@ -105,21 +103,5 @@
*/
public Map getTemporaryAttributes() {
return this.temporaryAttributes;
- }
-
- /**
- * @see java.lang.Object#clone()
- */
- protected Object clone() throws CloneNotSupportedException {
- final AbstractParameters clone = (AbstractParameters)super.clone();
-
- if ( this.parameters.size() > 0 ) {
- clone.parameters = new LinkedMap(this.parameters);
- }
- if ( this.temporaryAttributes.size() > 0 ) {
- clone.temporaryAttributes = new HashMap(this.temporaryAttributes);
- }
-
- return clone;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java Tue Dec 18 12:29:29 2007
@@ -17,7 +17,6 @@
package org.apache.cocoon.portal.om;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
/**
@@ -90,31 +89,5 @@
public final void removeItem(Item item) {
this.items.remove(item);
item.setParent(null);
- }
-
- /**
- * @see java.lang.Object#clone()
- */
- protected Object clone() throws CloneNotSupportedException {
- CompositeLayout clone = (CompositeLayout)super.clone();
-
- // we are not cloning the items
- clone.items.clear();
-
- return clone;
- }
-
- /**
- * @see org.apache.cocoon.portal.om.Layout#copy()
- */
- public Layout copy() {
- CompositeLayout clone = (CompositeLayout)super.copy();
- final Iterator i = this.items.iterator();
- while ( i.hasNext() ) {
- final Item current = (Item)i.next();
- final Item clonedItem = current.copy(clone);
- clone.addItem(clonedItem);
- }
- return clone;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletDefinition.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletDefinition.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletDefinition.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletDefinition.java Tue Dec 18 12:29:29 2007
@@ -16,8 +16,8 @@
*/
package org.apache.cocoon.portal.om;
-import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -34,7 +34,7 @@
*
* @version $Id$
*/
-public final class CopletDefinition implements Serializable, Cloneable {
+public final class CopletDefinition {
/** The unique identifier. */
protected final String id;
@@ -46,7 +46,7 @@
protected CopletType copletType;
/** Attributes (configuration) of this coplet. */
- protected final Map attributes = new HashMap();
+ protected Map attributes = Collections.EMPTY_MAP;
protected String allowedRoles;
@@ -57,12 +57,22 @@
* @param id The unique id of the object.
* @see PortalUtils#testId(String)
*/
- public CopletDefinition(String id) {
+ public CopletDefinition(String id, CopletType type) {
final String idErrorMsg = PortalUtils.testId(id);
if ( idErrorMsg != null ) {
throw new IllegalArgumentException(idErrorMsg);
}
this.id = id;
+ this.copletType = type;
+ }
+
+ /**
+ * Constructor to instantiate a new coplet data object.
+ * @param id The unique id of the object.
+ * @see PortalUtils#testId(String)
+ */
+ public CopletDefinition(String id) {
+ this(id, null);
}
/**
@@ -97,16 +107,16 @@
return this.copletType;
}
- /**
- * Sets the type of the coplet.
- * @param copletType The coplet type to set
- */
- public void setCopletType(CopletType copletType) {
- this.copletType = copletType;
+ public void setCopletType(final CopletType ct) {
+ this.copletType = ct;
}
public Object removeAttribute(String key) {
- return this.attributes.remove(key);
+ final Object result = this.attributes.remove(key);
+ if ( this.attributes.size() == 0 ) {
+ this.attributes = Collections.EMPTY_MAP;
+ }
+ return result;
}
public Object getAttribute(String key) {
@@ -114,6 +124,9 @@
}
public void setAttribute(String key, Object value) {
+ if ( this.attributes.size() == 0 ) {
+ this.attributes = new HashMap();
+ }
this.attributes.put(key, value);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletInstance.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletInstance.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletInstance.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletInstance.java Tue Dec 18 12:29:29 2007
@@ -16,7 +16,6 @@
*/
package org.apache.cocoon.portal.om;
-import java.io.Serializable;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -45,7 +44,7 @@
*
* @version $Id$
*/
-public final class CopletInstance implements Cloneable, Serializable {
+public final class CopletInstance {
public final static int SIZE_MINIMIZED = 0;
public final static int SIZE_NORMAL = 1;
@@ -79,14 +78,19 @@
* @param id The unique id of the object.
* @see PortalUtils#testId(String)
*/
- public CopletInstance(String id) {
+ public CopletInstance(String id, CopletDefinition def) {
final String idErrorMsg = PortalUtils.testId(id);
if ( idErrorMsg != null ) {
throw new IllegalArgumentException(idErrorMsg);
}
+ this.copletDefinition = def;
this.id = id;
}
+ public CopletInstance(String id) {
+ this(id, null);
+ }
+
/**
* @return CopletDefinition
*/
@@ -94,12 +98,8 @@
return this.copletDefinition;
}
- /**
- * Sets the coplet definition..
- * @param copletDef The copletDef to set
- */
- public void setCopletDefinition(CopletDefinition copletDef) {
- this.copletDefinition = copletDef;
+ public void setCopletDefinition(final CopletDefinition cd) {
+ this.copletDefinition = cd;
}
public String getTitle() {
@@ -115,35 +115,6 @@
public void setTitle(String title) {
this.title = title;
- }
-
- /**
- * @see java.lang.Object#clone()
- */
- protected Object clone() throws CloneNotSupportedException {
- final CopletInstance clone = new CopletInstance(this.id);
-
- if ( this.attributes.size() > 0 ) {
- clone.attributes = new HashMap(this.attributes);
- }
- if ( this.temporaryAttributes.size() > 0 ) {
- clone.temporaryAttributes = new HashMap(this.temporaryAttributes);
- }
-
- clone.size = this.size;
- clone.copletDefinition = this.copletDefinition;
- clone.title = this.title;
-
- return clone;
- }
-
- public CopletInstance copy() {
- try {
- return (CopletInstance)this.clone();
- } catch (CloneNotSupportedException cnse) {
- // ignore
- return null;
- }
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java Tue Dec 18 12:29:29 2007
@@ -43,26 +43,4 @@
public String getCopletInstanceId() {
return this.copletInstanceId;
}
-
- /**
- * @see java.lang.Object#clone()
- */
- protected Object clone() throws CloneNotSupportedException {
- CopletLayout clone = (CopletLayout)super.clone();
-
- clone.copletInstanceId = null;
-
- return clone;
- }
-
- /**
- * @see org.apache.cocoon.portal.om.Layout#copy()
- */
- public Layout copy() {
- CopletLayout clone = (CopletLayout)super.copy();
-
- clone.copletInstanceId = this.copletInstanceId;
-
- return clone;
- }
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletType.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletType.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletType.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletType.java Tue Dec 18 12:29:29 2007
@@ -23,19 +23,24 @@
import org.apache.cocoon.portal.util.PortalUtils;
/**
- * A coplet base data defines a coplet type, like a pipeline based coplet,
+ * A coplet type defines a way of adding content to the portal, like a
+ * Cocoon pipeline based coplet,
* a JSR 168 portlet or a WSRP portlet. For each type exists a coplet type
- * with some configuration.
+ * with corresponding configuration.
+ *
* Based on the coplet type, coplets are created ({@link CopletDefinition}.
*
* @version $Id$
*/
public final class CopletType {
+ /** The configuration. */
protected Map copletConfig = Collections.EMPTY_MAP;
+ /** The unique identifier. */
protected final String id;
+ /** The coplet adapter. */
protected CopletAdapter copletAdapter;
/**
@@ -43,12 +48,22 @@
* @param id The unique id of the object.
* @see PortalUtils#testId(String)
*/
- public CopletType(String id) {
+ public CopletType(String id, CopletAdapter adapter) {
final String idErrorMsg = PortalUtils.testId(id);
if ( idErrorMsg != null ) {
throw new IllegalArgumentException(idErrorMsg);
}
this.id = id;
+ this.copletAdapter = adapter;
+ }
+
+ /**
+ * Create a new coplet base data object.
+ * @param id The unique id of the object.
+ * @see PortalUtils#testId(String)
+ */
+ public CopletType(String id) {
+ this(id, null);
}
/**
@@ -91,7 +106,7 @@
}
public void setCopletConfig(final Map config) {
- if ( config.size() == 0 ) {
+ if ( config == null || config.size() == 0 ) {
this.copletConfig = Collections.EMPTY_MAP;
} else {
this.copletConfig = new HashMap(config);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java Tue Dec 18 12:29:29 2007
@@ -50,15 +50,4 @@
public void setSource(String source) {
this.source = source;
}
-
- /**
- * @see java.lang.Object#clone()
- */
- protected Object clone() throws CloneNotSupportedException {
- FrameLayout clone = (FrameLayout)super.clone();
-
- clone.source = this.source;
-
- return clone;
- }
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Item.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Item.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Item.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Item.java Tue Dec 18 12:29:29 2007
@@ -53,31 +53,4 @@
public final void setParent(CompositeLayout layout) {
this.parentLayout = layout;
}
-
- /**
- * @see java.lang.Object#clone()
- */
- protected Object clone() throws CloneNotSupportedException {
- Item clone = (Item)super.clone();
-
- clone.layout = null;
- clone.parentLayout = null;
-
- return clone;
- }
-
- public Item copy(CompositeLayout parent) {
- try {
- Item clone = (Item)this.clone();
- if ( this.layout != null ) {
- clone.layout = this.layout.copy();
- clone.layout.setParent(clone);
- }
- clone.parentLayout = parent;
- return clone;
- } catch (CloneNotSupportedException cnse) {
- // ignore
- }
- return null;
- }
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Layout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Layout.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Layout.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/Layout.java Tue Dec 18 12:29:29 2007
@@ -16,14 +16,9 @@
*/
package org.apache.cocoon.portal.om;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-
import org.apache.cocoon.portal.layout.renderer.Renderer;
import org.apache.cocoon.portal.services.LayoutFactory;
import org.apache.cocoon.portal.util.PortalUtils;
-import org.apache.commons.collections.map.LinkedMap;
/**
* A layout describes a graphical element on the portal page. This can
@@ -130,61 +125,11 @@
}
/**
- * Make a copy of this layout object and of all it's children.
- * This includes copies of items and coplet instances.
- */
- public Layout copy() {
- try {
- return (Layout)this.clone();
- } catch (CloneNotSupportedException cnse) {
- // ignore
- }
- return null;
- }
-
- /**
* @see java.lang.Object#toString()
*/
public String toString() {
return "Layout (" + this.getClass() + '.' + this.hashCode() +
"), type=" + this.layoutType + ", id=" + (this.getId() == null ? "" : this.getId());
- }
-
- /**
- * @see java.lang.Object#clone()
- */
- protected Object clone() throws CloneNotSupportedException {
- Constructor c;
- try {
- c = this.getClass().getConstructor(new Class[] {String.class, String.class});
- final Layout clone = (Layout)c.newInstance(new Object[] {this.id, this.layoutType});
-
- // clone fields from AbstractParameters
- if ( this.parameters.size() > 0 ) {
- clone.parameters = new LinkedMap(this.parameters);
- }
-
- if ( this.temporaryAttributes.size() > 0 ) {
- clone.temporaryAttributes = new HashMap(this.temporaryAttributes);
- }
-
- // we don't clone the parent; we just set it to null
- clone.parent = null;
- clone.customRenderer = this.customRenderer;
- clone.isStatic = this.isStatic;
-
- return clone;
- } catch (NoSuchMethodException e) {
- throw new CloneNotSupportedException("Unable to find constructor for new layout object.");
- } catch (InstantiationException e) {
- throw new CloneNotSupportedException("Unable to create layout object.");
- } catch (InvocationTargetException e) {
- throw new CloneNotSupportedException("Unable to invoke constructor for new layout object.");
- } catch (IllegalArgumentException e) {
- throw new CloneNotSupportedException("Unable to invoke constructor for new layout object.");
- } catch (IllegalAccessException e) {
- throw new CloneNotSupportedException("Unable to invoke constructor for new layout object.");
- }
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java Tue Dec 18 12:29:29 2007
@@ -55,16 +55,4 @@
public void setProfileName(String linkedProfileName) {
this.linkedProfileName = linkedProfileName;
}
-
- /**
- * @see java.lang.Object#clone()
- */
- protected Object clone() throws CloneNotSupportedException {
- LinkLayout clone = (LinkLayout)super.clone();
-
- clone.linkedLayoutId = this.linkedLayoutId;
- clone.linkedProfileName = this.linkedProfileName;
-
- return clone;
- }
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/NamedItem.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/NamedItem.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/NamedItem.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/NamedItem.java Tue Dec 18 12:29:29 2007
@@ -39,15 +39,4 @@
public void setName(String name) {
this.name = name;
}
-
- /**
- * @see java.lang.Object#clone()
- */
- protected Object clone() throws CloneNotSupportedException {
- NamedItem clone = (NamedItem)super.clone();
-
- clone.name = this.name;
-
- return clone;
- }
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultCopletFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultCopletFactory.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultCopletFactory.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultCopletFactory.java Tue Dec 18 12:29:29 2007
@@ -50,20 +50,19 @@
/**
* @see org.apache.cocoon.portal.services.CopletFactory#newInstance(org.apache.cocoon.portal.om.CopletDefinition, String)
*/
- public CopletInstance newInstance(CopletDefinition copletData, String key)
+ public CopletInstance newInstance(CopletDefinition copletDefinition, String key)
throws PortalException {
String id = key;
if (id == null ) {
synchronized (this) {
- id = copletData.getId() + '-' + idCounter;
+ id = copletDefinition.getId() + '-' + idCounter;
idCounter += 1;
}
}
- CopletInstance instance = new CopletInstance(id);
- instance.setCopletDefinition(copletData);
+ CopletInstance instance = new CopletInstance(id, copletDefinition);
// now lookup the adapter
- final CopletAdapter adapter = instance.getCopletDefinition().getCopletType().getCopletAdapter();
+ final CopletAdapter adapter = copletDefinition.getCopletType().getCopletAdapter();
adapter.login( instance );
// send an event
@@ -96,8 +95,7 @@
idCounter += 1;
}
}
- final CopletDefinition definition = new CopletDefinition(id);
- definition.setCopletType(copletType);
+ final CopletDefinition definition = new CopletDefinition(id, copletType);
final CopletAdapter adapter = definition.getCopletType().getCopletAdapter();
adapter.init( definition );
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java?rev=605322&r1=605321&r2=605322&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java Tue Dec 18 12:29:29 2007
@@ -91,8 +91,7 @@
// check for portlets
if ( "portlet".equals(cd.getCopletType().getId()) ) {
final String id = StringUtils.replaceChars(cd.getId() + "-1", '_', '-');
- final CopletInstance cid = new CopletInstance(id);
- cid.setCopletDefinition(cd);
+ final CopletInstance cid = new CopletInstance(id, cd);
instances.add(cid);
if ( portletNames.size() == 0 || portletNames.contains(cd.getId())) {
final CopletLayout copletLayout = (CopletLayout) this.portalService.getLayoutFactory().newInstance("coplet");