/hg/icedtea-web: Use Swing generics, cleanup with diamond operator
aazores at icedtea.classpath.org
aazores at icedtea.classpath.org
Mon Apr 14 13:22:05 UTC 2014
changeset 94dc6b7515b5 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=94dc6b7515b5
author: Andrew Azores <aazores at redhat.com>
date: Mon Apr 14 09:21:41 2014 -0400
Use Swing generics, cleanup with diamond operator
* netx/net/sourceforge/jnlp/controlpanel/CachePane.java
* 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
* netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java
diffstat:
ChangeLog | 12 +++
netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java | 7 +-
netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java | 8 +-
netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java | 5 +-
netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java | 2 +-
netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java | 32 +++++----
netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java | 16 ++--
netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java | 9 +-
8 files changed, 56 insertions(+), 35 deletions(-)
diffs (361 lines):
diff -r 3dde3780f8bd -r 94dc6b7515b5 ChangeLog
--- a/ChangeLog Thu Apr 10 16:03:23 2014 -0400
+++ b/ChangeLog Mon Apr 14 09:21:41 2014 -0400
@@ -1,3 +1,15 @@
+2014-04-14 Andrew Azores <aazores at redhat.com>
+
+ Use Swing generics, cleanup with diamond operator
+ * netx/net/sourceforge/jnlp/controlpanel/CachePane.java
+ * 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
+ * netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java
+
2014-04-10 Andrew Azores <aazores at redhat.com>
Update PolicyEditor classes for Java 7 - Swing Generics, Diamond operator.
diff -r 3dde3780f8bd -r 94dc6b7515b5 netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Thu Apr 10 16:03:23 2014 -0400
+++ b/netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java Mon Apr 14 09:21:41 2014 -0400
@@ -292,12 +292,13 @@
settingsPanel.add(p, panel.toString());
}
- final JList settingsList = new JList(panels);
+ final JList<SettingsPanel> settingsList = new JList<>(panels);
settingsList.addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) {
- JList list = (JList) e.getSource();
- SettingsPanel panel = (SettingsPanel) list.getSelectedValue();
+ @SuppressWarnings("unchecked")
+ JList<SettingsPanel> list = (JList<SettingsPanel>) e.getSource();
+ SettingsPanel panel = list.getSelectedValue();
CardLayout cl = (CardLayout) settingsPanel.getLayout();
cl.show(settingsPanel, panel.toString());
}
diff -r 3dde3780f8bd -r 94dc6b7515b5 netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Thu Apr 10 16:03:23 2014 -0400
+++ b/netx/net/sourceforge/jnlp/controlpanel/DebuggingPanel.java Mon Apr 14 09:21:41 2014 -0400
@@ -27,6 +27,7 @@
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
+
import javax.swing.Box;
import javax.swing.JButton;
import javax.swing.JCheckBox;
@@ -36,6 +37,7 @@
import javax.swing.JTextField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+
import net.sourceforge.jnlp.config.Defaults;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.runtime.Translator;
@@ -139,7 +141,7 @@
new ComboItem(Translator.R("DPShowJavawsOnly"), DeploymentConfiguration.CONSOLE_SHOW_JAVAWS) };
JLabel consoleLabel = new JLabel(Translator.R("DPJavaConsole"));
- JComboBox consoleComboBox = new JComboBox();
+ JComboBox<ComboItem> consoleComboBox = new JComboBox<>();
consoleComboBox.setActionCommand(DeploymentConfiguration.KEY_CONSOLE_STARTUP_MODE); // The property this comboBox affects.
JPanel consolePanel = new JPanel();
@@ -201,7 +203,6 @@
}
@Override
- @SuppressWarnings("unchecked")
public void itemStateChanged(ItemEvent e) {
Object o = e.getSource();
@@ -210,7 +211,8 @@
JCheckBox jcb = (JCheckBox) o;
config.setProperty(jcb.getActionCommand(), String.valueOf(jcb.isSelected()));
} else if (o instanceof JComboBox) {
- JComboBox jcb = (JComboBox) o;
+ @SuppressWarnings("unchecked")
+ JComboBox<ComboItem> jcb = (JComboBox<ComboItem>) o;
ComboItem c = (ComboItem) e.getItem();
config.setProperty(jcb.getActionCommand(), c.getValue());
}
diff -r 3dde3780f8bd -r 94dc6b7515b5 netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java Thu Apr 10 16:03:23 2014 -0400
+++ b/netx/net/sourceforge/jnlp/controlpanel/DesktopShortcutPanel.java Mon Apr 14 09:21:41 2014 -0400
@@ -62,7 +62,7 @@
private void addComponents() {
GridBagConstraints c = new GridBagConstraints();
JLabel description = new JLabel("<html>" + Translator.R("CPDesktopIntegrationDescription") + "<hr /></html>");
- JComboBox shortcutComboOptions = new JComboBox();
+ JComboBox<ComboItem> shortcutComboOptions = new JComboBox<>();
ComboItem[] items = { new ComboItem(Translator.R("DSPNeverCreate"), "NEVER"),
new ComboItem(Translator.R("DSPAlwaysAllow"), "ALWAYS"),
new ComboItem(Translator.R("DSPAskUser"), "ASK_USER"),
@@ -94,8 +94,9 @@
add(filler, c);
}
+ @SuppressWarnings("unchecked")
public void itemStateChanged(ItemEvent e) {
ComboItem c = (ComboItem) e.getItem();
- config.setProperty(((JComboBox) e.getSource()).getActionCommand(), c.getValue());
+ config.setProperty(((JComboBox<ComboItem>) e.getSource()).getActionCommand(), c.getValue());
}
}
diff -r 3dde3780f8bd -r 94dc6b7515b5 netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java Thu Apr 10 16:03:23 2014 -0400
+++ b/netx/net/sourceforge/jnlp/controlpanel/TemporaryInternetFilesPanel.java Mon Apr 14 09:21:41 2014 -0400
@@ -163,7 +163,7 @@
new ComboItem("7", "7"),
new ComboItem("8", "8"),
new ComboItem(Translator.R("TIFPMax"), "9"), };
- JComboBox cbCompression = new JComboBox(compressionOptions);
+ JComboBox<ComboItem> cbCompression = new JComboBox<>(compressionOptions);
cbCompression.setSelectedIndex(Integer.parseInt(this.config.getProperty(properties[3])));
cbCompression.addItemListener(new ItemListener() {
@Override
diff -r 3dde3780f8bd -r 94dc6b7515b5 netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java Thu Apr 10 16:03:23 2014 -0400
+++ b/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java Mon Apr 14 09:21:41 2014 -0400
@@ -51,6 +51,7 @@
import java.util.Date;
import java.util.List;
import java.util.regex.Pattern;
+
import javax.swing.DefaultCellEditor;
import javax.swing.JComboBox;
import javax.swing.JDialog;
@@ -72,6 +73,7 @@
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter;
+
import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.security.appletextendedsecurity.AppletSecurityLevel;
@@ -95,9 +97,9 @@
private javax.swing.JButton moveRowDownButton;
private javax.swing.JCheckBox askBeforeActionCheckBox;
private javax.swing.JCheckBox filterRegexesCheckBox;
- private javax.swing.JComboBox mainPolicyComboBox;
- private javax.swing.JComboBox deleteTypeComboBox;
- private javax.swing.JComboBox viewFilter;
+ private javax.swing.JComboBox<AppletSecurityLevel> mainPolicyComboBox;
+ private javax.swing.JComboBox<String> deleteTypeComboBox;
+ private javax.swing.JComboBox<String> viewFilter;
private javax.swing.JLabel globalBehaviourLabel;
private javax.swing.JLabel securityLevelLabel;
private javax.swing.JScrollPane userTableScrollPane;
@@ -175,7 +177,7 @@
setButtons((!currentModel.back.isReadOnly()));
}
- public String appletItemsToCaption(List<UnsignedAppletActionEntry> ii, String caption) {
+ public static String appletItemsToCaption(List<UnsignedAppletActionEntry> ii, String caption) {
StringBuilder sb = new StringBuilder();
for (UnsignedAppletActionEntry i : ii) {
sb.append(appletItemToCaption(i, caption)).append("\n");
@@ -197,7 +199,7 @@
public static void removeSelectedFromTable(JTable table, boolean ask, UnsignedAppletActionTableModel data, Component forDialog) {
int[] originalIndexes = table.getSelectedRows();
- List<Integer> newIndexes = new ArrayList<Integer>(originalIndexes.length);
+ List<Integer> newIndexes = new ArrayList<>(originalIndexes.length);
for (int i = 0; i < originalIndexes.length; i++) {
//we need to remap values first
int modelRow = table.convertRowIndexToModel(originalIndexes[i]);
@@ -249,7 +251,7 @@
userTable = createTbale(customModel);
globalTable = createTbale(globalModel);
helpButton = new javax.swing.JButton();
- mainPolicyComboBox = new JComboBox(new AppletSecurityLevel[]{
+ mainPolicyComboBox = new JComboBox<>(new AppletSecurityLevel[] {
AppletSecurityLevel.DENY_ALL,
AppletSecurityLevel.DENY_UNSIGNED,
AppletSecurityLevel.ASK_UNSIGNED,
@@ -258,8 +260,8 @@
mainPolicyComboBox.setSelectedItem(AppletSecurityLevel.getDefault());
securityLevelLabel = new javax.swing.JLabel();
globalBehaviourLabel = new javax.swing.JLabel();
- deleteTypeComboBox = new javax.swing.JComboBox();
- viewFilter = new javax.swing.JComboBox();
+ 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 +337,7 @@
globalBehaviourLabel.setText(Translator.R("APPEXTSECguiPanelGlobalBehaviourCaption"));
- deleteTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel(new String[]{
+ deleteTypeComboBox.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] {
Translator.R("APPEXTSECguiPanelDeleteMenuSelected"),
Translator.R("APPEXTSECguiPanelDeleteMenuAllA"),
Translator.R("APPEXTSECguiPanelDeleteMenuAllN"),
@@ -343,7 +345,7 @@
Translator.R("APPEXTSECguiPanelDeleteMenuAlln"),
Translator.R("APPEXTSECguiPanelDeleteMenuAllAll")}));
- viewFilter.setModel(new javax.swing.DefaultComboBoxModel(new String[]{
+ viewFilter.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] {
Translator.R("APPEXTSECguiPanelShowOnlyPermanent"),
Translator.R("APPEXTSECguiPanelShowOnlyTemporal"),
Translator.R("APPEXTSECguiPanelShowAll"),
@@ -681,7 +683,7 @@
}
}
- private void helpButtonActionPerformed(java.awt.event.ActionEvent evt) {
+ private static void helpButtonActionPerformed(java.awt.event.ActionEvent evt) {
JDialog d = new ExtendedAppletSecurityHelp(null, false);
ScreenFinder.centerWindowsToCurrentScreen(d);
d.setVisible(true);
@@ -701,7 +703,11 @@
public TableCellEditor getCellEditor(int row, int column) {
int columnx = convertColumnIndexToModel(column);
if (columnx == 0) {
- return new DefaultCellEditor(new JComboBox(new ExecuteAppletAction[]{ExecuteAppletAction.ALWAYS, ExecuteAppletAction.NEVER, ExecuteAppletAction.YES, ExecuteAppletAction.NO}));
+ return new DefaultCellEditor(new JComboBox<>(new ExecuteAppletAction[] {
+ ExecuteAppletAction.ALWAYS,
+ ExecuteAppletAction.NEVER,
+ ExecuteAppletAction.YES,
+ ExecuteAppletAction.NO }));
}
if (columnx == 2) {
column = convertColumnIndexToModel(column);
@@ -761,7 +767,7 @@
private void removeByBehaviour(ExecuteAppletAction unsignedAppletAction) {
UnsignedAppletActionEntry[] items = currentModel.back.toArray();
if (askBeforeActionCheckBox.isSelected()) {
- List<UnsignedAppletActionEntry> toBeDeleted = new ArrayList<UnsignedAppletActionEntry>();
+ List<UnsignedAppletActionEntry> toBeDeleted = new ArrayList<>();
for (int i = 0; i < items.length; i++) {
UnsignedAppletActionEntry unsignedAppletActionEntry = items[i];
if (unsignedAppletActionEntry.getUnsignedAppletAction() == unsignedAppletAction) {
diff -r 3dde3780f8bd -r 94dc6b7515b5 netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java
--- a/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java Thu Apr 10 16:03:23 2014 -0400
+++ b/netx/net/sourceforge/jnlp/security/viewer/CertificatePane.java Mon Apr 14 09:21:41 2014 -0400
@@ -108,7 +108,7 @@
JTabbedPane tabbedPane;
private final JTable userTable;
private final JTable systemTable;
- private JComboBox certificateTypeCombo;
+ private JComboBox<CertificateType> certificateTypeCombo;
private KeyStores.Type currentKeyStoreType;
private KeyStores.Level currentKeyStoreLevel;
@@ -130,7 +130,7 @@
userTable = new JTable(null);
systemTable = new JTable(null);
- disableForSystem = new ArrayList<JComponent>();
+ disableForSystem = new ArrayList<>();
addComponents();
@@ -165,7 +165,7 @@
JLabel certificateTypeLabel = new JLabel(R("CVCertificateType"));
- certificateTypeCombo = new JComboBox(certificateTypes);
+ certificateTypeCombo = new JComboBox<>(certificateTypes);
certificateTypeCombo.addActionListener(new CertificateTypeListener());
certificateTypePanel.add(certificateTypeLabel, BorderLayout.LINE_START);
@@ -257,7 +257,7 @@
private void readKeyStore() {
Enumeration<String> aliases = null;
- certs = new ArrayList<X509Certificate>();
+ certs = new ArrayList<>();
try {
//Get all of the X509Certificates and put them into an ArrayList
@@ -279,7 +279,7 @@
SecurityUtil.getCN(c.getIssuerX500Principal().getName());
}
} catch (Exception e) {
- //TODO
+ // TODO handle exception
OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e);
}
}
@@ -314,9 +314,7 @@
if (result == JOptionPane.OK_OPTION) {
return jpf.getPassword();
}
- else {
- return null;
- }
+ return null;
}
/** Allows storing KeyStores.Types in a JComponent */
@@ -342,7 +340,7 @@
@Override
@SuppressWarnings("unchecked")//this is just certificateTypeCombo, nothing else
public void actionPerformed(ActionEvent e) {
- JComboBox source = (JComboBox) e.getSource();
+ JComboBox<CertificateType> source = (JComboBox<CertificateType>) e.getSource();
CertificateType type = (CertificateType) source.getSelectedItem();
currentKeyStoreType = type.getType();
repopulateTables();
diff -r 3dde3780f8bd -r 94dc6b7515b5 netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java
--- a/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java Thu Apr 10 16:03:23 2014 -0400
+++ b/netx/net/sourceforge/jnlp/util/logging/ConsoleOutputPane.java Mon Apr 14 09:21:41 2014 -0400
@@ -15,6 +15,7 @@
import java.util.Observer;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern;
+
import javax.swing.ButtonGroup;
import javax.swing.JFrame;
import javax.swing.JMenuItem;
@@ -26,6 +27,7 @@
import javax.swing.text.Document;
import javax.swing.text.PlainDocument;
import javax.swing.text.html.HTMLDocument;
+
import net.sourceforge.jnlp.runtime.JNLPRuntime;
import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.util.logging.headers.ObservableMessagesProvider;
@@ -247,7 +249,6 @@
statistics.setText(model.createStatisticHint());
}
- @SuppressWarnings("unchecked")
private void initComponents() {
jPanel2 = new javax.swing.JPanel();
@@ -267,7 +268,7 @@
showPreInit = new javax.swing.JCheckBox();
sortByLabel = new javax.swing.JLabel();
regExLabel = new javax.swing.JCheckBox();
- sortBy = new javax.swing.JComboBox();
+ sortBy = new javax.swing.JComboBox<>();
searchLabel = new javax.swing.JLabel();
autorefresh = new javax.swing.JCheckBox();
refresh = new javax.swing.JButton();
@@ -362,7 +363,7 @@
regExLabel.setText(Translator.R("COPregex") + ":");
regExLabel.addActionListener(getDefaultActionSingleton());
- sortBy.setModel(new javax.swing.DefaultComboBoxModel(new String[]{
+ sortBy.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] {
Translator.R("COPAsArrived"),
Translator.R("COPuser"),
Translator.R("COPorigin"),
@@ -943,7 +944,7 @@
private javax.swing.JCheckBox showThread2;
private javax.swing.JCheckBox showUser;
private javax.swing.JCheckBox sortCopyAll;
- private javax.swing.JComboBox sortBy;
+ private javax.swing.JComboBox<String> sortBy;
private javax.swing.JLabel sortByLabel;
private javax.swing.JLabel statistics;
private javax.swing.JCheckBox wordWrap;
More information about the distro-pkg-dev
mailing list