From d2bf9cae06763fd896b9994c945eaa18ea58ba7e Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Tue, 2 Oct 2007 20:18:36 +0000
Subject: [PATCH] Fixed compilation issue following merge

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6902 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/web/bean/TrashcanItemDetailsDialog.java   | 10 +++++++++-
 source/web/WEB-INF/faces-config-beans.xml              |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/web/bean/TrashcanItemDetailsDialog.java b/source/java/org/alfresco/web/bean/TrashcanItemDetailsDialog.java
index c1c3a489cd..67789a1507 100644
--- a/source/java/org/alfresco/web/bean/TrashcanItemDetailsDialog.java
+++ b/source/java/org/alfresco/web/bean/TrashcanItemDetailsDialog.java
@@ -27,6 +27,7 @@ package org.alfresco.web.bean;
 import javax.faces.context.FacesContext;
 
 import org.alfresco.service.cmr.repository.Path;
+import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.web.app.Application;
 
 import org.alfresco.web.bean.repository.Node;
@@ -36,6 +37,8 @@ public class TrashcanItemDetailsDialog extends TrashcanDialog
    private static final String MSG_DETAILS_OF = "details_of";
    private static final String MSG_ORIGINAL_LOCATION = "original_location";
    private static final String MSG_CLOSE = "close";
+   
+   protected PermissionService permissionService;
 
    @Override
    protected String finishImpl(FacesContext context, String outcome) throws Exception
@@ -56,7 +59,7 @@ public class TrashcanItemDetailsDialog extends TrashcanDialog
       Path path = (Path) property.getItem().getProperties().get("locationPath");
       
       return Application.getMessage(FacesContext.getCurrentInstance(), MSG_ORIGINAL_LOCATION) + ": " + 
-             path.toDisplayPath(nodeService);
+             path.toDisplayPath(nodeService, permissionService);
    }
 
    @Override
@@ -69,4 +72,9 @@ public class TrashcanItemDetailsDialog extends TrashcanDialog
    {
       return property.getItem();
    }
+   
+   public void setPermissionService(PermissionService permissionService)
+   {
+      this.permissionService = permissionService;
+   }
 }
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index 1971d04fc1..5113f44528 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -4709,6 +4709,10 @@
          <property-name>dictionaryService</property-name>
          <value>#{DictionaryService}</value>
       </managed-property>
+      <managed-property>
+         <property-name>permissionService</property-name>
+         <value>#{PermissionService}</value>
+      </managed-property>
       <managed-property>
          <property-name>property</property-name>
          <value>#{TrashcanDialogProperty}</value>