Skip to content
This repository
Browse code

Mac developers complain too much!

Fiiiine, I'll remove the items JJ did to break the java 6 compiling lol.
  • Loading branch information...
commit 062f9186e09e04992038c77582f36c4359372aad 1 parent 4768741
Sean Schwartz unv-annihilator authored
15 .classpath
... ... @@ -1,8 +1,7 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<classpath>
3   - <classpathentry kind="src" path="src"/>
4   - <classpathentry kind="src" path="res"/>
5   - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
6   - <classpathentry kind="lib" path="External Jars/swingx-all-1.6.4.jar"/>
7   - <classpathentry kind="output" path="bin"/>
8   -</classpath>
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<classpath>
  3 + <classpathentry kind="src" path="src"/>
  4 + <classpathentry kind="src" path="res"/>
  5 + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
  6 + <classpathentry kind="output" path="bin"/>
  7 +</classpath>
6 src/net/ftb/gui/dialogs/TexturePackFilterDialog.java
@@ -37,7 +37,7 @@
37 37 public class TexturePackFilterDialog extends JDialog {
38 38 private JPanel panel = new JPanel();
39 39 private JLabel compatibleLbl = new JLabel("Compatible Pack:"), resolutionLbl = new JLabel("Mod Pack Resolution:");
40   - private JComboBox<String> compatibleBox, resolutionBox;
  40 + private JComboBox compatibleBox, resolutionBox;
41 41 private JButton applyButton = new JButton("Apply Filter"), cancelButton = new JButton("Cancel"), searchButton = new JButton("Search Packs");
42 42
43 43 private TexturepackPane instance;
@@ -93,7 +93,7 @@ private void setupGui() {
93 93 }
94 94 }
95 95 }
96   - compatibleBox = new JComboBox<String>(comp.toArray(new String[]{}));
  96 + compatibleBox = new JComboBox(comp.toArray(new String[]{}));
97 97
98 98 ArrayList<String> res = new ArrayList<String>();
99 99 res.add("All");
@@ -102,7 +102,7 @@ private void setupGui() {
102 102 res.add(TexturePack.getTexturePack(i).getResolution());
103 103 }
104 104 }
105   - resolutionBox = new JComboBox<String>(res.toArray(new String[]{}));
  105 + resolutionBox = new JComboBox(res.toArray(new String[]{}));
106 106
107 107 compatibleBox.setSelectedItem(instance.compatible);
108 108 resolutionBox.setSelectedItem(instance.resolution);
4 src/net/ftb/gui/panes/ModpacksPane.java
@@ -71,7 +71,7 @@
71 71 private static JButton server;
72 72
73 73 private JButton privatePack;
74   - private static JComboBox<String> version;
  74 + private static JComboBox version;
75 75 private static int selectedPack = 0;
76 76 private static boolean modPacksAdded = false;
77 77 private static HashMap<Integer, ModPack> currentPacks = new HashMap<Integer, ModPack>();
@@ -219,7 +219,7 @@ public void actionPerformed(ActionEvent event) {
219 219 });
220 220 add(server);
221 221
222   - version = new JComboBox<String>(new String[]{});
  222 + version = new JComboBox(new String[]{});
223 223 version.setBounds(560, 5, 130, 25);
224 224 version.addActionListener(new ActionListener() {
225 225 @Override

0 comments on commit 062f918

Please sign in to comment.
Something went wrong with that request. Please try again.