myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skitch...@apache.org
Subject svn commit: r673803 [2/4] - in /myfaces/core/trunk: 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/convert/ api/src/main/java/javax/faces/el/ api/src/main...
Date Thu, 03 Jul 2008 21:07:48 GMT
Modified: myfaces/core/trunk/api/src/test/java/javax/faces/application/FacesMessageTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/application/FacesMessageTest.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/application/FacesMessageTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/application/FacesMessageTest.java Thu Jul  3 14:07:46 2008
@@ -23,149 +23,149 @@
 
 public class FacesMessageTest extends TestCase {
 
-	public static void main(String[] args) {
-		junit.textui.TestRunner.run(FacesMessageTest.class);
-	}
-
-	public FacesMessageTest(String name) {
-		super(name);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	/*
-	 * Test method for 'javax.faces.application.FacesMessage.FacesMessage()'
-	 */
-	public void testFacesMessage() {
-		FacesMessage msg = new FacesMessage();
-		assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
-		assertNull(msg.getSummary());
-		assertNull(msg.getDetail());
-	}
-
-	/*
-	 * Test method for 'javax.faces.application.FacesMessage.FacesMessage(String)'
-	 */
-	public void testFacesMessageString() {
-		String summary = "summary";
-		FacesMessage msg = new FacesMessage(summary);
-		assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
-		assertEquals(msg.getSummary(), summary);
-		assertEquals(msg.getDetail(), summary);
-	}
-
-	/*
-	 * Test method for 'javax.faces.application.FacesMessage.FacesMessage(String, String)'
-	 */
-	public void testFacesMessageStringString() {
-		String summary = "summary";
-		String detail = "detail";
-		FacesMessage msg = new FacesMessage(summary, detail);
-		assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
-		assertEquals(msg.getSummary(), summary);
-		assertEquals(msg.getDetail(), detail);
-	}
-
-	/*
-	 * Test method for 'javax.faces.application.FacesMessage.FacesMessage(Severity, String, String)'
-	 */
-	public void testFacesMessageSeverityStringString() {
-		String summary = "summary";
-		String detail = "detail";
-		FacesMessage msg = new FacesMessage(FacesMessage.SEVERITY_ERROR, summary, detail);
-		assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_ERROR);
-		assertEquals(msg.getSummary(), summary);
-		assertEquals(msg.getDetail(), detail);
-	}
-
-	/*
-	 * Test method for 'javax.faces.application.FacesMessage.FacesMessage(Severity, String, String)'
-	 */
-	public void testFacesMessageNullSeverityStringString() {
-		String summary = "summary";
-		String detail = "detail";
-		try {
-			new FacesMessage(null, summary, detail);
-			fail("Should have thrown an exception");
-		} catch (NullPointerException e) {
-		}
-	}
-
-	/*
-	 * Test method for 'javax.faces.application.FacesMessage.setSeverity(Severity)'
-	 */
-	public void testSetSeverity() {
-		FacesMessage msg = new FacesMessage();
-		assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
-		msg.setSeverity(FacesMessage.SEVERITY_FATAL);
-		assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_FATAL);
-	}
-
-	/*
-	 * Test method for 'javax.faces.application.FacesMessage.setSeverity(Severity)'
-	 */
-	public void testSetNullSeverity() {
-		FacesMessage msg = new FacesMessage();
-		try {
-			msg.setSeverity(null);
-			fail("Should have thrown an exception");
-		} catch (NullPointerException e) {
-		}
-	}
-
-	/*
-	 * Test method for 'javax.faces.application.FacesMessage.setSummary(String)'
-	 */
-	public void testSetSummary() {
-		FacesMessage msg = new FacesMessage();
-		String summary = "summary";
-		msg.setSummary(summary);
-		assertEquals(msg.getSummary(), summary);
-		assertEquals(msg.getDetail(), summary);
-	}
-
-	/*
-	 * Test method for 'javax.faces.application.FacesMessage.setDetail(String)'
-	 */
-	public void testSetDetail() {
-		FacesMessage msg = new FacesMessage();
-		String detail = "detail";
-		msg.setDetail(detail);
-		assertEquals(msg.getSummary(), null);
-		assertEquals(msg.getDetail(), detail);
-	}
-
-	public void testSeverityOrdering() {
-		// make sure they are ordered correctly from least to worst
-		assertTrue(0 > FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_WARN));
-		assertTrue(0 > FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_ERROR));
-		assertTrue(0 > FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_FATAL));
-		// make sure they are ordered correctly from worts to least
-		assertTrue(0 < FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_ERROR));
-		assertTrue(0 < FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_WARN));
-		assertTrue(0 < FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_INFO));
-	}
-
-	public void testSeverityCompareWithString() {
-		// make sure the compare fails when it should
-		try {
-			FacesMessage.SEVERITY_ERROR.compareTo("Hello There");
-			fail("should throw");
-		} catch(IllegalArgumentException e) {
-		}
-	}
-
-	public void testSeverityEquality() {
-		// make sure they all respond as equals when they should
-		assertEquals(0, FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_INFO));
-		assertEquals(0, FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_WARN));
-		assertEquals(0, FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_ERROR));
-		assertEquals(0, FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_FATAL));
-	}
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(FacesMessageTest.class);
+    }
+
+    public FacesMessageTest(String name) {
+        super(name);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    /*
+     * Test method for 'javax.faces.application.FacesMessage.FacesMessage()'
+     */
+    public void testFacesMessage() {
+        FacesMessage msg = new FacesMessage();
+        assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+        assertNull(msg.getSummary());
+        assertNull(msg.getDetail());
+    }
+
+    /*
+     * Test method for 'javax.faces.application.FacesMessage.FacesMessage(String)'
+     */
+    public void testFacesMessageString() {
+        String summary = "summary";
+        FacesMessage msg = new FacesMessage(summary);
+        assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+        assertEquals(msg.getSummary(), summary);
+        assertEquals(msg.getDetail(), summary);
+    }
+
+    /*
+     * Test method for 'javax.faces.application.FacesMessage.FacesMessage(String, String)'
+     */
+    public void testFacesMessageStringString() {
+        String summary = "summary";
+        String detail = "detail";
+        FacesMessage msg = new FacesMessage(summary, detail);
+        assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+        assertEquals(msg.getSummary(), summary);
+        assertEquals(msg.getDetail(), detail);
+    }
+
+    /*
+     * Test method for 'javax.faces.application.FacesMessage.FacesMessage(Severity, String, String)'
+     */
+    public void testFacesMessageSeverityStringString() {
+        String summary = "summary";
+        String detail = "detail";
+        FacesMessage msg = new FacesMessage(FacesMessage.SEVERITY_ERROR, summary, detail);
+        assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_ERROR);
+        assertEquals(msg.getSummary(), summary);
+        assertEquals(msg.getDetail(), detail);
+    }
+
+    /*
+     * Test method for 'javax.faces.application.FacesMessage.FacesMessage(Severity, String, String)'
+     */
+    public void testFacesMessageNullSeverityStringString() {
+        String summary = "summary";
+        String detail = "detail";
+        try {
+            new FacesMessage(null, summary, detail);
+            fail("Should have thrown an exception");
+        } catch (NullPointerException e) {
+        }
+    }
+
+    /*
+     * Test method for 'javax.faces.application.FacesMessage.setSeverity(Severity)'
+     */
+    public void testSetSeverity() {
+        FacesMessage msg = new FacesMessage();
+        assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_INFO);
+        msg.setSeverity(FacesMessage.SEVERITY_FATAL);
+        assertEquals(msg.getSeverity(), FacesMessage.SEVERITY_FATAL);
+    }
+
+    /*
+     * Test method for 'javax.faces.application.FacesMessage.setSeverity(Severity)'
+     */
+    public void testSetNullSeverity() {
+        FacesMessage msg = new FacesMessage();
+        try {
+            msg.setSeverity(null);
+            fail("Should have thrown an exception");
+        } catch (NullPointerException e) {
+        }
+    }
+
+    /*
+     * Test method for 'javax.faces.application.FacesMessage.setSummary(String)'
+     */
+    public void testSetSummary() {
+        FacesMessage msg = new FacesMessage();
+        String summary = "summary";
+        msg.setSummary(summary);
+        assertEquals(msg.getSummary(), summary);
+        assertEquals(msg.getDetail(), summary);
+    }
+
+    /*
+     * Test method for 'javax.faces.application.FacesMessage.setDetail(String)'
+     */
+    public void testSetDetail() {
+        FacesMessage msg = new FacesMessage();
+        String detail = "detail";
+        msg.setDetail(detail);
+        assertEquals(msg.getSummary(), null);
+        assertEquals(msg.getDetail(), detail);
+    }
+
+    public void testSeverityOrdering() {
+        // make sure they are ordered correctly from least to worst
+        assertTrue(0 > FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_WARN));
+        assertTrue(0 > FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_ERROR));
+        assertTrue(0 > FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_FATAL));
+        // make sure they are ordered correctly from worts to least
+        assertTrue(0 < FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_ERROR));
+        assertTrue(0 < FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_WARN));
+        assertTrue(0 < FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_INFO));
+    }
+
+    public void testSeverityCompareWithString() {
+        // make sure the compare fails when it should
+        try {
+            FacesMessage.SEVERITY_ERROR.compareTo("Hello There");
+            fail("should throw");
+        } catch(IllegalArgumentException e) {
+        }
+    }
+
+    public void testSeverityEquality() {
+        // make sure they all respond as equals when they should
+        assertEquals(0, FacesMessage.SEVERITY_INFO.compareTo(FacesMessage.SEVERITY_INFO));
+        assertEquals(0, FacesMessage.SEVERITY_WARN.compareTo(FacesMessage.SEVERITY_WARN));
+        assertEquals(0, FacesMessage.SEVERITY_ERROR.compareTo(FacesMessage.SEVERITY_ERROR));
+        assertEquals(0, FacesMessage.SEVERITY_FATAL.compareTo(FacesMessage.SEVERITY_FATAL));
+    }
 }

Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseTest.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/UIComponentBaseTest.java Thu Jul  3 14:07:46 2008
@@ -29,128 +29,128 @@
 import org.apache.shale.test.mock.MockValueBinding;
 
 public class UIComponentBaseTest extends AbstractJsfTestCase {
-	private UIComponentBase mock = null;
+    private UIComponentBase mock = null;
      
-	public static void main(String[] args) {
-		junit.textui.TestRunner.run(UIComponentBaseTest.class);
-	}
-
-	public UIComponentBaseTest(String name) {
-		super(name);
-	}
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(UIComponentBaseTest.class);
+    }
+
+    public UIComponentBaseTest(String name) {
+        super(name);
+    }
 
-	public static Test suite() {
+    public static Test suite() {
         TestSuite suite = new TestSuite();
         suite.addTestSuite(UIComponentBaseTest.class);
         return suite;        
-	}
+    }
 
-	public void setUp() {
-		super.setUp();
+    public void setUp() {
+        super.setUp();
         // TODO remove this line once shale-test goes alpha, see MYFACES-1155
-		facesContext.getViewRoot().setRenderKitId(MockRenderKitFactory.HTML_BASIC_RENDER_KIT);
-		mock = new UIComponentMock();
-	}
-
-	public void tearDown() {
-		super.tearDown();
-		mock = null;
-	}
-
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.isRendered()'
-	 */
-	public void testIsRendered() {
-		// defaults to true
-		assertTrue(mock.isRendered());
-	}
-
-	public void testIsRenderedValueSet() {
-		mock.setRendered(true);
-		assertTrue(mock.isRendered());
-		mock.setRendered(false);
-		assertFalse(mock.isRendered());
-	}
-
-	public void testIsRenderedBinding() {
-
-		ValueBinding vb = new MockValueBinding(application,
-				"#{requestScope.foo}");
-		externalContext.getRequestMap().put("foo", new Boolean(false));
-
-		mock.setValueBinding("rendered", vb);
-		assertFalse(mock.isRendered());
-	}
-
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getRendersChildren()'
-	 */
-	public void testGetRendersChildren() {
-
-	}
-
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getChildCount()'
-	 */
-	public void testGetChildCount() {
-
-	}
-
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.UIComponentBase()'
-	 */
-	public void testUIComponentBase() {
-
-	}
-
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getAttributes()'
-	 */
-	public void testGetAttributes() {
-
-	}
-
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getValueBinding(String)'
-	 */
-	public void testGetValueBindingString() {
-
-	}
-
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.setValueBinding(String, ValueBinding)'
-	 */
-	public void testSetValueBindingStringValueBinding() {
-
-	}
-
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getClientId(FacesContext)'
-	 */
-	public void testGetClientIdFacesContext() {
+        facesContext.getViewRoot().setRenderKitId(MockRenderKitFactory.HTML_BASIC_RENDER_KIT);
+        mock = new UIComponentMock();
+    }
+
+    public void tearDown() {
+        super.tearDown();
+        mock = null;
+    }
+
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.isRendered()'
+     */
+    public void testIsRendered() {
+        // defaults to true
+        assertTrue(mock.isRendered());
+    }
+
+    public void testIsRenderedValueSet() {
+        mock.setRendered(true);
+        assertTrue(mock.isRendered());
+        mock.setRendered(false);
+        assertFalse(mock.isRendered());
+    }
+
+    public void testIsRenderedBinding() {
+
+        ValueBinding vb = new MockValueBinding(application,
+                "#{requestScope.foo}");
+        externalContext.getRequestMap().put("foo", new Boolean(false));
+
+        mock.setValueBinding("rendered", vb);
+        assertFalse(mock.isRendered());
+    }
+
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getRendersChildren()'
+     */
+    public void testGetRendersChildren() {
+
+    }
 
-		UIInput input = createInputInTree();
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getChildCount()'
+     */
+    public void testGetChildCount() {
+
+    }
+
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.UIComponentBase()'
+     */
+    public void testUIComponentBase() {
+
+    }
+
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getAttributes()'
+     */
+    public void testGetAttributes() {
+
+    }
+
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getValueBinding(String)'
+     */
+    public void testGetValueBindingString() {
+
+    }
+
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.setValueBinding(String, ValueBinding)'
+     */
+    public void testSetValueBindingStringValueBinding() {
+
+    }
+
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getClientId(FacesContext)'
+     */
+    public void testGetClientIdFacesContext() {
+
+        UIInput input = createInputInTree();
         
-		String str = input.getClientId(facesContext);
+        String str = input.getClientId(facesContext);
 
-		assertEquals(str, "data:input99");
+        assertEquals(str, "data:input99");
 
-		UIData uiData = (UIData) input.getParent().getParent();
+        UIData uiData = (UIData) input.getParent().getParent();
 
-		uiData.setRowIndex(1);
+        uiData.setRowIndex(1);
 
-		str = input.getClientId(facesContext);
-	}
+        str = input.getClientId(facesContext);
+    }
 
-	private UIInput createInputInTree() {
-		UIViewRoot viewRoot = facesContext.getViewRoot();
+    private UIInput createInputInTree() {
+        UIViewRoot viewRoot = facesContext.getViewRoot();
 
-		UIData uiData = new UIData();
-		uiData.setId("data");
+        UIData uiData = new UIData();
+        uiData.setId("data");
 
-		UIColumn column = new UIColumn();
+        UIColumn column = new UIColumn();
 
-		uiData.getChildren().add(column);
+        uiData.getChildren().add(column);
 
         UIInput input = null;
 
@@ -160,52 +160,52 @@
             column.getChildren().add(input);
         }
 
-		viewRoot.getChildren().add(uiData);
+        viewRoot.getChildren().add(uiData);
 
-		return input;
-	}
+        return input;
+    }
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getId()'
-	 */
-	public void testGetId() {
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getId()'
+     */
+    public void testGetId() {
 
-	}
+    }
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.setId(String)'
-	 */
-	public void testSetIdString() {
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.setId(String)'
+     */
+    public void testSetIdString() {
 
-	}
+    }
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getParent()'
-	 */
-	public void testGetParent() {
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getParent()'
+     */
+    public void testGetParent() {
 
-	}
+    }
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.setParent(UIComponent)'
-	 */
-	public void testSetParentUIComponent() {
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.setParent(UIComponent)'
+     */
+    public void testSetParentUIComponent() {
 
-	}
+    }
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getChildren()'
-	 */
-	public void testGetChildren() {
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getChildren()'
+     */
+    public void testGetChildren() {
 
-	}
+    }
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.findComponent(String)'
-	 */
-	public void testFindComponentString() {
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.findComponent(String)'
+     */
+    public void testFindComponentString() {
 
-		UIInput input = createInputInTree();
+        UIInput input = createInputInTree();
 
         for(int j=0; j<100; j++) {
             UIComponent comp = input.findComponent(":data:input"+j);
@@ -215,227 +215,227 @@
         }
     }
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getFacets()'
-	 */
-	public void testGetFacets() {
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getFacets()'
+     */
+    public void testGetFacets() {
 
-	}
-
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getFacet(String)'
-	 */
-	public void testGetFacetString() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getFacet(String)'
+     */
+    public void testGetFacetString() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getFacetsAndChildren()'
-	 */
-	public void testGetFacetsAndChildren() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getFacetsAndChildren()'
+     */
+    public void testGetFacetsAndChildren() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.broadcast(FacesEvent)'
-	 */
-	public void testBroadcastFacesEvent() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.broadcast(FacesEvent)'
+     */
+    public void testBroadcastFacesEvent() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.decode(FacesContext)'
-	 */
-	public void testDecodeFacesContext() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.decode(FacesContext)'
+     */
+    public void testDecodeFacesContext() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.encodeBegin(FacesContext)'
-	 */
-	public void testEncodeBeginFacesContext() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.encodeBegin(FacesContext)'
+     */
+    public void testEncodeBeginFacesContext() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.encodeChildren(FacesContext)'
-	 */
-	public void testEncodeChildrenFacesContext() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.encodeChildren(FacesContext)'
+     */
+    public void testEncodeChildrenFacesContext() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.encodeEnd(FacesContext)'
-	 */
-	public void testEncodeEndFacesContext() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.encodeEnd(FacesContext)'
+     */
+    public void testEncodeEndFacesContext() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.addFacesListener(FacesListener)'
-	 */
-	public void testAddFacesListenerFacesListener() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.addFacesListener(FacesListener)'
+     */
+    public void testAddFacesListenerFacesListener() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getFacesListeners(Class)'
-	 */
-	public void testGetFacesListenersClass() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getFacesListeners(Class)'
+     */
+    public void testGetFacesListenersClass() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.removeFacesListener(FacesListener)'
-	 */
-	public void testRemoveFacesListenerFacesListener() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.removeFacesListener(FacesListener)'
+     */
+    public void testRemoveFacesListenerFacesListener() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.queueEvent(FacesEvent)'
-	 */
-	public void testQueueEventFacesEvent() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.queueEvent(FacesEvent)'
+     */
+    public void testQueueEventFacesEvent() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.processDecodes(FacesContext)'
-	 */
-	public void testProcessDecodesFacesContext() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.processDecodes(FacesContext)'
+     */
+    public void testProcessDecodesFacesContext() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.processValidators(FacesContext)'
-	 */
-	public void testProcessValidatorsFacesContext() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.processValidators(FacesContext)'
+     */
+    public void testProcessValidatorsFacesContext() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.processUpdates(FacesContext)'
-	 */
-	public void testProcessUpdatesFacesContext() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.processUpdates(FacesContext)'
+     */
+    public void testProcessUpdatesFacesContext() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.processSaveState(FacesContext)'
-	 */
-	public void testProcessSaveStateFacesContext() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.processSaveState(FacesContext)'
+     */
+    public void testProcessSaveStateFacesContext() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.processRestoreState(FacesContext, Object)'
-	 */
-	public void testProcessRestoreStateFacesContextObject() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.processRestoreState(FacesContext, Object)'
+     */
+    public void testProcessRestoreStateFacesContextObject() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getFacesContext()'
-	 */
-	public void testGetFacesContext() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getFacesContext()'
+     */
+    public void testGetFacesContext() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getRenderer(FacesContext)'
-	 */
-	public void testGetRendererFacesContext() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getRenderer(FacesContext)'
+     */
+    public void testGetRendererFacesContext() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.getPathToComponent(UIComponent)'
-	 */
-	public void testGetPathToComponent() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.getPathToComponent(UIComponent)'
+     */
+    public void testGetPathToComponent() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.isTransient()'
-	 */
-	public void testIsTransient() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.isTransient()'
+     */
+    public void testIsTransient() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.setTransient(boolean)'
-	 */
-	public void testSetTransient() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.setTransient(boolean)'
+     */
+    public void testSetTransient() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.saveAttachedState(FacesContext, Object)'
-	 */
-	public void testSaveAttachedState() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.saveAttachedState(FacesContext, Object)'
+     */
+    public void testSaveAttachedState() {
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.restoreAttachedState(FacesContext, Object)'
-	 */
-	public void testRestoreAttachedState() {
+    }
 
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.restoreAttachedState(FacesContext, Object)'
+     */
+    public void testRestoreAttachedState() {
 
-	public void testSaveState() throws Exception {
+    }
 
-		try {
-			String id = "id";
-			String rendererType = "Whumpy";
-			mock.setId(id);
-			mock.setRendered(true);
-			mock.setRendererType(rendererType);
-			Object value[] = (Object[]) mock.saveState(facesContext);
-			assertEquals(id, value[0]);
-			assertEquals(Boolean.TRUE, value[1]);
-			assertEquals(rendererType, value[2]);
+    public void testSaveState() throws Exception {
 
-			assertNull(value[3]);
-			assertNull(value[4]);
-			assertNull(value[5]);
-			assertNull(value[6]);
-		} catch (NullPointerException e) {
-			fail("Should not throw an exception");
-		}
-	}
+        try {
+            String id = "id";
+            String rendererType = "Whumpy";
+            mock.setId(id);
+            mock.setRendered(true);
+            mock.setRendererType(rendererType);
+            Object value[] = (Object[]) mock.saveState(facesContext);
+            assertEquals(id, value[0]);
+            assertEquals(Boolean.TRUE, value[1]);
+            assertEquals(rendererType, value[2]);
+
+            assertNull(value[3]);
+            assertNull(value[4]);
+            assertNull(value[5]);
+            assertNull(value[6]);
+        } catch (NullPointerException e) {
+            fail("Should not throw an exception");
+        }
+    }
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.restoreState(FacesContext, Object)'
-	 */
-	public void testRestoreState() {
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.restoreState(FacesContext, Object)'
+     */
+    public void testRestoreState() {
 
-	}
+    }
 
-	/*
-	 * Test method for 'javax.faces.component.UIComponentBase.setRendererType(String)'
-	 */
-	public void testSetRendererType() {
-		assertNull(mock.getRendererType());
-	}
+    /*
+     * Test method for 'javax.faces.component.UIComponentBase.setRendererType(String)'
+     */
+    public void testSetRendererType() {
+        assertNull(mock.getRendererType());
+    }
 
-	public void testSetRendererTypeStringValue() {
-		String rendererType = "BlueBlorf";
-		mock.setRendererType(rendererType);
-		assertEquals(mock.getRendererType(), rendererType);
-	}
+    public void testSetRendererTypeStringValue() {
+        String rendererType = "BlueBlorf";
+        mock.setRendererType(rendererType);
+        assertEquals(mock.getRendererType(), rendererType);
+    }
 
-	public void testSetRendererTypeStringBinding() {
+    public void testSetRendererTypeStringBinding() {
 
-		String whumpy = "Whumpy";
+        String whumpy = "Whumpy";
 
-		ValueBinding vb = new MockValueBinding(application,
-				"#{requestScope.foo}");
-		externalContext.getRequestMap().put("foo", whumpy);
+        ValueBinding vb = new MockValueBinding(application,
+                "#{requestScope.foo}");
+        externalContext.getRequestMap().put("foo", whumpy);
 
-		mock.setValueBinding("rendererType", vb);
-		assertEquals(mock.getRendererType(), whumpy);
+        mock.setValueBinding("rendererType", vb);
+        assertEquals(mock.getRendererType(), whumpy);
 
-	}
+    }
 
 }

Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/UISelectManyTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/component/UISelectManyTest.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/UISelectManyTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/UISelectManyTest.java Thu Jul  3 14:07:46 2008
@@ -93,8 +93,8 @@
 
   public void testValidateIntArray() {
     
-	facesContext.getViewRoot().setLocale(_TEST_LOCALE);
-	  
+    facesContext.getViewRoot().setLocale(_TEST_LOCALE);
+      
     UISelectMany selectMany = new UISelectMany();
     selectMany.setId("selectMany");
     selectMany.setRendererType(null);
@@ -119,7 +119,7 @@
 
   public void testValidateStringArray() {
 
-	facesContext.getViewRoot().setLocale(_TEST_LOCALE);
+    facesContext.getViewRoot().setLocale(_TEST_LOCALE);
 
     UISelectMany selectMany = new UISelectMany();
     selectMany.setId("selectMany");
@@ -145,8 +145,8 @@
 
   public void testValidateStringList() {
 
-	facesContext.getViewRoot().setLocale(_TEST_LOCALE);
-	  
+    facesContext.getViewRoot().setLocale(_TEST_LOCALE);
+      
     UISelectMany selectMany = new UISelectMany();
     selectMany.setId("selectMany");
     selectMany.setRendererType(null);

Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/_MessageUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/component/_MessageUtilsTest.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/_MessageUtilsTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/_MessageUtilsTest.java Thu Jul  3 14:07:46 2008
@@ -48,17 +48,17 @@
 
   public void testGetCause() throws Exception
   {
-	  IllegalStateException e1 = new IllegalStateException("e1");
-	  FacesException e2 = new FacesException("e2");
-	  FacesException e3 = new FacesException("e3", e1);
-	  
-	  Throwable t1 = _MessageUtils.getCause(e1);
-	  assertNull(t1);
-	  
-	  Throwable t2 = _MessageUtils.getCause(e2);
-	  assertNull(t2);
-	  
-	  Throwable t3 = _MessageUtils.getCause(e3);
-	  assertSame(e1, t3);
+      IllegalStateException e1 = new IllegalStateException("e1");
+      FacesException e2 = new FacesException("e2");
+      FacesException e3 = new FacesException("e3", e1);
+      
+      Throwable t1 = _MessageUtils.getCause(e1);
+      assertNull(t1);
+      
+      Throwable t2 = _MessageUtils.getCause(e2);
+      assertNull(t2);
+      
+      Throwable t3 = _MessageUtils.getCause(e3);
+      assertSame(e1, t3);
   }
 }

Modified: myfaces/core/trunk/api/src/test/java/javax/faces/convert/DateTimeConverterTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/convert/DateTimeConverterTest.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/convert/DateTimeConverterTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/convert/DateTimeConverterTest.java Thu Jul  3 14:07:46 2008
@@ -119,8 +119,8 @@
         df.setTimeZone(timeZone);
         mock.setType("time");
         mock.setTimeZone(timeZone);
-		mock.setLocale(Locale.US);
-		String current = df.format(new Date());
+        mock.setLocale(Locale.US);
+        String current = df.format(new Date());
         UIInput input = new UIInput();
         input.setValue(new Date());
         Date date = (Date) mock.getAsObject(FacesContext.getCurrentInstance(), input, current);

Modified: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/Mock2ApplicationFactory.java Thu Jul  3 14:07:46 2008
@@ -26,22 +26,22 @@
  * Necessary for testing application-factory-setup with to application-factories;
  */
 public class Mock2ApplicationFactory extends ApplicationFactory {
-	private Application app = null;
-	private ApplicationFactory factory = null;
+    private Application app = null;
+    private ApplicationFactory factory = null;
 
-	public Mock2ApplicationFactory() {
-	}
+    public Mock2ApplicationFactory() {
+    }
 
-	public Mock2ApplicationFactory(ApplicationFactory factory) {
-		this.factory = factory;
-	}
+    public Mock2ApplicationFactory(ApplicationFactory factory) {
+        this.factory = factory;
+    }
 
-	public Application getApplication() {
-		return app;
-	}
+    public Application getApplication() {
+        return app;
+    }
 
-	public void setApplication(Application application) {
-		this.app = application;
-	}
+    public void setApplication(Application application) {
+        this.app = application;
+    }
 
 }

Modified: myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java (original)
+++ myfaces/core/trunk/api/src/test/java/org/apache/myfaces/mock/api/MockApplicationFactory.java Thu Jul  3 14:07:46 2008
@@ -23,22 +23,22 @@
 import javax.faces.application.ApplicationFactory;
 
 public class MockApplicationFactory extends ApplicationFactory {
-	private Application app = null;
-	private ApplicationFactory factory;
+    private Application app = null;
+    private ApplicationFactory factory;
 
-	public MockApplicationFactory() {
-	}
+    public MockApplicationFactory() {
+    }
 
-	public MockApplicationFactory(ApplicationFactory factory) {
-		this.factory = factory;
-	}
-	
-	public Application getApplication() {
-		return app;
-	}
+    public MockApplicationFactory(ApplicationFactory factory) {
+        this.factory = factory;
+    }
+    
+    public Application getApplication() {
+        return app;
+    }
 
-	public void setApplication(Application application) {
-		this.app = application;
-	}
+    public void setApplication(Application application) {
+        this.app = application;
+    }
 
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ActionListenerImpl.java Thu Jul  3 14:07:46 2008
@@ -82,8 +82,8 @@
         navigationHandler.handleNavigation(facesContext,
                                            fromAction,
                                            outcome);
-		//Render Response if needed
-		facesContext.renderResponse();
+        //Render Response if needed
+        facesContext.renderResponse();
 
     }
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/pss/ViewHandlerResponseWrapperHelperImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/pss/ViewHandlerResponseWrapperHelperImpl.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/pss/ViewHandlerResponseWrapperHelperImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/pss/ViewHandlerResponseWrapperHelperImpl.java Thu Jul  3 14:07:46 2008
@@ -77,12 +77,12 @@
 
     public String toString() {
         String result = null;
-	if (caw != null) {
-	    result = caw.toString();
-	}
-	else if (tempOS != null) {
-	    result = tempOS.toString();
-	}
+    if (caw != null) {
+        result = caw.toString();
+    }
+    else if (tempOS != null) {
+        result = tempOS.toString();
+    }
 
     return result;
     }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java Thu Jul  3 14:07:46 2008
@@ -615,11 +615,11 @@
 
                 if (DEFAULT_FACES_CONFIG.equals(systemId))
                 {
-                	if(log.isWarnEnabled())
-	                    log.warn(DEFAULT_FACES_CONFIG + " has been specified in the " +
-	                            FacesServlet.CONFIG_FILES_ATTR + " context parameter of " +
-	                            "the deployment descriptor. This will automatically be removed, " +
-	                            "if we wouldn't do this, it would be loaded twice.  See JSF spec 1.1, 10.3.2");
+                    if(log.isWarnEnabled())
+                        log.warn(DEFAULT_FACES_CONFIG + " has been specified in the " +
+                                FacesServlet.CONFIG_FILES_ATTR + " context parameter of " +
+                                "the deployment descriptor. This will automatically be removed, " +
+                                "if we wouldn't do this, it would be loaded twice.  See JSF spec 1.1, 10.3.2");
                 }
                 else
                     configFilesList.add(systemId);

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/ManagedBeanBuilder.java Thu Jul  3 14:07:46 2008
@@ -111,15 +111,15 @@
             switch (property.getType())
             {
                 case ManagedProperty.TYPE_LIST:
-                	
-                	// JSF 1.1, 5.3.1.3 
-                	// Call the property getter, if it exists.
-                	// If the getter returns null or doesn't exist, create a java.util.ArrayList,
-                	// otherwise use the returned Object ...
-                	if(PropertyUtils.isReadable(bean, property.getPropertyName()))
-                		value = propertyResolver.getValue(bean, property.getPropertyName());
-                	value = value == null ? new ArrayList() : value;
-                	
+                    
+                    // JSF 1.1, 5.3.1.3 
+                    // Call the property getter, if it exists.
+                    // If the getter returns null or doesn't exist, create a java.util.ArrayList,
+                    // otherwise use the returned Object ...
+                    if(PropertyUtils.isReadable(bean, property.getPropertyName()))
+                        value = propertyResolver.getValue(bean, property.getPropertyName());
+                    value = value == null ? new ArrayList() : value;
+                    
                     if (value instanceof List) {
                         initializeList(facesContext, property.getListEntries(), (List) value);
 
@@ -144,14 +144,14 @@
                     break;
                 case ManagedProperty.TYPE_MAP:
 
-                	// JSF 1.1, 5.3.1.3 
-                	// Call the property getter, if it exists.
-                	// If the getter returns null or doesn't exist, create a java.util.HashMap,
-                	// otherwise use the returned java.util.Map .
-                	if(PropertyUtils.isReadable(bean, property.getPropertyName()))
-                		value = propertyResolver.getValue(bean, property.getPropertyName());
-                	value = value == null ? new HashMap() : value;
-                	
+                    // JSF 1.1, 5.3.1.3 
+                    // Call the property getter, if it exists.
+                    // If the getter returns null or doesn't exist, create a java.util.HashMap,
+                    // otherwise use the returned java.util.Map .
+                    if(PropertyUtils.isReadable(bean, property.getPropertyName()))
+                        value = propertyResolver.getValue(bean, property.getPropertyName());
+                    value = value == null ? new HashMap() : value;
+                    
                     if (! (value instanceof Map)) {
                         value = new HashMap();
                     }
@@ -268,9 +268,9 @@
             return "application";
         }
 
-	    // check implicit objects
+        // check implicit objects
         if (beanName.equalsIgnoreCase("cookie")) {
-	    return "request";
+        return "request";
         }
         if (beanName.equalsIgnoreCase("facesContext")) {
             return "request";
@@ -284,7 +284,7 @@
         }
 
         if (beanName.equalsIgnoreCase("initParam")) {
-	    return "application";
+        return "application";
         }
         if (beanName.equalsIgnoreCase("param")) {
             return "request";

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/portlet/PortletExternalContextImpl.java Thu Jul  3 14:07:46 2008
@@ -336,8 +336,8 @@
 
     public void setResponse(Object response) {
         if (response instanceof PortletResponse) {
-	        this._portletResponse = (PortletResponse) response;
-	    }
+            this._portletResponse = (PortletResponse) response;
+        }
     }   
 
     public Object getSession(boolean create) {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Thu Jul  3 14:07:46 2008
@@ -426,7 +426,7 @@
         }
         catch (ServletException e)
         {
-        	if (e.getMessage() != null)
+            if (e.getMessage() != null)
             {
                 throw new FacesException(e.getMessage(), e);
             }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/convert/ConverterUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/convert/ConverterUtils.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/convert/ConverterUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/convert/ConverterUtils.java Thu Jul  3 14:07:46 2008
@@ -32,51 +32,51 @@
     private ConverterUtils() {}
 
 
-	public static int convertToInt(Object value)
-	{
-		if (value instanceof Number)
-		{
-			return ((Number)value).intValue();
-		}
-		else if (value instanceof String)
-		{
-			try
-			{
-				return Integer.parseInt((String)value);
-			}
-			catch (NumberFormatException e)
-			{
-				throw new IllegalArgumentException("Cannot convert " + value.toString() + " to int");
-			}
-		}
-		else
-		{
-			throw new IllegalArgumentException("Cannot convert " + value.toString() + " to int");
-		}
-	}
-
-	public static boolean convertToBoolean(Object value)
-	{
-		if (value instanceof Boolean)
-		{
-			return ((Boolean)value).booleanValue();
-		}
-		else if (value instanceof String)
-		{
-			try
-			{
-				return new Boolean((String)value).booleanValue();
-			}
-			catch (Exception e)
-			{
-				throw new IllegalArgumentException("Cannot convert " + value.toString() + " to boolean");
-			}
-		}
-		else
-		{
-			throw new IllegalArgumentException("Cannot convert " + value.toString() + " to boolean");
-		}
-	}	
+    public static int convertToInt(Object value)
+    {
+        if (value instanceof Number)
+        {
+            return ((Number)value).intValue();
+        }
+        else if (value instanceof String)
+        {
+            try
+            {
+                return Integer.parseInt((String)value);
+            }
+            catch (NumberFormatException e)
+            {
+                throw new IllegalArgumentException("Cannot convert " + value.toString() + " to int");
+            }
+        }
+        else
+        {
+            throw new IllegalArgumentException("Cannot convert " + value.toString() + " to int");
+        }
+    }
+
+    public static boolean convertToBoolean(Object value)
+    {
+        if (value instanceof Boolean)
+        {
+            return ((Boolean)value).booleanValue();
+        }
+        else if (value instanceof String)
+        {
+            try
+            {
+                return new Boolean((String)value).booleanValue();
+            }
+            catch (Exception e)
+            {
+                throw new IllegalArgumentException("Cannot convert " + value.toString() + " to boolean");
+            }
+        }
+        else
+        {
+            throw new IllegalArgumentException("Cannot convert " + value.toString() + " to boolean");
+        }
+    }    
 
     public static long convertToLong(Object value)
     {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/ELParserHelper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/ELParserHelper.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/ELParserHelper.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/ELParserHelper.java Thu Jul  3 14:07:46 2008
@@ -118,14 +118,14 @@
         {
             if (posOpenBrace > 0)
             {
-				if( posOpenBrace-1 > remainsPos )
-					sb.append(expressionString.substring(remainsPos, posOpenBrace - 1));
+                if( posOpenBrace-1 > remainsPos )
+                    sb.append(expressionString.substring(remainsPos, posOpenBrace - 1));
 
                 if (expressionString.charAt(posOpenBrace - 1) == '$')
                 {
                     sb.append("${'${'}");
-					remainsPos = posOpenBrace+1;
-					continue;
+                    remainsPos = posOpenBrace+1;
+                    continue;
                 }
                 else if (expressionString.charAt(posOpenBrace - 1) == '#')
                 {
@@ -150,23 +150,23 @@
 //                    else
 //                    {
                         sb.append("${");
-						int posCloseBrace = indexOfMatchingClosingBrace(expressionString, posOpenBrace);
+                        int posCloseBrace = indexOfMatchingClosingBrace(expressionString, posOpenBrace);
                         sb.append(expressionString.substring(posOpenBrace + 1, posCloseBrace + 1));
-						remainsPos = posCloseBrace + 1;
-						continue;
+                        remainsPos = posCloseBrace + 1;
+                        continue;
 //                    }
                 }else{
-					if( posOpenBrace > remainsPos )
-						sb.append( expressionString.charAt(posOpenBrace - 1) );
+                    if( posOpenBrace > remainsPos )
+                        sb.append( expressionString.charAt(posOpenBrace - 1) );
                 }
             }
 
-			// Standalone brace
-			sb.append('{');
-			remainsPos = posOpenBrace + 1;
+            // Standalone brace
+            sb.append('{');
+            remainsPos = posOpenBrace + 1;
         }
 
-		sb.append(expressionString.substring(remainsPos));
+        sb.append(expressionString.substring(remainsPos));
 
         // Create a new String to shrink mem size since we are caching
         return new String(sb.toString());

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/ApplyRequestValuesExecutor.java Thu Jul  3 14:07:46 2008
@@ -28,12 +28,12 @@
  * Apply request values phase (JSF Spec 2.2.2)
  */
 class ApplyRequestValuesExecutor implements PhaseExecutor {
-	public boolean execute(FacesContext facesContext) {
-		facesContext.getViewRoot().processDecodes(facesContext);
-		return false;
-	}
+    public boolean execute(FacesContext facesContext) {
+        facesContext.getViewRoot().processDecodes(facesContext);
+        return false;
+    }
 
-	public PhaseId getPhase() {
-		return PhaseId.APPLY_REQUEST_VALUES;
-	}
+    public PhaseId getPhase() {
+        return PhaseId.APPLY_REQUEST_VALUES;
+    }
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/InvokeApplicationExecutor.java Thu Jul  3 14:07:46 2008
@@ -28,12 +28,12 @@
  * Invoke application phase (JSF Spec 2.2.5)
  */
 class InvokeApplicationExecutor implements PhaseExecutor {
-	public boolean execute(FacesContext facesContext) {
-		facesContext.getViewRoot().processApplication(facesContext);
-		return false;
-	}
+    public boolean execute(FacesContext facesContext) {
+        facesContext.getViewRoot().processApplication(facesContext);
+        return false;
+    }
 
-	public PhaseId getPhase() {
-		return PhaseId.INVOKE_APPLICATION;
-	}
+    public PhaseId getPhase() {
+        return PhaseId.INVOKE_APPLICATION;
+    }
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/LifecycleImpl.java Thu Jul  3 14:07:46 2008
@@ -55,15 +55,15 @@
 
     public LifecycleImpl() {
         // hide from public access
-    	lifecycleExecutors = new PhaseExecutor[] {
-    			new RestoreViewExecutor(),
-    			new ApplyRequestValuesExecutor(),
-    			new ProcessValidationsExecutor(),
-    			new UpdateModelValuesExecutor(),
-    			new InvokeApplicationExecutor()
-    	};
+        lifecycleExecutors = new PhaseExecutor[] {
+                new RestoreViewExecutor(),
+                new ApplyRequestValuesExecutor(),
+                new ProcessValidationsExecutor(),
+                new UpdateModelValuesExecutor(),
+                new InvokeApplicationExecutor()
+        };
 
-    	renderExecutor = new RenderResponseExecutor();
+        renderExecutor = new RenderResponseExecutor();
     }
 
     public void execute(FacesContext facesContext) throws FacesException {
@@ -77,18 +77,18 @@
 
         PhaseListenerManager phaseListenerMgr = new PhaseListenerManager(this, facesContext, getPhaseListeners());
         for(int executorIndex = 0;executorIndex < lifecycleExecutors.length;executorIndex++) {
-        	if(executePhase(facesContext, lifecycleExecutors[executorIndex], phaseListenerMgr)) {
-        		return;
-        	}
+            if(executePhase(facesContext, lifecycleExecutors[executorIndex], phaseListenerMgr)) {
+                return;
+            }
         }
     }
 
 
     private boolean executePhase(FacesContext facesContext, PhaseExecutor executor,
-    		PhaseListenerManager phaseListenerMgr) throws FacesException {
-		boolean skipFurtherProcessing = false;
+            PhaseListenerManager phaseListenerMgr) throws FacesException {
+        boolean skipFurtherProcessing = false;
         if (log.isTraceEnabled()) {
-        	log.trace("entering " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
+            log.trace("entering " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
         }
 
         try {
@@ -96,14 +96,14 @@
 
             if(isResponseComplete(facesContext, executor.getPhase(), true)) {
                 // have to return right away
-            	return true;
+                return true;
             }
             if(shouldRenderResponse(facesContext, executor.getPhase(), true)) {
-            	skipFurtherProcessing = true;
+                skipFurtherProcessing = true;
             }
 
             if(executor.execute(facesContext)) {
-            	return true;
+                return true;
             }
         } finally {
             phaseListenerMgr.informPhaseListenersAfter(executor.getPhase());
@@ -111,13 +111,13 @@
 
 
         if (isResponseComplete(facesContext, executor.getPhase(), false)
-        		|| shouldRenderResponse(facesContext, executor.getPhase(), false)) {
-        	// since this phase is completed we don't need to return right away even if the response is completed
-        	skipFurtherProcessing = true;
+                || shouldRenderResponse(facesContext, executor.getPhase(), false)) {
+            // since this phase is completed we don't need to return right away even if the response is completed
+            skipFurtherProcessing = true;
         }
 
         if (!skipFurtherProcessing && log.isTraceEnabled()) {
-			log.trace("exiting " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
+            log.trace("exiting " + executor.getPhase() + " in " + LifecycleImpl.class.getName());
         }
 
         return skipFurtherProcessing;
@@ -128,9 +128,9 @@
             throw new NullPointerException("FacesContext is null");
         }
 
-    	// if the response is complete we should not be invoking the phase listeners
+        // if the response is complete we should not be invoking the phase listeners
         if(isResponseComplete(facesContext, renderExecutor.getPhase(), true)) {
-        	return;
+            return;
         }
         if (log.isTraceEnabled()) log.trace("entering " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
 
@@ -140,7 +140,7 @@
             phaseListenerMgr.informPhaseListenersBefore(renderExecutor.getPhase());
             // also possible that one of the listeners completed the response
             if(isResponseComplete(facesContext, renderExecutor.getPhase(), true)) {
-            	return;
+                return;
             }
 
             renderExecutor.execute(facesContext);
@@ -154,64 +154,64 @@
         }
 
         if (log.isTraceEnabled()) {
-        	log.trace("exiting " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
+            log.trace("exiting " + renderExecutor.getPhase() + " in " + LifecycleImpl.class.getName());
         }
     }
 
     private boolean isResponseComplete(FacesContext facesContext, PhaseId phase, boolean before) {
-		boolean flag = false;
-	    if (facesContext.getResponseComplete()) {
-	        if (log.isDebugEnabled()) {
-				log.debug("exiting from lifecycle.execute in " + phase
-						+ " because getResponseComplete is true from one of the " +
-						(before ? "before" : "after") + " listeners");
-	        }
-	        flag = true;
-	    }
-	    return flag;
-	}
-
-	private boolean shouldRenderResponse(FacesContext facesContext, PhaseId phase, boolean before) {
-			boolean flag = false;
-	    if (facesContext.getRenderResponse()) {
-	        if (log.isDebugEnabled()) {
-				log.debug("exiting from lifecycle.execute in " + phase
-						+ " because getRenderResponse is true from one of the " +
-						(before ? "before" : "after") + " listeners");
-	        }
-	        flag = true;
-	    }
-	    return flag;
-	}
+        boolean flag = false;
+        if (facesContext.getResponseComplete()) {
+            if (log.isDebugEnabled()) {
+                log.debug("exiting from lifecycle.execute in " + phase
+                        + " because getResponseComplete is true from one of the " +
+                        (before ? "before" : "after") + " listeners");
+            }
+            flag = true;
+        }
+        return flag;
+    }
+
+    private boolean shouldRenderResponse(FacesContext facesContext, PhaseId phase, boolean before) {
+            boolean flag = false;
+        if (facesContext.getRenderResponse()) {
+            if (log.isDebugEnabled()) {
+                log.debug("exiting from lifecycle.execute in " + phase
+                        + " because getRenderResponse is true from one of the " +
+                        (before ? "before" : "after") + " listeners");
+            }
+            flag = true;
+        }
+        return flag;
+    }
 
     public void addPhaseListener(PhaseListener phaseListener) {
-		if (phaseListener == null) {
-			throw new NullPointerException("PhaseListener must not be null.");
-		}
-		synchronized (_phaseListenerList) {
-			_phaseListenerList.add(phaseListener);
-			_phaseListenerArray = null; // reset lazy cache array
-		}
-	}
-
-	public void removePhaseListener(PhaseListener phaseListener) {
-		if (phaseListener == null) {
-			throw new NullPointerException("PhaseListener must not be null.");
-		}
-		synchronized (_phaseListenerList) {
-			_phaseListenerList.remove(phaseListener);
-			_phaseListenerArray = null; // reset lazy cache array
-		}
-	}
-
-	public PhaseListener[] getPhaseListeners() {
-		synchronized (_phaseListenerList) {
-			// (re)build lazy cache array if necessary
-			if (_phaseListenerArray == null) {
-				_phaseListenerArray = (PhaseListener[]) _phaseListenerList.toArray(new PhaseListener[_phaseListenerList
-						.size()]);
-			}
-			return _phaseListenerArray;
-		}
-	}
+        if (phaseListener == null) {
+            throw new NullPointerException("PhaseListener must not be null.");
+        }
+        synchronized (_phaseListenerList) {
+            _phaseListenerList.add(phaseListener);
+            _phaseListenerArray = null; // reset lazy cache array
+        }
+    }
+
+    public void removePhaseListener(PhaseListener phaseListener) {
+        if (phaseListener == null) {
+            throw new NullPointerException("PhaseListener must not be null.");
+        }
+        synchronized (_phaseListenerList) {
+            _phaseListenerList.remove(phaseListener);
+            _phaseListenerArray = null; // reset lazy cache array
+        }
+    }
+
+    public PhaseListener[] getPhaseListeners() {
+        synchronized (_phaseListenerList) {
+            // (re)build lazy cache array if necessary
+            if (_phaseListenerArray == null) {
+                _phaseListenerArray = (PhaseListener[]) _phaseListenerList.toArray(new PhaseListener[_phaseListenerList
+                        .size()]);
+            }
+            return _phaseListenerArray;
+        }
+    }
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseExecutor.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseExecutor.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/PhaseExecutor.java Thu Jul  3 14:07:46 2008
@@ -36,8 +36,8 @@
    * @param facesContext The <code>FacesContext</code> for the current request we are processing 
    * @return <code>true</code> if execution should be stopped
    */
-	boolean execute(FacesContext facesContext);
-	
+    boolean execute(FacesContext facesContext);
+    
   /**
    * Returns the <code>PhaseId</code> for which the implemented executor is invoked 
    * @return

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/ProcessValidationsExecutor.java Thu Jul  3 14:07:46 2008
@@ -28,12 +28,12 @@
  * Process validations phase (JSF Spec 2.2.3)
  */
 class ProcessValidationsExecutor implements PhaseExecutor {
-	public boolean execute(FacesContext facesContext) {
-		facesContext.getViewRoot().processValidators(facesContext);
-		return false;
-	}
+    public boolean execute(FacesContext facesContext) {
+        facesContext.getViewRoot().processValidators(facesContext);
+        return false;
+    }
 
-	public PhaseId getPhase() {
-		return PhaseId.PROCESS_VALIDATIONS;
-	}
+    public PhaseId getPhase() {
+        return PhaseId.PROCESS_VALIDATIONS;
+    }
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java Thu Jul  3 14:07:46 2008
@@ -33,19 +33,19 @@
  * render response phase (JSF Spec 2.2.6)
  */
 class RenderResponseExecutor implements PhaseExecutor {
-	public boolean execute(FacesContext facesContext) {
-		Application application = facesContext.getApplication();
-		ViewHandler viewHandler = application.getViewHandler();
+    public boolean execute(FacesContext facesContext) {
+        Application application = facesContext.getApplication();
+        ViewHandler viewHandler = application.getViewHandler();
 
-		try {
-			viewHandler.renderView(facesContext, facesContext.getViewRoot());
-		} catch (IOException e) {
-			throw new FacesException(e.getMessage(), e);
-		}
-		return false;
-	}
+        try {
+            viewHandler.renderView(facesContext, facesContext.getViewRoot());
+        } catch (IOException e) {
+            throw new FacesException(e.getMessage(), e);
+        }
+        return false;
+    }
 
-	public PhaseId getPhase() {
-		return PhaseId.RENDER_RESPONSE;
-	}
+    public PhaseId getPhase() {
+        return PhaseId.RENDER_RESPONSE;
+    }
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java Thu Jul  3 14:07:46 2008
@@ -45,58 +45,58 @@
  */
 class RestoreViewExecutor implements PhaseExecutor {
 
-	private static final Log log = LogFactory.getLog(LifecycleImpl.class);
+    private static final Log log = LogFactory.getLog(LifecycleImpl.class);
 
-	public boolean execute(FacesContext facesContext) {
-		if(facesContext.getViewRoot() != null) {
-			facesContext.getViewRoot().setLocale(facesContext.getExternalContext().getRequestLocale());
-			RestoreStateUtils.recursivelyHandleComponentReferencesAndSetValid(facesContext, facesContext.getViewRoot());
-			return false;
-		}
-
-		// Derive view identifier
-		String viewId = deriveViewId(facesContext);
-
-		if (viewId == null) {
-			ExternalContext externalContext = facesContext.getExternalContext();
-
-			if(externalContext.getRequestServletPath() == null) {
-				return true;
-			}
-			
-			if (!externalContext.getRequestServletPath().endsWith("/")) {
-				try {
-					externalContext.redirect(externalContext.getRequestServletPath() + "/");
-					facesContext.responseComplete();
-					return true;
-				} catch (IOException e) {
-					throw new FacesException("redirect failed", e);
-				}
-			}
-		}
-
-		Application application = facesContext.getApplication();
-		ViewHandler viewHandler = application.getViewHandler();
-
-		// boolean viewCreated = false;
-		UIViewRoot viewRoot = viewHandler.restoreView(facesContext, viewId);
-		if (viewRoot == null) {
-			viewRoot = viewHandler.createView(facesContext, viewId);
-			viewRoot.setViewId(viewId);
-			facesContext.renderResponse();
-			// viewCreated = true;
-		}
+    public boolean execute(FacesContext facesContext) {
+        if(facesContext.getViewRoot() != null) {
+            facesContext.getViewRoot().setLocale(facesContext.getExternalContext().getRequestLocale());
+            RestoreStateUtils.recursivelyHandleComponentReferencesAndSetValid(facesContext, facesContext.getViewRoot());
+            return false;
+        }
+
+        // Derive view identifier
+        String viewId = deriveViewId(facesContext);
+
+        if (viewId == null) {
+            ExternalContext externalContext = facesContext.getExternalContext();
+
+            if(externalContext.getRequestServletPath() == null) {
+                return true;
+            }
+            
+            if (!externalContext.getRequestServletPath().endsWith("/")) {
+                try {
+                    externalContext.redirect(externalContext.getRequestServletPath() + "/");
+                    facesContext.responseComplete();
+                    return true;
+                } catch (IOException e) {
+                    throw new FacesException("redirect failed", e);
+                }
+            }
+        }
+
+        Application application = facesContext.getApplication();
+        ViewHandler viewHandler = application.getViewHandler();
+
+        // boolean viewCreated = false;
+        UIViewRoot viewRoot = viewHandler.restoreView(facesContext, viewId);
+        if (viewRoot == null) {
+            viewRoot = viewHandler.createView(facesContext, viewId);
+            viewRoot.setViewId(viewId);
+            facesContext.renderResponse();
+            // viewCreated = true;
+        }
 
-		facesContext.setViewRoot(viewRoot);
+        facesContext.setViewRoot(viewRoot);
 
     if (!isPostback(facesContext)) {
-			// no POST or query parameters --> set render response flag
-			facesContext.renderResponse();
-		}
-
-		RestoreStateUtils.recursivelyHandleComponentReferencesAndSetValid(facesContext, viewRoot);
-		return false;
-	}
+            // no POST or query parameters --> set render response flag
+            facesContext.renderResponse();
+        }
+
+        RestoreStateUtils.recursivelyHandleComponentReferencesAndSetValid(facesContext, viewRoot);
+        return false;
+    }
   
     
   /**
@@ -111,43 +111,43 @@
       return facesContext.getExternalContext().getRequestParameterMap().containsKey(HtmlResponseStateManager.STANDARD_STATE_SAVING_PARAM);
   } 
 
-	public PhaseId getPhase() {
-		return PhaseId.RESTORE_VIEW;
-	}
-
-	private static String deriveViewId(FacesContext facesContext) {
-		ExternalContext externalContext = facesContext.getExternalContext();
-
-		if (PortletUtil.isPortletRequest(facesContext)) {
-			PortletRequest request = (PortletRequest) externalContext.getRequest();
-			return request.getParameter(MyFacesGenericPortlet.VIEW_ID);
-		}
-
-		String viewId = externalContext.getRequestPathInfo(); // getPathInfo
-		if (viewId == null) {
-			// No extra path info found, so it is probably extension mapping
-			viewId = externalContext.getRequestServletPath(); // getServletPath
-			DebugUtils.assertError(viewId != null, log,
-					"RequestServletPath is null, cannot determine viewId of current page.");
-			if (viewId == null)
-				return null;
-
-			// TODO: JSF Spec 2.2.1 - what do they mean by "if the default
-			// ViewHandler implementation is used..." ?
-			String defaultSuffix = externalContext.getInitParameter(ViewHandler.DEFAULT_SUFFIX_PARAM_NAME);
-			String suffix = defaultSuffix != null ? defaultSuffix : ViewHandler.DEFAULT_SUFFIX;
-			DebugUtils.assertError(suffix.charAt(0) == '.', log, "Default suffix must start with a dot!");
-
-			int slashPos = viewId.lastIndexOf('/');
-			int extensionPos = viewId.lastIndexOf('.');
-			if (extensionPos == -1 || extensionPos <= slashPos) {
-				log.error("Assumed extension mapping, but there is no extension in " + viewId);
-				viewId = null;
-			} else {
-				viewId = viewId.substring(0, extensionPos) + suffix;
-			}
-		}
+    public PhaseId getPhase() {
+        return PhaseId.RESTORE_VIEW;
+    }
+
+    private static String deriveViewId(FacesContext facesContext) {
+        ExternalContext externalContext = facesContext.getExternalContext();
+
+        if (PortletUtil.isPortletRequest(facesContext)) {
+            PortletRequest request = (PortletRequest) externalContext.getRequest();
+            return request.getParameter(MyFacesGenericPortlet.VIEW_ID);
+        }
+
+        String viewId = externalContext.getRequestPathInfo(); // getPathInfo
+        if (viewId == null) {
+            // No extra path info found, so it is probably extension mapping
+            viewId = externalContext.getRequestServletPath(); // getServletPath
+            DebugUtils.assertError(viewId != null, log,
+                    "RequestServletPath is null, cannot determine viewId of current page.");
+            if (viewId == null)
+                return null;
+
+            // TODO: JSF Spec 2.2.1 - what do they mean by "if the default
+            // ViewHandler implementation is used..." ?
+            String defaultSuffix = externalContext.getInitParameter(ViewHandler.DEFAULT_SUFFIX_PARAM_NAME);
+            String suffix = defaultSuffix != null ? defaultSuffix : ViewHandler.DEFAULT_SUFFIX;
+            DebugUtils.assertError(suffix.charAt(0) == '.', log, "Default suffix must start with a dot!");
+
+            int slashPos = viewId.lastIndexOf('/');
+            int extensionPos = viewId.lastIndexOf('.');
+            if (extensionPos == -1 || extensionPos <= slashPos) {
+                log.error("Assumed extension mapping, but there is no extension in " + viewId);
+                viewId = null;
+            } else {
+                viewId = viewId.substring(0, extensionPos) + suffix;
+            }
+        }
 
-		return viewId;
-	}
+        return viewId;
+    }
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/lifecycle/UpdateModelValuesExecutor.java Thu Jul  3 14:07:46 2008
@@ -29,12 +29,12 @@
  * Update model values phase (JSF Spec 2.2.4)
  */
 class UpdateModelValuesExecutor implements PhaseExecutor {
-	public boolean execute(FacesContext facesContext) {
-		facesContext.getViewRoot().processUpdates(facesContext);
-		return false;
-	}
+    public boolean execute(FacesContext facesContext) {
+        facesContext.getViewRoot().processUpdates(facesContext);
+        return false;
+    }
 
-	public PhaseId getPhase() {
-		return PhaseId.UPDATE_MODEL_VALUES;
-	}
+    public PhaseId getPhase() {
+        return PhaseId.UPDATE_MODEL_VALUES;
+    }
 }

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertDateTimeTag.java Thu Jul  3 14:07:46 2008
@@ -31,17 +31,17 @@
 public class ConvertDateTimeTag
         extends ConvertDateTimeTagBase
 {
-	
+    
     /**
      * serial version id for correct serialisation versioning
      */
     private static final long serialVersionUID = 1L;
 
-	
+    
     public void setPageContext(PageContext context)
     {
         super.setPageContext(context);
         setConverterId(DateTimeConverter.CONVERTER_ID);
     }
-	
+    
 }
\ No newline at end of file

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/LoadBundleTag.java Thu Jul  3 14:07:46 2008
@@ -199,11 +199,11 @@
 
         public boolean containsKey(Object key)
         {
-        	try {
+            try {
                 return _bundle.getObject(key.toString()) != null;
-        	} catch (MissingResourceException e) {
-        		return false;
-        	}
+            } catch (MissingResourceException e) {
+                return false;
+            }
         }
 
 

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/util/DebugUtils.java Thu Jul  3 14:07:46 2008
@@ -369,7 +369,7 @@
             }
             else if (value instanceof MethodBinding)
             {
-            	stream.print(((MethodBinding)value).getExpressionString());
+                stream.print(((MethodBinding)value).getExpressionString());
             }
             else
             {

Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/application/jsp/JspStateManagerImplTest.java Thu Jul  3 14:07:46 2008
@@ -61,9 +61,9 @@
         output.setId("foo");
 
                 /*todo: java.lang.UnsupportedOperationException
-	at org.apache.shale.test.mock.MockRenderKit.getResponseStateManager(MockRenderKit.java:125)
-	at org.apache.myfaces.application.jsp.JspStateManagerImpl.writeState(JspStateManagerImpl.java:428)
-	at org.apache.myfaces.application.jsp.JspStateManagerImplTest.testWriteAndRestoreState(JspStateManagerImplTest.java:61)
+    at org.apache.shale.test.mock.MockRenderKit.getResponseStateManager(MockRenderKit.java:125)
+    at org.apache.myfaces.application.jsp.JspStateManagerImpl.writeState(JspStateManagerImpl.java:428)
+    at org.apache.myfaces.application.jsp.JspStateManagerImplTest.testWriteAndRestoreState(JspStateManagerImplTest.java:61)
         stateManager.writeState(facesContext, stateManager.saveSerializedView(facesContext));
 
         UIViewRoot restoredViewRoot = stateManager.restoreView(facesContext, "/root", RenderKitFactory.HTML_BASIC_RENDER_KIT);

Modified: myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java?rev=673803&r1=673802&r2=673803&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java (original)
+++ myfaces/core/trunk/impl/src/test/java/org/apache/myfaces/config/AbstractManagedBeanBuilderTestCase.java Thu Jul  3 14:07:46 2008
@@ -47,103 +47,103 @@
 
 public abstract class AbstractManagedBeanBuilderTestCase extends TestCase {
 
-	protected MangedBeanExample example;
-	
-	// managed property values
-	protected static final List MANAGED_LIST = new ArrayList();
-	protected static final Map MANAGED_MAP = new HashMap();
-	protected static final String INJECTED_VALUE = "tatiana";
-	
-	/**
-	 * Skips digester and manually builds and configures a managed bean.
-	 */
-	
-	protected void setUp() throws Exception {
-		ManagedBeanBuilder managedBeanBuilder = new ManagedBeanBuilder();
-		ManagedBean managedBean = new ManagedBean();
-		
-		managedBean.setBeanClass(MangedBeanExample.class.getName());
-		managedBean.setName("managed");
-		managedBean.setScope("request");
-		
-		// test methods of children will want to make sure these values come 
-		// out on the other end of this.
-		MANAGED_LIST.add("0");
-		MANAGED_LIST.add("1");
-		MANAGED_LIST.add("2");
-		MANAGED_MAP.put("0", "0");
-		MANAGED_MAP.put("1", "1");
-		MANAGED_MAP.put("2", "2");
-		
-		ManagedProperty managedProperty = new ManagedProperty();
-		managedProperty.setPropertyName("managedProperty");
-		managedProperty.setValue(INJECTED_VALUE);
-		
-		ManagedProperty managedList = new ManagedProperty();
-		managedList.setPropertyName("managedList");
-		ListEntries listEntries = makeListEntries();
-		managedList.setListEntries(listEntries);
-		
-		ManagedProperty writeOnlyList = new ManagedProperty();
-		writeOnlyList.setPropertyName("writeOnlyList");
-		ListEntries writeOnlyListEntries = makeListEntries();
-		writeOnlyList.setListEntries(writeOnlyListEntries);
-		
-		ManagedProperty managedMap = new ManagedProperty();
-		managedMap.setPropertyName("managedMap");
-		MapEntries mapEntries = makeMapEntries();
-		managedMap.setMapEntries(mapEntries);
-		
-		ManagedProperty writeOnlyMap = new ManagedProperty();
-		writeOnlyMap.setPropertyName("writeOnlyMap");
-		MapEntries writeOnlyMapEntries = makeMapEntries();
-		writeOnlyMap.setMapEntries(writeOnlyMapEntries);		
-		
-		managedBean.addProperty(managedProperty);
-		managedBean.addProperty(managedList);
-		managedBean.addProperty(writeOnlyList);
-		managedBean.addProperty(managedMap);
-		managedBean.addProperty(writeOnlyMap);
+    protected MangedBeanExample example;
+    
+    // managed property values
+    protected static final List MANAGED_LIST = new ArrayList();
+    protected static final Map MANAGED_MAP = new HashMap();
+    protected static final String INJECTED_VALUE = "tatiana";
+    
+    /**
+     * Skips digester and manually builds and configures a managed bean.
+     */
+    
+    protected void setUp() throws Exception {
+        ManagedBeanBuilder managedBeanBuilder = new ManagedBeanBuilder();
+        ManagedBean managedBean = new ManagedBean();
+        
+        managedBean.setBeanClass(MangedBeanExample.class.getName());
+        managedBean.setName("managed");
+        managedBean.setScope("request");
+        
+        // test methods of children will want to make sure these values come 
+        // out on the other end of this.
+        MANAGED_LIST.add("0");
+        MANAGED_LIST.add("1");
+        MANAGED_LIST.add("2");
+        MANAGED_MAP.put("0", "0");
+        MANAGED_MAP.put("1", "1");
+        MANAGED_MAP.put("2", "2");
+        
+        ManagedProperty managedProperty = new ManagedProperty();
+        managedProperty.setPropertyName("managedProperty");
+        managedProperty.setValue(INJECTED_VALUE);
+        
+        ManagedProperty managedList = new ManagedProperty();
+        managedList.setPropertyName("managedList");
+        ListEntries listEntries = makeListEntries();
+        managedList.setListEntries(listEntries);
+        
+        ManagedProperty writeOnlyList = new ManagedProperty();
+        writeOnlyList.setPropertyName("writeOnlyList");
+        ListEntries writeOnlyListEntries = makeListEntries();
+        writeOnlyList.setListEntries(writeOnlyListEntries);
+        
+        ManagedProperty managedMap = new ManagedProperty();
+        managedMap.setPropertyName("managedMap");
+        MapEntries mapEntries = makeMapEntries();
+        managedMap.setMapEntries(mapEntries);
+        
+        ManagedProperty writeOnlyMap = new ManagedProperty();
+        writeOnlyMap.setPropertyName("writeOnlyMap");
+        MapEntries writeOnlyMapEntries = makeMapEntries();
+        writeOnlyMap.setMapEntries(writeOnlyMapEntries);        
+        
+        managedBean.addProperty(managedProperty);
+        managedBean.addProperty(managedList);
+        managedBean.addProperty(writeOnlyList);
+        managedBean.addProperty(managedMap);
+        managedBean.addProperty(writeOnlyMap);
 
-		// provide the minimal environment 
-		Application application = null;
-		application = new ApplicationImpl();
-		application.setPropertyResolver(new PropertyResolverImpl());
-		MockFacesContext facesContext = new MockFacesContext();
-		facesContext.setApplication(application);
-		
-		// simulate a managed bean creation
-		example = (MangedBeanExample) managedBeanBuilder
-			.buildManagedBean(facesContext, managedBean);
-	}
-	
-	protected void tearDown() throws Exception {
-		example = null;
-		MANAGED_LIST.clear();
-		MANAGED_MAP.clear();
-	}
-	
-	private ListEntries makeListEntries(){
-		ListEntries listEntries = new ListEntries();
-		
-		for(int i = 0; i < MANAGED_LIST.size(); i++){
-			Entry entry = new Entry();
-			entry.setValue((String) MANAGED_LIST.get(i));
-			listEntries.addEntry(entry);
-		}
-		return listEntries;
-	}
-	
-	private MapEntries makeMapEntries(){
-		MapEntries mapEntries = new MapEntries();
-		
-		for(int i = 0 ; i < MANAGED_MAP.size(); i++){
-			MapEntries.Entry mapEntry = new MapEntries.Entry();
-			mapEntry.setKey((String) MANAGED_MAP.get(i + ""));
-			mapEntry.setValue((String) MANAGED_MAP.get(i + ""));
-			mapEntries.addEntry(mapEntry);
-		}
-		return mapEntries;
-	}
-	
+        // provide the minimal environment 
+        Application application = null;
+        application = new ApplicationImpl();
+        application.setPropertyResolver(new PropertyResolverImpl());
+        MockFacesContext facesContext = new MockFacesContext();
+        facesContext.setApplication(application);
+        
+        // simulate a managed bean creation
+        example = (MangedBeanExample) managedBeanBuilder
+            .buildManagedBean(facesContext, managedBean);
+    }
+    
+    protected void tearDown() throws Exception {
+        example = null;
+        MANAGED_LIST.clear();
+        MANAGED_MAP.clear();
+    }
+    
+    private ListEntries makeListEntries(){
+        ListEntries listEntries = new ListEntries();
+        
+        for(int i = 0; i < MANAGED_LIST.size(); i++){
+            Entry entry = new Entry();
+            entry.setValue((String) MANAGED_LIST.get(i));
+            listEntries.addEntry(entry);
+        }
+        return listEntries;
+    }
+    
+    private MapEntries makeMapEntries(){
+        MapEntries mapEntries = new MapEntries();
+        
+        for(int i = 0 ; i < MANAGED_MAP.size(); i++){
+            MapEntries.Entry mapEntry = new MapEntries.Entry();
+            mapEntry.setKey((String) MANAGED_MAP.get(i + ""));
+            mapEntry.setValue((String) MANAGED_MAP.get(i + ""));
+            mapEntries.addEntry(mapEntry);
+        }
+        return mapEntries;
+    }
+    
 }



Mime
View raw message