You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by lr...@apache.org on 2010/02/21 00:43:50 UTC
svn commit: r912264 - in /incubator/photark/trunk:
photark-jcr/src/main/java/org/apache/photark/services/album/jcr/
photark-jcr/src/main/java/org/apache/photark/upload/
photark/src/main/java/org/apache/photark/
photark/src/main/java/org/apache/photark/...
Author: lresende
Date: Sun Feb 21 00:43:49 2010
New Revision: 912264
URL: http://svn.apache.org/viewvc?rev=912264&view=rev
Log:
Rename Picture to Image for naming consistence
Added:
incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java (contents, props changed)
- copied, changed from r911262, incubator/photark/trunk/photark/src/main/java/org/apache/photark/Picture.java
Removed:
incubator/photark/trunk/photark/src/main/java/org/apache/photark/Picture.java
Modified:
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/ArchiveFileExtractor.java
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/FileUploader.java
incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/PhotoUploadServlet.java
incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/Album.java
incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/AlbumAgregator.java
incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.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=912264&r1=912263&r2=912264&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:49 2010
@@ -33,7 +33,7 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.photark.Picture;
+import org.apache.photark.Image;
import org.apache.photark.services.album.Album;
import org.apache.photark.services.album.ImageFilter;
import org.apache.photark.services.gallery.jcr.JCRSession;
@@ -181,7 +181,7 @@
}
- public void addPicture(Picture picture) {
+ public void addPicture(Image picture) {
try {
Node root = session.getRootNode();
Node albumNode = root.getNode(name);
@@ -196,7 +196,7 @@
}
}
- public void deletePicture(Picture picture) {
+ public void deletePicture(Image picture) {
try {
Node root = session.getRootNode();
Node albumNode = root.getNode(name);
Modified: incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/ArchiveFileExtractor.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/ArchiveFileExtractor.java?rev=912264&r1=912263&r2=912264&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/ArchiveFileExtractor.java (original)
+++ incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/ArchiveFileExtractor.java Sun Feb 21 00:43:49 2010
@@ -31,7 +31,7 @@
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import org.apache.commons.io.IOUtils;
-import org.apache.photark.Picture;
+import org.apache.photark.Image;
public class ArchiveFileExtractor {
private String entryTypes[];
@@ -40,9 +40,9 @@
this.entryTypes = entryTypes;
}
- public List<Picture> extractArchive(InputStream inStream) {
+ public List<Image> extractArchive(InputStream inStream) {
ArchiveStreamFactory streamFactory = new ArchiveStreamFactory();
- List<Picture> pictures = new ArrayList<Picture>();
+ List<Image> pictures = new ArrayList<Image>();
try {
ArchiveInputStream archiveInputStream = streamFactory.createArchiveInputStream(inStream);
ArchiveEntry entry = null;
@@ -50,7 +50,7 @@
if (!entry.isDirectory() && isEntryTypeAllowd(entry)) {
byte buf[] = IOUtils.toByteArray(archiveInputStream);
InputStream inputStream = new ByteArrayInputStream(buf);
- Picture picture = new Picture(entry.getName(), new Date(), inputStream);
+ Image picture = new Image(entry.getName(), new Date(), inputStream);
pictures.add(picture);
}
}
Modified: incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/FileUploader.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/FileUploader.java?rev=912264&r1=912263&r2=912264&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/FileUploader.java (original)
+++ incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/FileUploader.java Sun Feb 21 00:43:49 2010
@@ -27,7 +27,7 @@
import org.apache.commons.compress.archivers.ArchiveException;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
-import org.apache.photark.Picture;
+import org.apache.photark.Image;
public class FileUploader {
@@ -36,16 +36,16 @@
public FileUploader() {
}
- public List<Picture> uploadFile(InputStream inStream, String fileName) throws IOException {
+ public List<Image> uploadFile(InputStream inStream, String fileName) throws IOException {
- List<Picture> pictures = new ArrayList<Picture>();
+ List<Image> pictures = new ArrayList<Image>();
if (isArchive(inStream)) {
ArchiveFileExtractor archiveFileExtractor = new ArchiveFileExtractor(entryTypes);
pictures = archiveFileExtractor.extractArchive(inStream);
} else {
// this is a picture file and not the archive file
- Picture picture = new Picture(fileName, new Date(), inStream);
+ Image picture = new Image(fileName, new Date(), inStream);
pictures.add(picture);
}
return pictures;
Modified: incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/PhotoUploadServlet.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/PhotoUploadServlet.java?rev=912264&r1=912263&r2=912264&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/PhotoUploadServlet.java (original)
+++ incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/upload/PhotoUploadServlet.java Sun Feb 21 00:43:49 2010
@@ -35,7 +35,7 @@
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.photark.Picture;
+import org.apache.photark.Image;
import org.apache.photark.services.album.Album;
import org.apache.photark.services.album.jcr.AlbumImpl;
import org.apache.photark.services.gallery.Gallery;
@@ -87,9 +87,9 @@
InputStream inStream = fileItem.getInputStream();
FileUploader uploader = new FileUploader();
- List<Picture> pictures = uploader.uploadFile(new BufferedInputStream(inStream), fileName);
+ List<Image> pictures = uploader.uploadFile(new BufferedInputStream(inStream), fileName);
- for (Picture picture : pictures) {
+ for (Image picture : pictures) {
addPictureToAlbum(albumName, picture);
}
sb.append("file=uploaded/" + fileName);
@@ -113,10 +113,10 @@
* @param albumName String
* @param picture Picture
*/
- private void addPictureToAlbum(String albumName, Picture picture) {
+ private void addPictureToAlbum(String albumName, Image image) {
Gallery gallery = new GalleryImpl();
gallery.addAlbum(albumName);
Album album = new AlbumImpl(albumName);
- album.addPicture(picture);
+ album.addPicture(image);
}
}
Copied: incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java (from r911262, incubator/photark/trunk/photark/src/main/java/org/apache/photark/Picture.java)
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java?p2=incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java&p1=incubator/photark/trunk/photark/src/main/java/org/apache/photark/Picture.java&r1=911262&r2=912264&rev=912264&view=diff
==============================================================================
--- incubator/photark/trunk/photark/src/main/java/org/apache/photark/Picture.java (original)
+++ incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java Sun Feb 21 00:43:49 2010
@@ -27,7 +27,7 @@
/**
* Model representing an album image
*/
-public class Picture {
+public class Image {
private String name;
private String description;
private Date creationDate;
@@ -35,12 +35,12 @@
private List<Properties> imageProperties;
- public Picture(String name, Date createDate) {
+ public Image(String name, Date createDate) {
this.name = name;
this.creationDate = createDate;
}
- public Picture(String name, Date createDate, InputStream inStream) {
+ public Image(String name, Date createDate, InputStream inStream) {
this(name, createDate);
this.inStream = inStream;
}
Propchange: incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/photark/trunk/photark/src/main/java/org/apache/photark/Image.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/Album.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/Album.java?rev=912264&r1=912263&r2=912264&view=diff
==============================================================================
--- incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/Album.java (original)
+++ incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/Album.java Sun Feb 21 00:43:49 2010
@@ -19,7 +19,7 @@
package org.apache.photark.services.album;
-import org.apache.photark.Picture;
+import org.apache.photark.Image;
import org.oasisopen.sca.annotation.Remotable;
@Remotable
@@ -35,7 +35,7 @@
String[] getPictures();
- void addPicture(Picture picture);
+ void addPicture(Image picture);
- void deletePicture(Picture picture);
+ void deletePicture(Image picture);
}
\ No newline at end of file
Modified: incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/AlbumAgregator.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/AlbumAgregator.java?rev=912264&r1=912263&r2=912264&view=diff
==============================================================================
--- incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/AlbumAgregator.java (original)
+++ incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/AlbumAgregator.java Sun Feb 21 00:43:49 2010
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.photark.Picture;
+import org.apache.photark.Image;
import org.oasisopen.sca.annotation.Init;
import org.oasisopen.sca.annotation.Reference;
@@ -98,11 +98,11 @@
}
- public void addPicture(Picture picture){
+ public void addPicture(Image picture){
}
- public void deletePicture(Picture picture){
+ public void deletePicture(Image picture){
}
}
Modified: incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java?rev=912264&r1=912263&r2=912264&view=diff
==============================================================================
--- incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java (original)
+++ incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/filesystem/AlbumImpl.java Sun Feb 21 00:43:49 2010
@@ -23,7 +23,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.photark.Picture;
+import org.apache.photark.Image;
import org.apache.photark.services.album.Album;
import org.apache.photark.services.album.ImageFilter;
import org.oasisopen.sca.annotation.Init;
@@ -90,11 +90,11 @@
return pictureArray;
}
- public void addPicture(Picture picture){
+ public void addPicture(Image picture){
throw new UnsupportedOperationException("Not implemented");
}
- public void deletePicture(Picture picture){
+ public void deletePicture(Image picture){
throw new UnsupportedOperationException("Not implemented");
}
}
\ No newline at end of file