moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-01-09 20:58:05 -05:00
Code Issues Releases Wiki Activity

Revert Java 7 only changes

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2264 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2014-03-18 00:04:00 +00:00
parent 61dcfae33f
commit 38dbddf807
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/davmail/ui/SelectCertificateDialog.java
View File

@ -30,7 +30,7 @@ import java.awt.event.ActionListener;
* Let user select a client certificate * Let user select a client certificate
*/ */
public class SelectCertificateDialog extends JDialog { public class SelectCertificateDialog extends JDialog {
protected final JList<String> aliasListBox; protected final JList aliasListBox;
protected String selectedAlias; protected String selectedAlias;
/** /**
@ -64,7 +64,7 @@ public class SelectCertificateDialog extends JDialog {
imageLabel.setText(BundleMessage.format("UI_CERTIFICATE_ALIAS_PROMPT")); imageLabel.setText(BundleMessage.format("UI_CERTIFICATE_ALIAS_PROMPT"));
questionPanel.add(imageLabel); questionPanel.add(imageLabel);
aliasListBox = new JList<String>(aliases); aliasListBox = new JList(aliases);
aliasListBox.setMaximumSize(aliasListBox.getPreferredSize()); aliasListBox.setMaximumSize(aliasListBox.getPreferredSize());
JPanel aliasPanel = new JPanel(); JPanel aliasPanel = new JPanel();
@ -92,7 +92,7 @@ public class SelectCertificateDialog extends JDialog {
JButton cancelButton = new JButton(BundleMessage.format("UI_BUTTON_CANCEL")); JButton cancelButton = new JButton(BundleMessage.format("UI_BUTTON_CANCEL"));
okButton.addActionListener(new ActionListener() { okButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
selectedAlias = aliasListBox.getSelectedValue(); selectedAlias = (String) aliasListBox.getSelectedValue();
setVisible(false); setVisible(false);
} }
}); });

28
src/java/davmail/ui/SettingsFrame.java
View File

@ -75,21 +75,21 @@ public class SettingsFrame extends JFrame {
protected JTextField certHashField; protected JTextField certHashField;
protected JCheckBox disableUpdateCheck; protected JCheckBox disableUpdateCheck;
protected JComboBox<String> keystoreTypeCombo; protected JComboBox keystoreTypeCombo;
protected JTextField keystoreFileField; protected JTextField keystoreFileField;
protected JPasswordField keystorePassField; protected JPasswordField keystorePassField;
protected JPasswordField keyPassField; protected JPasswordField keyPassField;
protected JComboBox<String> clientKeystoreTypeCombo; protected JComboBox clientKeystoreTypeCombo;
protected JTextField clientKeystoreFileField; protected JTextField clientKeystoreFileField;
protected JPasswordField clientKeystorePassField; protected JPasswordField clientKeystorePassField;
protected JTextField pkcs11LibraryField; protected JTextField pkcs11LibraryField;
protected JTextArea pkcs11ConfigField; protected JTextArea pkcs11ConfigField;
protected JComboBox<Level> rootLoggingLevelField; protected JComboBox rootLoggingLevelField;
protected JComboBox<Level> davmailLoggingLevelField; protected JComboBox davmailLoggingLevelField;
protected JComboBox<Level> httpclientLoggingLevelField; protected JComboBox httpclientLoggingLevelField;
protected JComboBox<Level> wireLoggingLevelField; protected JComboBox wireLoggingLevelField;
protected JTextField logFilePathField; protected JTextField logFilePathField;
protected JTextField logFileSizeField; protected JTextField logFileSizeField;
@ -102,7 +102,7 @@ public class SettingsFrame extends JFrame {
protected JCheckBox imapAutoExpungeCheckBox; protected JCheckBox imapAutoExpungeCheckBox;
protected JCheckBox enableKeepAliveCheckBox; protected JCheckBox enableKeepAliveCheckBox;
protected JCheckBox popMarkReadOnRetrCheckBox; protected JCheckBox popMarkReadOnRetrCheckBox;
protected JComboBox<String> enableEwsComboBox; protected JComboBox enableEwsComboBox;
protected JCheckBox enableKerberosCheckBox; protected JCheckBox enableKerberosCheckBox;
protected JTextField folderSizeLimitField; protected JTextField folderSizeLimitField;
protected JCheckBox smtpSaveInSentCheckBox; protected JCheckBox smtpSaveInSentCheckBox;
@ -151,7 +151,7 @@ public class SettingsFrame extends JFrame {
JPanel settingsPanel = new JPanel(new GridLayout(7, 2)); JPanel settingsPanel = new JPanel(new GridLayout(7, 2));
settingsPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_GATEWAY"))); settingsPanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_GATEWAY")));
enableEwsComboBox = new JComboBox<String>(new String[]{WEBDAV, EWS, AUTO}); enableEwsComboBox = new JComboBox(new String[]{WEBDAV, EWS, AUTO});
setEwsModeSelectedItem(Settings.getProperty("davmail.enableEws", "auto")); setEwsModeSelectedItem(Settings.getProperty("davmail.enableEws", "auto"));
urlField = new JTextField(Settings.getProperty("davmail.url"), 20); urlField = new JTextField(Settings.getProperty("davmail.url"), 20);
popPortField = new JTextField(Settings.getProperty("davmail.popPort"), 4); popPortField = new JTextField(Settings.getProperty("davmail.popPort"), 4);
@ -316,7 +316,7 @@ public class SettingsFrame extends JFrame {
JPanel keyStorePanel = new JPanel(new GridLayout(4, 2)); JPanel keyStorePanel = new JPanel(new GridLayout(4, 2));
keyStorePanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_DAVMAIL_SERVER_CERTIFICATE"))); keyStorePanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_DAVMAIL_SERVER_CERTIFICATE")));
keystoreTypeCombo = new JComboBox<String>(new String[]{"JKS", "PKCS12"}); keystoreTypeCombo = new JComboBox(new String[]{"JKS", "PKCS12"});
keystoreTypeCombo.setSelectedItem(Settings.getProperty("davmail.ssl.keystoreType")); keystoreTypeCombo.setSelectedItem(Settings.getProperty("davmail.ssl.keystoreType"));
keystoreFileField = new JTextField(Settings.getProperty("davmail.ssl.keystoreFile"), 17); keystoreFileField = new JTextField(Settings.getProperty("davmail.ssl.keystoreFile"), 17);
keystorePassField = new JPasswordField(Settings.getProperty("davmail.ssl.keystorePass"), 15); keystorePassField = new JPasswordField(Settings.getProperty("davmail.ssl.keystorePass"), 15);
@ -339,7 +339,7 @@ public class SettingsFrame extends JFrame {
clientKeystorePanel.setLayout(new BoxLayout(clientKeystorePanel, BoxLayout.Y_AXIS)); clientKeystorePanel.setLayout(new BoxLayout(clientKeystorePanel, BoxLayout.Y_AXIS));
clientKeystorePanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_CLIENT_CERTIFICATE"))); clientKeystorePanel.setBorder(BorderFactory.createTitledBorder(BundleMessage.format("UI_CLIENT_CERTIFICATE")));
clientKeystoreTypeCombo = new JComboBox<String>(new String[]{"PKCS11", "JKS", "PKCS12"}); clientKeystoreTypeCombo = new JComboBox(new String[]{"PKCS11", "JKS", "PKCS12"});
clientKeystoreTypeCombo.setSelectedItem(Settings.getProperty("davmail.ssl.clientKeystoreType")); clientKeystoreTypeCombo.setSelectedItem(Settings.getProperty("davmail.ssl.clientKeystoreType"));
clientKeystoreFileField = new JTextField(Settings.getProperty("davmail.ssl.clientKeystoreFile"), 17); clientKeystoreFileField = new JTextField(Settings.getProperty("davmail.ssl.clientKeystoreFile"), 17);
clientKeystorePassField = new JPasswordField(Settings.getProperty("davmail.ssl.clientKeystorePass"), 15); clientKeystorePassField = new JPasswordField(Settings.getProperty("davmail.ssl.clientKeystorePass"), 15);
@ -506,10 +506,10 @@ public class SettingsFrame extends JFrame {
loggingLevelPanel.add(leftLoggingPanel); loggingLevelPanel.add(leftLoggingPanel);
loggingLevelPanel.add(rightLoggingPanel); loggingLevelPanel.add(rightLoggingPanel);
rootLoggingLevelField = new JComboBox<Level>(LOG_LEVELS); rootLoggingLevelField = new JComboBox(LOG_LEVELS);
davmailLoggingLevelField = new JComboBox<Level>(LOG_LEVELS); davmailLoggingLevelField = new JComboBox(LOG_LEVELS);
httpclientLoggingLevelField = new JComboBox<Level>(LOG_LEVELS); httpclientLoggingLevelField = new JComboBox(LOG_LEVELS);
wireLoggingLevelField = new JComboBox<Level>(LOG_LEVELS); wireLoggingLevelField = new JComboBox(LOG_LEVELS);
logFilePathField = new JTextField(Settings.getProperty("davmail.logFilePath"), 15); logFilePathField = new JTextField(Settings.getProperty("davmail.logFilePath"), 15);
logFileSizeField = new JTextField(Settings.getProperty("davmail.logFileSize"), 15); logFileSizeField = new JTextField(Settings.getProperty("davmail.logFileSize"), 15);