From bfb89267b79932155cdb5cafa104b49804125dab Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 17 Jan 2014 18:47:48 +0200 Subject: [PATCH] Format code --- src/jtictactoe/Figure.java | 62 +++--- src/jtictactoe/GameBoard.java | 3 +- src/jtictactoe/Main.java | 3 +- src/jtictactoe/Table.java | 12 +- src/jtictactoe/TitlePanel.java | 360 ++++++++++++++++----------------- src/jtictactoe/Util.java | 49 +++-- 6 files changed, 243 insertions(+), 246 deletions(-) diff --git a/src/jtictactoe/Figure.java b/src/jtictactoe/Figure.java index 087d760..e23d185 100644 --- a/src/jtictactoe/Figure.java +++ b/src/jtictactoe/Figure.java @@ -1,31 +1,31 @@ -package jtictactoe; - -/** - * - * @author aNNiMON - */ -public class Figure { - - public static final char - EMPTY = ' ', - X = 'X', - O = 'O'; - - protected char figure; - - public Figure() { - this.figure = EMPTY; - } - - public boolean isEmpty() { - return (figure == EMPTY); - } - - public char getFigure() { - return figure; - } - - public void setFigure(char figure) { - this.figure = figure; - } -} +package jtictactoe; + +/** + * + * @author aNNiMON + */ +public class Figure { + + public static final char + EMPTY = ' ', + X = 'X', + O = 'O'; + + protected char figure; + + public Figure() { + this.figure = EMPTY; + } + + public boolean isEmpty() { + return (figure == EMPTY); + } + + public char getFigure() { + return figure; + } + + public void setFigure(char figure) { + this.figure = figure; + } +} \ No newline at end of file diff --git a/src/jtictactoe/GameBoard.java b/src/jtictactoe/GameBoard.java index 9fd32fa..be207b8 100644 --- a/src/jtictactoe/GameBoard.java +++ b/src/jtictactoe/GameBoard.java @@ -13,6 +13,7 @@ import javax.swing.JPanel; * @author aNNiMON */ public class GameBoard extends JPanel { + private static final int CELL_SIZE = 150; private static final int OFFSET = 15; @@ -114,4 +115,4 @@ public class GameBoard extends JPanel { return point; } -} +} \ No newline at end of file diff --git a/src/jtictactoe/Main.java b/src/jtictactoe/Main.java index f949253..4205c65 100644 --- a/src/jtictactoe/Main.java +++ b/src/jtictactoe/Main.java @@ -11,7 +11,6 @@ public class Main extends JFrame { public static void main(String[] args) { new Main().setVisible(true); - } public Main() { @@ -29,4 +28,4 @@ public class Main extends JFrame { pack(); } -} +} \ No newline at end of file diff --git a/src/jtictactoe/Table.java b/src/jtictactoe/Table.java index b12f027..a970b06 100644 --- a/src/jtictactoe/Table.java +++ b/src/jtictactoe/Table.java @@ -44,7 +44,7 @@ public class Table { } public void setFigure(int x, int y) { - if( (checkWinner() != Figure.EMPTY) || (!hasMoreMoves()) ) { + if ( (checkWinner() != Figure.EMPTY) || (!hasMoreMoves()) ) { resetTable(); return; } @@ -59,7 +59,7 @@ public class Table { } public void computerMove() { - if( (checkWinner() != Figure.EMPTY) || (!hasMoreMoves()) ) { + if ( (checkWinner() != Figure.EMPTY) || (!hasMoreMoves()) ) { //resetTable(); return; } @@ -105,14 +105,14 @@ public class Table { // Trying to put figure to the center. int x = 1, y = 1; - if(!table[y][x].isEmpty() || (random.nextInt(5) <= 3) ) { + if (!table[y][x].isEmpty() || (random.nextInt(5) <= 3) ) { // If it's busy, put to the corners. int count = 0; do { x = random.nextBoolean() ? 0 : 2; y = random.nextBoolean() ? 0 : 2; count++; - } while ( (!table[y][x].isEmpty()) && (count < 10)); + } while ( (!table[y][x].isEmpty()) && (count < 10) ); if (count > 9) { // Put to the remaining cells. @@ -122,7 +122,7 @@ public class Table { x = pair[random.nextInt(pair.length)][0]; y = pair[random.nextInt(pair.length)][1]; count++; - } while ( (!table[y][x].isEmpty()) && (count < 10)); + } while ( (!table[y][x].isEmpty()) && (count < 10) ); } } table[y][x].setFigure(nextMoveIsX ? Figure.X : Figure.O); @@ -198,4 +198,4 @@ public class Table { } return false; } -} +} \ No newline at end of file diff --git a/src/jtictactoe/TitlePanel.java b/src/jtictactoe/TitlePanel.java index 872b1e8..e4c4306 100644 --- a/src/jtictactoe/TitlePanel.java +++ b/src/jtictactoe/TitlePanel.java @@ -1,181 +1,179 @@ -package jtictactoe; - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Frame; -import java.awt.Graphics; -import java.awt.Point; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionAdapter; -import java.awt.image.BufferedImage; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JPanel; - -/** - * - * @author aNNiMON - */ -public class TitlePanel extends JPanel { - - private final BufferedImage exitImage, exitImageBW; - private final BufferedImage minimizeImage, minimizeImageBW; - private final BufferedImage background; - private final JFrame mainFrame; - private final Font messageFont, infoFont; - - private boolean moveForm; - private Point clickedStart; - - private int winX, winO; - private String message; - - public TitlePanel(JFrame mainFrame) { - this.mainFrame = mainFrame; - background = Util.getImage("/res/title_bg.jpg"); - minimizeImage = Util.getImage("/res/minimize_button.png"); - minimizeImageBW = Util.getImage("/res/minimize_button_bw.png"); - exitImage = Util.getImage("/res/exit_button.png"); - exitImageBW = Util.getImage("/res/exit_button_bw.png"); - moveForm = false; - messageFont = new Font("Arial", Font.BOLD, 60); - infoFont = new Font("Arial", Font.PLAIN, 30); - winX = winO = 0; - message = ""; - initComponents(); - } - - public void updateWin(int winX, int winO) { - this.winX += winX; - this.winO += winO; - } - - public void setMessage(String message) { - this.message = message; - repaint(); - } - - @Override - public void paintComponent(Graphics g) { - super.paintComponent(g); - final int width = background.getWidth(); - - g.drawImage(background, 0, 0, null); - - g.setColor(Color.DARK_GRAY); - g.setFont(infoFont); - - g.drawString("X:"+winX, 5, 110); - String win = "O:" + winO; - g.drawString(win, width - getFontMetrics(infoFont).stringWidth(win) - 5, 110); - - if (!message.isEmpty()) { - g.setFont(messageFont); - int x = getFontMetrics(messageFont).stringWidth(message) / 2; - x = width / 2 - x; - g.drawString(message, x, 110); - } - } - - private void initComponents() { - setBackground(new Color(51, 51, 51)); - setPreferredSize(new Dimension(480, 150)); - addMouseListener(new MouseAdapter() { - @Override - public void mousePressed(MouseEvent evt) { - formMousePressed(evt); - } - @Override - public void mouseReleased(MouseEvent evt) { - formMouseReleased(evt); - } - }); - addMouseMotionListener(new MouseMotionAdapter() { - @Override - public void mouseDragged(MouseEvent evt) { - formMouseDragged(evt); - } - }); - setLayout(null); - - - final JButton exitButton = new JButton(); - exitButton.setIcon(new ImageIcon(exitImageBW)); - exitButton.setBorder(null); - exitButton.setBorderPainted(false); - exitButton.setContentAreaFilled(false); - exitButton.addMouseListener(new MouseAdapter() { - @Override - public void mouseEntered(MouseEvent evt) { - exitButton.setIcon(new ImageIcon(exitImage)); - } - @Override - public void mouseExited(MouseEvent evt) { - exitButton.setIcon(new ImageIcon(exitImageBW)); - } - }); - exitButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent evt) { - exitButtonActionPerformed(evt); - } - }); - add(exitButton); - exitButton.setBounds(378, 2, 100, 50); - - final JButton minimizeButton = new JButton(); - minimizeButton.setIcon(new ImageIcon(minimizeImageBW)); - minimizeButton.setBorder(null); - minimizeButton.setBorderPainted(false); - minimizeButton.setContentAreaFilled(false); - minimizeButton.addMouseListener(new MouseAdapter() { - @Override - public void mouseEntered(MouseEvent evt) { - minimizeButton.setIcon(new ImageIcon(minimizeImage)); - } - @Override - public void mouseExited(MouseEvent evt) { - minimizeButton.setIcon(new ImageIcon(minimizeImageBW)); - } - }); - minimizeButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent evt) { - mainFrame.setState(Frame.ICONIFIED); - } - }); - add(minimizeButton); - minimizeButton.setBounds(2, 2, 100, 50); - } - - private void exitButtonActionPerformed(ActionEvent evt) { - mainFrame.setVisible(false); - mainFrame.dispose(); - System.exit(0); - } - - private void formMousePressed(MouseEvent evt) { - if (evt.getButton() == MouseEvent.BUTTON1) { - moveForm = true; - clickedStart = evt.getPoint(); - } - } - - private void formMouseReleased(MouseEvent evt) { - moveForm = false; - } - - private void formMouseDragged(MouseEvent evt) { - if (moveForm) { - Point moved = evt.getLocationOnScreen(); - moved.translate(-clickedStart.x, -clickedStart.y); - mainFrame.setLocation(moved); - } - } - -} +package jtictactoe; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.Point; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseMotionAdapter; +import java.awt.image.BufferedImage; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JPanel; + +/** + * + * @author aNNiMON + */ +public class TitlePanel extends JPanel { + + private final BufferedImage exitImage, exitImageBW; + private final BufferedImage minimizeImage, minimizeImageBW; + private final BufferedImage background; + private final JFrame mainFrame; + private final Font messageFont, infoFont; + + private boolean moveForm; + private Point clickedStart; + + private int winX, winO; + private String message; + + public TitlePanel(JFrame mainFrame) { + this.mainFrame = mainFrame; + background = Util.getImage("/res/title_bg.jpg"); + minimizeImage = Util.getImage("/res/minimize_button.png"); + minimizeImageBW = Util.getImage("/res/minimize_button_bw.png"); + exitImage = Util.getImage("/res/exit_button.png"); + exitImageBW = Util.getImage("/res/exit_button_bw.png"); + moveForm = false; + messageFont = new Font("Arial", Font.BOLD, 60); + infoFont = new Font("Arial", Font.PLAIN, 30); + winX = winO = 0; + message = ""; + initComponents(); + } + + public void updateWin(int winX, int winO) { + this.winX += winX; + this.winO += winO; + } + + public void setMessage(String message) { + this.message = message; + repaint(); + } + + @Override + public void paintComponent(Graphics g) { + super.paintComponent(g); + final int width = background.getWidth(); + + g.drawImage(background, 0, 0, null); + + g.setColor(Color.DARK_GRAY); + g.setFont(infoFont); + + g.drawString("X:"+winX, 5, 110); + String win = "O:" + winO; + g.drawString(win, width - getFontMetrics(infoFont).stringWidth(win) - 5, 110); + + if (!message.isEmpty()) { + g.setFont(messageFont); + int x = getFontMetrics(messageFont).stringWidth(message) / 2; + x = width / 2 - x; + g.drawString(message, x, 110); + } + } + + private void initComponents() { + setBackground(new Color(51, 51, 51)); + setPreferredSize(new Dimension(480, 150)); + addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent evt) { + formMousePressed(evt); + } + @Override + public void mouseReleased(MouseEvent evt) { + formMouseReleased(evt); + } + }); + addMouseMotionListener(new MouseMotionAdapter() { + @Override + public void mouseDragged(MouseEvent evt) { + formMouseDragged(evt); + } + }); + setLayout(null); + + final JButton exitButton = new JButton(); + exitButton.setIcon(new ImageIcon(exitImageBW)); + exitButton.setBorder(null); + exitButton.setBorderPainted(false); + exitButton.setContentAreaFilled(false); + exitButton.addMouseListener(new MouseAdapter() { + @Override + public void mouseEntered(MouseEvent evt) { + exitButton.setIcon(new ImageIcon(exitImage)); + } + @Override + public void mouseExited(MouseEvent evt) { + exitButton.setIcon(new ImageIcon(exitImageBW)); + } + }); + exitButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent evt) { + exitButtonActionPerformed(evt); + } + }); + add(exitButton); + exitButton.setBounds(378, 2, 100, 50); + + final JButton minimizeButton = new JButton(); + minimizeButton.setIcon(new ImageIcon(minimizeImageBW)); + minimizeButton.setBorder(null); + minimizeButton.setBorderPainted(false); + minimizeButton.setContentAreaFilled(false); + minimizeButton.addMouseListener(new MouseAdapter() { + @Override + public void mouseEntered(MouseEvent evt) { + minimizeButton.setIcon(new ImageIcon(minimizeImage)); + } + @Override + public void mouseExited(MouseEvent evt) { + minimizeButton.setIcon(new ImageIcon(minimizeImageBW)); + } + }); + minimizeButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent evt) { + mainFrame.setState(Frame.ICONIFIED); + } + }); + add(minimizeButton); + minimizeButton.setBounds(2, 2, 100, 50); + } + + private void exitButtonActionPerformed(ActionEvent evt) { + mainFrame.setVisible(false); + mainFrame.dispose(); + System.exit(0); + } + + private void formMousePressed(MouseEvent evt) { + if (evt.getButton() == MouseEvent.BUTTON1) { + moveForm = true; + clickedStart = evt.getPoint(); + } + } + + private void formMouseReleased(MouseEvent evt) { + moveForm = false; + } + + private void formMouseDragged(MouseEvent evt) { + if (moveForm) { + Point moved = evt.getLocationOnScreen(); + moved.translate(-clickedStart.x, -clickedStart.y); + mainFrame.setLocation(moved); + } + } +} \ No newline at end of file diff --git a/src/jtictactoe/Util.java b/src/jtictactoe/Util.java index a68e6ba..88612e8 100644 --- a/src/jtictactoe/Util.java +++ b/src/jtictactoe/Util.java @@ -1,25 +1,24 @@ -package jtictactoe; - -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; -import javax.imageio.ImageIO; - -/** - * - * @author aNNiMON - */ -public class Util { - - public static BufferedImage getImage(String path) { - BufferedImage image = null; - try { - InputStream is = Runtime.getRuntime().getClass().getResourceAsStream(path); - image = ImageIO.read(is); - is.close(); - } catch (IOException ex) { - } - return image; - } - -} +package jtictactoe; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import javax.imageio.ImageIO; + +/** + * + * @author aNNiMON + */ +public class Util { + + public static BufferedImage getImage(String path) { + BufferedImage image = null; + try { + InputStream is = Runtime.getRuntime().getClass().getResourceAsStream(path); + image = ImageIO.read(is); + is.close(); + } catch (IOException ex) { + } + return image; + } +} \ No newline at end of file