[Acmcontester-developers] SF.net SVN: acmcontester: [127] WebEditor

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

Revision: 127
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=127&view=rev
Author:   sem62
Date:     2008-05-10 14:00:12 -0700 (Sat, 10 May 2008)

Log Message:
-----------
fixed bug with "same as title" at SimpleQuestion property dialog.

Modified Paths:
--------------
    WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java
    WebEditor/template/SimpleQuestionModel.conf

Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java	2008-05-10 20:48:29 UTC (rev 126)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java	2008-05-10 21:00:12 UTC (rev 127)
@@ -9,6 +9,7 @@
 import javax.swing.table.DefaultTableColumnModel;
 
 import edu.lnu.FireFly.WebEditor.ItemModels.SimpleQuestion.SimpleQuestionAnswersDataModel;
+import edu.lnu.FireFly.WebEditor.ItemModels.SimpleQuestion.SimpleQuestionData;
 import edu.lnu.FireFly.WebEditor.ItemModels.SimpleQuestion.SimpleQuestionModel;
 
 /**
@@ -445,12 +446,17 @@
 
 		manifestItem.setTitle(titleTextField.getText());
 
-		itemModel.getData(manifestItem).setCaption(captionTextField.getText());
+		SimpleQuestionData data = itemModel.getData(manifestItem);
 
-		itemModel.getData(manifestItem)
-				.setQuestion(questionTextField.getText());
+		if (sameAsTitleCheckBox.isSelected()){
+			data.setCaption(titleTextField.getText());
+		} else {
+			data.setCaption(captionTextField.getText());
+		}
 
-		itemModel.getData(manifestItem).setAnswers(
+		data.setQuestion(questionTextField.getText());
+
+		data.setAnswers(
 				simpleQuestionAnswersDataModel);
 
 		itemModel.updateItemResource(manifestItem, true);

Modified: WebEditor/template/SimpleQuestionModel.conf
===================================================================
--- WebEditor/template/SimpleQuestionModel.conf	2008-05-10 20:48:29 UTC (rev 126)
+++ WebEditor/template/SimpleQuestionModel.conf	2008-05-10 21:00:12 UTC (rev 127)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SimpleQuestion>
-<caption>New caption</caption>
+<caption>New simple question</caption>
 <question>Answer "Yes" to question, please.</question>
 <ShowOnSummaryPage>true</ShowOnSummaryPage>
 <answers singleVariant="false">


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