svn commit: r912265 - in /incubator/photark/trunk: photark-jcr/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java photark/src/main/java/org/apache/photark/Image.java

[lr...@apache.org]

Author: lresende
Date: Sun Feb 21 00:43:57 2010
New Revision: 912265

URL: http://svn.apache.org/viewvc?rev=912265&view=rev
Log:
Name consistence and adding java doc

Modified:
    incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java
    incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java

Modified: incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java?rev=912265&r1=912264&r2=912265&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java (original)
+++ incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java Sun Feb 21 00:43:57 2010
@@ -186,8 +186,8 @@
             Node root = session.getRootNode();
             Node albumNode = root.getNode(name);
             Node picNode = albumNode.addNode(picture.getName());
-            picture.getInputStream();
-            picNode.setProperty("imageContent", picture.getInputStream());
+            picture.getImageAsStream();
+            picNode.setProperty("imageContent", picture.getImageAsStream());
             picNode.setProperty("name", picture.getName());
             picNode.setProperty("location", picture.getName());
             session.save();

Modified: incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java?rev=912265&r1=912264&r2=912265&view=diff
==============================================================================
--- incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java (original)
+++ incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java Sun Feb 21 00:43:57 2010
@@ -29,32 +29,54 @@
  */
 public class Image {
     private String name;
-    private String description;
-    private Date creationDate;
-    private InputStream inStream;
+    private Date datePosted;
+    private InputStream imageStream;
 
     private List<Properties> imageProperties;
 
-    public Image(String name, Date createDate) {
+    /**
+     * Constructor
+     * @param name Image name
+     * @param datePosted Date when image is being added
+     */
+    public Image(String name, Date datePosted) {
         this.name = name;
-        this.creationDate = createDate;
+        this.datePosted = datePosted;
     }
 
-    public Image(String name, Date createDate, InputStream inStream) {
-        this(name, createDate);
-        this.inStream = inStream;
+    /**
+     * Constructor
+     * @param name Image name
+     * @param datePosted Date when image is being added
+     * @param imageStream Image stream content
+     */
+    public Image(String name, Date datePosted, InputStream imageStream) {
+        this(name, datePosted);
+        this.imageStream = imageStream;
     }
 
+    /**
+     * Get image file name
+     * @return image file name
+     */
     public String getName() {
         return name;
     }
 
-    public Date getCreationDate() {
-        return creationDate;
+    /**
+     * Get date when image was posted
+     * @return date posted
+     */
+    public Date getDatePosted() {
+        return datePosted;
     }
 
-    public InputStream getInputStream() {
-        return inStream;
+    /**
+     * Return image content as stream
+     * @return image stream
+     */
+    public InputStream getImageAsStream() {
+        return imageStream;
     }
 
 }