From: Jim Procter Date: Tue, 10 Oct 2017 13:01:46 +0000 (+0100) Subject: JAL-2392 formatting X-Git-Tag: Release_2_10_3b1~78^2~3 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4bc43e668616c1fec2b59ac4bca31578b55e5724;p=jalview.git JAL-2392 formatting --- diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java index aff40e4..fef7451 100644 --- a/src/jalview/gui/AppJmol.java +++ b/src/jalview/gui/AppJmol.java @@ -253,7 +253,7 @@ public class AppJmol extends StructureViewerBase @Override protected List getViewersFor(AlignmentPanel apanel) { - List result = new ArrayList(); + List result = new ArrayList<>(); JInternalFrame[] frames = Desktop.instance.getAllFrames(); for (JInternalFrame frame : frames) @@ -305,7 +305,7 @@ public class AppJmol extends StructureViewerBase @Override void showSelectedChains() { - Vector toshow = new Vector(); + Vector toshow = new Vector<>(); for (int i = 0; i < chainMenu.getItemCount(); i++) { if (chainMenu.getItem(i) instanceof JCheckBoxMenuItem) @@ -494,7 +494,7 @@ public class AppJmol extends StructureViewerBase // todo - record which pdbids were successfully imported. StringBuilder errormsgs = new StringBuilder(); - List files = new ArrayList(); + List files = new ArrayList<>(); String pdbid = ""; try { diff --git a/src/jalview/gui/ProgressBar.java b/src/jalview/gui/ProgressBar.java index ea341e3..3e91361 100644 --- a/src/jalview/gui/ProgressBar.java +++ b/src/jalview/gui/ProgressBar.java @@ -89,8 +89,8 @@ public class ProgressBar implements IProgressIndicator } this.statusPanel = container; this.statusBar = statusBar; - this.progressBars = new Hashtable(); - this.progressBarHandlers = new Hashtable(); + this.progressBars = new Hashtable<>(); + this.progressBarHandlers = new Hashtable<>(); }