--- FM2SQL/Attic/FM2SQL.java 2004/03/03 12:14:47 1.24 +++ FM2SQL/Attic/FM2SQL.java 2004/03/15 12:31:30 1.31 @@ -67,6 +67,7 @@ import javax.swing.table.TableModel; */ public class FM2SQL extends JFrame implements ActionListener, TableModelListener { + private JMenuItem delimiterItem; private JCheckBoxMenuItem convertItem; private JCheckBoxMenuItem appendItem; private JCheckBoxMenuItem updateItem; @@ -596,6 +597,13 @@ public class FM2SQL extends JFrame imple { } } + if (command.equals("Delimiter")) + { + new DelimiterDialog(fmInstance).setVisible(true); + //delimiter = JOptionPane.showInputDialog(fmInstance,"Enter delimiter String",delimiter); + + } + if (command == "Convert Mode") { System.out.println("Convert Mode selected"); @@ -731,6 +739,21 @@ public class FM2SQL extends JFrame imple }; thread.start(); } + if (command.equals("Delete Tables")) + { + + Thread thread = new Thread() + { + public void run() + { + setEnabled(false); + delete(); + setEnabled(true); + } + + }; + thread.start(); + } if (command.equals("show Tables")) { @@ -824,6 +847,40 @@ public class FM2SQL extends JFrame imple } } + public void delete() + { + Vector vectors[] = getListFromTable(); + Convert.user = bean.user; + Convert.passwd = bean.passwd; + Convert.userDest = destBean.user; + Convert.passwdDest = destBean.passwd; + try + { + + fmInstance.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); + fmInstance.setEnabled(false); + Convert.delete(bean.url, destURLBox.getSelectedItem().toString(), vectors[0], vectors[1], vectors[2], vectors[3],vectors[4], mode); + + destBean.setConnection((String) destURLBox.getSelectedItem()); + DefaultListModel model = new DefaultListModel(); + tables = destBean.getTableNames(); + for (int j = 0; j < tables.size(); ++j) + model.addElement(tables.get(j)); + if (debug) + System.out.println("hallo" + tables + " "); + tListDest.setModel(model); + fmInstance.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + } catch (Exception e4) + { + ByteArrayOutputStream b = new ByteArrayOutputStream(); + PrintStream stream = new PrintStream(b); + e4.printStackTrace(stream); + showErrorDialog(b.toString(), "Delete of table failed"); + fmInstance.setEnabled(true); + } + + } + /** * Copys the content of source to destination and makes new table if necessary */ @@ -930,6 +987,12 @@ public class FM2SQL extends JFrame imple convert.setText("Update Tables"); convert.setActionCommand("Update Tables"); mode = Convert.DataBase.UPDATE_MODE; + } else if (database.mode == Convert.DataBase.UPDATE_MODE) + { + deleteItem.setSelected(true); + convert.setText("Delete Tables"); + convert.setActionCommand("Delete Tables"); + mode = Convert.DataBase.DELETE_MODE; } delimiter=database.delimiter; database.bean.getConnection(); @@ -959,7 +1022,22 @@ public class FM2SQL extends JFrame imple Object idcomboBox=tC.tableModel.getValueAt(index,ID_INDEX); indices[i] = index; - if(comboBox!=null) ((JComboBox)comboBox).setSelectedItem(database.layouts.get(i)); + if (comboBox != null) + { + String layout = database.layouts.get(i).toString(); + ((JComboBox) comboBox).setSelectedItem(layout); + if (layout != "") + { + bean.makeQuery("select * from" + bean.getQC() + table + bean.getQC() + " layout " + bean.getQC() + layout + bean.getQC(), 1); + + Vector idVec = bean.getColumnNames(); + if (idVec == null) + idVec = new Vector(); + idVec.add(0, ""); + ((JComboBox) idcomboBox).setModel(new DefaultComboBoxModel(idVec)); + } + + } if(idcomboBox!=null)((JComboBox)idcomboBox).setSelectedItem(bean.ids.get(i)); tC.tableModel.fireTableDataChanged(); noDBUpdate = false; @@ -1209,7 +1287,7 @@ public class FM2SQL extends JFrame imple if (columnName.equals("Layouts")) { - bean.makeQuery("select * from"+bean.getQC()+table+bean.getQC(),1); + bean.makeQuery("select * from"+bean.getQC()+table+bean.getQC()+" layout "+bean.getQC()+layout+bean.getQC(),1); Vector idVec = bean.getColumnNames(); if (idVec == null) @@ -1218,6 +1296,8 @@ public class FM2SQL extends JFrame imple JComboBox box = ((JComboBox) model.getValueAt(row, ID_INDEX)); box.setModel(new DefaultComboBoxModel(idVec)); box.setSelectedItem(id); + + tC.tableModel.fireTableCellUpdated(row,ID_INDEX); } } @@ -1274,12 +1354,6 @@ public class FM2SQL extends JFrame imple menu = new JMenu("Options"); menu.setMnemonic('O'); - item = new JMenuItem("show Driver features"); - item.setToolTipText("shows the features of the selected driver"); - item.addActionListener(fm); - menu.add(item); - menubar.add(menu); - ButtonGroup bgrp = new ButtonGroup(); convertItem = new JCheckBoxMenuItem("Convert Mode"); convertItem.setToolTipText("Normal table conversion existing table will be deleted"); @@ -1315,9 +1389,19 @@ public class FM2SQL extends JFrame imple menu.add(deleteItem); menubar.add(menu); - + item = new JMenuItem("show Driver features"); + item.setToolTipText("shows the features of the selected driver"); item.addActionListener(fm); menu.add(item); + menubar.add(menu); + delimiterItem = new JMenuItem("Delimiter"); + delimiterItem.setToolTipText("Delimiter for FM Arrayfields"); + delimiterItem.addActionListener(fm); + menu.add(delimiterItem); + menubar.add(menu); + + // item.addActionListener(fm); +// menu.add(item); menubar.add(menu); @@ -1442,6 +1526,117 @@ public class FM2SQL extends JFrame imple } } + public static class DelimiterDialog extends JDialog + { + JLabel table = new JLabel(" "); + JLabel status = new JLabel(" "); + JLabel title = new JLabel(" "); + JPanel content = new JPanel(); + JPanel titlePanel = new JPanel(); + JPanel delimiterPanel = new JPanel(); + JPanel buttonPanel = new JPanel(); + JTextField delimiter = new JTextField(10); + + JButton cancel = new JButton("Cancel"); + JButton ok = new JButton("Ok"); + Thread thread; + public DelimiterDialog(JFrame frame) + { + super(frame); + setTitle("Delimiter Editor"); + setModal(true); + content = new JPanel(true); + delimiter.setText(fmInstance.delimiter); + ActionListener al = new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + fmInstance.delimiter=parseDelimiter(delimiter.getText()); + setVisible(false); + } + + }; + this.addWindowListener(new WindowAdapter() + { + public void windowClosing(WindowEvent e) + { + cancel.doClick(); + } + }); + + //delimiter.setText(fmInstance.delimiter); + delimiter.addActionListener(al); + content.setLayout(new BoxLayout(content, BoxLayout.Y_AXIS)); + title = new JLabel("Enter Delimiter "); + title.setHorizontalTextPosition(title.CENTER); + titlePanel.add(title); + buttonPanel.add(ok); + buttonPanel.add(cancel); + content.add(titlePanel); + content.add(Box.createRigidArea(new java.awt.Dimension(0, 15))); + + content.add(new JLabel("")); + content.add(delimiterPanel); + content.add(buttonPanel); + content.add(Box.createRigidArea(new java.awt.Dimension(0, 15))); + + delimiterPanel.add(new JLabel("Delimiter: ")); + delimiterPanel.add(delimiter); + getContentPane().add(titlePanel, "North"); + getContentPane().add(content, "Center"); + ok.addActionListener(al); + cancel.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + fmInstance.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); + fmInstance.setEnabled(true); + setVisible(false); + // thread.stop(); + } + + }); + pack(); + setLocationRelativeTo(fmInstance); + } + public String parseDelimiter(Object o) + { + String str = o.toString(); + StringBuffer sbuff = new StringBuffer(); + int length = str.length(); + for(int i = 0;i