This is an automated email from the git hooks/post-receive script. sascha-guest pushed a commit to branch master in repository artemis.
commit 2d997a1c5849b6d6cd6fb8a5d9134ab4222f9ec2 Author: Sascha Steinbiss <[email protected]> Date: Sat Nov 7 19:21:38 2015 +0000 rename methods to avoid name clash in Java 8 --- debian/patches/java-8-sort.patch | 57 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 58 insertions(+) diff --git a/debian/patches/java-8-sort.patch b/debian/patches/java-8-sort.patch new file mode 100644 index 0000000..dc384d5 --- /dev/null +++ b/debian/patches/java-8-sort.patch @@ -0,0 +1,57 @@ +Description: fix name clash with Java 8 List.sort() +Author: Sascha Steinbiss <[email protected]> +--- a/uk/ac/sanger/artemis/AlignMatchVector.java ++++ b/uk/ac/sanger/artemis/AlignMatchVector.java +@@ -107,7 +107,7 @@ + * @param cmp The returned vector will be sorted with this Comparator. + **/ + public void sort (final Comparator cmp) { +- vector = vector.sort (cmp); ++ vector = vector.mysort (cmp); + } + + /** +--- a/uk/ac/sanger/artemis/FeatureVector.java ++++ b/uk/ac/sanger/artemis/FeatureVector.java +@@ -154,7 +154,7 @@ + public FeatureVector sort (final Comparator cmp) { + final FeatureVector return_vector = (FeatureVector) clone (); + +- return_vector.vector = return_vector.vector.sort (cmp); ++ return_vector.vector = return_vector.vector.mysort (cmp); + + return return_vector; + } +--- a/uk/ac/sanger/artemis/io/KeyVector.java ++++ b/uk/ac/sanger/artemis/io/KeyVector.java +@@ -65,7 +65,7 @@ + * Sorts the elements of the vector using a simple O(n^2) selection + * sort. + */ +- public void sort() ++ public void mysort() + { + int smallest; + +--- a/uk/ac/sanger/artemis/io/SimpleEntryInformation.java ++++ b/uk/ac/sanger/artemis/io/SimpleEntryInformation.java +@@ -175,7 +175,7 @@ + return null; + } + +- return_vector.sort (); ++ return_vector.mysort (); + return return_vector; + } + +--- a/uk/ac/sanger/artemis/util/FastVector.java ++++ b/uk/ac/sanger/artemis/util/FastVector.java +@@ -91,7 +91,7 @@ + * Return a sorted copy of this vector. + * @param cmp The returned vector will be sorted with this Comparator. + **/ +- public FastVector sort(final Comparator cmp) ++ public FastVector mysort(final Comparator cmp) + { + final FastVector return_vector = (FastVector)clone(); + Collections.sort(return_vector, cmp); diff --git a/debian/patches/series b/debian/patches/series index cc14cba..1ffda6e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ class-path.patch jar-rules.patch test-classpath.patch CRAMReferenceSequenceFile.patch +java-8-sort.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/artemis.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
