/hg/icedtea-web: Made again compatible with JDK6.All JLists, JCo...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Dec 13 02:43:02 PST 2013
changeset 48b7db08527c in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=48b7db08527c
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Dec 13 11:49:51 2013 +0100
Made again compatible with JDK6.All JLists, JComboBoxs, and DefaultComboBoxModels moved back to be not generics-like
in netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java, netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java, netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java, netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java, netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java, netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java
diffstat:
ChangeLog | 11 ++++++
netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java | 2 +-
netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java | 4 +-
netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java | 2 +-
netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java | 2 +-
netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java | 18 +++++-----
netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 6 +-
7 files changed, 28 insertions(+), 17 deletions(-)
diffs (168 lines):
diff -r eb344d690bf1 -r 48b7db08527c ChangeLog
--- a/ChangeLog Fri Dec 13 10:47:07 2013 +0100
+++ b/ChangeLog Fri Dec 13 11:49:51 2013 +0100
@@ -1,3 +1,14 @@
+2013-12-13 Jiri Vanek <jvanek at redhat.com>
+
+ Made again compatible with JDK6.All JLists, JComboBoxs, and DefaultComboBoxModels
+ moved back to be not generics-like
+ * netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
+ * netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java
+ * netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java
+ * netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java
+ * netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java
+ * netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java
+
2013-12-13 Jiri Vanek <jvanek at redhat.com>
itw itself warning cleanup: fixed rawtypes and unchecks, added braces and Override
diff -r eb344d690bf1 -r 48b7db08527c netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Fri Dec 13 10:47:07 2013 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Fri Dec 13 11:49:51 2013 +0100
@@ -291,7 +291,7 @@
settingsPanel.add(p, panel.toString());
}
- final JList<SettingsPanel> settingsList = new JList<SettingsPanel>(panels);
+ final JList settingsList = new JList(panels);
settingsList.addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) {
diff -r eb344d690bf1 -r 48b7db08527c netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Fri Dec 13 10:47:07 2013 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Fri Dec 13 11:49:51 2013 +0100
@@ -139,7 +139,7 @@
new ComboItem(Translator.R("DPShowJavawsOnly"), DeploymentConfiguration.CONSOLE_SHOW_JAVAWS) };
JLabel consoleLabel = new JLabel(Translator.R("DPJavaConsole"));
- JComboBox<ComboItem> consoleComboBox = new JComboBox<ComboItem>();
+ JComboBox consoleComboBox = new JComboBox();
consoleComboBox.setActionCommand(DeploymentConfiguration.KEY_CONSOLE_STARTUP_MODE); // The property this comboBox affects.
JPanel consolePanel = new JPanel();
@@ -210,7 +210,7 @@
JCheckBox jcb = (JCheckBox) o;
config.setProperty(jcb.getActionCommand(), String.valueOf(jcb.isSelected()));
} else if (o instanceof JComboBox) {
- JComboBox<ComboItem> jcb = (JComboBox) o;
+ JComboBox jcb = (JComboBox) o;
ComboItem c = (ComboItem) e.getItem();
config.setProperty(jcb.getActionCommand(), c.getValue());
}
diff -r eb344d690bf1 -r 48b7db08527c netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java Fri Dec 13 10:47:07 2013 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java Fri Dec 13 11:49:51 2013 +0100
@@ -62,7 +62,7 @@
private void addComponents() {
GridBagConstraints c = new GridBagConstraints();
JLabel description = new JLabel("<html>" + Translator.R("CPDesktopIntegrationDescription") + "<hr /></html>");
- JComboBox<ComboItem> shortcutComboOptions = new JComboBox<ComboItem>();
+ JComboBox shortcutComboOptions = new JComboBox();
ComboItem[] items = { new ComboItem(Translator.R("DSPNeverCreate"), "NEVER"),
new ComboItem(Translator.R("DSPAlwaysAllow"), "ALWAYS"),
new ComboItem(Translator.R("DSPAskUser"), "ASK_USER"),
diff -r eb344d690bf1 -r 48b7db08527c netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java Fri Dec 13 10:47:07 2013 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java Fri Dec 13 11:49:51 2013 +0100
@@ -163,7 +163,7 @@
new ComboItem("7", "7"),
new ComboItem("8", "8"),
new ComboItem(Translator.R("TIFPMax"), "9"), };
- JComboBox<ComboItem> cbCompression = new JComboBox<ComboItem>(compressionOptions);
+ JComboBox cbCompression = new JComboBox(compressionOptions);
cbCompression.setSelectedIndex(Integer.parseInt(this.config.getProperty(properties[3])));
cbCompression.addItemListener(new ItemListener() {
@Override
diff -r eb344d690bf1 -r 48b7db08527c netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java Fri Dec 13 10:47:07 2013 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java Fri Dec 13 11:49:51 2013 +0100
@@ -95,9 +95,9 @@
private javax.swing.JButton moveRowDownButton;
private javax.swing.JCheckBox askBeforeActionCheckBox;
private javax.swing.JCheckBox filterRegexesCheckBox;
- private javax.swing.JComboBox<AppletSecurityLevel> mainPolicyComboBox;
- private javax.swing.JComboBox<String> deleteTypeComboBox;
- private javax.swing.JComboBox<String> viewFilter;
+ private javax.swing.JComboBox mainPolicyComboBox;
+ private javax.swing.JComboBox deleteTypeComboBox;
+ private javax.swing.JComboBox viewFilter;
private javax.swing.JLabel globalBehaviourLabel;
private javax.swing.JLabel securityLevelLabel;
private javax.swing.JScrollPane userTableScrollPane;
@@ -249,7 +249,7 @@
userTable = createTbale(customModel);
globalTable = createTbale(globalModel);
helpButton = new javax.swing.JButton();
- mainPolicyComboBox = new JComboBox<AppletSecurityLevel>(new AppletSecurityLevel[]{
+ mainPolicyComboBox = new JComboBox(new AppletSecurityLevel[]{
AppletSecurityLevel.DENY_ALL,
AppletSecurityLevel.DENY_UNSIGNED,
AppletSecurityLevel.ASK_UNSIGNED,
@@ -258,8 +258,8 @@
mainPolicyComboBox.setSelectedItem(AppletSecurityLevel.getDefault());
securityLevelLabel = new javax.swing.JLabel();
globalBehaviourLabel = new javax.swing.JLabel();
- deleteTypeComboBox = new javax.swing.JComboBox<String>();
- viewFilter = new javax.swing.JComboBox<String>();
+ deleteTypeComboBox = new javax.swing.JComboBox();
+ viewFilter = new javax.swing.JComboBox();
deleteButton = new javax.swing.JButton();
testUrlButton = new javax.swing.JButton();
addRowButton = new javax.swing.JButton();
@@ -335,7 +335,7 @@
globalBehaviourLabel.setText(Translator.R("APPEXTSECguiPanelGlobalBehaviourCaption"));
- deleteTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[]{
+ deleteTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[]{
Translator.R("APPEXTSECguiPanelDeleteMenuSelected"),
Translator.R("APPEXTSECguiPanelDeleteMenuAllA"),
Translator.R("APPEXTSECguiPanelDeleteMenuAllN"),
@@ -343,7 +343,7 @@
Translator.R("APPEXTSECguiPanelDeleteMenuAlln"),
Translator.R("APPEXTSECguiPanelDeleteMenuAllAll")}));
- viewFilter.setModel(new javax.swing.DefaultComboBoxModel<String>(new String[]{
+ viewFilter.setModel(new javax.swing.DefaultComboBoxModel(new String[]{
Translator.R("APPEXTSECguiPanelShowOnlyPermanent"),
Translator.R("APPEXTSECguiPanelShowOnlyTemporal"),
Translator.R("APPEXTSECguiPanelShowAll"),
@@ -701,7 +701,7 @@
public TableCellEditor getCellEditor(int row, int column) {
int columnx = convertColumnIndexToModel(column);
if (columnx == 0) {
- return new DefaultCellEditor(new JComboBox<ExecuteUnsignedApplet>(new ExecuteUnsignedApplet[]{ExecuteUnsignedApplet.ALWAYS, ExecuteUnsignedApplet.NEVER, ExecuteUnsignedApplet.YES, ExecuteUnsignedApplet.NO}));
+ return new DefaultCellEditor(new JComboBox(new ExecuteUnsignedApplet[]{ExecuteUnsignedApplet.ALWAYS, ExecuteUnsignedApplet.NEVER, ExecuteUnsignedApplet.YES, ExecuteUnsignedApplet.NO}));
}
if (columnx == 2) {
column = convertColumnIndexToModel(column);
diff -r eb344d690bf1 -r 48b7db08527c netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java
--- a/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java Fri Dec 13 10:47:07 2013 +0100
+++ b/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java Fri Dec 13 11:49:51 2013 +0100
@@ -108,7 +108,7 @@
JTabbedPane tabbedPane;
private final JTable userTable;
private final JTable systemTable;
- private JComboBox<CertificateType> certificateTypeCombo;
+ private JComboBox certificateTypeCombo;
private KeyStores.Type currentKeyStoreType;
private KeyStores.Level currentKeyStoreLevel;
@@ -165,7 +165,7 @@
JLabel certificateTypeLabel = new JLabel(R("CVCertificateType"));
- certificateTypeCombo = new JComboBox<CertificateType>(certificateTypes);
+ certificateTypeCombo = new JComboBox(certificateTypes);
certificateTypeCombo.addActionListener(new CertificateTypeListener());
certificateTypePanel.add(certificateTypeLabel, BorderLayout.LINE_START);
@@ -342,7 +342,7 @@
@Override
@SuppressWarnings("unchecked")//this is just certificateTypeCombo, nothing else
public void actionPerformed(ActionEvent e) {
- JComboBox<CertificateType> source = (JComboBox<CertificateType>) e.getSource();
+ JComboBox source = (JComboBox) e.getSource();
CertificateType type = (CertificateType) source.getSelectedItem();
currentKeyStoreType = type.getType();
repopulateTables();
More information about the distro-pkg-dev
mailing list