[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action ...
Christian Bauer
christian at hibernate.org
Wed Mar 21 13:32:24 EDT 2007
User: cbauer
Date: 07/03/21 13:32:24
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/action
NodeHistory.java UserSearch.java UserHome.java
Log:
Support EL value bindings in plugin CSS files
Revision Changes Path
1.3 +1 -19 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHistory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeHistory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHistory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NodeHistory.java 18 Mar 2007 15:44:37 -0000 1.2
+++ NodeHistory.java 21 Mar 2007 17:32:24 -0000 1.3
@@ -6,7 +6,6 @@
import org.jboss.seam.ScopeType;
import org.jboss.seam.Component;
import org.jboss.seam.core.FacesMessages;
-import org.jboss.seam.core.Conversation;
import org.jboss.seam.wiki.core.dao.NodeDAO;
import org.jboss.seam.wiki.core.model.Node;
import org.jboss.seam.wiki.core.model.Document;
@@ -59,25 +58,8 @@
FacesMessage.SEVERITY_INFO,
"noHistory",
"No stored history for this document.");
- exitConversation(false);
- }
- }
-
- // TODO: Typical exit method to get out of a root or nested conversation, JBSEAM-906
- public void exitConversation(Boolean endBeforeRedirect) {
- Conversation currentConversation = Conversation.instance();
- if (currentConversation.isNested()) {
- // End this nested conversation and return to last rendered view-id of parent
- currentConversation.endAndRedirect(endBeforeRedirect);
- } else {
- // End this root conversation
- currentConversation.end();
- // Return to the view-id that was captured when this conversation started
NodeBrowser browser = (NodeBrowser) Component.getInstance("browser");
- if (endBeforeRedirect)
- browser.redirectToLastBrowsedPage();
- else
- browser.redirectToLastBrowsedPageWithConversation();
+ browser.exitConversation(false);
}
}
1.2 +0 -19 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserSearch.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UserSearch.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserSearch.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UserSearch.java 7 Mar 2007 18:37:37 -0000 1.1
+++ UserSearch.java 21 Mar 2007 17:32:24 -0000 1.2
@@ -4,9 +4,7 @@
import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.ScopeType;
import org.jboss.seam.core.FacesMessages;
-import org.jboss.seam.core.Conversation;
import org.jboss.seam.wiki.core.dao.UserDAO;
-import org.jboss.seam.wiki.core.action.NodeBrowser;
import org.jboss.seam.wiki.core.model.User;
import javax.faces.application.FacesMessage;
@@ -48,23 +46,6 @@
ignoreProperties = new String[]{"passwordHash", "activated", "createdOn"};
}
- // TODO: Typical exit method to get out of a root or nested conversation, JBSEAM-906
- public void exitConversation(Boolean endBeforeRedirect) {
- Conversation currentConversation = Conversation.instance();
- if (currentConversation.isNested()) {
- // End this nested conversation and return to last rendered view-id of parent
- currentConversation.endAndRedirect(endBeforeRedirect);
- } else {
- // End this root conversation
- currentConversation.end();
- // Return to the view-id that was captured when this conversation started
- if (endBeforeRedirect)
- browser.redirectToLastBrowsedPage();
- else
- browser.redirectToLastBrowsedPageWithConversation();
- }
- }
-
public void find() {
page = 0;
queryRowCount();
1.3 +5 -20 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UserHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/UserHome.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- UserHome.java 18 Mar 2007 15:44:37 -0000 1.2
+++ UserHome.java 21 Mar 2007 17:32:24 -0000 1.3
@@ -42,6 +42,9 @@
@In
private Renderer renderer;
+ @In
+ NodeBrowser browser;
+
private org.jboss.seam.wiki.core.model.Role defaultRole;
private String oldUsername;
@@ -68,24 +71,6 @@
if (isManaged()) roles = getInstance().getRoles();
}
- // TODO: Typical exit method to get out of a root or nested conversation, JBSEAM-906
- public void exitConversation(Boolean endBeforeRedirect) {
- Conversation currentConversation = Conversation.instance();
- if (currentConversation.isNested()) {
- // End this nested conversation and return to last rendered view-id of parent
- currentConversation.endAndRedirect(endBeforeRedirect);
- } else {
- // End this root conversation
- currentConversation.end();
- // Return to the view-id that was captured when this conversation started
- NodeBrowser browser = (NodeBrowser) Component.getInstance("browser");
- if (endBeforeRedirect)
- browser.redirectToLastBrowsedPage();
- else
- browser.redirectToLastBrowsedPageWithConversation();
- }
- }
-
public String persist() {
// Validate
@@ -133,7 +118,7 @@
"Activiate account: confirmRegistration.seam?activationCode=" + getInstance().getActivationCode());
*/
- exitConversation(false);
+ browser.exitConversation(false);
} catch (Exception ex) {
ex.printStackTrace(System.out);
@@ -197,7 +182,7 @@
);
}
}
- exitConversation(false);
+ browser.exitConversation(false);
}
return outcome;
More information about the jboss-cvs-commits
mailing list