From 41d4916360dc202105083e1f7ac6dfa71879ff22 Mon Sep 17 00:00:00 2001
From: paul <paul.ivancsics@chello.at>
Date: Mon, 30 Mar 2020 21:34:30 +0200
Subject: [PATCH] nothing

---
 src/main/java/Board.java | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/Board.java b/src/main/java/Board.java
index 8787a77..569aa57 100644
--- a/src/main/java/Board.java
+++ b/src/main/java/Board.java
@@ -15,14 +15,19 @@ public class Board {
 			.map(this::row);
 	}
 
-	Stream<String> row(int row) {
+	public Stream<Stream<String>> columns() {
 		return IntStream.range(0, 9).boxed()
-			.map(column -> digit(row, column));
+			.map(this::column);
 	}
 
-	public Stream<Stream<String>> columns() {
+	public Stream<Stream<String>> squares() {
+		return IntStream.range(0, 3).boxed()
+			.flatMap(this::squares);
+	}
+
+	Stream<String> row(int row) {
 		return IntStream.range(0, 9).boxed()
-			.map(this::column);
+			.map(column -> digit(row, column));
 	}
 
 	Stream<String> column(int column) {
@@ -30,17 +35,12 @@ public class Board {
 			.map(row -> digit(row, column));
 	}
 
-	Stream<Stream<String>> squares() {
-		return IntStream.range(0, 3).boxed()
-			.flatMap(this::squares);
-	}
-
-	private Stream<Stream<String>> squares(int squareRow) {
+	Stream<Stream<String>> squares(int squareRow) {
 		return IntStream.range(0, 3).boxed()
 			.map(squareColumn -> square(squareRow, squareColumn));
 	}
 
-	private Stream<String> square(int squareRow, int squareColumn) {
+	Stream<String> square(int squareRow, int squareColumn) {
 		return IntStream.range(squareRow*3, squareRow*3+3).boxed()
 			.flatMap(row -> squareDigitsInRow(row, squareColumn));
 	}