diff --git a/pitiupi.mpChat/out/GUI/ChatMenu.class b/pitiupi.mpChat/out/GUI/ChatMenu.class deleted file mode 100644 index c0ab65b..0000000 Binary files a/pitiupi.mpChat/out/GUI/ChatMenu.class and /dev/null differ diff --git a/pitiupi.mpChat/out/GUI/ChatWindow.class b/pitiupi.mpChat/out/GUI/ChatWindow.class deleted file mode 100644 index 0a97f82..0000000 Binary files a/pitiupi.mpChat/out/GUI/ChatWindow.class and /dev/null differ diff --git a/pitiupi.mpChat/out/GUI/PrivateChatWindow.class b/pitiupi.mpChat/out/GUI/PrivateChatWindow.class deleted file mode 100644 index 0d7a074..0000000 Binary files a/pitiupi.mpChat/out/GUI/PrivateChatWindow.class and /dev/null differ diff --git a/pitiupi.mpChat/out/GUI/PublicChatWindow.class b/pitiupi.mpChat/out/GUI/PublicChatWindow.class deleted file mode 100644 index b8f8c03..0000000 Binary files a/pitiupi.mpChat/out/GUI/PublicChatWindow.class and /dev/null differ diff --git a/pitiupi.mpChat/out/GUI/SocketTestMenu.class b/pitiupi.mpChat/out/GUI/SocketTestMenu.class deleted file mode 100644 index 724eae7..0000000 Binary files a/pitiupi.mpChat/out/GUI/SocketTestMenu.class and /dev/null differ diff --git a/pitiupi.mpChat/out/GUI/SocketTestWindow.class b/pitiupi.mpChat/out/GUI/SocketTestWindow.class deleted file mode 100644 index b782ecd..0000000 Binary files a/pitiupi.mpChat/out/GUI/SocketTestWindow.class and /dev/null differ diff --git a/pitiupi.mpChat/out/META-INF/services/pitiupi.plugin.Plugin b/pitiupi.mpChat/out/META-INF/services/pitiupi.plugin.Plugin deleted file mode 100644 index 3240a6f..0000000 --- a/pitiupi.mpChat/out/META-INF/services/pitiupi.plugin.Plugin +++ /dev/null @@ -1 +0,0 @@ -plugin.MultiProtocolChat diff --git a/pitiupi.mpChat/out/control/ChatController.class b/pitiupi.mpChat/out/control/ChatController.class deleted file mode 100644 index 864a1bb..0000000 Binary files a/pitiupi.mpChat/out/control/ChatController.class and /dev/null differ diff --git a/pitiupi.mpChat/out/net/MpChatMessage.class b/pitiupi.mpChat/out/net/MpChatMessage.class deleted file mode 100644 index 78047ae..0000000 Binary files a/pitiupi.mpChat/out/net/MpChatMessage.class and /dev/null differ diff --git a/pitiupi.mpChat/out/net/TestChatMessage.class b/pitiupi.mpChat/out/net/TestChatMessage.class deleted file mode 100644 index 02c09f3..0000000 Binary files a/pitiupi.mpChat/out/net/TestChatMessage.class and /dev/null differ diff --git a/pitiupi.mpChat/out/net/TestMessage.class b/pitiupi.mpChat/out/net/TestMessage.class deleted file mode 100644 index d472376..0000000 Binary files a/pitiupi.mpChat/out/net/TestMessage.class and /dev/null differ diff --git a/pitiupi.mpChat/out/plugin/MultiProtocolChat.class b/pitiupi.mpChat/out/plugin/MultiProtocolChat.class deleted file mode 100644 index 7ecd755..0000000 Binary files a/pitiupi.mpChat/out/plugin/MultiProtocolChat.class and /dev/null differ diff --git a/pitiupi.mpChat/out/plugin/SocketTest.class b/pitiupi.mpChat/out/plugin/SocketTest.class deleted file mode 100644 index 549bbe9..0000000 Binary files a/pitiupi.mpChat/out/plugin/SocketTest.class and /dev/null differ diff --git a/pitiupi.mpChat/out/plugin/TestChat.class b/pitiupi.mpChat/out/plugin/TestChat.class deleted file mode 100644 index 29ca5c3..0000000 Binary files a/pitiupi.mpChat/out/plugin/TestChat.class and /dev/null differ diff --git a/pitiupi.mpChat/src/GUI/ChatMenu.java b/pitiupi.mpChat/src/GUI/ChatMenu.java deleted file mode 100644 index 1881c6e..0000000 --- a/pitiupi.mpChat/src/GUI/ChatMenu.java +++ /dev/null @@ -1,40 +0,0 @@ -package GUI; - -import pitiupi.models.Menus.MenuCategory; -import pitiupi.models.Menus.MulticastMenus.MulticastSubMenu; -import plugin.MultiProtocolChat; - -import javax.swing.*; -import java.awt.*; - -public class ChatMenu extends MulticastSubMenu { - private final MultiProtocolChat multiProtocolChat; - - public ChatMenu(MultiProtocolChat multiProtocolChat) { - this.multiProtocolChat = multiProtocolChat; - this.setText("MP-Chat"); - - JMenuItem startPrivateChat = new JMenuItem("start Private Chat"); - startPrivateChat.addActionListener(e -> showPrivateChatDialog()); - this.add(startPrivateChat); - } - - public void newMenuItem(JMenuItem newMenuItem, ChatWindow chatWindow) { - newMenuItem.addActionListener(e -> chatWindow.setVisible(true)); - - this.add(newMenuItem); - } - - public void removeMenuItem(JMenuItem removeMenuItem) { - this.remove(removeMenuItem); - } - - private void showPrivateChatDialog() { - - } - - @Override - public String getText() { - return "MP-Chat"; - } -} diff --git a/pitiupi.mpChat/src/GUI/ChatWindow.java b/pitiupi.mpChat/src/GUI/ChatWindow.java deleted file mode 100644 index bca8e1c..0000000 --- a/pitiupi.mpChat/src/GUI/ChatWindow.java +++ /dev/null @@ -1,94 +0,0 @@ -package GUI; - -import net.MpChatMessage; -import pitiupi.control.ConnectionManager; - -import javax.swing.*; -import java.awt.*; -import java.net.InetAddress; -import java.net.UnknownHostException; - -public abstract class ChatWindow extends JFrame { - - protected final ConnectionManager connectionManager; - - private JTextArea receivedMessagesArea; - protected JTextField messageField; - - public ChatWindow(ConnectionManager connectionManager) { - this.connectionManager = connectionManager; - initComponents(); - } - - private void initComponents() { - setTitle("Socket Test"); - setSize(700, 500); - setLocationRelativeTo(null); - setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); - - JPanel mainPanel = new JPanel(new BorderLayout(10, 10)); - - mainPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - - initReceivedMessagesPanel(mainPanel); - initBottomPanel(mainPanel); - - setContentPane(mainPanel); - } - - private void initReceivedMessagesPanel(JPanel mainPanel) { - receivedMessagesArea = new JTextArea(); - receivedMessagesArea.setEditable(false); - receivedMessagesArea.setLineWrap(true); - receivedMessagesArea.setWrapStyleWord(true); - - JScrollPane messagesScrollPane = new JScrollPane(receivedMessagesArea); - - messagesScrollPane.setBorder(BorderFactory.createTitledBorder("Mensagens recebidas")); - - mainPanel.add(messagesScrollPane, BorderLayout.CENTER); - } - - private void initBottomPanel(JPanel mainPanel) { - messageField = new JTextField(); - - JPanel bottomPanel = new JPanel(new BorderLayout(10, 10)); - - bottomPanel.add(messageField, BorderLayout.CENTER); - - initButtons(bottomPanel); - - mainPanel.add(bottomPanel, BorderLayout.SOUTH); - } - - protected abstract void initButtons(JPanel bottomPanel); - - protected MpChatMessage createMessage(String tipoMensagem) { - try { - String nome = connectionManager.getUserName(); - String ip = InetAddress.getLocalHost().getHostAddress(); - String message = messageField.getText(); - - return new MpChatMessage(nome, ip, tipoMensagem, message); - - } catch (UnknownHostException e) { - throw new RuntimeException(e); - } - } - - public void receiveMessage(MpChatMessage msg) { - SwingUtilities.invokeLater(() -> { - String mensagem = String.format( - "[%s] %s (%s): %s%n", - msg.getTipoMensagem(), - msg.getNome(), - msg.getIp(), - msg.getMessage() - ); - - receivedMessagesArea.append(mensagem); - - receivedMessagesArea.setCaretPosition(receivedMessagesArea.getDocument().getLength()); - }); - } -} \ No newline at end of file diff --git a/pitiupi.mpChat/src/GUI/PublicChatMenu.java b/pitiupi.mpChat/src/GUI/MulticastMpChatMenu.java similarity index 66% rename from pitiupi.mpChat/src/GUI/PublicChatMenu.java rename to pitiupi.mpChat/src/GUI/MulticastMpChatMenu.java index aa1b18a..a068b1d 100644 --- a/pitiupi.mpChat/src/GUI/PublicChatMenu.java +++ b/pitiupi.mpChat/src/GUI/MulticastMpChatMenu.java @@ -2,10 +2,10 @@ package GUI; import pitiupi.models.Menus.MulticastMenus.MulticastActionMenu; -public class PublicChatMenu extends MulticastActionMenu { +public class MulticastMpChatMenu extends MulticastActionMenu { PublicChatWindow publicChatWindow; - PublicChatMenu(PublicChatWindow publicChatWindow) { + public MulticastMpChatMenu(PublicChatWindow publicChatWindow) { this.publicChatWindow = publicChatWindow; } @@ -14,8 +14,9 @@ public class PublicChatMenu extends MulticastActionMenu { publicChatWindow.setVisible(true); } + @Override public String getText() { - return ""; + return "MP-Chat"; } } diff --git a/pitiupi.mpChat/src/GUI/PrivateChatMenu.java b/pitiupi.mpChat/src/GUI/PrivateChatMenu.java deleted file mode 100644 index e57bc2f..0000000 --- a/pitiupi.mpChat/src/GUI/PrivateChatMenu.java +++ /dev/null @@ -1,38 +0,0 @@ -package GUI; - -import control.ChatController; -import pitiupi.models.Menus.UnicastMenus.UnicastActionMenu; -import pitiupi.models.User; -import plugin.MultiProtocolChat; - -import javax.swing.*; -import java.awt.*; -import java.net.InetAddress; - -public class PrivateChatMenu extends UnicastActionMenu { - PrivateChatWindow privateChatWindow; - private final MultiProtocolChat multiProtocolChat; - private final ChatController chatController; - - public PrivateChatMenu(PrivateChatWindow PrivateChatWindow, MultiProtocolChat multiProtocolChat, ChatController chatController) { - this.privateChatWindow = PrivateChatWindow; - this.multiProtocolChat = multiProtocolChat; - this.chatController = chatController; - } - - @Override - public void onClick(User user) { - if (multiProtocolChat.openConnection(user.getAddress()) - else errorLabel.setVisible(true); - - dialog.setContentPane(contentPanel); - dialog.pack(); - dialog.setLocationRelativeTo(SwingUtilities.getWindowAncestor(privateChatWindow)); - dialog.setVisible(true); - } - - @Override - public String getText() { - return "start Private Chat"; - } -} diff --git a/pitiupi.mpChat/src/GUI/UnicastMpChatMenu.java b/pitiupi.mpChat/src/GUI/UnicastMpChatMenu.java new file mode 100644 index 0000000..52cc699 --- /dev/null +++ b/pitiupi.mpChat/src/GUI/UnicastMpChatMenu.java @@ -0,0 +1,4 @@ +package GUI; + +public class UnicastMpChatMenu { +}