Author: craigmcc
Date: Tue Jul 4 12:16:36 2006
New Revision: 419063
URL: http://svn.apache.org/viewvc?rev=419063&view=rev
Log:
Finish up the first-pass checkstyle cleanups on shale-core (skipping the
org.apache.shale.remote package that is deprecated and will be removed).
That leaves about 100 error messages in five or six major categories to
be reviewed in more detail.
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/ActionState.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/EndState.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/impl/StatusImpl.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleVariableResolver.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleWebContext.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ValidatorRenderKit.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorCommandRenderer.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorInputRenderer.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/util/ConverterHelper.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractViewController.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandler.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerFactory.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerImpl.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewActionListener.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewPhaseListener.java
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewViewHandler.java
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/application/AbstractRegExpFilter.java
Tue Jul 4 12:16:36 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2004-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -106,11 +106,11 @@
* <p>Array of regular expression patterns for the includes list.</p>
*/
private Pattern includesPatterns[] = new Pattern[0];
-
+
/**
* <p>Returns an array of regular expression patterns for the includes
list.</p>
*/
- protected Pattern[] getIncludesPatterns() {return includesPatterns;};
+ protected Pattern[] getIncludesPatterns() { return includesPatterns; }
// --------------------------------------------------------------
Properties
@@ -166,6 +166,8 @@
* against the value returned by the <code>value()</code> method.</p>
*
* @param context <code>ShaleWebContext</code> for this request
+ *
+ * @exception Exception if an error occurs
*/
public boolean execute(Context context) throws Exception {
@@ -229,6 +231,8 @@
* being accepted. The default implementation does nothing.</p>
*
* @param context <code>Context</code> for the current request
+ *
+ * @exception Exception if an error occurs
*/
protected void accept(ShaleWebContext context) throws Exception {
@@ -243,6 +247,8 @@
* of <code>HttpServletResponse.SC_FORBIDDEN</code>.</p>
*
* @param context <code>Context</code> for the current request
+ *
+ * @exception Exception if an error occurs
*/
protected void reject(ShaleWebContext context) throws Exception {
@@ -330,7 +336,7 @@
try {
type = st.nextToken();
} catch (IOException e) {
- // Can not happen
+ ; // Can not happen
}
if (type == StreamTokenizer.TT_EOF) {
break;
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/ActionState.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/ActionState.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/ActionState.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/ActionState.java
Tue Jul 4 12:16:36 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2004-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
*/
public interface ActionState extends State {
-
+
// --------------------------------------------------------------
Properties
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/EndState.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/EndState.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/EndState.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/EndState.java
Tue Jul 4 12:16:36 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2004-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,6 +32,5 @@
*/
public interface EndState extends ViewState {
-
}
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java
Tue Jul 4 12:16:36 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2004-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -105,7 +105,7 @@
// -------------------------------------------------------- Static
Variables
-
+
/**
* <p>An empty parameters list to pass to the <code>invoke()</code>
* method of a <code>MethodBinding</code>.</p>
@@ -391,7 +391,7 @@
* @param outcome The outcome that caused us to transition to this
* [EMAIL PROTECTED] State}
*
- * @exception IllegalArgumentExceptoin if the specified state is not of
+ * @exception IllegalArgumentException if the specified state is not of
* a known type
*/
private void preprocess(FacesContext context, Status status,
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/impl/StatusImpl.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/impl/StatusImpl.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/impl/StatusImpl.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/dialog/impl/StatusImpl.java
Tue Jul 4 12:16:36 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2004-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,7 +45,7 @@
*/
public class StatusImpl implements Status {
-
+
// ------------------------------------------------------ Instance
Variables
@@ -176,7 +176,7 @@
references.remove(index);
if (log.isDebugEnabled()) {
log.debug("pop(" + index + ") --> " +
- ((index > 0) ? (Position) positions.get(index-1) :
null));
+ ((index > 0) ? (Position) positions.get(index - 1) :
null));
}
if (index > 0) {
return (Position) positions.get(index - 1);
@@ -202,7 +202,7 @@
}
if (log.isDebugEnabled()) {
- log.debug("push(" + position + ")@" + (positions.size()-1));
+ log.debug("push(" + position + ")@" + (positions.size() - 1));
}
}
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleApplicationFilter.java
Tue Jul 4 12:16:36 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2004-2006 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,10 +21,6 @@
import java.lang.reflect.Method;
import java.net.URL;
import javax.faces.FacesException;
-
-import javax.faces.FactoryFinder;
-import javax.faces.lifecycle.Lifecycle;
-import javax.faces.lifecycle.LifecycleFactory;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -35,7 +31,6 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.chain.Catalog;
import org.apache.commons.chain.CatalogFactory;
@@ -47,8 +42,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.shale.util.Messages;
-import org.apache.shale.view.Constants;
-import org.apache.shale.view.ViewControllerMapper;
/**
@@ -225,7 +218,7 @@
LogFactory.release(Thread.currentThread().getContextClassLoader());
}
-
+
/**
* <p>Perform per-request application controler functionality.</p>
@@ -233,6 +226,9 @@
* @param request The request we are processing
* @param response The response we are creating
* @param chain The filter chain for this request
+ *
+ * @exception IOException if an input/output error occurs
+ * @exception ServletException if a servlet exception is thrown
*/
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain) throws IOException, ServletException {
@@ -264,8 +260,8 @@
}
if (result) {
// Clean up the stored request attribute
- request.removeAttribute(CONTEXT_ATTR);
- // Bypass calling the remainder of the application
+ request.removeAttribute(CONTEXT_ATTR);
+ // Bypass calling the remainder of the application
return;
}
}
@@ -298,6 +294,8 @@
* <p>Perform application startup intiialization as necessary.</p>
*
* @param config <code>FilterConfig</code> for this filter
+ *
+ * @exception ServletException if a servlet exception is thrown
*/
public void init(FilterConfig config) throws ServletException {
@@ -365,7 +363,7 @@
catalog = new CatalogBase();
CatalogFactory.getInstance().addCatalog(CATALOG_NAME, catalog);
}
-
+
// Configure this catalog based on our default resource
if (log().isDebugEnabled()) {
log().debug(messages.getMessage("filter.parsingResource",
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleVariableResolver.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleVariableResolver.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleVariableResolver.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleVariableResolver.java
Tue Jul 4 12:16:36 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2004-2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -47,7 +47,7 @@
* $Id$
*/
public class ShaleVariableResolver extends VariableResolver {
-
+
// -------------------------------------------------------------
Constructor
@@ -136,7 +136,11 @@
* <p>Resolve variable names known to this resolver; otherwise, delegate to
* the original resolver passed to our constructor.</p>
*
+ * @param context FacesContext for the current request
* @param name Variable name to be resolved
+ *
+ * @exception EvaluationException if the JNDI naming context
+ * throws a naming exception
*/
public Object resolveVariable(FacesContext context, String name)
throws EvaluationException {
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleWebContext.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleWebContext.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleWebContext.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ShaleWebContext.java
Tue Jul 4 12:16:36 2006
@@ -1,19 +1,17 @@
/*
* Copyright 2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
- * $Id$
*/
package org.apache.shale.faces;
@@ -30,6 +28,8 @@
/**
* <p>Commons Chain <code>Context</code> implementation for Shale.</p>
+ *
+ * $Id$
*/
public class ShaleWebContext extends ServletWebContext {
@@ -51,7 +51,7 @@
super(context, request, response);
}
-
+
// ------------------------------------------------------ Instance
Variables
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ValidatorRenderKit.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ValidatorRenderKit.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ValidatorRenderKit.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/faces/ValidatorRenderKit.java
Tue Jul 4 12:16:36 2006
@@ -12,7 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
*/
package org.apache.shale.faces;
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorCommandRenderer.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorCommandRenderer.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorCommandRenderer.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorCommandRenderer.java
Tue Jul 4 12:16:36 2006
@@ -12,7 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
*/
package org.apache.shale.renderer;
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorInputRenderer.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorInputRenderer.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorInputRenderer.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/renderer/ValidatorInputRenderer.java
Tue Jul 4 12:16:36 2006
@@ -12,7 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
*/
package org.apache.shale.renderer;
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/util/ConverterHelper.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/util/ConverterHelper.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/util/ConverterHelper.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/util/ConverterHelper.java
Tue Jul 4 12:16:36 2006
@@ -32,7 +32,7 @@
* @since 1.0.1
*/
public class ConverterHelper {
-
+
// -------------------------------------------------------- Static
Variables
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractViewController.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractViewController.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractViewController.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractViewController.java
Tue Jul 4 12:16:36 2006
@@ -32,6 +32,9 @@
// --------------------------------------------------------------
Properties
+ /**
+ * <p>Flag indicating that this is a postback request.</p>
+ */
private boolean postBack = false;
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandler.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandler.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandler.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandler.java
Tue Jul 4 12:16:36 2006
@@ -1,19 +1,17 @@
/*
* Copyright 2006 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
- * $Id$
*/
package org.apache.shale.view.faces;
@@ -22,12 +20,14 @@
* <p>Interface describing a "strategy pattern" implementation for
* handling exceptions thrown by an application event callback that
* is managed by Shale. A suitable instance may be acquired by calling
- * <code>ExceptionHandlerFactory.getInstance().getExceptionHandler().</p>
+ *
<code>ExceptionHandlerFactory.getInstance().getExceptionHandler()</code>.</p>
*
* @since 1.0.3
+ *
+ * $Id$
*/
public interface ExceptionHandler {
-
+
/**
* <p>Handle the specified exception thrown by an application
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerFactory.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerFactory.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerFactory.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerFactory.java
Tue Jul 4 12:16:36 2006
@@ -12,8 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
- * $Id$
*/
package org.apache.shale.view.faces;
@@ -24,6 +22,8 @@
* <p>Factory for exception handler instances.</p>
*
* @since 1.0.3
+ *
+ * $Id$
*/
public final class ExceptionHandlerFactory {
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerImpl.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerImpl.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerImpl.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerImpl.java
Tue Jul 4 12:16:36 2006
@@ -12,8 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
- * $Id$
*/
package org.apache.shale.view.faces;
@@ -25,6 +23,8 @@
/**
* <p>Default implementation of the [EMAIL PROTECTED] ExceptionHandler}
interface.</p>
+ *
+ * $Id$
*/
public class ExceptionHandlerImpl implements ExceptionHandler {
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewActionListener.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewActionListener.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewActionListener.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewActionListener.java
Tue Jul 4 12:16:36 2006
@@ -12,8 +12,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
- * $Id$
*/
package org.apache.shale.view.faces;
@@ -27,6 +25,8 @@
* lifecycle.</p>
*
* @since 1.0.3
+ *
+ * $Id$
*/
public final class ViewActionListener implements ActionListener {
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewPhaseListener.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewPhaseListener.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewPhaseListener.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewPhaseListener.java
Tue Jul 4 12:16:36 2006
@@ -16,7 +16,6 @@
package org.apache.shale.view.faces;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Modified:
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewViewHandler.java
URL:
http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewViewHandler.java?rev=419063&r1=419062&r2=419063&view=diff
==============================================================================
---
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewViewHandler.java
(original)
+++
struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewViewHandler.java
Tue Jul 4 12:16:36 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2004-2006 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,7 +31,6 @@
import javax.faces.el.VariableResolver;
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
-import javax.servlet.ServletException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,12 +44,12 @@
* <p>[EMAIL PROTECTED] ViewViewHandler} is a custom implementation of
<code>ViewHandler</code>
* that adds support for on-demand creation and configuration of [EMAIL
PROTECTED] ViewController}
* instances, and other view related functionality.</p>
- *
+ *
* $Id$
*/
public class ViewViewHandler extends ViewHandler {
-
+
// -------------------------------------------------------------
Constructor
@@ -69,7 +68,7 @@
// -------------------------------------------------------- Static
Variables
-
+
/**
* <p>Log instance for this class.</p>
*/
@@ -86,7 +85,7 @@
// ------------------------------------------------------ Instance
Variables
-
+
/**
* <p>Cached [EMAIL PROTECTED] ViewControllerMapper} we will use to
translate
* view identifiers to the class name of a [EMAIL PROTECTED]
ViewController}.</p>
@@ -105,13 +104,13 @@
// ----------------------------------------------------- ViewHandler
Methods
- // Specified by ViewHandler
+ /** [EMAIL PROTECTED] */
public Locale calculateLocale(FacesContext context) {
return original.calculateLocale(context);
}
- // Specified by ViewHandler
+ /** [EMAIL PROTECTED] */
public String calculateRenderKitId(FacesContext context) {
return original.calculateRenderKitId(context);
}
@@ -133,19 +132,19 @@
}
- // Specified by ViewHandler
+ /** [EMAIL PROTECTED] */
public String getActionURL(FacesContext context, String viewId) {
return original.getActionURL(context, viewId);
}
-
- // Specified by ViewHandler
+
+ /** [EMAIL PROTECTED] */
public String getResourceURL(FacesContext context, String path) {
return original.getResourceURL(context, path);
}
- // Specified by ViewHandler
+ /** [EMAIL PROTECTED] */
public void renderView(FacesContext context, UIViewRoot view)
throws IOException, FacesException {
original.renderView(context, view);
@@ -167,7 +166,7 @@
}
- // Specified by ViewHandler
+ /** [EMAIL PROTECTED] */
public void writeState(FacesContext context) throws IOException {
original.writeState(context);
}
@@ -248,8 +247,8 @@
* @param context <code>FacesContext</code> for the current request
* @param view <code>UIViewRoot</code> just created or restored
* (or <code>null</code> if there was no such view)
- * @param viewId of the <code>UIViewRoot</code> just created or
- * restored
+ * @param viewId of the <code>UIViewRoot</code> just created or
+ * restored
* @param postBack <code>true</code> if this is a post back to
* an existing view
*/
@@ -260,8 +259,8 @@
if (view == null) {
return;
}
-
- // Its not the responsibilty of createView method to set the viewId of
the view
+
+ // Its not the responsibilty of createView method to set the viewId of
the view
// (See JSF 1.1 spec. pg. 7-16)
//String viewId = view.getViewId();
if (log.isDebugEnabled()) {
@@ -354,16 +353,22 @@
/**
* <p>The default RenderKit is decorated with [EMAIL PROTECTED]
org.apache.shale.faces.ValidatorRenderKit}.
- * This wrapper intercepts component renderer's decorating them.</p>
- *
+ * This wrapper intercepts component renderer's decorating them.</p>
+ *
* @param context <code>FacesContext</code> for the current request
* @param view <code>UIViewRoot</code> for the current component tree
*/
private void setupRenderKit(FacesContext context, UIViewRoot view) {
- RenderKitFactory factory = (RenderKitFactory)
FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
- RenderKit defaultRenderKit = factory.getRenderKit(context,
view.getRenderKitId());
- if (!(defaultRenderKit instanceof ValidatorRenderKit))
- factory.addRenderKit(view.getRenderKitId(), new
ValidatorRenderKit(defaultRenderKit));
+
+ RenderKitFactory factory =
+ (RenderKitFactory)
FactoryFinder.getFactory(FactoryFinder.RENDER_KIT_FACTORY);
+ RenderKit defaultRenderKit =
+ factory.getRenderKit(context, view.getRenderKitId());
+ if (!(defaultRenderKit instanceof ValidatorRenderKit)) {
+ factory.addRenderKit(view.getRenderKitId(),
+ new ValidatorRenderKit(defaultRenderKit));
+ }
+
}
}
