don't use diamond types, a JDK 1.7 feature

OpherV · Sep 10, 2015 · c2bb358 · c2bb358
1 parent f4a8302
commit c2bb358
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/gitflow/GitflowImpl.java b/src/gitflow/GitflowImpl.java
@@ -391,7 +391,7 @@ public GitCommandResult publishHotfix(@NotNull GitRepository repository,
     }
 
     private void setUrl(GitLineHandler h, GitRepository repository) {
-        ArrayList<GitRemote> remotes = new ArrayList<>(repository.getRemotes());
+        ArrayList<GitRemote> remotes = new ArrayList<GitRemote>(repository.getRemotes());
 
         //make sure a remote repository is available
         if (!remotes.isEmpty()) {

diff --git a/src/gitflow/ui/AbstractBranchStartDialog.java b/src/gitflow/ui/AbstractBranchStartDialog.java
@@ -20,7 +20,7 @@ public abstract class AbstractBranchStartDialog extends DialogWrapper {
 
     private JPanel contentPane;
     private JTextField branchNameTextField;
-    private JComboBox<ComboEntry> branchFromCombo;
+    private JComboBox branchFromCombo;
     private JLabel branchNameLabel;
 
     private Project project;
@@ -92,7 +92,7 @@ protected JComponent createCenterPanel() {
         return contentPane;
     }
 
-    private ComboBoxModel<ComboEntry> createBranchComboModel() {
+    private ComboBoxModel createBranchComboModel() {
         final List<String> branchList = gitflowBranchUtil.getLocalBranchNames();
         final String defaultBranch = getDefaultBranch();
         branchList.remove(defaultBranch);
@@ -104,7 +104,7 @@ private ComboBoxModel<ComboEntry> createBranchComboModel() {
             entries[i] = new ComboEntry(branchName, branchName);
         }
 
-        return new DefaultComboBoxModel<>(entries);
+        return new DefaultComboBoxModel(entries);
     }
 
     /**