source.jalview.org Git - jalview.git/commit

git://source.jalview.org / jalview.git / commit

author	gmungoc <g.m.carstairs@dundee.ac.uk>
	Wed, 10 Jan 2018 15:20:56 +0000 (15:20 +0000)
committer	gmungoc <g.m.carstairs@dundee.ac.uk>
	Wed, 10 Jan 2018 15:20:56 +0000 (15:20 +0000)
commit	14b1b2a878190d5fffda298c4b9a901c72c74ad3
tree	39d0c1ff1d48e09edde5d2cac6798b31915a0a07	tree \| snapshot
parent	4073e96c3cb60f28c01cd91ec7f847cafbf01f78	commit \| diff

JAL-1793 update spike branch to latest

81 files changed:

examples/exampleFeatures.txt		diff \| blob \| history
help/html/releases.html		diff \| blob \| history
resources/lang/Messages.properties		diff \| blob \| history
schemas/JalviewUserColours.xsd		diff \| blob \| history
schemas/jalview.xsd		diff \| blob \| history
src/jalview/api/FeatureColourI.java		diff \| blob \| history
src/jalview/api/FeatureRenderer.java		diff \| blob \| history
src/jalview/appletgui/AlignFrame.java		diff \| blob \| history
src/jalview/appletgui/AnnotationColumnChooser.java		diff \| blob \| history
src/jalview/binding/Colour.java		diff \| blob \| history
src/jalview/binding/CompoundMatcher.java	[new file with mode: 0644]	blob
src/jalview/binding/FeatureMatcher.java	[new file with mode: 0644]	blob
src/jalview/binding/FeatureMatcherSet.java	[new file with mode: 0644]	blob
src/jalview/binding/Filter.java	[new file with mode: 0644]	blob
src/jalview/binding/JalviewUserColours.java		diff \| blob \| history
src/jalview/binding/MatchCondition.java	[new file with mode: 0644]	blob
src/jalview/binding/MatcherSet.java	[new file with mode: 0644]	blob
src/jalview/binding/types/ColourThreshTypeType.java	[new file with mode: 0644]	blob
src/jalview/binding/types/FeatureMatcherByType.java	[new file with mode: 0644]	blob
src/jalview/binding/types/NoValueColour.java	[new file with mode: 0644]	blob
src/jalview/controller/AlignViewController.java		diff \| blob \| history
src/jalview/datamodel/features/FeatureMatcher.java		diff \| blob \| history
src/jalview/datamodel/features/FeatureMatcherI.java		diff \| blob \| history
src/jalview/datamodel/features/FeatureMatcherSet.java		diff \| blob \| history
src/jalview/datamodel/features/FeatureMatcherSetI.java		diff \| blob \| history
src/jalview/gui/AlignFrame.java		diff \| blob \| history
src/jalview/gui/AnnotationColumnChooser.java		diff \| blob \| history
src/jalview/gui/AnnotationExporter.java		diff \| blob \| history
src/jalview/gui/AnnotationLabels.java		diff \| blob \| history
src/jalview/gui/FeatureSettings.java		diff \| blob \| history
src/jalview/gui/FeatureTypeSettings.java		diff \| blob \| history
src/jalview/gui/Jalview2XML.java		diff \| blob \| history
src/jalview/gui/Preferences.java		diff \| blob \| history
src/jalview/gui/SeqPanel.java		diff \| blob \| history
src/jalview/gui/StructureViewer.java		diff \| blob \| history
src/jalview/io/FeaturesFile.java		diff \| blob \| history
src/jalview/io/FormatAdapter.java		diff \| blob \| history
src/jalview/renderer/AnnotationRenderer.java		diff \| blob \| history
src/jalview/schemabinding/version2/.castor.cdr		diff \| blob \| history
src/jalview/schemabinding/version2/Colour.java		diff \| blob \| history
src/jalview/schemabinding/version2/CompoundMatcher.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/FeatureMatcher.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/FeatureMatcherSet.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/Filter.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/JalviewUserColours.java		diff \| blob \| history
src/jalview/schemabinding/version2/MatchCondition.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/MatcherSet.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/OtherData.java		diff \| blob \| history
src/jalview/schemabinding/version2/Setting.java		diff \| blob \| history
src/jalview/schemabinding/version2/descriptors/ColourDescriptor.java		diff \| blob \| history
src/jalview/schemabinding/version2/descriptors/CompoundMatcherDescriptor.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/descriptors/FeatureMatcherDescriptor.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/descriptors/FeatureMatcherSetDescriptor.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/descriptors/FilterDescriptor.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/descriptors/JalviewUserColoursDescriptor.java		diff \| blob \| history
src/jalview/schemabinding/version2/descriptors/MatchConditionDescriptor.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/descriptors/MatcherSetDescriptor.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/descriptors/OtherDataDescriptor.java		diff \| blob \| history
src/jalview/schemabinding/version2/descriptors/SettingDescriptor.java		diff \| blob \| history
src/jalview/schemabinding/version2/types/.castor.cdr	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/types/ColourThreshTypeType.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/types/FeatureMatcherByType.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/types/NoValueColour.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/types/descriptors/ColourThreshTypeTypeDescriptor.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/types/descriptors/FeatureMatcherByTypeDescriptor.java	[new file with mode: 0644]	blob
src/jalview/schemabinding/version2/types/descriptors/NoValueColourDescriptor.java	[new file with mode: 0644]	blob
src/jalview/schemes/FeatureColour.java		diff \| blob \| history
src/jalview/util/matcher/Condition.java		diff \| blob \| history
src/jalview/util/matcher/Matcher.java		diff \| blob \| history
src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java		diff \| blob \| history
test/jalview/datamodel/features/FeatureAttributesTest.java		diff \| blob \| history
test/jalview/datamodel/features/FeatureMatcherSetTest.java		diff \| blob \| history
test/jalview/datamodel/features/FeatureMatcherTest.java		diff \| blob \| history
test/jalview/gui/AnnotationColumnChooserTest.java	[new file with mode: 0644]	blob
test/jalview/gui/FeatureSettingsTest.java	[new file with mode: 0644]	blob
test/jalview/gui/StructureViewerTest.java		diff \| blob \| history
test/jalview/io/FeaturesFileTest.java		diff \| blob \| history
test/jalview/io/Jalview2xmlTests.java		diff \| blob \| history
test/jalview/renderer/seqfeatures/FeatureRendererTest.java		diff \| blob \| history
test/jalview/schemes/FeatureColourTest.java		diff \| blob \| history
test/jalview/util/matcher/ConditionTest.java		diff \| blob \| history

RSS Atom