From 1255a76bf3303e0b8ea6ebc474a9234cac847e8d Mon Sep 17 00:00:00 2001 From: 4pr0n Date: Thu, 17 Sep 2015 03:30:33 -0700 Subject: [PATCH] Revert "Add some type parameters to satisfy our generics gods." This reverts commit 7f097049b879f7ddf2f751617fd1a904bb5b3760. Had build errors, probably 'cause i'm using an old version of Java in my build env. --- .../java/com/rarchives/ripme/ui/MainWindow.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/ui/MainWindow.java b/src/main/java/com/rarchives/ripme/ui/MainWindow.java index 02ddc63b..99aec6d9 100644 --- a/src/main/java/com/rarchives/ripme/ui/MainWindow.java +++ b/src/main/java/com/rarchives/ripme/ui/MainWindow.java @@ -112,8 +112,8 @@ public class MainWindow implements Runnable, RipStatusHandler { // Queue private static JButton optionQueue; private static JPanel queuePanel; - private static JList queueList; - private static DefaultListModel queueListModel; + private static JList queueList; + private static DefaultListModel queueListModel; private static JScrollPane queueListScroll; // Configuration @@ -128,7 +128,7 @@ public class MainWindow implements Runnable, RipStatusHandler { private static JButton configSaveDirButton; private static JTextField configRetriesText; private static JCheckBox configAutoupdateCheckbox; - private static JComboBox configLogLevelCombobox; + private static JComboBox configLogLevelCombobox; private static JCheckBox configPlaySound; private static JCheckBox configSaveOrderCheckbox; private static JCheckBox configShowPopup; @@ -393,8 +393,8 @@ public class MainWindow implements Runnable, RipStatusHandler { queuePanel.setBorder(emptyBorder); queuePanel.setVisible(false); queuePanel.setPreferredSize(new Dimension(300, 250)); - queueListModel = new DefaultListModel(); - queueList = new JList(queueListModel); + queueListModel = new DefaultListModel(); + queueList = new JList(queueListModel); queueList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); queueListScroll = new JScrollPane(queueList, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, @@ -432,7 +432,7 @@ public class MainWindow implements Runnable, RipStatusHandler { configAutoupdateCheckbox = new JCheckBox("Auto-update?", Utils.getConfigBoolean("auto.update", true)); configAutoupdateCheckbox.setHorizontalAlignment(JCheckBox.RIGHT); configAutoupdateCheckbox.setHorizontalTextPosition(JCheckBox.LEFT); - configLogLevelCombobox = new JComboBox(new String[] {"Log level: Error", "Log level: Warn", "Log level: Info", "Log level: Debug"}); + configLogLevelCombobox = new JComboBox(new String[] {"Log level: Error", "Log level: Warn", "Log level: Info", "Log level: Debug"}); configLogLevelCombobox.setSelectedItem(Utils.getConfigString("log.level", "Log level: Debug")); setLogLevel(configLogLevelCombobox.getSelectedItem().toString()); configPlaySound = new JCheckBox("Sound when rip completes", Utils.getConfigBoolean("play.sound", false)); @@ -668,7 +668,7 @@ public class MainWindow implements Runnable, RipStatusHandler { configLogLevelCombobox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent arg0) { - String level = ((JComboBox) arg0.getSource()).getSelectedItem().toString(); + String level = ((JComboBox) arg0.getSource()).getSelectedItem().toString(); setLogLevel(level); } });