From b95ec6f233e933437c48fc221b68810ddeb08d0c Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Thu, 8 Oct 2015 11:31:24 +0100 Subject: [PATCH] JAL-1894 organise imports --- .settings/org.eclipse.jdt.ui.prefs | 2 +- src/jalview/io/JSONFile.java | 3 +-- .../version2/descriptors/AnnotationColoursDescriptor.java | 1 - .../schemabinding/version2/descriptors/FeaturesDescriptor.java | 1 - .../version2/descriptors/UserColourSchemeDescriptor.java | 1 - .../schemabinding/version2/descriptors/VamsasModelDescriptor.java | 1 - test/jalview/analysis/ParsePropertiesTest.java | 1 + 7 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index 5b61305..30e76be 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -12,7 +12,7 @@ sp_cleanup.add_missing_annotations=true sp_cleanup.add_missing_deprecated_annotations=true sp_cleanup.add_missing_methods=false sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=false +sp_cleanup.add_missing_override_annotations=true sp_cleanup.add_missing_override_annotations_interface_methods=true sp_cleanup.add_serial_version_id=false sp_cleanup.always_use_blocks=true diff --git a/src/jalview/io/JSONFile.java b/src/jalview/io/JSONFile.java index 5cd09a1..1038925 100644 --- a/src/jalview/io/JSONFile.java +++ b/src/jalview/io/JSONFile.java @@ -572,8 +572,7 @@ public class JSONFile extends AlignFile implements ComplexAlignFile .get("label").toString(), alAnnot.get("description") .toString(), annotations); alignAnnot.graph = (alAnnot.get("graphType") == null) ? 0 : Integer - .valueOf(alAnnot.get("graphType") - .toString()); + .valueOf(alAnnot.get("graphType").toString()); JSONObject diplaySettings = (JSONObject) alAnnot .get("annotationSettings"); diff --git a/src/jalview/schemabinding/version2/descriptors/AnnotationColoursDescriptor.java b/src/jalview/schemabinding/version2/descriptors/AnnotationColoursDescriptor.java index f269bdf..1d2aad3 100644 --- a/src/jalview/schemabinding/version2/descriptors/AnnotationColoursDescriptor.java +++ b/src/jalview/schemabinding/version2/descriptors/AnnotationColoursDescriptor.java @@ -11,7 +11,6 @@ package jalview.schemabinding.version2.descriptors; //- Imported classes and packages -/ //---------------------------------/ - /** * Class AnnotationColoursDescriptor. * diff --git a/src/jalview/schemabinding/version2/descriptors/FeaturesDescriptor.java b/src/jalview/schemabinding/version2/descriptors/FeaturesDescriptor.java index 5a5b4a9..a7ffaba 100644 --- a/src/jalview/schemabinding/version2/descriptors/FeaturesDescriptor.java +++ b/src/jalview/schemabinding/version2/descriptors/FeaturesDescriptor.java @@ -11,7 +11,6 @@ package jalview.schemabinding.version2.descriptors; //- Imported classes and packages -/ //---------------------------------/ - /** * Class FeaturesDescriptor. * diff --git a/src/jalview/schemabinding/version2/descriptors/UserColourSchemeDescriptor.java b/src/jalview/schemabinding/version2/descriptors/UserColourSchemeDescriptor.java index 527b16b..ece728a 100644 --- a/src/jalview/schemabinding/version2/descriptors/UserColourSchemeDescriptor.java +++ b/src/jalview/schemabinding/version2/descriptors/UserColourSchemeDescriptor.java @@ -11,7 +11,6 @@ package jalview.schemabinding.version2.descriptors; //- Imported classes and packages -/ //---------------------------------/ - /** * Class UserColourSchemeDescriptor. * diff --git a/src/jalview/schemabinding/version2/descriptors/VamsasModelDescriptor.java b/src/jalview/schemabinding/version2/descriptors/VamsasModelDescriptor.java index fc7f9ba..86e6992 100644 --- a/src/jalview/schemabinding/version2/descriptors/VamsasModelDescriptor.java +++ b/src/jalview/schemabinding/version2/descriptors/VamsasModelDescriptor.java @@ -11,7 +11,6 @@ package jalview.schemabinding.version2.descriptors; //- Imported classes and packages -/ //---------------------------------/ - /** * Class VamsasModelDescriptor. * diff --git a/test/jalview/analysis/ParsePropertiesTest.java b/test/jalview/analysis/ParsePropertiesTest.java index bfe7b7f..d692bbb 100644 --- a/test/jalview/analysis/ParsePropertiesTest.java +++ b/test/jalview/analysis/ParsePropertiesTest.java @@ -27,6 +27,7 @@ import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; +import jalview.gui.AlignFrame; import java.util.List; -- 1.7.10.2