Fix up to some less-than-ideal code to some recent dialog/wizard refactoring from usethelink

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7002 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/AdvancedSearchDialog.java

@@ -28,7 +28,6 @@ import java.io.Serializable;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,13 +36,10 @@ import javax.faces.component.UISelectBoolean;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 import javax.faces.model.DataModel;
-import javax.faces.model.ListDataModel;
 import javax.faces.model.SelectItem;
 
 import org.alfresco.model.ContentModel;
-
 import org.alfresco.repo.security.permissions.AccessDeniedException;
-
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
@@ -53,7 +49,6 @@ import org.alfresco.service.cmr.dictionary.TypeDefinition;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentService;
-
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.AccessStatus;
@@ -91,6 +86,9 @@ import org.alfresco.web.ui.repo.component.UISearchCustomProperties;
  */
 public class AdvancedSearchDialog extends BaseDialogBean
 {
+   /** PermissionService */
+   protected PermissionService permissionService;
+
    /**
     * Default constructor
     */
@@ -102,9 +100,15 @@ public class AdvancedSearchDialog extends BaseDialogBean
       properties.getPanels().put(PANEL_CUSTOM, false);
    }
    
+   
    // ------------------------------------------------------------------------------
    // Bean property getters and setters
    
+   public void setPermissionService(PermissionService permissionService)
+   {
+      this.permissionService = permissionService;
+   }
+   
    public void setProperties(SearchProperties properties)
    {
       this.properties = properties;
@@ -119,8 +123,8 @@ public class AdvancedSearchDialog extends BaseDialogBean
       if (allow)
       {
          NodeRef savedSearchRef = new NodeRef(Repository.getStoreRef(), properties.getSavedSearch());
-         allow = (properties.getPermissionService().hasPermission(savedSearchRef,
+         allow = (this.permissionService.hasPermission(savedSearchRef,
-                  PermissionService.WRITE) == AccessStatus.ALLOWED);
+                     PermissionService.WRITE) == AccessStatus.ALLOWED);
       }
       return allow;
    }
@@ -270,6 +274,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
       return properties.getContentFormats();
    }
    
+   
    // ------------------------------------------------------------------------------
    // Action event handlers
    
@@ -1035,6 +1040,7 @@ public class AdvancedSearchDialog extends BaseDialogBean
       return null;
    }
    
+   
    // ------------------------------------------------------------------------------
    // Private data
    

source/java/org/alfresco/web/bean/SearchProperties.java

@@ -37,7 +37,6 @@ import javax.faces.model.SelectItem;
 import org.alfresco.repo.cache.ExpiringValueCache;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.web.bean.repository.Node;
 import org.alfresco.web.config.AdvancedSearchConfigElement;
 
@@ -47,11 +46,8 @@ public class SearchProperties
     private static final String LOOKIN_ALL = "all";
     private static final String SAVED_SEARCHES_USER = "user";
 
-    /** PermissionService */
-    protected PermissionService permissionService;
-
     /** Client Config reference */
-    protected AdvancedSearchConfigElement searchConfigElement = null;
+    private AdvancedSearchConfigElement searchConfigElement = null;
 
     /** Progressive panel UI state */
     private Map<String, Boolean> panels = new HashMap<String, Boolean>(5, 1.0f);
@@ -152,15 +148,6 @@ public class SearchProperties
     /** auto-expiring cache of the list of saved searches */
     private ExpiringValueCache<List<SelectItem>> cachedSavedSearches = new ExpiringValueCache<List<SelectItem>>();
 
-    public PermissionService getPermissionService()
-    {
-        return permissionService;
-    }
-
-    public void setPermissionService(PermissionService permissionService)
-    {
-        this.permissionService = permissionService;
-    }
 
     public AdvancedSearchConfigElement getSearchConfigElement()
     {

source/web/WEB-INF/faces-config-beans.xml

@@ -485,10 +485,6 @@
       <managed-bean-name>SearchProperties</managed-bean-name>
       <managed-bean-class>org.alfresco.web.bean.SearchProperties</managed-bean-class>
       <managed-bean-scope>session</managed-bean-scope>
-      <managed-property>
-         <property-name>permissionService</property-name>
-         <value>#{PermissionService}</value>
-      </managed-property>
    </managed-bean>
 
    <managed-bean>
@@ -514,6 +510,10 @@
          <property-name>searchService</property-name>
          <value>#{SearchService}</value>
       </managed-property>
+      <managed-property>
+         <property-name>permissionService</property-name>
+         <value>#{PermissionService}</value>
+      </managed-property>
       <managed-property>
          <property-name>properties</property-name>
          <value>#{SearchProperties}</value>