jford 2004/03/25 14:23:21
Modified: components/registry/src/java/org/apache/jetspeed/om/portlet/impl
PortletDefinitionImpl.java
PortletApplicationDefinitionImpl.java
Log:
Removed storage of metadata. Create a new one everytime getMetadata is called.
Made get/setMetadataFields protected.
Should use GenericMetadata to interface with fields.
Revision Changes Path
1.7 +7 -13
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
Index: PortletDefinitionImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PortletDefinitionImpl.java 11 Mar 2004 19:14:26 -0000 1.6
+++ PortletDefinitionImpl.java 25 Mar 2004 22:23:20 -0000 1.7
@@ -104,8 +104,6 @@
private String expirationCache;
/** Metadata property */
- private GenericMetadata metadata = new PortletDefinitionMetadataImpl();
-
private Collection metadataFields = null;
public PortletDefinitionImpl()
@@ -670,14 +668,13 @@
*/
public GenericMetadata getMetadata()
{
- if(metadata.getFields() == null)
+ if(metadataFields == null)
{
- if(metadataFields == null)
- {
- metadataFields = new ArrayList();
- }
- metadata.setFields(metadataFields);
+ metadataFields = new ArrayList();
}
+
+ GenericMetadata metadata = new PortletDefinitionMetadataImpl();
+ metadata.setFields(metadataFields);
return metadata;
}
@@ -687,14 +684,13 @@
*/
public void setMetadata(GenericMetadata metadata)
{
- this.metadata = metadata;
this.metadataFields = metadata.getFields();
}
/**
* @return
*/
- public Collection getMetadataFields()
+ protected Collection getMetadataFields()
{
return metadataFields;
}
@@ -702,10 +698,8 @@
/**
* @param collection
*/
- public void setMetadataFields(Collection metadataFields)
+ protected void setMetadataFields(Collection metadataFields)
{
this.metadataFields = metadataFields;
- metadata.setFields(metadataFields);
}
-
}
1.8 +8 -13
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java
Index: PortletApplicationDefinitionImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PortletApplicationDefinitionImpl.java 11 Mar 2004 19:14:58 -0000 1.7
+++ PortletApplicationDefinitionImpl.java 25 Mar 2004 22:23:20 -0000 1.8
@@ -60,8 +60,6 @@
protected long webApplicationId;
/** Metadata property */
- private GenericMetadata metadata = new PortletApplicationMetadataImpl();
-
private Collection metadataFields = null;
/** Description */
@@ -244,14 +242,13 @@
*/
public GenericMetadata getMetadata()
{
- if(metadata.getFields() == null)
+ if(metadataFields == null)
{
- if(metadataFields == null)
- {
- metadataFields = new ArrayList();
- }
- metadata.setFields(metadataFields);
+ metadataFields = new ArrayList();
}
+
+ GenericMetadata metadata = new PortletApplicationMetadataImpl();
+ metadata.setFields(metadataFields);
return metadata;
}
@@ -261,14 +258,13 @@
*/
public void setMetadata(GenericMetadata metadata)
{
- this.metadata = metadata;
this.metadataFields = metadata.getFields();
}
/**
* @return
*/
- public Collection getMetadataFields()
+ protected Collection getMetadataFields()
{
return metadataFields;
}
@@ -276,10 +272,9 @@
/**
* @param collection
*/
- public void setMetadataFields(Collection metadataFields)
+ protected void setMetadataFields(Collection metadataFields)
{
this.metadataFields = metadataFields;
- metadata.setFields(metadataFields);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
