You can subscribe to this list here.
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
|
From: CVS by c. <jav...@li...> - 2005-06-08 18:02:18
|
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; |
From: CVS by c. <jav...@li...> - 2005-06-08 18:02:18
|
CVS commit by creon1: * Added dialog for adding channels/servers. No functionality yet though * Added functionality for removing channels/servers M +10 -0 JavaBot/src/javabot/handlers/ConfigHandler.java 1.14 --- JavaBot/src/javabot/handlers/ConfigHandler.java #1.13:1.14 @@ -239,4 +239,14 @@ public class ConfigHandler } + public Vector getChannelVector() + { + return channels; + } + + public Vector getServerVector() + { + return servers; + } + /** * Adds a new channel post to the config file, on the <botinstance>-level |
From: CVS by c. <jav...@li...> - 2005-06-07 17:29:12
|
CVS commit by creon1: * Show servers and channels from the config * Reloads the values from the config correctly (re-reads the config file on disc) M +3 -0 JavaBot/src/javabot/handlers/ConfigHandler.java 1.13 --- JavaBot/src/javabot/handlers/ConfigHandler.java #1.12:1.13 @@ -63,4 +63,7 @@ public class ConfigHandler Document doc = db.parse(new File(CONFIG_FILE)); + channels = new Vector(); + servers = new Vector(); + NodeList root = doc.getElementsByTagName("javabot"); if(root.getLength() == 1) |
From: CVS by c. <jav...@li...> - 2005-06-07 17:28:57
|
CVS commit by creon1: * Show servers and channels from the config * Reloads the values from the config correctly (re-reads the config file on disc) M +55 -8 JavaBot/src/configgenerator/GUIFrontEnd.java 1.14 M +16 -6 JavaBot/src/configgenerator/GeneratorBackEnd.java 1.14 --- JavaBot/src/configgenerator/GUIFrontEnd.java #1.13:1.14 @@ -2,4 +2,5 @@ package configgenerator; import javabot.handlers.ExceptionHandler; +import javabot.handlers.ConfigHandler; import javabot.container.ConfigObject; @@ -20,11 +21,13 @@ public class GUIFrontEnd extends JFrame private GeneratorBackEnd backEnd; private ConfigObject[] configObjects; + private ConfigHandler.Channel[] channels; + private ConfigHandler.Server[] servers; private JTable propertyTable; private JTable channelTable; private JTable serverTable; - private DefaultTableModel propertyTableModel; - private DefaultTableModel channelTableModel; - private DefaultTableModel serverTableModel; + private ConfigTableModel propertyTableModel; + private ConfigTableModel channelTableModel; + private ConfigTableModel serverTableModel; private JButton saveConfigButton; @@ -63,4 +66,6 @@ public class GUIFrontEnd extends JFrame backEnd = new GeneratorBackEnd(); configObjects = backEnd.getConfigObjects(); + channels = backEnd.getChannels(); + servers = backEnd.getServers(); reloadConfigButton = new JButton("Reload config"); saveConfigButton = new JButton("Save"); @@ -93,5 +98,11 @@ public class GUIFrontEnd extends JFrame // CHANNEL TABLE String[] channelColumnNames = {"Name", "Key"}; - channelTableModel = new ConfigTableModel(null, channelColumnNames); + Object[][] channelData = new Object[channels.length][2]; + for(int i = 0; i < channelData.length; i++) + { + channelData[i][0] = channels[i].getName(); + channelData[i][1] = channels[i].getKey(); + } + channelTableModel = new ConfigTableModel(channelData, channelColumnNames); channelTable = new JTable(channelTableModel); channelTable.setDragEnabled(false); @@ -105,5 +116,11 @@ public class GUIFrontEnd extends JFrame // SERVER TABLE String[] serverColumnNames = {"Hostname", "Port"}; - serverTableModel = new ConfigTableModel(null, serverColumnNames); + Object[][] serverData = new Object[servers.length][2]; + for(int i = 0; i < serverData.length; i++) + { + serverData[i][0] = servers[i].getHostname(); + serverData[i][1] = "" + servers[i].getPort(); + } + serverTableModel = new ConfigTableModel(serverData, serverColumnNames); serverTable = new JTable(serverTableModel); serverTable.setDragEnabled(false); @@ -206,11 +223,40 @@ public class GUIFrontEnd extends JFrame private void reloadConfig() { + Object[] rowData = new Object[2]; backEnd.initConfigObjects(); - configObjects = backEnd.getConfigObjects(); + configObjects = backEnd.getConfigObjects(); + clearTableModel(propertyTableModel); for(int i = 0; i < configObjects.length; i++) { - propertyTableModel.setValueAt(configObjects[i].getProperty(), i, 0); - propertyTableModel.setValueAt(configObjects[i].getValue(), i, 1); + rowData[0] = configObjects[i].getProperty(); + rowData[1] = configObjects[i].getValue(); + propertyTableModel.addRow(rowData); + } + + channels = backEnd.getChannels(); + clearTableModel(channelTableModel); + for(int i = 0; i < channels.length; i++) + { + rowData[0] = channels[i].getName(); + rowData[1] = channels[i].getKey(); + channelTableModel.addRow(rowData); + } + + servers = backEnd.getServers(); + clearTableModel(serverTableModel); + for(int i = 0; i < servers.length; i++) + { + rowData[0] = servers[i].getHostname(); + rowData[1] = "" + servers[i].getPort(); + serverTableModel.addRow(rowData); + } + } + + private void clearTableModel(ConfigTableModel tableModel) + { + while(tableModel.getRowCount() > 0) + { + tableModel.removeRow(0); } } @@ -218,4 +264,5 @@ public class GUIFrontEnd extends JFrame private class PropertyEditor extends JDialog { + // todo ?-button, with help dialog private JTextField textField; private JButton dialogOkButton; --- JavaBot/src/configgenerator/GeneratorBackEnd.java #1.13:1.14 @@ -16,6 +16,6 @@ public class GeneratorBackEnd { private ConfigObject[] configObjects; - private Vector channels; - private Vector servers; + private ConfigHandler.Channel[] channels; + private ConfigHandler.Server[] servers; private ConfigHandler configHandler; boolean validConfig; @@ -24,8 +24,4 @@ public class GeneratorBackEnd { configHandler = ConfigHandler.getInstance(); - validConfig = configHandler.loadConfig(); - channels = new Vector(); - servers = new Vector(); - initConfigObjects(); } @@ -33,4 +29,8 @@ public class GeneratorBackEnd public void initConfigObjects() { + configHandler.loadConfig(); + channels = configHandler.getChannels(); + servers = configHandler.getServers(); + configObjects = new ConfigObject[7]; @@ -95,4 +95,14 @@ public class GeneratorBackEnd } + public ConfigHandler.Channel[] getChannels() + { + return channels; + } + + public ConfigHandler.Server[] getServers() + { + return servers; + } + /** * Returns true if the specified value is considered to be a valid value for the configObject |
From: CVS by c. <jav...@li...> - 2004-11-30 21:00:18
|
CVS commit by creon1: Added Add and Delete buttons for Channel and Server panels M +27 -5 JavaBot/src/configgenerator/GUIFrontEnd.java 1.13 --- JavaBot/src/configgenerator/GUIFrontEnd.java #1.12:1.13 @@ -31,4 +31,8 @@ public class GUIFrontEnd extends JFrame private JButton closeGeneratorButton; private JButton reloadConfigButton; + private JButton addChannelButton; + private JButton removeChannelButton; + private JButton addServerButton; + private JButton removeServerButton; public GUIFrontEnd() @@ -62,4 +66,8 @@ public class GUIFrontEnd extends JFrame saveConfigButton = new JButton("Save"); closeGeneratorButton = new JButton("Close"); + addChannelButton = new JButton("Add"); + removeChannelButton = new JButton("Delete"); + addServerButton = new JButton("Add"); + removeServerButton = new JButton("Delete"); // PROPERTY TABLE @@ -94,5 +102,4 @@ public class GUIFrontEnd extends JFrame JScrollPane channelTableScrollPane = new JScrollPane(channelTable); channelTable.setPreferredScrollableViewportSize(new Dimension(190, 150)); - channelTableScrollPane.setBorder(BorderFactory.createTitledBorder("Channels")); // SERVER TABLE @@ -107,8 +114,7 @@ public class GUIFrontEnd extends JFrame JScrollPane serverTableScrollPane = new JScrollPane(serverTable); serverTable.setPreferredScrollableViewportSize(new Dimension(190, 150)); - serverTableScrollPane.setBorder(BorderFactory.createTitledBorder("Servers")); setUpListeners(); - setSize(450, 250); + setSize(450, 500); JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); @@ -117,8 +123,24 @@ public class GUIFrontEnd extends JFrame buttonPanel.add(closeGeneratorButton); + JPanel channelPanel = new JPanel(new BorderLayout()); + JPanel channelButtonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + channelPanel.add(channelTableScrollPane, BorderLayout.CENTER); + channelButtonPanel.add(addChannelButton); + channelButtonPanel.add(removeChannelButton); + channelPanel.add(channelButtonPanel, BorderLayout.SOUTH); + channelPanel.setBorder(BorderFactory.createTitledBorder("Channels")); + + JPanel serverPanel = new JPanel(new BorderLayout()); + JPanel serverButtonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + serverPanel.add(serverTableScrollPane, BorderLayout.CENTER); + serverButtonPanel.add(addServerButton); + serverButtonPanel.add(removeServerButton); + serverPanel.add(serverButtonPanel, BorderLayout.SOUTH); + serverPanel.setBorder(BorderFactory.createTitledBorder("Servers")); + JPanel tablePanel = new JPanel(new GridLayout(2, 1)); JPanel lowerTablePanel = new JPanel(new GridLayout(1, 2)); - lowerTablePanel.add(channelTableScrollPane); - lowerTablePanel.add(serverTableScrollPane); + lowerTablePanel.add(channelPanel); + lowerTablePanel.add(serverPanel); tablePanel.add(propertyTableScrollPane); tablePanel.add(lowerTablePanel); |
From: CVS by c. <jav...@li...> - 2004-11-30 20:40:54
|
CVS commit by creon1: Added channel and server tables M +93 -43 JavaBot/src/configgenerator/GUIFrontEnd.java 1.12 --- JavaBot/src/configgenerator/GUIFrontEnd.java #1.11:1.12 @@ -22,5 +22,9 @@ public class GUIFrontEnd extends JFrame private JTable propertyTable; - private DefaultTableModel tableModel; + private JTable channelTable; + private JTable serverTable; + private DefaultTableModel propertyTableModel; + private DefaultTableModel channelTableModel; + private DefaultTableModel serverTableModel; private JButton saveConfigButton; @@ -59,4 +63,76 @@ public class GUIFrontEnd extends JFrame closeGeneratorButton = new JButton("Close"); + // PROPERTY TABLE + String[] propertyColumnNames = {"Property", "Value"}; + Object[][] propertyData = new Object[configObjects.length][2]; + for(int i = 0; i < propertyData.length; i++) + { + propertyData[i][0] = configObjects[i].getProperty(); + propertyData[i][1] = configObjects[i].getValue(); + } + + propertyTableModel = new ConfigTableModel(propertyData, propertyColumnNames); + propertyTable = new JTable(propertyTableModel); + propertyTable.setDragEnabled(false); + propertyTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + propertyTable.setRowSelectionAllowed(true); + propertyTable.setShowVerticalLines(false); + + JScrollPane propertyTableScrollPane = new JScrollPane(propertyTable); + propertyTable.setPreferredScrollableViewportSize(new Dimension(400, 200)); + propertyTableScrollPane.setBorder(BorderFactory.createTitledBorder("Properties")); + + // CHANNEL TABLE + String[] channelColumnNames = {"Name", "Key"}; + channelTableModel = new ConfigTableModel(null, channelColumnNames); + channelTable = new JTable(channelTableModel); + channelTable.setDragEnabled(false); + channelTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + channelTable.setRowSelectionAllowed(true); + channelTable.setShowVerticalLines(false); + + JScrollPane channelTableScrollPane = new JScrollPane(channelTable); + channelTable.setPreferredScrollableViewportSize(new Dimension(190, 150)); + channelTableScrollPane.setBorder(BorderFactory.createTitledBorder("Channels")); + + // SERVER TABLE + String[] serverColumnNames = {"Hostname", "Port"}; + serverTableModel = new ConfigTableModel(null, serverColumnNames); + serverTable = new JTable(serverTableModel); + serverTable.setDragEnabled(false); + serverTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + serverTable.setRowSelectionAllowed(true); + serverTable.setShowVerticalLines(false); + + JScrollPane serverTableScrollPane = new JScrollPane(serverTable); + serverTable.setPreferredScrollableViewportSize(new Dimension(190, 150)); + serverTableScrollPane.setBorder(BorderFactory.createTitledBorder("Servers")); + + setUpListeners(); + setSize(450, 250); + + JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + buttonPanel.add(reloadConfigButton); + buttonPanel.add(saveConfigButton); + buttonPanel.add(closeGeneratorButton); + + JPanel tablePanel = new JPanel(new GridLayout(2, 1)); + JPanel lowerTablePanel = new JPanel(new GridLayout(1, 2)); + lowerTablePanel.add(channelTableScrollPane); + lowerTablePanel.add(serverTableScrollPane); + tablePanel.add(propertyTableScrollPane); + tablePanel.add(lowerTablePanel); + + getContentPane().setLayout(new BorderLayout()); + + getContentPane().add(tablePanel, BorderLayout.CENTER); + getContentPane().add(buttonPanel, BorderLayout.SOUTH); + + setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + setVisible(true); + } + + private void setUpListeners() + { reloadConfigButton.addActionListener(new ActionListener() { @@ -84,27 +160,4 @@ public class GUIFrontEnd extends JFrame }); - setSize(450, 250); - - String[] columnNames = {"Property", "Value"}; - Object[][] data = new Object[configObjects.length][2]; - for(int i = 0; i < data.length; i++) - { - data[i][0] = configObjects[i].getProperty(); - data[i][1] = configObjects[i].getValue(); - } - - tableModel = new DefaultTableModel(data, columnNames) - { - public boolean isCellEditable(int row, int column) - { - return false; - } - }; - - propertyTable = new JTable(tableModel); - propertyTable.setDragEnabled(false); - propertyTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - propertyTable.setRowSelectionAllowed(true); - propertyTable.setShowVerticalLines(false); propertyTable.addMouseListener(new MouseListener() { @@ -122,20 +175,4 @@ public class GUIFrontEnd extends JFrame public void mouseReleased(MouseEvent e) { } }); - - JScrollPane tableScrollPane = new JScrollPane(propertyTable); - propertyTable.setPreferredScrollableViewportSize(new Dimension(400, 200)); - - JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - buttonPanel.add(reloadConfigButton); - buttonPanel.add(saveConfigButton); - buttonPanel.add(closeGeneratorButton); - - getContentPane().setLayout(new BorderLayout()); - - getContentPane().add(tableScrollPane, BorderLayout.CENTER); - getContentPane().add(buttonPanel, BorderLayout.SOUTH); - - setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - setVisible(true); } @@ -152,6 +189,6 @@ public class GUIFrontEnd extends JFrame for(int i = 0; i < configObjects.length; i++) { - tableModel.setValueAt(configObjects[i].getProperty(), i, 0); - tableModel.setValueAt(configObjects[i].getValue(), i, 1); + propertyTableModel.setValueAt(configObjects[i].getProperty(), i, 0); + propertyTableModel.setValueAt(configObjects[i].getValue(), i, 1); } } @@ -231,5 +268,18 @@ public class GUIFrontEnd extends JFrame { configObject.setValue(textField.getText()); - tableModel.setValueAt(configObject.getValue(), propertyTable.getSelectedRow(), 1); + propertyTableModel.setValueAt(configObject.getValue(), propertyTable.getSelectedRow(), 1); + } + } + + private class ConfigTableModel extends DefaultTableModel + { + public ConfigTableModel(Object[][] data, Object[] columnNames) + { + super(data, columnNames); + } + + public boolean isCellEditable(int row, int column) + { + return false; } } |
From: CVS by c. <jav...@li...> - 2004-11-30 19:07:35
|
CVS commit by creon1: Added "reload config" button M +23 -0 JavaBot/src/configgenerator/GUIFrontEnd.java 1.11 M +5 -1 JavaBot/src/configgenerator/GeneratorBackEnd.java 1.13 --- JavaBot/src/configgenerator/GUIFrontEnd.java #1.10:1.11 @@ -26,4 +26,5 @@ public class GUIFrontEnd extends JFrame private JButton saveConfigButton; private JButton closeGeneratorButton; + private JButton reloadConfigButton; public GUIFrontEnd() @@ -54,7 +55,16 @@ public class GUIFrontEnd extends JFrame backEnd = new GeneratorBackEnd(); configObjects = backEnd.getConfigObjects(); + reloadConfigButton = new JButton("Reload config"); saveConfigButton = new JButton("Save"); closeGeneratorButton = new JButton("Close"); + reloadConfigButton.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + reloadConfig(); + } + }); + saveConfigButton.addActionListener(new ActionListener() { @@ -117,4 +127,5 @@ public class GUIFrontEnd extends JFrame JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + buttonPanel.add(reloadConfigButton); buttonPanel.add(saveConfigButton); buttonPanel.add(closeGeneratorButton); @@ -134,4 +145,16 @@ public class GUIFrontEnd extends JFrame } + private void reloadConfig() + { + backEnd.initConfigObjects(); + configObjects = backEnd.getConfigObjects(); + + for(int i = 0; i < configObjects.length; i++) + { + tableModel.setValueAt(configObjects[i].getProperty(), i, 0); + tableModel.setValueAt(configObjects[i].getValue(), i, 1); + } + } + private class PropertyEditor extends JDialog { --- JavaBot/src/configgenerator/GeneratorBackEnd.java #1.12:1.13 @@ -28,5 +28,9 @@ public class GeneratorBackEnd servers = new Vector(); - // START CONFIG OBJECTS + initConfigObjects(); + } + + public void initConfigObjects() + { configObjects = new ConfigObject[7]; |
From: CVS by c. <jav...@li...> - 2004-11-30 18:51:55
|
CVS commit by creon1: Copy-paste error. Servers doesn't have a name and a key, but rather a hostname and a port :) M +2 -2 JavaBot/src/javabot/handlers/ConfigHandler.java 1.12 --- JavaBot/src/javabot/handlers/ConfigHandler.java #1.11:1.12 @@ -383,6 +383,6 @@ public class ConfigHandler { Element serverNode = doc.createElement("server"); - serverNode.setAttribute("name", URLEncoder.encode(hostname, "UTF-8")); - serverNode.setAttribute("key", URLEncoder.encode("" + port, "UTF-8")); + serverNode.setAttribute("hostname", URLEncoder.encode(hostname, "UTF-8")); + serverNode.setAttribute("port", URLEncoder.encode("" + port, "UTF-8")); return serverNode; |
From: CVS by c. <jav...@li...> - 2004-11-30 18:50:19
|
CVS commit by creon1: Saving of regular properties implemented M +17 -0 JavaBot/src/configgenerator/GUIFrontEnd.java 1.10 M +5 -0 JavaBot/src/configgenerator/GeneratorBackEnd.java 1.12 --- JavaBot/src/configgenerator/GUIFrontEnd.java #1.9:1.10 @@ -57,4 +57,21 @@ public class GUIFrontEnd extends JFrame closeGeneratorButton = new JButton("Close"); + saveConfigButton.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + backEnd.saveConfig(); + } + }); + + closeGeneratorButton.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + hide(); + dispose(); + } + }); + setSize(450, 250); --- JavaBot/src/configgenerator/GeneratorBackEnd.java #1.11:1.12 @@ -77,5 +77,10 @@ public class GeneratorBackEnd public void saveConfig() { + for(int i = 0; i < configObjects.length; i++) + { + configHandler.setValue(configObjects[i].getProperty(), configObjects[i].getValue()); + } + configHandler.saveConfig(); } |
From: CVS by c. <jav...@li...> - 2004-11-28 17:49:10
|
CVS commit by creon1: Save and Close buttons added M +17 -5 JavaBot/src/configgenerator/GUIFrontEnd.java 1.9 --- JavaBot/src/configgenerator/GUIFrontEnd.java #1.8:1.9 @@ -22,5 +22,8 @@ public class GUIFrontEnd extends JFrame private JTable propertyTable; - DefaultTableModel tableModel; + private DefaultTableModel tableModel; + + private JButton saveConfigButton; + private JButton closeGeneratorButton; public GUIFrontEnd() @@ -28,7 +31,4 @@ public class GUIFrontEnd extends JFrame super("JavaBot - Config Generator"); - backEnd = new GeneratorBackEnd(); - configObjects = backEnd.getConfigObjects(); - try { @@ -52,4 +52,9 @@ public class GUIFrontEnd extends JFrame } + backEnd = new GeneratorBackEnd(); + configObjects = backEnd.getConfigObjects(); + saveConfigButton = new JButton("Save"); + closeGeneratorButton = new JButton("Close"); + setSize(450, 250); @@ -94,5 +99,12 @@ public class GUIFrontEnd extends JFrame propertyTable.setPreferredScrollableViewportSize(new Dimension(400, 200)); - getContentPane().add(tableScrollPane); + JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + buttonPanel.add(saveConfigButton); + buttonPanel.add(closeGeneratorButton); + + getContentPane().setLayout(new BorderLayout()); + + getContentPane().add(tableScrollPane, BorderLayout.CENTER); + getContentPane().add(buttonPanel, BorderLayout.SOUTH); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); |
From: CVS by c. <jav...@li...> - 2004-11-28 17:43:55
|
CVS commit by creon1: We don't have to write to the error log each time it can't find the config file M +0 -1 JavaBot/src/javabot/handlers/ConfigHandler.java 1.11 --- JavaBot/src/javabot/handlers/ConfigHandler.java #1.10:1.11 @@ -118,5 +118,4 @@ public class ConfigHandler catch(Exception e) { - ExceptionHandler.handleException(e); return false; } |
From: CVS by c. <jav...@li...> - 2004-11-28 17:43:27
|
CVS commit by creon1: * Removed GeneratorBackEnd.getValue(..), since it was pointless * Removed ConfigObject.defaultValue - the default value can be stored in the value variable until it's replaced * Made the OK and Cancel buttons work M +1 -8 JavaBot/src/javabot/container/ConfigObject.java 1.6 --- JavaBot/src/javabot/container/ConfigObject.java #1.5:1.6 @@ -15,5 +15,4 @@ public class ConfigObject private String description; private String property; - private String defaultValue; private String value; private String validValue; @@ -24,7 +23,6 @@ public class ConfigObject this.description = description; this.property = property; - this.defaultValue = ConfigHandler.getInstance().getStringValue(property).equalsIgnoreCase("") ? defaultValue : ConfigHandler.getInstance().getStringValue(property); + this.value = ConfigHandler.getInstance().getStringValue(property).equalsIgnoreCase("") ? defaultValue : ConfigHandler.getInstance().getStringValue(property); this.validValue = validValue; - value = ""; } @@ -39,9 +37,4 @@ public class ConfigObject } - public String getDefaultValue() - { - return defaultValue; - } - public String getQuestion() { |
From: CVS by c. <jav...@li...> - 2004-11-28 17:43:26
|
CVS commit by creon1: * Removed GeneratorBackEnd.getValue(..), since it was pointless * Removed ConfigObject.defaultValue - the default value can be stored in the value variable until it's replaced * Made the OK and Cancel buttons work M +45 -13 JavaBot/src/configgenerator/GUIFrontEnd.java 1.8 M +0 -18 JavaBot/src/configgenerator/GeneratorBackEnd.java 1.11 --- JavaBot/src/configgenerator/GUIFrontEnd.java #1.7:1.8 @@ -22,4 +22,5 @@ public class GUIFrontEnd extends JFrame private JTable propertyTable; + DefaultTableModel tableModel; public GUIFrontEnd() @@ -58,8 +59,8 @@ public class GUIFrontEnd extends JFrame { data[i][0] = configObjects[i].getProperty(); - data[i][1] = backEnd.getDefaultValue(configObjects[i]); + data[i][1] = configObjects[i].getValue(); } - DefaultTableModel tableModel = new DefaultTableModel(data, columnNames) + tableModel = new DefaultTableModel(data, columnNames) { public boolean isCellEditable(int row, int column) @@ -101,24 +102,25 @@ public class GUIFrontEnd extends JFrame private void showDialog() { - new InputDialog(this); + new PropertyEditor(this); } - private class InputDialog extends JDialog + private class PropertyEditor extends JDialog { private JTextField textField; - private JButton okButton; - private JButton cancelButton; + private JButton dialogOkButton; + private JButton dialogCancelButton; private ConfigObject configObject; - public InputDialog(Frame owner) + public PropertyEditor(Frame owner) { super(owner, "Edit property", true); configObject = configObjects[propertyTable.getSelectedRow()]; - textField = new JTextField(backEnd.getDefaultValue(configObject)); + textField = new JTextField(configObject.getValue()); textField.setToolTipText(configObject.getDescription()); textField.setBorder(BorderFactory.createTitledBorder(configObject.getProperty())); - okButton = new JButton("OK"); - cancelButton = new JButton("Cancel"); + dialogOkButton = new JButton("OK"); + dialogCancelButton = new JButton("Cancel"); + getRootPane().setDefaultButton(dialogOkButton); textField.addKeyListener(new KeyListener() @@ -132,7 +134,24 @@ public class GUIFrontEnd extends JFrame }); + dialogOkButton.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + storeValue(); + closeDialog(); + } + }); + + dialogCancelButton.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + closeDialog(); + } + }); + JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - buttonPanel.add(okButton); - buttonPanel.add(cancelButton); + buttonPanel.add(dialogOkButton); + buttonPanel.add(dialogCancelButton); getContentPane().setLayout(new BorderLayout()); @@ -146,7 +166,19 @@ public class GUIFrontEnd extends JFrame private void evaluateValue() { - okButton.setEnabled(backEnd.isValidValue(configObject, textField.getText())); + dialogOkButton.setEnabled(backEnd.isValidValue(configObject, textField.getText())); textField.setForeground(backEnd.isValidValue(configObject, textField.getText()) ? Color.BLACK : Color.RED); } + + private void closeDialog() + { + hide(); + dispose(); + } + + private void storeValue() + { + configObject.setValue(textField.getText()); + tableModel.setValueAt(configObject.getValue(), propertyTable.getSelectedRow(), 1); + } } } --- JavaBot/src/configgenerator/GeneratorBackEnd.java #1.10:1.11 @@ -87,22 +87,4 @@ public class GeneratorBackEnd /** - * Gives the default value to display in the config generator. This is either the value - * specified when creating the ConfigObject instance, or the value currently specified - * in the config, but this is only if there exists a config file, and the loading of it - * was successful - * @param configObject - * @return The default value to display in the config generator - */ - public String getDefaultValue(ConfigObject configObject) - { - if(configObject != null) - { - return validConfig ? configHandler.getStringValue(configObject.getProperty()) : configObject.getDefaultValue(); - } - - return ""; - } - - /** * Returns true if the specified value is considered to be a valid value for the configObject */ |
From: CVS by s. <jav...@li...> - 2004-11-28 17:09:13
|
CVS commit by scalldog: M +1 -1 JavaBot/src/javabot/modules/special/findquake3player/EmptyServerData.java 1.3 --- JavaBot/src/javabot/modules/special/findquake3player/EmptyServerData.java #1.2:1.3 @@ -10,5 +10,5 @@ import javabot.container.filedata.User; * *@author Fredrik Ryd- *@since JavaBot + *@since JavaBot 1.0.0 */ |
From: CVS by s. <jav...@li...> - 2004-11-28 17:09:02
|
CVS commit by scalldog: M +1 -1 JavaBot/src/javabot/modules/special/findquake3player/QuakeServer.java 1.4 --- JavaBot/src/javabot/modules/special/findquake3player/QuakeServer.java #1.3:1.4 @@ -8,5 +8,5 @@ import java.util.Vector; * *@author Fredrik Ryd- *@since JavaBot + *@since JavaBot 1.0.0 */ |
From: CVS by s. <jav...@li...> - 2004-11-28 17:08:47
|
CVS commit by scalldog: M +1 -1 JavaBot/src/javabot/modules/special/findquake3player/FindClanWarServer.java 1.2 --- JavaBot/src/javabot/modules/special/findquake3player/FindClanWarServer.java #1.1:1.2 @@ -11,5 +11,5 @@ import javabot.container.filedata.Defaul * *@author Fredrik Ryd- *@since JavaBot + *@since JavaBot 1.0.0 */ |
From: CVS by s. <jav...@li...> - 2004-11-28 16:09:45
|
CVS commit by scalldog: searches for an empty server A JavaBot/src/javabot/modules/special/findquake3player/FindClanWarServer.java 1.1 |
From: CVS by s. <jav...@li...> - 2004-11-28 15:40:39
|
CVS commit by scalldog: changed some stuff to boolean M +16 -20 JavaBot/src/javabot/modules/special/findquake3player/QuakeServer.java 1.3 --- JavaBot/src/javabot/modules/special/findquake3player/QuakeServer.java #1.2:1.3 @@ -148,12 +148,11 @@ public class QuakeServer { } - public String getG_needpass() { + public boolean getG_needpass() { if (g_needpass.equalsIgnoreCase("1")) { - g_needpass = "yes"; + return true; } - else if(g_needpass.equalsIgnoreCase("0")) { - g_needpass = "no"; + else { + return false; } - return g_needpass; } @@ -218,12 +217,11 @@ public class QuakeServer { } - public String getSv_floodProtect() { + public boolean getSv_floodProtect() { if (sv_floodProtect.equalsIgnoreCase("1")) { - sv_floodProtect = "yes"; + return true; } - else if(sv_floodProtect.equalsIgnoreCase("0")) { - sv_floodProtect = "no"; + else { + return false; } - return sv_floodProtect; } @@ -232,12 +230,11 @@ public class QuakeServer { } - public String getSv_allowDownload() { + public boolean getSv_allowDownload() { if (sv_allowDownload.equalsIgnoreCase("1")) { - sv_allowDownload = "yes"; + return true; } - else if(sv_allowDownload.equalsIgnoreCase("0")) { - sv_allowDownload = "no"; + else { + return false; } - return sv_allowDownload; } @@ -262,12 +259,11 @@ public class QuakeServer { } - public String getSv_punkbuster() { + public boolean getSv_punkbuster() { if (sv_punkbuster.equalsIgnoreCase("1")) { - sv_punkbuster = "yes"; + return true; } - else if(sv_punkbuster.equalsIgnoreCase("0")) { - sv_punkbuster = "no"; + else { + return false; } - return sv_punkbuster; } |
From: CVS by c. <jav...@li...> - 2004-11-28 15:34:21
|
CVS commit by creon1: Evaluates the entered value, and enables/disables the OK-button, and makes the text either black or red M +24 -8 JavaBot/src/configgenerator/GUIFrontEnd.java 1.7 M +2 -2 JavaBot/src/configgenerator/GeneratorBackEnd.java 1.10 --- JavaBot/src/configgenerator/GUIFrontEnd.java #1.6:1.7 @@ -7,6 +7,5 @@ import javax.swing.*; import javax.swing.table.DefaultTableModel; import java.awt.*; -import java.awt.event.MouseListener; -import java.awt.event.MouseEvent; +import java.awt.event.*; /** @@ -110,4 +109,5 @@ public class GUIFrontEnd extends JFrame private JButton okButton; private JButton cancelButton; + private ConfigObject configObject; public InputDialog(Frame owner) @@ -115,5 +115,5 @@ public class GUIFrontEnd extends JFrame super(owner, "Edit property", true); - ConfigObject configObject = configObjects[propertyTable.getSelectedRow()]; + configObject = configObjects[propertyTable.getSelectedRow()]; textField = new JTextField(backEnd.getDefaultValue(configObject)); textField.setToolTipText(configObject.getDescription()); @@ -122,14 +122,30 @@ public class GUIFrontEnd extends JFrame cancelButton = new JButton("Cancel"); + textField.addKeyListener(new KeyListener() + { + public void keyPressed(KeyEvent e) { } + public void keyReleased(KeyEvent e) + { + evaluateValue(); + } + public void keyTyped(KeyEvent e) { } + }); + JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); buttonPanel.add(okButton); buttonPanel.add(cancelButton); - this.getContentPane().setLayout(new BorderLayout()); - this.getContentPane().add(textField, BorderLayout.CENTER); - this.getContentPane().add(buttonPanel, BorderLayout.SOUTH); + getContentPane().setLayout(new BorderLayout()); + getContentPane().add(textField, BorderLayout.CENTER); + getContentPane().add(buttonPanel, BorderLayout.SOUTH); - this.setSize(200, 110); - this.setVisible(true); + setSize(200, 110); + setVisible(true); + } + + private void evaluateValue() + { + okButton.setEnabled(backEnd.isValidValue(configObject, textField.getText())); + textField.setForeground(backEnd.isValidValue(configObject, textField.getText()) ? Color.BLACK : Color.RED); } } --- JavaBot/src/configgenerator/GeneratorBackEnd.java #1.9:1.10 @@ -80,5 +80,5 @@ public class GeneratorBackEnd } - // todo (1.1.0) Collect ConfigObjects from ALL modules and return them along with the defined ones + // todo (1.0.0) Collect ConfigObjects from ALL modules and return them along with the defined ones public ConfigObject[] getConfigObjects() { @@ -111,5 +111,5 @@ public class GeneratorBackEnd if(configObject != null) { - return configObject.getValidValue().matches(value); + return value.matches(configObject.getValidValue()); } |
From: CVS by s. <jav...@li...> - 2004-11-28 15:15:06
|
CVS commit by scalldog: helpmsg and groupname M +1 -1 JavaBot/src/javabot/modules/special/findquake3player/EmptyServerData.java 1.2 --- JavaBot/src/javabot/modules/special/findquake3player/EmptyServerData.java #1.1:1.2 @@ -33,5 +33,5 @@ public class EmptyServerData extends Mod public String getGroupName() { - return null; + return "FindQuake3Player"; } } |
From: CVS by s. <jav...@li...> - 2004-11-28 15:14:55
|
CVS commit by scalldog: helpmsg and groupname M +1 -1 JavaBot/src/javabot/modules/special/findquake3player/CleanUpServerData.java 1.3 --- JavaBot/src/javabot/modules/special/findquake3player/CleanUpServerData.java #1.2:1.3 @@ -52,5 +52,5 @@ public class CleanUpServerData extends M public String getGroupName() { - return null; + return "FindQuake3Player"; } } |
From: CVS by s. <jav...@li...> - 2004-11-28 15:14:40
|
CVS commit by scalldog: helpmsg and groupname M +1 -1 JavaBot/src/javabot/modules/special/findquake3player/AddServer.java 1.10 --- JavaBot/src/javabot/modules/special/findquake3player/AddServer.java #1.9:1.10 @@ -80,5 +80,5 @@ public class AddServer extends Module { public String getHelpMessage() { - return "BotAdmin-flag is required for this module Usage: !addserver <ip-adress>:<port> {-f}"; + return "Adds a server to the datafile. BotAdmin-flag is required for this module. Usage: !addserver <ip-adress>:<port> {-f}"; } public String getGroupName() { |
From: CVS by s. <jav...@li...> - 2004-11-28 15:14:22
|
CVS commit by scalldog: helpmsg and groupname M +2 -2 JavaBot/src/javabot/modules/special/findquake3player/RemoveServer.java 1.2 --- JavaBot/src/javabot/modules/special/findquake3player/RemoveServer.java #1.1:1.2 @@ -57,9 +57,9 @@ public class RemoveServer extends Module public String getHelpMessage() { - return null; + return "Removes a server from the datafile. BotAdmin-flag is required for this module. Usage: !removeserver <ip-adress>:<port>"; } public String getGroupName() { - return null; + return "FindQuake3Player"; } |
From: CVS by c. <jav...@li...> - 2004-11-28 14:57:40
|
CVS commit by creon1: A bit too much undo M +6 -1 JavaBot/src/javabot/container/ConfigObject.java 1.5 --- JavaBot/src/javabot/container/ConfigObject.java #1.4:1.5 @@ -25,5 +25,5 @@ public class ConfigObject this.property = property; this.defaultValue = ConfigHandler.getInstance().getStringValue(property).equalsIgnoreCase("") ? defaultValue : ConfigHandler.getInstance().getStringValue(property); - + this.validValue = validValue; value = ""; } @@ -54,4 +54,9 @@ public class ConfigObject } + public String getValidValue() + { + return validValue; + } + public void setValue(String value) { |
From: CVS by c. <jav...@li...> - 2004-11-28 14:54:34
|
CVS commit by creon1: GUI generator front end rewritten - this is the new draft M +73 -65 JavaBot/src/configgenerator/GUIFrontEnd.java 1.6 M +24 -3 JavaBot/src/configgenerator/GeneratorBackEnd.java 1.9 |