You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2009/02/03 08:00:28 UTC
svn commit: r740233 - in /cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node: LastModifiedCollector.java MimeTypeCollector.java

Author: reinhard
Date: Tue Feb  3 07:00:27 2009
New Revision: 740233

URL: http://svn.apache.org/viewvc?rev=740233&view=rev
Log:
COCOON3-14
Specify the pipeline component type

Modified:
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/LastModifiedCollector.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/MimeTypeCollector.java

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/LastModifiedCollector.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/LastModifiedCollector.java?rev=740233&r1=740232&r2=740233&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/LastModifiedCollector.java (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/LastModifiedCollector.java Tue Feb  3 07:00:27 2009
@@ -17,6 +17,7 @@
 package org.apache.cocoon.servlet.node;
 
 import org.apache.cocoon.pipeline.Pipeline;
+import org.apache.cocoon.pipeline.component.PipelineComponent;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -34,11 +35,12 @@
         THREAD_LOCAL.set(null);
     }
 
+    @SuppressWarnings("unchecked")
     @Around("execution(* org.apache.cocoon.pipeline.Pipeline.execute(..))")
     public Object interceptInvoke(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
         Object result = proceedingJoinPoint.proceed();
 
-        Pipeline pipeline = (Pipeline) proceedingJoinPoint.getTarget();
+        Pipeline<PipelineComponent> pipeline = (Pipeline<PipelineComponent>) proceedingJoinPoint.getTarget();
         long lastModified = pipeline.getLastModified();
         THREAD_LOCAL.set(lastModified);
 

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/MimeTypeCollector.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/MimeTypeCollector.java?rev=740233&r1=740232&r2=740233&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/MimeTypeCollector.java (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/node/MimeTypeCollector.java Tue Feb  3 07:00:27 2009
@@ -17,6 +17,7 @@
 package org.apache.cocoon.servlet.node;
 
 import org.apache.cocoon.pipeline.Pipeline;
+import org.apache.cocoon.pipeline.component.PipelineComponent;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -34,11 +35,12 @@
         return THREAD_LOCAL.get();
     }
 
+    @SuppressWarnings("unchecked")
     @Around("execution(* org.apache.cocoon.pipeline.Pipeline.execute(..))")
     public Object interceptInvoke(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
         Object result = proceedingJoinPoint.proceed();
 
-        Pipeline pipeline = (Pipeline) proceedingJoinPoint.getTarget();
+        Pipeline<PipelineComponent> pipeline = (Pipeline<PipelineComponent>) proceedingJoinPoint.getTarget();
         String newValue = pipeline.getContentType();
         if (newValue != null) {
             THREAD_LOCAL.set(newValue);