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 2005/10/17 13:58:09 UTC
svn commit: r325880 - in
/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal: event/impl/
pluto/ pluto/factory/ pluto/om/common/ pluto/service/log/ pluto/services/
pluto/services/factory/
Author: cziegeler
Date: Mon Oct 17 04:57:44 2005
New Revision: 325880
URL: http://svn.apache.org/viewcvs?rev=325880&view=rev
Log:
Clean up code and java docs
Removed:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/UnmodifiableSet.java
Modified:
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicTitleServiceImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/InformationProviderServiceImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortalContextProviderImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/ResourceURLProviderImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ControllerFactoryImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ObjectIDFactoryImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/PortletPreferencesFactoryImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/MimeType.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/service/log/LogServiceImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/service/log/LoggerImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/services/PropertyManagerServiceImpl.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java Mon Oct 17 04:57:44 2005
@@ -50,7 +50,7 @@
/**
* This is the default implementation of the event manager.
- * For each event class (interface and impl.) a {@link #HierarchyInfo} is created.
+ * For each event class (interface and impl.) a {@link DefaultEventManager.HierarchyInfo} is created.
* This helper object contains all subscribed receivers for the event and *all*
* parents being it interfaces or classes. This makes adding new receivers
* very easy: we just get the hierarchy info for the event in question and then
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java Mon Oct 17 04:57:44 2005
@@ -31,7 +31,7 @@
import org.apache.pluto.services.information.ResourceURLProvider;
/**
- * Our own dynamic information provider
+ * Our own dynamic information provider.
*
* @version $Id$
*/
@@ -40,10 +40,10 @@
/** Service manager */
protected final ServiceManager manager;
-
+
/** The portal context provider */
protected final PortalContextProviderImpl provider;
-
+
/**
* Constructor
*/
@@ -53,13 +53,13 @@
this.provider = provider;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.DynamicInformationProvider#getPortletURLProvider(org.apache.pluto.om.window.PortletWindow)
*/
public PortletURLProvider getPortletURLProvider(PortletWindow portletWindow) {
return new PortletURLProviderImpl(portletWindow, this.manager);
}
-
+
/* (non-Javadoc)
* @see org.apache.pluto.services.information.DynamicInformationProvider#getResourceURLProvider(org.apache.pluto.om.window.PortletWindow)
*/
@@ -67,14 +67,14 @@
return new ResourceURLProviderImpl(this.provider);
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.DynamicInformationProvider#getPortletActionProvider(org.apache.pluto.om.window.PortletWindow)
*/
public PortletActionProvider getPortletActionProvider(PortletWindow portletWindow) {
return new PortletActionProviderImpl(portletWindow);
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.DynamicInformationProvider#getPortletMode(org.apache.pluto.om.window.PortletWindow)
*/
public PortletMode getPortletMode(PortletWindow portletWindow) {
@@ -86,7 +86,7 @@
return pm;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.DynamicInformationProvider#getPreviousPortletMode(org.apache.pluto.om.window.PortletWindow)
*/
public PortletMode getPreviousPortletMode(PortletWindow portletWindow) {
@@ -95,7 +95,7 @@
return pm;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.DynamicInformationProvider#getWindowState(org.apache.pluto.om.window.PortletWindow)
*/
public WindowState getWindowState(PortletWindow portletWindow) {
@@ -107,7 +107,7 @@
return ws;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.DynamicInformationProvider#getPreviousWindowState(org.apache.pluto.om.window.PortletWindow)
*/
public WindowState getPreviousWindowState(PortletWindow portletWindow) {
@@ -116,7 +116,7 @@
return ws;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.DynamicInformationProvider#getResponseContentType()
*/
public String getResponseContentType() {
@@ -124,30 +124,29 @@
}
static protected final HashSet responseMimeTypes = new HashSet();
-
+
static {
responseMimeTypes.add("text/html");
}
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.pluto.services.information.DynamicInformationProvider#getResponseContentTypes()
*/
public Iterator getResponseContentTypes() {
return responseMimeTypes.iterator();
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.DynamicInformationProvider#isPortletModeAllowed(javax.portlet.PortletMode)
*/
public boolean isPortletModeAllowed(PortletMode mode) {
return this.provider.getSupportedPortletModes().contains(mode);
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.DynamicInformationProvider#isWindowStateAllowed(javax.portlet.WindowState)
*/
public boolean isWindowStateAllowed(WindowState state) {
return this.provider.getSupportedWindowStates().contains(state);
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicTitleServiceImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicTitleServiceImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicTitleServiceImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/DynamicTitleServiceImpl.java Mon Oct 17 04:57:44 2005
@@ -36,6 +36,5 @@
HttpServletRequest request,
String dynamicTitle) {
((PortletEntityImpl)window.getPortletEntity()).getCopletInstanceData().setTemporaryAttribute("dynamic-title", dynamicTitle);
- }
-
+ }
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/InformationProviderServiceImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/InformationProviderServiceImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/InformationProviderServiceImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/InformationProviderServiceImpl.java Mon Oct 17 04:57:44 2005
@@ -31,7 +31,7 @@
import org.apache.pluto.services.information.StaticInformationProvider;
/**
- * Our own information provider service
+ * Our own information provider service.
*
* @version $Id$
*/
@@ -40,29 +40,29 @@
/** The service manager */
protected ServiceManager manager;
-
+
/** The portlet container environment */
protected PortletContainerEnvironmentImpl portletContainerEnvironment;
-
+
/** The static information provider (thread safe) */
protected StaticInformationProvider staticProvider;
/** The portal context provider (thread safe) */
protected PortalContextProviderImpl provider;
-
+
/** The component context */
protected Context context;
final static protected String dynamicProviderRole= InformationProviderServiceImpl.class.getName();
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.cocoon.portal.pluto.PortletContainerEnabled#setPortletContainerEnvironment(org.apache.pluto.services.PortletContainerEnvironment)
*/
public void setPortletContainerEnvironment(PortletContainerEnvironment env) {
this.portletContainerEnvironment = (PortletContainerEnvironmentImpl)env;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.InformationProviderService#getStaticProvider()
*/
public StaticInformationProvider getStaticProvider() {
@@ -73,7 +73,7 @@
return this.staticProvider;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.InformationProviderService#getDynamicProvider(javax.servlet.http.HttpServletRequest)
*/
public DynamicInformationProvider getDynamicProvider(HttpServletRequest request) {
@@ -88,15 +88,14 @@
return dynProvider;
}
-
- /* (non-Javadoc)
+ /**
* @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
*/
public void contextualize(Context context) throws ContextException {
this.context = context;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
public void service(ServiceManager manager) throws ServiceException {
@@ -113,5 +112,4 @@
}
return this.provider;
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortalContextProviderImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortalContextProviderImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortalContextProviderImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortalContextProviderImpl.java Mon Oct 17 04:57:44 2005
@@ -50,13 +50,13 @@
/** The host name */
protected String hostNameHTTP;
-
+
/** The host name */
protected String hostNameHTTPS;
-
+
/** The host name */
protected String contextHTTP;
-
+
/** The host name */
protected String contextHTTPS;
@@ -74,7 +74,7 @@
this.init(objectModel);
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.PortalContextProvider#getProperty(java.lang.String)
*/
public String getProperty(String name) {
@@ -85,32 +85,28 @@
return(String) properties.get(name);
}
-
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.PortalContextProvider#getPropertyNames()
*/
public Collection getPropertyNames() {
return properties.keySet();
}
-
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.PortalContextProvider#getSupportedPortletModes()
*/
public Collection getSupportedPortletModes() {
return this.modes;
}
-
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.PortalContextProvider#getSupportedWindowStates()
*/
public Collection getSupportedWindowStates() {
return this.states;
}
-
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.PortalContextProvider#getPortalInfo()
*/
public String getPortalInfo() {
@@ -118,7 +114,7 @@
}
/**
- * Return all default modes
+ * Return all default modes.
*/
protected Vector getDefaultModes() {
Vector m = new Vector();
@@ -127,12 +123,12 @@
m.add(new PortletMode("edit"));
m.add(new PortletMode("help"));
m.add(new PortletMode("config"));
-
+
return m;
}
/**
- * Return all default states
+ * Return all default states.
*/
protected Vector getDefaultStates() {
Vector s = new Vector();
@@ -140,12 +136,12 @@
s.add(new WindowState("normal"));
s.add(new WindowState("minimized"));
s.add(new WindowState("maximized"));
-
+
return s;
}
/**
- * Initialize some infos
+ * Initialize some infos.
*/
protected void init(Map objectModel) {
final Request request = ObjectModelHelper.getRequest(objectModel);
@@ -153,7 +149,7 @@
final String contextRoot = request.getContextPath();
final int hostPortHTTP = request.getServerPort();
final int hostPortHTTPS = 443;
-
+
StringBuffer hostHTTP = new StringBuffer("http://");
hostHTTP.append(hostName);
if (hostPortHTTP != 80) {
@@ -164,7 +160,7 @@
hostHTTP.append('/');
hostHTTP.append(contextRoot);
this.contextHTTP = hostHTTP.toString();
-
+
StringBuffer hostHTTPS = new StringBuffer("https://");
hostHTTPS.append(hostName);
if (hostPortHTTPS != 443) {
@@ -176,7 +172,7 @@
hostHTTPS.append(contextRoot);
this.contextHTTPS = hostHTTPS.toString();
}
-
+
public String getBaseURLexcludeContext(boolean secure) {
return (secure?this.hostNameHTTPS : this.hostNameHTTP);
}
@@ -184,5 +180,4 @@
public String getBaseURL(boolean secure) {
return (secure?this.contextHTTPS : this.contextHTTP);
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/ResourceURLProviderImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/ResourceURLProviderImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/ResourceURLProviderImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/ResourceURLProviderImpl.java Mon Oct 17 04:57:44 2005
@@ -36,25 +36,24 @@
this.base = provider.getBaseURLexcludeContext(false);
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.information.ResourceURLProvider#setAbsoluteURL(java.lang.String)
*/
public void setAbsoluteURL(String path) {
this.url = path;
}
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.pluto.services.information.ResourceURLProvider#setFullPath(java.lang.String)
*/
public void setFullPath(String path) {
this.url = this.base + path;
}
-
- /* (non-Javadoc)
+
+ /**
* @see java.lang.Object#toString()
*/
public String toString() {
return this.url;
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/AbstractFactory.java Mon Oct 17 04:57:44 2005
@@ -21,9 +21,8 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.pluto.factory.Factory;
-
/**
- * Abstract implementation for all factories
+ * Abstract implementation for all factories.
*
* @version $Id$
*/
@@ -31,13 +30,13 @@
extends AbstractLogEnabled
implements Factory {
- /** The servlet config */
+ /** The servlet config. */
protected ServletConfig servletConfig;
- /** The properties */
+ /** The properties. */
protected Map properties;
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.pluto.factory.Factory#init(javax.servlet.ServletConfig, java.util.Map)
*/
public void init(ServletConfig config, Map properties)
@@ -46,7 +45,7 @@
this.properties = properties;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.factory.Factory#destroy()
*/
public void destroy() throws Exception {
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ControllerFactoryImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ControllerFactoryImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ControllerFactoryImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ControllerFactoryImpl.java Mon Oct 17 04:57:44 2005
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.portal.pluto.factory;
-import org.apache.cocoon.portal.pluto.om.common.UnmodifiableSet;
import org.apache.pluto.om.Controller;
import org.apache.pluto.om.ControllerFactory;
import org.apache.pluto.om.Model;
@@ -27,17 +26,13 @@
* @version $Id$
*/
public class ControllerFactoryImpl
-extends AbstractFactory
-implements ControllerFactory {
+ extends AbstractFactory
+ implements ControllerFactory {
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.ControllerFactory#get(org.apache.pluto.om.Model)
*/
public Controller get(Model model) {
- if (model instanceof UnmodifiableSet) {
- model = (Model)((UnmodifiableSet)model).getModifiableSet();
- }
return (Controller)model;
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/LocalPortletInvokerImpl.java Mon Oct 17 04:57:44 2005
@@ -50,37 +50,37 @@
public class LocalPortletInvokerImpl
extends AbstractLogEnabled
implements PortletInvoker, Contextualizable, Serviceable, Initializable {
-
- /** servlet configuration */
+
+ /** servlet configuration. */
protected final ServletConfig servletConfig;
- /** The portlet definition */
+ /** The portlet definition. */
protected final PortletDefinition portletDefinition;
- /** The portlet */
+ /** The portlet. */
protected Portlet portlet;
-
- /** The avalon context */
+
+ /** The avalon context. */
protected Context context;
-
- /** The service manager */
+
+ /** The service manager. */
protected ServiceManager manager;
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
*/
public void contextualize(Context context) throws ContextException {
this.context = context;
}
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize() throws Exception {
@@ -105,7 +105,7 @@
ServletConfig servletConfig) {
this.portletDefinition = portletDefinition;
this.servletConfig = servletConfig;
-
+
try {
final String clazzName = portletDefinition.getClassName();
this.portlet = (Portlet)ClassUtils.newInstance(clazzName);
@@ -115,7 +115,7 @@
}
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.invoker.PortletInvoker#action(javax.portlet.ActionRequest, javax.portlet.ActionResponse)
*/
public void action(ActionRequest request,
@@ -127,7 +127,7 @@
this.portlet.processAction(request, response);
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.invoker.PortletInvoker#render(javax.portlet.RenderRequest, javax.portlet.RenderResponse)
*/
public void render(RenderRequest request, RenderResponse response)
@@ -147,10 +147,9 @@
request.removeAttribute(org.apache.pluto.Constants.PORTLET_REQUEST);
request.removeAttribute(org.apache.pluto.Constants.PORTLET_RESPONSE);
}
-
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.invoker.PortletInvoker#load(javax.portlet.PortletRequest, javax.portlet.RenderResponse)
*/
public void load(PortletRequest request, RenderResponse response)
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ObjectIDFactoryImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ObjectIDFactoryImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ObjectIDFactoryImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ObjectIDFactoryImpl.java Mon Oct 17 04:57:44 2005
@@ -24,14 +24,13 @@
* @version $Id$
*/
public class ObjectIDFactoryImpl
-extends AbstractFactory
-implements ObjectIDFactory {
+ extends AbstractFactory
+ implements ObjectIDFactory {
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.factory.ObjectIDFactory#createObjectID(java.lang.String)
*/
public ObjectID createObjectID(String portletGUID) {
return org.apache.cocoon.portal.pluto.om.common.ObjectIDImpl.createFromString(portletGUID);
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/PortletInvokerFactoryImpl.java Mon Oct 17 04:57:44 2005
@@ -46,28 +46,28 @@
/** The avalon context */
protected Context context;
-
+
/** The service manager */
protected ServiceManager manager;
-
+
/** All local portlets */
protected List localPortlets = Collections.synchronizedList(new ArrayList());
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
*/
public void contextualize(Context context) throws ContextException {
this.context = context;
}
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
public void dispose() {
@@ -81,7 +81,7 @@
this.context = null;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.factory.PortletInvokerFactory#getPortletInvoker(org.apache.pluto.om.portlet.PortletDefinition)
*/
public PortletInvoker getPortletInvoker(PortletDefinition portletDefinition) {
@@ -109,15 +109,14 @@
} else {
invoker = new PortletInvokerImpl(portletDefinition, this.servletConfig);
}
-
+
return invoker;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.factory.PortletInvokerFactory#releasePortletInvoker(org.apache.pluto.invoker.PortletInvoker)
*/
public void releasePortletInvoker(PortletInvoker invoker) {
// nothing to do here
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/PortletPreferencesFactoryImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/PortletPreferencesFactoryImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/PortletPreferencesFactoryImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/PortletPreferencesFactoryImpl.java Mon Oct 17 04:57:44 2005
@@ -22,17 +22,16 @@
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.portlet.PortletDefinition;
-
/**
* Our own preferences factory.
*
* @version $Id$
*/
public class PortletPreferencesFactoryImpl
-extends AbstractFactory
-implements PortletPreferencesFactory {
+ extends AbstractFactory
+ implements PortletPreferencesFactory {
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.factory.PortletPreferencesFactory#getPortletPreferences(java.lang.Integer, org.apache.pluto.om.entity.PortletEntity)
*/
public PortletPreferences getPortletPreferences(Integer methodId,
@@ -40,12 +39,11 @@
return new PortletPreferencesImpl(methodId, portletEntity);
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.factory.PortletPreferencesFactory#getPortletPreferences(java.lang.Integer, org.apache.pluto.om.portlet.PortletDefinition)
*/
public PortletPreferences getPortletPreferences(Integer methodId,
PortletDefinition portletDefinition) {
return new PortletPreferencesImpl(methodId, portletDefinition);
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/AbstractSupportSet.java Mon Oct 17 04:57:44 2005
@@ -38,7 +38,7 @@
public void preBuild(Object parameter) throws Exception {
dispatch(parameter, PRE_BUILD);
}
-
+
public void postBuild(Object parameter) throws Exception {
dispatch(parameter, POST_BUILD);
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeImpl.java Mon Oct 17 04:57:44 2005
@@ -38,21 +38,21 @@
// nothing to do
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.portlet.ContentType#getContentType()
*/
public String getContentType() {
return contentType;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.portlet.ContentType#getPortletModes()
*/
public Iterator getPortletModes() {
return portletModes.iterator();
}
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.cocoon.portal.pluto.om.common.Support#postLoad(java.lang.Object)
*/
public void postLoad(Object parameter) throws Exception {
@@ -67,21 +67,21 @@
}
}
- /* (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 {
@@ -93,7 +93,7 @@
}
}
- /* (non-Javadoc)
+ /**
* @see org.apache.cocoon.portal.pluto.om.common.Support#postStore(java.lang.Object)
*/
public void postStore(Object parameter) throws Exception {
@@ -113,8 +113,8 @@
public boolean supportsPortletMode(javax.portlet.PortletMode portletMode) {
return portletModes.contains(portletMode);
}
-
- /* (non-Javadoc)
+
+ /**
* @see java.lang.Object#toString()
*/
public String toString() {
@@ -147,5 +147,4 @@
public Collection getCastorPortletModes() {
return castorPortletModes;
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ContentTypeSetImpl.java Mon Oct 17 04:57:44 2005
@@ -32,8 +32,8 @@
// special content type that represents the union of all supported markups
private ContentType anyContentType;
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.pluto.om.portlet.ContentTypeSet#get(java.lang.String)
*/
public ContentType get(String contentType) {
@@ -47,14 +47,13 @@
return null;
}
- /* (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();
+ Collection allPortletModes = new ArrayList();
Iterator contentTypes = this.iterator();
while (contentTypes.hasNext()){
ContentType aContentType = (ContentType)contentTypes.next();
@@ -67,14 +66,13 @@
}
}
}
-
+
ContentTypeImpl _anyContentType = new ContentTypeImpl();
_anyContentType.setPortletModes(allPortletModes);
anyContentType = _anyContentType;
}
-
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#toString()
*/
public String toString() {
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DescriptionImpl.java Mon Oct 17 04:57:44 2005
@@ -43,14 +43,14 @@
return locale;
}
- /* (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 {
@@ -60,7 +60,8 @@
locale = new Locale(castorLocale, "");
}
}
- /* (non-Javadoc)
+
+ /**
* @see org.apache.cocoon.portal.pluto.om.common.Support#postStore(java.lang.Object)
*/
public void postStore(Object parameter) throws Exception {
@@ -69,13 +70,13 @@
public void preBuild(Object parameter) throws Exception {
// nothing to do
-}
+ }
public void preStore(Object parameter) throws Exception {
// nothing to do
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#toString()
*/
public String toString() {
@@ -94,7 +95,6 @@
return buffer.toString();
}
-
public void setDescription(String description) {
this.description = description;
}
@@ -103,7 +103,6 @@
this.locale = locale;
}
-
// end castor methods
/**
@@ -121,5 +120,4 @@
public void setCastorLocale(String castorLocale) {
this.castorLocale = castorLocale;
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DescriptionSetImpl.java Mon Oct 17 04:57:44 2005
@@ -29,7 +29,7 @@
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) {
@@ -43,14 +43,14 @@
return null;
}
- /* (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 {
@@ -60,25 +60,24 @@
}
}
- /* (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/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameImpl.java Mon Oct 17 04:57:44 2005
@@ -34,21 +34,21 @@
// nothing to do
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.common.DisplayName#getDisplayName()
*/
public String getDisplayName() {
return displayName;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.common.DisplayName#getLocale()
*/
public Locale getLocale() {
return locale;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.cocoon.portal.pluto.om.common.Support#postLoad(java.lang.Object)
*/
public void postLoad(Object parameter) throws Exception {
@@ -58,35 +58,36 @@
locale = new Locale(castorLocale, "");
}
}
- /* (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
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#toString()
*/
public String toString() {
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/DisplayNameSetImpl.java Mon Oct 17 04:57:44 2005
@@ -26,9 +26,11 @@
*
* @version $Id$
*/
-public class DisplayNameSetImpl extends AbstractSupportSet implements DisplayNameSet, java.io.Serializable, Support {
+public class DisplayNameSetImpl
+ extends AbstractSupportSet
+ implements DisplayNameSet, java.io.Serializable, Support {
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.common.DisplayNameSet#get(java.util.Locale)
*/
public DisplayName get(Locale locale) {
@@ -42,14 +44,16 @@
return null;
}
-
- /* (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
}
+ /**
+ * @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()) {
@@ -57,7 +61,7 @@
}
}
- /* (non-Javadoc)
+ /**
* @see org.apache.cocoon.portal.pluto.om.common.Support#postStore(java.lang.Object)
*/
public void postStore(Object parameter) throws Exception {
@@ -71,14 +75,14 @@
// 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 java.lang.Object#toString()
*/
public String toString() {
@@ -96,5 +100,4 @@
}
return buffer.toString();
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java Mon Oct 17 04:57:44 2005
@@ -153,7 +153,10 @@
return keywords;
}
-
+
+ /**
+ * @see java.lang.Object#toString()
+ */
public String toString() {
return toString(0);
}
@@ -184,10 +187,9 @@
return buffer.toString();
}
-
// additional methods.
-
- /* (non-Javadoc)
+
+ /**
* @see java.lang.Object#equals(java.lang.Object)
* used for element equality according collection implementations
*/
@@ -196,7 +198,7 @@
: ((LanguageImpl)o).getLocale().equals(this.locale);
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#hashCode()
*/
public int hashCode() {
@@ -219,5 +221,4 @@
public void setTitle(String title) {
this.title = title;
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java Mon Oct 17 04:57:44 2005
@@ -30,8 +30,9 @@
*
* @version $Id$
*/
-public class LanguageSetImpl extends AbstractSupportSet implements LanguageSet, java.io.Serializable, Support
-{
+public class LanguageSetImpl
+ extends AbstractSupportSet
+ implements LanguageSet, java.io.Serializable, Support {
private String castorKeywords;
@@ -82,7 +83,7 @@
}
*/
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.common.LanguageSet#get(java.util.Locale)
*/
public Language get(Locale locale) {
@@ -106,14 +107,14 @@
return null;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.common.LanguageSet#getLocales()
*/
public Iterator getLocales() {
return locales.iterator();
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.common.LanguageSet#getDefaultLocale()
*/
public Locale getDefaultLocale() {
@@ -134,14 +135,14 @@
return defLoc;
}
- /* (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 {
@@ -149,30 +150,28 @@
initInlinedInfos();
}
- /* (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 {
// if resource-bundle is given
// must be initialized later when classloader is known by initResourceBundle()
@@ -203,13 +202,13 @@
/*String title;
String shortTitle;
String keywords;
-
+
try {
title=bundle.getString("javax.portlet.title");
} catch(MissingResourceException x) {
title = this.title;
}
-
+
try {
shortTitle=bundle.getString("javax.portlet.short-title");
} catch(MissingResourceException x) {
@@ -292,7 +291,6 @@
}
// end castor methods
-
public void setClassLoader(ClassLoader loader) {
this.classLoader = loader;
}
@@ -309,7 +307,7 @@
this.title = title;
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#toString()
*/
public String toString() {
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/MimeType.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/MimeType.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/MimeType.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/MimeType.java Mon Oct 17 04:57:44 2005
@@ -30,18 +30,21 @@
public String getExtension() {
return extension;
}
+
/**
* @param extension The extension to set.
*/
public void setExtension(String extension) {
this.extension = extension;
}
+
/**
* @return Returns the mimeType.
*/
public String getMimeType() {
return mimeType;
}
+
/**
* @param mimeType The mimeType to set.
*/
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ObjectIDImpl.java Mon Oct 17 04:57:44 2005
@@ -38,7 +38,6 @@
}
// internal methods.
-
private void readObject (ObjectInputStream stream) throws IOException {
intOID = stream.readInt ();
@@ -49,9 +48,11 @@
stream.write (intOID);
}
-
// addtional methods.
-
+
+ /**
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
public boolean equals (Object object) {
boolean result = false;
@@ -65,14 +66,14 @@
return (result);
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#hashCode()
*/
public int hashCode () {
return intOID;
}
- /* (non-Javadoc)
+ /**
* @see java.lang.Object#toString()
*/
public String toString () {
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ParameterImpl.java Mon Oct 17 04:57:44 2005
@@ -25,7 +25,7 @@
import org.apache.pluto.util.StringUtils;
/**
- *
+ *
* @version $Id$
*/
public class ParameterImpl implements Parameter, ParameterCtrl, java.io.Serializable {
@@ -48,7 +48,7 @@
return value;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.common.Parameter#getDescription(Locale)
*/
public Description getDescription(Locale locale) {
@@ -65,7 +65,7 @@
this.value = value;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.common.ParameterCtrl#setDescriptionSet(DescriptionSet)
*/
public void setDescriptionSet(DescriptionSet descriptions) {
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/ParameterSetImpl.java Mon Oct 17 04:57:44 2005
@@ -33,8 +33,9 @@
// nothing to do
}
- // ParameterSet implementation.
-
+ /**
+ * @see org.apache.pluto.om.common.ParameterSet#get(java.lang.String)
+ */
public Parameter get(String name) {
Iterator iterator = this.iterator();
while (iterator.hasNext()) {
@@ -46,8 +47,9 @@
return null;
}
- // ParameterSetCtrl implementation.
-
+ /**
+ * @see org.apache.pluto.om.common.ParameterSetCtrl#add(java.lang.String, java.lang.String)
+ */
public Parameter add(String name, String value) {
ParameterImpl parameter = new ParameterImpl();
parameter.setName(name);
@@ -58,6 +60,9 @@
return parameter;
}
+ /**
+ * @see org.apache.pluto.om.common.ParameterSetCtrl#remove(java.lang.String)
+ */
public Parameter remove(String name) {
Iterator iterator = this.iterator();
while (iterator.hasNext()) {
@@ -70,12 +75,16 @@
return null;
}
+ /**
+ * @see org.apache.pluto.om.common.ParameterSetCtrl#remove(org.apache.pluto.om.common.Parameter)
+ */
public void remove(Parameter parameter) {
super.remove(parameter);
}
- // additional methods.
-
+ /**
+ * @see java.lang.Object#toString()
+ */
public String toString() {
return toString(0);
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceImpl.java Mon Oct 17 04:57:44 2005
@@ -30,7 +30,7 @@
* @version $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!*#";
@@ -88,8 +88,6 @@
return value != null;
}
- // PreferenceCtrl implementation.
-
/**
* @see org.apache.pluto.om.common.PreferenceCtrl#setName(java.lang.String)
*/
@@ -201,5 +199,4 @@
buffer.append("'");
return buffer.toString();
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceSetImpl.java Mon Oct 17 04:57:44 2005
@@ -136,7 +136,6 @@
return buffer.toString();
}
-
// additional internal methods
public String getCastorPreferencesValidator() {
@@ -170,5 +169,4 @@
return changed;
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/PreferenceUtil.java Mon Oct 17 04:57:44 2005
@@ -43,5 +43,4 @@
}
return returnValue;
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleImpl.java Mon Oct 17 04:57:44 2005
@@ -29,7 +29,7 @@
public SecurityRoleImpl() {
// nothing to do
- }
+ }
// SecurityRole implementation.
@@ -66,5 +66,4 @@
buffer.append("'");
return buffer.toString();
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefImpl.java Mon Oct 17 04:57:44 2005
@@ -46,14 +46,13 @@
return roleLink;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.om.common.SecurityRoleRef#getDescription(Locale)
*/
public Description getDescription(Locale locale) {
return descriptions.get(locale);
}
-
public void setRoleName(String roleName) {
this.roleName = roleName;
}
@@ -79,6 +78,4 @@
public void setCastorDescriptions(DescriptionSet castorDescriptions) {
this.descriptions = castorDescriptions;
}
-
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleRefSetImpl.java Mon Oct 17 04:57:44 2005
@@ -35,8 +35,9 @@
// nothing to do
}
- // SecurityRoleRefSet implementation.
-
+ /**
+ * @see org.apache.pluto.om.common.SecurityRoleRefSet#get(java.lang.String)
+ */
public SecurityRoleRef get(String roleName) {
Iterator iterator = this.iterator();
while (iterator.hasNext()) {
@@ -48,8 +49,9 @@
return null;
}
- // SecurityRoleRefSetCtrl implementation.
-
+ /**
+ * @see org.apache.pluto.om.common.SecurityRoleRefSetCtrl#add(org.apache.pluto.om.common.SecurityRoleRef)
+ */
public SecurityRoleRef add(SecurityRoleRef securityRoleRef) {
SecurityRoleRefImpl newSecurityRoleRef = new SecurityRoleRefImpl();
newSecurityRoleRef.setRoleName(securityRoleRef.getRoleName());
@@ -61,6 +63,9 @@
return newSecurityRoleRef;
}
+ /**
+ * @see org.apache.pluto.om.common.SecurityRoleRefSetCtrl#remove(java.lang.String)
+ */
public SecurityRoleRef remove(String roleName) {
Iterator iterator = this.iterator();
while (iterator.hasNext()) {
@@ -73,12 +78,15 @@
return null;
}
+ /**
+ * @see org.apache.pluto.om.common.SecurityRoleRefSetCtrl#remove(org.apache.pluto.om.common.SecurityRoleRef)
+ */
public void remove(SecurityRoleRef securityRoleRef) {
super.remove(securityRoleRef);
}
// additional methods.
-
+
public SecurityRoleRef add(String roleName, String roleLink, DescriptionSet descriptions) {
SecurityRoleRefImpl securityRoleRef = new SecurityRoleRefImpl();
securityRoleRef.setRoleName(roleName);
@@ -89,22 +97,4 @@
return securityRoleRef;
}
-
- // unmodifiable part
-
- public static class Unmodifiable extends UnmodifiableSet
- implements SecurityRoleRefSet {
-
- public Unmodifiable(SecurityRoleRefSet c) {
- super(c);
- }
-
- // additional methods.
-
- public SecurityRoleRef get(String roleName) {
- return((SecurityRoleRefSet)c).get(roleName);
- }
-
- }
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/common/SecurityRoleSetImpl.java Mon Oct 17 04:57:44 2005
@@ -28,22 +28,6 @@
*/
public class SecurityRoleSetImpl extends HashSet implements SecurityRoleSet, java.io.Serializable {
- // unmodifiable part
-
- public static class Unmodifiable
- extends UnmodifiableSet
- implements SecurityRoleSet {
-
- public Unmodifiable(SecurityRoleSet c) {
- super(c);
- }
-
- public SecurityRole get(String roleName) {
- return ((SecurityRoleSet)c).get(roleName);
- }
-
- }
-
public SecurityRoleSetImpl() {
// nothing to do
}
@@ -114,5 +98,4 @@
}
return buffer.toString();
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/service/log/LogServiceImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/service/log/LogServiceImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/service/log/LogServiceImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/service/log/LogServiceImpl.java Mon Oct 17 04:57:44 2005
@@ -19,7 +19,7 @@
import org.apache.pluto.services.log.Logger;
/**
- * Our own log service logging to an avalon logger-
+ * Our own log service logging to an avalon logger.
*
* @version $Id$
*/
@@ -28,19 +28,20 @@
/** The logger to use */
protected Logger logger;
-
+
/** Constructor */
public LogServiceImpl(org.apache.avalon.framework.logger.Logger logger) {
this.logger = new LoggerImpl(logger);
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.log.LogService#getLogger(java.lang.Class)
*/
public org.apache.pluto.services.log.Logger getLogger(Class arg0) {
return this.logger;
}
- /* (non-Javadoc)
+
+ /**
* @see org.apache.pluto.services.log.LogService#getLogger(java.lang.String)
*/
public org.apache.pluto.services.log.Logger getLogger(String arg0) {
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/service/log/LoggerImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/service/log/LoggerImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/service/log/LoggerImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/service/log/LoggerImpl.java Mon Oct 17 04:57:44 2005
@@ -27,83 +27,83 @@
/** The logger to use */
protected Logger logger;
-
+
/** Constructor */
public LoggerImpl(Logger logger) {
this.logger = logger;
}
- /* (non-Javadoc)
- * @see org.apache.pluto.services.log.LogService#debug(java.lang.String, java.lang.String, java.lang.Throwable)
+ /**
+ * @see org.apache.pluto.services.log.Logger#debug(java.lang.String, java.lang.Throwable)
*/
public void debug(String aMessage, Throwable aThrowable) {
this.logger.debug(aMessage, aThrowable);
}
- /* (non-Javadoc)
- * @see org.apache.pluto.services.log.LogService#debug(java.lang.String, java.lang.String)
+ /**
+ * @see org.apache.pluto.services.log.Logger#debug(java.lang.String)
*/
public void debug(String aMessage) {
this.logger.debug(aMessage);
}
- /* (non-Javadoc)
- * @see org.apache.pluto.services.log.LogService#error(java.lang.String, java.lang.String, java.lang.Throwable)
+ /**
+ * @see org.apache.pluto.services.log.Logger#error(java.lang.String, java.lang.Throwable)
*/
public void error(String aMessage, Throwable aThrowable) {
this.logger.error(aMessage, aThrowable);
}
- /* (non-Javadoc)
- * @see org.apache.pluto.services.log.LogService#info(java.lang.String, java.lang.String)
+ /**
+ * @see org.apache.pluto.services.log.Logger#info(java.lang.String)
*/
public void info(String aMessage) {
this.logger.info(aMessage);
}
- /* (non-Javadoc)
- * @see org.apache.pluto.services.log.LogService#isDebugEnabled(java.lang.String)
+ /**
+ * @see org.apache.pluto.services.log.Logger#isDebugEnabled()
*/
public boolean isDebugEnabled() {
return this.logger.isDebugEnabled();
}
- /* (non-Javadoc)
- * @see org.apache.pluto.services.log.LogService#isErrorEnabled(java.lang.String)
+ /**
+ * @see org.apache.pluto.services.log.Logger#isErrorEnabled()
*/
public boolean isErrorEnabled() {
return this.logger.isErrorEnabled();
}
- /* (non-Javadoc)
- * @see org.apache.pluto.services.log.LogService#isInfoEnabled(java.lang.String)
+ /**
+ * @see org.apache.pluto.services.log.Logger#isInfoEnabled()
*/
public boolean isInfoEnabled() {
return this.logger.isInfoEnabled();
}
- /* (non-Javadoc)
- * @see org.apache.pluto.services.log.LogService#isWarnEnabled(java.lang.String)
+ /**
+ * @see org.apache.pluto.services.log.Logger#isWarnEnabled()
*/
public boolean isWarnEnabled() {
return this.logger.isWarnEnabled();
}
- /* (non-Javadoc)
- * @see org.apache.pluto.services.log.LogService#warn(java.lang.String, java.lang.String)
+ /**
+ * @see org.apache.pluto.services.log.Logger#warn(java.lang.String)
*/
public void warn(String aMessage) {
this.logger.warn(aMessage);
}
- /* (non-Javadoc)
+ /**
* @see org.apache.pluto.services.log.Logger#error(java.lang.Throwable)
*/
public void error(Throwable throwable) {
this.logger.error("Exception", throwable);
}
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.pluto.services.log.Logger#error(java.lang.String)
*/
public void error(String aMessage) {
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/services/PropertyManagerServiceImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/services/PropertyManagerServiceImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/services/PropertyManagerServiceImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/services/PropertyManagerServiceImpl.java Mon Oct 17 04:57:44 2005
@@ -78,8 +78,6 @@
* that name returns an empty <code>Map</code>.
**/
public Map getRequestProperties(PortletWindow window, HttpServletRequest request) {
-
return Collections.EMPTY_MAP;
}
-
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java?rev=325880&r1=325879&r2=325880&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/services/factory/FactoryManagerServiceImpl.java Mon Oct 17 04:57:44 2005
@@ -16,6 +16,7 @@
package org.apache.cocoon.portal.pluto.services.factory;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -48,6 +49,7 @@
import org.apache.cocoon.portal.pluto.factory.PortletInvokerFactoryImpl;
import org.apache.cocoon.portal.pluto.factory.PortletPreferencesFactoryImpl;
import org.apache.cocoon.servlet.CocoonServlet;
+import org.apache.cocoon.util.ClassUtils;
import org.apache.pluto.factory.Factory;
import org.apache.pluto.factory.ObjectIDFactory;
import org.apache.pluto.factory.impl.ActionRequestFactoryImpl;
@@ -70,8 +72,6 @@
* A service has to derive from {@link Factory} and implement the
* <CODE>init()</CODE> and <CODE>destroy()</CODE> methods as appropriate.
*
- * TODO This is a very lazy implementation, we need to improve it
- *
* @see Factory
* @version $Id$
*/
@@ -81,29 +81,35 @@
/** The servlet configuration */
protected ServletConfig servletConfig;
-
+
/** The avalon context */
protected Context context;
-
+
/** The service manager */
protected ServiceManager manager;
-
- /* (non-Javadoc)
+
+ /** All factories mapped by factory class name. */
+ protected Map factoryMap = new HashMap();
+
+ /** All factories. */
+ protected List factoryList = new ArrayList();
+
+ /**
* @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
*/
public void contextualize(Context context) throws ContextException {
this.context = context;
this.servletConfig = (ServletConfig) context.get(CocoonServlet.CONTEXT_SERVLET_CONFIG);
}
-
- /* (non-Javadoc)
+
+ /**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
public void service(ServiceManager manager) throws ServiceException {
this.manager = manager;
}
- /* (non-Javadoc)
+ /**
* @see org.apache.avalon.framework.activity.Initializable#initialize()
*/
public void initialize()
@@ -129,39 +135,30 @@
factories.put(ObjectIDFactory.class.getName(), ObjectIDFactoryImpl.class.getName());
factories.put(ControllerFactory.class.getName(), ControllerFactoryImpl.class.getName());
-
+
for (Iterator iter = factories.entrySet().iterator(); iter.hasNext (); ) {
Map.Entry me = (Map.Entry)iter.next();
- String factoryInterfaceName = (String)me.getKey();
// try to get hold of the factory
- Class factoryInterface;
-
- factoryInterface = Class.forName (factoryInterfaceName);
-
- String factoryImplName = (String)me.getValue();
- Class factoryImpl = Class.forName (factoryImplName);
- Factory factory = (Factory) factoryImpl.newInstance ();
+ Factory factory = (Factory) ClassUtils.newInstance((String)me.getValue());
ContainerUtil.enableLogging(factory, this.getLogger());
ContainerUtil.contextualize(factory, this.context);
ContainerUtil.service(factory, this.manager);
ContainerUtil.initialize(factory);
-
- factory.init(this.servletConfig, new HashMap());
- factoryMap.put (factoryInterface.getName(), factory);
+ factory.init(this.servletConfig, Collections.EMPTY_MAP);
+
+ factoryMap.put(me.getKey(), factory);
// build up list in reverse order for later destruction
factoryList.add (0, factory);
-
}
}
- /* (non-Javadoc)
+ /**
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
public void dispose() {
-
// destroy the services in reverse order
for (Iterator iterator = factoryList.iterator (); iterator.hasNext (); ) {
Factory factory = (Factory) iterator.next ();
@@ -175,7 +172,6 @@
factoryList.clear();
factoryMap.clear();
-
}
/**
@@ -191,8 +187,4 @@
// therefore we can go without synchronization
return ((Factory) factoryMap.get (theClass.getName()));
}
-
- private Map factoryMap = new HashMap();
- private List factoryList = new ArrayList();
-
}