git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' (JAL-4102 2.11.2.6 patch release) into features/r2_11_2_alphaf...
[jalview.git]
/
src
/
jalview
/
io
/
packed
/
ParsePackedSet.java
diff --git
a/src/jalview/io/packed/ParsePackedSet.java
b/src/jalview/io/packed/ParsePackedSet.java
index
91575bf
..
37dd66b
100644
(file)
--- a/
src/jalview/io/packed/ParsePackedSet.java
+++ b/
src/jalview/io/packed/ParsePackedSet.java
@@
-20,6
+20,8
@@
*/
package jalview.io.packed;
*/
package jalview.io.packed;
+import java.util.Locale;
+
import jalview.api.FeatureColourI;
import jalview.datamodel.AlignmentI;
import jalview.io.AppletFormatAdapter;
import jalview.api.FeatureColourI;
import jalview.datamodel.AlignmentI;
import jalview.io.AppletFormatAdapter;
@@
-34,7
+36,6
@@
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.Locale;
public class ParsePackedSet
{
public class ParsePackedSet
{
@@
-53,7
+54,7
@@
public class ParsePackedSet
public Object[] getAlignment(JalviewDataset context,
Iterable<DataProvider> files) throws Exception
{
public Object[] getAlignment(JalviewDataset context,
Iterable<DataProvider> files) throws Exception
{
- List<Object> rslt = new ArrayList<Object>();
+ List<Object> rslt = new ArrayList<>();
if (context == null)
{
context = new JalviewDataset();
if (context == null)
{
context = new JalviewDataset();
@@
-152,7
+153,7
@@
public class ParsePackedSet
// if not, create one.
if (context.featureColours == null)
{
// if not, create one.
if (context.featureColours == null)
{
- context.featureColours = new HashMap<String, FeatureColourI>();
+ context.featureColours = new HashMap<>();
}
try
{
}
try
{
@@
-224,12
+225,13
@@
public class ParsePackedSet
* would be created.
*
* @param args
* would be created.
*
* @param args
+ * @j2sIgnore
*/
public static void main(String args[])
{
// make data providers from the set of keys/files
int i = 0;
*/
public static void main(String args[])
{
// make data providers from the set of keys/files
int i = 0;
- List<DataProvider> dp = new ArrayList<DataProvider>();
+ List<DataProvider> dp = new ArrayList<>();
while ((i + 1) < args.length)
{
String type = args[i++];
while ((i + 1) < args.length)
{
String type = args[i++];