diff options
| -rw-r--r-- | src/main/java/models/GameStatus.java | 4 | ||||
| -rw-r--r-- | src/main/java/pokemon/Server.java | 1 | ||||
| -rw-r--r-- | src/main/java/ui/MainFrame.java | 38 |
3 files changed, 23 insertions, 20 deletions
diff --git a/src/main/java/models/GameStatus.java b/src/main/java/models/GameStatus.java index 0230b8b..6bfc792 100644 --- a/src/main/java/models/GameStatus.java +++ b/src/main/java/models/GameStatus.java @@ -1,6 +1,8 @@ package models; -public enum GameStatus { +import java.io.Serializable; + +public enum GameStatus implements Serializable { WAITING_FOR_SECOND_PLAYER, PLAYING, FINISHED, diff --git a/src/main/java/pokemon/Server.java b/src/main/java/pokemon/Server.java index 555d040..bf84756 100644 --- a/src/main/java/pokemon/Server.java +++ b/src/main/java/pokemon/Server.java @@ -223,6 +223,7 @@ public class Server implements Runnable { } game.status=GameStatus.PLAYING; ByteBuffer buff = ByteBuffer.wrap(game.toString().getBytes()); + System.out.println(game.toString()); sc.write(buff); buff = ByteBuffer.wrap(game.toString().getBytes()); opponentSocket.write(buff); diff --git a/src/main/java/ui/MainFrame.java b/src/main/java/ui/MainFrame.java index 8b3e949..c3c974d 100644 --- a/src/main/java/ui/MainFrame.java +++ b/src/main/java/ui/MainFrame.java @@ -135,29 +135,29 @@ public class MainFrame extends JFrame implements Runnable { XMLDecoder decoder = null; decoder = new XMLDecoder(new ByteArrayInputStream(sb.toString().getBytes())); try { - UserListWrapper wp=(UserListWrapper) decoder.readObject(); - decoder.close(); - chooseOpponentPanel.comboBox.removeAllItems(); - if(wp.getUsers()!=null) - for(User user :wp.getUsers()) { - if(userId!=user.id) - chooseOpponentPanel.comboBox.addItem(new ComboBoxUser(user)); - - } + Object o=decoder.readObject(); + decoder.close(); + if(o instanceof UserListWrapper) { + UserListWrapper wp=(UserListWrapper) o; + chooseOpponentPanel.comboBox.removeAllItems(); + if(wp.getUsers()!=null) + for(User user :wp.getUsers()) { + if(userId!=user.id) + chooseOpponentPanel.comboBox.addItem(new ComboBoxUser(user)); + + } + }else if(o instanceof Game) { + Game game=(Game) o; + decoder.close(); + this.getContentPane().removeAll(); + this.getContentPane().add(this.gamePanel,BorderLayout.CENTER); + SwingUtilities.updateComponentTreeUI(this); + + } } catch (Exception e) { System.out.println("Nije refresh"); } - try { - game=(Game) decoder.readObject(); - decoder.close(); - this.getContentPane().removeAll(); - this.getContentPane().add(this.gamePanel,BorderLayout.CENTER); - SwingUtilities.updateComponentTreeUI(this); - - } catch (Exception e) { - System.out.println("Nije GAME"); - } } |