Menu
▾
▴
[Acmcontester-developers] SF.net SVN: acmcontester: [147] WebEditor/src/edu/lnu/FireFly/WebEditor
|
From: <se...@us...> - 2008-05-20 15:56:15
|
Revision: 147
http://acmcontester.svn.sourceforge.net/acmcontester/?rev=147&view=rev
Author: sem62
Date: 2008-05-20 08:54:30 -0700 (Tue, 20 May 2008)
Log Message:
-----------
* Creating method registerPropertyDlg(PropertyDlg dlg). It must be called from constructor of current model or somethig else.
It must set an instance of property dialog for this model.
* remove all methods Configure because they was the same.
* Deleted all constructors from subclasses of PropertyDlg and added the same constructor to they parent class.
Modified Paths:
--------------
WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.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/LecturePropertiestsDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.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/SimpleQuestion/SimpleQuestionModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/CourseTree.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -29,6 +29,7 @@
}
public CourseTree(TreeDataModel dataModel, AppletContext appletContext) {
+ super(dataModel);
this.appletContext = appletContext;
this.addTreeSelectionListener(this);
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/ChapterPropertiestsDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/ChapterPropertiestsDlg.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/ChapterPropertiestsDlg.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -16,569 +16,566 @@
*/
public class ChapterPropertiestsDlg extends PropertyDlg implements ItemListener {
- /**
- *
- */
- private static final long serialVersionUID = -4476966699237610316L;
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4476966699237610316L;
- private javax.swing.JCheckBox flowCheckBox;
- private javax.swing.JCheckBox choiceCheckBox;
- private javax.swing.JCheckBox choiceExitCheckBox;
- private javax.swing.JCheckBox forwarOnlyCheckBox;
- private javax.swing.JComboBox configurationComboBox;
- private javax.swing.JLabel titleLabel;
- private javax.swing.JLabel jLabel2;
- private javax.swing.JLabel jLabel3;
- private javax.swing.JLabel jLabel4;
- private javax.swing.JLabel jLabel5;
- private javax.swing.JLabel jLabel6;
- private javax.swing.JPanel generalPanel;
- private javax.swing.JPanel controlModesPanel;
- private javax.swing.JPanel jPanel3;
- private javax.swing.JPanel jPanel4;
- private javax.swing.JPanel jPanel5;
- private javax.swing.JPanel jPanel6;
- private javax.swing.JTextField titleTextField;
+ private javax.swing.JCheckBox flowCheckBox;
+ private javax.swing.JCheckBox choiceCheckBox;
+ private javax.swing.JCheckBox choiceExitCheckBox;
+ private javax.swing.JCheckBox forwarOnlyCheckBox;
+ private javax.swing.JComboBox configurationComboBox;
+ private javax.swing.JLabel titleLabel;
+ private javax.swing.JLabel jLabel2;
+ private javax.swing.JLabel jLabel3;
+ private javax.swing.JLabel jLabel4;
+ private javax.swing.JLabel jLabel5;
+ private javax.swing.JLabel jLabel6;
+ private javax.swing.JPanel generalPanel;
+ private javax.swing.JPanel controlModesPanel;
+ private javax.swing.JPanel jPanel3;
+ private javax.swing.JPanel jPanel4;
+ private javax.swing.JPanel jPanel5;
+ private javax.swing.JPanel jPanel6;
+ private javax.swing.JTextField titleTextField;
- /** Creates new form ChapterPropertiests */
- public ChapterPropertiestsDlg() {
- obj = this;
+ protected void initComponents() {
+ setDefaultCloseOperation(HIDE_ON_CLOSE);
+ setTitle("Propertiests...");
- initComponents();
- }
+ generalPanel = new javax.swing.JPanel();
+ titleLabel = new javax.swing.JLabel();
+ titleTextField = new javax.swing.JTextField();
+ controlModesPanel = new javax.swing.JPanel();
+ jPanel3 = new javax.swing.JPanel();
+ flowCheckBox = new javax.swing.JCheckBox();
+ jLabel2 = new javax.swing.JLabel();
+ jPanel4 = new javax.swing.JPanel();
+ choiceCheckBox = new javax.swing.JCheckBox();
+ jLabel3 = new javax.swing.JLabel();
+ jPanel5 = new javax.swing.JPanel();
+ choiceExitCheckBox = new javax.swing.JCheckBox();
+ jLabel4 = new javax.swing.JLabel();
+ jPanel6 = new javax.swing.JPanel();
+ forwarOnlyCheckBox = new javax.swing.JCheckBox();
+ jLabel5 = new javax.swing.JLabel();
+ jLabel6 = new javax.swing.JLabel();
- private void initComponents() {
- setDefaultCloseOperation(HIDE_ON_CLOSE);
- setTitle("Propertiests...");
+ configurationComboBox = new javax.swing.JComboBox();
+ configurationComboBox.addItemListener(this);
- generalPanel = new javax.swing.JPanel();
- titleLabel = new javax.swing.JLabel();
- titleTextField = new javax.swing.JTextField();
- controlModesPanel = new javax.swing.JPanel();
- jPanel3 = new javax.swing.JPanel();
- flowCheckBox = new javax.swing.JCheckBox();
- jLabel2 = new javax.swing.JLabel();
- jPanel4 = new javax.swing.JPanel();
- choiceCheckBox = new javax.swing.JCheckBox();
- jLabel3 = new javax.swing.JLabel();
- jPanel5 = new javax.swing.JPanel();
- choiceExitCheckBox = new javax.swing.JCheckBox();
- jLabel4 = new javax.swing.JLabel();
- jPanel6 = new javax.swing.JPanel();
- forwarOnlyCheckBox = new javax.swing.JCheckBox();
- jLabel5 = new javax.swing.JLabel();
- jLabel6 = new javax.swing.JLabel();
+ cancelButton = new javax.swing.JButton("Cancel");
+ okButton = new javax.swing.JButton("Ok");
+ okButton.addActionListener(this);
+ cancelButton.addActionListener(this);
- configurationComboBox = new javax.swing.JComboBox();
- configurationComboBox.addItemListener(this);
+ cancelButton.setPreferredSize(new java.awt.Dimension(65, 23));
+ okButton.setPreferredSize(new java.awt.Dimension(65, 23));
- cancelButton = new javax.swing.JButton("Cancel");
- okButton = new javax.swing.JButton("Ok");
- okButton.addActionListener(this);
- cancelButton.addActionListener(this);
+ setName("Propertiests...");
- cancelButton.setPreferredSize(new java.awt.Dimension(65, 23));
- okButton.setPreferredSize(new java.awt.Dimension(65, 23));
+ generalPanel.setBorder(javax.swing.BorderFactory
+ .createTitledBorder("General"));
+ titleLabel.setText("Title");
- setName("Propertiests...");
-
- generalPanel.setBorder(javax.swing.BorderFactory
- .createTitledBorder("General"));
- titleLabel.setText("Title");
-
- javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(
- generalPanel);
- generalPanel.setLayout(jPanel1Layout);
- jPanel1Layout
- .setHorizontalGroup(jPanel1Layout
- .createParallelGroup(
+ javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(
+ generalPanel);
+ generalPanel.setLayout(jPanel1Layout);
+ jPanel1Layout
+ .setHorizontalGroup(jPanel1Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ jPanel1Layout
+ .createSequentialGroup()
+ .addContainerGap()
+ .addGroup(
+ jPanel1Layout
+ .createParallelGroup(
javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
+ .addComponent(
+ titleTextField,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ 588,
+ Short.MAX_VALUE)
+ .addGroup(
jPanel1Layout
- .createSequentialGroup()
- .addContainerGap()
- .addGroup(
- jPanel1Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(
- titleTextField,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- 588,
- Short.MAX_VALUE)
- .addGroup(
- jPanel1Layout
- .createSequentialGroup()
- .addComponent(
- titleLabel)
- .addContainerGap(
- 568,
- Short.MAX_VALUE)
- ))
- .addContainerGap()));
- jPanel1Layout
- .setVerticalGroup(jPanel1Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- jPanel1Layout
- .createSequentialGroup()
- .addComponent(titleLabel)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(
- titleTextField,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap()));
+ .createSequentialGroup()
+ .addComponent(
+ titleLabel)
+ .addContainerGap(
+ 568,
+ Short.MAX_VALUE)))
+ .addContainerGap()));
+ jPanel1Layout
+ .setVerticalGroup(jPanel1Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ jPanel1Layout
+ .createSequentialGroup()
+ .addComponent(titleLabel)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(
+ titleTextField,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap()));
- controlModesPanel.setBorder(javax.swing.BorderFactory
- .createTitledBorder("Control modes"));
+ controlModesPanel.setBorder(javax.swing.BorderFactory
+ .createTitledBorder("Control modes"));
- jPanel3.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+ jPanel3.setBorder(javax.swing.BorderFactory.createEtchedBorder());
- flowCheckBox.setText("Flow");
+ flowCheckBox.setText("Flow");
- jLabel2
- .setText("Indicates the flow sequencing requests is permitted to the children of this activity."); // NOI18N
+ jLabel2
+ .setText("Indicates the flow sequencing requests is permitted to the children of this activity."); // NOI18N
- javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(
- jPanel3);
- jPanel3.setLayout(jPanel3Layout);
- jPanel3Layout
- .setHorizontalGroup(jPanel3Layout
- .createParallelGroup(
+ javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(
+ jPanel3);
+ jPanel3.setLayout(jPanel3Layout);
+ jPanel3Layout
+ .setHorizontalGroup(jPanel3Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ jPanel3Layout
+ .createSequentialGroup()
+ .addContainerGap()
+ .addGroup(
+ jPanel3Layout
+ .createParallelGroup(
javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- jPanel3Layout
- .createSequentialGroup()
- .addContainerGap()
- .addGroup(
- jPanel3Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(
- flowCheckBox)
- .addComponent(jLabel2))
- .addContainerGap(180, Short.MAX_VALUE)));
- jPanel3Layout
- .setVerticalGroup(jPanel3Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- jPanel3Layout
- .createSequentialGroup()
- .addContainerGap(
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE)
- .addComponent(flowCheckBox)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jLabel2)));
+ .addComponent(
+ flowCheckBox)
+ .addComponent(jLabel2))
+ .addContainerGap(180, Short.MAX_VALUE)));
+ jPanel3Layout
+ .setVerticalGroup(jPanel3Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ jPanel3Layout
+ .createSequentialGroup()
+ .addContainerGap(
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)
+ .addComponent(flowCheckBox)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel2)));
- jPanel4.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+ jPanel4.setBorder(javax.swing.BorderFactory.createEtchedBorder());
- choiceCheckBox.setText("Choice");
+ choiceCheckBox.setText("Choice");
- jLabel3
- .setText("Indicates that a choice sequencing request is permitted to target the children of the activity."); // NOI18N
+ jLabel3
+ .setText("Indicates that a choice sequencing request is permitted to target the children of the activity."); // NOI18N
- javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(
- jPanel4);
- jPanel4.setLayout(jPanel4Layout);
- jPanel4Layout
- .setHorizontalGroup(jPanel4Layout
- .createParallelGroup(
+ javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(
+ jPanel4);
+ jPanel4.setLayout(jPanel4Layout);
+ jPanel4Layout
+ .setHorizontalGroup(jPanel4Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ jPanel4Layout
+ .createSequentialGroup()
+ .addContainerGap()
+ .addGroup(
+ jPanel4Layout
+ .createParallelGroup(
javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- jPanel4Layout
- .createSequentialGroup()
- .addContainerGap()
- .addGroup(
- jPanel4Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(
- choiceCheckBox)
- .addComponent(jLabel3))
- .addContainerGap(130, Short.MAX_VALUE)));
- jPanel4Layout
- .setVerticalGroup(jPanel4Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- jPanel4Layout
- .createSequentialGroup()
- .addContainerGap()
- .addComponent(choiceCheckBox)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jLabel3).addContainerGap(
- 3, Short.MAX_VALUE)));
+ .addComponent(
+ choiceCheckBox)
+ .addComponent(jLabel3))
+ .addContainerGap(130, Short.MAX_VALUE)));
+ jPanel4Layout
+ .setVerticalGroup(jPanel4Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ jPanel4Layout
+ .createSequentialGroup()
+ .addContainerGap()
+ .addComponent(choiceCheckBox)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel3).addContainerGap(
+ 3, Short.MAX_VALUE)));
- jPanel5.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+ jPanel5.setBorder(javax.swing.BorderFactory.createEtchedBorder());
- choiceExitCheckBox.setText("Choice exit");
+ choiceExitCheckBox.setText("Choice exit");
- jLabel4
- .setText("Indicates that an active child of this activity is permitted to terminate if a choice sequencing request is processed."); // NOI18N
+ jLabel4
+ .setText("Indicates that an active child of this activity is permitted to terminate if a choice sequencing request is processed."); // NOI18N
- javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(
- jPanel5);
- jPanel5.setLayout(jPanel5Layout);
- jPanel5Layout
- .setHorizontalGroup(jPanel5Layout
- .createParallelGroup(
+ javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(
+ jPanel5);
+ jPanel5.setLayout(jPanel5Layout);
+ jPanel5Layout
+ .setHorizontalGroup(jPanel5Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ jPanel5Layout
+ .createSequentialGroup()
+ .addContainerGap()
+ .addGroup(
+ jPanel5Layout
+ .createParallelGroup(
javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- jPanel5Layout
- .createSequentialGroup()
- .addContainerGap()
- .addGroup(
- jPanel5Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(
- choiceExitCheckBox)
- .addComponent(jLabel4))
- .addContainerGap(30, Short.MAX_VALUE)));
- jPanel5Layout
- .setVerticalGroup(jPanel5Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- jPanel5Layout
- .createSequentialGroup()
- .addContainerGap(
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE)
- .addComponent(choiceExitCheckBox)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jLabel4)));
+ .addComponent(
+ choiceExitCheckBox)
+ .addComponent(jLabel4))
+ .addContainerGap(30, Short.MAX_VALUE)));
+ jPanel5Layout
+ .setVerticalGroup(jPanel5Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ jPanel5Layout
+ .createSequentialGroup()
+ .addContainerGap(
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)
+ .addComponent(choiceExitCheckBox)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel4)));
- jPanel6.setBorder(javax.swing.BorderFactory.createEtchedBorder());
- forwarOnlyCheckBox.setText("Forward only");
- jLabel5
- .setText("Indicates that backward targets (in terms of activity tree traversal) are not permitted for the children of this activity. ");
+ jPanel6.setBorder(javax.swing.BorderFactory.createEtchedBorder());
+ forwarOnlyCheckBox.setText("Forward only");
+ jLabel5
+ .setText("Indicates that backward targets (in terms of activity tree traversal) are not permitted for the children of this activity. ");
- javax.swing.GroupLayout jPanel6Layout = new javax.swing.GroupLayout(
- jPanel6);
- jPanel6.setLayout(jPanel6Layout);
- jPanel6Layout
- .setHorizontalGroup(jPanel6Layout
- .createParallelGroup(
+ javax.swing.GroupLayout jPanel6Layout = new javax.swing.GroupLayout(
+ jPanel6);
+ jPanel6.setLayout(jPanel6Layout);
+ jPanel6Layout
+ .setHorizontalGroup(jPanel6Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ jPanel6Layout
+ .createSequentialGroup()
+ .addContainerGap()
+ .addGroup(
+ jPanel6Layout
+ .createParallelGroup(
javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- jPanel6Layout
- .createSequentialGroup()
- .addContainerGap()
- .addGroup(
- jPanel6Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(
- forwarOnlyCheckBox)
- .addComponent(jLabel5))
- .addContainerGap(
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE)));
- jPanel6Layout
- .setVerticalGroup(jPanel6Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- jPanel6Layout
- .createSequentialGroup()
- .addContainerGap()
- .addComponent(forwarOnlyCheckBox)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jLabel5)
- ));
+ .addComponent(
+ forwarOnlyCheckBox)
+ .addComponent(jLabel5))
+ .addContainerGap(
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)));
+ jPanel6Layout
+ .setVerticalGroup(jPanel6Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ jPanel6Layout
+ .createSequentialGroup()
+ .addContainerGap()
+ .addComponent(forwarOnlyCheckBox)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel5)));
- configurationComboBox.setModel(new javax.swing.DefaultComboBoxModel(
- new String[] { "User defined", "Lecture materials",
- "Examinations materials" }));
- jLabel6.setText("Choose configuration");
+ configurationComboBox.setModel(new javax.swing.DefaultComboBoxModel(
+ new String[] { "User defined", "Lecture materials",
+ "Examinations materials" }));
+ jLabel6.setText("Choose configuration");
- javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(
- controlModesPanel);
- controlModesPanel.setLayout(jPanel2Layout);
- jPanel2Layout.setHorizontalGroup(jPanel2Layout.createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING).addGroup(
- jPanel2Layout.createSequentialGroup()
- .addContainerGap().addGroup(
- jPanel2Layout.createParallelGroup(
+ javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(
+ controlModesPanel);
+ controlModesPanel.setLayout(jPanel2Layout);
+ jPanel2Layout
+ .setHorizontalGroup(jPanel2Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ jPanel2Layout
+ .createSequentialGroup()
+ .addContainerGap()
+ .addGroup(
+ jPanel2Layout
+ .createParallelGroup(
javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jPanel6,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE).addComponent(jPanel5,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE).addComponent(jPanel4,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE).addComponent(jPanel3,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE).addComponent(
- configurationComboBox, 0, 588,
- Short.MAX_VALUE).addComponent(jLabel6))
- .addContainerGap()));
- jPanel2Layout
- .setVerticalGroup(jPanel2Layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- javax.swing.GroupLayout.Alignment.TRAILING,
- jPanel2Layout
- .createSequentialGroup()
- .addComponent(jLabel6)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE)
- .addComponent(
- configurationComboBox,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(
- jPanel3,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(
- jPanel4,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- 53,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(
- jPanel5,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(
- jPanel6,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(10, Short.MAX_VALUE)
- ));
+ .addComponent(
+ jPanel6,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)
+ .addComponent(
+ jPanel5,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)
+ .addComponent(
+ jPanel4,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)
+ .addComponent(
+ jPanel3,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)
+ .addComponent(
+ configurationComboBox,
+ 0, 588,
+ Short.MAX_VALUE)
+ .addComponent(jLabel6))
+ .addContainerGap()));
+ jPanel2Layout
+ .setVerticalGroup(jPanel2Layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ javax.swing.GroupLayout.Alignment.TRAILING,
+ jPanel2Layout
+ .createSequentialGroup()
+ .addComponent(jLabel6)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)
+ .addComponent(
+ configurationComboBox,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(
+ jPanel3,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(
+ jPanel4,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ 53,
+ javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(
+ jPanel5,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(
+ jPanel6,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(10, Short.MAX_VALUE)));
- javax.swing.GroupLayout layout = new javax.swing.GroupLayout(
- getContentPane());
- getContentPane().setLayout(layout);
- layout
- .setHorizontalGroup(layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- javax.swing.GroupLayout.Alignment.TRAILING,
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(
+ getContentPane());
+ getContentPane().setLayout(layout);
+ layout
+ .setHorizontalGroup(layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ javax.swing.GroupLayout.Alignment.TRAILING,
+ layout
+ .createSequentialGroup()
+ .addContainerGap()
+ .addGroup(
+ layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(
+ controlModesPanel,
+ javax.swing.GroupLayout.Alignment.LEADING,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)
+ .addComponent(
+ generalPanel,
+ javax.swing.GroupLayout.Alignment.LEADING,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)
+ .addGroup(
layout
- .createSequentialGroup()
- .addContainerGap()
- .addGroup(
- layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(
- controlModesPanel,
- javax.swing.GroupLayout.Alignment.LEADING,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE)
- .addComponent(
- generalPanel,
- javax.swing.GroupLayout.Alignment.LEADING,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE)
- .addGroup(
- layout
- .createSequentialGroup()
- .addComponent(
- okButton,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- 86,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(
- cancelButton,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- 91,
- javax.swing.GroupLayout.PREFERRED_SIZE)))
- .addContainerGap()));
- layout
- .setVerticalGroup(layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(
- layout
- .createSequentialGroup()
- .addContainerGap()
- .addComponent(
- generalPanel,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(
- controlModesPanel,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(
- javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(
- layout
- .createParallelGroup(
- javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(
- okButton,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(
- cancelButton,
- javax.swing.GroupLayout.PREFERRED_SIZE,
- javax.swing.GroupLayout.DEFAULT_SIZE,
- javax.swing.GroupLayout.PREFERRED_SIZE))
- .addContainerGap(
- javax.swing.GroupLayout.DEFAULT_SIZE,
- Short.MAX_VALUE)));
+ .createSequentialGroup()
+ .addComponent(
+ okButton,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ 86,
+ javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(
+ cancelButton,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ 91,
+ javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addContainerGap()));
+ layout
+ .setVerticalGroup(layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(
+ layout
+ .createSequentialGroup()
+ .addContainerGap()
+ .addComponent(
+ generalPanel,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(
+ controlModesPanel,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(
+ javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(
+ layout
+ .createParallelGroup(
+ javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(
+ okButton,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(
+ cancelButton,
+ javax.swing.GroupLayout.PREFERRED_SIZE,
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap(
+ javax.swing.GroupLayout.DEFAULT_SIZE,
+ Short.MAX_VALUE)));
- this.getRootPane().setDefaultButton(okButton);
- pack();
- }
+ this.getRootPane().setDefaultButton(okButton);
+ pack();
+ }
- @Override
- public void itemStateChanged(ItemEvent arg0) {
- if (arg0.getStateChange() == ItemEvent.SELECTED) {
- ChapterPropertiestsDlg dlg = (ChapterPropertiestsDlg) obj;
+ @Override
+ public void itemStateChanged(ItemEvent arg0) {
+ if (arg0.getStateChange() == ItemEvent.SELECTED) {
+ switch (configurationComboBox.getSelectedIndex()) {
+ case 0:
+ flowCheckBox.setSelected(false);
+ choiceCheckBox.setSelected(true);
+ forwarOnlyCheckBox.setSelected(false);
+ choiceExitCheckBox.setSelected(true);
- switch (configurationComboBox.getSelectedIndex()) {
- case 0:
- dlg.flowCheckBox.setSelected(false);
- dlg.choiceCheckBox.setSelected(true);
- dlg.forwarOnlyCheckBox.setSelected(false);
- dlg.choiceExitCheckBox.setSelected(true);
+ flowCheckBox.setEnabled(true);
+ choiceCheckBox.setEnabled(true);
+ forwarOnlyCheckBox.setEnabled(true);
+ choiceExitCheckBox.setEnabled(true);
- dlg.flowCheckBox.setEnabled(true);
- dlg.choiceCheckBox.setEnabled(true);
- dlg.forwarOnlyCheckBox.setEnabled(true);
- dlg.choiceExitCheckBox.setEnabled(true);
+ break;
+ case 1:
+ flowCheckBox.setSelected(true);
+ choiceCheckBox.setSelected(true);
+ forwarOnlyCheckBox.setSelected(false);
+ choiceExitCheckBox.setSelected(true);
- break;
- case 1:
- dlg.flowCheckBox.setSelected(true);
- dlg.choiceCheckBox.setSelected(true);
- dlg.forwarOnlyCheckBox.setSelected(false);
- dlg.choiceExitCheckBox.setSelected(true);
+ flowCheckBox.setEnabled(false);
+ choiceCheckBox.setEnabled(false);
+ forwarOnlyCheckBox.setEnabled(false);
+ choiceExitCheckBox.setEnabled(false);
- dlg.flowCheckBox.setEnabled(false);
- dlg.choiceCheckBox.setEnabled(false);
- dlg.forwarOnlyCheckBox.setEnabled(false);
- dlg.choiceExitCheckBox.setEnabled(false);
+ break;
+ case 2:
+ flowCheckBox.setSelected(true);
+ choiceCheckBox.setSelected(false);
+ forwarOnlyCheckBox.setSelected(true);
+ choiceExitCheckBox.setSelected(false);
- break;
- case 2:
- dlg.flowCheckBox.setSelected(true);
- dlg.choiceCheckBox.setSelected(false);
- dlg.forwarOnlyCheckBox.setSelected(true);
- dlg.choiceExitCheckBox.setSelected(false);
+ flowCheckBox.setEnabled(false);
+ choiceCheckBox.setEnabled(false);
+ forwarOnlyCheckBox.setEnabled(false);
+ choiceExitCheckBox.setEnabled(false);
- dlg.flowCheckBox.setEnabled(false);
- dlg.choiceCheckBox.setEnabled(false);
- dlg.forwarOnlyCheckBox.setEnabled(false);
- dlg.choiceExitCheckBox.setEnabled(false);
-
- break;
- }
- }
+ break;
+ }
}
+ }
- @Override
- protected void fillFields() {
- ChapterPropertiestsDlg dlg = (ChapterPropertiestsDlg) obj;
+ @Override
+ protected void fillFields() {
+ titleTextField.setText(manifestItem.getTitle());
+ titleTextField.selectAll();
- dlg.titleTextField.setText(manifestItem.getTitle());
- dlg.titleTextField.selectAll();
+ Sequencing sequencing = null;
+ if (manifestItem.getClass() == Item.class) {
+ sequencing = ((Item) manifestItem).sequencing;
+ }
- Sequencing sequencing = null;
- if (manifestItem.getClass() == Item.class) {
- sequencing = ((Item) manifestItem).sequencing;
- }
+ if (manifestItem.getClass() == Organization.class) {
+ sequencing = ((Organization) manifestItem).sequencing;
+ }
- if (manifestItem.getClass() == Organization.class) {
- sequencing = ((Organization) manifestItem).sequencing;
- }
-
- if (sequencing != null && sequencing.controlMode != null) {
- dlg.flowCheckBox.setSelected(sequencing.controlMode.flow);
- dlg.choiceCheckBox.setSelected(sequencing.controlMode.choice);
- dlg.forwarOnlyCheckBox
- .setSelected(sequencing.controlMode.forwardOnly);
- dlg.choiceExitCheckBox
- .setSelected(sequencing.controlMode.choiceExit);
- } else {
- dlg.flowCheckBox.setSelected(false);
- dlg.choiceCheckBox.setSelected(true);
- dlg.forwarOnlyCheckBox.setSelected(false);
- dlg.choiceExitCheckBox.setSelected(true);
- }
+ if (sequencing != null && sequencing.controlMode != null) {
+ flowCheckBox.setSelected(sequencing.controlMode.flow);
+ choiceCheckBox.setSelected(sequencing.controlMode.choice);
+ forwarOnlyCheckBox.setSelected(sequencing.controlMode.forwardOnly);
+ choiceExitCheckBox.setSelected(sequencing.controlMode.choiceExit);
+ } else {
+ flowCheckBox.setSelected(false);
+ choiceCheckBox.setSelected(true);
+ forwarOnlyCheckBox.setSelected(false);
+ choiceExitCheckBox.setSelected(true);
}
+ }
- @Override
- protected void saveChanges() {
- ChapterPropertiestsDlg dlg = (ChapterPropertiestsDlg) obj;
+ @Override
+ protected void saveChanges() {
+ manifestItem.setTitle(titleTextField.getText());
- manifestItem.setTitle(dlg.titleTextField.getText());
+ Sequencing sequencing = null;
+ if (manifestItem.getClass() == Item.class) {
+ sequencing = ((Item) manifestItem).sequencing;
- Sequencing sequencing = null;
- if (manifestItem.getClass() == Item.class) {
- sequencing = ((Item) manifestItem).sequencing;
+ if (sequencing == null) {
+ sequencing = new Sequencing();
+ ((Item) manifestItem).sequencing = sequencing;
+ }
+ }
- if (sequencing == null) {
- sequencing = new Sequencing();
- ((Item) manifestItem).sequencing = sequencing;
- }
- }
+ if (manifestItem.getClass() == Organization.class) {
+ sequencing = ((Organization) manifestItem).sequencing;
+ if (sequencing == null) {
+ sequencing = new Sequencing();
+ ((Organization) manifestItem).sequencing = sequencing;
+ }
+ }
- if (manifestItem.getClass() == Organization.class) {
- sequencing = ((Organization) manifestItem).sequencing;
- if (sequencing == null) {
- sequencing = new Sequencing();
- ((Organization) manifestItem).sequencing = sequencing;
- }
- }
+ if (sequencing.controlMode == null) {
+ sequencing.controlMode = new ControlMode();
+ }
- if (sequencing.controlMode == null) {
- sequencing.controlMode = new ControlMode();
- }
+ sequencing.controlMode.flow = flowCheckBox.isSelected();
+ sequencing.controlMode.choice = choiceCheckBox.isSelected();
+ sequencing.controlMode.forwardOnly = forwarOnlyCheckBox.isSelected();
+ sequencing.controlMode.choiceExit = choiceExitCheckBox.isSelected();
- sequencing.controlMode.flow = dlg.flowCheckBox.isSelected();
- sequencing.controlMode.choice = dlg.choiceCheckBox.isSelected();
- sequencing.controlMode.forwardOnly = dlg.forwarOnlyCheckBox
- .isSelected();
- sequencing.controlMode.choiceExit = dlg.choiceExitCheckBox.isSelected();
+ setVisible(false);
- obj.setVisible(false);
-
- ((ResourcedItemModel) ItemModels.getModelFromItem(manifestItem))
- .updateItemResource(manifestItem, true);
- }
+ ((ResourcedItemModel) ItemModels.getModelFromItem(manifestItem))
+ .updateItemResource(manifestItem, true);
+ }
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/CompileQ/CompileQPropertiestsDlg.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -52,12 +52,6 @@
private MultiLineTableCellEditor multiLineTableCellEditor = new MultiLineTableCellEditor();
private PartAttributesCellEditor partAttributesCellEditor = new PartAttributesCellEditor();
- public CompileQPropertiestsDlg() {
- obj = this;
-
- initComponents();
- }
-
@Override
public void actionPerformed(ActionEvent arg0) {
super.actionPerformed(arg0);
@@ -168,28 +162,27 @@
@Override
protected void fillFields() {
- CompileQPropertiestsDlg dlg = (CompileQPropertiestsDlg) obj;
- dlg.titleTextField.setText(manifestItem.getTitle());
+ titleTextField.setText(manifestItem.getTitle());
CompileQModel itemModel = new CompileQModel();
- dlg.captionTextField.setText(itemModel.getData(manifestItem)
+ captionTextField.setText(itemModel.getData(manifestItem)
.getCaption());
- dlg.sameAsTitleCheckBox.setSelected(dlg.titleTextField.getText()
- .equals(dlg.captionTextField.getText()));
+ sameAsTitleCheckBox.setSelected(titleTextField.getText()
+ .equals(captionTextField.getText()));
- dlg.compileQTableDataModel = itemModel.getData(manifestItem).getParts();
+ compileQTableDataModel = itemModel.getData(manifestItem).getParts();
- dlg.programmingLanguage.addItem("Any");
- dlg.programmingLanguage.addItem("C++");
- dlg.programmingLanguage.addItem("Pascal");
+ programmingLanguage.addItem("Any");
+ programmingLanguage.addItem("C++");
+ programmingLanguage.addItem("Pascal");
- dlg.programmingLanguage.setSelectedItem(itemModel.getData(manifestItem).getLanguge());
+ programmingLanguage.setSelectedItem(itemModel.getData(manifestItem).getLanguge());
- dlg.partsTable.setModel(dlg.compileQTableDataModel);
+ partsTable.setModel(compileQTableDataModel);
- DefaultTableColumnModel columnModel = (DefaultTableColumnModel) dlg.partsTable
+ DefaultTableColumnModel columnModel = (DefaultTableColumnModel) partsTable
.getColumnModel();
columnModel.getColumn(1).setCellEditor(multiLineTableCellEditor);
@@ -205,7 +198,7 @@
columnModel.getColumn(2).setMinWidth(100);
columnModel.getColumn(2).setResizable(false);
- dlg.titleTextField.selectAll();
+ titleTextField.selectAll();
}
@Override
@@ -217,7 +210,7 @@
partsTable.getModel().setValueAt(text, selectedRow, 1);
}
- private void initComponents() {
+ protected void initComponents() {
setTitle("Propertiests...");
generalPanel = new javax.swing.JPanel();
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -49,13 +49,6 @@
private JLabel titleLabel;
- /** Creates new form NewJFrame */
- public LecturePropertiestsDlg() {
- obj = this;
-
- initComponents();
- }
-
@Override
public void actionPerformed(ActionEvent arg0) {
super.actionPerformed(arg0);
@@ -69,7 +62,7 @@
}
}
- private void initComponents() {
+ protected void initComponents() {
setTitle("Propertiests...");
titlePanel = new javax.swing.JPanel();
titleLabel = new JLabel("Title");
@@ -380,21 +373,20 @@
@Override
protected void fillFields() {
- LecturePropertiestsDlg dlg = (LecturePropertiestsDlg) obj;
LectureModel model = new LectureModel();
String title = manifestItem.getTitle();
String caption = ((LectureData) model.getItemData(manifestItem))
.getCaption();
- dlg.sameAsTitleCheckbox.setSelected(title.equals(caption));
+ sameAsTitleCheckbox.setSelected(title.equals(caption));
- dlg.titleTextField.setText(title);
- dlg.titleTextField.selectAll();
+ titleTextField.setText(title);
+ titleTextField.selectAll();
- dlg.captionTextField.setText(caption);
+ captionTextField.setText(caption);
- dlg.contentEditorPane.setText(((LectureData) model
+ 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-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -15,24 +15,28 @@
*/
private static final long serialVersionUID = -6002603750731392120L;
+ public PropertyDlg(){
+ initComponents();
+ }
+
protected void editTextFieldInHtmlEditor(JTextComponent textComponent) {
WebEditor.instance.htmlEdit(textComponent, this);
}
+
+ protected abstract void initComponents();
@Override
public void actionPerformed(ActionEvent e) {
if (e.getSource() == okButton) {
saveChanges();
- obj.setVisible(false);
+ setVisible(false);
}
if (e.getSource() == cancelButton) {
- obj.setVisible(false);
+ setVisible(false);
}
}
- protected PropertyDlg obj;
-
protected TreeItem manifestItem;
protected abstract void saveChanges();
@@ -45,10 +49,10 @@
public void showDialog(TreeItem item) {
manifestItem = item;
- obj.fillFields();
+ fillFields();
- obj.setModal(true);
- obj.setVisible(true);
+ setModal(true);
+ setVisible(true);
}
public void editedHtmlTextWasSet() {
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/SimpleQuestionPropertiestsDlg.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -45,12 +45,6 @@
private javax.swing.JTextField currentAnswerVariant;
- public SimpleQuestionPropertiestsDlg() {
- obj = this;
-
- initComponents();
- }
-
@Override
public void actionPerformed(ActionEvent arg0) {
super.actionPerformed(arg0);
@@ -132,29 +126,28 @@
@Override
protected void fillFields() {
- SimpleQuestionPropertiestsDlg dlg = (SimpleQuestionPropertiestsDlg) obj;
- dlg.titleTextField.setText(manifestItem.getTitle());
+ titleTextField.setText(manifestItem.getTitle());
SimpleQuestionModel itemModel = new SimpleQuestionModel();
- dlg.captionTextField.setText(itemModel.getData(manifestItem)
+ captionTextField.setText(itemModel.getData(manifestItem)
.getCaption());
- dlg.sameAsTitleCheckBox.setSelected(dlg.titleTextField.getText()
- .equals(dlg.captionTextField.getText()));
- dlg.questionTextField.setText(itemModel.getData(manifestItem)
+ sameAsTitleCheckBox.setSelected(titleTextField.getText()
+ .equals(captionTextField.getText()));
+ questionTextField.setText(itemModel.getData(manifestItem)
.getQuestion());
- dlg.simpleQuestionAnswersDataModel = itemModel.getData(manifestItem)
+ simpleQuestionAnswersDataModel = itemModel.getData(manifestItem)
.getAnswers();
- dlg.answersTable.setModel(dlg.simpleQuestionAnswersDataModel);
+ answersTable.setModel(simpleQuestionAnswersDataModel);
- DefaultTableColumnModel columnModel = (DefaultTableColumnModel) dlg.answersTable
+ DefaultTableColumnModel columnModel = (DefaultTableColumnModel) answersTable
.getColumnModel();
columnModel.getColumn(0).setPreferredWidth(1);
columnModel.getColumn(1).setPreferredWidth(300);
columnModel.getColumn(2).setPreferredWidth(1);
- dlg.titleTextField.selectAll();
+ titleTextField.selectAll();
}
@Override
@@ -166,7 +159,7 @@
answersTable.getModel().setValueAt(text, selectedRow, 1);
}
- private void initComponents() {
+ protected void initComponents() {
setTitle("Propertiests...");
generalPanel = new javax.swing.JPanel();
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -17,6 +17,8 @@
super();
modelName = "ChapterModel";
isContainerItem = true;
+
+ registerConfigDlg(new ChapterPropertiestsDlg());
}
@Override
@@ -32,13 +34,6 @@
}
@Override
- public void ConfigureItem(TreeItem item) {
- new ChapterPropertiestsDlg().showDialog(item);
-
- TreeDataModel.getInstance().treeNodesChanged(item);
- }
-
- @Override
protected ItemData createItemDataInstance() {
return new ChapterItemData();
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/CompileQ/CompileQModel.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -6,13 +6,13 @@
import edu.lnu.FireFly.FFManifest.item.Item;
import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.WebEditor.WebEditor;
-import edu.lnu.FireFly.WebEditor.GUI.TreeDataModel;
import edu.lnu.FireFly.WebEditor.GUI.Dialogs.CompileQ.CompileQPropertiestsDlg;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
import edu.lnu.FireFly.WebEditor.ItemModels.ResourcedItemModel;
import edu.lnu.FireFly.WebEditor.ItemModels.Template;
public class CompileQModel extends ResourcedItemModel {
+
@Override
protected String getDefaultTitle() {
return "New compile question";
@@ -30,6 +30,7 @@
public CompileQModel() {
modelName = "CompileQModel";
+ registerConfigDlg(new CompileQPropertiestsDlg());
}
@Override
@@ -44,16 +45,6 @@
return false;
}
- @Override
- public void ConfigureItem(TreeItem item) {
- new CompileQPropertiestsDlg().showDialog(item);
-
- TreeDataModel.getInstance().treeNodesChanged(item);
- WebEditor.tree.setSelectionPath(null);
- WebEditor.tree.setSelectionPath(TreeDataModel.getInstance()
- .getItemPath(item));
- }
-
public CompileQData getData(TreeItem item) {
return ((CompileQData) getItemData(item));
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ItemModel.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -17,6 +17,7 @@
import edu.lnu.FireFly.WebEditor.WebEditor;
import edu.lnu.FireFly.WebEditor.Data.ManifestFactory;
import edu.lnu.FireFly.WebEditor.GUI.TreeDataModel;
+import edu.lnu.FireFly.WebEditor.GUI.Dialogs.PropertyDlg;
import edu.lnu.FireFly.WebEditor.ItemModels.SummaryPageModel.SummaryPageModel;
public abstract class ItemModel {
@@ -32,6 +33,8 @@
protected boolean isContainerItem = false;
+ private PropertyDlg propertyDlg = null;
+
public final boolean getShowOnSummaryPage(TreeItem anItem) {
if (this.getClass() == SummaryPageModel.class){
return false;
@@ -71,9 +74,24 @@
public abstract boolean canAddToItem(TreeItem parent);
public abstract boolean canConvertItem(TreeItem parent);
+
+ public final void ConfigureItem(TreeItem item) {
+ if (propertyDlg != null){
+ propertyDlg.showDialog(item);
+ }
- public abstract void ConfigureItem(TreeItem item);
+// In SimpleQModel
+// WebEditor.tree.setSelectionPath(null);
+// WebEditor.tree.setSelectionPath(TreeDataModel.getInstance()
+// .getItemPath(item));
+ TreeDataModel.getInstance().treeNodesChanged(item);
+ }
+
+ public final void registerConfigDlg(PropertyDlg dlg){
+ this.propertyDlg = dlg;
+ }
+
protected String createNewResource() {
if (modelHasResource()){
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Lecture/LectureModel.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -4,7 +4,6 @@
import edu.lnu.FireFly.FFManifest.item.Item;
import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.WebEditor.WebEditor;
-import edu.lnu.FireFly.WebEditor.GUI.TreeDataModel;
import edu.lnu.FireFly.WebEditor.GUI.Dialogs.LecturePropertiestsDlg;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
import edu.lnu.FireFly.WebEditor.ItemModels.ResourcedItemModel;
@@ -33,6 +32,7 @@
public LectureModel() {
modelName = "LectureModel";
+ registerConfigDlg(new LecturePropertiestsDlg());
}
@Override
@@ -47,17 +47,6 @@
return false;
}
- @Override
- public void ConfigureItem(TreeItem item) {
- new LecturePropertiestsDlg().showDialog(item);
- TreeDataModel.getInstance().treeNodesChanged(item);
- WebEditor.tree.setSelectionPath(null);
- WebEditor.tree.setSelectionPath(TreeDataModel.getInstance()
- .getItemPath(item));
-
- TreeDataModel.getInstance().treeNodesChanged(item);
- }
-
private LectureData getData(TreeItem item) {
return (LectureData) getItemData(item);
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -6,7 +6,6 @@
import edu.lnu.FireFly.FFManifest.item.Item;
import edu.lnu.FireFly.FFManifest.resource.Resource;
import edu.lnu.FireFly.WebEditor.WebEditor;
-import edu.lnu.FireFly.WebEditor.GUI.TreeDataModel;
import edu.lnu.FireFly.WebEditor.GUI.Dialogs.SimpleQuestionPropertiestsDlg;
import edu.lnu.FireFly.WebEditor.ItemModels.ItemData;
import edu.lnu.FireFly.WebEditor.ItemModels.ResourcedItemModel;
@@ -30,6 +29,7 @@
public SimpleQuestionModel() {
modelName = "SimpleQuestionModel";
+ registerConfigDlg(new SimpleQuestionPropertiestsDlg());
}
@Override
@@ -44,15 +44,6 @@
return false;
}
- @Override
- public void ConfigureItem(TreeItem item) {
- new SimpleQuestionPropertiestsDlg().showDialog(item);
- TreeDataModel.getInstance().treeNodesChanged(item);
- WebEditor.tree.setSelectionPath(null);
- WebEditor.tree.setSelectionPath(TreeDataModel.getInstance()
- .getItemPath(item));
- }
-
public SimpleQuestionData getData(TreeItem item) {
return ((SimpleQuestionData) getItemData(item));
}
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SummaryPageModel/SummaryPageModel.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -84,11 +84,6 @@
}
@Override
- public void ConfigureItem(TreeItem item) {
- // Currently this model doesn't configurable.
- }
-
- @Override
public boolean canAddToItem(TreeItem parent) {
// It can be added to any item because it must generated automatically.
return false;
Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java 2008-05-19 21:30:10 UTC (rev 146)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/UnknownItemModel.java 2008-05-20 15:54:30 UTC (rev 147)
@@ -7,11 +7,6 @@
public class UnknownItemModel extends ItemModel {
@Override
- public void ConfigureItem(TreeItem item) {
- System.out.println("Can't doing this operation with unknown item model");
- }
-
- @Override
public void addItem(TreeItem parent) {
System.out.println("Can't doing this operation with unknown item model");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
