Author: julien(a)jboss.com Date: 2007-02-27 17:12:53 -0500 (Tue, 27 Feb 2007) New Revision: 6437 Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AssignWindowsAction.java Log: better code flow of the validation of window assignement Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AssignWindowsAction.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AssignWindowsAction.java 2007-02-27 22:02:51 UTC (rev 6436) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/actions/AssignWindowsAction.java 2007-02-27 22:12:53 UTC (rev 6437) @@ -202,53 +202,56 @@ */ public boolean validateAddWindow() { + FacesContext faces = FacesContext.getCurrentInstance(); + + // Validate window name if (windowName == null) { FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No window name!", null); - FacesContext.getCurrentInstance().addMessage("windowName", message); - return false; + faces.addMessage("windowName", message); } - - // Trim name - windowName = windowName.trim(); - - // Check for empty string - if (windowName.length() == 0) + else { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Window name cannot be blank!", null); - FacesContext.getCurrentInstance().addMessage("layoutForm:windowName", message); - return false; - } + // Trim name + windowName = windowName.trim(); - // Check for duplicate window name - Page page = (Page)pomgr.getSelectedObject(); - if (page.getWindow(windowName) != null) - { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Duplicate window name found on this page!", null); - FacesContext.getCurrentInstance().addMessage("layoutForm:windowName", message); - return false; + // Check for empty string + if (windowName.length() == 0) + { + FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Window name cannot be blank!", null); + faces.addMessage("layoutForm:windowName", message); + } + else + { + // Check for duplicate window name + Page page = (Page)pomgr.getSelectedObject(); + if (page.getWindow(windowName) != null) + { + FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Duplicate window name found on this page!", null); + faces.addMessage("layoutForm:windowName", message); + } + } } - // + // Validate instance selection contentType = pomgr.getSelectedContentType(); if (contentType == null) { FacesMessage message = new FacesMessage("No content type provided!", null); - FacesContext.getCurrentInstance().addMessage("layoutForm:instanceId", message); - return false; + faces.addMessage("layoutForm:instanceId", message); } - - // - contentURI = pomgr.getSelectedContentURI(); - if (contentURI == null) + else { - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No portlet selected!", null); - FacesContext.getCurrentInstance().addMessage("layoutForm:instanceId", message); - return false; + contentURI = pomgr.getSelectedContentURI(); + if (contentURI == null) + { + FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No portlet selected!", null); + faces.addMessage("layoutForm:instanceId", message); + } } // - return true; + return faces.getMessages().hasNext() == false; } public static class DynamicMap implements DynamicBean