Novos menus e envio de mensagens

pitiupi.chat/src/pitiupi/chat/GUI/ChatMenu.java

@@ -4,28 +4,29 @@
  */
 package pitiupi.chat.GUI;
 
-import java.awt.event.ActionEvent;
-import javax.swing.JMenu;
+import pitiupi.models.Menus.MulticastMenus.MulticastMenu;
+import pitiupi.models.Menus.MulticastMenus.MulticastSubMenu;
+
+import java.util.List;
 
 /**
  *
  * @author flavio
  */
-public class ChatMenu extends JMenu {
-
-    private final ChatWindow chatWindow;
-    private javax.swing.JMenuItem menuItem;
+public class ChatMenu extends MulticastSubMenu {
+    ChatMulticastMenu chatMulticastMenu;
 
     public ChatMenu(ChatWindow chatWindow) {
-        this.chatWindow = chatWindow;
-        this.setText("Chat");
-        menuItem = new javax.swing.JMenuItem();
-        menuItem.setText("Show Chat Window");
-        menuItem.addActionListener(this::chatMenuActionPerformed);
-        this.add(menuItem);
+        this.chatMulticastMenu = new ChatMulticastMenu(chatWindow);
     }
 
-    private void chatMenuActionPerformed(ActionEvent ae) {
-        this.chatWindow.setVisible(true);
+    @Override
+    public String getText() {
+        return "Chat";
+    }
+
+    @Override
+    public List<MulticastMenu> getMenus() {
+        return List.of(chatMulticastMenu);
     }
 }

pitiupi.chat/src/pitiupi/chat/GUI/ChatMulticastMenu.java

@@ -0,0 +1,21 @@
+package pitiupi.chat.GUI;
+
+import pitiupi.models.Menus.MulticastMenus.MulticastActionMenu;;
+
+public class ChatMulticastMenu extends MulticastActionMenu {
+    ChatWindow chatWindow;
+
+    public ChatMulticastMenu(ChatWindow chatWindow) {
+        this.chatWindow = chatWindow;
+    }
+
+    @Override
+    public String getText() {
+        return "Show Chat Window";
+    }
+
+    @Override
+    public void onClick() {
+        chatWindow.setVisible(true);
+    }
+}

pitiupi.chat/src/pitiupi/chat/GUI/ChatWindow.java

@@ -5,30 +5,28 @@
  */
 package pitiupi.chat.GUI;
 
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import pitiupi.chat.net.ChatMessage;
-import pitiupi.GUI.MainWindow;
 import pitiupi.control.ConnectionManager;
-import pitiupi.net.Message;
+import pitiupi.models.Messages.Message;
+
+import javax.swing.*;
 
 /**
  *
  * @author flavio
  */
-public class ChatWindow extends javax.swing.JDialog {
+public class ChatWindow extends JDialog {
 
-    private javax.swing.JButton jButton1;
-    private javax.swing.JEditorPane jEditorPane1;
-    private javax.swing.JPanel jPanel1;
-    private javax.swing.JPanel jPanel2;
-    private javax.swing.JScrollPane jScrollPane1;
-    private javax.swing.JScrollPane jScrollPane2;
-    private javax.swing.JSplitPane jSplitPane1;
-    private javax.swing.JTextArea jTextArea1;
+    private JButton jButton1;
+    private JEditorPane jEditorPane1;
+    private JPanel jPanel1;
+    private JPanel jPanel2;
+    private JScrollPane jScrollPane1;
+    private JScrollPane jScrollPane2;
+    private JSplitPane jSplitPane1;
+    private JTextArea jTextArea1;
 
     private final ConnectionManager connectionManager;
 
@@ -44,23 +42,23 @@ public class ChatWindow extends javax.swing.JDialog {
      */
     private void initComponents() {
 
-        this.setDefaultCloseOperation(javax.swing.WindowConstants.HIDE_ON_CLOSE);
+        this.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
         this.setTitle("Chat Window");
         this.setBounds(new java.awt.Rectangle(0, 0, 800, 600));
         this.getContentPane().setLayout(new java.awt.BorderLayout(5, 5));
         this.setPreferredSize(new java.awt.Dimension(800, 600));
 
-        jSplitPane1 = new javax.swing.JSplitPane();
-        jScrollPane1 = new javax.swing.JScrollPane();
-        jEditorPane1 = new javax.swing.JEditorPane();
-        jPanel1 = new javax.swing.JPanel();
-        jScrollPane2 = new javax.swing.JScrollPane();
-        jTextArea1 = new javax.swing.JTextArea();
-        jPanel2 = new javax.swing.JPanel();
-        jButton1 = new javax.swing.JButton();
+        jSplitPane1 = new JSplitPane();
+        jScrollPane1 = new JScrollPane();
+        jEditorPane1 = new JEditorPane();
+        jPanel1 = new JPanel();
+        jScrollPane2 = new JScrollPane();
+        jTextArea1 = new JTextArea();
+        jPanel2 = new JPanel();
+        jButton1 = new JButton();
 
         jSplitPane1.setDividerLocation(500);
-        jSplitPane1.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
+        jSplitPane1.setOrientation(JSplitPane.VERTICAL_SPLIT);
         jEditorPane1.setContentType("text/html");
         jPanel1.setLayout(new java.awt.BorderLayout());
         jTextArea1.setColumns(20);

pitiupi.chat/src/pitiupi/chat/net/ChatMessage.java

@@ -5,14 +5,14 @@
  */
 package pitiupi.chat.net;
 
-import pitiupi.net.Message;
-import pitiupi.net.Message;
+
+import pitiupi.models.Messages.Message;
 
 /**
  *
  * @author flavio
  */
-public class ChatMessage extends Message{
+public class ChatMessage extends Message {
 
     private String text;
     private String name;

pitiupi.chat/src/pitiupi/chat/plugin/ChatPlugin.java

@@ -4,46 +4,43 @@
  */
 package pitiupi.chat.plugin;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import pitiupi.GUI.MainWindow;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import pitiupi.chat.GUI.ChatMenu;
 import pitiupi.chat.GUI.ChatWindow;
 import pitiupi.chat.net.ChatMessage;
 import pitiupi.control.ConnectionManager;
 import pitiupi.control.GuiManager;
-import pitiupi.net.Message;
-import pitiupi.plugin.Plugin;
+import pitiupi.models.Menus.MenuCategory;
+import pitiupi.models.Messages.Message;
+import pitiupi.models.Plugin;
 
 /**
  *
  * @author flavio
  */
-public class ChatPlugin implements Plugin {
+public class ChatPlugin extends Plugin {
 
     private ChatWindow chatWindow;
 
-    public ChatPlugin() {
-    }
-
     @Override
     public void createPlugin(ConnectionManager connectionManager, GuiManager guiManager) {
         this.chatWindow = new ChatWindow(connectionManager);
-        guiManager.addMenu(new ChatMenu(chatWindow));
+        guiManager.createMenu(MenuCategory.Social, new ChatMenu(chatWindow));
     }
 
     @Override
-    public void receiveMessage(byte[] message) {
-        ByteArrayInputStream bis = new ByteArrayInputStream(message);
-        ObjectInputStream ois;
-        try {
-            ois = new ObjectInputStream(bis);
-            if (ois.readObject() instanceof ChatMessage msg) {
-                this.chatWindow.receiveChatMessage(msg);
-            }
-        } catch (IOException | ClassNotFoundException ex) {
-            System.out.println(ex.toString());
+    public List<Class<? extends Message>> getMessages() {
+        return List.of(ChatMessage.class);
+    }
+
+
+    @Override
+    public void receiveMessage(Message message) {
+        if (message instanceof ChatMessage msg) {
+            this.chatWindow.receiveChatMessage(msg);
         }
     }
 
@@ -67,8 +64,5 @@ public class ChatPlugin implements Plugin {
         return "Pitiupi.Chat.Example";
     }
 
-    @Override
-    public Message getMessage() {
-        return new ChatMessage();
-    }
+
 }