Commit 6bb19e6

committed

AbstractSortArray, SortArray: Moved compareAndSwap() from abstract class to interface (Java SE 8+).

1 parent c18cd33 commit 6bb19e6Copy full SHA for 6bb19e6

File tree

-10

lines changed

-10

lines changed

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,15 +76,6 @@ public void swap(int i, int j) {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`
`79`		`- public boolean compareAndSwap(int i, int j) {`
`80`		`- if (compare(i, j) > 0) {`
`81`		`- swap(i, j);`
`82`		`- return true;`
`83`		`- } else`
`84`		`- return false;`
`85`		`- }`
`86`		`-`
`87`		`-`
`88`	`79`	`/* Sorting progress visualization */`
`89`	`80`
`90`	`81`	`// Does nothing by default; can be overridden.`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,13 @@ public interface SortArray {`
`80`	`80`	`* @return whether initially array[i] > array[j], which causes them to be swapped`
`81`	`81`	`* @throws IndexOutOfBoundsException if not (0 ≤ {@code i}, {@code j} < {@code length()})`
`82`	`82`	`*/`
`83`		`- public boolean compareAndSwap(int i, int j);`
	`83`	`+ public default boolean compareAndSwap(int i, int j) {`
	`84`	`+ if (compare(i, j) > 0) {`
	`85`	`+ swap(i, j);`
	`86`	`+ return true;`
	`87`	`+ } else`
	`88`	`+ return false;`
	`89`	`+ }`
`84`	`90`
`85`	`91`
`86`	`92`	`/**`

Comments

(0)