acmcontester-developers Mailing List for ACM Contester (Page 20)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 107
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=107&view=rev
Author:   sem62
Date:     2008-05-08 13:56:59 -0700 (Thu, 08 May 2008)

Log Message:
-----------
Fully working LecturePropertyDialog.

Modified Paths:
--------------
    WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithWYSIWYGEditor.java
    WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java
    WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java

Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithWYSIWYGEditor.java
===================================================================

--- WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithWYSIWYGEditor.java	2008-05-08 20:11:53 UTC (rev 106)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/AppletWithWYSIWYGEditor.java	2008-05-08 20:56:59 UTC (rev 107)
@@ -1,16 +1,16 @@
 package edu.lnu.FireFly.WebEditor;
 
-import javax.swing.JTextField;
+import javax.swing.text.JTextComponent;
 
 import netscape.javascript.JSObject;
 import edu.lnu.FireFly.WebEditor.GUI.Dialogs.PropertyDlg;
 
 public class AppletWithWYSIWYGEditor extends AppletWithApiHandle{
 	private boolean htmlEditing = false;
-	private JTextField textField = null;
+	private JTextComponent textField = null;
 	private PropertyDlg editingDlg = null;
 
-	public void htmlEdit(JTextField captionTextField2, PropertyDlg dlg) {
+	public void htmlEdit(JTextComponent captionTextField2, PropertyDlg dlg) {
 		JSObject win = JSObject.getWindow(this);
 		Object[] params = new String[1];
 		params[0] = captionTextField2.getText();

Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java
===================================================================
--- WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java	2008-05-08 20:11:53 UTC (rev 106)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/LecturePropertiestsDlg.java	2008-05-08 20:56:59 UTC (rev 107)
@@ -24,7 +24,7 @@
 				captionTextField.setText(titleTextField.getText());
 			}
 			captionTextField.setEnabled(!sameAsTitleCheckbox.isSelected());
-			editContentInHtmlBtn.setEnabled(captionTextField.isEnabled());
+			editCaptionInHtmlBtn.setEnabled(captionTextField.isEnabled());
 		}
 	}
 
@@ -35,10 +35,10 @@
 
 	private javax.swing.JCheckBox sameAsTitleCheckbox;
 
+	private javax.swing.JButton editCaptionInHtmlBtn;
 	private javax.swing.JButton editContentInHtmlBtn;
 
 	private javax.swing.JEditorPane contentEditorPane;
-	private javax.swing.JLabel titleLabel;
 	private javax.swing.JPanel titlePanel;
 	private javax.swing.JPanel captionPanel;
 	private javax.swing.JPanel contentPanel;
@@ -57,19 +57,23 @@
 	public void actionPerformed(ActionEvent arg0) {
 		super.actionPerformed(arg0);
 
-		if (arg0.getSource() == editContentInHtmlBtn) {
+		if (arg0.getSource() == editCaptionInHtmlBtn) {
 			editTextFieldInHtmlEditor(captionTextField);
 		}
+
+		if (arg0.getSource() == editContentInHtmlBtn) {
+			editTextFieldInHtmlEditor(contentEditorPane);
+		}
 	}
 
 	private void initComponents() {
 		setTitle("Propertiests...");
 		titlePanel = new javax.swing.JPanel();
-		titleLabel = new javax.swing.JLabel();
 		titleTextField = new javax.swing.JTextField();
 		captionPanel = new javax.swing.JPanel();
 		captionTextField = new javax.swing.JTextField();
 		sameAsTitleCheckbox = new javax.swing.JCheckBox();
+		editCaptionInHtmlBtn = new javax.swing.JButton();
 		editContentInHtmlBtn = new javax.swing.JButton();
 		contentPanel = new javax.swing.JPanel();
 		jScrollPane1 = new javax.swing.JScrollPane();
@@ -77,15 +81,19 @@
 		okButton = new javax.swing.JButton();
 		cancelButton = new javax.swing.JButton();
 
+		editCaptionInHtmlBtn.addActionListener(this);
 		editContentInHtmlBtn.addActionListener(this);
 		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"));
-		titleLabel.setText("Title");
 
 		javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(
 				titlePanel);
@@ -93,31 +101,22 @@
 		jPanel1Layout.setHorizontalGroup(jPanel1Layout.createParallelGroup(
 				javax.swing.GroupLayout.Alignment.LEADING).addComponent(
 				titleTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 412,
-				Short.MAX_VALUE).addGroup(
-				jPanel1Layout.createSequentialGroup().addComponent(titleLabel)
-						.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)));
+				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)));
 
 		captionPanel.setBorder(javax.swing.BorderFactory
 				.createTitledBorder("Caption"));
 
 		sameAsTitleCheckbox.setText("Same as title");
 
-		editContentInHtmlBtn.setText("...");
+		editCaptionInHtmlBtn.setText("...");
 
 		javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(
 				captionPanel);
@@ -132,7 +131,7 @@
 						captionTextField, javax.swing.GroupLayout.DEFAULT_SIZE,
 						361, Short.MAX_VALUE).addPreferredGap(
 						javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-						.addComponent(editContentInHtmlBtn, 30, 30, 30)));
+						.addComponent(editCaptionInHtmlBtn, 30, 30, 30)));
 		jPanel2Layout
 				.setVerticalGroup(jPanel2Layout
 						.createParallelGroup(
@@ -151,7 +150,7 @@
 														.createParallelGroup(
 																javax.swing.GroupLayout.Alignment.BASELINE)
 														.addComponent(
-																editContentInHtmlBtn,
+																editCaptionInHtmlBtn,
 																20, 20, 20)
 														.addComponent(
 																captionTextField,
@@ -167,13 +166,27 @@
 		javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(
 				contentPanel);
 		contentPanel.setLayout(jPanel3Layout);
-		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");
 
@@ -194,11 +207,6 @@
 												layout
 														.createParallelGroup(
 																javax.swing.GroupLayout.Alignment.LEADING)
-														.addComponent(
-																contentPanel,
-																javax.swing.GroupLayout.DEFAULT_SIZE,
-																javax.swing.GroupLayout.DEFAULT_SIZE,
-																Short.MAX_VALUE)
 														.addGroup(
 																layout
 																		.createSequentialGroup()
@@ -216,16 +224,20 @@
 																								javax.swing.GroupLayout.DEFAULT_SIZE,
 																								javax.swing.GroupLayout.DEFAULT_SIZE,
 																								Short.MAX_VALUE)
+																						.addComponent(
+																								contentPanel,
+																								javax.swing.GroupLayout.DEFAULT_SIZE,
+																								javax.swing.GroupLayout.DEFAULT_SIZE,
+																								Short.MAX_VALUE)
 																						.addGroup(
 																								javax.swing.GroupLayout.Alignment.TRAILING,
 																								layout
 																										.createSequentialGroup()
-																										.addComponent(
-																												cancelButton)
+																										.addComponent(cancelButton, 80, 80, 80)
 																										.addPreferredGap(
 																												javax.swing.LayoutStyle.ComponentPlacement.RELATED)
 																										.addComponent(
-																												okButton)
+																												okButton, 80, 80, 80)
 																										.addPreferredGap(
 																												javax.swing.LayoutStyle.ComponentPlacement.RELATED)))
 																		.addContainerGap()))));
@@ -262,9 +274,8 @@
 												layout
 														.createParallelGroup(
 																javax.swing.GroupLayout.Alignment.BASELINE)
-														.addComponent(
-																cancelButton)
-														.addComponent(okButton))
+														.addComponent(cancelButton, 20, 20, 20)
+														.addComponent(okButton, 20, 20, 20))
 										.addContainerGap()));
 
 		pack();
@@ -289,16 +300,16 @@
 		LectureModel model = new LectureModel();
 
 		String title = manifestItem.getTitle();
-		String caption = ((LectureData) model
-				.getItemData(manifestItem)).getCaption();
-		
+		String caption = ((LectureData) model.getItemData(manifestItem))
+				.getCaption();
+
 		dlg.sameAsTitleCheckbox.setSelected(title.equals(caption));
 
 		dlg.titleTextField.setText(title);
 		dlg.titleTextField.selectAll();
 
 		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 20:11:53 UTC (rev 106)
+++ WebEditor/src/edu/lnu/FireFly/WebEditor/GUI/Dialogs/PropertyDlg.java	2008-05-08 20:56:59 UTC (rev 107)
@@ -4,7 +4,7 @@
 import java.awt.event.ActionListener;
 
 import javax.swing.JDialog;
-import javax.swing.JTextField;
+import javax.swing.text.JTextComponent;
 
 import edu.lnu.FireFly.FFManifest.TreeItem;
 import edu.lnu.FireFly.WebEditor.WebEditor;
@@ -15,8 +15,8 @@
 	 */
 	private static final long serialVersionUID = -6002603750731392120L;
 
-	protected void editTextFieldInHtmlEditor(JTextField captionTextField2) {
-		WebEditor.instance.htmlEdit(captionTextField2, this);
+	protected void editTextFieldInHtmlEditor(JTextComponent textComponent) {
+		WebEditor.instance.htmlEdit(textComponent, this);
 	}
 
 	@Override


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




2008	Jan	Feb	Mar	Apr	May (128)	Jun (97)	Jul (13)	Aug (40)	Sep (50)	Oct (27)	Nov (7)	Dec (15)
2009	Jan (18)	Feb (47)	Mar (7)	Apr	May	Jun	Jul (32)	Aug	Sep (14)	Oct (22)	Nov	Dec

acmcontester-developers Mailing List for ACM Contester (Page 20)

acmcontester-developers — This list is to notify all developers on this project