JavaLeaks
diff --git a/‎Flickr4Java/src/main/java/com/flickr4java/flickr/people/PeopleInterface.java‎
Lines changed: 21 additions & 34 deletions b/‎Flickr4Java/src/main/java/com/flickr4java/flickr/people/PeopleInterface.java‎
Lines changed: 21 additions & 34 deletions
diff --git a/‎Flickr4Java/src/main/java/com/flickr4java/flickr/photos/SearchParameters.java‎
Lines changed: 4 additions & 0 deletions b/‎Flickr4Java/src/main/java/com/flickr4java/flickr/photos/SearchParameters.java‎
Lines changed: 4 additions & 0 deletions
@@ -30,7 +30,7 @@
 
 /**
  * Interface for finding Flickr users.
- * 
+ *
  * @author Anthony Eden
  * @version $Id: PeopleInterface.java,v 1.28 2010/09/12 20:13:57 x-mago Exp $
  */
@@ -70,9 +70,9 @@ public PeopleInterface(String apiKey, String sharedSecret, Transport transportAP
 
     /**
      * Find the user by their email address.
-     * 
+     *
      * This method does not require authentication.
-     * 
+     *
      * @param email
      *            The email address
      * @return The User
@@ -98,9 +98,9 @@ public User findByEmail(String email) throws FlickrException {
 
     /**
      * Find a User by the username.
-     * 
+     *
      * This method does not require authentication.
-     * 
+     *
      * @param username
      *            The username
      * @return The User object
@@ -126,9 +126,9 @@ public User findByUsername(String username) throws FlickrException {
 
     /**
      * Get info about the specified user.
-     * 
+     *
      * This method does not require authentication.
-     * 
+     *
      * @param userId
      *            The user ID
      * @return The User object
@@ -175,12 +175,12 @@ public User getInfo(String userId) throws FlickrException {
 
     /**
      * Get a collection of public groups for the user.
-     * 
+     *
      * The groups will contain only the members nsid, name, admin and eighteenplus. If you want the whole group-information, you have to call
      * {@link com.flickr4java.flickr.groups.GroupsInterface#getInfo(String)}.
-     * 
+     *
      * This method does not require authentication.
-     * 
+     *
      * @param userId
      *            The user ID
      * @return The public groups
@@ -219,9 +219,9 @@ public PhotoList<Photo> getPublicPhotos(String userId, int perPage, int page) th
 
     /**
      * Get a collection of public photos for the specified user ID.
-     * 
+     *
      * This method does not require authentication.
-     * 
+     *
      * @see com.flickr4java.flickr.photos.Extras
      * @param userId
      *            The User ID
@@ -274,9 +274,9 @@ public PhotoList<Photo> getPublicPhotos(String userId, Set<String> extras, int p
 
     /**
      * Get upload status for the currently authenticated user.
-     * 
+     *
      * Requires authentication with 'read' permission using the new authentication API.
-     * 
+     *
      * @return A User object with upload status data fields filled
      * @throws FlickrException
      */
@@ -359,20 +359,7 @@ public PhotoList<Photo> getPhotos(String userId, String safeSearch, Date minUplo
         NodeList photoNodes = photosElement.getElementsByTagName("photo");
         for (int i = 0; i < photoNodes.getLength(); i++) {
             Element photoElement = (Element) photoNodes.item(i);
-            Photo photo = new Photo();
-            photo.setId(photoElement.getAttribute("id"));
-            photo.setSecret(photoElement.getAttribute("secret"));
-
-            User owner = new User();
-            owner.setId(photoElement.getAttribute("owner"));
-            photo.setOwner(owner);
-            photo.setUrl("http://flickr.com/photos/" + owner.getId() + "/" + photo.getId());
-            photo.setServer(photoElement.getAttribute("server"));
-            photo.setTitle(photoElement.getAttribute("title"));
-            photo.setPublicFlag("1".equals(photoElement.getAttribute("ispublic")));
-            photo.setFriendFlag("1".equals(photoElement.getAttribute("isfriend")));
-            photo.setFamilyFlag("1".equals(photoElement.getAttribute("isfamily")));
-            photos.add(photo);
+            photos.add(PhotoUtils.createPhoto(photoElement));
         }
         return photos;
     }
@@ -430,7 +417,7 @@ public PhotoList<Photo> getPhotosOf(String userId, String ownerId, Set<String> e
 
     /**
      * Add the given person to the photo. Optionally, send in co-ordinates
-     * 
+     *
      * @param photoId
      * @param userId
      * @param bounds
@@ -445,7 +432,7 @@ public void add(String photoId, String userId, Rectangle bounds) throws FlickrEx
 
     /**
      * Delete the person from the photo
-     * 
+     *
      * @param photoId
      * @param userId
      * @throws FlickrException
@@ -459,7 +446,7 @@ public void delete(String photoId, String userId) throws FlickrException {
 
     /**
      * Delete the co-ordinates that the user is shown in
-     * 
+     *
      * @param photoId
      * @param userId
      * @throws FlickrException
@@ -473,7 +460,7 @@ public void deleteCoords(String photoId, String userId) throws FlickrException {
 
     /**
      * Edit the co-ordinates that the user shows in
-     * 
+     *
      * @param photoId
      * @param userId
      * @param bounds
@@ -487,7 +474,7 @@ public void editCoords(String photoId, String userId, Rectangle bounds) throws F
     }
 
     /**
-     * 
+     *
      * @param photoId
      * @throws FlickrException
      */
@@ -499,7 +486,7 @@ public UserList<User> getList(String photoId) throws FlickrException {
     }
 
     /**
-     * 
+     *
      * @param userId
      * @throws FlickrException
      */
 
@@ -592,6 +592,10 @@ public Map<String, Object> getAsParameters() {
             }
         }
 
+        if (placeId != null && !placeId.isEmpty()) {
+            parameters.put("place_id", placeId);
+        }
+
         return parameters;
     }
Original file line number	Diff line number	Diff line change
`@@ -592,6 +592,10 @@ public Map<String, Object> getAsParameters() {`
`592`	`592`	`}`
`593`	`593`	`}`
`594`	`594`
	`595`	`+ if (placeId != null && !placeId.isEmpty()) {`
	`596`	`+ parameters.put("place_id", placeId);`
	`597`	`+ }`
	`598`	`+`
`595`	`599`	`return parameters;`
`596`	`600`	`}`
`597`	`601`