Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [101] WebEditor
|
From: <se...@us...> - 2008-05-07 19:24:20
|
Revision: 101
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=101&view=rev
Author: sem62
Date: 2008-05-07 12:24:22 -0700 (Wed, 07 May 2008)
Log Message:
-----------
Fixed bugs with updating course tree
Modified Paths:
--------------
WebEditor/resources/index.html
WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java
WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/TreeDataModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java
WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java
Modified: WebEditor/resources/index.html
===================================================================
--- WebEditor/resources/index.html 2008-05-07 17:51:30 UTC (rev 100)
+++ WebEditor/resources/index.html 2008-05-07 19:24:22 UTC (rev 101)
@@ -88,7 +88,8 @@
<applet mayscript="" name="player" archive="webeditor.jar,RTEValidators.jar,FFManifest.jar, dom4j.jar" code=edu.lnu.FireFly.WebEditor.WebEditor.class width="100%" height="100%">
<PARAM NAME="courseLocation" VALUE="http://127.0.0.1/sem/course/">
<PARAM NAME="serviceLocation" VALUE="http://127.0.0.1/sem/WebEditor/service/">
- <PARAM NAME="templateLocation" VALUE="http://127.0.0.1/sem/WebEditor/template">
+ <PARAM NAME="templateLocation" VALUE="http://127.0.0.1/sem/WebEditor/template/">
+ <PARAM NAME="resourceLocation" VALUE="http://127.0.0.1/sem/WebEditor/">
</applet>
</td>
</tr>
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java 2008-05-07 17:51:30 UTC (rev 100)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java 2008-05-07 19:24:22 UTC (rev 101)
@@ -27,6 +27,11 @@
static public String GetValue(String parameter){
System.out.print("GetValue(" + parameter + ");\n");
+
+ if (parameter.endsWith("completionStatus")){
+ return "incomplete";
+ }
+
return "";
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java 2008-05-07 17:51:30 UTC (rev 100)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java 2008-05-07 19:24:22 UTC (rev 101)
@@ -11,7 +11,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.WebEditor.GUI.TreeDataModel;
+import edu.lnu.FireFly.WebEditor.GUI.Reorganizer;
import edu.lnu.FireFly.WebEditor.ItemModels.ChapterModel;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModel;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModels;
@@ -209,12 +209,12 @@
"Count of summary pages is graiter than one!!!");
}
- ((Item) item).moveDown();
+ Reorganizer.getInstance().moveDown(item);
}
}
}
- TreeDataModel.getInstance().updateAllTree();
+ //TreeDataModel.getInstance().updateAllTree();
}
public void updateSummaryPages() {
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/TreeDataModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/TreeDataModel.java 2008-05-07 17:51:30 UTC (rev 100)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/TreeDataModel.java 2008-05-07 19:24:22 UTC (rev 101)
@@ -96,7 +96,7 @@
return getItemPath(item.getParent()).pathByAddingChild(item);
}
- public void updateAllTree(){
+ private void updateAllTree(){
for (int i=0; i < listeners.size(); i++){
TreeModelListener listener = listeners.get(i);
TreeModelEvent event = new TreeModelEvent(this, new TreePath(TreeDataModel.getInstance().getRoot()));
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-07 17:51:30 UTC (rev 100)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-07 19:24:22 UTC (rev 101)
@@ -38,7 +38,7 @@
return;
}
- ConfigureItem(item);
+ ConfigureItem(item);
}
protected final String loadResource(String location, String identifier) {
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java 2008-05-07 17:51:30 UTC (rev 100)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java 2008-05-07 19:24:22 UTC (rev 101)
@@ -4,6 +4,7 @@
private String courseLocation = "";
private String templateLocation = "";
private String serviceLocation = "";
+ private String resourceLocation = "";
public static Settings obj = null;
@@ -39,4 +40,12 @@
public void setServiceLocation(String serviceLocation) {
this.serviceLocation = serviceLocation;
}
+
+ public String getResourceLocation() {
+ return resourceLocation;
+ }
+
+ public void setResourceLocation(String resourceLocation) {
+ this.resourceLocation = resourceLocation;
+ }
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java 2008-05-07 17:51:30 UTC (rev 100)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java 2008-05-07 19:24:22 UTC (rev 101)
@@ -157,8 +157,8 @@
if (e.getNewLeadSelectionPath() == null) {
try {
getAppletContext().showDocument(
- new URL("http://localhost:8080/WebEditor/empty.htm"),
- "ContentFrame");
+ new URL(Settings.getInstance().getResourceLocation()
+ + "/empty.htm"), "ContentFrame");
System.out.print("browse to empty document.\n");
Thread.sleep(300);
} catch (Exception e1) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
