[Acmcontester-developers] SF.net SVN: acmcontester: [77] WebEditor/src/edu/lnu/FireFly/WebEditor

[<se...@us...>]

Revision: 77
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=77&view=rev
Author:   sem62
Date:     2008-05-02 15:35:58 -0700 (Fri, 02 May 2008)

Log Message:
-----------
Fixed bugs:
* Objectives list mapped in SummaryPage's manifest item;
* return false at getShowOnSummaryPage into SummaryPageModel (It's can't be shown into Summary page).

Modified Paths:
--------------
    WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java
    WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java

Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java	2008-05-02 19:12:29 UTC (rev 76)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java	2008-05-02 22:35:58 UTC (rev 77)
@@ -109,15 +109,12 @@
 				result.add(getItemId(item));
 			}
 
-			for (int j = 0; i < item.getChildCount(); i++) {
+			for (int j = 0; j < item.getChildCount(); j++) {
 				TreeItem child = item.getChild(j);
-				ItemModel chapterModel = ItemModels.getModelFromItem(child);
+				ItemModel childModel = ItemModels.getModelFromItem(child);
 
-				if (chapterModel.getClass() == ChapterModel.class) {
-					if (((ChapterModel) chapterModel)
-							.getShowOnSummaryPage(child)) {
-						result.addAll(getShowingItemsIds(child));
-					}
+				if (childModel.getShowOnSummaryPage(child)) {
+					result.addAll(getShowingItemsIds(child));
 				}
 			}
 		}

Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java	2008-05-02 19:12:29 UTC (rev 76)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java	2008-05-02 22:35:58 UTC (rev 77)
@@ -11,6 +11,7 @@
 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.SummaryPageModel.SummaryPageModel;
 import edu.lnu.FireFly.WebEditor.WSClients.WebEditorServiceClient;
 
 public abstract class ItemModel {
@@ -25,6 +26,10 @@
 	protected boolean isContainerItem = false;
 
 	public final boolean getShowOnSummaryPage(TreeItem anItem) {
+		if (this.getClass() == SummaryPageModel.class){
+			return false;
+		}
+		
 		ItemData itemData = getItemData(anItem);
 
 		if (itemData == null) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.