Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [167] WebEditor/src/edu/lnu/FireFly/WebEditor
|
From: <se...@us...> - 2008-05-24 19:20:03
|
Revision: 167
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=167&view=rev
Author: sem62
Date: 2008-05-24 12:20:07 -0700 (Sat, 24 May 2008)
Log Message:
-----------
* Moved frame redirection code to one method.
* Called redirect browser after configure item's property.
Modified Paths:
--------------
WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java
WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java 2008-05-24 18:52:29 UTC (rev 166)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java 2008-05-24 19:20:07 UTC (rev 167)
@@ -1,13 +1,10 @@
package edu.lnu.FireFly.WebEditor;
-import java.net.URL;
-
import javax.swing.JApplet;
import edu.lnu.FireFly.FFManifest.Manifest;
import edu.lnu.FireFly.FFManifest.TreeItem;
import edu.lnu.FireFly.FFManifest.item.Item;
-import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.Rte.Cmi;
import edu.lnu.FireFly.Rte.CmiManager;
import edu.lnu.FireFly.Rte.ElementName;
@@ -43,11 +40,12 @@
Manifest manifest = SummaryPageManager.getInstance().getManifest();
TreeItem item = manifest.findItemByIdentifier(nextItemIdentifier);
-
+
GlobalStateInformation.setCurrentActivity(item);
-
- UserAnswerStatus answer = AnswersStatusManager.getInstance().getAnswerStatus(item);
-
+
+ UserAnswerStatus answer = AnswersStatusManager.getInstance()
+ .getAnswerStatus(item);
+
answer.setRawAnswer(null);
} catch (Exception e) {
e.printStackTrace();
@@ -61,7 +59,8 @@
try {
System.out.print("Terminate(" + parameter + ");\n");
- if (nextItemIdentifier.equals(GlobalStateInformation.getCurrentActivity().getIdentifier())){
+ if (nextItemIdentifier.equals(GlobalStateInformation
+ .getCurrentActivity().getIdentifier())) {
showAnswerResult();
}
GlobalStateInformation.setCurrentActivity(null);
@@ -78,12 +77,13 @@
String identifier = "";
if (currentActivity != null) {
identifier = currentActivity.getIdentifier();
- TreeItem item = SummaryPageManager.getInstance().getManifest().findItemByIdentifier(identifier);
+ Manifest manifest = SummaryPageManager.getInstance().getManifest();
+ TreeItem item = manifest.findItemByIdentifier(identifier);
ItemModel model = ItemModels.getModelFromItem(item);
UserAnswerStatus answerStatus = AnswersStatusManager.getInstance().getAnswerStatus(item);
-
- if (answerStatus.getRawAnswer() != null && answerStatus.getRawAnswer().length > 0){
+
+ if (answerStatus.getRawAnswer() != null && answerStatus.getRawAnswer().length > 0) {
model.showAnswerStatus(answerStatus);
}
}
@@ -92,25 +92,14 @@
}
private void redirectTo(String identifier) {
- try {
- TreeItem item = SummaryPageManager.getInstance().getManifest()
- .findItemByIdentifier(identifier);
+ Manifest manifest = SummaryPageManager.getInstance().getManifest();
+ TreeItem item = manifest.findItemByIdentifier(identifier);
- if (item.getClass() != Item.class) {
- return;
- }
-
- Resource resource = WebEditor.instance.getManifest().resources
- .findResourceByIdentifier(((Item) item).identifierref);
- if (resource != null) {
- getAppletContext().showDocument(
- new URL(Settings.getInstance().getCourseLocation()
- + resource.getFullHref()), "ContentFrame");
- System.out.print("redirected\n");
- }
- } catch (Exception exc) {
- exc.printStackTrace();
+ if (item.getClass() != Item.class) {
+ return;
}
+
+ WebEditor.instance.showItemResource(item);
}
public synchronized String GetValue(String parameter) {
@@ -150,11 +139,10 @@
cmi.setValue(new ElementName(parameter.substring(4)), value);
if (parameter.startsWith("cmi.answers.")) {
- String itemIdentifier = GlobalStateInformation
- .getCurrentActivity().getIdentifier();
+ String itemIdentifier = GlobalStateInformation.getCurrentActivity().getIdentifier();
- TreeItem item = SummaryPageManager.getInstance()
- .getManifest().findItemByIdentifier(itemIdentifier);
+ Manifest manifest = SummaryPageManager.getInstance().getManifest();
+ TreeItem item = manifest.findItemByIdentifier(itemIdentifier);
AnswersStatusManager.getInstance().cmiAnswersChanged(item);
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.java 2008-05-24 18:52:29 UTC (rev 166)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.java 2008-05-24 19:20:07 UTC (rev 167)
@@ -1,14 +1,12 @@
package edu.lnu.FireFly.WebEditor;
import java.applet.AppletContext;
-import java.net.URL;
import javax.swing.JTree;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import edu.lnu.FireFly.FFManifest.item.Item;
-import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.WebEditor.GUI.TreeDataModel;
public class CourseTree extends JTree implements TreeSelectionListener {
@@ -35,41 +33,30 @@
}
@Override
- public void valueChanged(TreeSelectionEvent e) {
- if (e.getNewLeadSelectionPath() == null) {
+ public void valueChanged(TreeSelectionEvent event) {
+ if (event.getNewLeadSelectionPath() == null) {
try {
AppletWithApiHandle.setNextItemIdentifier("");
- getAppletContext().showDocument(
- new URL(Settings.getInstance().getResourceLocation()
- + "/empty.htm"), "ContentFrame");
+ WebEditor.instance.showItemResource(null);
+
System.out.print("browse to empty document.\n");
Thread.sleep(300);
+ } catch (InterruptedException e1) {
+ // do nothing
} catch (Exception e1) {
- // TODO Auto-generated catch block
e1.printStackTrace();
}
return;
}
- if (e.getNewLeadSelectionPath().getLastPathComponent().getClass() == Item.class) {
- Item item = (Item) e.getNewLeadSelectionPath()
+ if (event.getNewLeadSelectionPath().getLastPathComponent().getClass() == Item.class) {
+ Item item = (Item) event.getNewLeadSelectionPath()
.getLastPathComponent();
AppletWithApiHandle.setNextItemIdentifier(item.identifier);
- try {
- Resource resource = WebEditor.instance.getManifest().resources
- .findResourceByIdentifier(item.identifierref);
- if (resource != null) {
- getAppletContext().showDocument(
- new URL(Settings.getInstance().getCourseLocation()
- + resource.getFullHref()), "ContentFrame");
- System.out.print("redirected\n");
- }
- } catch (Exception exc) {
- exc.printStackTrace();
- }
+ WebEditor.instance.showItemResource(item);
}
}
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-24 18:52:29 UTC (rev 166)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-24 19:20:07 UTC (rev 167)
@@ -87,6 +87,7 @@
}
TreeDataModel.getInstance().treeNodesChanged(item);
+ WebEditor.instance.showItemResource(item);
}
public final void registerConfigDlg(PropertyDlg dlg) {
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java 2008-05-24 18:52:29 UTC (rev 166)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java 2008-05-24 19:20:07 UTC (rev 167)
@@ -1,11 +1,16 @@
package edu.lnu.FireFly.WebEditor;
+import java.net.MalformedURLException;
+import java.net.URL;
+
import javax.swing.JScrollPane;
import edu.lnu.FireFly.FFManifest.Manifest;
import edu.lnu.FireFly.FFManifest.TreeItem;
+import edu.lnu.FireFly.FFManifest.item.Item;
import edu.lnu.FireFly.FFManifest.parser.Parser;
import edu.lnu.FireFly.FFManifest.parser.TestDocException;
+import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.WebEditor.Data.AnswersStatusManager;
import edu.lnu.FireFly.WebEditor.Data.AutoSaveThread;
import edu.lnu.FireFly.WebEditor.Data.ManifestFactory;
@@ -16,7 +21,8 @@
import edu.lnu.FireFly.WebEditor.ItemModels.OrganizationModel;
import edu.lnu.FireFly.WebEditor.WSClients.WebEditorServiceClient;
-public class WebEditor extends AppletWithWYSIWYGEditor implements MainMenuListenet{
+public class WebEditor extends AppletWithWYSIWYGEditor implements
+ MainMenuListenet {
/**
*
@@ -63,10 +69,32 @@
return manifest;
}
+ public void showItemResource(TreeItem anItem) {
+ try {
+
+ if (anItem.getClass() != Item.class){
+ return;
+ }
+
+ Manifest manifest = WebEditor.instance.getManifest();
+ Resource resource = manifest.resources
+ .findResourceByIdentifier(((Item)anItem).identifierref);
+
+ if (resource != null) {
+ String href = Settings.getInstance().getCourseLocation() + resource.getFullHref();
+ getAppletContext().showDocument(new URL(href), "ContentFrame");
+
+ System.out.print("redirected\n");
+ }
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+
@Override
public void init() {
Settings.getInstance().parseAppletParameters(this);
-
+
instance = this;
autoSaveThread = new AutoSaveThread();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
