2 files changed, 16 insertions, 0 deletions
diff --git a/src/main/java/ui/GamePanel.java b/src/main/java/ui/GamePanel.java
index beeeb11..599e3c9 100644
--- a/src/main/java/ui/GamePanel.java
+++ b/src/main/java/ui/GamePanel.java
@@ -27,6 +27,7 @@ import models.AbilityType;
 import models.GameStatus;
 import models.MonsterViewModel;
 import models.User;
+import pokemon.RegexHelper;
 
 import javax.swing.JTextArea;
 import java.awt.event.ActionListener;
@@ -187,6 +188,10 @@ public class GamePanel extends JPanel {
 	}
 	public void sendChat() {
 		String message=textFieldChat.getText();
+		if(!RegexHelper.checkChatInput(message)) {
+			return;
+			
+		}
 		MainFrame topFrame=(MainFrame) SwingUtilities.getAncestorOfClass(MainFrame.class, GamePanel.this);
 		String sendMessage="CHATMESSAGE:"+opponentId+":"+message;
 		ByteBuffer bb=ByteBuffer.wrap(sendMessage.getBytes());
diff --git a/src/main/java/ui/LoginPanel.java b/src/main/java/ui/LoginPanel.java
index bfd47f9..06a9099 100644
--- a/src/main/java/ui/LoginPanel.java
+++ b/src/main/java/ui/LoginPanel.java
@@ -4,6 +4,9 @@ import javax.swing.JPanel;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
+
+import pokemon.RegexHelper;
+
 import javax.swing.JTextArea;
 import java.awt.SystemColor;
 import java.awt.Font;
@@ -81,6 +84,14 @@ public class LoginPanel extends JPanel {
 			warningTextArea.setText("Morate uneti login informacije");
 			return;
 		}
+		if(!RegexHelper.checkAlphaNumericInput(username)) {
+			warningTextArea.setText("Username mora sadrzati alfanumericke karaktere");
+			return;
+		}
+		if(!RegexHelper.checkAlphaNumericInput(password)) {
+			warningTextArea.setText("Password mora sadrzati alfanumericke karaktere");
+			return;
+		}
 		String loginMsg="LOGIN:"+username+":"+password;
 		ByteBuffer bbLogin=ByteBuffer.wrap(loginMsg.getBytes());
 		MainFrame topFrame=(MainFrame) SwingUtilities.getAncestorOfClass(MainFrame.class, LoginPanel.this);