Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [106] WebEditor/src/edu/lnu/FireFly/WebEditor
|
From: <se...@us...> - 2008-05-08 21:31:36
|
Revision: 106
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=106&view=rev
Author: sem62
Date: 2008-05-08 13:11:53 -0700 (Thu, 08 May 2008)
Log Message:
-----------
Fixed bugs at LecturePropertyDlg.
Modified Paths:
--------------
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/ItemModels/ChapterModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.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
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java 2008-05-08 19:14:26 UTC (rev 105)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java 2008-05-08 20:11:53 UTC (rev 106)
@@ -24,6 +24,7 @@
captionTextField.setText(titleTextField.getText());
}
captionTextField.setEnabled(!sameAsTitleCheckbox.isSelected());
+ editContentInHtmlBtn.setEnabled(captionTextField.isEnabled());
}
}
@@ -48,7 +49,7 @@
/** Creates new form NewJFrame */
public LecturePropertiestsDlg() {
obj = this;
-
+
initComponents();
}
@@ -62,6 +63,7 @@
}
private void initComponents() {
+ setTitle("Propertiests...");
titlePanel = new javax.swing.JPanel();
titleLabel = new javax.swing.JLabel();
titleTextField = new javax.swing.JTextField();
@@ -130,7 +132,7 @@
captionTextField, javax.swing.GroupLayout.DEFAULT_SIZE,
361, Short.MAX_VALUE).addPreferredGap(
javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(editContentInHtmlBtn)));
+ .addComponent(editContentInHtmlBtn, 30, 30, 30)));
jPanel2Layout
.setVerticalGroup(jPanel2Layout
.createParallelGroup(
@@ -149,7 +151,8 @@
.createParallelGroup(
javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(
- editContentInHtmlBtn)
+ editContentInHtmlBtn,
+ 20, 20, 20)
.addComponent(
captionTextField,
javax.swing.GroupLayout.PREFERRED_SIZE,
@@ -285,11 +288,17 @@
LecturePropertiestsDlg dlg = (LecturePropertiestsDlg) obj;
LectureModel model = new LectureModel();
- dlg.titleTextField.setText(manifestItem.getTitle());
+ String title = manifestItem.getTitle();
+ String caption = ((LectureData) model
+ .getItemData(manifestItem)).getCaption();
+
+ dlg.sameAsTitleCheckbox.setSelected(title.equals(caption));
+
+ dlg.titleTextField.setText(title);
dlg.titleTextField.selectAll();
- dlg.captionTextField.setText(((LectureData) model
- .getItemData(manifestItem)).getCaption());
+ dlg.captionTextField.setText(caption);
+
dlg.contentEditorPane.setText(((LectureData) model
.getItemData(manifestItem)).getContent());
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java 2008-05-08 19:14:26 UTC (rev 105)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java 2008-05-08 20:11:53 UTC (rev 106)
@@ -7,7 +7,6 @@
import javax.swing.JTextField;
import edu.lnu.FireFly.FFManifest.TreeItem;
-import edu.lnu.FireFly.FFManifest.item.Item;
import edu.lnu.FireFly.WebEditor.WebEditor;
public abstract class PropertyDlg extends JDialog implements ActionListener{
@@ -44,7 +43,7 @@
protected javax.swing.JButton okButton;
public void showDialog(TreeItem item) {
- manifestItem = (Item) item;
+ manifestItem = item;
obj.fillFields();
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ChapterModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ChapterModel.java 2008-05-08 19:14:26 UTC (rev 105)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ChapterModel.java 2008-05-08 20:11:53 UTC (rev 106)
@@ -14,6 +14,11 @@
public class ChapterModel extends ResourcedItemModel {
@Override
+ protected String getDefaultTitle() {
+ return "New chapter";
+ }
+
+ @Override
public boolean getLimitConditionsMenuVisible() {
return false;
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-08 19:14:26 UTC (rev 105)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-08 20:11:53 UTC (rev 106)
@@ -19,6 +19,8 @@
protected String modelName = "Abstract model";
+ protected abstract String getDefaultTitle();
+
public void setItemData(TreeItem anItem, ItemData data) {
questionsData.put(anItem, data);
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-08 19:14:26 UTC (rev 105)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-08 20:11:53 UTC (rev 106)
@@ -18,6 +18,11 @@
public class LectureModel extends ResourcedItemModel {
@Override
+ protected String getDefaultTitle() {
+ return "New lecture";
+ }
+
+ @Override
public boolean getShowSummaryPageMenuVisible() {
return false;
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-08 19:14:26 UTC (rev 105)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-08 20:11:53 UTC (rev 106)
@@ -23,7 +23,7 @@
item.identifier = this.getClass().getSimpleName() + "_Item_"
+ UUID.randomUUID().toString();
- item.title = "New " + modelName;
+ item.title = getDefaultTitle();
item.parameters = "pageType=" + modelName;
item.identifierref = createNewResource();
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-08 19:14:26 UTC (rev 105)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-08 20:11:53 UTC (rev 106)
@@ -20,6 +20,11 @@
public class SimpleQuestionModel extends ResourcedItemModel {
@Override
+ protected String getDefaultTitle() {
+ return "New simple question";
+ }
+
+ @Override
public boolean getLimitConditionsMenuVisible() {
return true;
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-08 19:14:26 UTC (rev 105)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-08 20:11:53 UTC (rev 106)
@@ -20,6 +20,11 @@
public class SummaryPageModel extends ResourcedItemModel {
@Override
+ protected String getDefaultTitle() {
+ return "New summary page";
+ }
+
+ @Override
public boolean getLimitConditionsMenuVisible() {
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
