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 2009/09/13 22:45:53 UTC
svn commit: r814417 - in
/incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album:
Album.java AlbumAgregator.java filesystem/AlbumImpl.java jcr/AlbumImpl.java
Author: lresende
Date: Sun Sep 13 22:45:53 2009
New Revision: 814417
URL: http://svn.apache.org/viewvc?rev=814417&view=rev
Log:
Updating album interface to provide the album name
Modified:
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
incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java
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=814417&r1=814416&r2=814417&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 Sep 13 22:45:53 2009
@@ -24,6 +24,10 @@
@Remotable
public interface Album {
- public String[] getPictures();
+ String getName();
+
+ void setName(String name);
+
+ String[] getPictures();
}
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=814417&r1=814416&r2=814417&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 Sep 13 22:45:53 2009
@@ -28,6 +28,8 @@
import com.google.gdata.data.Link;
public class AlbumAgregator implements Album {
+ private static String NAME = "Aggregated Album";
+
private List<String> pictures = new ArrayList<String>();
@Reference(required=false)
@@ -70,6 +72,15 @@
}
}
+
+ public String getName() {
+ return NAME;
+ }
+
+ public void setName(String name) {
+ throw new UnsupportedOperationException();
+ }
+
public String[] getPictures() {
String[] pictureArray = new String[pictures.size()];
pictures.toArray(pictureArray);
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=814417&r1=814416&r2=814417&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 Sep 13 22:45:53 2009
@@ -32,29 +32,10 @@
public class AlbumImpl implements Album {
private String gallery;
- private String album;
+ private String name;
private String location;
private List<String> pictures = new ArrayList<String>();
- @Property
- public void setGallery(String gallery) {
- this.gallery = gallery;
- this.location = null;
- }
- @Property
- public void setAlbum(String album) {
- this.album = album;
- this.location = null;
- }
-
- protected String getLocation() {
- if (location == null) {
- location = gallery + "/" + album + "/";
- }
- return location;
-
- }
-
@Init
public void init() {
try {
@@ -80,12 +61,36 @@
}
}
+ @Property
+ public void setGallery(String gallery) {
+ this.gallery = gallery;
+ this.location = null;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Property
+ public void setName(String name) {
+ this.name = name;
+ this.location = null;
+ }
+
+
public String[] getPictures() {
String[] pictureArray = new String[pictures.size()];
pictures.toArray(pictureArray);
return pictureArray;
}
+ private String getLocation() {
+ if (location == null) {
+ location = gallery + "/" + name + "/";
+ }
+ return location;
+ }
+
/**
* Inner fileFilter class
*/
Modified: incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java?rev=814417&r1=814416&r2=814417&view=diff
==============================================================================
--- incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java (original)
+++ incubator/photark/trunk/photark/src/main/java/org/apache/photark/services/album/jcr/AlbumImpl.java Sun Sep 13 22:45:53 2009
@@ -40,30 +40,11 @@
public class AlbumImpl implements Album {
private String gallery;
- private String album;
+ private String name;
private String location;
private Repository repository=null;
private Session session=null;
- @Property
- public void setGallery(String gallery) {
- this.gallery = gallery;
- this.location = null;
- }
- @Property
- public void setAlbum(String album) {
- this.album = album;
- this.location = null;
- }
-
- protected String getLocation() {
- if (location == null) {
- location = gallery + "/" + album + "/";
- }
- return location;
-
- }
-
@Init
public void init() {
System.out.println(">>> Initializing JCR Album");
@@ -100,6 +81,32 @@
e.printStackTrace();
}
}
+
+
+ @Property
+ public void setGallery(String gallery) {
+ this.gallery = gallery;
+ this.location = null;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ @Property
+ public void setName(String name) {
+ this.name = name;
+ this.location = null;
+ }
+
+ protected String getLocation() {
+ if (location == null) {
+ location = gallery + "/" + name + "/";
+ }
+ return location;
+
+ }
+
public String[] getPictures() {
List<String> pictures = new ArrayList<String>();