From a985ba7723cd414c33750a9a1538d6b3d4918ed2 Mon Sep 17 00:00:00 2001 From: Britt Park Date: Sat, 30 Sep 2006 17:51:15 +0000 Subject: [PATCH] Changed AVMNodeConverter.ToAVMVersionPath() to return a Pair. Fixed avm.jsp which got busted by last checkin. Added implementation of AddChild to AVMNodeService. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java | 4 ++-- source/java/org/alfresco/web/templating/OutputUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java b/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java index 3ebd128a8d..4251ad3323 100644 --- a/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java @@ -395,7 +395,7 @@ public class ImportWebsiteDialog { if (file.isFile()) { - String avmPath = (String)AVMNodeConverter.ToAVMVersionPath(root)[1]; + String avmPath = AVMNodeConverter.ToAVMVersionPath(root).getSecond(); avmService.createFile(avmPath, file.getName(), new BufferedInputStream(new FileInputStream(file), BUFFER_SIZE)); // create content node based on the filename /*FileInfo contentFile = fileFolderService.create(root, fileName, ContentModel.TYPE_AVM_PLAIN_CONTENT); @@ -418,7 +418,7 @@ public class ImportWebsiteDialog else { //FileInfo fileInfo = fileFolderService.create(root, file.getName(), ContentModel.TYPE_AVM_PLAIN_FOLDER); - String avmPath = (String)AVMNodeConverter.ToAVMVersionPath(root)[1]; + String avmPath = AVMNodeConverter.ToAVMVersionPath(root).getSecond(); avmService.createDirectory(avmPath, file.getName()); importDirectory(file.getPath(), AVMNodeConverter.ToNodeRef(-1, avmPath + '/' + file.getName()));//fileInfo.getNodeRef() diff --git a/source/java/org/alfresco/web/templating/OutputUtil.java b/source/java/org/alfresco/web/templating/OutputUtil.java index dde3922959..a211171c28 100644 --- a/source/java/org/alfresco/web/templating/OutputUtil.java +++ b/source/java/org/alfresco/web/templating/OutputUtil.java @@ -119,7 +119,7 @@ public class OutputUtil String generatedFileName = (String) nodeService.getProperty(generatedNodeRef, ContentModel.PROP_NAME); - String avmPath = (String)AVMNodeConverter.ToAVMVersionPath(nodeRef)[1]; + String avmPath = AVMNodeConverter.ToAVMVersionPath(nodeRef).getSecond(); String avmStore = avmPath.substring(0, avmPath.indexOf(":/")); String sandBoxUrl = AVMConstants.buildAVMStoreUrl(avmStore);