Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert to Java 7's generic JComboBox

master
melvin 2013-09-12 11:16:26 +08:00
parent 8bcf0e4f16
commit 0874cde489
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/magic/ui/DownloadImagesDialog.java
View File

@ -9,6 +9,7 @@ import magic.data.IconImages;
import magic.data.WebDownloader;
import javax.swing.DefaultComboBoxModel;
import javax.swing.ComboBoxModel;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JFileChooser;
@ -36,7 +37,7 @@ public class DownloadImagesDialog extends JFrame implements Runnable,ActionListe
private final MagicFrame frame;
private final DownloadMissingFiles files;
private final JComboBox proxyComboBox;
private final JComboBox<Proxy.Type> proxyComboBox;
private final JTextField addressTextField;
private final JTextField portTextField;
private final JProgressBar progressBar;
@ -124,8 +125,8 @@ public class DownloadImagesDialog extends JFrame implements Runnable,ActionListe
SpringLayout.WEST, contentPane);
final Proxy.Type[] proxyTypes=Proxy.Type.values();
final DefaultComboBoxModel proxyModel=new DefaultComboBoxModel(proxyTypes);
proxyComboBox=new JComboBox(proxyModel);
final ComboBoxModel<Proxy.Type> proxyModel=new DefaultComboBoxModel<Proxy.Type>(proxyTypes);
proxyComboBox=new JComboBox<Proxy.Type>(proxyModel);
proxyComboBox.setFocusable(false);
proxyComboBox.addActionListener(this);
add(proxyComboBox);