diff options
| author | cirakg <ciraboxkg@gmail.com> | 2023-01-08 21:09:27 +0100 |
|---|---|---|
| committer | cirakg <ciraboxkg@gmail.com> | 2023-01-08 21:09:27 +0100 |
| commit | da977ffa778d5bda4bba4d0f36db602ae1384b3c (patch) | |
| tree | f7cdac4fb0d629ddce26801d511433409d6d45bb /src/main | |
| parent | 1a63847916f0fe1c130502805c004b8620913642 (diff) | |
Ispravljen edge case za obradu izlaska korisnika iz aplikacije. Dodati tooltip-ovi na desktop aplikaciji.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/pokemon/Server.java | 2 | ||||
| -rw-r--r-- | src/main/java/ui/ChooseOpponentPanel.java | 5 | ||||
| -rw-r--r-- | src/main/java/ui/GamePanel.java | 7 | ||||
| -rw-r--r-- | src/main/java/ui/LoginPanel.java | 6 | ||||
| -rw-r--r-- | src/main/java/ui/OpponentConfirmation.java | 7 |
5 files changed, 26 insertions, 1 deletions
diff --git a/src/main/java/pokemon/Server.java b/src/main/java/pokemon/Server.java index 8292281..12d3d15 100644 --- a/src/main/java/pokemon/Server.java +++ b/src/main/java/pokemon/Server.java @@ -90,6 +90,8 @@ public class Server implements Runnable { } private void leftGame(SocketChannel sc)throws Exception { + if(!players.containsKey(sc)) + return; long id=players.get(sc); Game game=null; for(Game tempGame :games) { diff --git a/src/main/java/ui/ChooseOpponentPanel.java b/src/main/java/ui/ChooseOpponentPanel.java index c318aaf..b5d0b6b 100644 --- a/src/main/java/ui/ChooseOpponentPanel.java +++ b/src/main/java/ui/ChooseOpponentPanel.java @@ -43,6 +43,11 @@ public class ChooseOpponentPanel extends JPanel { comboBox.setBounds(134, 101, 166, 22); add(comboBox); + JLabel lblToolTip = new JLabel("(?)"); + lblToolTip.setBounds(330, 105, 27, 14); + lblToolTip.setToolTipText("<html>Izbor protivnika. Lista se refreshuje svaki put kada se korisnik prijavi na sistem,<br> zapocne nova igra, zavrsi igra, igrac izadje iz igrice.</html>"); + add(lblToolTip); + btnSendGameRequest.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { if(comboBox.getItemCount()==0) diff --git a/src/main/java/ui/GamePanel.java b/src/main/java/ui/GamePanel.java index e863ea0..e16482d 100644 --- a/src/main/java/ui/GamePanel.java +++ b/src/main/java/ui/GamePanel.java @@ -55,6 +55,7 @@ public class GamePanel extends JPanel { public MonsterViewModel yourMonster=null; public MonsterViewModel enemyMonster=null; public JButton btnBack; + private JLabel lblToolTip; /** * Create the panel. @@ -184,6 +185,12 @@ public class GamePanel extends JPanel { btnBack.setBounds(353, 276, 188, 23); btnBack.setVisible(false); add(btnBack); + + lblToolTip = new JLabel("(?)"); + lblToolTip.setBounds(180, 105, 23, 14); + lblToolTip.setToolTipText("<html>Igra<br> Korisnici se bore po potezima. Koristeci izabrane napade <br>Prikazane su sve potrebne informacije za vodjenje igre.<br> Korisnici mogu koristiti chat za komunikaciju.<br> Po zavrsetku igre korisnici dobijaju obavestenje o rezultatu igre i<br> opciju da se vrate na stranicu za biranje protivnika</html>"); + add(lblToolTip); + add(lblToolTip); } public void sendChat() { diff --git a/src/main/java/ui/LoginPanel.java b/src/main/java/ui/LoginPanel.java index 06a9099..adc6f78 100644 --- a/src/main/java/ui/LoginPanel.java +++ b/src/main/java/ui/LoginPanel.java @@ -72,6 +72,11 @@ public class LoginPanel extends JPanel { }); btnLogIn.setBounds(174, 181, 81, 23); add(btnLogIn); + + JLabel lblToolTip = new JLabel("(?)"); + lblToolTip.setBounds(338, 106, 25, 14); + lblToolTip.setToolTipText("<html>Prijavljivanje korisnika. <br> Polja ne smeju biti prazna i unos mora biti alfanumericki. <br>Ukoliko korisnik nema izabranog pokemona nije mu dozvoljeno da se prijavi </html>"); + add(lblToolTip); } @@ -103,5 +108,4 @@ public class LoginPanel extends JPanel { e.printStackTrace(); } } - } diff --git a/src/main/java/ui/OpponentConfirmation.java b/src/main/java/ui/OpponentConfirmation.java index d0c2a95..9e38b52 100644 --- a/src/main/java/ui/OpponentConfirmation.java +++ b/src/main/java/ui/OpponentConfirmation.java @@ -19,6 +19,7 @@ public class OpponentConfirmation extends JPanel { public JButton btnAccept; public JButton btnRefuse; public long opponentId; + private JLabel lblToolTip; public OpponentConfirmation() { setLayout(null); @@ -64,6 +65,12 @@ public class OpponentConfirmation extends JPanel { }); btnRefuse.setBounds(214, 194, 89, 23); add(btnRefuse); + + lblToolTip = new JLabel("(?)"); + lblToolTip.setBounds(249, 41, 24, 14); + lblToolTip.setToolTipText("<html>Ukoliko korisnik salje zahtev drugom korisniku za igru on ceka na odgovor korisnika<br> Ukoliko korisnik prima zahtev za igru od drugog korisnika <br> on odgovara na taj zahtev prihvacanjem igre ili odbijanjem </html>"); + add(lblToolTip); + add(lblToolTip); } public long getOpponentId() { |