diff options
Diffstat (limited to 'netx/net/sourceforge/jnlp')
6 files changed, 17 insertions, 17 deletions
diff --git a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java index 7a50d68..3caa4a2 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java +++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java @@ -291,7 +291,7 @@ public class ControlPanel extends JFrame { 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 --git a/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java b/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java index 559b4d5..fc7eb8e 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java +++ b/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java @@ -139,7 +139,7 @@ public class DebuggingPanel extends NamedBorderPanel implements ItemListener { 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 @@ public class DebuggingPanel extends NamedBorderPanel implements ItemListener { 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 --git a/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java b/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java index 57d9059..68ea968 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java +++ b/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java @@ -62,7 +62,7 @@ public class DesktopShortcutPanel extends NamedBorderPanel implements ItemListen 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 --git a/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java b/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java index 7519b2f..f42ed08 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java +++ b/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java @@ -163,7 +163,7 @@ public class TemporaryInternetFilesPanel extends NamedBorderPanel implements Cha 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 --git a/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java b/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java index 727c94c..2059d38 100644 --- a/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java +++ b/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java @@ -95,9 +95,9 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { 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 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { 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 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { 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 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { 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 @@ public class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { 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 class UnsignedAppletsTrustingListPanel extends javax.swing.JPanel { 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 --git a/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java b/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java index 71b48aa..7564fb5 100644 --- a/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java +++ b/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java @@ -108,7 +108,7 @@ public class CertificatePane extends JPanel { 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 @@ public class CertificatePane extends JPanel { 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 @@ public class CertificatePane extends JPanel { @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(); |