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/02/26 09:56:14 UTC
svn commit: r511756 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/
cocoon-portal-impl/src/main/j...
Author: cziegeler
Date: Mon Feb 26 00:56:12 2007
New Revision: 511756
URL: http://svn.apache.org/viewvc?view=rev&rev=511756
Log:
Fix reference to ajax impl in pom
Fix request processor aspect implementations
Removed:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspectPrepareContext.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/RequestParameterRequestProcessorAspect.java
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/EventManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LinkService.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/RequestProcessorAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/RequestProcessorAspectContext.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/AbstractContentRequestProcessorAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/ActionCounterRequestProcessorAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/FrameRequestProcessorAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/LinkRequestProcessorAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/NoClientCachingRequestProcessorAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ProfileManagerAspectContextImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/RequestProcessorAspectContextImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/links/DefaultLinkService.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml Mon Feb 26 00:56:12 2007
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-ajax-impl</artifactId>
- <version>1.0.0-M2-SNAPSHOT</version>
+ <version>1.0.0-RC1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/EventManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/EventManager.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/EventManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/EventManager.java Mon Feb 26 00:56:12 2007
@@ -16,14 +16,13 @@
*/
package org.apache.cocoon.portal.event;
-import org.apache.cocoon.portal.PortalException;
/**
* This component manages the event handling mechanism in the portal.
* The event mechanism is based on the publisher/subscriber principle.
* An interested component (a {@link org.apache.cocoon.portal.event.Receiver}
* can subscribe itself for a specific class (or classes) of events.
- * All Events have a common ancestor type {@link Event} and the event types are
+ * All Events have a common ancestor type {@link Event} and the event types are
* identified by a (sub)class
*
* @version $Id$
@@ -33,13 +32,12 @@
/**
* Represents the role of the service
*/
- String ROLE = EventManager.class.getName();
+ String ROLE = EventManager.class.getName();
/**
* Process the events.
*/
- void processEvents()
- throws PortalException;
+ void processEvents();
/**
* Publish an event. All registered receivers get notified.
@@ -48,7 +46,7 @@
void send(Event event);
/**
- * Subscribes a receiver for a specific type of event.
+ * Subscribes a receiver for a specific type of event.
*/
void subscribe(Receiver receiver);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java Mon Feb 26 00:56:12 2007
@@ -25,6 +25,7 @@
import org.apache.cocoon.portal.event.EventManager;
import org.apache.cocoon.portal.event.aspect.EventAspect;
import org.apache.cocoon.portal.event.aspect.EventAspectContext;
+import org.apache.cocoon.portal.services.LinkService;
import org.apache.cocoon.portal.util.AbstractBean;
/**
@@ -57,7 +58,7 @@
* @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext)
*/
public void process(EventAspectContext context) {
- final String defaultRequestParameterName = context.getPortalService().getLinkService().getEventRequestParameterName();
+ final String defaultRequestParameterName = LinkService.DEFAULT_EVENT_REQUEST_PARAMETER_NAME;
final Request request = ObjectModelHelper.getRequest(context.getPortalService().getProcessInfoProvider().getObjectModel());
final String requestParameterNames = context.getAspectProperties().getProperty("parameter-name", defaultRequestParameterName);
boolean processedDefault = false;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java Mon Feb 26 00:56:12 2007
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.event.Event;
import org.apache.cocoon.portal.event.EventManager;
@@ -54,7 +53,7 @@
*
* @version $Id$
*/
-public class DefaultEventManager
+public class DefaultEventManager
extends AbstractBean
implements EventManager {
@@ -68,7 +67,7 @@
protected Map eventHierarchy = new HashMap();
/**
- * Helper method to get the current object model
+ * Helper method to get the current object model
*/
protected Map getObjectModel() {
return this.portalService.getProcessInfoProvider().getObjectModel();
@@ -97,8 +96,7 @@
/**
* @see org.apache.cocoon.portal.event.EventManager#processEvents()
*/
- public void processEvents()
- throws PortalException {
+ public void processEvents() {
// now process event aspects
DefaultEventAspectContext eventContext = new DefaultEventAspectContext(this.portalService, this.chain);
eventContext.invokeNext();
@@ -163,7 +161,7 @@
if ( current.getName().equals("inform") ) {
final Class[] params = current.getParameterTypes();
if ( (params.length == 1)
- || (params.length == 2
+ || (params.length == 2
&& params[1].getName().equals(PortalService.class.getName()))) {
if ( Event.class.isAssignableFrom( params[0] ) ) {
final MethodInfo info = new MethodInfo();
@@ -262,7 +260,7 @@
final HierarchyInfo current = (HierarchyInfo)i.next();
info.addToParents(current);
this.addToHierarchy(info, current.getParents());
- }
+ }
}
protected static final class HierarchyInfo {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LinkService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LinkService.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LinkService.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/LinkService.java Mon Feb 26 00:56:12 2007
@@ -20,14 +20,19 @@
import java.util.List;
import org.apache.cocoon.portal.event.Event;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
/**
- * This is a central service of the portal. It should be used to create links
- * inside the portal pages.
+ * This is a central service of the portal. It creates all links contained in the
+ * portal pages. Usually a link contains information about one (or more) portal events.
+ * When a user activates a link these events are fired. As the link service created
+ * the link, it is also the responsibility of the link service to "parse" the incoming
+ * url and fire the contained events accordingly. Therefore the link service extends
+ * the {@link RequestProcessorAspect}.
*
* @version $Id$
*/
-public interface LinkService {
+public interface LinkService extends RequestProcessorAspect {
/** The request parameter name used for adding event information to the url. */
String DEFAULT_EVENT_REQUEST_PARAMETER_NAME = "cocoon-portal-event";
@@ -139,9 +144,4 @@
* Test if the parameter is an internal one.
*/
boolean isInternalParameterName(String name);
-
- /**
- * Get the name of the request parameter used to encode events.
- */
- String getEventRequestParameterName();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java Mon Feb 26 00:56:12 2007
@@ -18,18 +18,13 @@
import java.util.Properties;
-import org.apache.cocoon.portal.PortalException;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
/**
- * @since 2.1.8
* @version $Id$
*/
-public interface PortalManagerAspect {
-
- void prepare(PortalManagerAspectPrepareContext context)
- throws PortalException;
+public interface PortalManagerAspect extends RequestProcessorAspect {
void render(PortalManagerAspectRenderContext context,
ContentHandler ch,
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/RequestProcessorAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/RequestProcessorAspect.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/RequestProcessorAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/RequestProcessorAspect.java Mon Feb 26 00:56:12 2007
@@ -16,8 +16,6 @@
*/
package org.apache.cocoon.portal.services.aspects;
-import org.apache.cocoon.portal.PortalException;
-
/**
* This aspect can be used to add additional behaviour to the request processing
* phase.
@@ -26,6 +24,5 @@
*/
public interface RequestProcessorAspect {
- void process(RequestProcessorAspectContext context)
- throws PortalException;
+ void process(RequestProcessorAspectContext context);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/RequestProcessorAspectContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/RequestProcessorAspectContext.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/RequestProcessorAspectContext.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/RequestProcessorAspectContext.java Mon Feb 26 00:56:12 2007
@@ -16,8 +16,6 @@
*/
package org.apache.cocoon.portal.services.aspects;
-import org.apache.cocoon.portal.PortalException;
-
/**
* The context for a {@link RequestProcessorAspect}.
*
@@ -29,6 +27,5 @@
/**
* Invoke next aspect in the chain.
*/
- void invokeNext()
- throws PortalException;
+ void invokeNext();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/AbstractContentRequestProcessorAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/AbstractContentRequestProcessorAspect.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/AbstractContentRequestProcessorAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/AbstractContentRequestProcessorAspect.java Mon Feb 26 00:56:12 2007
@@ -23,10 +23,10 @@
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.event.Event;
import org.apache.cocoon.portal.event.EventManager;
-import org.apache.cocoon.portal.event.aspect.EventAspect;
-import org.apache.cocoon.portal.event.aspect.EventAspectContext;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.LayoutException;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
import org.apache.cocoon.portal.util.AbstractBean;
/**
@@ -35,9 +35,9 @@
*/
public abstract class AbstractContentRequestProcessorAspect
extends AbstractBean
- implements EventAspect {
+ implements RequestProcessorAspect {
- protected abstract String getRequestParameterName(EventAspectContext context);
+ protected abstract String getRequestParameterName(RequestProcessorAspectContext context);
protected abstract int getRequiredValueCount();
@@ -69,9 +69,9 @@
}
/**
- * @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext)
+ * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspect#process(org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext)
*/
- public void process(EventAspectContext context) {
+ public void process(RequestProcessorAspectContext context) {
final Request request = ObjectModelHelper.getRequest(context.getPortalService().getProcessInfoProvider().getObjectModel());
String[] values = request.getParameterValues(this.getRequestParameterName(context));
if (values != null) {
@@ -103,12 +103,12 @@
if ( tokenCount == this.getRequiredValueCount() ) {
String [] eventValues = new String[tokenCount];
-
+
while (tokenizer.hasMoreTokens()) {
eventValues[tokenNumber] = tokenizer.nextToken();
-
+
tokenNumber = tokenNumber + 1;
- }
+ }
this.publish( context.getPortalService(), eventValues );
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/ActionCounterRequestProcessorAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/ActionCounterRequestProcessorAspect.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/ActionCounterRequestProcessorAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/ActionCounterRequestProcessorAspect.java Mon Feb 26 00:56:12 2007
@@ -19,8 +19,8 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Response;
-import org.apache.cocoon.portal.event.aspect.EventAspect;
-import org.apache.cocoon.portal.event.aspect.EventAspectContext;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
import org.apache.cocoon.portal.util.AbstractBean;
/**
@@ -36,7 +36,7 @@
*/
public class ActionCounterRequestProcessorAspect
extends AbstractBean
- implements EventAspect {
+ implements RequestProcessorAspect {
protected final static String ATTRIBUTE_NAME = ActionCounterRequestProcessorAspect.class.getName();
@@ -44,9 +44,9 @@
protected String parameterName = "cocoon-portal-action";
/**
- * @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext)
+ * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspect#process(org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext)
*/
- public void process(EventAspectContext context) {
+ public void process(RequestProcessorAspectContext context) {
final String requestParameterName = context.getAspectProperties().getProperty("parameter-name", this.parameterName);
int actionCount;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/FrameRequestProcessorAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/FrameRequestProcessorAspect.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/FrameRequestProcessorAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/FrameRequestProcessorAspect.java Mon Feb 26 00:56:12 2007
@@ -18,13 +18,13 @@
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.event.Event;
-import org.apache.cocoon.portal.event.aspect.EventAspectContext;
import org.apache.cocoon.portal.event.layout.LayoutInstanceChangeAttributeEvent;
import org.apache.cocoon.portal.om.FrameLayout;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.LayoutException;
import org.apache.cocoon.portal.om.LayoutFeatures;
import org.apache.cocoon.portal.om.LayoutInstance;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
/**
*
@@ -35,7 +35,7 @@
/**
* @see org.apache.cocoon.portal.event.aspect.impl.AbstractContentEventAspect#getRequestParameterName(org.apache.cocoon.portal.event.aspect.EventAspectContext)
*/
- protected String getRequestParameterName(EventAspectContext context) {
+ protected String getRequestParameterName(RequestProcessorAspectContext context) {
return context.getAspectProperties().getProperty("parameter-name", "frame");
}
@@ -56,6 +56,6 @@
LayoutFeatures.checkLayoutClass(layout, FrameLayout.class, true);
final LayoutInstance instance = LayoutFeatures.getLayoutInstance(service, layout, true);
final Event e = new LayoutInstanceChangeAttributeEvent(instance, FrameLayout.ATTRIBUTE_SOURCE_ID, values[2], true);
- service.getEventManager().send(e);
+ service.getEventManager().send(e);
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/LinkRequestProcessorAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/LinkRequestProcessorAspect.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/LinkRequestProcessorAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/LinkRequestProcessorAspect.java Mon Feb 26 00:56:12 2007
@@ -18,13 +18,13 @@
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.event.Event;
-import org.apache.cocoon.portal.event.aspect.EventAspectContext;
import org.apache.cocoon.portal.event.layout.LayoutInstanceChangeAttributeEvent;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.LayoutException;
import org.apache.cocoon.portal.om.LayoutFeatures;
import org.apache.cocoon.portal.om.LayoutInstance;
import org.apache.cocoon.portal.om.LinkLayout;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
/**
*
@@ -35,7 +35,7 @@
/**
* @see org.apache.cocoon.portal.event.aspect.impl.AbstractContentEventAspect#getRequestParameterName(org.apache.cocoon.portal.event.aspect.EventAspectContext)
*/
- protected String getRequestParameterName(EventAspectContext context) {
+ protected String getRequestParameterName(RequestProcessorAspectContext context) {
return context.getAspectProperties().getProperty("parameter-name", "link");
}
@@ -56,6 +56,6 @@
LayoutFeatures.checkLayoutClass(layout, LinkLayout.class, true);
final LayoutInstance instance = LayoutFeatures.getLayoutInstance(service, layout, true);
final Event e = new LayoutInstanceChangeAttributeEvent(instance, LinkLayout.ATTRIBUTE_LAYOUT_ID, values[2], true);
- service.getEventManager().send(e);
+ service.getEventManager().send(e);
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/NoClientCachingRequestProcessorAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/NoClientCachingRequestProcessorAspect.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/NoClientCachingRequestProcessorAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/NoClientCachingRequestProcessorAspect.java Mon Feb 26 00:56:12 2007
@@ -18,8 +18,8 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Response;
-import org.apache.cocoon.portal.event.aspect.EventAspect;
-import org.apache.cocoon.portal.event.aspect.EventAspectContext;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
import org.apache.cocoon.portal.util.AbstractBean;
/**
@@ -31,12 +31,12 @@
*/
public class NoClientCachingRequestProcessorAspect
extends AbstractBean
- implements EventAspect {
+ implements RequestProcessorAspect {
/**
- * @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext)
+ * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspect#process(org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext)
*/
- public void process(EventAspectContext context) {
+ public void process(RequestProcessorAspectContext context) {
final Response response = ObjectModelHelper.getResponse( context.getPortalService().getProcessInfoProvider().getObjectModel() );
response.setHeader("Cache-Control", "no-cache");
response.addHeader("Cache-Control", "no-store");
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java Mon Feb 26 00:56:12 2007
@@ -20,13 +20,12 @@
import java.util.List;
import java.util.Properties;
-import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.om.CopletInstanceFeatures;
import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext;
import org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
import org.apache.cocoon.portal.util.AbstractBean;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -47,10 +46,9 @@
protected static final ContentHandler nullHandler = new DefaultHandler();
/**
- * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspect#prepare(org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext)
+ * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspect#process(org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext)
*/
- public void prepare(PortalManagerAspectPrepareContext context)
- throws PortalException {
+ public void process(RequestProcessorAspectContext context) {
// let's just invoke the next
context.invokeNext();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java Mon Feb 26 00:56:12 2007
@@ -18,11 +18,10 @@
import java.util.Properties;
-import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext;
import org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
import org.apache.cocoon.portal.services.aspects.support.AspectChain;
import org.apache.cocoon.portal.services.aspects.support.BasicAspectContextImpl;
import org.xml.sax.ContentHandler;
@@ -36,7 +35,7 @@
public final class PortalManagerAspectContextImpl
extends BasicAspectContextImpl
implements PortalManagerAspectRenderContext,
- PortalManagerAspectPrepareContext {
+ RequestProcessorAspectContext {
public PortalManagerAspectContextImpl(PortalService service,
AspectChain chain) {
@@ -44,20 +43,19 @@
}
/**
- * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext#invokeNext()
+ * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext#invokeNext()
*/
- public void invokeNext()
- throws PortalException {
+ public void invokeNext() {
final PortalManagerAspect aspect = (PortalManagerAspect)this.getNext();
if ( aspect != null ) {
- aspect.prepare(this);
+ aspect.process(this);
}
}
/**
* @see org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext#invokeNext(org.xml.sax.ContentHandler, java.util.Properties)
*/
- public void invokeNext(ContentHandler ch, Properties properties)
+ public void invokeNext(ContentHandler ch, Properties properties)
throws SAXException {
final PortalManagerAspect aspect = (PortalManagerAspect)this.getNext();
if ( aspect != null ) {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ProfileManagerAspectContextImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ProfileManagerAspectContextImpl.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ProfileManagerAspectContextImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ProfileManagerAspectContextImpl.java Mon Feb 26 00:56:12 2007
@@ -18,6 +18,7 @@
import java.util.Collection;
+import org.apache.cocoon.portal.PortalRuntimeException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.services.aspects.ProfileManagerAspect;
@@ -50,7 +51,23 @@
this.phase = phase;
}
+ /**
+ * @see org.apache.cocoon.portal.services.aspects.ProfileManagerAspectContext#invokeNext(java.lang.Object)
+ */
public void invokeNext(Object object) {
+ // type check first
+ if ( object == null ) {
+ throw new PortalRuntimeException("Profile information can't be null (phase = " + this.phase + ").");
+ }
+ if ( phase == PHASE_COPLET_LAYOUT ) {
+ if ( !(object instanceof Layout) ) {
+ throw new PortalRuntimeException("Profile information must be of type Layout (phase = " + this.phase + ").");
+ }
+ } else {
+ if ( !(object instanceof Collection) ) {
+ throw new PortalRuntimeException("Profile information must be of type Collection (phase = " + this.phase + ").");
+ }
+ }
final ProfileManagerAspect aspect = (ProfileManagerAspect)this.getNext();
if ( aspect != null ) {
switch (phase) {
@@ -68,6 +85,10 @@
}
}
+ /**
+ * Return the resulting profile depending on the phase.
+ * @return
+ */
public Object getResult() {
return this.result;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/RequestProcessorAspectContextImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/RequestProcessorAspectContextImpl.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/RequestProcessorAspectContextImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/RequestProcessorAspectContextImpl.java Mon Feb 26 00:56:12 2007
@@ -16,7 +16,6 @@
*/
package org.apache.cocoon.portal.services.aspects.impl.support;
-import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
@@ -40,8 +39,7 @@
/**
* @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext#invokeNext()
*/
- public void invokeNext()
- throws PortalException {
+ public void invokeNext() {
final RequestProcessorAspect aspect = (RequestProcessorAspect)this.getNext();
if ( aspect != null ) {
aspect.process(this);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java Mon Feb 26 00:56:12 2007
@@ -34,8 +34,8 @@
import org.apache.cocoon.portal.profile.ProfileManager;
import org.apache.cocoon.portal.services.PortalManager;
import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext;
import org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
import org.apache.cocoon.portal.services.aspects.impl.support.PortalManagerAspectContextImpl;
import org.apache.cocoon.portal.services.aspects.support.AspectChain;
import org.apache.cocoon.portal.util.AbstractBean;
@@ -77,7 +77,7 @@
/**
* @see PortalManager#render(ContentHandler, Properties)
*/
- public void render(ContentHandler contentHandler, Properties properties)
+ public void render(ContentHandler contentHandler, Properties properties)
throws SAXException {
PortalManagerAspectContextImpl aspectContext =
new PortalManagerAspectContextImpl(this.portalService, this.chain);
@@ -96,9 +96,9 @@
}
/**
- * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspect#prepare(org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext)
+ * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspect#process(org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext)
*/
- public void prepare(PortalManagerAspectPrepareContext renderContext) throws PortalException {
+ public void process(RequestProcessorAspectContext rpContext) {
EventManager eventManager = this.portalService.getEventManager();
eventManager.processEvents();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/links/DefaultLinkService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/links/DefaultLinkService.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/links/DefaultLinkService.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/links/DefaultLinkService.java Mon Feb 26 00:56:12 2007
@@ -30,7 +30,10 @@
import org.apache.cocoon.portal.PortalRuntimeException;
import org.apache.cocoon.portal.event.ComparableEvent;
import org.apache.cocoon.portal.event.Event;
+import org.apache.cocoon.portal.event.EventConverter;
+import org.apache.cocoon.portal.event.EventManager;
import org.apache.cocoon.portal.services.LinkService;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
import org.apache.cocoon.portal.util.AbstractBean;
/**
@@ -354,9 +357,23 @@
}
/**
- * @see org.apache.cocoon.portal.services.LinkService#getEventRequestParameterName()
+ * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspect#process(org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext)
*/
- public String getEventRequestParameterName() {
- return this.requestParameterName;
+ public void process(RequestProcessorAspectContext context) {
+ final Request request = ObjectModelHelper.getRequest(context.getPortalService().getProcessInfoProvider().getObjectModel());
+ final EventManager publisher = context.getPortalService().getEventManager();
+ final EventConverter converter = context.getPortalService().getEventConverter();
+
+ final String[] values = request.getParameterValues( this.requestParameterName );
+ if ( values != null ) {
+ for(int i=0; i<values.length; i++) {
+ final String current = values[i];
+ final Event e = converter.decode(current);
+ if ( null != e) {
+ publisher.send(e);
+ }
+ }
+ }
+ context.invokeNext();
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?view=diff&rev=511756&r1=511755&r2=511756
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Mon Feb 26 00:56:12 2007
@@ -53,8 +53,8 @@
import org.apache.cocoon.portal.pluto.servlet.ServletRequestImpl;
import org.apache.cocoon.portal.pluto.servlet.ServletResponseImpl;
import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext;
import org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
import org.apache.cocoon.portal.util.HtmlSaxParser;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
@@ -79,7 +79,7 @@
*
* @version $Id$
*/
-public class PortletAdapter
+public class PortletAdapter
extends AbstractCopletAdapter
implements PortalManagerAspect, CopletDecorationProvider, Receiver, Parameterizable {
@@ -131,7 +131,7 @@
PortletDefinitionRegistry registry = (PortletDefinitionRegistry) portletContainerEnvironment.getContainerService(PortletDefinitionRegistry.class);
- final String portletEntityId = (String) getConfiguration(coplet, PORTLET_ATTRIBUTE_NAME);
+ final String portletEntityId = (String) getConfiguration(coplet, PORTLET_ATTRIBUTE_NAME);
if ( this.getLogger().isDebugEnabled() ) {
this.getLogger().debug("Coplet " + coplet.getId() + " tries to login into portlet " + portletEntityId);
}
@@ -141,11 +141,11 @@
if ( portletEntity.getPortletDefinition() != null ) {
// create the window
- PortletWindow portletWindow = new PortletWindowImpl(coplet, portletEntityId);
+ PortletWindow portletWindow = new PortletWindowImpl(coplet, portletEntityId);
((PortletWindowCtrl)portletWindow).setId(coplet.getId());
((PortletWindowCtrl)portletWindow).setPortletEntity(portletEntity);
- PortletWindowList windowList = portletEntity.getPortletWindowList();
- ((PortletWindowListCtrl)windowList).add(portletWindow);
+ PortletWindowList windowList = portletEntity.getPortletWindowList();
+ ((PortletWindowListCtrl)windowList).add(portletWindow);
coplet.setTemporaryAttribute(PORTLET_WINDOW_ATTRIBUTE_NAME, portletWindow);
// load the portlet
@@ -155,11 +155,11 @@
final HttpServletResponse res = (HttpServletResponse) objectModel.get(HttpEnvironment.HTTP_RESPONSE_OBJECT);
objectModel.put("portlet-response", new ServletResponseImpl(res));
req = new ServletRequestImpl((HttpServletRequest) objectModel.get(HttpEnvironment.HTTP_REQUEST_OBJECT), null);
- objectModel.put("portlet-request", req);
+ objectModel.put("portlet-request", req);
}
final HttpServletResponse res = (HttpServletResponse) objectModel.get("portlet-response");
try {
- this.portletContainer.portletLoad(portletWindow, req.getRequest(portletWindow),
+ this.portletContainer.portletLoad(portletWindow, req.getRequest(portletWindow),
res);
} catch (Exception e) {
this.getLogger().error("Error loading portlet " + portletEntityId + " for instance " + coplet.getId(), e);
@@ -254,14 +254,14 @@
* Return the portlet container
*/
public PortletContainer getPortletContainer() {
- return this.portletContainer;
+ return this.portletContainer;
}
/**
* Return the portlet container environment
*/
public PortletContainerEnvironment getPortletContainerEnvironment() {
- return this.portletContainerEnvironment;
+ return this.portletContainerEnvironment;
}
/**
@@ -355,10 +355,9 @@
}
/**
- * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspect#prepare(org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext)
+ * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspect#process(org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext)
*/
- public void prepare(PortalManagerAspectPrepareContext aspectContext)
- throws PortalException {
+ public void process(RequestProcessorAspectContext aspectContext) {
// process the events
aspectContext.invokeNext();
@@ -419,7 +418,7 @@
// portlet modes
final String pmString = (String)copletInstanceData.getTemporaryAttribute(PORTLET_MODE_ATTRIBUTE_NAME);
- final PortletMode pm;
+ final PortletMode pm;
if ( pmString == null ) {
pm = PortletMode.VIEW;
} else {
@@ -436,13 +435,13 @@
url.clearParameters();
url.setPortletMode(PortletMode.HELP);
modes.add(new DecorationAction("help-uri", url.toString()));
- }
+ }
if ( !pm.equals(PortletMode.VIEW) ) {
PortletURLProviderImpl url = (PortletURLProviderImpl)dip.getPortletURLProvider(window);
url.clearParameters();
url.setPortletMode(PortletMode.VIEW);
modes.add(new DecorationAction("view-uri", url.toString()));
- }
+ }
}
return modes;
@@ -460,7 +459,7 @@
// Sizing
final String wsString = (String)copletInstanceData.getTemporaryAttribute(WINDOW_STATE_ATTRIBUTE_NAME);
- final WindowState ws;
+ final WindowState ws;
if ( wsString == null ) {
ws = WindowState.NORMAL;
} else {
@@ -490,7 +489,7 @@
}
}
if ( this.enableFullScreen ) {
- // TODO - Implement full screen for portlets (= own mode)
+ // TODO - Implement full screen for portlets (= own mode)
}
}