Index: autoupdate/src/org/netbeans/modules/autoupdate/AutoCheckInfo.form =================================================================== RCS file: /cvs/autoupdate/src/org/netbeans/modules/autoupdate/AutoCheckInfo.form,v retrieving revision 1.11 diff -u -r1.11 AutoCheckInfo.form --- autoupdate/src/org/netbeans/modules/autoupdate/AutoCheckInfo.form 2 Dec 2002 12:23:03 -0000 1.11 +++ autoupdate/src/org/netbeans/modules/autoupdate/AutoCheckInfo.form 20 Jun 2003 10:47:33 -0000 @@ -130,11 +130,6 @@ - - - - - @@ -147,9 +142,6 @@ - - - Index: autoupdate/src/org/netbeans/modules/autoupdate/AutoCheckInfo.java =================================================================== RCS file: /cvs/autoupdate/src/org/netbeans/modules/autoupdate/AutoCheckInfo.java,v retrieving revision 1.21 diff -u -r1.21 AutoCheckInfo.java --- autoupdate/src/org/netbeans/modules/autoupdate/AutoCheckInfo.java 3 Dec 2002 14:09:13 -0000 1.21 +++ autoupdate/src/org/netbeans/modules/autoupdate/AutoCheckInfo.java 20 Jun 2003 10:47:35 -0000 @@ -245,9 +245,7 @@ extSettingsPanel.setLayout(new java.awt.GridBagLayout()); - extSettingsPanel.setPreferredSize(new java.awt.Dimension(350, 200)); proxyButton.setText(NbBundle.getBundle(AutoCheckInfo.class).getString("AutoCheckInfo.proxyButton.text")); - proxyButton.setPreferredSize(new java.awt.Dimension(139, 27)); proxyButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { proxyButtonActionPerformed(evt); @@ -302,17 +300,17 @@ // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JCheckBox beforeCheckBox; private javax.swing.JCheckBox configCheckBox; - private javax.swing.JPanel extSettingsPanel; private javax.swing.JPanel configPanel; - private javax.swing.JTextArea messageText; - private javax.swing.JButton proxyButton; - private javax.swing.JCheckBox negativCheckBox; - private javax.swing.JCheckBox beforeCheckBox; - private javax.swing.JComboBox periodComboBox; + private javax.swing.JPanel extSettingsPanel; private javax.swing.JLabel iconLabel; private javax.swing.JLabel jLabel2; private javax.swing.JPanel messagePanel; + private javax.swing.JTextArea messageText; + private javax.swing.JCheckBox negativCheckBox; + private javax.swing.JComboBox periodComboBox; + private javax.swing.JButton proxyButton; // End of variables declaration//GEN-END:variables boolean showDialog(boolean yesNo) { Index: autoupdate/src/org/netbeans/modules/autoupdate/CertificateDialog.java =================================================================== RCS file: /cvs/autoupdate/src/org/netbeans/modules/autoupdate/CertificateDialog.java,v retrieving revision 1.9.30.1 diff -u -r1.9.30.1 CertificateDialog.java --- autoupdate/src/org/netbeans/modules/autoupdate/CertificateDialog.java 16 Jun 2003 01:06:23 -0000 1.9.30.1 +++ autoupdate/src/org/netbeans/modules/autoupdate/CertificateDialog.java 20 Jun 2003 10:47:39 -0000 @@ -45,7 +45,6 @@ initComponents(); certificateTextArea.setText( SignVerifier.formatCerts( certs ) ); certificateTextArea.setCaretPosition(0); -// setPreferredSize(new java.awt.Dimension(350,220)); getAccessibleContext().setAccessibleName(getBundle("CTL_Certificate_Title")); getAccessibleContext().setAccessibleDescription(aboutTextArea.getText()); Index: autoupdate/src/org/netbeans/modules/autoupdate/ConnectingErrorDialog.java =================================================================== RCS file: /cvs/autoupdate/src/org/netbeans/modules/autoupdate/ConnectingErrorDialog.java,v retrieving revision 1.8.30.1 diff -u -r1.8.30.1 ConnectingErrorDialog.java --- autoupdate/src/org/netbeans/modules/autoupdate/ConnectingErrorDialog.java 16 Jun 2003 01:06:24 -0000 1.8.30.1 +++ autoupdate/src/org/netbeans/modules/autoupdate/ConnectingErrorDialog.java 20 Jun 2003 10:47:39 -0000 @@ -14,6 +14,7 @@ package org.netbeans.modules.autoupdate; import java.awt.Font; +import java.awt.GridBagConstraints; import javax.swing.*; import org.openide.DialogDescriptor; import org.openide.DialogDisplayer; @@ -34,7 +35,6 @@ public ConnectingErrorDialog() { initComponents(); initAccessibility(); - setPreferredSize(new java.awt.Dimension(350,120)); } /** This method is called from within the constructor to @@ -63,6 +63,8 @@ textArea.setLineWrap(true); textArea.setWrapStyleWord(true); textArea.setEnabled(false); + textArea.setColumns(40); + textArea.setRows(3); if ( type == Updates.UNKNOWN_ERROR && serverMessage != null ) textArea.setText( serverMessage ); else { @@ -73,8 +75,9 @@ else textArea.setText(getBundle("CTL_Invalid_textLabel")); } - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridheight = 0; + gridBagConstraints = new GridBagConstraints(); + gridBagConstraints.gridx=0; + gridBagConstraints.gridy = 0; gridBagConstraints.insets = new java.awt.Insets(18, 18, 0, 0); gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; add(iconLabel, gridBagConstraints); @@ -90,8 +93,10 @@ gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 1; - gridBagConstraints.gridwidth = 0; - gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 18); + gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER; + gridBagConstraints.gridheight = 3; + gridBagConstraints.insets = new java.awt.Insets(0, 12, 18, 18); + gridBagConstraints.fill = GridBagConstraints.BOTH; gridBagConstraints.weightx = 1.0; gridBagConstraints.weighty = 1.0; add(textArea, gridBagConstraints); Index: autoupdate/src/org/netbeans/modules/autoupdate/FirstPanel.java =================================================================== RCS file: /cvs/autoupdate/src/org/netbeans/modules/autoupdate/FirstPanel.java,v retrieving revision 1.27.2.1 diff -u -r1.27.2.1 FirstPanel.java --- autoupdate/src/org/netbeans/modules/autoupdate/FirstPanel.java 16 Jun 2003 01:06:26 -0000 1.27.2.1 +++ autoupdate/src/org/netbeans/modules/autoupdate/FirstPanel.java 20 Jun 2003 10:47:41 -0000 @@ -42,7 +42,6 @@ }); setName(getBundle("LAB_First")); initComponents (); -// setPreferredSize(new java.awt.Dimension(500, 380)); this.validator = validator; Index: autoupdate/src/org/netbeans/modules/autoupdate/IncompleteDialog.java =================================================================== RCS file: /cvs/autoupdate/src/org/netbeans/modules/autoupdate/IncompleteDialog.java,v retrieving revision 1.6.30.1 diff -u -r1.6.30.1 IncompleteDialog.java --- autoupdate/src/org/netbeans/modules/autoupdate/IncompleteDialog.java 16 Jun 2003 01:06:26 -0000 1.6.30.1 +++ autoupdate/src/org/netbeans/modules/autoupdate/IncompleteDialog.java 20 Jun 2003 10:47:41 -0000 @@ -35,7 +35,6 @@ public IncompleteDialog() { initComponents(); initAccessibility(); - setPreferredSize(new java.awt.Dimension(350,120)); } /** This method is called from within the constructor to Index: autoupdate/src/org/netbeans/modules/autoupdate/LicenceDialog.form =================================================================== RCS file: /cvs/autoupdate/src/org/netbeans/modules/autoupdate/LicenceDialog.form,v retrieving revision 1.7.30.1 diff -u -r1.7.30.1 LicenceDialog.form --- autoupdate/src/org/netbeans/modules/autoupdate/LicenceDialog.form 16 Jun 2003 01:06:27 -0000 1.7.30.1 +++ autoupdate/src/org/netbeans/modules/autoupdate/LicenceDialog.form 20 Jun 2003 10:47:42 -0000 @@ -9,7 +9,7 @@ - + @@ -25,9 +25,14 @@ + + + + + Index: autoupdate/src/org/netbeans/modules/autoupdate/LicenceDialog.java =================================================================== RCS file: /cvs/autoupdate/src/org/netbeans/modules/autoupdate/LicenceDialog.java,v retrieving revision 1.16.30.1 diff -u -r1.16.30.1 LicenceDialog.java --- autoupdate/src/org/netbeans/modules/autoupdate/LicenceDialog.java 16 Jun 2003 01:06:27 -0000 1.16.30.1 +++ autoupdate/src/org/netbeans/modules/autoupdate/LicenceDialog.java 20 Jun 2003 10:47:42 -0000 @@ -25,9 +25,6 @@ */ public class LicenceDialog extends javax.swing.JPanel { - /** Preferred size of this dialog */ - private static final java.awt.Dimension preferredSize = new java.awt.Dimension( 620, 475 ); - /** The only Licence panel instance in system */ private static LicenceDialog licencePanel; /** The dialog descriptor of licence dialog */ @@ -52,11 +49,6 @@ licenceTextArea.getAccessibleContext().setAccessibleDescription(getBundle("ACSD_LicenceDialog_Licence")); } - /** Overload getPreffered size to get a bit bigger dialog */ - public java.awt.Dimension getPreferredSize() { - return preferredSize; - } - /** This method is called from within the constructor to * initialize the form. * WARNING: Do NOT modify this code. The content of this method is @@ -69,8 +61,11 @@ setLayout(new java.awt.BorderLayout()); setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(8, 8, 8, 8))); + licenceTextArea.setColumns(80); licenceTextArea.setEditable(false); licenceTextArea.setFont(new Font("Monospaced", Font.PLAIN, licenceTextArea.getFont().getSize() + 1)); + licenceTextArea.setRows(25); + licenceTextArea.setMinimumSize(new java.awt.Dimension(600, 400)); jScrollPane1.setViewportView(licenceTextArea); add(jScrollPane1, java.awt.BorderLayout.CENTER); Index: autoupdate/src/org/netbeans/modules/autoupdate/LoginPanel.java =================================================================== RCS file: /cvs/autoupdate/src/org/netbeans/modules/autoupdate/LoginPanel.java,v retrieving revision 1.9 diff -u -r1.9 LoginPanel.java --- autoupdate/src/org/netbeans/modules/autoupdate/LoginPanel.java 3 Dec 2002 14:09:17 -0000 1.9 +++ autoupdate/src/org/netbeans/modules/autoupdate/LoginPanel.java 20 Jun 2003 10:47:43 -0000 @@ -44,7 +44,6 @@ setName(getBundle("LAB_Login")); initComponents (); initAccessibility(); - setPreferredSize(new java.awt.Dimension(500, 380)); settings = Settings.getShared(); Index: autoupdate/src/org/netbeans/modules/autoupdate/SetupPanel.java =================================================================== RCS file: /cvs/autoupdate/src/org/netbeans/modules/autoupdate/SetupPanel.java,v retrieving revision 1.10 diff -u -r1.10 SetupPanel.java --- autoupdate/src/org/netbeans/modules/autoupdate/SetupPanel.java 3 Dec 2002 14:09:19 -0000 1.10 +++ autoupdate/src/org/netbeans/modules/autoupdate/SetupPanel.java 20 Jun 2003 10:47:44 -0000 @@ -38,7 +38,6 @@ setName(getBundle ("CTL_Settings_Name")); putClientProperty ("WizardPanel_contentData", new String[] {getName ()}); // NOI18N putClientProperty ("WizardPanel_contentSelectedIndex", new Integer (0)); // NOI18N - setPreferredSize(new java.awt.Dimension(500, 300)); String[] tags = (new Settings.PeriodPropertyEditor()).getTags(); for ( int i = 0; i < tags.length; i++ )