Skip to content

Commit d1ad9cd

Browse files
committed
more refactoring
1 parent c429d7a commit d1ad9cd

2 files changed

Lines changed: 11 additions & 15 deletions

File tree

src/main/java/org/teachingextensions/logo/utils/MazeUtils/CoolMaze.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public CoolMaze(int N)
1515
StdDraw.setXscale(0, N + 2);
1616
StdDraw.setYscale(0, N + 2);
1717
createMazeStructure();
18-
generateStartLocation();
18+
generateStartLocation(1, 1);
1919
}
2020
private void createMazeStructure()
2121
{
@@ -45,7 +45,7 @@ private void createMazeStructure()
4545
}
4646
}
4747
}
48-
private void generate(int x, int y)
48+
private void generateStartLocation(int x, int y)
4949
{
5050
visited[x][y] = true;
5151
while (!visited[x][y + 1] || !visited[x + 1][y] || !visited[x][y - 1] || !visited[x - 1][y])
@@ -57,37 +57,33 @@ private void generate(int x, int y)
5757
{
5858
north[x][y] = false;
5959
south[x][y + 1] = false;
60-
generate(x, y + 1);
60+
generateStartLocation(x, y + 1);
6161
break;
6262
}
6363
else if (r == 1 && !visited[x + 1][y])
6464
{
6565
east[x][y] = false;
6666
west[x + 1][y] = false;
67-
generate(x + 1, y);
67+
generateStartLocation(x + 1, y);
6868
break;
6969
}
7070
else if (r == 2 && !visited[x][y - 1])
7171
{
7272
south[x][y] = false;
7373
north[x][y - 1] = false;
74-
generate(x, y - 1);
74+
generateStartLocation(x, y - 1);
7575
break;
7676
}
7777
else if (r == 3 && !visited[x - 1][y])
7878
{
7979
west[x][y] = false;
8080
east[x - 1][y] = false;
81-
generate(x - 1, y);
81+
generateStartLocation(x - 1, y);
8282
break;
8383
}
8484
}
8585
}
8686
}
87-
private void generateStartLocation()
88-
{
89-
generate(1, 1);
90-
}
9187
private void solve(int x, int y)
9288
{
9389
if (x == 0 || y == 0 || x == N + 1 || y == N + 1)

src/main/java/org/teachingextensions/logo/utils/MazeUtils/StdDraw.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ private static void init()
629629
frame.setResizable(false);
630630
frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); // closes all windows
631631
// frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); // closes only current window
632-
frame.setTitle("Standard Draw");
632+
frame.setTitle("Amazing Maze!");
633633
frame.setJMenuBar(createMenuBar());
634634
frame.pack();
635635
frame.requestFocusInWindow();
@@ -643,8 +643,8 @@ private static JMenuBar createMenuBar()
643643
menuBar.add(menu);
644644
JMenuItem menuItem1 = new JMenuItem(" Save... ");
645645
menuItem1.addActionListener(std);
646-
menuItem1.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit()
647-
.getMenuShortcutKeyMask()));
646+
menuItem1.setAccelerator(
647+
KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
648648
menu.add(menuItem1);
649649
return menuBar;
650650
}
@@ -1730,8 +1730,8 @@ public static char nextKeyTyped()
17301730
{
17311731
synchronized (keyLock)
17321732
{
1733-
if (keysTyped.isEmpty()) { throw new NoSuchElementException(
1734-
"your program has already processed all keystrokes"); }
1733+
if (keysTyped
1734+
.isEmpty()) { throw new NoSuchElementException("your program has already processed all keystrokes"); }
17351735
return keysTyped.removeLast();
17361736
}
17371737
}

0 commit comments

Comments
 (0)