From: <se...@us...> - 2008-05-09 19:53:34
|
Revision: 114 http://acmcontester.svn.sourceforge.net/acmcontester/?rev=114&view=rev Author: sem62 Date: 2008-05-09 12:42:16 -0700 (Fri, 09 May 2008) Log Message: ----------- Fized bug with "Same as title" checkbox Modified Paths: -------------- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java =================================================================== --- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java 2008-05-09 19:36:00 UTC (rev 113) +++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java 2008-05-09 19:42:16 UTC (rev 114) @@ -86,11 +86,11 @@ okButton.addActionListener(this); cancelButton.addActionListener(this); sameAsTitleCheckbox.addChangeListener(this); - + editContentInHtmlBtn.setText("HTML Editor"); setResizable(false); - + setDefaultCloseOperation(javax.swing.WindowConstants.HIDE_ON_CLOSE); titlePanel.setBorder(javax.swing.BorderFactory .createTitledBorder("Title")); @@ -166,27 +166,28 @@ javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout( 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) - ); - jPanel3Layout.setVerticalGroup( - jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup() - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 145, Short.MAX_VALUE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(editContentInHtmlBtn, 20, 20, 20)) - ); -// jPanel3Layout.setHorizontalGroup(jPanel3Layout.createParallelGroup( -// javax.swing.GroupLayout.Alignment.LEADING).addComponent( -// jScrollPane1)); -// jPanel3Layout.setVerticalGroup(jPanel3Layout.createParallelGroup( -// javax.swing.GroupLayout.Alignment.LEADING).addComponent( -// jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 174, -// javax.swing.GroupLayout.PREFERRED_SIZE)); + 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)); + jPanel3Layout.setVerticalGroup(jPanel3Layout.createParallelGroup( + javax.swing.GroupLayout.Alignment.LEADING).addGroup( + javax.swing.GroupLayout.Alignment.TRAILING, + jPanel3Layout.createSequentialGroup().addComponent( + jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, + 145, Short.MAX_VALUE).addPreferredGap( + javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(editContentInHtmlBtn, 20, 20, 20))); + // jPanel3Layout.setHorizontalGroup(jPanel3Layout.createParallelGroup( + // javax.swing.GroupLayout.Alignment.LEADING).addComponent( + // jScrollPane1)); + // jPanel3Layout.setVerticalGroup(jPanel3Layout.createParallelGroup( + // javax.swing.GroupLayout.Alignment.LEADING).addComponent( + // jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 174, + // javax.swing.GroupLayout.PREFERRED_SIZE)); okButton.setText("Ok"); @@ -233,11 +234,18 @@ javax.swing.GroupLayout.Alignment.TRAILING, layout .createSequentialGroup() - .addComponent(cancelButton, 80, 80, 80) + .addComponent( + cancelButton, + 80, + 80, + 80) .addPreferredGap( javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent( - okButton, 80, 80, 80) + okButton, + 80, + 80, + 80) .addPreferredGap( javax.swing.LayoutStyle.ComponentPlacement.RELATED))) .addContainerGap())))); @@ -274,8 +282,11 @@ layout .createParallelGroup( javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(cancelButton, 20, 20, 20) - .addComponent(okButton, 20, 20, 20)) + .addComponent( + cancelButton, + 20, 20, 20) + .addComponent(okButton, + 20, 20, 20)) .addContainerGap())); pack(); @@ -285,11 +296,19 @@ protected void saveChanges() { manifestItem.setTitle(titleTextField.getText()); + String caption = captionTextField.getText(); + String content = contentEditorPane.getText(); + String title = manifestItem.getTitle(); + + if (sameAsTitleCheckbox.isSelected()) { + caption = title; + } + LectureModel model = new LectureModel(); - ((LectureData) model.getItemData(manifestItem)) - .setCaption(captionTextField.getText()); - ((LectureData) model.getItemData(manifestItem)) - .setContent(contentEditorPane.getText()); + LectureData lectureData = ((LectureData) model.getItemData(manifestItem)); + + lectureData.setCaption(caption); + lectureData.setContent(content); model.updateItemResource(manifestItem, true); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |