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

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

Revision: 170
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=170&view=rev
Author:   sem62
Date:     2008-05-26 12:15:22 -0700 (Mon, 26 May 2008)

Log Message:
-----------
Added "show user answer status dialog" parameter into Settings and put checkBoxMenuItem into MainMenu.

Modified Paths:
--------------
    WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java
    WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenu.java
    WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java

Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java	2008-05-26 18:45:06 UTC (rev 169)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithApiHandle.java	2008-05-26 19:15:22 UTC (rev 170)
@@ -39,15 +39,18 @@
 	    System.out.print("Initialize(" + parameter + ");\n");
 
 	    if (!nextItemIdentifier.equals("")) {
-		Manifest manifest = SummaryPageManager.getInstance().getManifest();
-		TreeItem item = manifest.findItemByIdentifier(nextItemIdentifier);
+		Manifest manifest = SummaryPageManager.getInstance()
+			.getManifest();
+		TreeItem item = manifest
+			.findItemByIdentifier(nextItemIdentifier);
 
 		if (item != null) {
 		    GlobalStateInformation.setCurrentActivity(item);
 
-		    UserAnswerStatus answer = AnswersStatusManager.getInstance().getAnswerStatus(item);
+		    UserAnswerStatus answer = AnswersStatusManager
+			    .getInstance().getAnswerStatus(item);
 
-		    if (answer != null){
+		    if (answer != null) {
 			answer.setRawAnswer(null);
 		    }
 		}
@@ -82,20 +85,23 @@
 	String identifier = "";
 	if (currentActivity != null) {
 	    identifier = currentActivity.getIdentifier();
-	    Manifest manifest = SummaryPageManager.getInstance().getManifest();
-	    TreeItem item = manifest.findItemByIdentifier(identifier);
-	    ItemModel model = ItemModels.getModelFromItem(item);
+	    if (Settings.getInstance().isShowAnswerResultDlg()) {
+		Manifest manifest = SummaryPageManager.getInstance()
+			.getManifest();
+		TreeItem item = manifest.findItemByIdentifier(identifier);
+		ItemModel model = ItemModels.getModelFromItem(item);
 
-	    UserAnswerStatus answerStatus = AnswersStatusManager.getInstance()
-		    .getAnswerStatus(item);
+		UserAnswerStatus answerStatus = AnswersStatusManager
+			.getInstance().getAnswerStatus(item);
 
-	    if (answerStatus.getRawAnswer() != null
-		    && answerStatus.getRawAnswer().length > 0) {
-		model.showAnswerStatus(answerStatus);
+		if (answerStatus.getRawAnswer() != null
+			&& answerStatus.getRawAnswer().length > 0) {
+		    model.showAnswerStatus(answerStatus);
+		}
 	    }
+	    
+	    redirectTo(identifier);
 	}
-
-	redirectTo(identifier);
     }
 
     private void redirectTo(String identifier) {

Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenu.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenu.java	2008-05-26 18:45:06 UTC (rev 169)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/MainMenu.java	2008-05-26 19:15:22 UTC (rev 170)
@@ -3,15 +3,27 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 
 import edu.lnu.FireFly.WebEditor.Data.AnswersStatusManager;
 import edu.lnu.FireFly.WebEditor.WSClients.WebEditorServiceClient;
 
-public class MainMenu extends JMenuBar implements ActionListener {
+public class MainMenu extends JMenuBar implements ActionListener,
+	ChangeListener {
 
+    @Override
+    public void stateChanged(ChangeEvent arg0) {
+	if (arg0.getSource().equals(showUserAnswerStautsMenuItem)) {
+	    boolean selected = showUserAnswerStautsMenuItem.isSelected();
+	    Settings.getInstance().setShowAnswerResultDlg(selected);
+	}
+    }
+
     private MainMenuListenet listener = null;
     /**
      * 
@@ -48,8 +60,8 @@
 	    e.printStackTrace();
 	}
     }
-    
-    public void setListener(MainMenuListenet listener){
+
+    public void setListener(MainMenuListenet listener) {
 	this.listener = listener;
     }
 
@@ -60,9 +72,18 @@
 	JMenu editMenu = new JMenu("Edit");
 	add(editMenu);
 
+	JMenu optionMenu = new JMenu("Options");
+	add(optionMenu);
+
+	showUserAnswerStautsMenuItem = new JCheckBoxMenuItem(
+		"Show answer result dlg", Settings.getInstance()
+			.isShowAnswerResultDlg());
+	showUserAnswerStautsMenuItem.addChangeListener(this);
+	optionMenu.add(showUserAnswerStautsMenuItem);
+
 	resetMenuItem = new JMenuItem("Reset user activity");
 	resetMenuItem.addActionListener(this);
-	fileMenu.add(resetMenuItem);
+	editMenu.add(resetMenuItem);
 
 	openMenuItem = new JMenuItem("Open");
 	openMenuItem.addActionListener(this);
@@ -82,6 +103,7 @@
     protected JMenuItem openMenuItem = null;
 
     protected JMenuItem resetMenuItem = null;
+    protected JMenuItem showUserAnswerStautsMenuItem = null;
 
     protected JMenuItem saveMenuItem = null;
 

Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java	2008-05-26 18:45:06 UTC (rev 169)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/Settings.java	2008-05-26 19:15:22 UTC (rev 170)
@@ -10,6 +10,8 @@
 
     private long autoSaveInterval = 5 * 60 * 1000;
     private long nopInterval = 60 * 1000;
+    
+    private boolean showAnswerResultDlg = false;
 
     private static Settings obj = null;
 
@@ -89,4 +91,12 @@
     public void setNopInterval(long nopInterval) {
 	this.nopInterval = nopInterval;
     }
+
+    public boolean isShowAnswerResultDlg() {
+        return showAnswerResultDlg;
+    }
+
+    public void setShowAnswerResultDlg(boolean showAnswerResultDlg) {
+        this.showAnswerResultDlg = showAnswerResultDlg;
+    }
 }


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