From 82dd51ed08218791c862d60f4c5bcce16ace0e96 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Sat, 7 Sep 2013 01:14:36 +0000
Subject: [PATCH]

---
 .classpath                                                   | 2 +-
 .settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs | 5 +++++
 src/zall/util/facebook/FBUser.java                           | 3 +--
 src/zall/util/facebook/FacebookConnect.java                  | 3 +--
 4 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 .settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

diff --git a/.classpath b/.classpath
index 95dd725..82edc4c 100644
--- a/.classpath
+++ b/.classpath
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/ZUtil"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -9,5 +8,6 @@
 	<classpathentry kind="lib" path="/Test/lib/slf4j-api-1.6.4.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Ziver/Documents/Programmering/Java/libs/xuggler/xuggle-xuggler-5.4.jar" sourcepath="C:/Users/Ziver/Documents/Programmering/Java/libs/xuggler/xuggle-xuggler-5.4.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/Apache Tomcat v7.0"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/ZUtil"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs b/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
new file mode 100644
index 0000000..af099af
--- /dev/null
+++ b/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
@@ -0,0 +1,5 @@
+XDOCLETBUILDERACTIVE=true
+XDOCLETHOME=
+XDOCLETUSEGLOBAL=true
+XDOCLETVERSION=1.2.1
+eclipse.preferences.version=1
diff --git a/src/zall/util/facebook/FBUser.java b/src/zall/util/facebook/FBUser.java
index 40de346..9f83eb7 100644
--- a/src/zall/util/facebook/FBUser.java
+++ b/src/zall/util/facebook/FBUser.java
@@ -47,8 +47,7 @@ public class FBUser {
 		try {
 			InputStream stream = fbc.getServiceURL( uid ).openStream();			
 			String data = IOUtil.getContent( stream );
-			JSONParser jp = new JSONParser();
-			DataNode node = jp.read( data );
+			DataNode node = JSONParser.read( data );
 
 			logger.finer("User("+uid+") data from Facebook: "+data);
 
diff --git a/src/zall/util/facebook/FacebookConnect.java b/src/zall/util/facebook/FacebookConnect.java
index eb51149..48cfaa2 100644
--- a/src/zall/util/facebook/FacebookConnect.java
+++ b/src/zall/util/facebook/FacebookConnect.java
@@ -169,8 +169,7 @@ public class FacebookConnect {
 		System.out.println( signature );
 		attrib[1] = Base64Decoder.addPadding( attrib[1] );
 		String data = Base64Decoder.decode( attrib[1] );
-		JSONParser json = new JSONParser();
-		DataNode map = json.read( data );	
+		DataNode map = JSONParser.read( data );
 		System.out.println(map);
 
 		if ( !map.getString("algorithm").equalsIgnoreCase("HMAC-SHA256") ) {