[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeFloat.java, 1.15, 1.16 DataTypeOther.java, 1.14, 1.15 DataTypeDouble.java, 1.15, 1.16 DataTypeShort.java, 1.16, 1.17 DataTypeUnknown.java, 1.14, 1.15

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2795/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent

Modified Files:
	DataTypeFloat.java DataTypeOther.java DataTypeDouble.java 
	DataTypeShort.java DataTypeUnknown.java 
Log Message:
Use beep helper and removed unused variables.

Index: DataTypeUnknown.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeUnknown.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DataTypeUnknown.java	9 Sep 2007 20:52:36 -0000	1.14
--- DataTypeUnknown.java	30 Dec 2008 11:28:46 -0000	1.15
***************
*** 308,318 ****
  	 private class KeyTextHandler extends KeyAdapter {
  	 	public void keyTyped(KeyEvent e) {
- 				char c = e.getKeyChar();
- 				
  				// as a coding convenience, create a reference to the text component
  				// that is typecast to JTextComponent.  this is not essential, as we
  				// could typecast every reference, but this makes the code cleaner
  				JTextComponent _theComponent = (JTextComponent)DataTypeUnknown.this._textComponent;
! 				_theComponent.getToolkit().beep();
  				e.consume();
  			}
--- 308,316 ----
  	 private class KeyTextHandler extends KeyAdapter {
  	 	public void keyTyped(KeyEvent e) {
  				// as a coding convenience, create a reference to the text component
  				// that is typecast to JTextComponent.  this is not essential, as we
  				// could typecast every reference, but this makes the code cleaner
  				JTextComponent _theComponent = (JTextComponent)DataTypeUnknown.this._textComponent;
! 				_beepHelper.beep(_theComponent);
  				e.consume();
  			}

Index: DataTypeFloat.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeFloat.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DataTypeFloat.java	21 Apr 2007 12:05:40 -0000	1.15
--- DataTypeFloat.java	30 Dec 2008 11:28:46 -0000	1.16
***************
*** 18,38 ****
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
! import java.awt.event.*;
! 
  import java.io.FileInputStream;
  import java.io.FileOutputStream;
  import java.io.InputStreamReader;
  import java.io.OutputStreamWriter;
! import java.io.IOException;
  
  import javax.swing.JTable;
- import javax.swing.JTextField;
  import javax.swing.JTextArea;
  import javax.swing.SwingUtilities;
  import javax.swing.text.JTextComponent;
- import java.sql.PreparedStatement;
- import java.sql.ResultSet;
- import java.text.NumberFormat;
- import java.math.BigDecimal;
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
--- 18,38 ----
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
! import java.awt.event.KeyEvent;
! import java.awt.event.MouseAdapter;
! import java.awt.event.MouseEvent;
  import java.io.FileInputStream;
  import java.io.FileOutputStream;
+ import java.io.IOException;
  import java.io.InputStreamReader;
  import java.io.OutputStreamWriter;
! import java.sql.PreparedStatement;
! import java.sql.ResultSet;
! import java.text.NumberFormat;
  
  import javax.swing.JTable;
  import javax.swing.JTextArea;
+ import javax.swing.JTextField;
  import javax.swing.SwingUtilities;
  import javax.swing.text.JTextComponent;
  
  import net.sourceforge.squirrel_sql.fw.datasetviewer.CellDataPopup;
***************
*** 85,94 ****
     private boolean _isNullable;
  
-    /* the total number of digits allowed in the field */
-    private int _precision;
- 
-    /* the number of decimal digits allowed flollowing the decimal point */
-    private int _scale;
- 
     /* table of which we are part (needed for creating popup dialog) */
     private JTable _table;
--- 85,88 ----
***************
*** 116,122 ****
        _colDef = colDef;
        _isNullable = colDef.isNullable();
-       _precision = colDef.getPrecision();
-       _scale = colDef.getScale();
- 
        _numberFormat = NumberFormat.getInstance();
  
--- 110,113 ----
***************
*** 359,363 ****
  	               }
  	               ((IRestorableTextComponent)_theComponent).updateText( text);
! 	               _theComponent.getToolkit().beep();
                 }
                 e.consume();
--- 350,354 ----
  	               }
  	               ((IRestorableTextComponent)_theComponent).updateText( text);
! 	               _beepHelper.beep(_theComponent);
                 }
                 e.consume();
***************
*** 372,376 ****
                 (c == KeyEvent.VK_BACK_SPACE) ||
                 (c == KeyEvent.VK_DELETE) ) ) {
!                _theComponent.getToolkit().beep();
                 e.consume();
              }
--- 363,367 ----
                 (c == KeyEvent.VK_BACK_SPACE) ||
                 (c == KeyEvent.VK_DELETE) ) ) {
!             	_beepHelper.beep(_theComponent);
                 e.consume();
              }

Index: DataTypeOther.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeOther.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DataTypeOther.java	9 Sep 2007 20:52:35 -0000	1.14
--- DataTypeOther.java	30 Dec 2008 11:28:46 -0000	1.15
***************
*** 317,321 ****
  			JTextComponent _theComponent = (JTextComponent)DataTypeOther.this._textComponent;
  			e.consume();
! 			_theComponent.getToolkit().beep();
  		}
  	}
--- 317,321 ----
  			JTextComponent _theComponent = (JTextComponent)DataTypeOther.this._textComponent;
  			e.consume();
! 			_beepHelper.beep(_theComponent);
  		}
  	}

Index: DataTypeShort.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeShort.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** DataTypeShort.java	9 Sep 2007 20:52:35 -0000	1.16
--- DataTypeShort.java	30 Dec 2008 11:28:46 -0000	1.17
***************
*** 280,284 ****
  				if ( ! DataTypeShort.this._isSigned && c == '-') {
  					// cannot use '-' when unsigned
! 					_theComponent.getToolkit().beep();
  					e.consume();
  				}
--- 280,284 ----
  				if ( ! DataTypeShort.this._isSigned && c == '-') {
  					// cannot use '-' when unsigned
! 					_beepHelper.beep(_theComponent);
  					e.consume();
  				}
***************
*** 299,303 ****
  						}
  						((IRestorableTextComponent)_theComponent).updateText( text);
! 						_theComponent.getToolkit().beep();
  					}
  					e.consume();
--- 299,303 ----
  						}
  						((IRestorableTextComponent)_theComponent).updateText( text);
! 						_beepHelper.beep(_theComponent);
  					}
  					e.consume();
***************
*** 308,312 ****
  					(c == KeyEvent.VK_BACK_SPACE) ||
  					(c == KeyEvent.VK_DELETE) ) ) {
! 					_theComponent.getToolkit().beep();
  					e.consume();
  				}
--- 308,312 ----
  					(c == KeyEvent.VK_BACK_SPACE) ||
  					(c == KeyEvent.VK_DELETE) ) ) {
! 					_beepHelper.beep(_theComponent);
  					e.consume();
  				}
***************
*** 319,323 ****
  					// max size reached
  					e.consume();
! 					_theComponent.getToolkit().beep();
  				}
  
--- 319,323 ----
  					// max size reached
  					e.consume();
! 					_beepHelper.beep(_theComponent);
  				}
  

Index: DataTypeDouble.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeDouble.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DataTypeDouble.java	21 Apr 2007 12:05:31 -0000	1.15
--- DataTypeDouble.java	30 Dec 2008 11:28:46 -0000	1.16
***************
*** 85,94 ****
     private boolean _isNullable;
  
-    /* the total number of digits allowed in the field */
-    private int _precision;
- 
-    /* the number of decimal digits allowed flollowing the decimal point */
-    private int _scale;
- 
     /* table of which we are part (needed for creating popup dialog) */
     private JTable _table;
--- 85,88 ----
***************
*** 115,121 ****
        _colDef = colDef;
        _isNullable = colDef.isNullable();
-       _precision = colDef.getPrecision();
-       _scale = colDef.getScale();
- 
        _numberFormat = NumberFormat.getInstance();
  
--- 109,112 ----
***************
*** 356,360 ****
  	               }
  	               ((IRestorableTextComponent)_theComponent).updateText( text);
! 	               _theComponent.getToolkit().beep();
                 }
                 e.consume();
--- 347,351 ----
  	               }
  	               ((IRestorableTextComponent)_theComponent).updateText( text);
! 	               _beepHelper.beep(_theComponent);
                 }
                 e.consume();
***************
*** 370,374 ****
                 (c == KeyEvent.VK_BACK_SPACE) ||
                 (c == KeyEvent.VK_DELETE) ) ) {
!                _theComponent.getToolkit().beep();
                 e.consume();
              }
--- 361,365 ----
                 (c == KeyEvent.VK_BACK_SPACE) ||
                 (c == KeyEvent.VK_DELETE) ) ) {
!             	_beepHelper.beep(_theComponent);
                 e.consume();
              }