package zero.zd.zquestionnaire;


import java.util.ArrayList;

import zero.zd.zquestionnaire.model.QnA;

/**
 * Helper class for retrieving QnA for different topics.
 * for future feature: choosing diff topics instead of 1 topic
 * Note: temporary implementation
 */
class QnAHelper {

    // TODO: add more QnA, import & export file
    static ArrayList<QnA> getBasicQnA() {
        ArrayList<QnA> qnaList = new ArrayList<>();
        qnaList.add(new QnA("ABC", "ABC"));
        qnaList.add(new QnA("DEF", "DEF"));
        qnaList.add(new QnA("GHI", "GHI"));
        qnaList.add(new QnA("JKL", "JKL"));
        qnaList.add(new QnA("MNO", "MNO"));
        qnaList.add(new QnA("PQR", "PQR"));
        qnaList.add(new QnA("STU", "STU"));
        qnaList.add(new QnA("VWX", "VWX"));
        qnaList.add(new QnA("YZA", "YZA"));
        qnaList.add(new QnA("BCD", "BCD"));

        return qnaList;
    }


}

package zero.zd.zquestionnaire;


import java.util.ArrayList;

import zero.zd.zquestionnaire.model.QnA;

/**
 * Helper class for retrieving QnA for different topics.
 * for future feature: choosing diff topics instead of 1 topic
 * Note: temporary implementation
 */
class QnAHelper {
    private static QnAHelper sInstance;

    private ArrayList<ArrayList<QnA>> mSubjectList;

    public static QnAHelper getInstance() {
        if (sInstance == null)
            sInstance = new QnAHelper();
        return sInstance;
    }

    private QnAHelper() {}

    public ArrayList<ArrayList<QnA>> getSubjectList() {
        // populate subject list
        mSubjectList.add(getBasicQnA());

        return mSubjectList;
    }

    // TODO: add more QnA, import & export file
    private ArrayList<QnA> getBasicQnA() {
        ArrayList<QnA> qnaList = new ArrayList<>();
        qnaList.add(new QnA("ABC", "ABC"));
        qnaList.add(new QnA("DEF", "DEF"));
        qnaList.add(new QnA("GHI", "GHI"));
        qnaList.add(new QnA("JKL", "JKL"));
        qnaList.add(new QnA("MNO", "MNO"));
        qnaList.add(new QnA("PQR", "PQR"));
        qnaList.add(new QnA("STU", "STU"));
        qnaList.add(new QnA("VWX", "VWX"));
        qnaList.add(new QnA("YZA", "YZA"));
        qnaList.add(new QnA("BCD", "BCD"));

        return qnaList;
    }


}

--- 
+++ 
@@ -11,27 +11,9 @@
  * Note: temporary implementation
  */
 class QnAHelper {
-    private static QnAHelper sInstance;
-
-    private ArrayList<ArrayList<QnA>> mSubjectList;
-
-    public static QnAHelper getInstance() {
-        if (sInstance == null)
-            sInstance = new QnAHelper();
-        return sInstance;
-    }
-
-    private QnAHelper() {}
-
-    public ArrayList<ArrayList<QnA>> getSubjectList() {
-        // populate subject list
-        mSubjectList.add(getBasicQnA());
-
-        return mSubjectList;
-    }
 
     // TODO: add more QnA, import & export file
-    private ArrayList<QnA> getBasicQnA() {
+    static ArrayList<QnA> getBasicQnA() {
         ArrayList<QnA> qnaList = new ArrayList<>();
         qnaList.add(new QnA("ABC", "ABC"));
         qnaList.add(new QnA("DEF", "DEF"));
Revert "Change Helper to Singleton Class"

This reverts commit 9a597a0cbfc00478ff312f3a5590ca9273e5ba0e.
