Heinous merge from HEAD. Seems to basically work. Be on guard however.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/spaces/EditSpaceDialog.java

@@ -31,9 +31,15 @@ public class EditSpaceDialog extends CreateSpaceDialog
       super.init(parameters);
       
       // setup the space being edited
-      this.editableNode = initEditableNode();
+      this.editableNode = new Node(this.browseBean.getActionSpace().getNodeRef());
       this.spaceType = this.editableNode.getType().toString();
    }
+      
+   @Override
+   public boolean getFinishButtonDisabled()
+   {
+      return false;
+   }
    
    /**
     * Init the editable Node
@@ -49,27 +55,11 @@ public class EditSpaceDialog extends CreateSpaceDialog
       return Application.getMessage(FacesContext.getCurrentInstance(), "ok");
    }
    
-   @Override
-   public boolean getFinishButtonDisabled()
-   {
-      return false;
-   }
-   
-   /**
-    * Returns the editable node
-    * 
-    * @return The editable node
-    */
-   public Node getEditableNode()
-   {
-      return this.editableNode;
-   }
-
    @Override
    protected String finishImpl(FacesContext context, String outcome) throws Exception
    {
       // update the existing node in the repository
-      NodeRef nodeRef = this.editableNode.getNodeRef();
+      NodeRef nodeRef = this.browseBean.getActionSpace().getNodeRef();
       Map<String, Object> editedProps = this.editableNode.getProperties();
       
       // handle the name property separately, perform a rename in case it changed
@@ -162,7 +152,7 @@ public class EditSpaceDialog extends CreateSpaceDialog
             this.nodeService.removeChild(assoc.getParentRef(), assoc.getChildRef());
          }
       }
-      
+            
       return outcome;
    }