Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [183] WebEditor/src/edu/lnu/FireFly/WebEditor
|
From: <se...@us...> - 2008-05-31 09:03:54
|
Revision: 183
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=183&view=rev
Author: sem62
Date: 2008-05-31 02:03:39 -0700 (Sat, 31 May 2008)
Log Message:
-----------
Code refactorings.
Modified Paths:
--------------
WebEditor/src/edu/lnu/FireFly/WebEditor/Data/ManifestFactory.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemConfigurationManager.java
Added Paths:
-----------
WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ChapterItemData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/CompileQData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemDataFactory.java
WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/LectureData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/SimpleQuestionData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/SummaryPageData.java
Removed Paths:
-------------
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterItemData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemDataFactory.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageData.java
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/Data/ManifestFactory.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/Data/ManifestFactory.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/Data/ManifestFactory.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -14,7 +14,7 @@
import edu.lnu.FireFly.FFManifest.item.sequencing.objectives.Objectives;
import edu.lnu.FireFly.FFManifest.resource.Resources;
import edu.lnu.FireFly.WebEditor.ItemModels.OrganizationModel;
-import edu.lnu.FireFly.WebEditor.ItemModels.Chapter.ChapterItemData;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.ChapterItemData;
import edu.lnu.FireFly.WebEditor.itemConfiguration.ItemConfigurationManager;
public class ManifestFactory {
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -26,10 +26,10 @@
import javax.swing.table.TableCellEditor;
import edu.lnu.FireFly.WebEditor.GUI.Dialogs.PropertyDlg;
-import edu.lnu.FireFly.WebEditor.ItemModels.CompileQ.CompileQData;
import edu.lnu.FireFly.WebEditor.ItemModels.CompileQ.CompileQIOModel;
import edu.lnu.FireFly.WebEditor.ItemModels.CompileQ.CompileQModel;
import edu.lnu.FireFly.WebEditor.ItemModels.CompileQ.CompileQPartsTableModel;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.CompileQData;
/**
*
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -7,8 +7,8 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import edu.lnu.FireFly.WebEditor.ItemModels.Lecture.LectureData;
import edu.lnu.FireFly.WebEditor.ItemModels.Lecture.LectureModel;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.LectureData;
/**
*
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -17,8 +17,8 @@
import javax.swing.table.DefaultTableColumnModel;
import edu.lnu.FireFly.WebEditor.ItemModels.SimpleQuestion.SimpleQuestionAnswersDataModel;
-import edu.lnu.FireFly.WebEditor.ItemModels.SimpleQuestion.SimpleQuestionData;
import edu.lnu.FireFly.WebEditor.ItemModels.SimpleQuestion.SimpleQuestionModel;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.SimpleQuestionData;
/**
*
Deleted: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterItemData.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterItemData.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterItemData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -1,108 +0,0 @@
-package edu.lnu.FireFly.WebEditor.ItemModels.Chapter;
-
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
-
-public class ChapterItemData extends ItemData {
- private boolean showSummaryPage = true;
-
- @Override
- public Element marshal() {
- Element root = DocumentHelper.createElement("ItemData");
-
- root.addElement("ShowSummaryPage").setText(
- String.valueOf(isShowSummaryPage()));
-
- root.addElement("ShowOnSummaryPage").setText(
- String.valueOf(getShowOnSummaryPage()));
-
- root.addElement("Configuration").setText(
- String.valueOf(getConfiguration()));
-
- return root;
- }
-
- private boolean flow;
-
- private boolean choice;
-
- private boolean forwarOnly;
- private boolean choiceExit;
- private int configuration = ChapterItemData.CONFIGURATION_USER_DEFINED;
-
- public int getConfiguration() {
- return configuration;
- }
-
- public boolean isChoice() {
- return choice;
- }
-
- public boolean isChoiceExit() {
- return choiceExit;
- }
-
- public boolean isFlow() {
- return flow;
- }
-
- public boolean isForwarOnly() {
- return forwarOnly;
- }
-
- public boolean isShowSummaryPage() {
- return showSummaryPage;
- }
-
- public void setChoice(boolean choice) {
- this.choice = choice;
- }
-
- public void setChoiceExit(boolean choiceExit) {
- this.choiceExit = choiceExit;
- }
-
- public void setConfiguration(int configuration) {
- this.configuration = configuration;
- }
-
- public void setFlow(boolean flow) {
- this.flow = flow;
- }
-
- public void setForwarOnly(boolean forwarOnly) {
- this.forwarOnly = forwarOnly;
- }
-
- public void setShowSummaryPage(boolean showSummaryPage) {
- this.showSummaryPage = showSummaryPage;
- }
-
- @Override
- public boolean unmarshal(Element root) {
- try {
- boolean showSP = Boolean.valueOf(root.elementTextTrim("ShowSummaryPage"));
- setShowSummaryPage(showSP);
-
- boolean showOnSP = Boolean.valueOf(root
- .elementTextTrim("ShowOnSummaryPage"));
- setShowOnSummaryPage(showOnSP);
-
- int configuration = Integer.valueOf(root
- .elementTextTrim("Configuration"));
- setConfiguration(configuration);
-
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
-
- return true;
- }
-
- public static final int CONFIGURATION_USER_DEFINED = 0;
- public static final int CONFIGURATION_LECTURE = 1;
- public static final int CONFIGURATION_EXAMINATION = 2;
-}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -4,12 +4,13 @@
import edu.lnu.FireFly.WebEditor.Data.SummaryPageManager;
import edu.lnu.FireFly.WebEditor.GUI.TreeDataModel;
import edu.lnu.FireFly.WebEditor.GUI.Dialogs.ChapterPropertiestsDlg;
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModel;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModels;
import edu.lnu.FireFly.WebEditor.ItemModels.ResourcedItemModel;
import edu.lnu.FireFly.WebEditor.ItemModels.SummaryPageModel.SummaryPageModel;
import edu.lnu.FireFly.WebEditor.UserAnswerStatus.UserAnswerStatus;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.ChapterItemData;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.ItemData;
public class ChapterModel extends ResourcedItemModel {
Deleted: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQData.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQData.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -1,120 +0,0 @@
-package edu.lnu.FireFly.WebEditor.ItemModels.CompileQ;
-
-import java.util.Iterator;
-
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
-
-public class CompileQData extends ItemData {
- @Override
- public Element marshal() {
- Element root = DocumentHelper.createElement("ItemData");
- root.addElement("caption").setText(getCaption());
-
- root.addElement("ShowOnSummaryPage").setText(
- String.valueOf(getShowOnSummaryPage()));
-
- Element parts = root.addElement("parts");
-
- parts.addAttribute("language", String.valueOf(getLanguge()));
-
- Iterator<CompileQPart> iter = getParts().questionParts.iterator();
-
- while (iter.hasNext()) {
- CompileQPart part = iter.next();
-
- Element partElement = parts.addElement("part");
- partElement.addAttribute("isAnswer", String.valueOf(part
- .getPartAttributes().isAnswer()));
- partElement.addAttribute("isReadOnly", String.valueOf(part
- .getPartAttributes().isReadOnly()));
- partElement.addAttribute("isVivsble", String.valueOf(part
- .getPartAttributes().isVisible()));
-
- partElement.setText(part.getAnswerText());
- }
-
- return root;
- }
-
- private String caption = "";
- private String languge = "Any";
-
- public String getCaption() {
- return caption;
- }
-
- private CompileQPartsTableModel parts = new CompileQPartsTableModel();
- private CompileQIOModel ioRecords = new CompileQIOModel();
-
- public void setCaption(String caption) {
- this.caption = caption;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public boolean unmarshal(Element root) {
- try {
- Element answers = root.element("parts");
-
- setCaption(root.elementTextTrim("caption"));
-
- boolean showOnSP = Boolean.valueOf(root
- .elementTextTrim("ShowOnSummaryPage"));
- setShowOnSummaryPage(showOnSP);
-
- setLanguge(answers.attributeValue("language"));
-
- getParts().questionParts.clear();
-
- Iterator<Element> iter = answers.elementIterator("part");
- while (iter.hasNext()) {
- Element partElement = iter.next();
- CompileQPart part = new CompileQPart(partElement.getText());
-
- part.getPartAttributes().setAnswer(
- partElement.attributeValue("isAnswer")
- .equalsIgnoreCase("true"));
- part.getPartAttributes().setReadOnly(
- partElement.attributeValue("isReadOnly")
- .equalsIgnoreCase("true"));
- part.getPartAttributes().setVisible(
- partElement.attributeValue("isVivsble")
- .equalsIgnoreCase("true"));
-
- getParts().questionParts.add(part);
- }
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
-
- return true;
- }
-
- public CompileQPartsTableModel getParts() {
- return parts;
- }
-
- public void setParts(CompileQPartsTableModel parts) {
- this.parts = parts;
- }
-
- public String getLanguge() {
- return languge;
- }
-
- public void setLanguge(String languge) {
- this.languge = languge;
- }
-
- public CompileQIOModel getIoRecords() {
- return ioRecords;
- }
-
- public void setIoRecords(CompileQIOModel ioRecords) {
- this.ioRecords = ioRecords;
- }
-}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -7,11 +7,12 @@
import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.WebEditor.WebEditor;
import edu.lnu.FireFly.WebEditor.GUI.Dialogs.CompileQ.CompileQPropertiestsDlg;
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
import edu.lnu.FireFly.WebEditor.ItemModels.ResourcedItemModel;
import edu.lnu.FireFly.WebEditor.ItemModels.Template;
import edu.lnu.FireFly.WebEditor.UserAnswerStatus.ScoredUserAnswerStatus;
import edu.lnu.FireFly.WebEditor.UserAnswerStatus.UserAnswerStatus;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.CompileQData;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.ItemData;
public class CompileQModel extends ResourcedItemModel {
Deleted: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemData.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemData.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -1,19 +0,0 @@
-package edu.lnu.FireFly.WebEditor.ItemModels;
-
-import org.dom4j.Element;
-
-public abstract class ItemData {
- private Boolean showOnSummaryPage = false;
-
- public Boolean getShowOnSummaryPage() {
- return showOnSummaryPage;
- }
-
- public void setShowOnSummaryPage(Boolean showOnSummaryPage) {
- this.showOnSummaryPage = showOnSummaryPage;
- }
-
- public abstract boolean unmarshal(Element root);
-
- public abstract Element marshal();
-}
Deleted: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemDataFactory.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemDataFactory.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemDataFactory.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -1,45 +0,0 @@
-package edu.lnu.FireFly.WebEditor.ItemModels;
-
-import edu.lnu.FireFly.WebEditor.ItemModels.Chapter.ChapterItemData;
-import edu.lnu.FireFly.WebEditor.ItemModels.CompileQ.CompileQData;
-import edu.lnu.FireFly.WebEditor.ItemModels.Lecture.LectureData;
-import edu.lnu.FireFly.WebEditor.ItemModels.SimpleQuestion.SimpleQuestionData;
-import edu.lnu.FireFly.WebEditor.ItemModels.SummaryPageModel.SummaryPageData;
-
-public class ItemDataFactory {
- private static ItemDataFactory obj = null;
-
- private ItemDataFactory(){}
-
- public static ItemDataFactory getInstance(){
- if (obj == null){
- obj = new ItemDataFactory();
- }
-
- return obj;
- }
-
- public ItemData createItemData(String type){
- if (LectureData.class.getSimpleName().equalsIgnoreCase(type)){
- return new LectureData();
- }
-
- if (ChapterItemData.class.getSimpleName().equalsIgnoreCase(type)){
- return new ChapterItemData();
- }
-
- if (SimpleQuestionData.class.getSimpleName().equalsIgnoreCase(type)){
- return new SimpleQuestionData();
- }
-
- if (SummaryPageData.class.getSimpleName().equalsIgnoreCase(type)){
- return new SummaryPageData();
- }
-
- if (CompileQData.class.getSimpleName().equalsIgnoreCase(type)){
- return new CompileQData();
- }
-
- return null;
- }
-}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -23,6 +23,7 @@
import edu.lnu.FireFly.WebEditor.ItemModels.SummaryPageModel.SummaryPageModel;
import edu.lnu.FireFly.WebEditor.UserAnswerStatus.UserAnswerStatus;
import edu.lnu.FireFly.WebEditor.itemConfiguration.ItemConfigurationManager;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.ItemData;
public abstract class ItemModel {
protected String modelName = "Abstract model";
Deleted: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureData.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureData.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -1,52 +0,0 @@
-package edu.lnu.FireFly.WebEditor.ItemModels.Lecture;
-
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
-
-public class LectureData extends ItemData {
- private String caption = "";
- private String content = "";
-
- public String getCaption() {
- return caption;
- }
-
- public void setCaption(String caption) {
- this.caption = caption;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- @Override
- public boolean unmarshal(Element root) {
- setCaption(root.elementTextTrim("caption"));
- setContent(root.elementTextTrim("content"));
-
- boolean showOnSP = Boolean.valueOf(root
- .elementTextTrim("ShowOnSummaryPage"));
-
- setShowOnSummaryPage(showOnSP);
-
- return true;
- }
-
- @Override
- public Element marshal() {
- Element root = DocumentHelper.createElement("ItemData");
- root.addElement("caption").setText(getCaption());
- root.addElement("content").setText(getContent());
-
- root.addElement("ShowOnSummaryPage").setText(
- String.valueOf(getShowOnSummaryPage()));
-
- return root;
- }
-}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -5,11 +5,12 @@
import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.WebEditor.WebEditor;
import edu.lnu.FireFly.WebEditor.GUI.Dialogs.LecturePropertiestsDlg;
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
import edu.lnu.FireFly.WebEditor.ItemModels.ResourcedItemModel;
import edu.lnu.FireFly.WebEditor.ItemModels.Template;
import edu.lnu.FireFly.WebEditor.UserAnswerStatus.LectureUserAnswerStatus;
import edu.lnu.FireFly.WebEditor.UserAnswerStatus.UserAnswerStatus;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.ItemData;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.LectureData;
public class LectureModel extends ResourcedItemModel {
@Override
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -11,6 +11,7 @@
import edu.lnu.FireFly.WebEditor.GUI.TreeDataModel;
import edu.lnu.FireFly.WebEditor.WSClients.WebEditorServiceClient;
import edu.lnu.FireFly.WebEditor.itemConfiguration.ItemConfigurationManager;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.ItemData;
public abstract class ResourcedItemModel extends ItemModel {
Deleted: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionData.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionData.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -1,100 +0,0 @@
-package edu.lnu.FireFly.WebEditor.ItemModels.SimpleQuestion;
-
-import java.util.Iterator;
-
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
-
-public class SimpleQuestionData extends ItemData {
- @Override
- public Element marshal() {
- Element root = DocumentHelper.createElement("ItemData");
- root.addElement("caption").setText(getCaption());
- root.addElement("question").setText(getQuestion());
-
- root.addElement("ShowOnSummaryPage").setText(
- String.valueOf(getShowOnSummaryPage()));
-
- Element ans = root.addElement("answers");
-
- ans.addAttribute("answerType", String.valueOf(getAnswers().getAnswerType()));
-
- Iterator<SimpleQuestionAnswer> iter = getAnswers().answers.iterator();
-
- while (iter.hasNext()) {
- SimpleQuestionAnswer answer = iter.next();
-
- Element ansEl = ans.addElement("answer");
- ansEl
- .addAttribute("point", String.valueOf(answer
- .getAnswerPoint()));
- ansEl.setText(answer.getAnswerText());
- }
-
- return root;
- }
-
- private SimpleQuestionAnswersDataModel answers = new SimpleQuestionAnswersDataModel();
- private String caption = "";
- private String question = "";
-
- public SimpleQuestionAnswersDataModel getAnswers() {
- return answers;
- }
-
- public void setAnswers(SimpleQuestionAnswersDataModel answers) {
- this.answers = answers;
- }
-
- public String getCaption() {
- return caption;
- }
-
- public void setCaption(String caption) {
- this.caption = caption;
- }
-
- public String getQuestion() {
- return question;
- }
-
- public void setQuestion(String question) {
- this.question = question;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public boolean unmarshal(Element root) {
- try {
- Element answers = root.element("answers");
-
- setCaption(root.elementTextTrim("caption"));
- setQuestion(root.elementTextTrim("question"));
-
- boolean showOnSP = Boolean.valueOf(root
- .elementTextTrim("ShowOnSummaryPage"));
- setShowOnSummaryPage(showOnSP);
-
- getAnswers().setAnswerType(Integer.valueOf(answers.attributeValue("answerType")));
-
- getAnswers().answers.clear();
-
- Iterator<Element> iter = answers.elementIterator("answer");
- while (iter.hasNext()) {
- Element answer = iter.next();
- SimpleQuestionAnswer ans = new SimpleQuestionAnswer(answer
- .getText());
- ans.setAnswerPoint(Double.valueOf(answer
- .attributeValue("point")));
- getAnswers().answers.add(ans);
- }
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
-
- return true;
- }
-}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -8,11 +8,12 @@
import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.WebEditor.WebEditor;
import edu.lnu.FireFly.WebEditor.GUI.Dialogs.SimpleQuestionPropertiestsDlg;
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
import edu.lnu.FireFly.WebEditor.ItemModels.ResourcedItemModel;
import edu.lnu.FireFly.WebEditor.ItemModels.Template;
import edu.lnu.FireFly.WebEditor.UserAnswerStatus.ScoredUserAnswerStatus;
import edu.lnu.FireFly.WebEditor.UserAnswerStatus.UserAnswerStatus;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.ItemData;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.SimpleQuestionData;
/**
* @author Yura
Deleted: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageData.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageData.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -1,27 +0,0 @@
-package edu.lnu.FireFly.WebEditor.ItemModels.SummaryPageModel;
-
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
-
-public class SummaryPageData extends ItemData {
-
- @Override
- public Element marshal() {
- Element root = DocumentHelper.createElement("ItemData");
-
- return root;
- }
-
- @Override
- public boolean unmarshal(Element root) {
- // TODO Auto-generated method stub
- return true;
- }
-
- @Override
- public Boolean getShowOnSummaryPage() {
- return false;
- }
-}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -4,7 +4,6 @@
import edu.lnu.FireFly.FFManifest.item.Item;
import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.WebEditor.WebEditor;
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModel;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModels;
import edu.lnu.FireFly.WebEditor.ItemModels.OrganizationModel;
@@ -14,6 +13,8 @@
import edu.lnu.FireFly.WebEditor.ItemModels.Lecture.LectureModel;
import edu.lnu.FireFly.WebEditor.ItemModels.SimpleQuestion.SimpleQuestionModel;
import edu.lnu.FireFly.WebEditor.UserAnswerStatus.UserAnswerStatus;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.ItemData;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.SummaryPageData;
public class SummaryPageModel extends ResourcedItemModel {
@Override
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -4,6 +4,7 @@
import edu.lnu.FireFly.FFManifest.item.Item;
import edu.lnu.FireFly.WebEditor.GUI.TreeDataModel;
import edu.lnu.FireFly.WebEditor.UserAnswerStatus.UserAnswerStatus;
+import edu.lnu.FireFly.WebEditor.itemConfiguration.ItemData;
public class UnknownItemModel extends ItemModel {
Copied: WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ChapterItemData.java (from rev 178, WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterItemData.java)
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ChapterItemData.java (rev 0)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ChapterItemData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -0,0 +1,107 @@
+package edu.lnu.FireFly.WebEditor.itemConfiguration;
+
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+
+public class ChapterItemData extends ItemData {
+ private boolean showSummaryPage = true;
+
+ @Override
+ public Element marshal() {
+ Element root = DocumentHelper.createElement("ItemData");
+
+ root.addElement("ShowSummaryPage").setText(
+ String.valueOf(isShowSummaryPage()));
+
+ root.addElement("ShowOnSummaryPage").setText(
+ String.valueOf(getShowOnSummaryPage()));
+
+ root.addElement("Configuration").setText(
+ String.valueOf(getConfiguration()));
+
+ return root;
+ }
+
+ private boolean flow;
+
+ private boolean choice;
+
+ private boolean forwarOnly;
+ private boolean choiceExit;
+ private int configuration = ChapterItemData.CONFIGURATION_USER_DEFINED;
+
+ public int getConfiguration() {
+ return configuration;
+ }
+
+ public boolean isChoice() {
+ return choice;
+ }
+
+ public boolean isChoiceExit() {
+ return choiceExit;
+ }
+
+ public boolean isFlow() {
+ return flow;
+ }
+
+ public boolean isForwarOnly() {
+ return forwarOnly;
+ }
+
+ public boolean isShowSummaryPage() {
+ return showSummaryPage;
+ }
+
+ public void setChoice(boolean choice) {
+ this.choice = choice;
+ }
+
+ public void setChoiceExit(boolean choiceExit) {
+ this.choiceExit = choiceExit;
+ }
+
+ public void setConfiguration(int configuration) {
+ this.configuration = configuration;
+ }
+
+ public void setFlow(boolean flow) {
+ this.flow = flow;
+ }
+
+ public void setForwarOnly(boolean forwarOnly) {
+ this.forwarOnly = forwarOnly;
+ }
+
+ public void setShowSummaryPage(boolean showSummaryPage) {
+ this.showSummaryPage = showSummaryPage;
+ }
+
+ @Override
+ public boolean unmarshal(Element root) {
+ try {
+ boolean showSP = Boolean.valueOf(root.elementTextTrim("ShowSummaryPage"));
+ setShowSummaryPage(showSP);
+
+ boolean showOnSP = Boolean.valueOf(root
+ .elementTextTrim("ShowOnSummaryPage"));
+ setShowOnSummaryPage(showOnSP);
+
+ int configuration = Integer.valueOf(root
+ .elementTextTrim("Configuration"));
+ setConfiguration(configuration);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+
+ return true;
+ }
+
+ public static final int CONFIGURATION_USER_DEFINED = 0;
+ public static final int CONFIGURATION_LECTURE = 1;
+ public static final int CONFIGURATION_EXAMINATION = 2;
+}
Copied: WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/CompileQData.java (from rev 182, WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQData.java)
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/CompileQData.java (rev 0)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/CompileQData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -0,0 +1,122 @@
+package edu.lnu.FireFly.WebEditor.itemConfiguration;
+
+import java.util.Iterator;
+
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+import edu.lnu.FireFly.WebEditor.ItemModels.CompileQ.CompileQIOModel;
+import edu.lnu.FireFly.WebEditor.ItemModels.CompileQ.CompileQPart;
+import edu.lnu.FireFly.WebEditor.ItemModels.CompileQ.CompileQPartsTableModel;
+
+public class CompileQData extends ItemData {
+ @Override
+ public Element marshal() {
+ Element root = DocumentHelper.createElement("ItemData");
+ root.addElement("caption").setText(getCaption());
+
+ root.addElement("ShowOnSummaryPage").setText(
+ String.valueOf(getShowOnSummaryPage()));
+
+ Element parts = root.addElement("parts");
+
+ parts.addAttribute("language", String.valueOf(getLanguge()));
+
+ Iterator<CompileQPart> iter = getParts().questionParts.iterator();
+
+ while (iter.hasNext()) {
+ CompileQPart part = iter.next();
+
+ Element partElement = parts.addElement("part");
+ partElement.addAttribute("isAnswer", String.valueOf(part
+ .getPartAttributes().isAnswer()));
+ partElement.addAttribute("isReadOnly", String.valueOf(part
+ .getPartAttributes().isReadOnly()));
+ partElement.addAttribute("isVivsble", String.valueOf(part
+ .getPartAttributes().isVisible()));
+
+ partElement.setText(part.getAnswerText());
+ }
+
+ return root;
+ }
+
+ private String caption = "";
+ private String languge = "Any";
+
+ public String getCaption() {
+ return caption;
+ }
+
+ private CompileQPartsTableModel parts = new CompileQPartsTableModel();
+ private CompileQIOModel ioRecords = new CompileQIOModel();
+
+ public void setCaption(String caption) {
+ this.caption = caption;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public boolean unmarshal(Element root) {
+ try {
+ Element answers = root.element("parts");
+
+ setCaption(root.elementTextTrim("caption"));
+
+ boolean showOnSP = Boolean.valueOf(root
+ .elementTextTrim("ShowOnSummaryPage"));
+ setShowOnSummaryPage(showOnSP);
+
+ setLanguge(answers.attributeValue("language"));
+
+ getParts().questionParts.clear();
+
+ Iterator<Element> iter = answers.elementIterator("part");
+ while (iter.hasNext()) {
+ Element partElement = iter.next();
+ CompileQPart part = new CompileQPart(partElement.getText());
+
+ part.getPartAttributes().setAnswer(
+ partElement.attributeValue("isAnswer")
+ .equalsIgnoreCase("true"));
+ part.getPartAttributes().setReadOnly(
+ partElement.attributeValue("isReadOnly")
+ .equalsIgnoreCase("true"));
+ part.getPartAttributes().setVisible(
+ partElement.attributeValue("isVivsble")
+ .equalsIgnoreCase("true"));
+
+ getParts().questionParts.add(part);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+
+ return true;
+ }
+
+ public CompileQPartsTableModel getParts() {
+ return parts;
+ }
+
+ public void setParts(CompileQPartsTableModel parts) {
+ this.parts = parts;
+ }
+
+ public String getLanguge() {
+ return languge;
+ }
+
+ public void setLanguge(String languge) {
+ this.languge = languge;
+ }
+
+ public CompileQIOModel getIoRecords() {
+ return ioRecords;
+ }
+
+ public void setIoRecords(CompileQIOModel ioRecords) {
+ this.ioRecords = ioRecords;
+ }
+}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemConfigurationManager.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemConfigurationManager.java 2008-05-29 19:08:52 UTC (rev 182)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemConfigurationManager.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -10,8 +10,6 @@
import org.dom4j.io.SAXReader;
import edu.lnu.FireFly.FFManifest.TreeItem;
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
-import edu.lnu.FireFly.WebEditor.ItemModels.ItemDataFactory;
import edu.lnu.FireFly.WebEditor.WSClients.WebEditorServiceClient;
public class ItemConfigurationManager {
Copied: WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemData.java (from rev 178, WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemData.java)
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemData.java (rev 0)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -0,0 +1,19 @@
+package edu.lnu.FireFly.WebEditor.itemConfiguration;
+
+import org.dom4j.Element;
+
+public abstract class ItemData {
+ private Boolean showOnSummaryPage = false;
+
+ public Boolean getShowOnSummaryPage() {
+ return showOnSummaryPage;
+ }
+
+ public void setShowOnSummaryPage(Boolean showOnSummaryPage) {
+ this.showOnSummaryPage = showOnSummaryPage;
+ }
+
+ public abstract boolean unmarshal(Element root);
+
+ public abstract Element marshal();
+}
Copied: WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemDataFactory.java (from rev 178, WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemDataFactory.java)
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemDataFactory.java (rev 0)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/ItemDataFactory.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -0,0 +1,40 @@
+package edu.lnu.FireFly.WebEditor.itemConfiguration;
+
+
+public class ItemDataFactory {
+ private static ItemDataFactory obj = null;
+
+ private ItemDataFactory(){}
+
+ public static ItemDataFactory getInstance(){
+ if (obj == null){
+ obj = new ItemDataFactory();
+ }
+
+ return obj;
+ }
+
+ public ItemData createItemData(String type){
+ if (LectureData.class.getSimpleName().equalsIgnoreCase(type)){
+ return new LectureData();
+ }
+
+ if (ChapterItemData.class.getSimpleName().equalsIgnoreCase(type)){
+ return new ChapterItemData();
+ }
+
+ if (SimpleQuestionData.class.getSimpleName().equalsIgnoreCase(type)){
+ return new SimpleQuestionData();
+ }
+
+ if (SummaryPageData.class.getSimpleName().equalsIgnoreCase(type)){
+ return new SummaryPageData();
+ }
+
+ if (CompileQData.class.getSimpleName().equalsIgnoreCase(type)){
+ return new CompileQData();
+ }
+
+ return null;
+ }
+}
Copied: WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/LectureData.java (from rev 178, WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureData.java)
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/LectureData.java (rev 0)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/LectureData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -0,0 +1,51 @@
+package edu.lnu.FireFly.WebEditor.itemConfiguration;
+
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+
+public class LectureData extends ItemData {
+ private String caption = "";
+ private String content = "";
+
+ public String getCaption() {
+ return caption;
+ }
+
+ public void setCaption(String caption) {
+ this.caption = caption;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ @Override
+ public boolean unmarshal(Element root) {
+ setCaption(root.elementTextTrim("caption"));
+ setContent(root.elementTextTrim("content"));
+
+ boolean showOnSP = Boolean.valueOf(root
+ .elementTextTrim("ShowOnSummaryPage"));
+
+ setShowOnSummaryPage(showOnSP);
+
+ return true;
+ }
+
+ @Override
+ public Element marshal() {
+ Element root = DocumentHelper.createElement("ItemData");
+ root.addElement("caption").setText(getCaption());
+ root.addElement("content").setText(getContent());
+
+ root.addElement("ShowOnSummaryPage").setText(
+ String.valueOf(getShowOnSummaryPage()));
+
+ return root;
+ }
+}
Copied: WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/SimpleQuestionData.java (from rev 178, WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionData.java)
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/SimpleQuestionData.java (rev 0)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/SimpleQuestionData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -0,0 +1,101 @@
+package edu.lnu.FireFly.WebEditor.itemConfiguration;
+
+import java.util.Iterator;
+
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+import edu.lnu.FireFly.WebEditor.ItemModels.SimpleQuestion.SimpleQuestionAnswer;
+import edu.lnu.FireFly.WebEditor.ItemModels.SimpleQuestion.SimpleQuestionAnswersDataModel;
+
+public class SimpleQuestionData extends ItemData {
+ @Override
+ public Element marshal() {
+ Element root = DocumentHelper.createElement("ItemData");
+ root.addElement("caption").setText(getCaption());
+ root.addElement("question").setText(getQuestion());
+
+ root.addElement("ShowOnSummaryPage").setText(
+ String.valueOf(getShowOnSummaryPage()));
+
+ Element ans = root.addElement("answers");
+
+ ans.addAttribute("answerType", String.valueOf(getAnswers().getAnswerType()));
+
+ Iterator<SimpleQuestionAnswer> iter = getAnswers().answers.iterator();
+
+ while (iter.hasNext()) {
+ SimpleQuestionAnswer answer = iter.next();
+
+ Element ansEl = ans.addElement("answer");
+ ansEl
+ .addAttribute("point", String.valueOf(answer
+ .getAnswerPoint()));
+ ansEl.setText(answer.getAnswerText());
+ }
+
+ return root;
+ }
+
+ private SimpleQuestionAnswersDataModel answers = new SimpleQuestionAnswersDataModel();
+ private String caption = "";
+ private String question = "";
+
+ public SimpleQuestionAnswersDataModel getAnswers() {
+ return answers;
+ }
+
+ public void setAnswers(SimpleQuestionAnswersDataModel answers) {
+ this.answers = answers;
+ }
+
+ public String getCaption() {
+ return caption;
+ }
+
+ public void setCaption(String caption) {
+ this.caption = caption;
+ }
+
+ public String getQuestion() {
+ return question;
+ }
+
+ public void setQuestion(String question) {
+ this.question = question;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public boolean unmarshal(Element root) {
+ try {
+ Element answers = root.element("answers");
+
+ setCaption(root.elementTextTrim("caption"));
+ setQuestion(root.elementTextTrim("question"));
+
+ boolean showOnSP = Boolean.valueOf(root
+ .elementTextTrim("ShowOnSummaryPage"));
+ setShowOnSummaryPage(showOnSP);
+
+ getAnswers().setAnswerType(Integer.valueOf(answers.attributeValue("answerType")));
+
+ getAnswers().answers.clear();
+
+ Iterator<Element> iter = answers.elementIterator("answer");
+ while (iter.hasNext()) {
+ Element answer = iter.next();
+ SimpleQuestionAnswer ans = new SimpleQuestionAnswer(answer
+ .getText());
+ ans.setAnswerPoint(Double.valueOf(answer
+ .attributeValue("point")));
+ getAnswers().answers.add(ans);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ return false;
+ }
+
+ return true;
+ }
+}
Copied: WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/SummaryPageData.java (from rev 178, WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageData.java)
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/SummaryPageData.java (rev 0)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/itemConfiguration/SummaryPageData.java 2008-05-31 09:03:39 UTC (rev 183)
@@ -0,0 +1,26 @@
+package edu.lnu.FireFly.WebEditor.itemConfiguration;
+
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+
+public class SummaryPageData extends ItemData {
+
+ @Override
+ public Element marshal() {
+ Element root = DocumentHelper.createElement("ItemData");
+
+ return root;
+ }
+
+ @Override
+ public boolean unmarshal(Element root) {
+ // TODO Auto-generated method stub
+ return true;
+ }
+
+ @Override
+ public Boolean getShowOnSummaryPage() {
+ return false;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
