You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sl...@apache.org on 2008/08/29 00:42:01 UTC

svn commit: r690034 [2/3] - in /myfaces/core/branches/2_0_0: api/src/main/java/javax/faces/ api/src/main/java/javax/faces/application/ api/src/main/java/javax/faces/component/ api/src/main/java/javax/faces/context/ api/src/main/java/javax/faces/el/ api...

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentBaseValueBindingTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentBaseValueBindingTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentBaseValueBindingTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentBaseValueBindingTest.java Thu Aug 28 15:41:56 2008
@@ -1,5 +1,12 @@
 package javax.faces.component;
 
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
 import java.lang.reflect.Method;
 import java.util.Collection;
 
@@ -7,9 +14,7 @@
 import javax.faces.el.ValueBinding;
 
 import org.easymock.EasyMock;
-import static org.easymock.EasyMock.*;
 import org.easymock.IAnswer;
-import static org.testng.Assert.*;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentEncodeAllTest.java Thu Aug 28 15:41:56 2008
@@ -1,17 +1,17 @@
 package javax.faces.component;
 
 import java.lang.reflect.Method;
-import java.util.Collection;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.faces.context.FacesContext;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import org.apache.myfaces.TestRunner;
 import org.apache.myfaces.Assert;
+import org.apache.myfaces.TestRunner;
 import org.easymock.EasyMock;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 /**
      * Tests for {@link UIComponent#encodeAll(javax.faces.context.FacesContext)}.

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentFindComponentTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentFindComponentTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentFindComponentTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentFindComponentTest.java Thu Aug 28 15:41:56 2008
@@ -1,13 +1,15 @@
 package javax.faces.component;
 
+import static org.easymock.EasyMock.expect;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 
 import org.easymock.EasyMock;
-import static org.easymock.EasyMock.*;
-import static org.testng.Assert.*;
 import org.testng.annotations.Test;
 
 /**

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentInvokeOnComponentTest.java Thu Aug 28 15:41:56 2008
@@ -1,18 +1,18 @@
 package javax.faces.component;
 
 import java.lang.reflect.Method;
-import java.util.Collection;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 
-import javax.faces.context.FacesContext;
 import javax.faces.FacesException;
+import javax.faces.context.FacesContext;
 
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-import org.testng.Assert;
 import org.apache.myfaces.TestRunner;
 import org.easymock.EasyMock;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 /**
      * Tests for

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentTest.java Thu Aug 28 15:41:56 2008
@@ -18,19 +18,20 @@
  */
 package javax.faces.component;
 
+import static org.apache.myfaces.Assert.assertException;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.same;
+import static org.testng.Assert.assertEquals;
+
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.el.ValueExpression;
 import javax.faces.context.FacesContext;
 
-import static org.apache.myfaces.Assert.*;
 import org.apache.myfaces.TestRunner;
-import static org.easymock.EasyMock.*;
-import static org.testng.Assert.*;
 import org.testng.annotations.Test;
 
 /**

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentValueExpressionTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentValueExpressionTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentValueExpressionTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIComponentValueExpressionTest.java Thu Aug 28 15:41:56 2008
@@ -1,6 +1,8 @@
 package javax.faces.component;
 import static org.easymock.EasyMock.expect;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIDataTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIDataTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIDataTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIDataTest.java Thu Aug 28 15:41:56 2008
@@ -49,7 +49,7 @@
 
     /**
      * Test method for
-     * {@link javax.faces.component.UIData#setValueExpression(java.lang.String, javax.el.ValueExpression)}.
+     * {@link javax.faces.component.UIData#setValueExpression(String, javax.el.ValueExpression)}.
      */
     public void testValueExpression()
     {
@@ -83,7 +83,7 @@
 
     /**
      * Test method for
-     * {@link javax.faces.component.UIData#invokeOnComponent(javax.faces.context.FacesContext, java.lang.String, javax.faces.component.ContextCallback)}.
+     * {@link javax.faces.component.UIData#invokeOnComponent(javax.faces.context.FacesContext, String, javax.faces.component.ContextCallback)}.
      */
     public void testInvokeOnComponentFacesContextStringContextCallback()
     {
@@ -156,7 +156,7 @@
 
     /**
      * Test method for
-     * {@link javax.faces.component.UIData#restoreState(javax.faces.context.FacesContext, java.lang.Object)}.
+     * {@link javax.faces.component.UIData#restoreState(javax.faces.context.FacesContext, Object)}.
      */
     public void testRestoreState()
     {
@@ -260,7 +260,7 @@
     }
 
     /**
-     * Test method for {@link javax.faces.component.UIData#setValue(java.lang.Object)}.
+     * Test method for {@link javax.faces.component.UIData#setValue(Object)}.
      */
     public void testSetValue()
     {
@@ -300,7 +300,7 @@
     }
 
     /**
-     * Test method for {@link javax.faces.component.UIData#setVar(java.lang.String)}.
+     * Test method for {@link javax.faces.component.UIData#setVar(String)}.
      */
     public void testSetVar()
     {

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIViewRootTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIViewRootTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIViewRootTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/UIViewRootTest.java Thu Aug 28 15:41:56 2008
@@ -18,16 +18,24 @@
  */
 package javax.faces.component;
 
-import org.apache.myfaces.TestRunner;
-import org.apache.shale.test.mock.MockFacesContext12;
-import static org.easymock.EasyMock.*;
-import org.easymock.IAnswer;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
-import static org.testng.Assert.*;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.aryEq;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.getCurrentArguments;
+import static org.easymock.EasyMock.same;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.fail;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
 
 import javax.el.ELContext;
 import javax.el.MethodExpression;
@@ -35,12 +43,23 @@
 import javax.faces.application.Application;
 import javax.faces.application.ViewHandler;
 import javax.faces.context.ExternalContext;
-import javax.faces.event.*;
+import javax.faces.event.AbortProcessingException;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
 import javax.faces.lifecycle.Lifecycle;
 import javax.faces.lifecycle.LifecycleFactory;
 import javax.faces.webapp.FacesServlet;
-import java.lang.reflect.Method;
-import java.util.*;
+
+import org.apache.myfaces.TestRunner;
+import org.apache.shale.test.mock.MockFacesContext12;
+import org.easymock.IAnswer;
+import org.easymock.classextension.EasyMock;
+import org.easymock.classextension.IMocksControl;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 /**
  * @author Mathias Broekelmann (latest modification by $Author$)
@@ -297,7 +316,7 @@
     //
     // /**
     // * Test method for
-    // * {@link javax.faces.component.UIViewRoot#restoreState(javax.faces.context.FacesContext, java.lang.Object)}.
+    // * {@link javax.faces.component.UIViewRoot#restoreState(javax.faces.context.FacesContext, Object)}.
     // */
     // public void testRestoreState()
     // {
@@ -330,7 +349,7 @@
     // }
     //
     // /**
-    // * Test method for {@link javax.faces.component.UIViewRoot#setRenderKitId(java.lang.String)}.
+    // * Test method for {@link javax.faces.component.UIViewRoot#setRenderKitId(String)}.
     // */
     // public void testSetRenderKitId()
     // {
@@ -346,7 +365,7 @@
     // }
     //
     // /**
-    // * Test method for {@link javax.faces.component.UIViewRoot#setViewId(java.lang.String)}.
+    // * Test method for {@link javax.faces.component.UIViewRoot#setViewId(String)}.
     // */
     // public void testSetViewId()
     // {

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_MethodBindingToMethodExpressionTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_MethodBindingToMethodExpressionTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_MethodBindingToMethodExpressionTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_MethodBindingToMethodExpressionTest.java Thu Aug 28 15:41:56 2008
@@ -149,7 +149,7 @@
 
     /**
      * Test method for
-     * {@link javax.faces.component._MethodBindingToMethodExpression#invoke(javax.el.ELContext, java.lang.Object[])}.
+     * {@link javax.faces.component._MethodBindingToMethodExpression#invoke(javax.el.ELContext, Object[])}.
      */
     public void testInvoke()
     {
@@ -196,7 +196,7 @@
 
     /**
      * Test method for
-     * {@link javax.faces.component._MethodBindingToMethodExpression#restoreState(javax.faces.context.FacesContext, java.lang.Object)}.
+     * {@link javax.faces.component._MethodBindingToMethodExpression#restoreState(javax.faces.context.FacesContext, Object)}.
      * 
      * @throws Exception
      */

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_ValueBindingToValueExpressionTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_ValueBindingToValueExpressionTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_ValueBindingToValueExpressionTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_ValueBindingToValueExpressionTest.java Thu Aug 28 15:41:56 2008
@@ -75,7 +75,7 @@
     }
 
     /**
-     * Test method for {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#equals(java.lang.Object)}.
+     * Test method for {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#equals(Object)}.
      */
     public void testEqualsObject()
     {
@@ -204,7 +204,7 @@
 
     /**
      * Test method for
-     * {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#setValue(javax.el.ELContext, java.lang.Object)}.
+     * {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#setValue(javax.el.ELContext, Object)}.
      */
     public void testSetValueELContextObject()
     {
@@ -218,7 +218,7 @@
 
     /**
      * Test method for
-     * {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#setValue(javax.el.ELContext, java.lang.Object)}.
+     * {@link org.apache.myfaces.el.convert.ValueBindingToValueExpression#setValue(javax.el.ELContext, Object)}.
      */
     public void testSetValueELContextObjectExceptions() throws Exception
     {

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java Thu Aug 28 15:41:56 2008
@@ -226,7 +226,7 @@
 
     /**
      * Test method for
-     * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, java.lang.Object)}.
+     * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, Object)}.
      */
     public void testSetValue()
     {
@@ -240,7 +240,7 @@
 
     /**
      * Test method for
-     * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, java.lang.Object)}.
+     * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, Object)}.
      */
     public void testSetValueExceptions()
     {

Modified: myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/validator/_MessageUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/validator/_MessageUtilsTest.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/validator/_MessageUtilsTest.java (original)
+++ myfaces/core/branches/2_0_0/api/src/test/java/javax/faces/validator/_MessageUtilsTest.java Thu Aug 28 15:41:56 2008
@@ -44,7 +44,7 @@
 
     /**
      * Test method for
-     * {@link javax.faces.validator._MessageUtils#getErrorMessage(javax.faces.context.FacesContext, java.lang.String, java.lang.Object[])}.
+     * {@link javax.faces.validator._MessageUtils#getErrorMessage(javax.faces.context.FacesContext, String, Object[])}.
      */
     @Test
     public void testErrorMessage()

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationFactoryImpl.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationFactoryImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationFactoryImpl.java Thu Aug 28 15:41:56 2008
@@ -18,12 +18,12 @@
  */
 package org.apache.myfaces.application;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import javax.faces.application.Application;
 import javax.faces.application.ApplicationFactory;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 /**
  * @author Manfred Geiler (latest modification by $Author$)
  * @author Thomas Spiegl

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java Thu Aug 28 15:41:56 2008
@@ -753,7 +753,7 @@
         String converterClassName = _converterClassNameToClassMap.get(targetClass);
 
         // Get EnumConverter for enum classes with no special converter, check
-        // here as recursive call with java.lang.Enum will not work
+        // here as recursive call with Enum will not work
         if (converterClassName == null && targetClass.isEnum()) {
             converterClassName = _converterClassNameToClassMap.get(Enum.class);
         }

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java Thu Aug 28 15:41:56 2008
@@ -18,13 +18,14 @@
  */
 package org.apache.myfaces.application;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.Map;
 
 import javax.faces.application.ViewHandler;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
-import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * A ViewHandlerSupport implementation for use with standard Java Servlet engines,

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/MyfacesStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/MyfacesStateManager.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/MyfacesStateManager.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/MyfacesStateManager.java Thu Aug 28 15:41:56 2008
@@ -18,9 +18,10 @@
  */
 package org.apache.myfaces.application;
 
+import java.io.IOException;
+
 import javax.faces.application.StateManager;
 import javax.faces.context.FacesContext;
-import java.io.IOException;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/TreeStructureManager.java Thu Aug 28 15:41:56 2008
@@ -18,16 +18,17 @@
  */
 package org.apache.myfaces.application;
 
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIViewRoot;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
+
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+
 /**
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspStateManagerImpl.java Thu Aug 28 15:41:56 2008
@@ -18,15 +18,25 @@
  */
 package org.apache.myfaces.application.jsp;
 
-import org.apache.commons.collections.map.AbstractReferenceMap;
-import org.apache.commons.collections.map.ReferenceMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.application.MyfacesStateManager;
-import org.apache.myfaces.application.TreeStructureManager;
-import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
-import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
-import org.apache.myfaces.shared_impl.util.MyFacesObjectInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 import javax.faces.FactoryFinder;
 import javax.faces.component.NamingContainer;
@@ -37,11 +47,16 @@
 import javax.faces.render.RenderKit;
 import javax.faces.render.RenderKitFactory;
 import javax.faces.render.ResponseStateManager;
-import java.io.*;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
+
+import org.apache.commons.collections.map.AbstractReferenceMap;
+import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.application.MyfacesStateManager;
+import org.apache.myfaces.application.TreeStructureManager;
+import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
+import org.apache.myfaces.shared_impl.renderkit.RendererUtils;
+import org.apache.myfaces.shared_impl.util.MyFacesObjectInputStream;
 
 /**
  * Default StateManager implementation for use when views are defined

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/JspViewHandlerImpl.java Thu Aug 28 15:41:56 2008
@@ -18,13 +18,11 @@
  */
 package org.apache.myfaces.application.jsp;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.application.DefaultViewHandlerSupport;
-import org.apache.myfaces.application.InvalidViewIdException;
-import org.apache.myfaces.application.ViewHandlerSupport;
-import org.apache.myfaces.shared_impl.config.MyfacesConfig;
-import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.Locale;
 
 import javax.faces.FacesException;
 import javax.faces.FactoryFinder;
@@ -44,11 +42,14 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.servlet.jsp.jstl.core.Config;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.Locale;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.application.DefaultViewHandlerSupport;
+import org.apache.myfaces.application.InvalidViewIdException;
+import org.apache.myfaces.application.ViewHandlerSupport;
+import org.apache.myfaces.shared_impl.config.MyfacesConfig;
+import org.apache.myfaces.shared_impl.renderkit.html.util.JavascriptUtils;
 
 /**
  * Implementation of the ViewHandler interface that knows how to use JSP pages

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/application/jsp/ViewResponseWrapper.java Thu Aug 28 15:41:56 2008
@@ -18,15 +18,20 @@
  */
 package org.apache.myfaces.application.jsp;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+
 /**
  * @author Bruno Aranda (latest modification by $Author$)
  * @version $Revision$ $Date$

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigDispenser.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigDispenser.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigDispenser.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigDispenser.java Thu Aug 28 15:41:56 2008
@@ -18,16 +18,16 @@
  */
 package org.apache.myfaces.config;
 
+import java.util.Iterator;
+
+import javax.el.ELResolver;
+
 import org.apache.myfaces.config.element.ManagedBean;
 import org.apache.myfaces.config.element.NavigationRule;
 import org.apache.myfaces.config.element.Renderer;
 import org.apache.myfaces.config.impl.digester.elements.Converter;
 import org.apache.myfaces.config.impl.digester.elements.ResourceBundle;
 
-import javax.el.ELResolver;
-
-import java.util.Iterator;
-
 /**
  * Subsumes several unmarshalled faces config objects and presents a simple interface
  * to the combined configuration data.

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigUnmarshaller.java Thu Aug 28 15:41:56 2008
@@ -18,8 +18,8 @@
  */
 package org.apache.myfaces.config;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 import org.xml.sax.SAXException;
 

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java Thu Aug 28 15:41:56 2008
@@ -18,6 +18,45 @@
  */
 package org.apache.myfaces.config;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLConnection;
+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 java.util.StringTokenizer;
+import java.util.TreeMap;
+
+import javax.el.ELResolver;
+import javax.faces.FacesException;
+import javax.faces.FactoryFinder;
+import javax.faces.application.Application;
+import javax.faces.application.ApplicationFactory;
+import javax.faces.application.NavigationHandler;
+import javax.faces.application.StateManager;
+import javax.faces.application.ViewHandler;
+import javax.faces.context.ExternalContext;
+import javax.faces.el.PropertyResolver;
+import javax.faces.el.VariableResolver;
+import javax.faces.event.ActionListener;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+import javax.faces.lifecycle.LifecycleFactory;
+import javax.faces.render.RenderKit;
+import javax.faces.render.RenderKitFactory;
+import javax.faces.webapp.FacesServlet;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.application.ApplicationFactoryImpl;
@@ -42,28 +81,6 @@
 import org.apache.myfaces.shared_impl.util.serial.SerialFactory;
 import org.xml.sax.SAXException;
 
-import javax.el.ELResolver;
-import javax.faces.FacesException;
-import javax.faces.FactoryFinder;
-import javax.faces.application.*;
-import javax.faces.context.ExternalContext;
-import javax.faces.el.PropertyResolver;
-import javax.faces.el.VariableResolver;
-import javax.faces.event.ActionListener;
-import javax.faces.event.PhaseListener;
-import javax.faces.lifecycle.Lifecycle;
-import javax.faces.lifecycle.LifecycleFactory;
-import javax.faces.render.RenderKit;
-import javax.faces.render.RenderKitFactory;
-import javax.faces.webapp.FacesServlet;
-import java.io.*;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.*;
-
 /**
  * Configures everything for a given context. The FacesConfigurator is independent of the concrete implementations that
  * lie behind FacesConfigUnmarshaller and FacesConfigDispenser.

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/LastVariableResolverInChain.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/LastVariableResolverInChain.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/LastVariableResolverInChain.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/LastVariableResolverInChain.java Thu Aug 28 15:41:56 2008
@@ -18,9 +18,9 @@
  */
 package org.apache.myfaces.config;
 
-import javax.faces.el.VariableResolver;
-import javax.faces.el.EvaluationException;
 import javax.faces.context.FacesContext;
+import javax.faces.el.EvaluationException;
+import javax.faces.el.VariableResolver;
 
 /**
  * Represents the last Variable resolver in the chain - is added to be able to

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java Thu Aug 28 15:41:56 2008
@@ -40,8 +40,8 @@
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.config.annotation.LifecycleProviderFactory;
 import org.apache.myfaces.config.annotation.LifecycleProvider;
+import org.apache.myfaces.config.annotation.LifecycleProviderFactory;
 import org.apache.myfaces.config.element.ListEntries;
 import org.apache.myfaces.config.element.ListEntry;
 import org.apache.myfaces.config.element.ManagedBean;

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AllAnnotationLifecycleProvider.java Thu Aug 28 15:41:56 2008
@@ -18,18 +18,17 @@
  */
 package org.apache.myfaces.config.annotation;
 
-import javax.naming.NamingException;
-import javax.naming.Context;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 import javax.annotation.Resource;
 import javax.ejb.EJB;
+import javax.naming.Context;
+import javax.naming.NamingException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceUnit;
 
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Field;
-
 // TODO @EJBs
 public class AllAnnotationLifecycleProvider extends ResourceAnnotationLifecycleProvider
 {

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/DefaultLifecycleProviderFactory.java Thu Aug 28 15:41:56 2008
@@ -18,19 +18,20 @@
  */
 package org.apache.myfaces.config.annotation;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.discovery.resource.ClassLoaders;
-import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
-import org.apache.commons.discovery.ResourceNameIterator;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 
 import javax.faces.context.ExternalContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Constructor;
+
+import org.apache.commons.discovery.ResourceNameIterator;
+import org.apache.commons.discovery.resource.ClassLoaders;
+import org.apache.commons.discovery.resource.names.DiscoverServiceNames;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
 
 /*
  * Date: Mar 12, 2007

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/LifecycleProviderFactory.java Thu Aug 28 15:41:56 2008
@@ -18,11 +18,10 @@
  */
 package org.apache.myfaces.config.annotation;
 
-import org.apache.commons.discovery.tools.DiscoverSingleton;
-
-
 import javax.faces.context.ExternalContext;
 
+import org.apache.commons.discovery.tools.DiscoverSingleton;
+
 
 public abstract class LifecycleProviderFactory {
     protected static final String FACTORY_DEFAULT = DefaultLifecycleProviderFactory.class.getName();

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoAnnotationLifecyleProvider.java Thu Aug 28 15:41:56 2008
@@ -18,10 +18,10 @@
  */
 package org.apache.myfaces.config.annotation;
 
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-
 import java.lang.reflect.InvocationTargetException;
 
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+
 public class NoAnnotationLifecyleProvider implements LifecycleProvider
 {
 

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/NoInjectionAnnotationLifecycleProvider.java Thu Aug 28 15:41:56 2008
@@ -18,14 +18,15 @@
  */
 package org.apache.myfaces.config.annotation;
 
-import org.apache.myfaces.shared_impl.util.ClassUtils;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.naming.NamingException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+
+import org.apache.myfaces.shared_impl.util.ClassUtils;
 
 /**
  * See SRV.14.5 Servlet Specification Version 2.5 JSR 154

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/ResourceAnnotationLifecycleProvider.java Thu Aug 28 15:41:56 2008
@@ -18,12 +18,13 @@
  */
 package org.apache.myfaces.config.annotation;
 
-import javax.naming.NamingException;
-import javax.naming.Context;
-import javax.annotation.Resource;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import javax.annotation.Resource;
+import javax.naming.Context;
+import javax.naming.NamingException;
 
 // TODO @Resources
 public class ResourceAnnotationLifecycleProvider extends NoInjectionAnnotationLifecycleProvider

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/TomcatAnnotationLifecycleProvider.java Thu Aug 28 15:41:56 2008
@@ -18,14 +18,15 @@
  */
 package org.apache.myfaces.config.annotation;
 
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.lang.reflect.InvocationTargetException;
 
-import javax.naming.NamingException;
 import javax.faces.context.ExternalContext;
+import javax.naming.NamingException;
 import javax.servlet.ServletContext;
-import java.lang.reflect.InvocationTargetException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
 
 public class TomcatAnnotationLifecycleProvider implements DiscoverableLifecycleProvider
 {

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedBean.java Thu Aug 28 15:41:56 2008
@@ -20,8 +20,6 @@
 
 import java.util.Iterator;
 
-import org.apache.myfaces.config.element.ListEntries;
-
 /**
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/element/ManagedProperty.java Thu Aug 28 15:41:56 2008
@@ -21,8 +21,6 @@
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
-import org.apache.myfaces.config.element.ListEntries;
-
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/FacesConfigEntityResolver.java Thu Aug 28 15:41:56 2008
@@ -18,20 +18,20 @@
  */
 package org.apache.myfaces.config.impl;
 
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.faces.context.ExternalContext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.JarURLConnection;
 import java.net.URL;
 import java.util.jar.JarEntry;
 
+import javax.faces.context.ExternalContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+
 /**
  * DOCUMENT ME!
  * @author Manfred Geiler (latest modification by $Author$)

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigDispenserImpl.java Thu Aug 28 15:41:56 2008
@@ -18,6 +18,16 @@
  */
 package org.apache.myfaces.config.impl.digester;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.render.RenderKitFactory;
+
 import org.apache.myfaces.config.FacesConfigDispenser;
 import org.apache.myfaces.config.element.ManagedBean;
 import org.apache.myfaces.config.element.NavigationRule;
@@ -30,16 +40,6 @@
 import org.apache.myfaces.config.impl.digester.elements.RenderKit;
 import org.apache.myfaces.config.impl.digester.elements.ResourceBundle;
 
-import javax.faces.render.RenderKitFactory;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>
  */

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java Thu Aug 28 15:41:56 2008
@@ -21,12 +21,28 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
+
 import javax.faces.context.ExternalContext;
 
+import org.apache.commons.digester.Digester;
 import org.apache.myfaces.config.FacesConfigUnmarshaller;
-import org.apache.myfaces.config.impl.digester.elements.*;
 import org.apache.myfaces.config.impl.FacesConfigEntityResolver;
-import org.apache.commons.digester.Digester;
+import org.apache.myfaces.config.impl.digester.elements.Application;
+import org.apache.myfaces.config.impl.digester.elements.Attribute;
+import org.apache.myfaces.config.impl.digester.elements.Converter;
+import org.apache.myfaces.config.impl.digester.elements.FacesConfig;
+import org.apache.myfaces.config.impl.digester.elements.Factory;
+import org.apache.myfaces.config.impl.digester.elements.ListEntries;
+import org.apache.myfaces.config.impl.digester.elements.LocaleConfig;
+import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
+import org.apache.myfaces.config.impl.digester.elements.ManagedProperty;
+import org.apache.myfaces.config.impl.digester.elements.MapEntries;
+import org.apache.myfaces.config.impl.digester.elements.NavigationCase;
+import org.apache.myfaces.config.impl.digester.elements.NavigationRule;
+import org.apache.myfaces.config.impl.digester.elements.Property;
+import org.apache.myfaces.config.impl.digester.elements.RenderKit;
+import org.apache.myfaces.config.impl.digester.elements.Renderer;
+import org.apache.myfaces.config.impl.digester.elements.ResourceBundle;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Attribute.java Thu Aug 28 15:41:56 2008
@@ -18,10 +18,10 @@
  */
 package org.apache.myfaces.config.impl.digester.elements;
 
-import java.util.List;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * @author Martin Marinschek

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Converter.java Thu Aug 28 15:41:56 2008
@@ -19,9 +19,9 @@
 package org.apache.myfaces.config.impl.digester.elements;
 
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
 import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 
 /**

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ListEntries.java Thu Aug 28 15:41:56 2008
@@ -19,8 +19,8 @@
 package org.apache.myfaces.config.impl.digester.elements;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Iterator;
+import java.util.List;
 
 
 /**

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedBean.java Thu Aug 28 15:41:56 2008
@@ -18,12 +18,12 @@
  */
 package org.apache.myfaces.config.impl.digester.elements;
 
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+
 
 /**
  * @author <a href="mailto:oliver@rossmueller.com">Oliver Rossmueller</a>

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/ManagedProperty.java Thu Aug 28 15:41:56 2008
@@ -21,7 +21,6 @@
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 
-import org.apache.myfaces.config.impl.digester.elements.ListEntries;
 import org.apache.myfaces.util.ContainerUtils;
 
 

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/MapEntries.java Thu Aug 28 15:41:56 2008
@@ -19,8 +19,8 @@
 package org.apache.myfaces.config.impl.digester.elements;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Iterator;
+import java.util.List;
 
 
 /**

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/NavigationRule.java Thu Aug 28 15:41:56 2008
@@ -19,10 +19,8 @@
 package org.apache.myfaces.config.impl.digester.elements;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collection;
-
-import org.apache.myfaces.config.impl.digester.elements.NavigationCase;
+import java.util.List;
 
 
 /**

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Property.java Thu Aug 28 15:41:56 2008
@@ -18,10 +18,10 @@
  */
 package org.apache.myfaces.config.impl.digester.elements;
 
-import java.util.List;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * @author Martin Marinschek

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java Thu Aug 28 15:41:56 2008
@@ -18,8 +18,6 @@
  */
 package org.apache.myfaces.context;
 
-import org.apache.myfaces.context.servlet.FacesContextImpl;
-
 import javax.faces.FacesException;
 import javax.faces.context.FacesContext;
 import javax.faces.context.FacesContextFactory;
@@ -31,6 +29,8 @@
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+import org.apache.myfaces.context.servlet.FacesContextImpl;
+
 /**
  * DOCUMENT ME!
  * @author Manfred Geiler (latest modification by $Author$)

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/FacesContextWrapper.java Thu Aug 28 15:41:56 2008
@@ -18,6 +18,8 @@
  */
 package org.apache.myfaces.context;
 
+import java.util.Iterator;
+
 import javax.el.ELContext;
 import javax.faces.application.Application;
 import javax.faces.application.FacesMessage;
@@ -28,7 +30,6 @@
 import javax.faces.context.ResponseStream;
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.RenderKit;
-import java.util.Iterator;
 
 
 /**

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/ApplicationMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/ApplicationMap.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/ApplicationMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/ApplicationMap.java Thu Aug 28 15:41:56 2008
@@ -20,6 +20,7 @@
 
 import java.util.Enumeration;
 import java.util.Map;
+
 import javax.portlet.PortletContext;
 
 import org.apache.myfaces.util.AbstractAttributeMap;

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java Thu Aug 28 15:41:56 2008
@@ -405,7 +405,7 @@
      * @param request
      */
     @Override
-    public void setRequest(java.lang.Object request)
+    public void setRequest(Object request)
     {
         this._portletRequest = (PortletRequest) request;
         this._actionRequest = isActionRequest(_portletRequest) ? (ActionRequest) request : null;
@@ -416,7 +416,7 @@
      * @param encoding
      * @throws java.io.UnsupportedEncodingException
      */
-    public void setRequestCharacterEncoding(java.lang.String encoding)
+    public void setRequestCharacterEncoding(String encoding)
         throws java.io.UnsupportedEncodingException{
       
         if(_actionRequest != null)
@@ -445,7 +445,7 @@
      * @param response
      */
     @Override
-    public void setResponse(java.lang.Object response)
+    public void setResponse(Object response)
     {
         this._portletResponse = (PortletResponse) response;
     }
@@ -455,7 +455,7 @@
      * @param encoding
      */
     @Override
-    public void setResponseCharacterEncoding(java.lang.String encoding)
+    public void setResponseCharacterEncoding(String encoding)
     {
         // nope!
     }

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestHeaderMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestHeaderMap.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestHeaderMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestHeaderMap.java Thu Aug 28 15:41:56 2008
@@ -20,6 +20,7 @@
 
 import java.util.Enumeration;
 import java.util.Map;
+
 import javax.portlet.PortletRequest;
 
 import org.apache.myfaces.util.AbstractAttributeMap;

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestMap.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestMap.java Thu Aug 28 15:41:56 2008
@@ -20,6 +20,7 @@
 
 import java.util.Enumeration;
 import java.util.Map;
+
 import javax.portlet.PortletRequest;
 
 import org.apache.myfaces.util.AbstractAttributeMap;

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterMap.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterMap.java Thu Aug 28 15:41:56 2008
@@ -19,6 +19,7 @@
 package org.apache.myfaces.context.portlet;
 
 import java.util.Enumeration;
+
 import javax.portlet.PortletRequest;
 
 import org.apache.myfaces.util.AbstractAttributeMap;

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/RequestParameterValuesMap.java Thu Aug 28 15:41:56 2008
@@ -19,6 +19,7 @@
 package org.apache.myfaces.context.portlet;
 
 import java.util.Enumeration;
+
 import javax.portlet.PortletRequest;
 
 import org.apache.myfaces.util.AbstractAttributeMap;

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/SessionMap.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/SessionMap.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/SessionMap.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/portlet/SessionMap.java Thu Aug 28 15:41:56 2008
@@ -18,14 +18,15 @@
  */
 package org.apache.myfaces.context.portlet;
 
-import org.apache.myfaces.shared_impl.util.NullEnumeration;
-import org.apache.myfaces.util.AbstractAttributeMap;
-
 import java.util.Enumeration;
 import java.util.Map;
+
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletSession;
 
+import org.apache.myfaces.shared_impl.util.NullEnumeration;
+import org.apache.myfaces.util.AbstractAttributeMap;
+
 /**
  * Portlet scope PortletSession attibutes as Map.
  *

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java Thu Aug 28 15:41:56 2008
@@ -18,10 +18,12 @@
  */
 package org.apache.myfaces.context.servlet;
 
-import org.apache.myfaces.context.ReleaseableExternalContext;
-import org.apache.myfaces.context.portlet.PortletExternalContextImpl;
-import org.apache.myfaces.el.unified.FacesELContext;
-import org.apache.myfaces.shared_impl.util.NullIterator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.el.ELContext;
 import javax.el.ELContextEvent;
@@ -43,7 +45,11 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import java.util.*;
+
+import org.apache.myfaces.context.ReleaseableExternalContext;
+import org.apache.myfaces.context.portlet.PortletExternalContextImpl;
+import org.apache.myfaces.el.unified.FacesELContext;
+import org.apache.myfaces.shared_impl.util.NullIterator;
 
 
 /**

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Thu Aug 28 15:41:56 2008
@@ -438,7 +438,7 @@
      * @param request
      */
     @Override
-    public void setRequest(java.lang.Object request)
+    public void setRequest(Object request)
     {
         this._servletRequest = (ServletRequest) request;
         this._httpServletRequest = isHttpServletRequest(_servletRequest) ? (HttpServletRequest) _servletRequest : null;
@@ -451,7 +451,7 @@
      * @throws java.io.UnsupportedEncodingException
      */
     @Override
-    public void setRequestCharacterEncoding(java.lang.String encoding) throws java.io.UnsupportedEncodingException
+    public void setRequestCharacterEncoding(String encoding) throws java.io.UnsupportedEncodingException
     {
 
         this._servletRequest.setCharacterEncoding(encoding);
@@ -481,7 +481,7 @@
      * @param response
      */
     @Override
-    public void setResponse(java.lang.Object response)
+    public void setResponse(Object response)
     {
         this._servletResponse = (ServletResponse) response;
     }
@@ -491,7 +491,7 @@
      * @param encoding
      */
     @Override
-    public void setResponseCharacterEncoding(java.lang.String encoding)
+    public void setResponseCharacterEncoding(String encoding)
     {
         this._servletResponse.setCharacterEncoding(encoding);
     }

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java Thu Aug 28 15:41:56 2008
@@ -18,8 +18,6 @@
  */
 package org.apache.myfaces.el;
 
-import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver.Scope;
-
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ValueExpression;
@@ -28,6 +26,8 @@
 import javax.faces.el.EvaluationException;
 import javax.faces.el.VariableResolver;
 
+import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver.Scope;
+
 /**
  * This variable resolver will be used for legacy variable resolvers which are registered through the faces config. If
  * it is invoked through the faces chain it will use the el resolver of {@link Application#getELResolver()}. If it is

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/PropertyResolverToELResolver.java Thu Aug 28 15:41:56 2008
@@ -18,6 +18,10 @@
  */
 package org.apache.myfaces.el.convert;
 
+import java.beans.FeatureDescriptor;
+import java.util.Iterator;
+import java.util.List;
+
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ELResolver;
@@ -30,10 +34,6 @@
 import javax.faces.el.EvaluationException;
 import javax.faces.el.PropertyResolver;
 
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Wrapper that converts a VariableResolver into an ELResolver. See JSF 1.2 spec section 5.6.1.6
  * 

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/convert/VariableResolverToELResolver.java Thu Aug 28 15:41:56 2008
@@ -18,6 +18,11 @@
  */
 package org.apache.myfaces.el.convert;
 
+import java.beans.FeatureDescriptor;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ELResolver;
@@ -27,11 +32,6 @@
 import javax.faces.el.EvaluationException;
 import javax.faces.el.VariableResolver;
 
-import java.beans.FeatureDescriptor;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
 /**
  * Wrapper that converts a VariableResolver into an ELResolver. See JSF 1.2 spec section 5.6.1.5
  * 

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java Thu Aug 28 15:41:56 2008
@@ -18,16 +18,16 @@
  */
 package org.apache.myfaces.el.unified;
 
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.el.convert.PropertyResolverToELResolver;
-import org.apache.myfaces.el.convert.VariableResolverToELResolver;
-
 import javax.el.CompositeELResolver;
 import javax.el.ELResolver;
 import javax.faces.application.Application;
 import javax.faces.el.PropertyResolver;
 import javax.faces.el.VariableResolver;
 
+import org.apache.myfaces.config.RuntimeConfig;
+import org.apache.myfaces.el.convert.PropertyResolverToELResolver;
+import org.apache.myfaces.el.convert.VariableResolverToELResolver;
+
 /**
  * @author Mathias Broekelmann (latest modification by $Author$)
  * @version $Revision$ $Date$

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForFaces.java Thu Aug 28 15:41:56 2008
@@ -18,12 +18,6 @@
  */
 package org.apache.myfaces.el.unified;
 
-import org.apache.myfaces.config.RuntimeConfig;
-import org.apache.myfaces.el.unified.resolver.ManagedBeanResolver;
-import org.apache.myfaces.el.unified.resolver.ResourceBundleResolver;
-import org.apache.myfaces.el.unified.resolver.ScopedAttributeResolver;
-import org.apache.myfaces.el.unified.resolver.implicitobject.ImplicitObjectResolver;
-
 import javax.el.ArrayELResolver;
 import javax.el.BeanELResolver;
 import javax.el.CompositeELResolver;
@@ -31,6 +25,12 @@
 import javax.el.MapELResolver;
 import javax.el.ResourceBundleELResolver;
 
+import org.apache.myfaces.config.RuntimeConfig;
+import org.apache.myfaces.el.unified.resolver.ManagedBeanResolver;
+import org.apache.myfaces.el.unified.resolver.ResourceBundleResolver;
+import org.apache.myfaces.el.unified.resolver.ScopedAttributeResolver;
+import org.apache.myfaces.el.unified.resolver.implicitobject.ImplicitObjectResolver;
+
 /**
  * Create the el resolver for faces. see 1.2 spec section 5.6.2
  * 

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderForJSP.java Thu Aug 28 15:41:56 2008
@@ -18,13 +18,13 @@
  */
 package org.apache.myfaces.el.unified;
 
+import javax.el.CompositeELResolver;
+
 import org.apache.myfaces.config.RuntimeConfig;
 import org.apache.myfaces.el.unified.resolver.ManagedBeanResolver;
 import org.apache.myfaces.el.unified.resolver.ResourceBundleResolver;
 import org.apache.myfaces.el.unified.resolver.implicitobject.ImplicitObjectResolver;
 
-import javax.el.CompositeELResolver;
-
 /**
  * build the el resolver for jsp. see 1.2 spec section 5.6.1
  * 

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java Thu Aug 28 15:41:56 2008
@@ -18,14 +18,15 @@
  */
 package org.apache.myfaces.el.unified.resolver;
 
-import org.apache.myfaces.el.VariableResolverImpl;
+import java.beans.FeatureDescriptor;
+import java.util.Iterator;
 
 import javax.el.ELContext;
 import javax.faces.application.Application;
 import javax.faces.context.FacesContext;
 import javax.servlet.jsp.JspApplicationContext;
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
+
+import org.apache.myfaces.el.VariableResolverImpl;
 
 /**
  * <p>

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ManagedBeanResolver.java Thu Aug 28 15:41:56 2008
@@ -24,6 +24,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ELResolver;
@@ -31,6 +32,7 @@
 import javax.el.PropertyNotWritableException;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.config.ManagedBeanBuilder;

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceBundleResolver.java Thu Aug 28 15:41:56 2008
@@ -23,6 +23,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.ResourceBundle;
+
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ELResolver;

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationImplicitObject.java Thu Aug 28 15:41:56 2008
@@ -19,6 +19,7 @@
 package org.apache.myfaces.el.unified.resolver.implicitobject;
 
 import java.beans.FeatureDescriptor;
+
 import javax.el.ELContext;
 
 /**

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/ApplicationScopeImplicitObject.java Thu Aug 28 15:41:56 2008
@@ -18,10 +18,11 @@
  */
 package org.apache.myfaces.el.unified.resolver.implicitobject;
 
-import javax.el.ELContext;
 import java.beans.FeatureDescriptor;
 import java.util.Map;
 
+import javax.el.ELContext;
+
 /**
  * Encapsulates information needed by the ImplicitObjectResolver
  *

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/CookieImplicitObject.java Thu Aug 28 15:41:56 2008
@@ -20,6 +20,7 @@
 
 import java.beans.FeatureDescriptor;
 import java.util.Map;
+
 import javax.el.ELContext;
 
 /**

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/FacesContextImplicitObject.java Thu Aug 28 15:41:56 2008
@@ -19,6 +19,7 @@
 package org.apache.myfaces.el.unified.resolver.implicitobject;
 
 import java.beans.FeatureDescriptor;
+
 import javax.el.ELContext;
 import javax.faces.context.FacesContext;
 

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java?rev=690034&r1=690033&r2=690034&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/el/unified/resolver/implicitobject/HeaderImplicitObject.java Thu Aug 28 15:41:56 2008
@@ -20,6 +20,7 @@
 
 import java.beans.FeatureDescriptor;
 import java.util.Map;
+
 import javax.el.ELContext;
 
 /**