From 0d90da39f77ac3cfa607a68bc59336bf0bdff240 Mon Sep 17 00:00:00 2001 From: Jesse Morgan Date: Sat, 9 Nov 2013 15:24:56 -0800 Subject: Refactored TrainingResource to use the Provider interface. Playlists are now generated from a default playlist and regularly merged with the default playlist to get updates. Also adding the Question tests that got left out of a previous commit. --- src/com/p4square/grow/model/Question.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/com/p4square/grow/model/Question.java') diff --git a/src/com/p4square/grow/model/Question.java b/src/com/p4square/grow/model/Question.java index 37deffa..f4b9458 100644 --- a/src/com/p4square/grow/model/Question.java +++ b/src/com/p4square/grow/model/Question.java @@ -7,9 +7,9 @@ package com.p4square.grow.model; import java.util.HashMap; import java.util.Map; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonSubTypes.Type; -import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonTypeInfo; /** * Model of an assessment question. -- cgit v1.2.3