inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
6338: Some WCM-435.
   6344: Fix for AWC-1452 (dialog close navigation issue)
   6345: Fix for AR-1611 and other related CIFS and NFS fixes
   6346: Minor javadoc fix for ReplicatingContentStore
   6347: Handle exceptions arising from UserTransaction.begin().
   6348: Many WCM fixes in one
            Conflicts resolved on faces-config-beans.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 13:21:08 +00:00
parent 48fa124735
commit 0fb2ae13f9
38 changed files with 1290 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/java/org/alfresco/web/bean/wcm/DeleteFileDialog.java
View File

@@ -51,8 +51,8 @@ public class DeleteFileDialog extends BaseDialogBean
protected AVMService avmService;
protected AVMBrowseBean avmBrowseBean;
protected FormsService formsService;
/**
* @param avmBrowseBean The avmBrowseBean to set.
*/
@@ -68,7 +68,14 @@ public class DeleteFileDialog extends BaseDialogBean
{
this.avmService = avmService;
}
/**
* @param formsService The FormsService to set.
*/
public void setFormsService(final FormsService formsService)
{
this.formsService = formsService;
}
// ------------------------------------------------------------------------------
// Dialog implementation
@@ -79,7 +86,11 @@ public class DeleteFileDialog extends BaseDialogBean
{
// get the content to delete
final AVMNode node = this.avmBrowseBean.getAvmActionNode();
if (node != null)
if (node == null)
{
logger.warn("WARNING: delete called without a current AVM Node!");
}
else
{
if (logger.isDebugEnabled())
logger.debug("Trying to delete AVM node: " + node.getPath());
@@ -88,7 +99,7 @@ public class DeleteFileDialog extends BaseDialogBean
{
try
{
fid = new RenditionImpl(node.getNodeRef()).getPrimaryFormInstanceData();
fid = this.formsService.getRendition(node.getNodeRef()).getPrimaryFormInstanceData();
}
catch (FileNotFoundException fnfe)
{
@@ -97,7 +108,7 @@ public class DeleteFileDialog extends BaseDialogBean
}
else if (node.hasAspect(WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
{
fid = new FormInstanceDataImpl(node.getNodeRef());
fid = this.formsService.getFormInstanceData(node.getNodeRef());
}
if (fid != null)
{
@@ -117,11 +128,6 @@ public class DeleteFileDialog extends BaseDialogBean
AVMNodeConverter.SplitBase(node.getPath())[1]);
}
}
else
{
logger.warn("WARNING: delete called without a current AVM Node!");
}
return outcome;
}
@@ -160,7 +166,7 @@ public class DeleteFileDialog extends BaseDialogBean
{
try
{
final FormInstanceData fid = new RenditionImpl(node.getNodeRef()).getPrimaryFormInstanceData();
final FormInstanceData fid = this.formsService.getRendition(node.getNodeRef()).getPrimaryFormInstanceData();
return MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(),
"delete_rendition_confirm"),
node.getName(),
@@ -175,12 +181,11 @@ public class DeleteFileDialog extends BaseDialogBean
}
else if (node.hasAspect(WCMAppModel.ASPECT_FORM_INSTANCE_DATA))
{
final FormInstanceData fid = new FormInstanceDataImpl(node.getNodeRef());
final FormInstanceData fid = this.formsService.getFormInstanceData(node.getNodeRef());
return MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(),
"delete_form_instance_data_confirm"),
fid.getName(),
fid.getRenditions().size());
}
return MessageFormat.format(Application.getMessage(FacesContext.getCurrentInstance(),
"delete_avm_file_confirm"),