Merge DEV/SEAMIST4 to HEAD (part 2 of 2)

12421 Tidy up and trivial code changes mostly relating to code style.
            Good exercise for learning code though.
            Tests re-run successfully.
            Ready for merge to HEAD.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2009-01-09 15:41:55 +00:00
parent 01bf05db58
commit 17ef0c24ad
18 changed files with 864 additions and 1023 deletions

View File

@@ -33,6 +33,8 @@ import javax.activation.DataSource;
import org.alfresco.service.cmr.repository.ContentReader;
/**
* DataSource facade for an Alfresco Content Reader
*
* @author Dmitry Lazurkin
*/
public class ContentReaderDataSource implements DataSource
@@ -46,21 +48,33 @@ public class ContentReaderDataSource implements DataSource
this.name = name;
}
/* (non-Javadoc)
* @see javax.activation.DataSource#getContentType()
*/
public String getContentType()
{
return contentReader.getMimetype();
}
/* (non-Javadoc)
* @see javax.activation.DataSource#getInputStream()
*/
public InputStream getInputStream() throws IOException
{
return contentReader.getContentInputStream();
}
/* (non-Javadoc)
* @see javax.activation.DataSource#getName()
*/
public String getName()
{
return name;
}
/* (non-Javadoc)
* @see javax.activation.DataSource#getOutputStream()
*/
public OutputStream getOutputStream() throws IOException
{
return null;