Skip to content
Snippets Groups Projects
Commit fd9c6a61 authored by Hai HoDac's avatar Hai HoDac
Browse files

Restrict username to <= 15 characters.

Add "resources" folder to project root, moved "icon" folder into "resource" folder.
parent 7a1d5044
No related branches found
No related tags found
1 merge request!43Hai
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
...@@ -58,24 +58,15 @@ public class PaintGUI extends JPanel { ...@@ -58,24 +58,15 @@ public class PaintGUI extends JPanel {
/// Set up button icons /// /// Set up button icons ///
try { try {
String path = System.getProperty("user.dir"); BufferedImage paletteIcon = ImageIO.read(getClass().getResource("/palette.png"));
System.out.println(path); BufferedImage freehandIcon = ImageIO.read(getClass().getResource("/freehand.png"));
File palettePic = new File(path + "/src/GUI/icon/palette.png"); BufferedImage lineIcon = ImageIO.read(getClass().getResource("/line.png"));
File freehandPic = new File(path + "/src/GUI/icon/freehand.png"); BufferedImage circleIcon = ImageIO.read(getClass().getResource("/circle.png"));
File linePic = new File(path + "/src/GUI/icon/line.png"); BufferedImage rectIcon = ImageIO.read(getClass().getResource("/rectangle.png"));
File circlePic = new File(path + "/src/GUI/icon/circle.png"); BufferedImage ovalIcon = ImageIO.read(getClass().getResource("/oval.png"));
File rectPic = new File(path + "/src/GUI/icon/rectangle.png"); BufferedImage eraserIcon = ImageIO.read(getClass().getResource("/eraser.png"));
File ovalPic = new File(path + "/src/GUI/icon/oval.png"); BufferedImage textIcon = ImageIO.read(getClass().getResource("/text.png"));
File eraserPic = new File(path + "/src/GUI/icon/eraser.png");
File textPic = new File(path + "/src/GUI/icon/text.png");
BufferedImage paletteIcon = ImageIO.read(palettePic);
BufferedImage freehandIcon = ImageIO.read(freehandPic);
BufferedImage lineIcon = ImageIO.read(linePic);
BufferedImage circleIcon = ImageIO.read(circlePic);
BufferedImage rectIcon = ImageIO.read(rectPic);
BufferedImage ovalIcon = ImageIO.read(ovalPic);
BufferedImage eraserIcon = ImageIO.read(eraserPic);
BufferedImage textIcon = ImageIO.read(textPic);
colorPaletteBtn = new JButton(new ImageIcon(paletteIcon)); colorPaletteBtn = new JButton(new ImageIcon(paletteIcon));
colorPaletteBtn.addActionListener(actionListener); colorPaletteBtn.addActionListener(actionListener);
freehandBtn = new JButton(new ImageIcon(freehandIcon)); freehandBtn = new JButton(new ImageIcon(freehandIcon));
......
...@@ -46,8 +46,8 @@ public class StartScreen { ...@@ -46,8 +46,8 @@ public class StartScreen {
String userName = usernameField.getText(); String userName = usernameField.getText();
String password = new String(passwordField.getPassword()); String password = new String(passwordField.getPassword());
if (userName.length() <= 15) {
int connectionStatus = client.connect(userName, serverAddress, password); int connectionStatus = client.connect(userName, serverAddress, password);
if( connectionStatus == 1 ) if( connectionStatus == 1 )
{ {
frame.setVisible(false); frame.setVisible(false);
...@@ -85,6 +85,10 @@ public class StartScreen { ...@@ -85,6 +85,10 @@ public class StartScreen {
showErrorMessage("Unknown Connection Status"); showErrorMessage("Unknown Connection Status");
} }
} }
else {
showErrorMessage("Username must be less or equal to 15 characters");
}
}
} }
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment