cziegeler 2003/05/21 06:24:03
Modified: src/blocks/portal/java/org/apache/cocoon/portal/coplet
CopletInstanceData.java
src/blocks/portal/samples/profiles/mapping
copletinstancedata.xml
Log:
Making coplet instance data aspectalizable
Revision Changes Path
1.5 +5 -20
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
Index: CopletInstanceData.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CopletInstanceData.java 21 May 2003 13:06:01 -0000 1.4
+++ CopletInstanceData.java 21 May 2003 13:23:59 -0000 1.5
@@ -50,6 +50,8 @@
*/
package org.apache.cocoon.portal.coplet;
+import org.apache.cocoon.portal.factory.impl.AbstractProducible;
+
/**
*
@@ -59,13 +61,12 @@
*
* @version CVS $Id$
*/
-public final class CopletInstanceData {
+public final class CopletInstanceData
+ extends AbstractProducible {
public final static int STATUS_MINIMIZED = 0;
public final static int STATUS_MAXIMIZED = 1;
- private String copletId;
-
private CopletData copletData;
protected int status = STATUS_MAXIMIZED;
@@ -74,22 +75,6 @@
* Constructor
*/
public CopletInstanceData() {
- }
-
- /**
- * Returns the copletId.
- * @return String
- */
- public String getId() {
- return copletId;
- }
-
- /**
- * Sets the copletId.
- * @param copletId The copletId to set
- */
- public void setId(String copletId) {
- this.copletId = copletId;
}
/**
1.4 +15 -5
cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletinstancedata.xml
Index: copletinstancedata.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletinstancedata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- copletinstancedata.xml 21 May 2003 13:06:01 -0000 1.3
+++ copletinstancedata.xml 21 May 2003 13:24:01 -0000 1.4
@@ -2,6 +2,19 @@
<mapping>
<description>Coplet instance data mapping file</description>
+ <class
name="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable">
+ </class>
+
+ <class name="org.apache.cocoon.portal.factory.impl.AbstractProducible"
+
extends="org.apache.cocoon.portal.aspect.impl.AbstractAspectalizable">
+ <field name="name" type="java.lang.String">
+ <bind-xml name="name" node="attribute" />
+ </field>
+ <field name="id" type="java.lang.String" >
+ <bind-xml name="id" node="attribute" />
+ </field>
+ </class>
+
<class
name="org.apache.cocoon.portal.profile.impl.CopletInstanceDataManager">
<map-to xml="coplets" />
@@ -10,12 +23,9 @@
</field>
</class>
- <class name="org.apache.cocoon.portal.coplet.CopletInstanceData">
+ <class name="org.apache.cocoon.portal.coplet.CopletInstanceData"
+ extends="org.apache.cocoon.portal.factory.impl.AbstractProducible">
<map-to xml="coplet-instance-data" />
-
- <field name="id" type="java.lang.String">
- <bind-xml name="id" node="attribute" />
- </field>
<field name="status" type="java.lang.Integer">
<bind-xml name="status"/>