Gurkengewuerz/ImgScroll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #231 from drguildo/drguildo

Browse Source 
Upate apache commons maven source, generic type parameters.
This commit is contained in:
4_pr0n 2015-09-17 03:29:04 -07:00
commit 5d31eb4f1a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -44,7 +44,7 @@
<version>1.2</version> <version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>1.3.2</version> <version>1.3.2</version>
</dependency> </dependency>

14
src/main/java/com/rarchives/ripme/ui/MainWindow.java
View File

@ -111,8 +111,8 @@ public class MainWindow implements Runnable, RipStatusHandler {
// Queue // Queue
private static JButton optionQueue; private static JButton optionQueue;
private static JPanel queuePanel; private static JPanel queuePanel;
private static JList queueList; private static JList<String> queueList;
private static DefaultListModel queueListModel; private static DefaultListModel<String> queueListModel;
private static JScrollPane queueListScroll; private static JScrollPane queueListScroll;
// Configuration // Configuration
@ -127,7 +127,7 @@ public class MainWindow implements Runnable, RipStatusHandler {
private static JButton configSaveDirButton; private static JButton configSaveDirButton;
private static JTextField configRetriesText; private static JTextField configRetriesText;
private static JCheckBox configAutoupdateCheckbox; private static JCheckBox configAutoupdateCheckbox;
private static JComboBox configLogLevelCombobox; private static JComboBox<String> configLogLevelCombobox;
private static JCheckBox configPlaySound; private static JCheckBox configPlaySound;
private static JCheckBox configSaveOrderCheckbox; private static JCheckBox configSaveOrderCheckbox;
private static JCheckBox configShowPopup; private static JCheckBox configShowPopup;
@ -392,8 +392,8 @@ public class MainWindow implements Runnable, RipStatusHandler {
queuePanel.setBorder(emptyBorder); queuePanel.setBorder(emptyBorder);
queuePanel.setVisible(false); queuePanel.setVisible(false);
queuePanel.setPreferredSize(new Dimension(300, 250)); queuePanel.setPreferredSize(new Dimension(300, 250));
queueListModel = new DefaultListModel(); queueListModel = new DefaultListModel<String>();
queueList = new JList(queueListModel); queueList = new JList<String>(queueListModel);
queueList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); queueList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
queueListScroll = new JScrollPane(queueList, queueListScroll = new JScrollPane(queueList,
JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
@ -423,7 +423,7 @@ public class MainWindow implements Runnable, RipStatusHandler {
configAutoupdateCheckbox = new JCheckBox("Auto-update?", Utils.getConfigBoolean("auto.update", true)); configAutoupdateCheckbox = new JCheckBox("Auto-update?", Utils.getConfigBoolean("auto.update", true));
configAutoupdateCheckbox.setHorizontalAlignment(JCheckBox.RIGHT); configAutoupdateCheckbox.setHorizontalAlignment(JCheckBox.RIGHT);
configAutoupdateCheckbox.setHorizontalTextPosition(JCheckBox.LEFT); configAutoupdateCheckbox.setHorizontalTextPosition(JCheckBox.LEFT);
configLogLevelCombobox = new JComboBox(new String[] {"Log level: Error", "Log level: Warn", "Log level: Info", "Log level: Debug"}); configLogLevelCombobox = new JComboBox<String>(new String[] {"Log level: Error", "Log level: Warn", "Log level: Info", "Log level: Debug"});
configLogLevelCombobox.setSelectedItem(Utils.getConfigString("log.level", "Log level: Debug")); configLogLevelCombobox.setSelectedItem(Utils.getConfigString("log.level", "Log level: Debug"));
setLogLevel(configLogLevelCombobox.getSelectedItem().toString()); setLogLevel(configLogLevelCombobox.getSelectedItem().toString());
configPlaySound = new JCheckBox("Sound when rip completes", Utils.getConfigBoolean("play.sound", false)); configPlaySound = new JCheckBox("Sound when rip completes", Utils.getConfigBoolean("play.sound", false));
@ -659,7 +659,7 @@ public class MainWindow implements Runnable, RipStatusHandler {
configLogLevelCombobox.addActionListener(new ActionListener() { configLogLevelCombobox.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent arg0) { public void actionPerformed(ActionEvent arg0) {
String level = ((JComboBox) arg0.getSource()).getSelectedItem().toString(); String level = ((JComboBox<?>) arg0.getSource()).getSelectedItem().toString();
setLogLevel(level); setLogLevel(level);
} }
}); });