From 39687f35f28d91661c5b9b5db5a28d1cbe2dd8d6 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Wed, 23 Aug 2006 16:50:12 +0000
Subject: [PATCH] Merged DEV/CHECK_EXISTS to HEAD    svn merge
 svn://www.alfresco.org:3691/alfresco/BRANCHES/DEV/CHECK_EXISTS@3442
 svn://www.alfresco.org:3691/alfresco/BRANCHES/DEV/CHECK_EXISTS@3590 .

TODO: Fix bug raising incorrect exception during UI paste of same-named file
Note:
- Added a new method to NodeService to get child by name
- Added a new method to FileFolderService to perform fast, direct lookups based on name


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/web/bean/DocumentPropertiesBean.java   | 2 +-
 .../alfresco/web/bean/content/EditContentPropertiesDialog.java  | 2 +-
 source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java b/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java
index 27c6cd3ffc..eedbc2560b 100644
--- a/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java
+++ b/source/java/org/alfresco/web/bean/DocumentPropertiesBean.java
@@ -262,7 +262,7 @@ public class DocumentPropertiesBean
          String statusMsg = MessageFormat.format(
                Application.getMessage(
                      FacesContext.getCurrentInstance(), "error_exists"), 
-                     e.getExisting().getName());
+                     e.getName());
          Utils.addErrorMessage(statusMsg);
          // no outcome
          outcome = null;
diff --git a/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java b/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
index 04cc367d9b..edaa8f7dea 100644
--- a/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
+++ b/source/java/org/alfresco/web/bean/content/EditContentPropertiesDialog.java
@@ -198,7 +198,7 @@ public class EditContentPropertiesDialog extends BaseDialogBean
       {
          return MessageFormat.format(Application.getMessage(
                FacesContext.getCurrentInstance(), Repository.ERROR_EXISTS), 
-               ((FileExistsException)exception).getExisting().getName());
+               ((FileExistsException)exception).getName());
       }
       else if (exception instanceof InvalidNodeRefException)
       {
diff --git a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
index 6fffd00e31..70d9ecae90 100644
--- a/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
+++ b/source/java/org/alfresco/web/bean/spaces/CreateSpaceWizard.java
@@ -712,7 +712,7 @@ public class CreateSpaceWizard extends BaseWizardBean
       {
          return MessageFormat.format(Application.getMessage(
                FacesContext.getCurrentInstance(), Repository.ERROR_EXISTS), 
-               ((FileExistsException)exception).getExisting().getName());
+               ((FileExistsException)exception).getName());
       }
       else
       {