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 2006/08/01 22:00:03 UTC
svn commit: r427702 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/
cocoon-portal-impl/src/main/java/org/apache/cocoon/po...
Author: cziegeler
Date: Tue Aug 1 13:00:02 2006
New Revision: 427702
URL: http://svn.apache.org/viewvc?rev=427702&view=rev
Log:
Finished refactoring and clean up profile handling a little bit
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/CompositeLayout.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.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/layout/CompositeLayout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/CompositeLayout.java?rev=427702&r1=427701&r2=427702&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/CompositeLayout.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/CompositeLayout.java Tue Aug 1 13:00:02 2006
@@ -31,7 +31,7 @@
extends Layout {
/** The children of this layout object. */
- protected List items = new ArrayList();
+ protected final List items = new ArrayList();
/**
* Create a new composite layout object.
@@ -124,7 +124,7 @@
CompositeLayoutImpl clone = (CompositeLayoutImpl)super.clone();
// we are not cloning the items
- clone.items = new ArrayList();
+ clone.items.clear();
return clone;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java?rev=427702&r1=427701&r2=427702&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/profile/impl/GroupBasedProfileManager.java Tue Aug 1 13:00:02 2006
@@ -490,7 +490,7 @@
try {
Collection cidm = (Collection)loader.loadProfile(key, profileLSParams);
- profile.setCopletInstanceDatas(cidm);
+ profile.setCopletInstances(cidm);
this.prepareObject(profile.getCopletInstancesMap());
return true;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.java?rev=427702&r1=427701&r2=427702&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/scratchpad/ProfileImpl.java Tue Aug 1 13:00:02 2006
@@ -41,14 +41,14 @@
/** The name (unique key) of this profile. */
protected final String profileName;
- /** A map of all coplet base datas. */
- protected Map copletBaseDatas;
+ /** A map of all coplet types. */
+ protected Map copletTypes;
- /** A map of all coplet datas. */
- protected Map copletDatas;
+ /** A map of all coplet definitions. */
+ protected Map copletDefinitions;
- /** A map of all coplet instance datas. */
- protected Map copletInstanceDatas;
+ /** A map of all coplet instances. */
+ protected Map copletInstances;
/** A list of all layouts. */
protected List layouts;
@@ -71,20 +71,20 @@
this.createLayoutCollections();
}
- public void setCopletTypes(Map copletBaseDatas) {
- this.copletBaseDatas = copletBaseDatas;
+ public void setCopletTypes(Map copletTypes) {
+ this.copletTypes = copletTypes;
}
- public void setCopletDefinitions(Map copletDatas) {
- this.copletDatas = copletDatas;
+ public void setCopletDefinitions(Map copletDefinitions) {
+ this.copletDefinitions = copletDefinitions;
}
- public void setCopletInstanceDatas(Collection copletInstanceDatas) {
- this.copletInstanceDatas = new HashMap();
- final Iterator i = copletInstanceDatas.iterator();
+ public void setCopletInstances(Collection copletInstances) {
+ this.copletInstances = new HashMap();
+ final Iterator i = copletInstances.iterator();
while ( i.hasNext() ) {
final CopletInstance current = (CopletInstance) i.next();
- this.copletInstanceDatas.put(current.getId(), current);
+ this.copletInstances.put(current.getId(), current);
}
}
@@ -99,21 +99,21 @@
* @see org.apache.cocoon.portal.scratchpad.Profile#getCopletTypes()
*/
public Collection getCopletTypes() {
- return this.copletBaseDatas.values();
+ return this.copletTypes.values();
}
/**
* @see org.apache.cocoon.portal.scratchpad.Profile#getCopletDefinitions()
*/
public Collection getCopletDefinitions() {
- return this.copletDatas.values();
+ return this.copletDefinitions.values();
}
/**
* @see org.apache.cocoon.portal.scratchpad.Profile#getCopletInstances()
*/
public Collection getCopletInstances() {
- return this.copletInstanceDatas.values();
+ return this.copletInstances.values();
}
/**
@@ -133,15 +133,15 @@
/**
* @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletType(java.lang.String)
*/
- public CopletType searchCopletType(String copletBaseDataId) {
- return (CopletType) this.copletBaseDatas.get(copletBaseDataId);
+ public CopletType searchCopletType(String copletTypeId) {
+ return (CopletType) this.copletTypes.get(copletTypeId);
}
/**
* @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletDefinition(java.lang.String)
*/
- public CopletDefinition searchCopletDefinition(String copletDataId) {
- return (CopletDefinition) this.copletDatas.get(copletDataId);
+ public CopletDefinition searchCopletDefinition(String copletDefinitionId) {
+ return (CopletDefinition) this.copletDefinitions.get(copletDefinitionId);
}
/**
@@ -162,8 +162,8 @@
/**
* @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletDefinitionObjects(java.lang.String)
*/
- public Collection searchCopletDefinitions(String copletTyoeId) {
- final CopletType cbd = this.searchCopletType(copletTyoeId);
+ public Collection searchCopletDefinitions(String copletTypeId) {
+ final CopletType cbd = this.searchCopletType(copletTypeId);
if ( cbd != null ) {
return this.searchCopletDefinitions(cbd);
}
@@ -174,18 +174,18 @@
* @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletInstance(java.lang.String)
*/
public CopletInstance searchCopletInstance(String copletId) {
- return (CopletInstance) this.copletInstanceDatas.get(copletId);
+ return (CopletInstance) this.copletInstances.get(copletId);
}
/**
* @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletInstances(org.apache.cocoon.portal.coplet.CopletDefinition)
*/
- public Collection searchCopletInstances(CopletDefinition copletData) {
+ public Collection searchCopletInstances(CopletDefinition copletDefinition) {
final List list = new ArrayList();
final Iterator i = this.getCopletInstances().iterator();
while ( i.hasNext() ) {
final CopletInstance current = (CopletInstance)i.next();
- if ( current.getCopletDefinition().equals(copletData) ) {
+ if ( current.getCopletDefinition().equals(copletDefinition) ) {
list.add(current);
}
}
@@ -195,10 +195,10 @@
/**
* @see org.apache.cocoon.portal.scratchpad.Profile#searchCopletInstances(java.lang.String)
*/
- public Collection searchCopletInstances(String copletDataId) {
- final CopletDefinition copletData = this.searchCopletDefinition(copletDataId);
- if ( copletData != null ) {
- return this.searchCopletInstances(copletData);
+ public Collection searchCopletInstances(String copletDefinitionId) {
+ final CopletDefinition copletDef = this.searchCopletDefinition(copletDefinitionId);
+ if ( copletDef != null ) {
+ return this.searchCopletInstances(copletDef);
}
return null;
}
@@ -235,13 +235,13 @@
public void add(CopletInstance cid) {
if ( cid != null ) {
- this.copletInstanceDatas.put(cid.getId(), cid);
+ this.copletInstances.put(cid.getId(), cid);
}
}
public void remove(CopletInstance cid) {
if ( cid != null ) {
- this.copletInstanceDatas.remove(cid.getId());
+ this.copletInstances.remove(cid.getId());
}
}
@@ -264,14 +264,14 @@
}
public Map getCopletInstancesMap() {
- return this.copletInstanceDatas;
+ return this.copletInstances;
}
public Map getCopletDefinitionsMap() {
- return this.copletDatas;
+ return this.copletDefinitions;
}
public Map getCopletTypesMap() {
- return this.copletBaseDatas;
+ return this.copletTypes;
}
}
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=427702&r1=427701&r2=427702&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 Aug 1 13:00:02 2006
@@ -102,7 +102,7 @@
}
}
}
- profile.setCopletInstanceDatas(instances);
+ profile.setCopletInstances(instances);
this.prepareObject(instances);
this.prepareObject(rootLayout);