You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/10/17 22:13:19 UTC
svn commit: r585665 - in /cocoon/trunk/core/cocoon-sitemap:
cocoon-sitemap-api/src/main/java/org/apache/cocoon/components/flow/
cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/
cocoon-sitemap-impl/src/main/java/org/apache/cocoon/componen...
Author: vgritsenko
Date: Wed Oct 17 13:13:18 2007
New Revision: 585665
URL: http://svn.apache.org/viewvc?rev=585665&view=rev
Log:
indent/formatting
Modified:
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/src/main/java/org/apache/cocoon/components/flow/WebContinuation.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/LifecycleHelper.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/src/main/java/org/apache/cocoon/components/flow/WebContinuation.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/src/main/java/org/apache/cocoon/components/flow/WebContinuation.java?rev=585665&r1=585664&r2=585665&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/src/main/java/org/apache/cocoon/components/flow/WebContinuation.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/src/main/java/org/apache/cocoon/components/flow/WebContinuation.java Wed Oct 17 13:13:18 2007
@@ -149,8 +149,9 @@
* @param name the attribute name.
*/
public Object getAttribute(String name) {
- if (this.attributes == null)
+ if (this.attributes == null) {
return null;
+ }
return this.attributes.get(name);
}
@@ -444,11 +445,12 @@
}
public boolean interpreterMatches( String interpreterId ) {
- return StringUtils.equals( this.interpreterId, interpreterId );
+ return StringUtils.equals(this.interpreterId, interpreterId);
}
public void detachFromParent() {
- if (getParentContinuation() != null)
+ if (getParentContinuation() != null) {
getParentContinuation().getChildren().remove(this);
+ }
}
}
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/LifecycleHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/LifecycleHelper.java?rev=585665&r1=585664&r2=585665&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/LifecycleHelper.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/LifecycleHelper.java Wed Oct 17 13:13:18 2007
@@ -116,9 +116,9 @@
* Alternative setupComponent method that takes a ServiceManager instead of a ComponentManger.
*/
public static Object setupComponent(final Object component,
- final Logger logger,
- final Context context,
- final ServiceManager serviceManager,
+ final Logger logger,
+ final Context context,
+ final ServiceManager serviceManager,
final Configuration configuration)
throws Exception {
return setupComponent(
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?rev=585665&r1=585664&r2=585665&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java Wed Oct 17 13:13:18 2007
@@ -557,12 +557,14 @@
protected class HolderAwareWebContinuation extends WebContinuation {
private WebContinuationsHolder continuationsHolder;
- public HolderAwareWebContinuation(String id, Object continuation,
- WebContinuation parentContinuation, int timeToLive,
- String interpreterId, ContinuationsDisposer disposer,
- WebContinuationsHolder continuationsHolder) {
- super(id, continuation, parentContinuation, timeToLive,
- interpreterId, disposer);
+ public HolderAwareWebContinuation(String id,
+ Object continuation,
+ WebContinuation parentContinuation,
+ int timeToLive,
+ String interpreterId,
+ ContinuationsDisposer disposer,
+ WebContinuationsHolder continuationsHolder) {
+ super(id, continuation, parentContinuation, timeToLive, interpreterId, disposer);
this.continuationsHolder = continuationsHolder;
}