javabot-cvs Mailing List for JavaBot

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

CVS commit by creon1: 

* Added dialog for adding channels/servers. No functionality yet though
* Added functionality for removing channels/servers


  M +105 -17   JavaBot/src/configgenerator/GUIFrontEnd.java   1.15
  M +6 -6      JavaBot/src/configgenerator/GeneratorBackEnd.java   1.15

--- JavaBot/src/configgenerator/GUIFrontEnd.java  #1.14:1.15
@@ -9,4 +9,5 @@ import javax.swing.table.DefaultTableMod
 import java.awt.*;
 import java.awt.event.*;
+import java.util.Vector;
 
 /**
@@ -21,6 +22,6 @@ public class GUIFrontEnd extends JFrame
     private GeneratorBackEnd backEnd;
     private ConfigObject[] configObjects;
-    private ConfigHandler.Channel[] channels;
-    private ConfigHandler.Server[] servers;
+    private Vector channels;
+    private Vector servers;
 
     private JTable propertyTable;
@@ -98,9 +99,11 @@ public class GUIFrontEnd extends JFrame
         // CHANNEL TABLE
         String[] channelColumnNames = {"Name", "Key"};
-        Object[][] channelData = new Object[channels.length][2];
+        Object[][] channelData = new Object[channels.size()][2];
+        ConfigHandler.Channel tmpChannel;
         for(int i = 0; i < channelData.length; i++)
         {
-            channelData[i][0] = channels[i].getName();
-            channelData[i][1] = channels[i].getKey();
+            tmpChannel = (ConfigHandler.Channel)channels.elementAt(i);
+            channelData[i][0] = tmpChannel.getName();
+            channelData[i][1] = tmpChannel.getKey();
         }
         channelTableModel = new ConfigTableModel(channelData, channelColumnNames);
@@ -116,9 +119,11 @@ public class GUIFrontEnd extends JFrame
         // SERVER TABLE
         String[] serverColumnNames = {"Hostname", "Port"};
-        Object[][] serverData = new Object[servers.length][2];
+        Object[][] serverData = new Object[servers.size()][2];
+        ConfigHandler.Server tmpServer;
         for(int i = 0; i < serverData.length; i++)
         {
-            serverData[i][0] = servers[i].getHostname();
-            serverData[i][1] = "" + servers[i].getPort();
+            tmpServer = (ConfigHandler.Server)servers.elementAt(i);
+            serverData[i][0] = tmpServer.getHostname();
+            serverData[i][1] = "" + tmpServer.getPort();
         }
         serverTableModel = new ConfigTableModel(serverData, serverColumnNames);
@@ -205,5 +210,5 @@ public class GUIFrontEnd extends JFrame
                 if(e.getClickCount() == 2)
                 {
-                    showDialog(); // The selected index is taken care of in the dialog
+                    showPropertyEditor(); // The selected index is taken care of in the dialog
                 }
             }
@@ -214,7 +219,50 @@ public class GUIFrontEnd extends JFrame
             public void mouseReleased(MouseEvent e) { }
         });
+
+        addChannelButton.addActionListener(new ActionListener()
+        {
+            public void actionPerformed(ActionEvent e)
+            {
+                showAddDialog("channel", "Name", "Key");
     }
+        });
 
-    private void showDialog()
+        removeChannelButton.addActionListener(new ActionListener()
+        {
+            public void actionPerformed(ActionEvent e)
+            {
+                delete(channelTableModel, channels, channelTable.getSelectedRow());
+            }
+        });
+
+        addServerButton.addActionListener(new ActionListener()
+        {
+            public void actionPerformed(ActionEvent e)
+            {
+                showAddDialog("server", "Hostname", "Port");
+            }
+        });
+
+        removeServerButton.addActionListener(new ActionListener()
+        {
+            public void actionPerformed(ActionEvent e)
+            {
+                delete(serverTableModel, servers, serverTable.getSelectedRow());
+            }
+        });
+    }
+
+    private void delete(ConfigTableModel tableModel, Vector vector, int selectedRow)
+    {
+        tableModel.removeRow(selectedRow);
+        vector.remove(selectedRow);
+    }
+
+    private void showAddDialog(String title, String firstColumn, String secondColumn)
+    {
+        new AddDialog(this, title, firstColumn, secondColumn);
+    }
+
+    private void showPropertyEditor()
     {
         new PropertyEditor(this);
@@ -237,8 +285,10 @@ public class GUIFrontEnd extends JFrame
         channels = backEnd.getChannels();
         clearTableModel(channelTableModel);
-        for(int i = 0; i < channels.length; i++)
+        ConfigHandler.Channel tmpChannel;
+        for(int i = 0; i < channels.size(); i++)
         {
-            rowData[0] = channels[i].getName();
-            rowData[1] = channels[i].getKey();
+            tmpChannel = (ConfigHandler.Channel)channels.elementAt(i);
+            rowData[0] = tmpChannel.getName();
+            rowData[1] = tmpChannel.getKey();
             channelTableModel.addRow(rowData);
         }
@@ -246,8 +296,10 @@ public class GUIFrontEnd extends JFrame
         servers = backEnd.getServers();
         clearTableModel(serverTableModel);
-        for(int i = 0; i < servers.length; i++)
+        ConfigHandler.Server tmpServer;
+        for(int i = 0; i < servers.size(); i++)
         {
-            rowData[0] = servers[i].getHostname();
-            rowData[1] = "" + servers[i].getPort();
+            tmpServer = (ConfigHandler.Server)servers.elementAt(i);
+            rowData[0] = tmpServer.getHostname();
+            rowData[1] = "" + tmpServer.getPort();
             serverTableModel.addRow(rowData);
         }
@@ -341,4 +392,41 @@ public class GUIFrontEnd extends JFrame
     }
 
+    private class AddDialog extends JDialog
+    {
+        JTextField firstValue;
+        JTextField secondValue;
+
+        JButton addButton;
+        JButton cancelButton;
+
+        public AddDialog(Frame owner, String title, String firstColumn, String secondColumn)
+        {
+            super(owner, "Add " + title, true);
+
+            firstValue = new JTextField();
+            firstValue.setBorder(BorderFactory.createTitledBorder(firstColumn));
+
+            secondValue = new JTextField();
+            secondValue.setBorder(BorderFactory.createTitledBorder(secondColumn));
+
+            addButton = new JButton("Add");
+            cancelButton = new JButton("Cancel");
+
+            getRootPane().setDefaultButton(addButton);
+
+            JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+            buttonPanel.add(addButton);
+            buttonPanel.add(cancelButton);
+
+            getContentPane().setLayout(new GridLayout(3, 1));
+            getContentPane().add(firstValue);
+            getContentPane().add(secondValue);
+            getContentPane().add(buttonPanel);
+
+            setSize(200, 160);
+            setVisible(true);
+        }
+    }
+
     private class ConfigTableModel extends DefaultTableModel
     {

--- JavaBot/src/configgenerator/GeneratorBackEnd.java  #1.14:1.15
@@ -16,6 +16,6 @@ public class GeneratorBackEnd
 {
     private ConfigObject[] configObjects;
-    private ConfigHandler.Channel[] channels;
-    private ConfigHandler.Server[] servers;
+    private Vector channels;
+    private Vector servers;
     private ConfigHandler configHandler;
     boolean validConfig;
@@ -30,6 +30,6 @@ public class GeneratorBackEnd
     {
         configHandler.loadConfig();
-        channels = configHandler.getChannels();
-        servers = configHandler.getServers();
+        channels = configHandler.getChannelVector();
+        servers = configHandler.getServerVector();
 
         configObjects = new ConfigObject[7];
@@ -95,10 +95,10 @@ public class GeneratorBackEnd
     }
 
-    public ConfigHandler.Channel[] getChannels()
+    public Vector getChannels()
     {
         return channels;
     }
 
-    public ConfigHandler.Server[] getServers()
+    public Vector getServers()
     {
         return servers;






2004	Jan	Feb (1)	Mar (140)	Apr (13)	May (160)	Jun (580)	Jul (60)	Aug (49)	Sep	Oct	Nov (58)	Dec
2005	Jan	Feb	Mar	Apr	May	Jun (4)	Jul	Aug	Sep	Oct	Nov	Dec

javabot-cvs Mailing List for JavaBot

javabot-cvs — Mailing list for CVS commit messages