Skip to content

Commit

Permalink
Merge branches 'hotfix-1.5.11' and 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
nischal committed Jan 15, 2012
3 parents 26102ff + f445042 + 26102ff commit 3ae9e72
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<property name="lib.dir" value="lib" />
<property name="build.dir" value="build" />
<property name="project.name" value="face4j" />
<property name="project.version" value="1.5.10" />
<property name="project.version" value="1.5.11" />
<property name="dist.dir" value="dist" />
<property name="archive.name-face4j" value="face4j-${project.version}" />
<property name="exclude-classes" value="com/face4j/dummy/**,com/face4j/facebook/test/**"></property>
Expand Down
Binary file added dist/face4j-1.5.11.jar
Binary file not shown.
3 changes: 3 additions & 0 deletions release.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,6 @@ version 0.4.1

13/01/2012
1.5.10

15/01/2012
1.5.11
35 changes: 32 additions & 3 deletions src/com/face4j/facebook/entity/Location.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ public class Location implements Serializable {
private String state;
private String country;
private String zip;

private String latitude;
private String longitude;

public String getId() {
return id;
Expand Down Expand Up @@ -61,7 +64,33 @@ public String getZip() {
public void setZip(String zip) {
this.zip = zip;
}



}
public Double getLatitude() {
if(this.latitude != null && !this.latitude.equals("")){
return Double.parseDouble(this.latitude);
}

return null;
}

public void setLatitude(Double latitude) {
if(latitude != null){
this.latitude = ""+latitude;
}
}

public Double getLongitude() {
if(this.longitude != null && !this.longitude.equals("")){
return Double.parseDouble(this.longitude);
}

return null;
}

public void setLongitude(Double longitude) {
if(longitude != null){
this.longitude = ""+longitude;
}
}

}

0 comments on commit 3ae9e72

Please sign in to comment.