Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [162] WebEditor
|
From: <se...@us...> - 2008-05-23 17:44:46
|
Revision: 162
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=162&view=rev
Author: sem62
Date: 2008-05-23 10:44:49 -0700 (Fri, 23 May 2008)
Log Message:
-----------
* Using new RTE library.
* Realizing mechanism for checking user answer.
* CleenUp code.
Modified Paths:
--------------
WebEditor/resources/index.html
WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java
WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithWYSIWYGEditor.java
WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.java
WebEditor/src/edu/lnu/FireFly/WebEditor/Data/AnswersStatusManager.java
WebEditor/src/edu/lnu/FireFly/WebEditor/Data/AutoSaveThread.java
WebEditor/src/edu/lnu/FireFly/WebEditor/Data/ManifestFactory.java
WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/CourseTreePopupMenu.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/ChapterPropertiestsDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/MultiLineCellRenderer.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/MultiLineTableCellEditor.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/PartAttributesCellEditor.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/PartNumber.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/PartNumberCellRenderer.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/PartOptionsPanel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LectureException.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/RenameDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/JMenuItemContainedModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Reorganizer.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/TreeDataModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterItemData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQPart.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/PartAttributes.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModels.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/OrganizationModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionAnswer.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionAnswersDataModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionData.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionException.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageData.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/ItemModels/UnknownItemModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownModelAnswerStatus.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Utils.java
WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java
WebEditor/src/edu/lnu/FireFly/WebEditor/WSClients/WebEditorServiceClient.java
WebEditor/src/edu/lnu/FireFly/WebEditor/WebEditor.java
WebEditor/template/global/SummaryPage.js
WebEditor/template/global/simpleQ.js
Added Paths:
-----------
WebEditor/src/edu/lnu/FireFly/WebEditor/UserAnswerStatus/
WebEditor/src/edu/lnu/FireFly/WebEditor/UserAnswerStatus/LectureUserAnswerStatus.java
WebEditor/src/edu/lnu/FireFly/WebEditor/UserAnswerStatus/ScoredUserAnswerStatus.java
WebEditor/src/edu/lnu/FireFly/WebEditor/UserAnswerStatus/UserAnswerStatus.java
WebEditor/template/global/images/failed.gif
WebEditor/template/global/images/passed.gif
Removed Paths:
-------------
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/LectureUserAnswerStatus.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ScoredUserAnswerStatus.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UserAnswerStatus.java
Modified: WebEditor/resources/index.html
===================================================================
--- WebEditor/resources/index.html 2008-05-23 14:27:49 UTC (rev 161)
+++ WebEditor/resources/index.html 2008-05-23 17:44:49 UTC (rev 162)
@@ -128,7 +128,7 @@
</tr>
</tbody>
</table>
- <tr><td><input type=text id='getval'><input type='button' onclick="getVal();"><td><input id='getvalres'></td></tr>
+ <!--tr><td><input type=text id='getval'><input type='button' value='SetValue' onclick="getVal();"><input id='getvalres'></td></tr-->
</table>
</body>
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java 2008-05-23 14:27:49 UTC (rev 161)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java 2008-05-23 17:44:49 UTC (rev 162)
@@ -32,7 +32,9 @@
public String Initialize(String parameter) {
System.out.print("Initialize(" + parameter + ");\n");
- GlobalStateInformation.setCurrentActivity(SummaryPageManager.getInstance().getManifest().findItemByIdentifier(nextItemIdentifier));
+ GlobalStateInformation.setCurrentActivity(SummaryPageManager
+ .getInstance().getManifest().findItemByIdentifier(
+ nextItemIdentifier));
return "true";
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithWYSIWYGEditor.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithWYSIWYGEditor.java 2008-05-23 14:27:49 UTC (rev 161)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithWYSIWYGEditor.java 2008-05-23 17:44:49 UTC (rev 162)
@@ -5,63 +5,63 @@
import netscape.javascript.JSObject;
import edu.lnu.FireFly.WebEditor.GUI.Dialogs.PropertyDlg;
-public class AppletWithWYSIWYGEditor extends AppletWithApiHandle{
- private boolean htmlEditing = false;
- private JTextComponent textField = null;
- private PropertyDlg editingDlg = null;
+public class AppletWithWYSIWYGEditor extends AppletWithApiHandle {
+ private boolean htmlEditing = false;
+ private JTextComponent textField = null;
+ private PropertyDlg editingDlg = null;
- public void htmlEdit(JTextComponent captionTextField2, PropertyDlg dlg) {
- JSObject win = JSObject.getWindow(this);
- Object[] params = new String[1];
- params[0] = captionTextField2.getText();
-
- htmlEditing = true;
- textField = captionTextField2;
- editingDlg = dlg;
-
- lockPropertyDlg();
- win.call("showEditor", params);
- }
-
- public String getEditedHTML(){
- return textField.getText();
- }
+ public void htmlEdit(JTextComponent captionTextField2, PropertyDlg dlg) {
+ JSObject win = JSObject.getWindow(this);
+ Object[] params = new String[1];
+ params[0] = captionTextField2.getText();
- public void cancelHtmlEditing(){
- unlockPropertyDlg();
+ htmlEditing = true;
+ textField = captionTextField2;
+ editingDlg = dlg;
- textField = null;
- editingDlg = null;
- htmlEditing = false;
-
- System.out.println("Canceled html editing");
- }
+ lockPropertyDlg();
+ win.call("showEditor", params);
+ }
- private void unlockPropertyDlg() {
- editingDlg.setEnabled(true);
- }
-
- public void setEditedHTML(String newHTML){
- if (!htmlEditing){
- return;
- }
- textField.setText(newHTML);
- editingDlg.editedHtmlTextWasSet();
-
- htmlEditing = false;
- unlockPropertyDlg();
- }
+ public String getEditedHTML() {
+ return textField.getText();
+ }
- private void lockPropertyDlg() {
- editingDlg.setEnabled(false);
+ public void cancelHtmlEditing() {
+ unlockPropertyDlg();
+
+ textField = null;
+ editingDlg = null;
+ htmlEditing = false;
+
+ System.out.println("Canceled html editing");
+ }
+
+ private void unlockPropertyDlg() {
+ editingDlg.setEnabled(true);
+ }
+
+ public void setEditedHTML(String newHTML) {
+ if (!htmlEditing) {
+ return;
}
+ textField.setText(newHTML);
+ editingDlg.editedHtmlTextWasSet();
- /**
- *
- */
- private static final long serialVersionUID = 1L;
+ htmlEditing = false;
+ unlockPropertyDlg();
+ }
- public boolean isHtmlEditing() {
- return htmlEditing;
- }
+ private void lockPropertyDlg() {
+ editingDlg.setEnabled(false);
+ }
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ public boolean isHtmlEditing() {
+ return htmlEditing;
+ }
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.java 2008-05-23 14:27:49 UTC (rev 161)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.java 2008-05-23 17:44:49 UTC (rev 162)
@@ -39,7 +39,7 @@
if (e.getNewLeadSelectionPath() == null) {
try {
AppletWithApiHandle.setNextItemIdentifier("");
-
+
getAppletContext().showDocument(
new URL(Settings.getInstance().getResourceLocation()
+ "/empty.htm"), "ContentFrame");
@@ -55,7 +55,7 @@
if (e.getNewLeadSelectionPath().getLastPathComponent().getClass() == Item.class) {
Item item = (Item) e.getNewLeadSelectionPath()
.getLastPathComponent();
-
+
AppletWithApiHandle.setNextItemIdentifier(item.identifier);
try {
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/Data/AnswersStatusManager.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/Data/AnswersStatusManager.java 2008-05-23 14:27:49 UTC (rev 161)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/Data/AnswersStatusManager.java 2008-05-23 17:44:49 UTC (rev 162)
@@ -9,7 +9,7 @@
import edu.lnu.FireFly.Rte.CmiManager;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModel;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemModels;
-import edu.lnu.FireFly.WebEditor.ItemModels.UserAnswerStatus;
+import edu.lnu.FireFly.WebEditor.UserAnswerStatus.UserAnswerStatus;
public class AnswersStatusManager {
private HashMap<TreeItem, UserAnswerStatus> answerStatus = new HashMap<TreeItem, UserAnswerStatus>();
@@ -18,34 +18,34 @@
private AnswersStatusManager() {
}
-
- public void resetAllAnswers(){
+
+ public void resetAllAnswers() {
answerStatus.clear();
-
+
Manifest manifest = SummaryPageManager.getInstance().getManifest();
-
+
TreeItem root = null;
try {
root = manifest.getRoot();
} catch (TestDocException e) {
e.printStackTrace();
-
- return ;
+
+ return;
}
-
+
updateAllCmiModels(root);
}
public void updateAllCmiModels(TreeItem root) {
ItemModel itemModel = ItemModels.getModelFromItem(root);
-
+
Cmi cmi = CmiManager.getInstance().getModelForActivity(root);
cmi.clearAnswers();
-
+
itemModel.handleUserAnswer(root);
-
- for (int i=0; i < root.getChildCount(); i++){
+
+ for (int i = 0; i < root.getChildCount(); i++) {
updateAllCmiModels(root.getChild(i));
}
}
@@ -56,7 +56,8 @@
if (userAnswerStatus == null) {
ItemModel itemModel = ItemModels.getModelFromItem(anItem);
- answerStatus.put(anItem, itemModel.createUserAnswerInstance(anItem));
+ answerStatus
+ .put(anItem, itemModel.createUserAnswerInstance(anItem));
userAnswerStatus = answerStatus.get(anItem);
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/Data/AutoSaveThread.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/Data/AutoSaveThread.java 2008-05-23 14:27:49 UTC (rev 161)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/Data/AutoSaveThread.java 2008-05-23 17:44:49 UTC (rev 162)
@@ -6,36 +6,37 @@
public class AutoSaveThread implements Runnable {
- private long nextSaveAt = 0;
-
- @Override
- public void run() {
- reset();
+ private long nextSaveAt = 0;
- try {
- while (true) {
- Thread.sleep(5000);
- if (System.currentTimeMillis() > nextSaveAt){
- processSave();
- reset();
- }
- }
- } catch (InterruptedException e) {
- // If interrupt sleepping.
- // Do nothing
+ @Override
+ public void run() {
+ reset();
+
+ try {
+ while (true) {
+ Thread.sleep(5000);
+ if (System.currentTimeMillis() > nextSaveAt) {
+ processSave();
+ reset();
}
+ }
+ } catch (InterruptedException e) {
+ // If interrupt sleepping.
+ // Do nothing
}
+ }
- public void reset() {
- nextSaveAt = System.currentTimeMillis() + Settings.getInstance().getAutoSaveInterval();
- }
+ public void reset() {
+ nextSaveAt = System.currentTimeMillis()
+ + Settings.getInstance().getAutoSaveInterval();
+ }
- private void processSave() {
- try {
- WebEditor.instance.saveManifest();
- } catch (TestDocException e) {
- System.out.println("WARNING: Can't save manifest.");
- }
+ private void processSave() {
+ try {
+ WebEditor.instance.saveManifest();
+ } catch (TestDocException e) {
+ System.out.println("WARNING: Can't save manifest.");
}
+ }
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/Data/ManifestFactory.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/Data/ManifestFactory.java 2008-05-23 14:27:49 UTC (rev 161)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/Data/ManifestFactory.java 2008-05-23 17:44:49 UTC (rev 162)
@@ -17,70 +17,69 @@
import edu.lnu.FireFly.WebEditor.ItemModels.Chapter.ChapterItemData;
public class ManifestFactory {
- static public Manifest createManifest(){
- Manifest manifest = new Manifest();
-
- manifest.setIdentifier(UUID.randomUUID().toString());
- manifest.setOrganizations(createOrganizations());
- manifest.setResources(new Resources());
+ static public Manifest createManifest() {
+ Manifest manifest = new Manifest();
- OrganizationModel model = null;
- TreeItem root = null;
- try{
- root = manifest.getRoot();
- model = new OrganizationModel();
- }
- catch (Exception e) {
- e.printStackTrace();
- return null;
- }
+ manifest.setIdentifier(UUID.randomUUID().toString());
+ manifest.setOrganizations(createOrganizations());
+ manifest.setResources(new Resources());
- model.setItemData(root, new ChapterItemData());
- model.updateItemResource(root, false);
-
- return manifest;
+ OrganizationModel model = null;
+ TreeItem root = null;
+ try {
+ root = manifest.getRoot();
+ model = new OrganizationModel();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null;
}
-
- static public Organizations createOrganizations(){
- Organizations organizations = new Organizations();
- Organization organization = new Organization();
- organization.setIdentifier(UUID.randomUUID().toString());
- organization.setTitle("New organization");
- organizations.addDefaultOrganization(organization);
-
- return organizations;
- }
-
- static public Sequencing createSequencing(){
- return new Sequencing();
- }
+ model.setItemData(root, new ChapterItemData());
+ model.updateItemResource(root, false);
- static public LimitConditions createLimitConditions(){
- return new LimitConditions();
- }
+ return manifest;
+ }
- public static Objectives createObjectives() {
- return new Objectives();
- }
+ static public Organizations createOrganizations() {
+ Organizations organizations = new Organizations();
+ Organization organization = new Organization();
+ organization.setIdentifier(UUID.randomUUID().toString());
+ organization.setTitle("New organization");
- public static Objective createObjective() {
- return new Objective();
- }
+ organizations.addDefaultOrganization(organization);
- public static ArrayList<MapInfo> createMapInfos() {
- return new ArrayList<MapInfo>();
- }
+ return organizations;
+ }
- public static MapInfo createMapInfo() {
- return new MapInfo();
- }
+ static public Sequencing createSequencing() {
+ return new Sequencing();
+ }
- public static MapInfo createMapInfo(String targetObjectiveID) {
- MapInfo mapInfo = new MapInfo();
-
- mapInfo.targetObjectiveID = targetObjectiveID;
-
- return mapInfo;
- }
+ static public LimitConditions createLimitConditions() {
+ return new LimitConditions();
+ }
+
+ public static Objectives createObjectives() {
+ return new Objectives();
+ }
+
+ public static Objective createObjective() {
+ return new Objective();
+ }
+
+ public static ArrayList<MapInfo> createMapInfos() {
+ return new ArrayList<MapInfo>();
+ }
+
+ public static MapInfo createMapInfo() {
+ return new MapInfo();
+ }
+
+ public static MapInfo createMapInfo(String targetObjectiveID) {
+ MapInfo mapInfo = new MapInfo();
+
+ mapInfo.targetObjectiveID = targetObjectiveID;
+
+ return mapInfo;
+ }
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java 2008-05-23 14:27:49 UTC (rev 161)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/Data/SummaryPageManager.java 2008-05-23 17:44:49 UTC (rev 162)
@@ -16,205 +16,205 @@
import edu.lnu.FireFly.WebEditor.ItemModels.SummaryPageModel.SummaryPageModel;
public class SummaryPageManager {
- private SummaryPageManager() {
- }
+ private SummaryPageManager() {
+ }
- private static SummaryPageManager obj = null;
+ private static SummaryPageManager obj = null;
- public static SummaryPageManager getInstance() {
- if (obj == null) {
- obj = new SummaryPageManager();
- }
-
- return obj;
+ public static SummaryPageManager getInstance() {
+ if (obj == null) {
+ obj = new SummaryPageManager();
}
- protected Manifest manifest = null;
+ return obj;
+ }
- public Manifest getManifest() {
- return manifest;
- }
+ protected Manifest manifest = null;
- public void setManifest(Manifest manifest) {
- this.manifest = manifest;
- }
+ public Manifest getManifest() {
+ return manifest;
+ }
- public void updateSummaryPages(TreeItem root) throws TestDocException {
- pushDownSummaryPage(root);
+ public void setManifest(Manifest manifest) {
+ this.manifest = manifest;
+ }
- for (int i = 0; i < root.getChildCount(); i++) {
- TreeItem item = root.getChild(i);
- ItemModel model = ItemModels.getModelFromItem(item);
+ public void updateSummaryPages(TreeItem root) throws TestDocException {
+ pushDownSummaryPage(root);
- if (model.getClass() == OrganizationModel.class
- || model.getClass() == ChapterModel.class) {
- updateSummaryPages(item);
- }
- }
+ for (int i = 0; i < root.getChildCount(); i++) {
+ TreeItem item = root.getChild(i);
+ ItemModel model = ItemModels.getModelFromItem(item);
- boolean showSummaryPage = isShowSummaryPageForItem(root);
+ if (model.getClass() == OrganizationModel.class
+ || model.getClass() == ChapterModel.class) {
+ updateSummaryPages(item);
+ }
+ }
- if (showSummaryPage) {
- createSummaryPageIfNotExists(root);
- Item summaryPage = (Item) root.getChild(root.getChildCount() - 1);
- ItemModel model = ItemModels.getModelFromItem(summaryPage);
+ boolean showSummaryPage = isShowSummaryPageForItem(root);
- insertAllNeededObjectivesIntoSummaryPage(root);
+ if (showSummaryPage) {
+ createSummaryPageIfNotExists(root);
+ Item summaryPage = (Item) root.getChild(root.getChildCount() - 1);
+ ItemModel model = ItemModels.getModelFromItem(summaryPage);
- ((SummaryPageModel) model).updateItemResource(summaryPage, false);
- } else {
- deleteSummaryPageIfExists(root);
- }
+ insertAllNeededObjectivesIntoSummaryPage(root);
+
+ ((SummaryPageModel) model).updateItemResource(summaryPage, false);
+ } else {
+ deleteSummaryPageIfExists(root);
}
+ }
- private void insertAllNeededObjectivesIntoSummaryPage(TreeItem root) {
- Item summaryPage = (Item) root.getChild(root.getChildCount() - 1);
+ private void insertAllNeededObjectivesIntoSummaryPage(TreeItem root) {
+ Item summaryPage = (Item) root.getChild(root.getChildCount() - 1);
- ArrayList<String> objectiveIds = getShowingItemsIds(root);
+ ArrayList<String> objectiveIds = getShowingItemsIds(root);
- ItemModel model = ItemModels.getModelFromItem(summaryPage);
- Objectives objectives = model.getObjectivesInstance(summaryPage);
- objectives.objective = new ArrayList<Objective>();
+ ItemModel model = ItemModels.getModelFromItem(summaryPage);
+ Objectives objectives = model.getObjectivesInstance(summaryPage);
+ objectives.objective = new ArrayList<Objective>();
- for (int i = 0; i < objectiveIds.size(); i++) {
- String objectiveId = objectiveIds.get(i);
- Objective objective = ManifestFactory.createObjective();
+ for (int i = 0; i < objectiveIds.size(); i++) {
+ String objectiveId = objectiveIds.get(i);
+ Objective objective = ManifestFactory.createObjective();
- objective.objectiveID = objectiveId;
- objective.mapInfo.add(ManifestFactory.createMapInfo(objectiveId));
+ objective.objectiveID = objectiveId;
+ objective.mapInfo.add(ManifestFactory.createMapInfo(objectiveId));
- summaryPage.sequencing.objectives.objective.add(objective);
- }
+ summaryPage.sequencing.objectives.objective.add(objective);
}
+ }
- private ArrayList<String> getShowingItemsIds(TreeItem root) {
- ArrayList<String> result = new ArrayList<String>();
+ private ArrayList<String> getShowingItemsIds(TreeItem root) {
+ ArrayList<String> result = new ArrayList<String>();
- for (int i = 0; i < root.getChildCount(); i++) {
- TreeItem item = root.getChild(i);
- ItemModel model = ItemModels.getModelFromItem(item);
- if (model.getShowOnSummaryPage(item)) {
- result.add(model.getIdentifier(item));
- }
+ for (int i = 0; i < root.getChildCount(); i++) {
+ TreeItem item = root.getChild(i);
+ ItemModel model = ItemModels.getModelFromItem(item);
+ if (model.getShowOnSummaryPage(item)) {
+ result.add(model.getIdentifier(item));
+ }
- for (int j = 0; j < item.getChildCount(); j++) {
- TreeItem child = item.getChild(j);
- ItemModel childModel = ItemModels.getModelFromItem(child);
+ for (int j = 0; j < item.getChildCount(); j++) {
+ TreeItem child = item.getChild(j);
+ ItemModel childModel = ItemModels.getModelFromItem(child);
- if (childModel.getShowOnSummaryPage(child)) {
- result.add(model.getIdentifier(child));
- result.addAll(getShowingItemsIds(child));
- }
- }
+ if (childModel.getShowOnSummaryPage(child)) {
+ result.add(model.getIdentifier(child));
+ result.addAll(getShowingItemsIds(child));
}
-
- return result;
+ }
}
- private void recursivlyUpdateObjectives(TreeItem root) {
-
- ItemModel model = ItemModels.getModelFromItem(root);
- model.updateItemObjectives(root);
+ return result;
+ }
- for (int i = 0; i < root.getChildCount(); i++) {
- recursivlyUpdateObjectives(root.getChild(i));
- }
+ private void recursivlyUpdateObjectives(TreeItem root) {
+
+ ItemModel model = ItemModels.getModelFromItem(root);
+ model.updateItemObjectives(root);
+
+ for (int i = 0; i < root.getChildCount(); i++) {
+ recursivlyUpdateObjectives(root.getChild(i));
}
+ }
- private void createSummaryPageIfNotExists(TreeItem root) {
- int childsCount = root.getChildCount();
+ private void createSummaryPageIfNotExists(TreeItem root) {
+ int childsCount = root.getChildCount();
- if (childsCount > 0) {
- TreeItem lastItem = root.getChild(childsCount - 1);
- ItemModel lastItemModel = ItemModels.getModelFromItem(lastItem);
- if (lastItemModel.getClass() == SummaryPageModel.class) {
- return;
- }
- }
- SummaryPageModel model = new SummaryPageModel();
- model.addItem(root);
+ if (childsCount > 0) {
+ TreeItem lastItem = root.getChild(childsCount - 1);
+ ItemModel lastItemModel = ItemModels.getModelFromItem(lastItem);
+ if (lastItemModel.getClass() == SummaryPageModel.class) {
+ return;
+ }
}
+ SummaryPageModel model = new SummaryPageModel();
+ model.addItem(root);
+ }
- private void deleteSummaryPageIfExists(TreeItem root) {
- int childsCount = root.getChildCount();
+ private void deleteSummaryPageIfExists(TreeItem root) {
+ int childsCount = root.getChildCount();
- if (childsCount == 0) {
- return;
- }
+ if (childsCount == 0) {
+ return;
+ }
- TreeItem lastItem = root.getChild(childsCount - 1);
- ItemModel lastItemModel = ItemModels.getModelFromItem(lastItem);
- if (lastItemModel.getClass() == SummaryPageModel.class) {
- SummaryPageModel model = new SummaryPageModel();
- model.remove(lastItem);
- }
+ TreeItem lastItem = root.getChild(childsCount - 1);
+ ItemModel lastItemModel = ItemModels.getModelFromItem(lastItem);
+ if (lastItemModel.getClass() == SummaryPageModel.class) {
+ SummaryPageModel model = new SummaryPageModel();
+ model.remove(lastItem);
}
+ }
- private boolean isShowSummaryPageForItem(TreeItem root)
- throws TestDocException {
+ private boolean isShowSummaryPageForItem(TreeItem root)
+ throws TestDocException {
- boolean showSummaryPage = false;
- ItemModel rootModel = ItemModels.getModelFromItem(root);
+ boolean showSummaryPage = false;
+ ItemModel rootModel = ItemModels.getModelFromItem(root);
- if (rootModel.getClass() == ChapterModel.class
- || rootModel.getClass() == OrganizationModel.class) {
- ChapterModel model = (ChapterModel) rootModel;
+ if (rootModel.getClass() == ChapterModel.class
+ || rootModel.getClass() == OrganizationModel.class) {
+ ChapterModel model = (ChapterModel) rootModel;
- showSummaryPage = model.getShowSummaryPage(root);
- } else {
- throw new TestDocException(
- "Root element must be a chapter or an organization");
- }
-
- return showSummaryPage;
+ showSummaryPage = model.getShowSummaryPage(root);
+ } else {
+ throw new TestDocException(
+ "Root element must be a chapter or an organization");
}
- private void recursivlyUpdateChapters(TreeItem root)
- throws TestDocException {
- int childsCount = root.getChildCount();
- for (int i = 0; i < childsCount; i++) {
- Item item = (Item) root.getChild(i);
- ItemModel itemModel = ItemModels.getModelFromItem(item);
+ return showSummaryPage;
+ }
- if (itemModel.getClass() == ChapterModel.class) {
- updateSummaryPages(item);
- }
- }
+ private void recursivlyUpdateChapters(TreeItem root)
+ throws TestDocException {
+ int childsCount = root.getChildCount();
+ for (int i = 0; i < childsCount; i++) {
+ Item item = (Item) root.getChild(i);
+ ItemModel itemModel = ItemModels.getModelFromItem(item);
+
+ if (itemModel.getClass() == ChapterModel.class) {
+ updateSummaryPages(item);
+ }
}
+ }
- private void pushDownSummaryPage(TreeItem root) throws TestDocException {
- int childsCount = root.getChildCount();
+ private void pushDownSummaryPage(TreeItem root) throws TestDocException {
+ int childsCount = root.getChildCount();
- for (int i = 0; i < childsCount; i++) {
- Item item = (Item) root.getChild(i);
- ItemModel itemModel = ItemModels.getModelFromItem(item);
+ for (int i = 0; i < childsCount; i++) {
+ Item item = (Item) root.getChild(i);
+ ItemModel itemModel = ItemModels.getModelFromItem(item);
- if (itemModel.getClass() == SummaryPageModel.class) {
- if (i != childsCount - 1) {
- ItemModel lastItemModel = ItemModels.getModelFromItem(root
- .getChild(childsCount - 1));
+ if (itemModel.getClass() == SummaryPageModel.class) {
+ if (i != childsCount - 1) {
+ ItemModel lastItemModel = ItemModels.getModelFromItem(root
+ .getChild(childsCount - 1));
- if (lastItemModel.getClass() == SummaryPageModel.class) {
- throw new TestDocException(
- "Count of summary pages is graiter than one!!!");
- }
+ if (lastItemModel.getClass() == SummaryPageModel.class) {
+ throw new TestDocException(
+ "Count of summary pages is graiter than one!!!");
+ }
- Reorganizer.getInstance().moveDown(item);
- }
- }
+ Reorganizer.getInstance().moveDown(item);
}
-
- //TreeDataModel.getInstance().updateAllTree();
+ }
}
- public void updateSummaryPages() {
- try {
- recursivlyUpdateChapters(manifest.getRoot());
- recursivlyUpdateObjectives(manifest.getRoot());
- updateSummaryPages(manifest.getRoot());
- } catch (TestDocException e) {
- e.printStackTrace();
- }
+ // TreeDataModel.getInstance().updateAllTree();
+ }
+
+ public void updateSummaryPages() {
+ try {
+ recursivlyUpdateChapters(manifest.getRoot());
+ recursivlyUpdateObjectives(manifest.getRoot());
+ updateSummaryPages(manifest.getRoot());
+ } catch (TestDocException e) {
+ e.printStackTrace();
}
+ }
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/CourseTreePopupMenu.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/CourseTreePopupMenu.java 2008-05-23 14:27:49 UTC (rev 161)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/CourseTreePopupMenu.java 2008-05-23 17:44:49 UTC (rev 162)
@@ -32,531 +32,531 @@
import edu.lnu.FireFly.WebEditor.ItemModels.SummaryPageModel.SummaryPageModel;
public class CourseTreePopupMenu extends MouseAdapter implements
- ActionListener, ChangeListener {
+ ActionListener, ChangeListener {
- protected JMenu addItemMenu;
- protected JMenu changeTypeMenu;
- protected TreeItem manifestItem = null;
- protected JPopupMenu menu;
- protected JMenuItem moveDownItemMenu;
- protected JMenuItem moveUpItemMenu;
- protected JMenuItem propertyItemMenu;
- protected JMenuItem removeItemMenu;
- protected JMenuItem renameItemMenu;
- protected JCheckBoxMenuItem showOnSummaryPageMenuItem;
- protected JCheckBoxMenuItem showSummaryPageMenuItem;
- protected JMenu limitConditionsMenu;
- protected JMenu attemptLimitMenu;
- protected JRadioButtonMenuItem attemptLimitNoneItemMenu;
- protected JRadioButtonMenuItem attemptLimit1ItemMenu;
- protected JRadioButtonMenuItem attemptLimit3ItemMenu;
- protected JRadioButtonMenuItem attemptLimit5ItemMenu;
- protected JRadioButtonMenuItem attemptLimit10ItemMenu;
- protected JRadioButtonMenuItem attemptLimitOtherItemMenu;
- protected JMenu attemptAbsoluteDurationMenu;
- protected JRadioButtonMenuItem attemptAbsoluteDuration1minItemMenu;
- protected JRadioButtonMenuItem attemptAbsoluteDurationNoneItemMenu;
- protected JRadioButtonMenuItem attemptAbsoluteDuration3minItemMenu;
- protected JRadioButtonMenuItem attemptAbsoluteDuration30minItemMenu;
- protected JRadioButtonMenuItem attemptAbsoluteDuration1hourItemMenu;
- protected JRadioButtonMenuItem attemptAbsoluteDuration5hourItemMenu;
- protected JRadioButtonMenuItem attemptAbsoluteDurationOtherItemMenu;
+ protected JMenu addItemMenu;
+ protected JMenu changeTypeMenu;
+ protected TreeItem manifestItem = null;
+ protected JPopupMenu menu;
+ protected JMenuItem moveDownItemMenu;
+ protected JMenuItem moveUpItemMenu;
+ protected JMenuItem propertyItemMenu;
+ protected JMenuItem removeItemMenu;
+ protected JMenuItem renameItemMenu;
+ protected JCheckBoxMenuItem showOnSummaryPageMenuItem;
+ protected JCheckBoxMenuItem showSummaryPageMenuItem;
+ protected JMenu limitConditionsMenu;
+ protected JMenu attemptLimitMenu;
+ protected JRadioButtonMenuItem attemptLimitNoneItemMenu;
+ protected JRadioButtonMenuItem attemptLimit1ItemMenu;
+ protected JRadioButtonMenuItem attemptLimit3ItemMenu;
+ protected JRadioButtonMenuItem attemptLimit5ItemMenu;
+ protected JRadioButtonMenuItem attemptLimit10ItemMenu;
+ protected JRadioButtonMenuItem attemptLimitOtherItemMenu;
+ protected JMenu attemptAbsoluteDurationMenu;
+ protected JRadioButtonMenuItem attemptAbsoluteDuration1minItemMenu;
+ protected JRadioButtonMenuItem attemptAbsoluteDurationNoneItemMenu;
+ protected JRadioButtonMenuItem attemptAbsoluteDuration3minItemMenu;
+ protected JRadioButtonMenuItem attemptAbsoluteDuration30minItemMenu;
+ protected JRadioButtonMenuItem attemptAbsoluteDuration1hourItemMenu;
+ protected JRadioButtonMenuItem attemptAbsoluteDuration5hourItemMenu;
+ protected JRadioButtonMenuItem attemptAbsoluteDurationOtherItemMenu;
- public CourseTreePopupMenu() {
- initReorganizeMenus();
- initSummaryPageMenus();
- initLimitConditionsMenu();
+ public CourseTreePopupMenu() {
+ initReorganizeMenus();
+ initSummaryPageMenus();
+ initLimitConditionsMenu();
- menu = new JPopupMenu();
- addItemMenu = new JMenu("Add item");
+ menu = new JPopupMenu();
+ addItemMenu = new JMenu("Add item");
- changeTypeMenu = new JMenu("Chage type");
+ changeTypeMenu = new JMenu("Chage type");
- propertyItemMenu = new JMenuItem("Property");
- propertyItemMenu.addActionListener(this);
+ propertyItemMenu = new JMenuItem("Property");
+ propertyItemMenu.addActionListener(this);
- menu.add(addItemMenu);
- menu.add(changeTypeMenu);
+ menu.add(addItemMenu);
+ menu.add(changeTypeMenu);
- menu.addSeparator();
+ menu.addSeparator();
- menu.add(moveUpItemMenu);
- menu.add(moveDownItemMenu);
- menu.add(removeItemMenu);
- menu.add(renameItemMenu);
+ menu.add(moveUpItemMenu);
+ menu.add(moveDownItemMenu);
+ menu.add(removeItemMenu);
+ menu.add(renameItemMenu);
- menu.addSeparator();
+ menu.addSeparator();
- menu.add(propertyItemMenu);
- menu.add(limitConditionsMenu);
- menu.add(showOnSummaryPageMenuItem);
- menu.add(showSummaryPageMenuItem);
+ menu.add(propertyItemMenu);
+ menu.add(limitConditionsMenu);
+ menu.add(showOnSummaryPageMenuItem);
+ menu.add(showSummaryPageMenuItem);
+ }
+
+ public void actionPerformed(java.awt.event.ActionEvent e) {
+ JMenuItem menuItem = (JMenuItem) e.getSource();
+
+ if (menuItem.getClass() == JMenuItemContainedModel.class) {
+ JMenuItemContainedModel myMenuItem = (JMenuItemContainedModel) menuItem;
+ if (myMenuItem.type == JMenuItemContainedModel.ADD_ITEM) {
+ myMenuItem.itemModel.addItem(manifestItem);
+ return;
+ }
}
- public void actionPerformed(java.awt.event.ActionEvent e) {
- JMenuItem menuItem = (JMenuItem) e.getSource();
+ ItemModel itemModel = ItemModels.getModelFromItem(manifestItem);
+ if (itemModel == null) {
+ System.out.print("Can't get model for item.\n");
+ return;
+ }
- if (menuItem.getClass() == JMenuItemContainedModel.class) {
- JMenuItemContainedModel myMenuItem = (JMenuItemContainedModel) menuItem;
- if (myMenuItem.type == JMenuItemContainedModel.ADD_ITEM) {
- myMenuItem.itemModel.addItem(manifestItem);
- return;
- }
- }
+ if (menuItem == renameItemMenu) {
+ itemModel.rename(manifestItem, RenameDlg.showDialog(manifestItem
+ .toString()));
+ }
- ItemModel itemModel = ItemModels.getModelFromItem(manifestItem);
- if (itemModel == null) {
- System.out.print("Can't get model for item.\n");
- return;
- }
+ if (menuItem == removeItemMenu) {
+ itemModel.remove(manifestItem);
+ }
- if (menuItem == renameItemMenu) {
- itemModel.rename(manifestItem, RenameDlg.showDialog(manifestItem
- .toString()));
- }
+ if (menuItem == propertyItemMenu) {
+ itemModel.ConfigureItem(manifestItem);
+ }
- if (menuItem == removeItemMenu) {
- itemModel.remove(manifestItem);
- }
+ if (menuItem == moveUpItemMenu) {
+ Reorganizer.getInstance().moveUp(manifestItem);
+ }
- if (menuItem == propertyItemMenu) {
- itemModel.ConfigureItem(manifestItem);
- }
+ if (menuItem == moveDownItemMenu) {
+ Reorganizer.getInstance().moveDown(manifestItem);
+ }
+ }
- if (menuItem == moveUpItemMenu) {
- Reorganizer.getInstance().moveUp(manifestItem);
- }
+ private void attemptAbsoluteDurationStateChanged(ChangeEvent arg0) {
+ boolean attemptAbsoluteDurationPerformed = isAttemptAbsoluteDurationPerformed(arg0);
- if (menuItem == moveDownItemMenu) {
- Reorganizer.getInstance().moveDown(manifestItem);
- }
+ if (attemptAbsoluteDurationPerformed) {
+ Duration duration = extractDurationLimitValue(arg0);
+
+ setDurationLimit(duration);
}
+ }
- private void attemptAbsoluteDurationStateChanged(ChangeEvent arg0) {
- boolean attemptAbsoluteDurationPerformed = isAttemptAbsoluteDurationPerformed(arg0);
+ private void attemptsLimitStateChanged(ChangeEvent arg0) {
+ boolean attemptLimitPerformed = isAttemptLimitPerformed(arg0);
- if (attemptAbsoluteDurationPerformed) {
- Duration duration = extractDurationLimitValue(arg0);
+ if (attemptLimitPerformed) {
+ Integer attemptLimit = extractAttemptLimitValue(arg0);
- setDurationLimit(duration);
- }
+ setAttemptLimitCount(attemptLimit);
}
- private void attemptsLimitStateChanged(ChangeEvent arg0) {
- boolean attemptLimitPerformed = isAttemptLimitPerformed(arg0);
+ }
- if (attemptLimitPerformed) {
- Integer attemptLimit = extractAttemptLimitValue(arg0);
+ public void createAddAndChangeMenuItems() {
+ ArrayList<ItemModel> models = ItemModels.getAllModels();
+ addItemMenu.removeAll();
+ changeTypeMenu.removeAll();
- setAttemptLimitCount(attemptLimit);
- }
+ JMenuItemContainedModel item;
+ for (int i = 0; i < models.size(); i++) {
+ if (models.get(i).canConvertItem(manifestItem)) {
+ item = new JMenuItemContainedModel(models.get(i),
+ JMenuItemContainedModel.CHANGE_ITEM_TYPE);
+ item.addActionListener(this);
+ changeTypeMenu.add(item);
+ }
+ if (models.get(i).canAddToItem(manifestItem)) {
+ item = new JMenuItemContainedModel(models.get(i),
+ JMenuItemContainedModel.ADD_ITEM);
+ item.addActionListener(this);
+ addItemMenu.add(item);
+ }
}
- public void createAddAndChangeMenuItems() {
- ArrayList<ItemModel> models = ItemModels.getAllModels();
- addItemMenu.removeAll();
- changeTypeMenu.removeAll();
+ changeTypeMenu.setVisible(changeTypeMenu.getComponentCount() != 0);
+ }
- JMenuItemContainedModel item;
- for (int i = 0; i < models.size(); i++) {
- if (models.get(i).canConvertItem(manifestItem)) {
- item = new JMenuItemContainedModel(models.get(i),
- JMenuItemContainedModel.CHANGE_ITEM_TYPE);
- item.addActionListener(this);
- changeTypeMenu.add(item);
- }
+ private void displayMenu(MouseEvent e) {
+ if (e.isPopupTrigger()) {
+ Point pt = e.getPoint();
+ TreePath path = WebEditor.getCourseTree()
+ .getClosestPathForLocation(pt.x, pt.y);
+ WebEditor.getCourseTree().setSelectionPath(path);
+ manifestItem = (TreeItem) path.getLastPathComponent();
- if (models.get(i).canAddToItem(manifestItem)) {
- item = new JMenuItemContainedModel(models.get(i),
- JMenuItemContainedModel.ADD_ITEM);
- item.addActionListener(this);
- addItemMenu.add(item);
- }
- }
+ ItemModel model = ItemModels.getModelFromItem(manifestItem);
+ if (model == null) {
+ System.out.print("Can't find model for selected item !!!");
+ return;
+ }
- changeTypeMenu.setVisible(changeTypeMenu.getComponentCount() != 0);
- }
+ prepareOrganizeMenuItems();
- private void displayMenu(MouseEvent e) {
- if (e.isPopupTrigger()) {
- Point pt = e.getPoint();
- TreePath path = WebEditor.getCourseTree()
- .getClosestPathForLocation(pt.x, pt.y);
- WebEditor.getCourseTree().setSelectionPath(path);
- manifestItem = (TreeItem) path.getLastPathComponent();
+ createAddAndChangeMenuItems();
- ItemModel model = ItemModels.getModelFromItem(manifestItem);
- if (model == null) {
- System.out.print("Can't find model for selected item !!!");
- return;
- }
+ showOnSummaryPageMenuItem.setState(model
+ .getShowOnSummaryPage(manifestItem));
+ showOnSummaryPageMenuItem.setVisible(model
+ .getShowOnSummaryPageMenuVisible());
- prepareOrganizeMenuItems();
+ limitConditionsMenu.setVisible(model
+ .getLimitConditionsMenuVisible(manifestItem));
- createAddAndChangeMenuItems();
+ showSummaryPageMenuItem.setVisible(model
+ .getShowSummaryPageMenuVisible());
- showOnSummaryPageMenuItem.setState(model
- .getShowOnSummaryPage(manifestItem));
- showOnSummaryPageMenuItem.setVisible(model
- .getShowOnSummaryPageMenuVisible());
+ if (model.getShowSummaryPageMenuVisible()) {
+ ChapterModel chapterModel = (ChapterModel) model;
- limitConditionsMenu.setVisible(model
- .getLimitConditionsMenuVisible(manifestItem));
+ showSummaryPageMenuItem.setState(chapterModel
+ .getShowSummaryPage(manifestItem));
+ }
- showSummaryPageMenuItem.setVisible(model
- .getShowSummaryPageMenuVisible());
+ addItemMenu.setVisible(model.isContainer()
+ && ItemModels.getAllModels().size() > 0);
- if (model.getShowSummaryPageMenuVisible()) {
- ChapterModel chapterModel = (ChapterModel) model;
-
- showSummaryPageMenuItem.setState(chapterModel
- .getShowSummaryPage(manifestItem));
- }
+ removeItemMenu.setVisible(model.isRemovable());
- addItemMenu.setVisible(model.isContainer()
- && ItemModels.getAllModels().size() > 0);
+ menu.show(e.getComponent(), e.getX(), e.getY());
+ }
+ }
- removeItemMenu.setVisible(model.isRemovable());
+ private Integer extractAttemptLimitValue(ChangeEvent arg0) {
+ Integer attemptLimit = null;
+ if (arg0.getSource() == attemptLimitNoneItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ attemptLimit = null;
+ }
+ }
- menu.show(e.getComponent(), e.getX(), e.getY());
- }
+ if (arg0.getSource() == attemptLimit1ItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ attemptLimit = 1;
+ }
}
- private Integer extractAttemptLimitValue(ChangeEvent arg0) {
- Integer attemptLimit = null;
- if (arg0.getSource() == attemptLimitNoneItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- attemptLimit = null;
- }
- }
+ if (arg0.getSource() == attemptLimit3ItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ attemptLimit = 3;
+ }
+ }
- if (arg0.getSource() == attemptLimit1ItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- attemptLimit = 1;
- }
- }
+ if (arg0.getSource() == attemptLimit5ItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ attemptLimit = 5;
+ }
+ }
- if (arg0.getSource() == attemptLimit3ItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- attemptLimit = 3;
- }
- }
+ if (arg0.getSource() == attemptLimit10ItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ attemptLimit = 10;
+ }
+ }
- if (arg0.getSource() == attemptLimit5ItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- attemptLimit = 5;
- }
- }
+ if (arg0.getSource() == attemptLimitOtherItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ // TODO Need realize dialog box.
+ attemptLimit = 7;
+ }
+ }
+ return attemptLimit;
+ }
- if (arg0.getSource() == attemptLimit10ItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- attemptLimit = 10;
- }
- }
+ private Duration extractDurationLimitValue(ChangeEvent arg0) {
+ Duration result = null;
+ DurationConverter converter = new DurationConverter();
- if (arg0.getSource() == attemptLimitOtherItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- // TODO Need realize dialog box.
- attemptLimit = 7;
- }
- }
- return attemptLimit;
+ if (arg0.getSource() == attemptAbsoluteDurationNoneItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ result = null;
+ }
}
- private Duration extractDurationLimitValue(ChangeEvent arg0) {
- Duration result = null;
- DurationConverter converter = new DurationConverter();
+ if (arg0.getSource() == attemptAbsoluteDuration1minItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ result = (Duration) converter.fromString("PT1M");
+ }
+ }
- if (arg0.getSource() == attemptAbsoluteDurationNoneItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- result = null;
- }
- }
+ if (arg0.getSource() == attemptAbsoluteDuration3minItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ result = (Duration) converter.fromString("PT3M");
+ }
+ }
- if (arg0.getSource() == attemptAbsoluteDuration1minItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- result = (Duration) converter.fromString("PT1M");
- }
- }
+ if (arg0.getSource() == attemptAbsoluteDuration30minItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ result = (Duration) converter.fromString("PT30M");
+ }
+ }
- if (arg0.getSource() == attemptAbsoluteDuration3minItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- result = (Duration) converter.fromString("PT3M");
- }
- }
+ if (arg0.getSource() == attemptAbsoluteDuration1hourItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ result = (Duration) converter.fromString("PT1H");
+ }
+ }
- if (arg0.getSource() == attemptAbsoluteDuration30minItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- result = (Duration) converter.fromString("PT30M");
- }
- }
+ if (arg0.getSource() == attemptAbsoluteDuration5hourItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ result = (Duration) converter.fromString("PT5H");
+ }
+ }
- if (arg0.getSource() == attemptAbsoluteDuration1hourItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- result = (Duration) converter.fromString("PT1H");
- }
- }
+ if (arg0.getSource() == attemptAbsoluteDurationOtherItemMenu) {
+ if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
+ // TODO need realize dialogBox
- if (arg0.getSource() == attemptAbsoluteDuration5hourItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- result = (Duration) converter.fromString("PT5H");
- }
- }
+ result = (Duration) converter.fromString("PT7H");
+ }
+ }
- if (arg0.getSource() == attemptAbsoluteDurationOtherItemMenu) {
- if (((JRadioButtonMenuItem) arg0.getSource()).isSelected()) {
- // TODO need realize dialogBox
+ return result;
+ }
- result = (Duration) converter.fromString("PT7H");
- }
- }
+ private Sequencing getSequencingInstance() {
+ Sequencing sequencing = null;
- return result;
+ if (manifestItem.getClass() == Organization.class) {
+ if (((Organization) manifestItem).sequencing == null) {
+ ((Organization) manifestItem).sequencing = ManifestFactory
+ .createSequencing();
+ }
+
+ sequencing = ((Organization) manifestItem).sequencing;
}
- private Sequencing getSequencingInstance() {
- Sequencing sequencing = null;
+ if (manifestItem.getClass() == Item.class) {
+ if (((Item) manifestItem).sequencing == null) {
+ ((Item) manifestItem).sequencing = ManifestFactory
+ .createSequencing();
+ }
- if (manifestItem.getClass() == Organization.class) {
- if (((Organization) manifestItem).sequencing == null) {
- ((Organization) manifestItem).sequencing = ManifestFactory
- .createSequencing();
- }
+ sequencing = ((Item) manifestItem).sequencing;
+ }
+ return sequencing;
+ }
- sequencing = ((Organization) manifestItem).sequencing;
- }
+ private void initAttemptAbsoluteDurationMenu() {
+ attemptAbsoluteDurationNoneItemMenu = new JRadioButtonMenuItem("None",
+ true);
+ attemptAbsoluteDuration1minItemMenu = new JRadioButtonMenuItem("1 min");
+ attemptAbsoluteDuration3minItemMenu = new JRadioButtonMenuItem("3 min");
+ attemptAbsoluteDuration30minItemMenu = new JRadioButtonMenuItem(
+ "30 min");
+ attemptAbsoluteDuration1hourItemMenu = new JRadioButtonMenuItem(
+ "1 hour");
+ attemptAbsoluteDuration5hourItemMenu = new JRadioButtonMenuItem(
+ "5 hour");
+ attemptAbsoluteDurationOtherItemMenu = new JRadioButtonMenuItem("Other");
- if (manifestItem.getClass() == Item.class) {
- if (((Item) manifestItem).sequencing == null) {
- ((Item) manifestItem).sequencing = ManifestFactory
- .createSequencing();
- }
+ ButtonGroup buttonGroup = new ButtonGroup();
+ buttonGroup.add(attemptAbsoluteDurationNoneItemMenu);
+ buttonGroup.add(attemptAbsoluteDuration1minItemMenu);
+ buttonGroup.add(attemptAbsoluteDuration3minItemMenu);
+ buttonGroup.add(attemptAbsoluteDuration30minItemMenu);
+ buttonGroup.add(attemptAbsoluteDuration1hourItemMenu);
+ buttonGroup.add(attemptAbsoluteDuration5hourItemMenu);
+ buttonGroup.add(attemptAbsoluteDurationOtherItemMenu);
- sequencing = ((Item) manifestItem).sequencing;
- }
- return sequencing;
- }
+ attemptAbsoluteDurationNoneItemMenu.addChangeListener(this);
+ attemptAbsoluteDuration1minItemMenu.addChangeListener(this);
+ attemptAbsoluteDuration3minItemMenu.addChangeListener(this);
+ attemptAbsoluteDuration30minItemMenu.addChangeListener(this);
+ attemptAbsoluteDuration1hourItemMenu.addChangeListener(this);
+ attemptAbsoluteDuration5hourItemMenu.addChangeListener(this);
+ attemptAbsoluteDurationOtherItemMenu.addChangeListener(this);
- private void initAttemptAbsoluteDurationMenu() {
- attemptAbsoluteDurationNoneItemMenu = new JRadioButtonMenuItem("None",
- true);
- attemptAbsoluteDuration1minItemMenu = new JRadioButtonMenuItem("1 min");
- attemptAbsoluteDuration3minItemMenu = new JRadioButtonMenuItem("3 min");
- attemptAbsoluteDuration30minItemMenu = new JRadioButtonMenuItem(
- "30 min");
- attemptAbsoluteDuration1hourItemMenu = new JRadioButtonMenuItem(
- "1 hour");
- attemptAbsoluteDuration5hourItemMenu = new JRadioButtonMenuItem(
- "5 hour");
- attemptAbsoluteDurationOtherItemMenu = new JRadioButtonMenuItem("Other");
+ attemptAbsoluteDurationMenu = new JMenu("Attempt duration");
+ attemptAbsoluteDurationMenu.add(attemptAbsoluteDurationNoneItemMenu);
+ attemptAbsoluteDurationMenu.add(attemptAbsoluteDuration1minItemMenu);
+ attemptAbsoluteDurationMenu.add(attemptAbsoluteDuration3minItemMenu);
+ attemptAbsoluteDurationMenu.add(attemptAbsoluteDuration30minItemMenu);
+ attemptAbsoluteDurationMenu.add(attemptAbsoluteDuration1hourItemMenu);
+ attemptAbsoluteDurationMenu.add(attemptAbsoluteDuration5hourItemMenu);
+ attemptAbsoluteDurationMenu.add(attemptAbsoluteDurationOtherItemMenu);
+ }
- ButtonGroup buttonGroup = new ButtonGroup();
- buttonGroup.add(attemptAbsoluteDurationNoneItemMenu);
- buttonGroup.add(attemptAbsoluteDuration1minItemMenu);
- buttonGroup.add(attemptAbsoluteDuration3minItemMenu);
- buttonGroup.add(attemptAbsoluteDuration30minItemMenu);
- buttonGroup.add(attemptAbsoluteDuration1hourItemMenu);
- buttonGroup.add(attemptAbsoluteDuration5hourItemMenu);
- buttonGroup.add(attemptAbsoluteDurationOtherItemMenu);
+ private void initAttemptLimitMenu() {
+ attemptLimitMenu = new JMenu("Attempts count");
+ attemptLimitNoneItemMenu = new JRadioButtonMenuItem("None", true);
+ attemptLimit1ItemMenu = new JRadioButtonMenuItem("1");
+ attemptLimit3ItemMenu = new JRadioButtonMenuItem("3");
+ attemptLimit5ItemMenu = new JRadioButtonMenuItem("5");
+ attemptLimit10ItemMenu = new JRadioButtonMenuItem("10");
+ attemptLimitOtherItemMenu = new JRadioButtonMenuItem("Other...");
- attemptAbsoluteDurationNoneItemMenu.addChangeListener(this);
- attemptAbsoluteDuration1minItemMenu.addChangeListener(this);
- attemptAbsoluteDuration3minItemMenu.addChangeListener(this);
- attemptAbsoluteDuration30minItemMenu.addChangeListener(this);
- attemptAbsoluteDuration1hourItemMenu.addChangeListener(this);
- attemptAbsoluteDuration5hourItemMenu.addChangeListener(this);
- attemptAbsoluteDurationOtherItemMenu.addChangeListener(this);
+ attemptLimitNoneItemMenu.addChangeListener(this);
+ attemptLimit1ItemMenu.addChangeListener(this);
+ attemptLimit3ItemMenu.addChangeListener(this);
+ attemptLimit5ItemMenu.addChangeListener(this);
+ attemptLimit10ItemMenu.addChangeListener(this);
+ attemptLimitOtherItemMenu.addChangeListener(this);
- attemptAbsoluteDurationMenu = new JMenu("Attempt duration");
- attemptAbsoluteDurationMenu.add(attemptAbsoluteDurationNoneItemMenu);
- attemptAbsoluteDurationMenu.add(attemptAbsoluteDuration1minItemMenu);
- attemptAbsoluteDurationMenu.add(attemptAbsoluteDuration3minItemMenu);
- attemptAbsoluteDurationMenu.add(attemptAbsoluteDuration30minItemMenu);
- attemptAbsoluteDurationMenu.add(attemptAbsoluteDuration1hourItemMenu);
- attemptAbsoluteDurationMenu.add(attemptAbsoluteDuration5hourItemMenu);
- attemptAbsoluteDurationMenu.add(attemptAbsoluteDurationOtherItemMenu);
- }
+ ButtonGroup buttonGroup = new ButtonGroup();
- private void initAttemptLimitMenu() {
- attemptLimitMenu = new JMenu("Attempts count");
- attemptLimitNoneItemMenu = new JRadioButtonMenuItem("None", true);
- attemptLimit1ItemMenu = new JRadioButtonMenuItem("1");
- attemptLimit3ItemMenu = new JRadioButtonMenuItem("3");
- attemptLimit5ItemMenu = new JRadioButtonMenuItem("5");
- attemptLimit10ItemMenu = new JRadioButtonMenuItem("10");
- attemptLimitOtherItemMenu = new JRadioButtonMenuItem("Other...");
+ buttonGroup.add(attemptLimitNoneItemMenu);
+ buttonGroup.add(attemptLimit1ItemMenu);
+ buttonGroup.add(attemptLimit3ItemMenu);
+ buttonGroup.add(attemptLimit5ItemMenu);
+ buttonGroup.add(attemptLimit10ItemMenu);
+ buttonGroup.add(attemptLimitOtherItemMenu);
- attemptLimitNoneItemMenu.addChangeListener(this);
- attemptLimit1ItemMenu.addChangeListener(this);
- attemptLimit3ItemMenu.addChangeListener(this);
- attemptLimit5ItemMenu.addChangeListener(this);
- attemptLimit10ItemMenu.addChangeListener(this);
- attemptLimitOtherItemMenu.addChangeListener(this);
+ attemptLimitMenu.add(attemptLimitNoneItemMenu);
+ attemptLimitMenu.add(attemptLimit1ItemMenu);
+ attemptLimitMenu.add(attemptLimit3ItemMenu);
+ attemptLimitMenu.add(attemptLimit5ItemMenu);
+ attemptLimitMenu.add(attemptLimit10ItemMenu);
+ attemptLimitMenu.add(attemptLimitOtherItemMenu);
+ }
- ButtonGroup buttonGroup = new ButtonGroup();
+ private void initLimitConditionsMenu() {
+ limitConditionsMenu = new JMenu("Limit Conditions");
- buttonGroup.add(attemptLimitNoneItemMenu);
- buttonGroup.add(attemptLimit1ItemMenu);
- buttonGroup.add(attemptLimit3ItemMenu);
- buttonGroup.add(attemptLimit5ItemMenu);
- buttonGroup.add(attemptLimit10ItemMenu);
- buttonGroup.add(attemptLimitOtherItemMenu);
+ initAttemptLimitMenu();
+ initAttemptAbsoluteDurationMenu();
- attemptLimitMenu.add(attemptLimitNoneItemMenu);
- attemptLimitMenu.add(attemptLimit1ItemMenu);
- attemptLimitMenu.add(attemptLimit3ItemMenu);
- attemptLimitMenu.add(attemptLimit5ItemMenu);
- attemptLimitMenu.add(attemptLimit10ItemMenu);
- attemptLimitMenu.add(attemptLimitOtherItemMenu);
- }
+ limitConditionsMenu.add(attemptLimitMenu);
+ limitConditionsMenu.add(attemptAbsoluteDurationMenu);
+ }
- private void initLimitConditionsMenu() {
- limitConditionsMenu = new JMenu("Limit Conditions");
+ private void initReorganizeMenus() {
+ moveUpItemMenu = new JMenuItem("Move up");
+ moveUpItemMenu.addActionListener(this);
- initAttemptLimitMenu();
- initAttemptAbsoluteDurationMenu();
+ moveDownItemMenu = new JMenuItem("Move down");
+ moveDownItemMenu.addActionListener(this);
- limitConditionsMenu.add(attemptLimitMenu);
- limitConditionsMenu.add(attemptAbsoluteDurationMenu);
- }
+ removeItemMenu = new JMenuItem("Delete");
+ removeItemMenu.addActionListener(this);
- private void initReorganizeMenus() {
- moveUpItemMenu = new JMenuItem("Move up");
- moveUpItemMenu.addActionListener(this);
+ renameItemMenu = new JMenuItem("Rename");
+ renameItemMenu.addActionListener(this);
+ }
- moveDownItemMenu = new JMenuItem("Move down");
- moveDownItemMenu.addActionListener(this);
+ private void initSummaryPageMenus() {
+ showOnSummaryPageMenuItem = new JCheckBoxMenuItem(
+ "Show on summary page", false);
+ showOnSummaryPageMenuItem.addChangeListener(this);
- removeItemMenu = new JMenuItem("Delete");
- removeItemMenu.addActionListener(this);
+ showSummaryPageMenuItem = new JCheckBoxMenuItem("Show summary page",
+ true);
+ showSummaryPageMenuItem.addChangeListener(this);
+ }
- renameItemMenu = new JMenuItem("Rename");
- renameItemMenu.addActionListener(this);
+ private boolean isAttemptAbsoluteDurationPerformed(ChangeEvent arg0) {
+ if (arg0.getSource() == attemptAbsoluteDurationNoneItemMenu
+ || arg0.getSource() == attemptAbsoluteDuration1minItemMenu
+ || arg0.getSource() == attemptAbsoluteDuration3minItemMenu
+ || arg0.getSource() == attemptAbsoluteDuration30minItemMenu
+ || arg0.getSource() == attemptAbsoluteDuration1hourItemMenu
+ || arg0.getSource() == attemptAbsoluteDuration5hourItemMenu
+ || arg0.getSource() == attemptAbsoluteDurationOtherItemMenu) {
+ return true;
}
- private void initSummaryPageMenus() {
- showOnSummaryPageMenuItem = new JCheckBoxMenuItem(
- "Show on summary page", false);
- showOnSummaryPageMenuItem.addChangeListener(this);
+ return false;
+ }
- showSummaryPageMenuItem = new JCheckBoxMenuItem("Show summary page",
- true);
- showSummaryPageMenuItem.addChangeListener(this);
+ private boolean isAttemptLimitPerformed(ChangeEvent arg0) {
+ if (arg0.getSource() == attemptLimitNoneItemMenu
+ || arg0.getSource() == attemptLimit1ItemMenu
+ || arg0.getSource() == attemptLimit3ItemMenu
+ || arg0.getSource() == attemptLimit5ItemMenu
+ || arg0.getSource() == attemptLimit10ItemMenu
+ || arg0.getSource() == attemptLimitOtherItemMenu) {
+ return true;
}
- private boolean isAttemptAbsoluteDurationPerformed(ChangeEvent arg0) {
- if (arg0.getSource() == attemptAbsoluteDurationNoneItemMenu
- || arg0.getSource() == attemptAbsoluteDuration1minItemMenu
- || arg0.getSource() == attemptAbsoluteDuration3minItemMenu
- || arg0.getSource() == attemptAbsoluteDuration30minItemMenu
- || arg0.getSource() == attemptAbsoluteDuration1hourItemMenu
- || arg0.getSource() == attemptAbsoluteDuration5hourItemMenu
- || arg0.getSource() == attemptAbsoluteDurationOtherItemMenu) {
- return true;
- }
+ return false;
+ }
- return false;
- }
+ @Override
+ public void mousePressed(java.awt.event.MouseEvent e) {
+ displayMenu(e);
+ }
- private boolean isAttemptLimitPerformed(ChangeEvent arg0) {
- if (arg0.getSource() == attemptLimitNoneItemMenu
- || arg0.getSource() == attemptLimit1ItemMenu
- || arg0.getSource() == attemptLimit3ItemMenu
- || arg0.getSource() == attemptLimit5ItemMenu
- || arg0.getSource() == attemptLimit10ItemMenu
- || arg0.getSource() == attemptLimitOtherItemMenu) {
- return true;
- }
+ @Override
+ public void mouseReleased(java.awt.event.MouseEvent e) {
+ displayMenu(e);
+ }
- return false;
+ private void prepareOrganizeMenuItems() {
+ if (manifestItem.getParent() == null) {
+ return;
}
- @Override
- public void mousePressed(java.awt.event.MouseEvent e) {
- displayMenu(e);
- }
+ int itemIndex = manifestItem.getParent().getChildIndex(manifestItem);
+ int childCount = manifestItem.getParent().getChildCount();
- @Override
- public void mouseReleased(java.awt.event.MouseEvent e) {
- displayMenu(e);
- }
+ boolean upEnabled = true;
+ boolean downEnabled = true;
- private void prepareOrganizeMenuItems() {
- if (manifestItem.getParent() == ...
[truncated message content] |
