Skip to content

Commit 5fe2c53

Browse files
IvanNovRIvanNovR
committed
class name harmonisation
1 parent 1ad4562 commit 5fe2c53

7 files changed

Lines changed: 23 additions & 23 deletions

File tree

src/main/java/ru/ivannovr/gui/gamepanels/FlappyBirdFrame.java renamed to src/main/java/ru/ivannovr/gui/gamepanels/FlappyBirdPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import java.awt.event.KeyEvent;
1111
import java.util.List;
1212

13-
public class FlappyBirdFrame extends AbstractGamePanel {
13+
public class FlappyBirdPanel extends AbstractGamePanel {
1414
private static final int WINDOW_SIZE = 600;
1515
private static final int FLAPPY_DELAY = 20;
1616
private int cloudOffset = 0;
1717

18-
public FlappyBirdFrame(JFrame parentFrame, String username, DatabaseManager dbManager) {
18+
public FlappyBirdPanel(JFrame parentFrame, String username, DatabaseManager dbManager) {
1919
super(parentFrame, username, dbManager, new FlappyBirdGame(username, dbManager), FLAPPY_DELAY);
2020
setPreferredSize(new Dimension(WINDOW_SIZE, WINDOW_SIZE));
2121
}

src/main/java/ru/ivannovr/gui/gamepanels/PacmanFrame.java renamed to src/main/java/ru/ivannovr/gui/gamepanels/PacmanPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
import java.util.ArrayList;
1717
import java.util.List;
1818

19-
public class PacmanFrame extends AbstractGamePanel {
19+
public class PacmanPanel extends AbstractGamePanel {
2020
private static final int CELL_SIZE = 30;
2121
private static final int GRID_SIZE = 20;
2222
private static final int WINDOW_SIZE = CELL_SIZE * GRID_SIZE;
2323
private static final int PACMAN_DELAY = 150;
2424
private int animationFrame = 0;
2525

26-
public PacmanFrame(JFrame parentFrame, String username, DatabaseManager dbManager) {
26+
public PacmanPanel(JFrame parentFrame, String username, DatabaseManager dbManager) {
2727
super(parentFrame, username, dbManager, new PacmanGame(username, dbManager), PACMAN_DELAY);
2828
setPreferredSize(new Dimension(WINDOW_SIZE, WINDOW_SIZE));
2929
}

src/main/java/ru/ivannovr/gui/gamepanels/SnakeFrame.java renamed to src/main/java/ru/ivannovr/gui/gamepanels/SnakePanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
import java.awt.event.KeyEvent;
1111
import java.util.LinkedList;
1212

13-
public class SnakeFrame extends AbstractGamePanel {
13+
public class SnakePanel extends AbstractGamePanel {
1414
private static final int CELL_SIZE = 30;
1515
private static final int GRID_SIZE = 20;
1616
private static final int WINDOW_SIZE = CELL_SIZE * GRID_SIZE;
1717
private static final int SNAKE_DELAY = 150;
1818

19-
public SnakeFrame(JFrame parentFrame, String username, DatabaseManager dbManager) {
19+
public SnakePanel(JFrame parentFrame, String username, DatabaseManager dbManager) {
2020
super(parentFrame, username, dbManager, new SnakeGame(username, dbManager), SNAKE_DELAY);
2121
setPreferredSize(new Dimension(WINDOW_SIZE, WINDOW_SIZE));
2222
}

‎src/main/java/ru/ivannovr/gui/menu/GameOverPanel.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import ru.ivannovr.gui.BasePanel;
44
import ru.ivannovr.gui.gamepanels.AbstractGamePanel;
5-
import ru.ivannovr.gui.gamepanels.FlappyBirdFrame;
6-
import ru.ivannovr.gui.gamepanels.PacmanFrame;
7-
import ru.ivannovr.gui.gamepanels.SnakeFrame;
5+
import ru.ivannovr.gui.gamepanels.FlappyBirdPanel;
6+
import ru.ivannovr.gui.gamepanels.PacmanPanel;
7+
import ru.ivannovr.gui.gamepanels.SnakePanel;
88
import ru.ivannovr.utils.DatabaseManager;
99

1010
import javax.swing.*;
@@ -43,7 +43,7 @@ protected void initializeComponents() {
4343
playAgainButton.setBounds(200, 250, 200, 60);
4444
add(playAgainButton);
4545

46-
JButton menuButton = createStyledButton("Back to Menu", new Color(100, 150, 255), e -> switchPanel(new MainMenu(parentFrame, username, dbManager)));
46+
JButton menuButton = createStyledButton("Back to Menu", new Color(100, 150, 255), e -> switchPanel(new MainPanel(parentFrame, username, dbManager)));
4747
menuButton.setBounds(200, 330, 200, 60);
4848
add(menuButton);
4949
}
@@ -60,9 +60,9 @@ protected void paintComponent(Graphics g) {
6060

6161
private void playAgain() {
6262
AbstractGamePanel newGamePanel = switch (gameName) {
63-
case "Snake" -> new SnakeFrame(parentFrame, username, dbManager);
64-
case "FlappyBird" -> new FlappyBirdFrame(parentFrame, username, dbManager);
65-
case "Pacman" -> new PacmanFrame(parentFrame, username, dbManager);
63+
case "Snake" -> new SnakePanel(parentFrame, username, dbManager);
64+
case "FlappyBird" -> new FlappyBirdPanel(parentFrame, username, dbManager);
65+
case "Pacman" -> new PacmanPanel(parentFrame, username, dbManager);
6666
default -> null;
6767
};
6868
if (newGamePanel != null) {

‎src/main/java/ru/ivannovr/gui/menu/LeaderboardPanel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public boolean isCellEditable(int row, int column) {
7373
scrollPane.setBorder(BorderFactory.createEmptyBorder());
7474
add(scrollPane);
7575

76-
JButton backButton = createStyledButton("Back to Menu", new Color(255, 100, 100), e -> switchPanel(new MainMenu(parentFrame, username, dbManager)));
76+
JButton backButton = createStyledButton("Back to Menu", new Color(255, 100, 100), e -> switchPanel(new MainPanel(parentFrame, username, dbManager)));
7777
backButton.setBounds(150, 480, 300, 50);
7878
add(backButton);
7979
}

‎src/main/java/ru/ivannovr/gui/menu/LoginPanel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void login() {
7373
return;
7474
}
7575
if (dbManager.authenticateUser(username, password)) {
76-
switchPanel(new MainMenu(parentFrame, username, dbManager));
76+
switchPanel(new MainPanel(parentFrame, username, dbManager));
7777
} else {
7878
JOptionPane.showMessageDialog(this, "Invalid username or password!");
7979
}

src/main/java/ru/ivannovr/gui/menu/MainMenu.java renamed to src/main/java/ru/ivannovr/gui/menu/MainPanel.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package ru.ivannovr.gui.menu;
22

33
import ru.ivannovr.gui.BasePanel;
4-
import ru.ivannovr.gui.gamepanels.FlappyBirdFrame;
5-
import ru.ivannovr.gui.gamepanels.PacmanFrame;
6-
import ru.ivannovr.gui.gamepanels.SnakeFrame;
4+
import ru.ivannovr.gui.gamepanels.FlappyBirdPanel;
5+
import ru.ivannovr.gui.gamepanels.PacmanPanel;
6+
import ru.ivannovr.gui.gamepanels.SnakePanel;
77
import ru.ivannovr.utils.DatabaseManager;
88

99
import javax.swing.*;
1010
import javax.swing.border.EmptyBorder;
1111
import java.awt.*;
1212

13-
public class MainMenu extends BasePanel {
13+
public class MainPanel extends BasePanel {
1414
private final String username;
1515
private JComboBox<String> gameSelector;
1616

17-
public MainMenu(JFrame parentFrame, String username, DatabaseManager dbManager) {
17+
public MainPanel(JFrame parentFrame, String username, DatabaseManager dbManager) {
1818
super(parentFrame, dbManager);
1919
this.username = username;
2020
initializeComponents();
@@ -68,9 +68,9 @@ private void startGame() {
6868
String selectedGame = (String) gameSelector.getSelectedItem();
6969
if (selectedGame == null) return;
7070
JPanel gamePanel = switch (selectedGame) {
71-
case "Snake" -> new SnakeFrame(parentFrame, username, dbManager);
72-
case "FlappyBird" -> new FlappyBirdFrame(parentFrame, username, dbManager);
73-
case "Pacman" -> new PacmanFrame(parentFrame, username, dbManager);
71+
case "Snake" -> new SnakePanel(parentFrame, username, dbManager);
72+
case "FlappyBird" -> new FlappyBirdPanel(parentFrame, username, dbManager);
73+
case "Pacman" -> new PacmanPanel(parentFrame, username, dbManager);
7474
default -> null;
7575
};
7676
if (gamePanel != null) {

0 commit comments

Comments
 (0)