You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2005/11/15 08:25:23 UTC

svn commit: r344322 - in /struts/shale/trunk: core-library/src/java/org/apache/shale/application/ core-library/src/java/org/apache/shale/component/ core-library/src/java/org/apache/shale/dialog/config/ core-library/src/java/org/apache/shale/dialog/face...

Author: craigmcc
Date: Mon Nov 14 23:24:49 2005
New Revision: 344322

URL: http://svn.apache.org/viewcvs?rev=344322&view=rev
Log:
[37504] Realphabetize imports and remove redundant ones

These changes should be cosmetic only.  All existing test cases run for me.

Submitted by:  Rahul Akolkar (rahul AT apache.org)

Modified:
    struts/shale/trunk/core-library/src/java/org/apache/shale/application/AbstractRegExpFilter.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/component/Subview.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationDestroy.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationInit.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationParser.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/AbstractState.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/DialogImpl.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/StatusImpl.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePhaseListener.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePropertyResolver.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleWebContext.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/remote/AbstractListCompletions.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/remote/AbstractSelectItems.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/remote/BasicListCompletions.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/remote/BasicSelectItems.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/remote/ContextAttributes.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/remote/EvaluateExpression.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteCommand.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteContext.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RequestAttributes.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/remote/ServletRemoteContext.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/remote/SessionAttributes.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/renderer/TokenRenderer.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/spring/WebApplicationContextVariableResolver.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/spring/webflow/WebFlowNavigationHandler.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/spring/webflow/WebFlowNavigationStrategy.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/CommonsValidatorTag.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/SubviewTag.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/TokenTag.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/ValidatorScriptTag.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/util/LoadBundle.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/util/Tags.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/util/TokenProcessor.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/validator/CommonsValidator.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractFacesBean.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java
    struts/shale/trunk/core-library/src/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java
    struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/config/ConfigurationParserTestCase.java
    struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/faces/DialogNavigationHandlerTestCase.java
    struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/impl/ImplClassesTestCase.java
    struts/shale/trunk/core-library/src/test/org/apache/shale/util/LoadBundleTestCase.java
    struts/shale/trunk/core-library/src/test/org/apache/shale/util/MessagesTestCase.java
    struts/shale/trunk/core-library/src/test/org/apache/shale/util/TokenProcessorTestCase.java
    struts/shale/trunk/core-library/src/test/org/apache/shale/view/ConcreteFacesBeanTestCase.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/base/AbstractJsfTestCase.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplicationFactory.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplicationMap.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockExternalContext.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockFacesContext.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockFacesContextFactory.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockHttpServletResponse.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockHttpSession.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockLifecycleFactory.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockMethodBinding.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockNavigationHandler.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockPropertyResolver.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRenderKit.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRenderKitFactory.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRequestMap.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServlet.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServletConfig.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServletContext.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockSessionMap.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockStateManager.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockValueBinding.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockVariableResolver.java
    struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockViewHandler.java
    struts/shale/trunk/test-framework/src/test/org/apache/shale/test/mock/MockObjectsTestCase.java
    struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/locale/SelectTestCase.java

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/application/AbstractRegExpFilter.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/application/AbstractRegExpFilter.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/application/AbstractRegExpFilter.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/application/AbstractRegExpFilter.java Mon Nov 14 23:24:49 2005
@@ -22,7 +22,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
+
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
 import org.apache.commons.logging.Log;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/component/Subview.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/component/Subview.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/component/Subview.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/component/Subview.java Mon Nov 14 23:24:49 2005
@@ -16,22 +16,19 @@
 
 package org.apache.shale.component;
 
-import java.beans.Beans;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import javax.faces.component.UIComponent;
+
 import javax.faces.component.UINamingContainer;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseId;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.shale.view.ViewController;
 import org.apache.shale.faces.ShaleConstants;
-import org.apache.shale.faces.ShalePhaseListener;
-import org.apache.shale.faces.ShaleViewHandler;
 import org.apache.shale.util.Messages;
+import org.apache.shale.view.ViewController;
 
 /**
  * <p>Specialized implementation of <code>UINamingContainer</code> that

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/component/ValidatorScript.java Mon Nov 14 23:24:49 2005
@@ -18,17 +18,18 @@
 
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
-import java.util.LinkedHashMap;
+
 import javax.faces.component.EditableValueHolder;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIComponentBase;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
-import org.apache.commons.validator.ValidatorAction;
 
+import org.apache.commons.validator.ValidatorAction;
 import org.apache.shale.validator.CommonsValidator;
 
 /**

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationDestroy.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationDestroy.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationDestroy.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationDestroy.java Mon Nov 14 23:24:49 2005
@@ -17,9 +17,10 @@
 package org.apache.shale.dialog.config;
 
 import javax.servlet.ServletContext;
+
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
-import org.apache.shale.dialog.*;
+import org.apache.shale.dialog.Globals;
 
 /**
  * <p>Command executed at web application shutdown to clean up the

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationInit.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationInit.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationInit.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationInit.java Mon Nov 14 23:24:49 2005
@@ -19,7 +19,9 @@
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.servlet.ServletContext;
+
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
 import org.apache.commons.logging.Log;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationParser.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationParser.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationParser.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/config/ConfigurationParser.java Mon Nov 14 23:24:49 2005
@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.Map;
+
 import org.apache.commons.digester.Digester;
 import org.apache.commons.digester.Rule;
 import org.apache.shale.dialog.Dialog;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/faces/DialogNavigationHandler.java Mon Nov 14 23:24:49 2005
@@ -17,11 +17,13 @@
 package org.apache.shale.dialog.faces;
 
 import java.util.Map;
+
 import javax.faces.application.NavigationHandler;
 import javax.faces.application.ViewHandler;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 import javax.faces.el.MethodBinding;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shale.dialog.ActionState;
@@ -30,7 +32,6 @@
 import org.apache.shale.dialog.Globals;
 import org.apache.shale.dialog.State;
 import org.apache.shale.dialog.Status;
-import org.apache.shale.dialog.Status.Position;
 import org.apache.shale.dialog.SubdialogState;
 import org.apache.shale.dialog.Transition;
 import org.apache.shale.dialog.ViewState;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/AbstractState.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/AbstractState.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/AbstractState.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/AbstractState.java Mon Nov 14 23:24:49 2005
@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shale.dialog.Dialog;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/DialogImpl.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/DialogImpl.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/DialogImpl.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/DialogImpl.java Mon Nov 14 23:24:49 2005
@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shale.dialog.Dialog;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/StatusImpl.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/StatusImpl.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/StatusImpl.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/dialog/impl/StatusImpl.java Mon Nov 14 23:24:49 2005
@@ -18,11 +18,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shale.dialog.Dialog;
 import org.apache.shale.dialog.Status;
-import org.apache.shale.dialog.Status.Position;
 
 /**
  * <p>Class used to record the current status of executing a {@link Dialog},

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleApplicationFilter.java Mon Nov 14 23:24:49 2005
@@ -18,6 +18,7 @@
 
 import java.io.IOException;
 import java.net.URL;
+
 import javax.faces.FactoryFinder;
 import javax.faces.event.PhaseListener;
 import javax.faces.lifecycle.Lifecycle;
@@ -31,6 +32,7 @@
 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;
@@ -41,8 +43,8 @@
 import org.apache.commons.chain.web.servlet.ServletWebContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.shale.view.ViewControllerMapper;
 import org.apache.shale.util.Messages;
+import org.apache.shale.view.ViewControllerMapper;
 
 
 /**

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleConstants.java Mon Nov 14 23:24:49 2005
@@ -16,9 +16,9 @@
 
 package org.apache.shale.faces;
 
+import org.apache.shale.util.TokenProcessor;
 import org.apache.shale.view.ViewController;
 import org.apache.shale.view.ViewControllerMapper;
-import org.apache.shale.util.TokenProcessor;
 
 
 /**

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePhaseListener.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePhaseListener.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePhaseListener.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePhaseListener.java Mon Nov 14 23:24:49 2005
@@ -16,16 +16,17 @@
 
 package org.apache.shale.faces;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.shale.view.ViewController;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
 import javax.faces.event.PhaseListener;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.shale.view.ViewController;
 
 /**
  * <p>{@link ShalePhaseListener} is a JavaServer Faces <code>PhaseListener</code>

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePropertyResolver.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePropertyResolver.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePropertyResolver.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePropertyResolver.java Mon Nov 14 23:24:49 2005
@@ -16,7 +16,6 @@
 
 package org.apache.shale.faces;
 
-import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.PropertyNotFoundException;
 import javax.faces.el.PropertyResolver;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleViewHandler.java Mon Nov 14 23:24:49 2005
@@ -16,22 +16,23 @@
 
 package org.apache.shale.faces;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.shale.view.ViewController;
-import org.apache.shale.view.ViewControllerMapper;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 import javax.faces.FacesException;
 import javax.faces.application.ViewHandler;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.shale.util.Messages;
+import org.apache.shale.view.ViewController;
+import org.apache.shale.view.ViewControllerMapper;
 
 /**
  * <p>{@link ShaleViewHandler} is a custom implementation of <code>ViewHandler</code> that adds support

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleWebContext.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleWebContext.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleWebContext.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShaleWebContext.java Mon Nov 14 23:24:49 2005
@@ -24,6 +24,7 @@
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
+
 import org.apache.commons.chain.web.servlet.ServletWebContext;
 import org.apache.shale.util.Messages;
 

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/remote/AbstractListCompletions.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/AbstractListCompletions.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/remote/AbstractListCompletions.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/remote/AbstractListCompletions.java Mon Nov 14 23:24:49 2005
@@ -19,10 +19,9 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
-import org.apache.shale.remote.RemoteContext;
-import org.apache.shale.remote.ResponseWrapper;
 
 /**
  * <p>Convenience base class for remote commands that perform "code completion"

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/remote/AbstractSelectItems.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/AbstractSelectItems.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/remote/AbstractSelectItems.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/remote/AbstractSelectItems.java Mon Nov 14 23:24:49 2005
@@ -19,11 +19,11 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.faces.model.SelectItem;
+
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
-import org.apache.shale.remote.RemoteContext;
-import org.apache.shale.remote.ResponseWrapper;
 
 /**
  * <p>Convenience base class for remote commands that retrieve arrays

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/remote/BasicListCompletions.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/BasicListCompletions.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/remote/BasicListCompletions.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/remote/BasicListCompletions.java Mon Nov 14 23:24:49 2005
@@ -16,13 +16,6 @@
 
 package org.apache.shale.remote;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.shale.remote.RemoteContext;
-import org.apache.shale.remote.ResponseWrapper;
 
 /**
  * <p>Simple concrete subclass of {@link AbstractListCompletions} that

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/remote/BasicSelectItems.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/BasicSelectItems.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/remote/BasicSelectItems.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/remote/BasicSelectItems.java Mon Nov 14 23:24:49 2005
@@ -16,14 +16,7 @@
 
 package org.apache.shale.remote;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 import javax.faces.model.SelectItem;
-import org.apache.commons.chain.Command;
-import org.apache.commons.chain.Context;
-import org.apache.shale.remote.RemoteContext;
-import org.apache.shale.remote.ResponseWrapper;
 
 /**
  * <p>Simple concrete subclass of {@link AbstractSelectItems} that

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/remote/ContextAttributes.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/ContextAttributes.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/remote/ContextAttributes.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/remote/ContextAttributes.java Mon Nov 14 23:24:49 2005
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.servlet.ServletContext;
 
 

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/remote/EvaluateExpression.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/EvaluateExpression.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/remote/EvaluateExpression.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/remote/EvaluateExpression.java Mon Nov 14 23:24:49 2005
@@ -16,9 +16,9 @@
 
 package org.apache.shale.remote;
 
-import java.io.IOException;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
+
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
 

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteCommand.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteCommand.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteCommand.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteCommand.java Mon Nov 14 23:24:49 2005
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
+
 import javax.faces.FactoryFinder;
 import javax.faces.application.Application;
 import javax.faces.application.ApplicationFactory;
@@ -30,6 +31,7 @@
 import javax.faces.lifecycle.Lifecycle;
 import javax.faces.lifecycle.LifecycleFactory;
 import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.chain.Catalog;
 import org.apache.commons.chain.CatalogFactory;
 import org.apache.commons.chain.Command;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteContext.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteContext.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteContext.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RemoteContext.java Mon Nov 14 23:24:49 2005
@@ -16,13 +16,14 @@
 
 package org.apache.shale.remote;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.Locale;
 import java.util.Map;
+
 import org.apache.commons.chain.Context;
 
 /**

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RequestAttributes.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RequestAttributes.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RequestAttributes.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/remote/RequestAttributes.java Mon Nov 14 23:24:49 2005
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.servlet.http.HttpServletRequest;
 
 

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/remote/ServletRemoteContext.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/ServletRemoteContext.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/remote/ServletRemoteContext.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/remote/ServletRemoteContext.java Mon Nov 14 23:24:49 2005
@@ -20,16 +20,18 @@
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.Locale;
 import java.util.Map;
+
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.chain.impl.ContextBase;
 
 /**

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/remote/SessionAttributes.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/remote/SessionAttributes.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/remote/SessionAttributes.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/remote/SessionAttributes.java Mon Nov 14 23:24:49 2005
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.servlet.http.HttpSession;
 
 

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/renderer/TokenRenderer.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/renderer/TokenRenderer.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/renderer/TokenRenderer.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/renderer/TokenRenderer.java Mon Nov 14 23:24:49 2005
@@ -18,10 +18,12 @@
 
 import java.io.IOException;
 import java.util.Map;
+
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.Renderer;
+
 import org.apache.shale.component.Token;
 
 /**

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/spring/WebApplicationContextVariableResolver.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/spring/WebApplicationContextVariableResolver.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/spring/WebApplicationContextVariableResolver.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/spring/WebApplicationContextVariableResolver.java Mon Nov 14 23:24:49 2005
@@ -19,6 +19,7 @@
 import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.VariableResolver;
+
 import org.springframework.web.jsf.FacesContextUtils;
 
 /**

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/spring/webflow/WebFlowNavigationHandler.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/spring/webflow/WebFlowNavigationHandler.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/spring/webflow/WebFlowNavigationHandler.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/spring/webflow/WebFlowNavigationHandler.java Mon Nov 14 23:24:49 2005
@@ -18,6 +18,7 @@
 
 import javax.faces.application.NavigationHandler;
 import javax.faces.context.FacesContext;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.web.context.WebApplicationContext;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/spring/webflow/WebFlowNavigationStrategy.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/spring/webflow/WebFlowNavigationStrategy.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/spring/webflow/WebFlowNavigationStrategy.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/spring/webflow/WebFlowNavigationStrategy.java Mon Nov 14 23:24:49 2005
@@ -21,6 +21,7 @@
 import javax.faces.context.FacesContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.webflow.Event;
 import org.springframework.webflow.ViewDescriptor;
 import org.springframework.webflow.execution.FlowExecutionManager;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/CommonsValidatorTag.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/CommonsValidatorTag.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/CommonsValidatorTag.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/CommonsValidatorTag.java Mon Nov 14 23:24:49 2005
@@ -21,8 +21,8 @@
 import javax.faces.webapp.ValidatorTag;
 import javax.servlet.jsp.JspException;
 
-import org.apache.shale.validator.CommonsValidator;
 import org.apache.shale.faces.ShaleConstants;
+import org.apache.shale.validator.CommonsValidator;
 
 /**
  * The tag class for the <code>s:commonsValidator</code> tag.

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/SubviewTag.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/SubviewTag.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/SubviewTag.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/SubviewTag.java Mon Nov 14 23:24:49 2005
@@ -17,6 +17,7 @@
 package org.apache.shale.taglib;
 
 import javax.faces.webapp.UIComponentTag;
+
 import org.apache.shale.component.Subview;
 
 /**

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/TokenTag.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/TokenTag.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/TokenTag.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/TokenTag.java Mon Nov 14 23:24:49 2005
@@ -17,6 +17,7 @@
 package org.apache.shale.taglib;
 
 import javax.faces.webapp.UIComponentTag;
+
 import org.apache.shale.component.Token;
 
 /**

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/ValidatorScriptTag.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/ValidatorScriptTag.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/ValidatorScriptTag.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/taglib/ValidatorScriptTag.java Mon Nov 14 23:24:49 2005
@@ -16,8 +16,8 @@
 
 package org.apache.shale.taglib;
 
-import javax.faces.context.FacesContext;
 import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
 import javax.faces.webapp.UIComponentTag;
 
 import org.apache.shale.faces.ShaleConstants;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/tiles/TilesViewHandler.java Mon Nov 14 23:24:49 2005
@@ -16,30 +16,24 @@
 
 package org.apache.shale.tiles;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import java.io.IOException;
 import java.text.MessageFormat;
-import java.util.List;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import javax.faces.application.ViewHandler;
-
 import javax.faces.FacesException;
 import javax.faces.application.ViewHandler;
-import javax.faces.component.UIOutput;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.tiles.ComponentContext;
 import org.apache.tiles.ComponentDefinition;
-import org.apache.tiles.DefinitionsFactory;
 import org.apache.tiles.DefinitionsFactoryException;
 import org.apache.tiles.NoSuchDefinitionException;
 import org.apache.tiles.TilesUtil;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/util/LoadBundle.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/util/LoadBundle.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/util/LoadBundle.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/util/LoadBundle.java Mon Nov 14 23:24:49 2005
@@ -24,10 +24,10 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 import java.util.Set;
+
 import javax.faces.context.FacesContext;
 
 /**

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/util/Tags.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/util/Tags.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/util/Tags.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/util/Tags.java Mon Nov 14 23:24:49 2005
@@ -17,6 +17,7 @@
 package org.apache.shale.util;
 
 import java.io.Serializable;
+
 import javax.faces.application.Application;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/util/TokenProcessor.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/util/TokenProcessor.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/util/TokenProcessor.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/util/TokenProcessor.java Mon Nov 14 23:24:49 2005
@@ -20,9 +20,11 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.faces.FacesException;
 import javax.faces.context.FacesContext;
 import javax.faces.el.PropertyResolver;
+
 import org.apache.shale.faces.ShaleConstants;
 
 /**

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/validator/CommonsValidator.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/validator/CommonsValidator.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/validator/CommonsValidator.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/validator/CommonsValidator.java Mon Nov 14 23:24:49 2005
@@ -32,6 +32,7 @@
 import java.util.ResourceBundle;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.faces.application.Application;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.EditableValueHolder;
@@ -40,12 +41,13 @@
 import javax.faces.context.FacesContext;
 import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.commons.validator.GenericValidator;
 import org.apache.commons.validator.ValidatorAction;
 import org.apache.commons.validator.ValidatorResources;
 import org.apache.commons.validator.ValidatorResourcesInitializer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * <p>This is a JSF validator that uses

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractFacesBean.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractFacesBean.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractFacesBean.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractFacesBean.java Mon Nov 14 23:24:49 2005
@@ -17,6 +17,7 @@
 package org.apache.shale.view;
 
 import java.util.Map;
+
 import javax.faces.FactoryFinder;
 import javax.faces.application.Application;
 import javax.faces.application.FacesMessage;

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/view/AbstractViewController.java Mon Nov 14 23:24:49 2005
@@ -16,7 +16,6 @@
 
 package org.apache.shale.view;
 
-import org.apache.shale.view.ViewController;
 
 /**
  * <p>{@link AbstractViewController} is a convenience base implementation of

Modified: struts/shale/trunk/core-library/src/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java (original)
+++ struts/shale/trunk/core-library/src/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java Mon Nov 14 23:24:49 2005
@@ -18,6 +18,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
+
 import org.apache.shale.view.ViewControllerMapper;
 
 /**

Modified: struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/config/ConfigurationParserTestCase.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/config/ConfigurationParserTestCase.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/config/ConfigurationParserTestCase.java (original)
+++ struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/config/ConfigurationParserTestCase.java Mon Nov 14 23:24:49 2005
@@ -24,7 +24,6 @@
 import org.apache.commons.chain.impl.ContextBase;
 import org.apache.shale.dialog.Dialog;
 import org.apache.shale.dialog.Globals;
-import org.apache.shale.dialog.config.ConfigurationInit;
 import org.apache.shale.dialog.impl.DialogImpl;
 import org.apache.shale.test.base.AbstractJsfTestCase;
 

Modified: struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/faces/DialogNavigationHandlerTestCase.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/faces/DialogNavigationHandlerTestCase.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/faces/DialogNavigationHandlerTestCase.java (original)
+++ struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/faces/DialogNavigationHandlerTestCase.java Mon Nov 14 23:24:49 2005
@@ -16,12 +16,9 @@
 
 package org.apache.shale.dialog.faces;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import junit.framework.TestCase;
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.impl.ContextBase;
@@ -29,7 +26,6 @@
 import org.apache.shale.dialog.config.ConfigurationInit;
 import org.apache.shale.test.base.AbstractJsfTestCase;
 import org.apache.shale.test.mock.MockNavigationHandler;
-import org.apache.shale.test.mock.MockPropertyResolver;
 
 /**
  * <p>Test case for {@link DialogNavigationHandler}.</p>

Modified: struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/impl/ImplClassesTestCase.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/impl/ImplClassesTestCase.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/impl/ImplClassesTestCase.java (original)
+++ struts/shale/trunk/core-library/src/test/org/apache/shale/dialog/impl/ImplClassesTestCase.java Mon Nov 14 23:24:49 2005
@@ -16,16 +16,14 @@
 
 package org.apache.shale.dialog.impl;
 
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import junit.framework.TestCase;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
 import org.apache.commons.chain.Command;
 import org.apache.commons.chain.Context;
 import org.apache.commons.chain.impl.ContextBase;
@@ -36,8 +34,6 @@
 import org.apache.shale.dialog.State;
 import org.apache.shale.dialog.config.ConfigurationInit;
 import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.MockNavigationHandler;
-import org.apache.shale.test.mock.MockPropertyResolver;
 
 /**
  * <p>Test case for implementation classes in package

Modified: struts/shale/trunk/core-library/src/test/org/apache/shale/util/LoadBundleTestCase.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/test/org/apache/shale/util/LoadBundleTestCase.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/test/org/apache/shale/util/LoadBundleTestCase.java (original)
+++ struts/shale/trunk/core-library/src/test/org/apache/shale/util/LoadBundleTestCase.java Mon Nov 14 23:24:49 2005
@@ -18,9 +18,12 @@
 
 import java.util.Locale;
 import java.util.Map;
+
 import javax.faces.context.FacesContext;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
 import org.apache.shale.test.base.AbstractJsfTestCase;
 
 /**

Modified: struts/shale/trunk/core-library/src/test/org/apache/shale/util/MessagesTestCase.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/test/org/apache/shale/util/MessagesTestCase.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/test/org/apache/shale/util/MessagesTestCase.java (original)
+++ struts/shale/trunk/core-library/src/test/org/apache/shale/util/MessagesTestCase.java Mon Nov 14 23:24:49 2005
@@ -17,9 +17,10 @@
 package org.apache.shale.util;
 
 import java.util.Locale;
-import javax.faces.context.FacesContext;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
 import org.apache.shale.test.base.AbstractJsfTestCase;
 
 /**

Modified: struts/shale/trunk/core-library/src/test/org/apache/shale/util/TokenProcessorTestCase.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/test/org/apache/shale/util/TokenProcessorTestCase.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/test/org/apache/shale/util/TokenProcessorTestCase.java (original)
+++ struts/shale/trunk/core-library/src/test/org/apache/shale/util/TokenProcessorTestCase.java Mon Nov 14 23:24:49 2005
@@ -19,9 +19,10 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
-import javax.faces.context.FacesContext;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
 import org.apache.shale.test.base.AbstractJsfTestCase;
 
 /**

Modified: struts/shale/trunk/core-library/src/test/org/apache/shale/view/ConcreteFacesBeanTestCase.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/test/org/apache/shale/view/ConcreteFacesBeanTestCase.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/core-library/src/test/org/apache/shale/view/ConcreteFacesBeanTestCase.java (original)
+++ struts/shale/trunk/core-library/src/test/org/apache/shale/view/ConcreteFacesBeanTestCase.java Mon Nov 14 23:24:49 2005
@@ -18,11 +18,14 @@
 
 import java.util.Iterator;
 import java.util.Map;
+
 import javax.faces.application.FacesMessage;
 import javax.faces.application.FacesMessage.Severity;
 import javax.faces.component.UIViewRoot;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
 import org.apache.shale.test.base.AbstractJsfTestCase;
 
 /**

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/base/AbstractJsfTestCase.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/base/AbstractJsfTestCase.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/base/AbstractJsfTestCase.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/base/AbstractJsfTestCase.java Mon Nov 14 23:24:49 2005
@@ -17,29 +17,16 @@
 package org.apache.shale.test.base;
 
 import javax.faces.FactoryFinder;
-import javax.faces.application.Application;
 import javax.faces.application.ApplicationFactory;
 import javax.faces.component.UIViewRoot;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.MethodNotFoundException;
-import javax.faces.el.PropertyNotFoundException;
-import javax.faces.el.ValueBinding;
 import javax.faces.lifecycle.LifecycleFactory;
-import javax.faces.render.RenderKit;
 import javax.faces.render.RenderKitFactory;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import junit.framework.TestCase;
 import junit.framework.Test;
+import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
 import org.apache.shale.test.mock.MockApplication;
-import org.apache.shale.test.mock.MockApplicationFactory;
 import org.apache.shale.test.mock.MockExternalContext;
 import org.apache.shale.test.mock.MockFacesContext;
 import org.apache.shale.test.mock.MockFacesContextFactory;
@@ -49,7 +36,6 @@
 import org.apache.shale.test.mock.MockLifecycle;
 import org.apache.shale.test.mock.MockLifecycleFactory;
 import org.apache.shale.test.mock.MockRenderKit;
-import org.apache.shale.test.mock.MockRenderKitFactory;
 import org.apache.shale.test.mock.MockServletConfig;
 import org.apache.shale.test.mock.MockServletContext;
 

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplication.java Mon Nov 14 23:24:49 2005
@@ -18,12 +18,10 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 import java.util.Locale;
+import java.util.Map;
 
 import javax.faces.FacesException;
 import javax.faces.application.Application;
@@ -31,19 +29,13 @@
 import javax.faces.application.StateManager;
 import javax.faces.application.ViewHandler;
 import javax.faces.component.UIComponent;
-import javax.faces.component.UISelectMany;
-import javax.faces.component.UISelectOne;
-import javax.faces.convert.Converter;
-import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
 import javax.faces.el.MethodBinding;
-import javax.faces.el.PropertyNotFoundException;
 import javax.faces.el.PropertyResolver;
 import javax.faces.el.ValueBinding;
 import javax.faces.el.VariableResolver;
 import javax.faces.event.ActionListener;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.PhaseId;
 import javax.faces.render.RenderKitFactory;
 import javax.faces.validator.Validator;
 

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplicationFactory.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplicationFactory.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplicationFactory.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplicationFactory.java Mon Nov 14 23:24:49 2005
@@ -16,7 +16,6 @@
 
 package org.apache.shale.test.mock;
 
-import javax.faces.FactoryFinder;
 import javax.faces.application.Application;
 import javax.faces.application.ApplicationFactory;
 

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplicationMap.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplicationMap.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplicationMap.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockApplicationMap.java Mon Nov 14 23:24:49 2005
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.servlet.ServletContext;
 
 /**

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockExternalContext.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockExternalContext.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockExternalContext.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockExternalContext.java Mon Nov 14 23:24:49 2005
@@ -20,7 +20,13 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.*;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 
 import javax.faces.FacesException;
 import javax.faces.context.ExternalContext;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockFacesContext.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockFacesContext.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockFacesContext.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockFacesContext.java Mon Nov 14 23:24:49 2005
@@ -21,11 +21,11 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 import javax.faces.FactoryFinder;
 import javax.faces.application.Application;
 import javax.faces.application.FacesMessage;
 import javax.faces.application.FacesMessage.Severity;
-import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockFacesContextFactory.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockFacesContextFactory.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockFacesContextFactory.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockFacesContextFactory.java Mon Nov 14 23:24:49 2005
@@ -17,9 +17,8 @@
 package org.apache.shale.test.mock;
 
 import javax.faces.FacesException;
-import javax.faces.FactoryFinder;
-import javax.faces.context.FacesContextFactory;
 import javax.faces.context.FacesContext;
+import javax.faces.context.FacesContextFactory;
 import javax.faces.lifecycle.Lifecycle;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockHttpServletResponse.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockHttpServletResponse.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockHttpServletResponse.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockHttpServletResponse.java Mon Nov 14 23:24:49 2005
@@ -18,7 +18,6 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.Writer;
 import java.util.Locale;
 
 import javax.servlet.ServletOutputStream;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockHttpSession.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockHttpSession.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockHttpSession.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockHttpSession.java Mon Nov 14 23:24:49 2005
@@ -18,6 +18,7 @@
 
 import java.util.Enumeration;
 import java.util.HashMap;
+
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionContext;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockLifecycleFactory.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockLifecycleFactory.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockLifecycleFactory.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockLifecycleFactory.java Mon Nov 14 23:24:49 2005
@@ -16,14 +16,12 @@
 
 package org.apache.shale.test.mock;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.faces.FactoryFinder;
-import javax.faces.lifecycle.LifecycleFactory;
 import javax.faces.lifecycle.Lifecycle;
+import javax.faces.lifecycle.LifecycleFactory;
 
 /**
  * <p>Mock implementation of <code>LifecycleFactory</code>.</p>

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockMethodBinding.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockMethodBinding.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockMethodBinding.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockMethodBinding.java Mon Nov 14 23:24:49 2005
@@ -18,23 +18,16 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import javax.faces.FacesException;
+
 import javax.faces.application.Application;
-import javax.faces.context.ExternalContext;
+import javax.faces.component.StateHolder;
+import javax.faces.component.UIComponentBase;
 import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.MethodBinding;
 import javax.faces.el.MethodNotFoundException;
-import javax.faces.el.PropertyNotFoundException;
-import javax.faces.el.PropertyResolver;
 import javax.faces.el.ReferenceSyntaxException;
 import javax.faces.el.ValueBinding;
-import javax.faces.el.VariableResolver;
-import javax.faces.component.StateHolder;
-import javax.faces.component.UIComponentBase;
 
 /**
  * <p>Mock implementation of <code>MethodBinding</code>.</p>

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockNavigationHandler.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockNavigationHandler.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockNavigationHandler.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockNavigationHandler.java Mon Nov 14 23:24:49 2005
@@ -18,6 +18,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.faces.application.NavigationHandler;
 import javax.faces.application.ViewHandler;
 import javax.faces.component.UIViewRoot;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockPropertyResolver.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockPropertyResolver.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockPropertyResolver.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockPropertyResolver.java Mon Nov 14 23:24:49 2005
@@ -18,9 +18,11 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
+
 import javax.faces.el.EvaluationException;
 import javax.faces.el.PropertyNotFoundException;
 import javax.faces.el.PropertyResolver;
+
 import org.apache.commons.beanutils.PropertyUtils;
 
 /**

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRenderKit.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRenderKit.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRenderKit.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRenderKit.java Mon Nov 14 23:24:49 2005
@@ -16,23 +16,16 @@
 
 package org.apache.shale.test.mock;
 
+import java.io.OutputStream;
+import java.io.Writer;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.component.UIData;
-import javax.faces.component.UIOutput;
-import javax.faces.component.UIPanel;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
+
 import javax.faces.context.ResponseStream;
-import javax.faces.render.Renderer;
+import javax.faces.context.ResponseWriter;
 import javax.faces.render.RenderKit;
+import javax.faces.render.Renderer;
 import javax.faces.render.ResponseStateManager;
-import java.io.Writer;
-import java.io.OutputStream;
-import java.io.IOException;
 
 /**
  * <p>Mock implementation of <code>RenderKit</code>.</p>

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRenderKitFactory.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRenderKitFactory.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRenderKitFactory.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRenderKitFactory.java Mon Nov 14 23:24:49 2005
@@ -19,8 +19,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import javax.faces.FacesException;
-import javax.faces.FactoryFinder;
+
 import javax.faces.context.FacesContext;
 import javax.faces.render.RenderKit;
 import javax.faces.render.RenderKitFactory;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRequestMap.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRequestMap.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRequestMap.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockRequestMap.java Mon Nov 14 23:24:49 2005
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.servlet.http.HttpServletRequest;
 
 /**

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServlet.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServlet.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServlet.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServlet.java Mon Nov 14 23:24:49 2005
@@ -17,6 +17,7 @@
 package org.apache.shale.test.mock;
 
 import java.io.IOException;
+
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServletConfig.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServletConfig.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServletConfig.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServletConfig.java Mon Nov 14 23:24:49 2005
@@ -16,9 +16,9 @@
 
 package org.apache.shale.test.mock;
 
-import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServletContext.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServletContext.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServletContext.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockServletContext.java Mon Nov 14 23:24:49 2005
@@ -17,13 +17,14 @@
 package org.apache.shale.test.mock;
 
 import java.io.File;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Set;
+
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockSessionMap.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockSessionMap.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockSessionMap.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockSessionMap.java Mon Nov 14 23:24:49 2005
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.servlet.http.HttpSession;
 
 

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockStateManager.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockStateManager.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockStateManager.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockStateManager.java Mon Nov 14 23:24:49 2005
@@ -17,6 +17,7 @@
 package org.apache.shale.test.mock;
 
 import java.io.IOException;
+
 import javax.faces.application.StateManager;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockValueBinding.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockValueBinding.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockValueBinding.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockValueBinding.java Mon Nov 14 23:24:49 2005
@@ -16,10 +16,10 @@
 
 package org.apache.shale.test.mock;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import javax.faces.application.Application;
 import javax.faces.component.StateHolder;
 import javax.faces.context.ExternalContext;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockVariableResolver.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockVariableResolver.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockVariableResolver.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockVariableResolver.java Mon Nov 14 23:24:49 2005
@@ -17,6 +17,7 @@
 package org.apache.shale.test.mock;
 
 import java.util.Map;
+
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.el.VariableResolver;

Modified: struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockViewHandler.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockViewHandler.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockViewHandler.java (original)
+++ struts/shale/trunk/test-framework/src/java/org/apache/shale/test/mock/MockViewHandler.java Mon Nov 14 23:24:49 2005
@@ -17,6 +17,7 @@
 package org.apache.shale.test.mock;
 
 import java.util.Locale;
+
 import javax.faces.application.ViewHandler;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;

Modified: struts/shale/trunk/test-framework/src/test/org/apache/shale/test/mock/MockObjectsTestCase.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/src/test/org/apache/shale/test/mock/MockObjectsTestCase.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/src/test/org/apache/shale/test/mock/MockObjectsTestCase.java (original)
+++ struts/shale/trunk/test-framework/src/test/org/apache/shale/test/mock/MockObjectsTestCase.java Mon Nov 14 23:24:49 2005
@@ -16,18 +16,9 @@
 
 package org.apache.shale.test.mock;
 
-import javax.faces.FactoryFinder;
-import javax.faces.application.Application;
-import javax.faces.application.ApplicationFactory;
-import javax.faces.component.UIViewRoot;
 import javax.faces.el.MethodBinding;
-import javax.faces.el.MethodNotFoundException;
-import javax.faces.el.PropertyNotFoundException;
 import javax.faces.el.ValueBinding;
-import javax.faces.render.RenderKit;
-import javax.faces.render.RenderKitFactory;
 
-import junit.framework.TestCase;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 

Modified: struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/locale/SelectTestCase.java
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/locale/SelectTestCase.java?rev=344322&r1=344321&r2=344322&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/locale/SelectTestCase.java (original)
+++ struts/shale/trunk/use-cases/src/test/org/apache/shale/usecases/locale/SelectTestCase.java Mon Nov 14 23:24:49 2005
@@ -19,9 +19,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import junit.framework.TestCase;
+
 import junit.framework.Test;
 import junit.framework.TestSuite;
+
 import org.apache.shale.test.base.AbstractViewControllerTestCase;
 
 /**



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org