diff --git a/Doc/Sd1/interfacesAbstractClasses.xml b/Doc/Sd1/interfacesAbstractClasses.xml index 21dafb992048c17aef5fa2d537d9c58c65ca8e1f..eb4af079700bc965ed0631d4360286b95ef0398e 100644 --- a/Doc/Sd1/interfacesAbstractClasses.xml +++ b/Doc/Sd1/interfacesAbstractClasses.xml @@ -884,7 +884,7 @@ for (final Rectangle n : rectangles) { </qandaset> <figure xml:id="sd1_fig_StringFlexibleSorting"> - <title>Flexibility in sorting</title> + <title>Situation dependent sorting criteria</title> <informaltable border="0"> <colgroup width="25%"/> @@ -946,7 +946,8 @@ public class SortCaseInsensitive implements <link role="red">String</emphasis>> { <emphasis role="red">â”â”â”â”â”â”â”â”â”â”â”â”â”â”â”┳â”â”â”â”â”â”â”â”â”â”â”â”›</emphasis> @Override <emphasis role="red">â–¼ â–¼</emphasis> - public int compare(final String a, final String b) { + public int compare(final <emphasis role="red">String</emphasis> a, final <emphasis + role="red">String</emphasis> b) { return <emphasis role="red">a.toLowerCase()</emphasis>.compareTo(<emphasis role="red">b.toLowerCase()</emphasis>); } @@ -1051,23 +1052,7 @@ Arrays.<link xlink:href="https://docs.oracle.com/javase/10/docs/api/java/util/Ar for (final String n: names) { System.out.println(n); -}</programlisting><calloutlist> - <callout arearefs="sd1_callout_StringSortIgnoreCaseLambda-1-co" - xml:id="sd1_callout_StringSortIgnoreCaseLambda-1"> - <para>This lambda expression is equivalent to the following - custom comparator:</para> - - <programlisting language="none">public class SortDescending implements <link - xlink:href="https://docs.oracle.com/javase/10/docs/api/java/util/Comparator.html">Comparator</link><String> { - @Override - public int compare(final String <emphasis role="red">a</emphasis>, final String <emphasis - role="red">b</emphasis>) { - return <emphasis role="red">b.compareTo(a)</emphasis>; // Equivalent to <coref - linkend="sd1_callout_StringSortIgnoreCaseLambda-1-co"/> - } -}</programlisting> - </callout> - </calloutlist></td> +}</programlisting></td> <td valign="top"><screen>sign quick @@ -1078,6 +1063,24 @@ ATM</screen></td> </informaltable> </figure> + <calloutlist> + <callout arearefs="sd1_callout_StringSortIgnoreCaseLambda-1-co" + xml:id="sd1_callout_StringSortIgnoreCaseLambda-1"> + <para>This lambda expression is equivalent to the following custom + comparator:</para> + + <programlisting language="none">public class SortDescending implements <link + xlink:href="https://docs.oracle.com/javase/10/docs/api/java/util/Comparator.html">Comparator</link><String> { + @Override + public int compare(final String <emphasis role="red">a</emphasis>, final String <emphasis + role="red">b</emphasis>) { + return <emphasis role="red">b.compareTo(a)</emphasis>; // Equivalent to <coref + linkend="sd1_callout_StringSortIgnoreCaseLambda-1-co"/> + } +}</programlisting> + </callout> + </calloutlist> + <qandaset defaultlabel="qanda" xml:id="sd1QandaArraysFlexibleSorting"> <title>Adding flexibility in sorting rectangles</title>