Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27636/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer Modified Files: MyTableModel.java DataSetViewerTablePanel.java DataSetViewerTextPanel.java RowDataInputFrame.java Log Message: Bug-2818117 ("Make Editable" uses column label instead of name): replaced the use of getLabel (rsmd.getColumnLabel()) with getColumnName (rsmd.getColumnName()). Index: DataSetViewerTextPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTextPanel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DataSetViewerTextPanel.java 21 Dec 2005 21:11:15 -0000 1.5 --- DataSetViewerTextPanel.java 31 Jan 2010 22:44:32 -0000 1.6 *************** *** 73,77 **** for (int i = 0; i < colDefs.length; ++i) { ! buf.append(format(colDefs[i].getLabel(), colDefs[i].getDisplayWidth(), ' ')); } addLine(buf.toString()); --- 73,77 ---- for (int i = 0; i < colDefs.length; ++i) { ! buf.append(format(colDefs[i].getColumnName(), colDefs[i].getDisplayWidth(), ' ')); } addLine(buf.toString()); *************** *** 164,167 **** --- 164,169 ---- private final class MyJTextArea extends JTextArea { + private static final long serialVersionUID = 1L; + private TextPopupMenu _textPopupMenu; *************** *** 213,216 **** --- 215,220 ---- private static class MyJTextAreaPopupMenu extends TextPopupMenu { + private static final long serialVersionUID = 1L; + private MakeEditableAction _makeEditable = new MakeEditableAction(); *************** *** 236,239 **** --- 240,245 ---- private class MakeEditableAction extends BaseAction { + private static final long serialVersionUID = 1L; + MakeEditableAction() { Index: MyTableModel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/MyTableModel.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MyTableModel.java 7 Aug 2007 01:03:26 -0000 1.8 --- MyTableModel.java 31 Jan 2010 22:44:32 -0000 1.9 *************** *** 115,119 **** else { ! return _colDefs != null ? _colDefs[col].getLabel() : super.getColumnName(col); } } --- 115,119 ---- else { ! return _colDefs != null ? _colDefs[col].getColumnName() : super.getColumnName(col); } } Index: RowDataInputFrame.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/RowDataInputFrame.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** RowDataInputFrame.java 25 Dec 2008 19:09:32 -0000 1.13 --- RowDataInputFrame.java 31 Jan 2010 22:44:32 -0000 1.14 *************** *** 53,56 **** --- 53,58 ---- implements ActionListener { + private static final long serialVersionUID = 1L; + private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(RowDataInputFrame.class); *************** *** 182,186 **** */ class RowDataJTable extends JTable { ! private ColumnDisplayDefinition[] _colDefs = null; --- 184,188 ---- */ class RowDataJTable extends JTable { ! private static final long serialVersionUID = 1L; private ColumnDisplayDefinition[] _colDefs = null; *************** *** 211,215 **** TableColumn col = new TableColumn(i, colWidth, CellComponentFactory.getTableCellRenderer(colDefs[i]), null); ! col.setHeaderValue(colDef.getLabel()); cm.addColumn(col); } --- 213,217 ---- TableColumn col = new TableColumn(i, colWidth, CellComponentFactory.getTableCellRenderer(colDefs[i]), null); ! col.setHeaderValue(colDef.getColumnName()); cm.addColumn(col); } *************** *** 336,339 **** --- 338,343 ---- class RowDataModel extends DefaultTableModel { + private static final long serialVersionUID = 1L; + /** * ctor *************** *** 346,350 **** Object[][] rowData = new Object[2][colDefs.length]; for (int i=0; i<colDefs.length; i++) { ! colNames[i] = colDefs[i].getLabel(); // set column heading rowData[0][i] = initalValues[i]; // set data in first row --- 350,354 ---- Object[][] rowData = new Object[2][colDefs.length]; for (int i=0; i<colDefs.length; i++) { ! colNames[i] = colDefs[i].getColumnName(); // set column heading rowData[0][i] = initalValues[i]; // set data in first row Index: DataSetViewerTablePanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/DataSetViewerTablePanel.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** DataSetViewerTablePanel.java 11 Jun 2009 18:48:56 -0000 1.35 --- DataSetViewerTablePanel.java 31 Jan 2010 22:44:32 -0000 1.36 *************** *** 20,63 **** * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import java.awt.Component; import java.awt.Point; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; - import java.awt.event.KeyEvent; import java.awt.event.MouseMotionAdapter; import javax.swing.DefaultCellEditor; import javax.swing.JTable; import javax.swing.ListSelectionModel; import javax.swing.table.DefaultTableColumnModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableColumnModel; - import javax.swing.JOptionPane; - import javax.swing.event.TableModelEvent; - - //??import javax.swing.event.TableModelListener; - //??import javax.swing.event.TableModelEvent; import net.sourceforge.squirrel_sql.fw.gui.ButtonTableHeader; import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel; import net.sourceforge.squirrel_sql.fw.gui.TablePopupMenu; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; - import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; - import net.sourceforge.squirrel_sql.fw.util.StringManager; - import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory; - import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.RestorableJTextField; - - // for printing... - - import java.awt.print.Printable; - import java.awt.Graphics; - import java.awt.print.PageFormat; - import java.awt.print.PrinterException; - import java.awt.Graphics2D; - import java.awt.Color; - import javax.swing.table.JTableHeader; - import java.awt.Font; - import java.util.ArrayList; public class DataSetViewerTablePanel extends BaseDataSetViewerDestination --- 20,55 ---- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + import java.awt.Color; import java.awt.Component; + import java.awt.Font; + import java.awt.Graphics; + import java.awt.Graphics2D; import java.awt.Point; + import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; + import java.awt.print.PageFormat; + import java.awt.print.Printable; + import java.awt.print.PrinterException; import javax.swing.DefaultCellEditor; + import javax.swing.JOptionPane; import javax.swing.JTable; import javax.swing.ListSelectionModel; import javax.swing.table.DefaultTableColumnModel; + import javax.swing.table.JTableHeader; import javax.swing.table.TableCellEditor; import javax.swing.table.TableColumnModel; + import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.CellComponentFactory; + import net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.RestorableJTextField; import net.sourceforge.squirrel_sql.fw.gui.ButtonTableHeader; import net.sourceforge.squirrel_sql.fw.gui.SortableTableModel; import net.sourceforge.squirrel_sql.fw.gui.TablePopupMenu; + import net.sourceforge.squirrel_sql.fw.util.StringManager; + import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; public class DataSetViewerTablePanel extends BaseDataSetViewerDestination *************** *** 457,461 **** ExtTableColumn col = new ExtTableColumn(i, colWidth, CellComponentFactory.getTableCellRenderer(colDefs[i]), null); ! col.setHeaderValue(colDef.getLabel()); col.setColumnDisplayDefinition(colDef); cm.addColumn(col); --- 449,453 ---- ExtTableColumn col = new ExtTableColumn(i, colWidth, CellComponentFactory.getTableCellRenderer(colDefs[i]), null); ! col.setHeaderValue(colDef.getColumnName()); col.setColumnDisplayDefinition(colDef); cm.addColumn(col); |
