Merge DEV to HEAD

ContentDiskDriver rework.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29451 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2011-07-29 09:08:54 +00:00
parent 65cb62ceb8
commit b4bd3a21c2
83 changed files with 11518 additions and 1101 deletions

View File

@@ -38,10 +38,6 @@ public class DesktopParams {
private SrvSession m_session;
// Filesystem driver
private AlfrescoDiskDriver m_driver;
// Folder node that the actions are working in
private NodeRef m_folderNode;
@@ -69,10 +65,9 @@ public class DesktopParams {
* @param folderNode NodeRef
* @param folderFile NetworkFile
*/
public DesktopParams(SrvSession sess, AlfrescoDiskDriver driver, NodeRef folderNode, NetworkFile folderFile)
public DesktopParams(SrvSession sess, NodeRef folderNode, NetworkFile folderFile)
{
m_session = sess;
m_driver = driver;
m_folderNode = folderNode;
m_folderFile = folderFile;
}
@@ -131,16 +126,6 @@ public class DesktopParams {
{
return m_folderFile;
}
/**
* Return the filesystem driver
*
* @return AlfrescoDiskDriver
*/
public final AlfrescoDiskDriver getDriver()
{
return m_driver;
}
/**
* Set the folder network file