Merged V3.0 to HEAD

11509: ETHREEOH-394: Incorrect message in activity feed when user accepts an invitation to a site
   11510: Fix to set position
   11511: Fix for ETHREEOH-533: Dialogs access via ExternalAccessServlet return to blank empty container.jsp page when Close button is clicked
   11512: Fix DM ACL deletion after merge forward for shared and defining ACLs.
   11513: Merged V2.2 to V3.0
      11501: Expose if set permissions are inherited or not and fix relatd behaviour for import/copy
   11514: Fix for ETHREEOH-476 (Impossible to create Site Invite Workflow) & ETHREEOH-254 (Default value at 'Start Advanced Workflow Wizard' page)
   11515: Fix for ETHREEOH-446 and ETHREEOH-447
   11517: Fix for ETHREEOH-225: Web Forms with repeating elements don't work
   11518: Merged V2.2 to V3.0
      11343: ACL upgrades may require a COW - it now warns when this happens.
      11369: Always lock against staging - ETWOTWO-763
   11519: Merged V2.2 to V3.0
      11467: Fixed ETWOTWO-774: CreateVersionTxnListener.afterCommit() throws NPE
      11468: More defensive coding on AVM txn listeners (avoid NPEs)
      11475: More defensive checks to avoid NPE
   11520: Merged V2.2 to V3.0
      11478: Keep creator and owner as orihinally set in AVM - Fix for ETWOTWO-604
   11521: RuntimeExec: Added optional directive SPLIT: to force argument tokenization
   11522: Limited tests to just check the command format not execute it for "dir . .."
   11523: Undid revision 11520 (Merged V2.2 11478)

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

source/java/org/alfresco/web/bean/wcm/ManagePermissionsDialog.java

@@ -51,14 +51,12 @@ import org.alfresco.web.ui.repo.WebResources;
  */
 public class ManagePermissionsDialog extends BasePermissionsDialog implements IContextListener, FilterViewSupport
 {
-
     private static final long serialVersionUID = -6980134441634707541L;
 
     private static final String MSG_MANAGE_PERMS_FOR = "manage_permissions_title";
     private static final String MSG_VIEW_PERMS_FOR = "view_permissions_title";
 
     private static final String LOCAL = "local";
-
     private static final String INHERITED = "inherited";
 
     private final static String MSG_CLOSE = "close";
@@ -73,6 +71,7 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
 
     private boolean inheritParenSpacePermissions;
 
+
     /**
      * @param personService The personService to set.
      */
@@ -122,7 +121,6 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
      */
     public List<Map> getUsers()
     {
-
         boolean includeInherited = true;
 
         if (this.filterMode.equals(LOCAL))
@@ -146,7 +144,6 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
             // found.
 
             NodeRef actionNode = getAvmBrowseBean().getAvmActionNode().getNodeRef();
-            // getPermissionService().setInheritParentPermissions(actionNode, inheritParenSpacePermissions);
 
             Map<String, List<String>> permissionMap;
             Map<String, List<String>> parentPermissionMap;
@@ -156,13 +153,10 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
             permissionMap = getPerson(permissions, permsToDisplay);
 
             NodeRef parentRef = getNodeService().getPrimaryParent(actionNode).getParentRef();
-            // getPermissionService().getAllSetPermissions(parentRef);
             parentPermissionMap = getPerson(getPermissionService().getAllSetPermissions(parentRef), permsToDisplay);
 
-            // for each authentication (username/group key) found we get the
-            // Person
-            // node represented by it and use that for our list databinding
-            // object
+            // for each authentication (username/group key) found we get the Person
+            // node represented by it and use that for our list databinding object
             personNodes = new ArrayList<Map>(permissionMap.size());
             List<String> local = new ArrayList<String>();
             List<String> inh = new ArrayList<String>();
@@ -392,7 +386,6 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
     public void areaChanged()
     {
         // nothing to do
-
     }
 
     /*
@@ -406,7 +399,6 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
         {
             this.usersRichList.setValue(null);
         }
-
     }
 
     /*
@@ -417,7 +409,6 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
     public void spaceChanged()
     {
         // nothing to do
-
     }
 
     /*
@@ -428,14 +419,12 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
     public void filterModeChanged(ActionEvent event)
     {
         UIModeList viewList = (UIModeList) event.getComponent();
-        // this.filterModeMode = viewList.getValue().toString();
         setFilterMode(viewList.getValue().toString());
         // force the list to be re-queried when the page is refreshed
         if (this.usersRichList != null)
         {
             this.usersRichList.setValue(null);
         }
-
     }
 
     /*
@@ -506,7 +495,6 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
     }
 
 
-
     /*
      * (non-Javadoc)
      * 
@@ -538,7 +526,6 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
     @Override
     public boolean getFinishButtonDisabled()
     {
-
         return false;
     }
 
@@ -559,7 +546,6 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
         FacesContext fc = FacesContext.getCurrentInstance();
         String pattern = Application.getMessage(fc, isRendered() ? MSG_MANAGE_PERMS_FOR : MSG_VIEW_PERMS_FOR);
 
-        // avmBrowseBean.getAvmActionNode().getNodePath().toDisplayPath(getNodeService(), getPermissionService());
         return MessageFormat.format(pattern, getAvmBrowseBean().getAvmActionNode().getName());
     }
 
@@ -605,5 +591,4 @@ public class ManagePermissionsDialog extends BasePermissionsDialog implements IC
         boolean inheritPermissions = (Boolean)event.getNewValue();
         setInheritParenSpacePermissions(inheritPermissions);
     }
-
 }