summaryrefslogtreecommitdiff
path: root/src/com/p4square/grow/model/Question.java
diff options
context:
space:
mode:
authorJesse Morgan <jesse@jesterpm.net>2013-11-09 15:24:56 -0800
committerJesse Morgan <jesse@jesterpm.net>2013-11-09 15:24:56 -0800
commitd94643c217b6b93eb6c539c60b00fe0cf68272b7 (patch)
treeff27dd65b1580c5f498091684d32403577165426 /src/com/p4square/grow/model/Question.java
parent5d7828e929a57042e3a0e6f6f2beafc60c748368 (diff)
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.
Diffstat (limited to 'src/com/p4square/grow/model/Question.java')
-rw-r--r--src/com/p4square/grow/model/Question.java6
1 files changed, 3 insertions, 3 deletions
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.