Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [98] WebEditor/src/edu/lnu/FireFly/WebEditor
|
From: <se...@us...> - 2008-05-07 17:08:06
|
Revision: 98
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=98&view=rev
Author: sem62
Date: 2008-05-07 10:08:06 -0700 (Wed, 07 May 2008)
Log Message:
-----------
Optimization trasferring.
Template loading only once.
Modified Paths:
--------------
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ChapterModel.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/Template.java
WebEditor/src/edu/lnu/FireFly/WebEditor/WSClients/WebEditorServiceClient.java
WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ChapterModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ChapterModel.java 2008-05-07 08:48:34 UTC (rev 97)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ChapterModel.java 2008-05-07 17:08:06 UTC (rev 98)
@@ -147,8 +147,8 @@
identifier = ((Item) anItem).identifier;
}
- WebEditorServiceClient
- .setFileContent(identifier + ".conf", doc.asXML());
+ WebEditorServiceClient.getInstance().setFileContent(
+ identifier + ".conf", doc.asXML());
if (updateSummaryPages) {
SummaryPageManager.getInstance().updateSummaryPages();
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-07 08:48:34 UTC (rev 97)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-07 17:08:06 UTC (rev 98)
@@ -64,14 +64,15 @@
}
@Override
- public boolean updateItemResource(TreeItem anItem, boolean updateSummaryPages) {
+ public boolean updateItemResource(TreeItem anItem,
+ boolean updateSummaryPages) {
Resource resource = WebEditor.instance.getManifest().resources
.findResourceByIdentifier(((Item) anItem).identifierref);
Template template = new Template(resource.getFullHref(), this);
LectureData itemData = getData(anItem);
-
+
template.setProperty("caption", itemData.getCaption());
template.setProperty("content", itemData.getContent());
@@ -85,11 +86,11 @@
root.addElement("ShowOnSummaryPage").setText(
String.valueOf(itemData.getShowOnSummaryPage()));
- WebEditorServiceClient.setFileContent(resource.identifier + ".conf",
- doc.asXML());
+ WebEditorServiceClient.getInstance().setFileContent(
+ resource.identifier + ".conf", doc.asXML());
SummaryPageManager.getInstance().updateSummaryPages();
-
+
return true;
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-07 08:48:34 UTC (rev 97)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-07 17:08:06 UTC (rev 98)
@@ -45,10 +45,10 @@
String res = "";
if (location.equalsIgnoreCase("course")) {
- res = WebEditorServiceClient.getFileContent(identifier + ".conf",
+ res = WebEditorServiceClient.getInstance().getFileContent(identifier + ".conf",
location);
} else {
- res = WebEditorServiceClient.getFileContent(modelName + ".conf",
+ res = WebEditorServiceClient.getInstance().getFileContent(modelName + ".conf",
location);
}
return res;
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-07 08:48:34 UTC (rev 97)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-07 17:08:06 UTC (rev 98)
@@ -146,7 +146,7 @@
ansEl.setText(answer.getAnswerText());
}
- WebEditorServiceClient.setFileContent(resource.identifier + ".conf",
+ WebEditorServiceClient.getInstance().setFileContent(resource.identifier + ".conf",
doc.asXML());
SummaryPageManager.getInstance().updateSummaryPages();
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-07 08:48:34 UTC (rev 97)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-07 17:08:06 UTC (rev 98)
@@ -54,7 +54,7 @@
/* Element root = */doc.addElement(this.getClass().getSimpleName());
// root.addElement("content").setText(getData(item).getContent());
- WebEditorServiceClient.setFileContent(resource.identifier + ".conf",
+ WebEditorServiceClient.getInstance().setFileContent(resource.identifier + ".conf",
doc.asXML());
return true;
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Template.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Template.java 2008-05-07 08:48:34 UTC (rev 97)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Template.java 2008-05-07 17:08:06 UTC (rev 98)
@@ -53,7 +53,7 @@
public boolean updateResource() {
String templateFileName = model.getClass().getSimpleName() + ".html";
- String res = WebEditorServiceClient.getFileContent(templateFileName,
+ String res = WebEditorServiceClient.getInstance().getFileContent(templateFileName,
"template");
Iterator<String> iter = propertiests.keySet().iterator();
@@ -67,7 +67,7 @@
}
}
- WebEditorServiceClient.setFileContent(fileName, res);
+ WebEditorServiceClient.getInstance().setFileContent(fileName, res);
return true;
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/WSClients/WebEditorServiceClient.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/WSClients/WebEditorServiceClient.java 2008-05-07 08:48:34 UTC (rev 97)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/WSClients/WebEditorServiceClient.java 2008-05-07 17:08:06 UTC (rev 98)
@@ -6,18 +6,45 @@
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
+import java.util.HashMap;
import edu.lnu.FireFly.WebEditor.Settings;
public class WebEditorServiceClient {
+
+ private HashMap<String, String> templates;
+
+ private static WebEditorServiceClient obj = null;
+
+ private WebEditorServiceClient(){
+ templates = new HashMap<String, String>();
+ }
+
+ public static WebEditorServiceClient getInstance(){
+ if (obj == null){
+ obj = new WebEditorServiceClient();
+ }
+
+ return obj;
+ }
/**
* @param fName File name
* @param location Location name = template | course
* @return
*/
- public static String getFileContent(String fName, String location) {
+ public String getFileContent(String fName, String location) {
System.out.println("Getting file's content (fName=" + fName + "; location=" + location + ")...");
+ if (location.equalsIgnoreCase("template")){
+ String template = templates.get(fName);
+ if (template != null){
+
+ System.out.println("Founded in hash.");
+
+ return template;
+ }
+ }
+
String result = "";
try {
// Construct data
@@ -53,11 +80,15 @@
e.printStackTrace();
}
+ if (location.equalsIgnoreCase("template")){
+ templates.put(fName, result);
+ }
+
System.out.print("result: " + result);
return result;
}
- public static void setFileContent(String fName, String content) {
+ public void setFileContent(String fName, String content) {
System.out.println("Setting file's content (fName=" + fName + ")...");
String result = "";
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java 2008-05-07 08:48:34 UTC (rev 97)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java 2008-05-07 17:08:06 UTC (rev 98)
@@ -64,13 +64,13 @@
private void saveManifest() throws TestDocException {
Parser parser = new Parser();
- WebEditorServiceClient.setFileContent("imsmanifest.xml", parser
- .toXML(manifest));
+ WebEditorServiceClient.getInstance().setFileContent("imsmanifest.xml",
+ parser.toXML(manifest));
}
private void openManifest() throws TestDocException {
Parser parser = new Parser();
- manifest = parser.fromXML(WebEditorServiceClient
+ manifest = parser.fromXML(WebEditorServiceClient.getInstance()
.getFileContent("imsmanifest.xml", "course"));
TreeDataModel.initInstance(manifest);
@@ -84,10 +84,13 @@
@Override
public void init() {
- Settings.getInstance().setCourseLocation(getParameter("courseLocation"));
- Settings.getInstance().setServiceLocation(getParameter("serviceLocation"));
- Settings.getInstance().setTemplateLocation(getParameter("templateLocation"));
-
+ Settings.getInstance()
+ .setCourseLocation(getParameter("courseLocation"));
+ Settings.getInstance().setServiceLocation(
+ getParameter("serviceLocation"));
+ Settings.getInstance().setTemplateLocation(
+ getParameter("templateLocation"));
+
instance = this;
initMenu();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
