Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [181] WebEditor/src/edu/lnu/FireFly/WebEditor
|
From: <se...@us...> - 2008-05-29 11:41:42
|
Revision: 181
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=181&view=rev
Author: sem62
Date: 2008-05-29 04:41:50 -0700 (Thu, 29 May 2008)
Log Message:
-----------
Fixed bug with summary page: after adding new item in course, it don't show properly in summary page.
Now calling method resetModelForActivity for updating objectives list.
Modified Paths:
--------------
WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java 2008-05-29 11:39:23 UTC (rev 180)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java 2008-05-29 11:41:50 UTC (rev 181)
@@ -8,6 +8,7 @@
import edu.lnu.FireFly.FFManifest.item.sequencing.objectives.Objective;
import edu.lnu.FireFly.FFManifest.item.sequencing.objectives.Objectives;
import edu.lnu.FireFly.FFManifest.parser.TestDocException;
+import edu.lnu.FireFly.Rte.CmiManager;
import edu.lnu.FireFly.WebEditor.GUI.Reorganizer;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModel;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModels;
@@ -85,6 +86,8 @@
summaryPage.sequencing.objectives.objective.add(objective);
}
+
+ CmiManager.getInstance().resetModelForActivity(summaryPage);
}
private ArrayList<String> getShowingItemsIds(TreeItem root) {
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java 2008-05-29 11:39:23 UTC (rev 180)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java 2008-05-29 11:41:50 UTC (rev 181)
@@ -10,7 +10,6 @@
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.WSClients.WebEditorServiceClient;
public class ChapterModel extends ResourcedItemModel {
@@ -86,11 +85,6 @@
return 0;
}
- @Override
- protected String getConfFileName(TreeItem anItem) {
- return getIdentifier(anItem);
- }
-
private ChapterItemData getData(TreeItem anItem) {
return (ChapterItemData) getItemData(anItem);
}
@@ -156,8 +150,6 @@
TreeDataModel.getInstance().treeNodesDeleted(aChapter);
aChapter.getParent().removeChild(aChapter);
- WebEditorServiceClient.getInstance().deleteFile(
- getConfFileName(aChapter));
SummaryPageManager.getInstance().updateSummaryPages();
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-29 11:39:23 UTC (rev 180)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-29 11:41:50 UTC (rev 181)
@@ -216,8 +216,7 @@
sequencing.objectives = ManifestFactory.createObjectives();
}
- sequencing.objectives.primaryObjective = ManifestFactory
- .createObjective();
+ sequencing.objectives.primaryObjective = ManifestFactory.createObjective();
sequencing.objectives.primaryObjective.objectiveID = getIdentifier(anItem);
sequencing.objectives.primaryObjective.satisfiedByMeasure = true;
@@ -226,8 +225,7 @@
mapInfo.writeSatisfiedStatus = true;
mapInfo.targetObjectiveID = sequencing.objectives.primaryObjective.objectiveID;
- sequencing.objectives.primaryObjective.mapInfo = ManifestFactory
- .createMapInfos();
+ sequencing.objectives.primaryObjective.mapInfo = ManifestFactory.createMapInfos();
sequencing.objectives.primaryObjective.mapInfo.add(mapInfo);
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-29 11:39:23 UTC (rev 180)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-29 11:41:50 UTC (rev 181)
@@ -7,7 +7,6 @@
import edu.lnu.FireFly.FFManifest.item.Item;
import edu.lnu.FireFly.FFManifest.parser.TestDocException;
import edu.lnu.FireFly.FFManifest.resource.Resource;
-import edu.lnu.FireFly.WebEditor.WebEditor;
import edu.lnu.FireFly.WebEditor.Data.SummaryPageManager;
import edu.lnu.FireFly.WebEditor.GUI.TreeDataModel;
import edu.lnu.FireFly.WebEditor.WSClients.WebEditorServiceClient;
@@ -46,19 +45,6 @@
ConfigureItem(item);
}
- protected final String getConfFileContent(String location, TreeItem anItem) {
- String res = "";
-
- if (location.equalsIgnoreCase("course")) {
- res = WebEditorServiceClient.getInstance().getFileContent(
- getConfFileName(anItem), location);
- } else {
- res = WebEditorServiceClient.getInstance().getFileContent(
- modelName + ".conf", location);
- }
- return res;
- }
-
@Override
public boolean isRemovable() {
return true;
@@ -82,8 +68,6 @@
WebEditorServiceClient.getInstance().deleteFile(
resource.getFullHref());
- WebEditorServiceClient.getInstance().deleteFile(
- getConfFileName(anItem));
manifest.resources.deleteResource(identifier);
@@ -125,18 +109,13 @@
return !isSubTreeUsingResource(root, getIdentifier(anItem), anItem);
}
- protected String getConfFileName(TreeItem anItem) {
- Resource resource = WebEditor.instance.getManifest().resources
- .findResourceByIdentifier(getIdentifierRef(anItem));
-
- return resource.identifier + ".conf";
- }
-
@Override
protected final void initializeDataForItem(Item anItem) {
ItemData itemData = createItemDataInstance();
//String res = getConfFileContent("template", anItem);
+// res = WebEditorServiceClient.getInstance().getFileContent(
+// modelName + ".conf", location);
//itemData.unmarshal(new StringReader(res), anItem);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
