Merge branch 'features/sequenceFeatureRefactor' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 23 Mar 2015 10:00:41 +0000 (10:00 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 23 Mar 2015 10:00:41 +0000 (10:00 +0000)
commit1ae9824ef37ce4ed36d1da986003474b47d1ab11
tree614202eb0be20af1f01accf67d3e9beffb5444a6
parentaf28532d835bbef7d85bde74696a1ef751d7ff5c
parentb13f521553582ef2fbfd7815ae25e23284babdea
Merge branch 'features/sequenceFeatureRefactor' into develop

Conflicts:
src/jalview/analysis/AlignmentSorter.java
src/jalview/analysis/Dna.java
src/jalview/bin/JalviewLite.java
src/jalview/gui/PopupMenu.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
test/jalview/datamodel/SequenceTest.java
and minor unit test refactoring
31 files changed:
src/jalview/analysis/AlignmentSorter.java
src/jalview/analysis/AlignmentUtils.java
src/jalview/analysis/Dna.java
src/jalview/bin/JalviewLite.java
src/jalview/controller/AlignViewController.java
src/jalview/ext/paradise/Annotate3D.java
src/jalview/ext/rbvi/chimera/ChimeraCommands.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/IdPanel.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SequenceFetcher.java
src/jalview/io/BioJsHTMLOutput.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/io/StockholmFile.java
src/jalview/renderer/seqfeatures/FeatureRenderer.java
src/jalview/util/ParseHtmlBodyAndLinks.java
src/jalview/util/StringUtils.java
src/jalview/ws/rest/InputType.java
src/jalview/ws/rest/RestServiceDescription.java
test/jalview/analysis/CrossRefTest.java
test/jalview/datamodel/SequenceTest.java
test/jalview/ext/paradise/TestAnnotate3D.java
test/jalview/util/MappingUtilsTest.java
test/jalview/util/StringUtilsTest.java
test/jalview/ws/jabaws/JpredJabaStructExportImport.java
test/jalview/ws/jabaws/RNAStructExportImport.java
test/jalview/ws/rest/ShmmrRSBSService.java
test/jalview/ws/seqfetcher/DbRefFetcherTest.java