Menu
▾
▴
[jboss-cvs] jboss-seam/examples/hibernate/src/org/jboss/seam/example/hibernate ...
|
From: Gavin K. <gav...@jb...> - 2006-03-26 21:30:39
|
User: gavin
Date: 06/03/26 16:30:37
Modified: examples/hibernate/src/org/jboss/seam/example/hibernate
ChangePasswordAction.java HotelBookingAction.java
LoginAction.java RegisterAction.java
Log:
use FacesMessages
Revision Changes Path
1.2 +3 -8 jboss-seam/examples/hibernate/src/org/jboss/seam/example/hibernate/ChangePasswordAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ChangePasswordAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/hibernate/src/org/jboss/seam/example/hibernate/ChangePasswordAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ChangePasswordAction.java 23 Jan 2006 11:19:39 -0000 1.1
+++ ChangePasswordAction.java 26 Mar 2006 21:30:37 -0000 1.2
@@ -1,17 +1,15 @@
-//$Id: ChangePasswordAction.java,v 1.1 2006/01/23 11:19:39 theute Exp $
+//$Id: ChangePasswordAction.java,v 1.2 2006/03/26 21:30:37 gavin Exp $
package org.jboss.seam.example.hibernate;
import static org.jboss.seam.annotations.Outcome.REDISPLAY;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-
import org.hibernate.Session;
import org.hibernate.validator.Valid;
import org.jboss.seam.annotations.IfInvalid;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
+import org.jboss.seam.core.FacesMessages;
@Name("changePassword")
@LoggedIn
@@ -24,9 +22,6 @@
@In(create=true)
private Session bookingDatabase;
- @In
- private FacesContext facesContext;
-
private String verify;
@IfInvalid(outcome=REDISPLAY)
@@ -39,7 +34,7 @@
}
else
{
- facesContext.addMessage(null, new FacesMessage("Re-enter new password"));
+ FacesMessages.instance().add("Re-enter new password");
bookingDatabase.refresh(user);
verify=null;
return null;
1.3 +6 -9 jboss-seam/examples/hibernate/src/org/jboss/seam/example/hibernate/HotelBookingAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HotelBookingAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/hibernate/src/org/jboss/seam/example/hibernate/HotelBookingAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- HotelBookingAction.java 23 Jan 2006 12:14:13 -0000 1.2
+++ HotelBookingAction.java 26 Mar 2006 21:30:37 -0000 1.3
@@ -1,4 +1,4 @@
-//$Id: HotelBookingAction.java,v 1.2 2006/01/23 12:14:13 gavin Exp $
+//$Id: HotelBookingAction.java,v 1.3 2006/03/26 21:30:37 gavin Exp $
package org.jboss.seam.example.hibernate;
import static org.jboss.seam.ScopeType.CONVERSATION;
@@ -8,9 +8,6 @@
import java.util.Calendar;
import java.util.List;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-
import org.hibernate.Session;
import org.hibernate.validator.Valid;
import org.jboss.seam.annotations.Begin;
@@ -23,6 +20,7 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.datamodel.DataModelSelectionIndex;
+import org.jboss.seam.core.FacesMessages;
@Name("hotelBooking")
@Scope(CONVERSATION)
@@ -52,12 +50,12 @@
@In
private User user;
- @In
- private transient FacesContext facesContext;
-
@In(required=false)
private transient BookingListAction bookingList;
+ @In(create=true)
+ private transient FacesMessages facesMessages;
+
public String getSearchString()
{
return searchString;
@@ -133,8 +131,7 @@
if ( !booking.getCheckinDate().before( booking.getCheckoutDate() ) )
{
- FacesMessage facesMessage = new FacesMessage("Check out date must be later than check in date");
- facesContext.addMessage(null, facesMessage);
+ facesMessages.add("Check out date must be later than check in date");
return null;
}
else
1.2 +5 -7 jboss-seam/examples/hibernate/src/org/jboss/seam/example/hibernate/LoginAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LoginAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/hibernate/src/org/jboss/seam/example/hibernate/LoginAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- LoginAction.java 23 Jan 2006 11:19:39 -0000 1.1
+++ LoginAction.java 26 Mar 2006 21:30:37 -0000 1.2
@@ -1,19 +1,17 @@
-//$Id: LoginAction.java,v 1.1 2006/01/23 11:19:39 theute Exp $
+//$Id: LoginAction.java,v 1.2 2006/03/26 21:30:37 gavin Exp $
package org.jboss.seam.example.hibernate;
import static org.jboss.seam.ScopeType.STATELESS;
import java.util.List;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-
import org.hibernate.Session;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.contexts.Context;
+import org.jboss.seam.core.FacesMessages;
@Name("login")
@Scope(STATELESS)
@@ -29,8 +27,8 @@
@In
private Context sessionContext;
- @In
- private FacesContext facesContext;
+ @In(create=true)
+ private FacesMessages facesMessages;
public String login()
{
@@ -41,7 +39,7 @@
if ( results.size()==0 )
{
- facesContext.addMessage(null, new FacesMessage("Invalid login"));
+ facesMessages.add("Invalid login");
return "login";
}
else
1.2 +6 -8 jboss-seam/examples/hibernate/src/org/jboss/seam/example/hibernate/RegisterAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegisterAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/hibernate/src/org/jboss/seam/example/hibernate/RegisterAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- RegisterAction.java 23 Jan 2006 11:19:39 -0000 1.1
+++ RegisterAction.java 26 Mar 2006 21:30:37 -0000 1.2
@@ -1,4 +1,4 @@
-//$Id: RegisterAction.java,v 1.1 2006/01/23 11:19:39 theute Exp $
+//$Id: RegisterAction.java,v 1.2 2006/03/26 21:30:37 gavin Exp $
package org.jboss.seam.example.hibernate;
import static org.jboss.seam.ScopeType.EVENT;
@@ -6,15 +6,13 @@
import java.util.List;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-
import org.hibernate.Session;
import org.hibernate.validator.Valid;
import org.jboss.seam.annotations.IfInvalid;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
+import org.jboss.seam.core.FacesMessages;
@Scope(EVENT)
@Name("register")
@@ -27,8 +25,8 @@
@In(create=true)
private Session bookingDatabase;
- @In
- private FacesContext facesContext;
+ @In(create=true)
+ private FacesMessages facesMessages;
private String verify;
@@ -47,13 +45,13 @@
}
else
{
- facesContext.addMessage(null, new FacesMessage("username already exists"));
+ facesMessages.add("username already exists");
return null;
}
}
else
{
- facesContext.addMessage(null, new FacesMessage("re-enter your password"));
+ facesMessages.add("re-enter your password");
verify=null;
return null;
}
|