From: <se...@us...> - 2008-05-10 14:03:30
|
Revision: 123 http://acmcontester.svn.sourceforge.net/acmcontester/?rev=123&view=rev Author: sem62 Date: 2008-05-10 07:03:25 -0700 (Sat, 10 May 2008) Log Message: ----------- Some design Chapter and Lecture models Modified Paths: -------------- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/ChapterPropertiestsDlg.java WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/ChapterPropertiestsDlg.java =================================================================== --- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/ChapterPropertiestsDlg.java 2008-05-10 13:18:47 UTC (rev 122) +++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/ChapterPropertiestsDlg.java 2008-05-10 14:03:25 UTC (rev 123) @@ -113,7 +113,9 @@ titleLabel) .addContainerGap( 568, - Short.MAX_VALUE))))); + Short.MAX_VALUE) + )) + .addContainerGap())); jPanel1Layout .setVerticalGroup(jPanel1Layout .createParallelGroup( @@ -293,8 +295,8 @@ .addComponent(forwarOnlyCheckBox) .addPreferredGap( javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jLabel5).addContainerGap( - 20, Short.MAX_VALUE))); + .addComponent(jLabel5) + )); configurationComboBox.setModel(new javax.swing.DefaultComboBoxModel( new String[] { "User defined", "Lecture materials", @@ -306,7 +308,8 @@ controlModesPanel.setLayout(jPanel2Layout); jPanel2Layout.setHorizontalGroup(jPanel2Layout.createParallelGroup( javax.swing.GroupLayout.Alignment.LEADING).addGroup( - jPanel2Layout.createSequentialGroup().addGroup( + jPanel2Layout.createSequentialGroup() + .addContainerGap().addGroup( jPanel2Layout.createParallelGroup( javax.swing.GroupLayout.Alignment.LEADING) .addComponent(jPanel6, @@ -370,7 +373,9 @@ jPanel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, - javax.swing.GroupLayout.PREFERRED_SIZE))); + javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(10, Short.MAX_VALUE) + )); javax.swing.GroupLayout layout = new javax.swing.GroupLayout( getContentPane()); Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java =================================================================== --- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java 2008-05-10 13:18:47 UTC (rev 122) +++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java 2008-05-10 14:03:25 UTC (rev 123) @@ -3,6 +3,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.JLabel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -46,6 +47,8 @@ private javax.swing.JTextField titleTextField; private javax.swing.JTextField captionTextField; + private JLabel titleLabel; + /** Creates new form NewJFrame */ public LecturePropertiestsDlg() { obj = this; @@ -69,6 +72,7 @@ private void initComponents() { setTitle("Propertiests..."); titlePanel = new javax.swing.JPanel(); + titleLabel = new JLabel("Title"); titleTextField = new javax.swing.JTextField(); captionPanel = new javax.swing.JPanel(); captionTextField = new javax.swing.JTextField(); @@ -93,24 +97,55 @@ setDefaultCloseOperation(javax.swing.WindowConstants.HIDE_ON_CLOSE); titlePanel.setBorder(javax.swing.BorderFactory - .createTitledBorder("Title")); + .createTitledBorder("General")); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout( titlePanel); titlePanel.setLayout(jPanel1Layout); - jPanel1Layout.setHorizontalGroup(jPanel1Layout.createParallelGroup( - javax.swing.GroupLayout.Alignment.LEADING).addComponent( - titleTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 412, - Short.MAX_VALUE)); - jPanel1Layout.setVerticalGroup(jPanel1Layout.createParallelGroup( - javax.swing.GroupLayout.Alignment.LEADING).addGroup( - jPanel1Layout.createSequentialGroup().addPreferredGap( - javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(titleTextField, - javax.swing.GroupLayout.PREFERRED_SIZE, - javax.swing.GroupLayout.DEFAULT_SIZE, - javax.swing.GroupLayout.PREFERRED_SIZE))); + jPanel1Layout + .setHorizontalGroup(jPanel1Layout + .createParallelGroup( + javax.swing.GroupLayout.Alignment.LEADING) + .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())); + captionPanel.setBorder(javax.swing.BorderFactory .createTitledBorder("Caption")); @@ -121,17 +156,27 @@ javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout( captionPanel); captionPanel.setLayout(jPanel2Layout); - jPanel2Layout.setHorizontalGroup(jPanel2Layout.createParallelGroup( - javax.swing.GroupLayout.Alignment.LEADING).addComponent( - sameAsTitleCheckbox, javax.swing.GroupLayout.PREFERRED_SIZE, - javax.swing.GroupLayout.DEFAULT_SIZE, - javax.swing.GroupLayout.PREFERRED_SIZE).addGroup( - javax.swing.GroupLayout.Alignment.TRAILING, - jPanel2Layout.createSequentialGroup().addComponent( - captionTextField, javax.swing.GroupLayout.DEFAULT_SIZE, - 361, Short.MAX_VALUE).addPreferredGap( - javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(editCaptionInHtmlBtn, 30, 30, 30))); + jPanel2Layout.setHorizontalGroup(jPanel2Layout + .createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel2Layout + .createSequentialGroup() + .addContainerGap() + .addComponent(sameAsTitleCheckbox, + javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE) + ) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout + .createSequentialGroup() + .addContainerGap() + .addComponent(captionTextField, + javax.swing.GroupLayout.DEFAULT_SIZE, + 361, + Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(editCaptionInHtmlBtn, 30, 30, 30) + .addContainerGap() + )); jPanel2Layout .setVerticalGroup(jPanel2Layout .createParallelGroup( @@ -147,16 +192,18 @@ .addGap(8, 8, 8) .addGroup( jPanel2Layout - .createParallelGroup( - javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent( - editCaptionInHtmlBtn, - 20, 20, 20) - .addComponent( - captionTextField, - javax.swing.GroupLayout.PREFERRED_SIZE, - javax.swing.GroupLayout.DEFAULT_SIZE, - javax.swing.GroupLayout.PREFERRED_SIZE)))); + .createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent( + editCaptionInHtmlBtn, + 20, 20, 20) + .addComponent( + captionTextField, + javax.swing.GroupLayout.PREFERRED_SIZE, + javax.swing.GroupLayout.DEFAULT_SIZE, + javax.swing.GroupLayout.PREFERRED_SIZE) + ) + .addContainerGap() + )); contentPanel.setBorder(javax.swing.BorderFactory .createTitledBorder("Content")); @@ -167,20 +214,36 @@ contentPanel); contentPanel.setLayout(jPanel3Layout); jPanel3Layout.setHorizontalGroup(jPanel3Layout.createParallelGroup( - javax.swing.GroupLayout.Alignment.LEADING).addGroup( - javax.swing.GroupLayout.Alignment.TRAILING, - jPanel3Layout.createSequentialGroup().addContainerGap() - .addComponent(editContentInHtmlBtn)).addComponent( - jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 486, - Short.MAX_VALUE)); + javax.swing.GroupLayout.Alignment.LEADING) + .addGroup( + javax.swing.GroupLayout.Alignment.TRAILING, + jPanel3Layout + .createSequentialGroup() + .addComponent(editContentInHtmlBtn) + .addContainerGap() + ) + .addGroup( + javax.swing.GroupLayout.Alignment.TRAILING, + jPanel3Layout + .createSequentialGroup() + .addContainerGap() + .addComponent(jScrollPane1, + javax.swing.GroupLayout.DEFAULT_SIZE, + 486,Short.MAX_VALUE) + .addContainerGap() + ) + ); jPanel3Layout.setVerticalGroup(jPanel3Layout.createParallelGroup( javax.swing.GroupLayout.Alignment.LEADING).addGroup( javax.swing.GroupLayout.Alignment.TRAILING, - jPanel3Layout.createSequentialGroup().addComponent( + jPanel3Layout.createSequentialGroup() + .addComponent( jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 145, Short.MAX_VALUE).addPreferredGap( javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(editContentInHtmlBtn, 20, 20, 20))); + .addComponent(editContentInHtmlBtn, 20, 20, 20) + .addContainerGap() + )); // jPanel3Layout.setHorizontalGroup(jPanel3Layout.createParallelGroup( // javax.swing.GroupLayout.Alignment.LEADING).addComponent( // jScrollPane1)); @@ -306,8 +369,9 @@ } LectureModel model = new LectureModel(); - LectureData lectureData = ((LectureData) model.getItemData(manifestItem)); - + LectureData lectureData = ((LectureData) model + .getItemData(manifestItem)); + lectureData.setCaption(caption); lectureData.setContent(content); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |