[jboss-cvs] jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action ...
Christian Bauer
christian at hibernate.org
Mon May 7 07:42:33 EDT 2007
User: cbauer
Date: 07/05/07 07:42:33
Modified: examples/wiki/src/main/org/jboss/seam/wiki/core/action
PreferenceEditor.java AdminHome.java NodeHome.java
UserHome.java
Log:
Switched to tabbed ajax forms
Revision Changes Path
1.3 +7 -4 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/PreferenceEditor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PreferenceEditor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/PreferenceEditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PreferenceEditor.java 4 Apr 2007 10:38:13 -0000 1.2
+++ PreferenceEditor.java 7 May 2007 11:42:33 -0000 1.3
@@ -28,13 +28,13 @@
private PreferenceComponent preferenceComponent;
private List<PreferenceValue> preferenceValues;
- boolean valuesAreValid = true;
+ boolean valid = true;
public String save() {
if (preferenceComponent == null) return null;
validate();
- if (!valuesAreValid) return "failed";
+ if (!valid) return "failed";
PreferenceProvider provider = (PreferenceProvider)Component.getInstance("preferenceProvider");
if (preferenceVisibility.equals(PreferenceVisibility.USER)) {
@@ -60,11 +60,11 @@
public void validate() {
if (preferenceComponent == null) return;
- valuesAreValid = true;
+ valid = true;
Map<PreferenceProperty, InvalidValue[]> invalidProperties = preferenceComponent.validate(preferenceValues);
for (Map.Entry<PreferenceProperty, InvalidValue[]> entry : invalidProperties.entrySet()) {
for (InvalidValue validationError : entry.getValue()) {
- valuesAreValid = false;
+ valid = false;
facesMessages.addToControlFromResourceBundleOrDefault(
"preferenceValidationErrors",
@@ -110,4 +110,7 @@
this.preferenceVisibility = preferenceVisibility;
}
+ public boolean isValid() {
+ return valid;
+ }
}
1.3 +14 -0 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/AdminHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AdminHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/AdminHome.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AdminHome.java 9 Apr 2007 10:57:58 -0000 1.2
+++ AdminHome.java 7 May 2007 11:42:33 -0000 1.3
@@ -8,6 +8,8 @@
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.FacesMessages;
+import org.jboss.seam.core.Expressions;
+import org.jboss.seam.core.Validators;
import org.jboss.seam.framework.EntityHome;
import org.jboss.seam.security.AuthorizationException;
import org.jboss.seam.security.Identity;
@@ -15,6 +17,8 @@
import org.jboss.seam.wiki.core.model.LinkProtocol;
import org.jboss.seam.wiki.preferences.PreferenceComponent;
import org.jboss.seam.wiki.preferences.PreferenceVisibility;
+import org.hibernate.validator.InvalidValue;
+import org.hibernate.validator.ClassValidator;
import javax.faces.application.FacesMessage;
import javax.persistence.EntityManager;
@@ -96,6 +100,16 @@
public void addLinkProtocol() {
entityManager.joinTransaction();
+ // TODO: http://jira.jboss.com/jira/browse/JBSEAM-1297
+ ClassValidator<LinkProtocol> validator = Validators.instance().getValidator(LinkProtocol.class, null);
+ InvalidValue[] ivs = validator.getInvalidValues(linkProtocol);
+ if (ivs.length>0) {
+ for (InvalidValue iv : ivs) {
+ facesMessages.addToControl(iv.getPropertyName(), FacesMessage.SEVERITY_INFO, iv.getMessage());
+ }
+ return;
+ }
+
newLinkProtocol = linkProtocol;
linkProtocols.add(newLinkProtocol);
entityManager.persist(newLinkProtocol);
1.17 +3 -3 jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NodeHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/main/org/jboss/seam/wiki/core/action/NodeHome.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NodeHome.java 4 May 2007 18:25:51 -0000 1.16
+++ NodeHome.java 7 May 2007 11:42:33 -0000 1.17
@@ -170,15 +170,15 @@
// Wiki name conversion
setWikiName();
- // Refresh UI
- refreshMenuItems();
-
// Validate
if (!isValidModel()) return null;
if (!beforeUpdate()) return null;
String outcome = super.update();
+ // Refresh UI
+ refreshMenuItems();
+
// Notify any plugin preferences editors to also flush
Events.instance().raiseEvent("PreferenceEditor.flushAll");
1.9 +4 -3 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- UserHome.java 22 Apr 2007 20:00:14 -0000 1.8
+++ UserHome.java 7 May 2007 11:42:33 -0000 1.9
@@ -8,7 +8,6 @@
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.core.FacesMessages;
import org.jboss.seam.core.Renderer;
-import org.jboss.seam.core.Conversation;
import org.jboss.seam.core.Events;
import org.jboss.seam.framework.EntityHome;
import org.jboss.seam.security.AuthorizationException;
@@ -16,6 +15,7 @@
import org.jboss.seam.wiki.core.action.prefs.UserManagementPreferences;
import org.jboss.seam.wiki.core.action.prefs.WikiPreferences;
import org.jboss.seam.wiki.core.dao.UserDAO;
+import org.jboss.seam.wiki.core.dao.UserRoleAccessFactory;
import org.jboss.seam.wiki.core.model.Role;
import org.jboss.seam.wiki.core.model.User;
import org.jboss.seam.wiki.preferences.PreferenceComponent;
@@ -24,6 +24,7 @@
import javax.faces.application.FacesMessage;
import java.util.List;
+import java.util.ArrayList;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -168,7 +169,7 @@
return null;
// Roles
- getInstance().getRoles().clear();
+ getInstance().setRoles(new ArrayList<Role>()); // Clear out the collection
getInstance().getRoles().addAll(roles);
// Preferences
@@ -276,7 +277,7 @@
facesMessages.addFromResourceBundleOrDefault(
FacesMessage.SEVERITY_INFO,
getMessageKeyPrefix() + "homeDirectoryCreated",
- "New home directory has been queued, update to commit the change"
+ "New home directory has been queued, save settings to commit"
);
}
More information about the jboss-cvs-commits
mailing list