Merge branch 'robdouglas-Add-Page-Attributes' into feature/PR-69 #69

roundrop · Oct 13, 2014 · 7789f6c · 7789f6c
2 parents 7486fa6 + 1760cd0
commit 7789f6c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/facebook4j-core/pom.xml b/facebook4j-core/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.facebook4j</groupId>
   <artifactId>facebook4j-core</artifactId>
-  <version>2.0.5-SNAPSHOT</version>
+  <version>2.1.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>facebook4j-core</name>
   <description>A Java library for the Facebook Graph API</description>

diff --git a/facebook4j-core/src/main/java/facebook4j/internal/json/PageJSONImpl.java b/facebook4j-core/src/main/java/facebook4j/internal/json/PageJSONImpl.java
@@ -16,11 +16,7 @@
 
 package facebook4j.internal.json;
 
-import facebook4j.Cover;
-import facebook4j.FacebookException;
-import facebook4j.Page;
-import facebook4j.Place;
-import facebook4j.ResponseList;
+import facebook4j.*;
 import facebook4j.conf.Configuration;
 import facebook4j.internal.http.HttpResponse;
 import facebook4j.internal.org.json.JSONArray;
@@ -58,6 +54,8 @@
     private String accessToken;
     private Boolean isCommunityPage;
     private Integer wereHereCount;
+    private String about;
+    private String username;
 
     /*package*/PageJSONImpl(HttpResponse res, Configuration conf) throws FacebookException {
         super(res);
@@ -100,6 +98,8 @@ private void init(JSONObject json) throws FacebookException {
             accessToken = getRawString("access_token", json);
             isCommunityPage = getBoolean("is_community_page", json);
             wereHereCount = getInt("were_here_count", json);
+            about = getRawString("about", json);
+            username = getRawString("username", json);
 
         } catch (JSONException jsone) {
             throw new FacebookException(jsone.getMessage(), jsone);
@@ -178,6 +178,10 @@ public Integer getWereHereCount() {
         return wereHereCount;
     }
 
+    public String getAbout() { return about; }
+
+    public String getUsername() { return username; }
+
     /*package*/
     static ResponseList<Page> createPageList(HttpResponse res, Configuration conf) throws FacebookException {
         try {
@@ -228,7 +232,7 @@ public String toString() {
                 + ", accessToken=" + accessToken + ", isCommunityPage="
                 + isCommunityPage + ", wereHereCount=" + wereHereCount
                 + ", id=" + id + ", name=" + name + ", category=" + category
-                + ", createdTime=" + createdTime + "]";
+                + ", createdTime=" + createdTime + ", about=" + about + ", username=" + username + "]";
     }
 
 }