Thread: [Squirrel-sql-commits] sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Gerd W. <ger...@us...> - 2005-07-28 05:50:40
|
Update of /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31584/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans Modified Files: NetbeansSQLEditorPane.java Log Message: Accellerators and mnemonics Index: NetbeansSQLEditorPane.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/NetbeansSQLEditorPane.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** NetbeansSQLEditorPane.java 27 May 2005 22:49:43 -0000 1.10 --- NetbeansSQLEditorPane.java 28 Jul 2005 05:50:25 -0000 1.11 *************** *** 71,74 **** --- 71,87 ---- ////////////////////////////////////////////////////////////////////////////////////////// + removeUnwantedKeyStrokes(); + + Document doc = getDocument(); + _syntaxFactory.putDocument(_session, doc); + + + setToolTipText("Just to make getToolTiptext() to be called"); + + new KeyManager(this); + } + + private void removeUnwantedKeyStrokes() + { ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // The ctrl enter short cut in the Netbeans editor is set in org.netbeans.editor.ext.BaseKit *************** *** 86,99 **** KeyStroke ctrlTStroke = KeyStroke.getKeyStroke(KeyEvent.VK_T, java.awt.event.InputEvent.CTRL_MASK); getKeymap().removeKeyStrokeBinding(ctrlTStroke); - // - /////////////////////////////////////////////////////////////////////////////////////////////////////////// ! Document doc = getDocument(); ! _syntaxFactory.putDocument(_session, doc); ! ! ! setToolTipText("Just to make getToolTiptext() to be called"); ! new KeyManager(this); } --- 99,109 ---- KeyStroke ctrlTStroke = KeyStroke.getKeyStroke(KeyEvent.VK_T, java.awt.event.InputEvent.CTRL_MASK); getKeymap().removeKeyStrokeBinding(ctrlTStroke); ! // Removed for reformatting ! KeyStroke ctrlShiftFStroke = KeyStroke.getKeyStroke(KeyEvent.VK_F, java.awt.event.InputEvent.CTRL_MASK | java.awt.event.InputEvent.SHIFT_MASK); ! getKeymap().removeKeyStrokeBinding(ctrlShiftFStroke); ! // ! /////////////////////////////////////////////////////////////////////////////////////////////////////////// } *************** *** 117,137 **** ! ////////////////////////////////////////////////////////////////////////////////////////////////////////////// ! // The ctrl enter short cut in the Netbeans editor is set in org.netbeans.editor.ext.BaseKit ! // to the org.netbeans.editor.ext.BaseKit.SplitLineAction. ! // Since the ctrl enter shorcut is a basic SQuirreL short cut and is defined via the main menu action ! // we must remove this binding here. ! KeyStroke ctrlEnterStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, java.awt.event.InputEvent.CTRL_MASK); ! getKeymap().removeKeyStrokeBinding(ctrlEnterStroke); ! ! // Removed for the SQLBookmark Plugin ! KeyStroke ctrlJStroke = KeyStroke.getKeyStroke(KeyEvent.VK_J, java.awt.event.InputEvent.CTRL_MASK); ! getKeymap().removeKeyStrokeBinding(ctrlJStroke); ! ! // Removed for the tools popup ! KeyStroke ctrlTStroke = KeyStroke.getKeyStroke(KeyEvent.VK_T, java.awt.event.InputEvent.CTRL_MASK); ! getKeymap().removeKeyStrokeBinding(ctrlTStroke); ! // ! /////////////////////////////////////////////////////////////////////////////////////////////////////////// Document doc = getDocument(); --- 127,131 ---- ! removeUnwantedKeyStrokes(); Document doc = getDocument(); |