empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject svn commit: r1448949 - in /empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main: java/org/apache/empire/jsf2/websample/web/pages/LoginPage.java webapp/pages/employeeDetailPage.xhtml
Date Fri, 22 Feb 2013 09:04:52 GMT
Author: doebele
Date: Fri Feb 22 09:04:52 2013
New Revision: 1448949

URL: http://svn.apache.org/r1448949
Log:
EMPIREDB-175 
rename misleading method name redirectTo() to navigateTo()

Modified:
    empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/LoginPage.java
    empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeDetailPage.xhtml

Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/LoginPage.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/LoginPage.java?rev=1448949&r1=1448948&r2=1448949&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/LoginPage.java
(original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/java/org/apache/empire/jsf2/websample/web/pages/LoginPage.java
Fri Feb 22 09:04:52 2013
@@ -32,14 +32,14 @@ public class LoginPage extends SamplePag
 		SampleSession session =	SampleUtils.getSampleSession();
 		session.setUser(SampleUtils.getSampleUser());
 		// goto list page
-		redirectTo(SamplePages.EmployeeListPage.getOutcome());
+		navigateTo(SamplePages.EmployeeListPage.getRedirect());
 	}
 
 	public void doLogout() 
 	{
 		// Perform logout
 		PageOutcome logout = this.getPageDefinition().getRedirect().addParam("logout", String.valueOf(true));
-		redirectTo( logout );
+		navigateTo( logout );
 		
         // Invalidate Session
 		FacesUtils.getContext().getExternalContext().invalidateSession();

Modified: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeDetailPage.xhtml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeDetailPage.xhtml?rev=1448949&r1=1448948&r2=1448949&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeDetailPage.xhtml
(original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-jsf2/src/main/webapp/pages/employeeDetailPage.xhtml
Fri Feb 22 09:04:52 2013
@@ -53,7 +53,7 @@
 				<!-- button bar -->
 				<h:panelGroup styleClass="buttonBar" layout="block">
 					<h:commandLink value="#{msg.employeeDetail_back}" action="#{page.doCancel}" immediate="true"
/>
-					<h:commandLink value="#{msg.employeeDetail_delete}" action="#{page.doDelete}" immediate="true"
rendered="#{page.idParam != null}" />
+					<h:commandLink value="#{msg.employeeDetail_delete}" action="#{page.doDelete}" immediate="true"
rendered="#{!page.employeeRecord.new}" />
 					<h:commandLink value="#{msg.employeeDetail_save}" action="#{page.doSave}" />
 				</h:panelGroup>
 			</h:form>



Mime
View raw message