Locking down restlet library version.

While trying to fix this issue, I also moved FMFacade into this package
and fixed a couple bugs that snuck into the last commit.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/com/p4square/grow/frontend/SurveyPageResource.java b/src/com/p4square/grow/frontend/SurveyPageResource.java
index 1f9c56c..4bb132a 100644
--- a/src/com/p4square/grow/frontend/SurveyPageResource.java
+++ b/src/com/p4square/grow/frontend/SurveyPageResource.java
@@ -33,7 +33,6 @@ import com.p4square.grow.model.UserRecord;
 import com.p4square.grow.provider.DelegateProvider;
 import com.p4square.grow.provider.JsonEncodedProvider;
 import com.p4square.grow.provider.Provider;
-import com.p4square.grow.provider.QuestionProvider;
 
 /**
  * SurveyPageResource handles rendering the survey and processing user's answers.
@@ -71,7 +70,9 @@ public class SurveyPageResource extends FreeMarkerPageResource {
         }
 
         mJsonClient = new JsonRequestClient(getContext().getClientDispatcher());
-        mQuestionProvider = new QuestionProvider<String>(new JsonRequestProvider<Question>(getContext().getClientDispatcher(), Question.class)) {
+        mQuestionProvider = new DelegateProvider<String, String, Question>(
+                new JsonRequestProvider<Question>(getContext().getClientDispatcher(),
+                    Question.class)) {
             @Override
             public String makeKey(String questionId) {
                 return getBackendEndpoint() + "/assessment/question/" + questionId;