You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
(121) |
May
(188) |
Jun
(134) |
Jul
(115) |
Aug
(201) |
Sep
(22) |
Oct
(22) |
Nov
(15) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(20) |
Feb
(4) |
Mar
(1) |
Apr
(84) |
May
(107) |
Jun
(101) |
Jul
(131) |
Aug
(66) |
Sep
(55) |
Oct
(189) |
Nov
(164) |
Dec
(60) |
| 2006 |
Jan
(75) |
Feb
(107) |
Mar
(117) |
Apr
(115) |
May
(91) |
Jun
(91) |
Jul
(225) |
Aug
(151) |
Sep
(117) |
Oct
(165) |
Nov
(263) |
Dec
(233) |
| 2007 |
Jan
(244) |
Feb
(116) |
Mar
(185) |
Apr
(263) |
May
(149) |
Jun
(292) |
Jul
(260) |
Aug
(306) |
Sep
(130) |
Oct
(61) |
Nov
(103) |
Dec
(144) |
| 2008 |
Jan
(112) |
Feb
(55) |
Mar
(116) |
Apr
(76) |
May
(69) |
Jun
(130) |
Jul
(75) |
Aug
(56) |
Sep
(76) |
Oct
(87) |
Nov
(403) |
Dec
(410) |
| 2009 |
Jan
(132) |
Feb
(168) |
Mar
(197) |
Apr
(67) |
May
(8) |
Jun
(44) |
Jul
(144) |
Aug
(126) |
Sep
(88) |
Oct
(3) |
Nov
(81) |
Dec
(97) |
| 2010 |
Jan
(238) |
Feb
(41) |
Mar
(61) |
Apr
(37) |
May
(31) |
Jun
(22) |
Jul
(92) |
Aug
(105) |
Sep
(46) |
Oct
(45) |
Nov
(55) |
Dec
(92) |
| 2011 |
Jan
(51) |
Feb
(21) |
Mar
(57) |
Apr
(20) |
May
(32) |
Jun
(29) |
Jul
(26) |
Aug
(50) |
Sep
(59) |
Oct
(25) |
Nov
(79) |
Dec
(2) |
| 2012 |
Jan
(14) |
Feb
(31) |
Mar
(11) |
Apr
(9) |
May
(13) |
Jun
(9) |
Jul
(6) |
Aug
(12) |
Sep
(16) |
Oct
(37) |
Nov
(12) |
Dec
(7) |
| 2013 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Gerd W. <ger...@us...> - 2009-11-30 23:03:04
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3797/app/src/net/sourceforge/squirrel_sql/client/gui/db Modified Files: AliasFolderState.java Log Message: Fixed startup error Index: AliasFolderState.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/AliasFolderState.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AliasFolderState.java 27 Dec 2008 19:20:53 -0000 1.4 --- AliasFolderState.java 30 Nov 2009 23:02:55 -0000 1.5 *************** *** 148,162 **** public void applyExpansionAndSelection(JTree tree) { ! if (null != _folderName) { ! applyExpansionAndSelectionToNode(tree, _node); ! for (AliasFolderState kid : _kids) { ! kid.applyExpansionAndSelection(tree); } - } - else - { - applyExpansionAndSelectionToNode(tree, _node); } } --- 148,168 ---- public void applyExpansionAndSelection(JTree tree) { ! if (_node != null) { ! // _node is null when there is an _aliasIdentifier with no Alias ! // This has been seen some times and caused NullPointersHere ! ! if (null != _folderName) { ! applyExpansionAndSelectionToNode(tree, _node); ! for (AliasFolderState kid : _kids) ! { ! kid.applyExpansionAndSelection(tree); ! } ! } ! else ! { ! applyExpansionAndSelectionToNode(tree, _node); } } } |
|
From: Gerd W. <ger...@us...> - 2009-11-30 22:15:31
|
Update of /cvsroot/squirrel-sql/sql12/web-site In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17589/web-site Modified Files: left.html Log Message: RSyntax editor integration Index: left.html =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/web-site/left.html,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** left.html 29 Dec 2008 18:03:23 -0000 1.20 --- left.html 30 Nov 2009 22:15:20 -0000 1.21 *************** *** 175,180 **** <h1 class="menu">SQuirreL's SQL editor is based on:</h1> ! <a href="http://www.netbeans.org" target="_blank"> ! <img border="0" alt="Eclipse" src="http://www.netbeans.org/images/v4/netbeans_logo.gif" width="120" height="50"/> </a> <td class="menu_right_border"> </td> --- 175,181 ---- <h1 class="menu">SQuirreL's SQL editor is based on:</h1> ! <a href="http://fifesoft.com/rsyntaxtextarea/" target="_blank"> ! <img border="0" alt="RSyntax" src="http://fifesoft.com/Fifesoft_blue.png" width="120" height="50"/> ! RSyntaxTextArea </a> <td class="menu_right_border"> </td> |
|
From: Gerd W. <ger...@us...> - 2009-11-30 21:29:41
|
Update of /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24448/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax Modified Files: SQLEntryPanelFactoryProxy.java Log Message: RSyntax editor integration --> Better GCing Index: SQLEntryPanelFactoryProxy.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/SQLEntryPanelFactoryProxy.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SQLEntryPanelFactoryProxy.java 29 Nov 2009 21:17:53 -0000 1.8 --- SQLEntryPanelFactoryProxy.java 30 Nov 2009 21:29:27 -0000 1.9 *************** *** 43,46 **** --- 43,47 ---- { _netbeansFactory.sessionEnding(session); + _rsyntaxFactory.sessionEnding(session); } |
Update of /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24448/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax Modified Files: SquirrelRSyntaxTextArea.java RSyntaxSQLEntryPanel.java RSyntaxSQLEntryAreaFactory.java Log Message: RSyntax editor integration --> Better GCing Index: RSyntaxSQLEntryPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/RSyntaxSQLEntryPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RSyntaxSQLEntryPanel.java 29 Nov 2009 21:17:53 -0000 1.1 --- RSyntaxSQLEntryPanel.java 30 Nov 2009 21:29:27 -0000 1.2 *************** *** 452,455 **** --- 452,456 ---- public void sessionEnding() { + _textArea.sessionEnding(); _session = null; } Index: RSyntaxSQLEntryAreaFactory.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/RSyntaxSQLEntryAreaFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RSyntaxSQLEntryAreaFactory.java 29 Nov 2009 21:17:53 -0000 1.1 --- RSyntaxSQLEntryAreaFactory.java 30 Nov 2009 21:29:27 -0000 1.2 *************** *** 7,18 **** import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPreferences; import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPugin; import java.util.HashMap; public class RSyntaxSQLEntryAreaFactory { private SyntaxPugin _plugin; ! public RSyntaxSQLEntryAreaFactory(SyntaxPugin plugin) { _plugin = plugin; --- 7,22 ---- import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPreferences; import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPugin; + import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel; + import net.sourceforge.squirrel_sql.fw.id.IIdentifier; import java.util.HashMap; + import java.util.ArrayList; public class RSyntaxSQLEntryAreaFactory { private SyntaxPugin _plugin; + private HashMap<IIdentifier, ArrayList<RSyntaxSQLEntryPanel>> _rSyntaxSQLEntryPanelsBySessionID = new HashMap<IIdentifier, ArrayList<RSyntaxSQLEntryPanel>>(); ! public RSyntaxSQLEntryAreaFactory(SyntaxPugin plugin) { _plugin = plugin; *************** *** 22,26 **** { SyntaxPreferences prefs = (SyntaxPreferences) session.getPluginObject(_plugin, IConstants.ISessionKeys.PREFS); ! return new RSyntaxSQLEntryPanel(session, prefs, props); } } --- 26,58 ---- { SyntaxPreferences prefs = (SyntaxPreferences) session.getPluginObject(_plugin, IConstants.ISessionKeys.PREFS); ! ! ArrayList<RSyntaxSQLEntryPanel> sqlEntryPanels = _rSyntaxSQLEntryPanelsBySessionID.get(session.getIdentifier()); ! ! if(null == sqlEntryPanels) ! { ! sqlEntryPanels = new ArrayList<RSyntaxSQLEntryPanel>(); ! _rSyntaxSQLEntryPanelsBySessionID.put(session.getIdentifier(), sqlEntryPanels); ! } ! ! RSyntaxSQLEntryPanel ret = new RSyntaxSQLEntryPanel(session, prefs, props); ! sqlEntryPanels.add(ret); ! ! return ret; } + + public void sessionEnding(ISession session) + { + ArrayList<RSyntaxSQLEntryPanel> rSyntaxSQLEntryPanels = _rSyntaxSQLEntryPanelsBySessionID.remove(session.getIdentifier()); + + if(null == rSyntaxSQLEntryPanels) + { + return; + } + + for (RSyntaxSQLEntryPanel rSyntaxSQLEntryPanel : rSyntaxSQLEntryPanels) + { + rSyntaxSQLEntryPanel.sessionEnding(); + } + + } } Index: SquirrelRSyntaxTextArea.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/SquirrelRSyntaxTextArea.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SquirrelRSyntaxTextArea.java 29 Nov 2009 21:17:53 -0000 1.1 --- SquirrelRSyntaxTextArea.java 30 Nov 2009 21:29:27 -0000 1.2 *************** *** 20,24 **** --- 20,26 ---- import javax.swing.*; import javax.swing.event.UndoableEditListener; + import javax.swing.event.ChangeListener; import javax.swing.text.Document; + import javax.swing.text.DefaultCaret; import java.awt.event.MouseEvent; import java.awt.event.ActionEvent; *************** *** 208,210 **** --- 210,230 ---- _squirrelRSyntaxSearchEngine.goToLine(); } + + public void sessionEnding() + { + //////////////////////////////////////////// + // Better GCing + getCaret().deinstall(this); + if(getCaret() instanceof DefaultCaret) + { + ChangeListener[] changeListeners = ((DefaultCaret) getCaret()).getChangeListeners(); + + for (ChangeListener changeListener : changeListeners) + { + getCaret().removeChangeListener(changeListener); + } + } + // + //////////////////////////////////////////// + } } |
|
From: Rob M. <man...@us...> - 2009-11-29 23:21:35
|
Update of /cvsroot/squirrel-sql/sql12/web-site In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv24311/web-site Modified Files: home.html header.html Log Message: Update for 3.0.3 release. Index: home.html =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/web-site/home.html,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** home.html 13 Jul 2009 21:50:26 -0000 1.72 --- home.html 29 Nov 2009 23:21:25 -0000 1.73 *************** *** 218,225 **** <!-- SF messed downloads up a bit. We do our best to keep at least the most important links simple--> ! <LI><B><a href="http://sourceforge.net/projects/squirrel-sql/files/1-stable/squirrel-sql-3.0.2-install.jar/download">Install jars (and source) of SQuirreL 3.0.2 for Windows/Linux/others</a></B></LI> ! <LI><B><a href="http://sourceforge.net/projects/squirrel-sql/files/1-stable/squirrel-sql-3.0.2-MacOSX-install.jar/download">Install jars (and source) of SQuirreL 3.0.2 for MacOS X</a></B></LI> ! <LI><B><a href="https://sourceforge.net/project/showfiles.php?group_id=28383&package_id=29193&release_id=691311">Plain zip format of SQuirreL 3.0.2</a></B></LI> <LI><B><a href="http://sourceforge.net/project/showfiles.php?group_id=28383&package_id=158128">Install jars of weekly snapshots for Windows/Linux/MacOS X/others</a></B></LI> <LI><B><a href="http://sourceforge.net/project/showfiles.php?group_id=28383">Overview of all available downloads</a></B></LI> --- 218,225 ---- <!-- SF messed downloads up a bit. We do our best to keep at least the most important links simple--> ! <LI><B><a href="http://sourceforge.net/projects/squirrel-sql/files/1-stable/squirrel-sql-3.0.3-install.jar/download">Install jars (and source) of SQuirreL 3.0.3 for Windows/Linux/others</a></B></LI> ! <LI><B><a href="http://sourceforge.net/projects/squirrel-sql/files/1-stable/squirrel-sql-3.0.3-MacOSX-install.jar/download">Install jars (and source) of SQuirreL 3.0.3 for MacOS X</a></B></LI> ! <LI><B><a href="https://sourceforge.net/project/showfiles.php?group_id=28383&package_id=29193&release_id=691311">Plain zip format of SQuirreL 3.0.3</a></B></LI> <LI><B><a href="http://sourceforge.net/project/showfiles.php?group_id=28383&package_id=158128">Install jars of weekly snapshots for Windows/Linux/MacOS X/others</a></B></LI> <LI><B><a href="http://sourceforge.net/project/showfiles.php?group_id=28383">Overview of all available downloads</a></B></LI> Index: header.html =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/web-site/header.html,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** header.html 24 Jun 2009 23:22:11 -0000 1.30 --- header.html 29 Nov 2009 23:21:25 -0000 1.31 *************** *** 25,29 **** <FONT SIZE=6 STYLE="font-size: 22pt">Universal SQL Client </FONT> <A href="http://www.squirrelsql.org/#installation"> ! <FONT SIZE=6 STYLE="font-size: 20pt">Version 3.0.2</FONT></A> </td> <TD WIDTH=20% align=right><IMG SRC="images/squirrel.jpg" NAME="Graphic3" VALIGN=TOP WIDTH=140 HEIGHT=56 BORDER=0> --- 25,29 ---- <FONT SIZE=6 STYLE="font-size: 22pt">Universal SQL Client </FONT> <A href="http://www.squirrelsql.org/#installation"> ! <FONT SIZE=6 STYLE="font-size: 20pt">Version 3.0.3</FONT></A> </td> <TD WIDTH=20% align=right><IMG SRC="images/squirrel.jpg" NAME="Graphic3" VALIGN=TOP WIDTH=140 HEIGHT=56 BORDER=0> |
Update of /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax Modified Files: SyntaxPugin.java SyntaxPluginResources.properties SyntaxPreferences.java KeyManager.java SyntaxPreferencesPanel.java ToolsPopupHandler.java I18NStrings.properties SQLEntryPanelFactoryProxy.java Added Files: FindAction.java GoToLineAction.java RepeatLastFindAction.java MarkSelectedAction.java FindSelectedAction.java ReplaceAction.java UnmarkAction.java Log Message: RSyntax editor integration Index: SQLEntryPanelFactoryProxy.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/SQLEntryPanelFactoryProxy.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SQLEntryPanelFactoryProxy.java 27 Dec 2008 19:30:37 -0000 1.7 --- SQLEntryPanelFactoryProxy.java 29 Nov 2009 21:17:53 -0000 1.8 *************** *** 12,15 **** --- 12,16 ---- import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryAreaFactory; import net.sourceforge.squirrel_sql.plugins.syntax.oster.OsterSQLEntryAreaFactory; + import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryAreaFactory; *************** *** 27,30 **** --- 28,32 ---- private ISQLEntryPanelFactory _originalFactory; + private RSyntaxSQLEntryAreaFactory _rsyntaxFactory; *************** *** 32,35 **** --- 34,38 ---- { _originalFactory = originalFactory; + _rsyntaxFactory = new RSyntaxSQLEntryAreaFactory(syntaxPugin); _netbeansFactory = new NetbeansSQLEntryAreaFactory(syntaxPugin); _osterFactory = new OsterSQLEntryAreaFactory(syntaxPugin); *************** *** 56,60 **** ! if (prefs.getUseNetbeansTextControl()) { newPnl = _netbeansFactory.createSQLEntryPanel(session, props); --- 59,67 ---- ! if (prefs.getUseRSyntaxTextArea()) ! { ! newPnl = _rsyntaxFactory.createSQLEntryPanel(session, props); ! } ! else if (prefs.getUseNetbeansTextControl()) { newPnl = _netbeansFactory.createSQLEntryPanel(session, props); --- NEW FILE: UnmarkAction.java --- package net.sourceforge.squirrel_sql.plugins.syntax; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction; import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import javax.swing.*; import java.awt.event.ActionEvent; public class UnmarkAction extends SquirrelAction implements ISQLPanelAction { private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(UnmarkAction.class); private ISession _session; private ISQLEntryPanel _sqlEntryPanel; public UnmarkAction(IApplication app, SyntaxPluginResources rsrc, ISQLEntryPanel sqlEntryPanel) { this(app, rsrc); _sqlEntryPanel = sqlEntryPanel; } public UnmarkAction(IApplication app, SyntaxPluginResources rsrc) { super(app, rsrc); } public void actionPerformed(ActionEvent evt) { if(null != _sqlEntryPanel) { doActionPerformed(_sqlEntryPanel, evt); } else if(null != _session) { ISQLEntryPanel sqlEntryPanel = _session.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel(); doActionPerformed(sqlEntryPanel, evt); } } private void doActionPerformed(ISQLEntryPanel sqlEntryPanel, ActionEvent evt) { if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel) { SquirrelRSyntaxTextArea rsep = (SquirrelRSyntaxTextArea) sqlEntryPanel.getTextComponent(); rsep.unmarkAll(); } else { String msg = s_stringMgr.getString("syntax.unmarkOnlyOnRecommendedEditors"); JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg); } } public void setSQLPanel(ISQLPanelAPI panel) { if(null != panel) { _session = panel.getSession(); } else { _session = null; } setEnabled(null != _session); } } Index: SyntaxPugin.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPugin.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** SyntaxPugin.java 27 Dec 2008 19:30:37 -0000 1.28 --- SyntaxPugin.java 29 Nov 2009 21:17:53 -0000 1.29 *************** *** 18,34 **** * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - import java.beans.PropertyChangeEvent; - import java.beans.PropertyChangeListener; - import java.io.File; - import java.io.FileNotFoundException; - import java.io.IOException; - import java.util.HashMap; - import java.util.Iterator; - import java.util.Map; - - import javax.swing.Action; - import javax.swing.JMenu; - import javax.swing.JMenuItem; - import javax.swing.JOptionPane; import net.sourceforge.squirrel_sql.client.IApplication; --- 18,21 ---- *************** *** 52,59 **** import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader; import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter; - import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.FindAction; import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel; ! import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.ReplaceAction; import net.sourceforge.squirrel_sql.plugins.syntax.oster.OsterSQLEntryPanel; /** --- 39,57 ---- import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader; import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter; import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel; ! import net.sourceforge.squirrel_sql.plugins.syntax.ReplaceAction; import net.sourceforge.squirrel_sql.plugins.syntax.oster.OsterSQLEntryPanel; + import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; + import net.sourceforge.squirrel_sql.plugins.syntax.UnmarkAction; + + import javax.swing.*; + import java.beans.PropertyChangeEvent; + import java.beans.PropertyChangeListener; + import java.io.File; + import java.io.FileNotFoundException; + import java.io.IOException; + import java.util.HashMap; + import java.util.Iterator; + import java.util.Map; /** *************** *** 78,83 **** --- 76,91 ---- //i18n[SyntaxPlugin.find=find] String FIND = s_stringMgr.getString("SyntaxPlugin.find"); + //i18n[SyntaxPlugin.findSelected=findselected] + String FIND_SELECTED = s_stringMgr.getString("SyntaxPlugin.findselected"); + //i18n[SyntaxPlugin.repeatLastFind=findrepeatlast] + String REPEAT_LAST_FIND = s_stringMgr.getString("SyntaxPlugin.repeatLastFind"); + //i18n[SyntaxPlugin.markSelected=markselected] + String MARK_SELECTED = s_stringMgr.getString("SyntaxPlugin.markSelected"); //i18n[SyntaxPlugin.replace=replace] String REPLACE = s_stringMgr.getString("SyntaxPlugin.replace"); + //i18n[SyntaxPlugin.unmark=unmark] + String UNMARK = s_stringMgr.getString("SyntaxPlugin.unmark"); + //i18n[SyntaxPlugin.gotoline=gotoline] + String GO_TO_LINE = s_stringMgr.getString("SyntaxPlugin.gotoline"); //i18n[SyntaxPlugin.autocorr=autocorr] String AUTO_CORR = s_stringMgr.getString("SyntaxPlugin.autocorr"); *************** *** 249,256 **** --- 257,284 ---- _resources.addToMenu(act, menu); + act = new FindSelectedAction(getApplication(), _resources); + coll.add(act); + _resources.addToMenu(act, menu); + + act = new RepeatLastFindAction(getApplication(), _resources); + coll.add(act); + _resources.addToMenu(act, menu); + + act = new MarkSelectedAction(getApplication(), _resources); + coll.add(act); + _resources.addToMenu(act, menu); + act = new ReplaceAction(getApplication(), _resources); coll.add(act); _resources.addToMenu(act, menu); + act = new UnmarkAction(getApplication(), _resources); + coll.add(act); + _resources.addToMenu(act, menu); + + act = new GoToLineAction(getApplication(), _resources); + coll.add(act); + _resources.addToMenu(act, menu); + act = new DuplicateLineAction(getApplication(), _resources); coll.add(act); *************** *** 339,344 **** JMenuItem mnuComment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(CommentAction.class)); - JMenuItem mnuUncomment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(UncommentAction.class)); _resources.configureMenuItem(coll.get(CommentAction.class), mnuComment); _resources.configureMenuItem(coll.get(UncommentAction.class), mnuUncomment); } --- 367,372 ---- JMenuItem mnuComment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(CommentAction.class)); _resources.configureMenuItem(coll.get(CommentAction.class), mnuComment); + JMenuItem mnuUncomment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(UncommentAction.class)); _resources.configureMenuItem(coll.get(UncommentAction.class), mnuUncomment); } *************** *** 359,365 **** ISQLPanelAPI sqlPanelAPI = sqlInternalFrame.getSQLPanelAPI(); JMenuItem mnuComment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(CommentAction.class)); JMenuItem mnuUncomment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(UncommentAction.class)); - _resources.configureMenuItem(coll.get(CommentAction.class), mnuComment); _resources.configureMenuItem(coll.get(UncommentAction.class), mnuUncomment); --- 387,395 ---- ISQLPanelAPI sqlPanelAPI = sqlInternalFrame.getSQLPanelAPI(); + JMenuItem mnuUnmark = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(UnmarkAction.class)); + _resources.configureMenuItem(coll.get(UnmarkAction.class), mnuUnmark); JMenuItem mnuComment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(CommentAction.class)); + _resources.configureMenuItem(coll.get(CommentAction.class), mnuComment); JMenuItem mnuUncomment = sqlPanelAPI.addToSQLEntryAreaMenu(coll.get(UncommentAction.class)); _resources.configureMenuItem(coll.get(UncommentAction.class), mnuUncomment); *************** *** 505,509 **** if( false == SyntaxPreferences.IPropertyNames.USE_NETBEANS_CONTROL.equals(propName) ! && false == SyntaxPreferences.IPropertyNames.USE_OSTER_CONTROL.equals(propName) ) { --- 535,540 ---- if( false == SyntaxPreferences.IPropertyNames.USE_NETBEANS_CONTROL.equals(propName) ! && false == SyntaxPreferences.IPropertyNames.USE_OSTER_CONTROL.equals(propName) ! && false == SyntaxPreferences.IPropertyNames.USE_RSYNTAX_CONTROL.equals(propName) ) { *************** *** 521,524 **** --- 552,560 ---- ((OsterSQLEntryPanel)pluginObject).updateFromPreferences(); } + + if(pluginObject instanceof RSyntaxSQLEntryPanel) + { + ((RSyntaxSQLEntryPanel)pluginObject).updateFromPreferences(); + } } else Index: ToolsPopupHandler.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/ToolsPopupHandler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ToolsPopupHandler.java 13 Sep 2007 22:14:47 -0000 1.1 --- ToolsPopupHandler.java 29 Nov 2009 21:17:53 -0000 1.2 *************** *** 1,19 **** package net.sourceforge.squirrel_sql.plugins.syntax; - import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; - import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; - import net.sourceforge.squirrel_sql.client.gui.session.ToolsPopupAccessor; - import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame; - import net.sourceforge.squirrel_sql.client.gui.session.SQLInternalFrame; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.ActionCollection; ! import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.*; import net.sourceforge.squirrel_sql.fw.util.Resources; import javax.swing.*; import java.util.HashMap; - import org.netbeans.editor.BaseKit; - public class ToolsPopupHandler { --- 1,25 ---- package net.sourceforge.squirrel_sql.plugins.syntax; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.ActionCollection; ! import net.sourceforge.squirrel_sql.client.gui.session.SQLInternalFrame; ! import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame; ! import net.sourceforge.squirrel_sql.client.gui.session.ToolsPopupAccessor; ! import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; ! import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.fw.util.Resources; + import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEditorPane; + import net.sourceforge.squirrel_sql.plugins.syntax.ReplaceAction; + import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.SQLKit; + import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.SQLSettingsInitializer; + import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirreLRSyntaxTextAreaUI; + import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; + import net.sourceforge.squirrel_sql.plugins.syntax.UnmarkAction; + import org.fife.ui.rtextarea.RTextAreaEditorKit; + import org.netbeans.editor.BaseKit; import javax.swing.*; import java.util.HashMap; public class ToolsPopupHandler { *************** *** 41,45 **** --- 47,56 ---- tpa.addToToolsPopup(SyntaxPugin.i18n.FIND , new FindAction(app, rsrc, isqlEntryPanel)); + tpa.addToToolsPopup(SyntaxPugin.i18n.FIND_SELECTED , new FindSelectedAction(app, rsrc, isqlEntryPanel)); + tpa.addToToolsPopup(SyntaxPugin.i18n.REPEAT_LAST_FIND , new RepeatLastFindAction(app, rsrc, isqlEntryPanel)); + tpa.addToToolsPopup(SyntaxPugin.i18n.MARK_SELECTED , new MarkSelectedAction(app, rsrc, isqlEntryPanel)); tpa.addToToolsPopup(SyntaxPugin.i18n.REPLACE , new ReplaceAction(app, rsrc, isqlEntryPanel)); + tpa.addToToolsPopup(SyntaxPugin.i18n.UNMARK , new UnmarkAction(app, rsrc, isqlEntryPanel)); + tpa.addToToolsPopup(SyntaxPugin.i18n.GO_TO_LINE , new GoToLineAction(app, rsrc, isqlEntryPanel)); tpa.addToToolsPopup(SyntaxPugin.i18n.AUTO_CORR , new ConfigureAutoCorrectAction(app, rsrc, _syntaxPugin)); tpa.addToToolsPopup(SyntaxPugin.i18n.DUP_LINE , new DuplicateLineAction(app, rsrc, isqlEntryPanel)); *************** *** 58,63 **** --- 69,85 ---- tpa.addToToolsPopup(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction); } + else if (isqlEntryPanel.getTextComponent() instanceof SquirrelRSyntaxTextArea) + { + SquirrelRSyntaxTextArea rsEdit = (SquirrelRSyntaxTextArea) isqlEntryPanel.getTextComponent(); + Action toUpperAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaUpperSelectionCaseAction); + toUpperAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_UPPER_CASE); + tpa.addToToolsPopup(SyntaxPugin.i18n.TO_UPPER_CASE, toUpperAction); + + Action toLowerAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaLowerSelectionCaseAction); + toLowerAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_LOWER_CASE); + tpa.addToToolsPopup(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction); + } } *************** *** 69,73 **** --- 91,100 ---- sif.addToToolsPopUp(SyntaxPugin.i18n.FIND, coll.get(FindAction.class)); + sif.addToToolsPopUp(SyntaxPugin.i18n.FIND_SELECTED , coll.get(FindSelectedAction.class)); + sif.addToToolsPopUp(SyntaxPugin.i18n.REPEAT_LAST_FIND , coll.get(RepeatLastFindAction.class)); + sif.addToToolsPopUp(SyntaxPugin.i18n.MARK_SELECTED , coll.get(MarkSelectedAction.class)); sif.addToToolsPopUp(SyntaxPugin.i18n.REPLACE, coll.get(ReplaceAction.class)); + sif.addToToolsPopUp(SyntaxPugin.i18n.UNMARK, coll.get(UnmarkAction.class)); + sif.addToToolsPopUp(SyntaxPugin.i18n.GO_TO_LINE, coll.get(GoToLineAction.class)); sif.addToToolsPopUp(SyntaxPugin.i18n.AUTO_CORR, coll.get(ConfigureAutoCorrectAction.class)); sif.addToToolsPopUp(SyntaxPugin.i18n.DUP_LINE, coll.get(DuplicateLineAction.class)); *************** *** 88,91 **** --- 115,131 ---- sif.addToToolsPopUp(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction); } + else if (sep.getTextComponent() instanceof SquirrelRSyntaxTextArea) + { + SquirrelRSyntaxTextArea rsEdit = (SquirrelRSyntaxTextArea) sep.getTextComponent(); + + Action toUpperAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaUpperSelectionCaseAction); + toUpperAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_UPPER_CASE); + sif.addToToolsPopUp(SyntaxPugin.i18n.TO_UPPER_CASE, toUpperAction); + + Action toLowerAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaLowerSelectionCaseAction); + toLowerAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_LOWER_CASE); + sif.addToToolsPopUp(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction); + + } } *************** *** 94,98 **** --- 134,143 ---- { sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.FIND , coll.get(FindAction.class)); + sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.FIND_SELECTED , coll.get(FindSelectedAction.class)); + sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.REPEAT_LAST_FIND , coll.get(RepeatLastFindAction.class)); + sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.MARK_SELECTED , coll.get(MarkSelectedAction.class)); sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.REPLACE , coll.get(ReplaceAction.class)); + sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.UNMARK , coll.get(UnmarkAction.class)); + sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.GO_TO_LINE , coll.get(GoToLineAction.class)); sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.AUTO_CORR , coll.get(ConfigureAutoCorrectAction.class)); sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.DUP_LINE , coll.get(DuplicateLineAction.class)); *************** *** 113,116 **** --- 158,174 ---- sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction); } + else if (sqlPanelAPI.getSQLEntryPanel().getTextComponent() instanceof SquirrelRSyntaxTextArea) + { + SquirrelRSyntaxTextArea rsEdit = (SquirrelRSyntaxTextArea) sqlPanelAPI.getSQLEntryPanel().getTextComponent(); + + Action toUpperAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaUpperSelectionCaseAction); + toUpperAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_UPPER_CASE); + sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.TO_UPPER_CASE, toUpperAction); + + Action toLowerAction = SquirreLRSyntaxTextAreaUI.getActionForName(rsEdit, RTextAreaEditorKit.rtaLowerSelectionCaseAction); + toLowerAction.putValue(Resources.ACCELERATOR_STRING, SquirreLRSyntaxTextAreaUI.RS_ACCELERATOR_STRING_TO_LOWER_CASE); + sqlInternalFrame.addToToolsPopUp(SyntaxPugin.i18n.TO_LOWER_CASE, toLowerAction); + + } } --- NEW FILE: GoToLineAction.java --- package net.sourceforge.squirrel_sql.plugins.syntax; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import javax.swing.*; import java.awt.event.ActionEvent; public class GoToLineAction extends SquirrelAction implements ISQLPanelAction { private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(GoToLineAction.class); private ISession _session; private ISQLEntryPanel _sqlEntryPanel; public GoToLineAction(IApplication app, SyntaxPluginResources rsrc, ISQLEntryPanel sqlEntryPanel) { this(app, rsrc); _sqlEntryPanel = sqlEntryPanel; } public GoToLineAction(IApplication app, SyntaxPluginResources rsrc) { super(app, rsrc); } public void actionPerformed(ActionEvent evt) { if(null != _sqlEntryPanel) { doActionPerformed(_sqlEntryPanel, evt); } else if(null != _session) { ISQLEntryPanel sqlEntryPanel = _session.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel(); doActionPerformed(sqlEntryPanel, evt); } } private void doActionPerformed(ISQLEntryPanel sqlEntryPanel, ActionEvent evt) { if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel) { SquirrelRSyntaxTextArea rsep = (SquirrelRSyntaxTextArea) sqlEntryPanel.getTextComponent(); rsep.showGoToLineDialog(evt); } else { String msg = s_stringMgr.getString("syntax.gotolineOnlyOnRecommendedEditors"); JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg); } } public void setSQLPanel(ISQLPanelAPI panel) { if(null != panel) { _session = panel.getSession(); } else { _session = null; } setEnabled(null != _session); } } --- NEW FILE: FindSelectedAction.java --- package net.sourceforge.squirrel_sql.plugins.syntax; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction; import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import javax.swing.*; import java.awt.event.ActionEvent; public class FindSelectedAction extends SquirrelAction implements ISQLPanelAction { private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(FindSelectedAction.class); private ISession _session; private ISQLEntryPanel _sqlEntryPanel; public FindSelectedAction(IApplication app, SyntaxPluginResources rsrc, ISQLEntryPanel sqlEntryPanel) { this(app, rsrc); _sqlEntryPanel = sqlEntryPanel; } public FindSelectedAction(IApplication app, SyntaxPluginResources rsrc) { super(app, rsrc); } public void actionPerformed(ActionEvent evt) { if(null != _sqlEntryPanel) { doActionPerformed(_sqlEntryPanel, evt); } else if(null != _session) { ISQLEntryPanel sqlEntryPanel = _session.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel(); doActionPerformed(sqlEntryPanel, evt); } } private void doActionPerformed(ISQLEntryPanel sqlEntryPanel, ActionEvent evt) { if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel) { SquirrelRSyntaxTextArea rsep = (SquirrelRSyntaxTextArea) sqlEntryPanel.getTextComponent(); rsep.findSelected(evt); } else { String msg = s_stringMgr.getString("syntax.findSelectedOnlyOnRecommendedEditors"); JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg); } } public void setSQLPanel(ISQLPanelAPI panel) { if(null != panel) { _session = panel.getSession(); } else { _session = null; } setEnabled(null != _session); } } --- NEW FILE: FindAction.java --- package net.sourceforge.squirrel_sql.plugins.syntax; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction; import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import javax.swing.*; import java.awt.event.ActionEvent; public class FindAction extends SquirrelAction implements ISQLPanelAction { private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(FindAction.class); private ISession _session; private ISQLEntryPanel _sqlEntryPanel; public FindAction(IApplication app, SyntaxPluginResources rsrc, ISQLEntryPanel sqlEntryPanel) { this(app, rsrc); _sqlEntryPanel = sqlEntryPanel; } public FindAction(IApplication app, SyntaxPluginResources rsrc) { super(app, rsrc); } public void actionPerformed(ActionEvent evt) { if(null != _sqlEntryPanel) { doActionPerformed(_sqlEntryPanel, evt); } else if(null != _session) { ISQLEntryPanel sqlEntryPanel = _session.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel(); doActionPerformed(sqlEntryPanel, evt); } } private void doActionPerformed(ISQLEntryPanel sqlEntryPanel, ActionEvent evt) { if(sqlEntryPanel instanceof NetbeansSQLEntryPanel) { NetbeansSQLEntryPanel nsep = (NetbeansSQLEntryPanel) sqlEntryPanel; nsep.showFindDialog(evt); } else if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel) { SquirrelRSyntaxTextArea rsep = (SquirrelRSyntaxTextArea) sqlEntryPanel.getTextComponent(); rsep.showFindDialog(evt); } else { String msg = s_stringMgr.getString("syntax.findOnlyOnRecommendedEditors"); JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg); } } public void setSQLPanel(ISQLPanelAPI panel) { if(null != panel) { _session = panel.getSession(); } else { _session = null; } setEnabled(null != _session); } } Index: KeyManager.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/KeyManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** KeyManager.java 14 Feb 2006 21:35:40 -0000 1.2 --- KeyManager.java 29 Nov 2009 21:17:53 -0000 1.3 *************** *** 2,5 **** --- 2,6 ---- import javax.swing.*; + import javax.swing.text.JTextComponent; import java.awt.*; import java.awt.event.ActionEvent; *************** *** 16,23 **** public static final char[] STOP_AT = new char[]{'.', '(', ')' , '\'', '\n', ',', '=', '<', '>'}; ! private JEditorPane _textPane; ! public KeyManager(JEditorPane textPane) { _textPane = textPane; --- 17,24 ---- public static final char[] STOP_AT = new char[]{'.', '(', ')' , '\'', '\n', ',', '=', '<', '>'}; ! private JTextComponent _textPane; ! public KeyManager(JTextComponent textPane) { _textPane = textPane; --- NEW FILE: RepeatLastFindAction.java --- package net.sourceforge.squirrel_sql.plugins.syntax; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import javax.swing.*; import java.awt.event.ActionEvent; public class RepeatLastFindAction extends SquirrelAction implements ISQLPanelAction { private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(RepeatLastFindAction.class); private ISession _session; private ISQLEntryPanel _sqlEntryPanel; public RepeatLastFindAction(IApplication app, SyntaxPluginResources rsrc, ISQLEntryPanel sqlEntryPanel) { this(app, rsrc); _sqlEntryPanel = sqlEntryPanel; } public RepeatLastFindAction(IApplication app, SyntaxPluginResources rsrc) { super(app, rsrc); } public void actionPerformed(ActionEvent evt) { if(null != _sqlEntryPanel) { doActionPerformed(_sqlEntryPanel, evt); } else if(null != _session) { ISQLEntryPanel sqlEntryPanel = _session.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel(); doActionPerformed(sqlEntryPanel, evt); } } private void doActionPerformed(ISQLEntryPanel sqlEntryPanel, ActionEvent evt) { if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel) { SquirrelRSyntaxTextArea rsep = (SquirrelRSyntaxTextArea) sqlEntryPanel.getTextComponent(); rsep.repeatLastFind(evt); } else { String msg = s_stringMgr.getString("syntax.repeatLastfindOnlyOnRecommendedEditors"); JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg); } } public void setSQLPanel(ISQLPanelAPI panel) { if(null != panel) { _session = panel.getSession(); } else { _session = null; } setEnabled(null != _session); } } Index: SyntaxPreferencesPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferencesPanel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SyntaxPreferencesPanel.java 5 Jul 2006 04:44:33 -0000 1.7 --- SyntaxPreferencesPanel.java 29 Nov 2009 21:17:53 -0000 1.8 *************** *** 174,177 **** --- 174,179 ---- // i18n[syntax.prefUseNetbeans=Use Netbeans editor (recommended)] String NETBEANS = s_stringMgr.getString("syntax.prefUseNetbeans"); + // i18n[syntax.prefUseNetbeans=Use Netbeans editor (recommended)] + String RSYNTAX = s_stringMgr.getString("syntax.prefUseRsyntax"); // i18n[syntax.prefUseOster=Use Ostermiller editor] String OSTER = s_stringMgr.getString("syntax.prefUseOster"); *************** *** 184,190 **** --- 186,199 ---- String TEXT_LIMIT_LINE_WIDTH = s_stringMgr.getString("syntax.textLimitLineWidth"); + // i18n[syntax.highlightCurrentLine=Highlight current line] + String HIGHLIGHT_CURRENT_LINE = s_stringMgr.getString("syntax.highlightCurrentLine"); + + // i18n[syntax.lineNumbersEnabled=Enable line numbers] + String LINE_NUMBERS_ENABLES = s_stringMgr.getString("syntax.lineNumbersEnabled"); + } private final JRadioButton _netbeansActiveOpt = new JRadioButton(i18n.NETBEANS); + private final JRadioButton _rsyntaxActiveOpt = new JRadioButton(i18n.RSYNTAX); private final JRadioButton _osterActiveOpt = new JRadioButton(i18n.OSTER); private final JRadioButton _plainActiveOpt = new JRadioButton(i18n.PLAIN); *************** *** 192,195 **** --- 201,206 ---- private final JCheckBox _chkTextLimitLineVisible = new JCheckBox(i18n.TEXT_LIMIT_LINE_VISIBLE); private final JTextField _txtTextLimitLineWidth = new JTextField(); + private final JCheckBox _chkHighlightCurrentLine = new JCheckBox(i18n.HIGHLIGHT_CURRENT_LINE); + private final JCheckBox _chkLineNumbersEnabled = new JCheckBox(i18n.LINE_NUMBERS_ENABLES); *************** *** 238,244 **** --- 249,258 ---- _osterActiveOpt.setSelected(prefs.getUseOsterTextControl()); _netbeansActiveOpt.setSelected(prefs.getUseNetbeansTextControl()); + _rsyntaxActiveOpt.setSelected(prefs.getUseRSyntaxTextArea()); _plainActiveOpt.setSelected(prefs.getUsePlainTextControl()); _chkTextLimitLineVisible.setSelected(prefs.isTextLimitLineVisible()); + _chkHighlightCurrentLine.setSelected(prefs.isHighlightCurrentLine()); + _chkLineNumbersEnabled.setSelected(prefs.isLineNumbersEnabled()); _txtTextLimitLineWidth.setText("" + prefs.getTextLimitLineWidth()); *************** *** 253,256 **** --- 267,271 ---- void applyChanges(SyntaxPreferences prefs) { + boolean oldUseRSyntaxTextArea = prefs.getUseRSyntaxTextArea(); boolean oldUseNetbeansTextControl = prefs.getUseNetbeansTextControl(); boolean oldUseOsterTextControl = prefs.getUseOsterTextControl(); *************** *** 260,263 **** --- 275,279 ---- { prefs.setUseNetbeansTextControl(_netbeansActiveOpt.isSelected()); + prefs.setUseRSyntaxTextArea(_rsyntaxActiveOpt.isSelected()); prefs.setUseOsterTextControl(_osterActiveOpt.isSelected()); prefs.setUsePlainTextControl(_plainActiveOpt.isSelected()); *************** *** 266,269 **** --- 282,286 ---- { prefs.setUseNetbeansTextControl(oldUseNetbeansTextControl); + prefs.setUseRSyntaxTextArea(oldUseRSyntaxTextArea); prefs.setUseOsterTextControl(oldUseOsterTextControl); prefs.setUsePlainTextControl(oldUsePlainTextControl); *************** *** 271,274 **** --- 288,293 ---- prefs.setTextLimitLineVisible(_chkTextLimitLineVisible.isSelected()); + prefs.setHighlightCurrentLine(_chkHighlightCurrentLine.isSelected()); + prefs.setLineNumbersEnabled(_chkLineNumbersEnabled.isSelected()); int limit = 80; *************** *** 312,327 **** final boolean useOsterControl = _osterActiveOpt.isSelected(); final boolean useNetbeansControl = _netbeansActiveOpt.isSelected(); final boolean usePlainControl = _plainActiveOpt.isSelected(); ! _stylesList.setEnabled(useOsterControl || useNetbeansControl); ! _styleMaintPnl.setEnabled(useOsterControl || useNetbeansControl); ! _chkTextLimitLineVisible.setEnabled(useNetbeansControl); ! _txtTextLimitLineWidth.setEnabled(useNetbeansControl); ! if(useNetbeansControl) { _txtTextLimitLineWidth.setEnabled(_chkTextLimitLineVisible.isSelected()); } } --- 331,350 ---- final boolean useOsterControl = _osterActiveOpt.isSelected(); final boolean useNetbeansControl = _netbeansActiveOpt.isSelected(); + final boolean useRSyntaxControl = _rsyntaxActiveOpt.isSelected(); final boolean usePlainControl = _plainActiveOpt.isSelected(); ! _stylesList.setEnabled(useOsterControl || useNetbeansControl || useRSyntaxControl); ! _styleMaintPnl.setEnabled(useOsterControl || useNetbeansControl || useRSyntaxControl); ! _chkTextLimitLineVisible.setEnabled(useNetbeansControl || useRSyntaxControl); ! _txtTextLimitLineWidth.setEnabled(useNetbeansControl || useRSyntaxControl); ! if(useNetbeansControl || useRSyntaxControl) { _txtTextLimitLineWidth.setEnabled(_chkTextLimitLineVisible.isSelected()); } + + _chkHighlightCurrentLine.setEnabled(useRSyntaxControl); + _chkLineNumbersEnabled.setEnabled(useRSyntaxControl); } *************** *** 333,336 **** --- 356,360 ---- ButtonGroup bg = new ButtonGroup(); + bg.add(_rsyntaxActiveOpt); bg.add(_netbeansActiveOpt); bg.add(_osterActiveOpt); *************** *** 353,356 **** --- 377,388 ---- }); + _rsyntaxActiveOpt.addChangeListener(new ChangeListener() + { + public void stateChanged(ChangeEvent evt) + { + updateControlStatus(); + } + }); + _plainActiveOpt.addChangeListener(new ChangeListener() { *************** *** 369,372 **** --- 401,421 ---- }); + _chkHighlightCurrentLine.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + updateControlStatus(); + } + }); + + _chkLineNumbersEnabled.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + updateControlStatus(); + } + }); + + *************** *** 405,421 **** gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0); ! pnlRet.add(_netbeansActiveOpt, gbc); gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0); ! pnlRet.add(_osterActiveOpt, gbc); gbc = new GridBagConstraints(0,2,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0); pnlRet.add(_plainActiveOpt, gbc); - JPanel pnlLineLimit = new JPanel(new GridBagLayout()); - gbc = new GridBagConstraints(0,3,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0); - pnlRet.add(pnlLineLimit, gbc); gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,5,5), 0,0); pnlLineLimit.add(_chkTextLimitLineVisible, gbc); --- 454,485 ---- gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0); ! pnlRet.add(_rsyntaxActiveOpt, gbc); gbc = new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0); ! pnlRet.add(_netbeansActiveOpt, gbc); gbc = new GridBagConstraints(0,2,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0); + pnlRet.add(_osterActiveOpt, gbc); + + gbc = new GridBagConstraints(0,3,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0,5,5,5), 0,0); pnlRet.add(_plainActiveOpt, gbc); + gbc = new GridBagConstraints(0,4,1,1,0,0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(40,5,0,5), 0,0); + pnlRet.add(createPnlLineLimit(), gbc); + + gbc = new GridBagConstraints(0,5,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0); + pnlRet.add(_chkHighlightCurrentLine, gbc); + + gbc = new GridBagConstraints(0,6,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5,5,5,5), 0,0); + pnlRet.add(_chkLineNumbersEnabled, gbc); + return pnlRet; + } + + private JPanel createPnlLineLimit() + { + GridBagConstraints gbc; + JPanel pnlLineLimit = new JPanel(new GridBagLayout()); gbc = new GridBagConstraints(0,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,5,5), 0,0); pnlLineLimit.add(_chkTextLimitLineVisible, gbc); *************** *** 427,432 **** gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,5,5), 0,0); pnlLineLimit.add(_txtTextLimitLineWidth, gbc); ! ! return pnlRet; } --- 491,495 ---- gbc = new GridBagConstraints(2,0,1,1,0,0,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,5,5), 0,0); pnlLineLimit.add(_txtTextLimitLineWidth, gbc); ! return pnlLineLimit; } --- NEW FILE: ReplaceAction.java --- package net.sourceforge.squirrel_sql.plugins.syntax; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction; import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import javax.swing.*; import java.awt.event.ActionEvent; public class ReplaceAction extends SquirrelAction implements ISQLPanelAction { private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ReplaceAction.class); private ISession _session; private ISQLEntryPanel _isqlEntryPanel; public ReplaceAction(IApplication app, SyntaxPluginResources rsrc) throws IllegalArgumentException { super(app, rsrc); } public ReplaceAction(IApplication app, SyntaxPluginResources rsrc, ISQLEntryPanel isqlEntryPanel) { this(app, rsrc); _isqlEntryPanel = isqlEntryPanel; } public void actionPerformed(ActionEvent evt) { if(null != _isqlEntryPanel) { doActionPerformed(_isqlEntryPanel, evt); } if(null != _session) { ISQLEntryPanel sqlEntryPanel = _session.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel(); doActionPerformed(sqlEntryPanel, evt); } } private void doActionPerformed(ISQLEntryPanel sqlEntryPanel, ActionEvent evt) { if(sqlEntryPanel instanceof NetbeansSQLEntryPanel) { NetbeansSQLEntryPanel nsep = (NetbeansSQLEntryPanel) sqlEntryPanel; nsep.showReplaceDialog(evt); } else if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel) { SquirrelRSyntaxTextArea rsep = (SquirrelRSyntaxTextArea) sqlEntryPanel.getTextComponent(); rsep.showReplaceDialog(evt); } else { String msg = s_stringMgr.getString("syntax.replaceOnlyOnRecommendedEditors"); JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg); } } public void setSQLPanel(ISQLPanelAPI panel) { if(null != panel) { _session = panel.getSession(); } else { _session = null; } setEnabled(null != _session); } } Index: SyntaxPreferences.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPreferences.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SyntaxPreferences.java 11 Aug 2007 17:22:51 -0000 1.7 --- SyntaxPreferences.java 29 Nov 2009 21:17:53 -0000 1.8 *************** *** 34,38 **** ! public interface IPropertyNames { // String BLINK_CARET = "blinkCaret"; // String BLOCK_CARET_ENABLED = "blockCaretEnabled"; --- 34,38 ---- ! public interface IPropertyNames { // String BLINK_CARET = "blinkCaret"; // String BLOCK_CARET_ENABLED = "blockCaretEnabled"; *************** *** 60,68 **** String USE_OSTER_CONTROL = "useOsterControl"; String USE_NETBEANS_CONTROL = "useNetbeansControl"; String USE_PLAIN_CONTROL = "usePlainControl"; String WHITE_SPACE_STYLE = "whiteSpaceStyle"; String TEXT_LIMIT_LINE_VISIBLE = "textLimitLineVisible"; String TEXT_LIMIT_LINE_WIDTH = "textLimitLineWidth"; ! } /** Object to handle property change events. */ --- 60,71 ---- String USE_OSTER_CONTROL = "useOsterControl"; String USE_NETBEANS_CONTROL = "useNetbeansControl"; + String USE_RSYNTAX_CONTROL = "useRSyntaxControl"; String USE_PLAIN_CONTROL = "usePlainControl"; String WHITE_SPACE_STYLE = "whiteSpaceStyle"; String TEXT_LIMIT_LINE_VISIBLE = "textLimitLineVisible"; String TEXT_LIMIT_LINE_WIDTH = "textLimitLineWidth"; ! String HIGHLIGHT_CURRENT_LINE = "highlightCurrentLine"; ! String LINE_NUMBERS_ENABLED = "lineNumbersEnabled"; ! } /** Object to handle property change events. */ *************** *** 71,76 **** /** If <TT>true</TT> use the Oster text control else use the standard Java control. */ private boolean _useOsterTextControl = false; ! private boolean _useNetbeansTextControl = true; private boolean _usePlainTextControl = false; /** If <TT>true</TT> use the block caret. */ --- 74,80 ---- /** If <TT>true</TT> use the Oster text control else use the standard Java control. */ private boolean _useOsterTextControl = false; ! private boolean _useNetbeansTextControl = false; private boolean _usePlainTextControl = false; + private boolean _useRSyntaxTextArea = true; /** If <TT>true</TT> use the block caret. */ *************** *** 115,118 **** --- 119,125 ---- private int _textLimitLineWidth = 80; + private boolean _highlightCurrentLine = true; + + private boolean _lineNumbersEnabled = false; *************** *** 260,263 **** --- 267,285 ---- } + + public boolean getUseRSyntaxTextArea() + { + return _useRSyntaxTextArea; + } + + public void setUseRSyntaxTextArea(boolean data) + { + if (_useRSyntaxTextArea != data) + { + getPropertyChangeReporter().firePropertyChange(IPropertyNames.USE_RSYNTAX_CONTROL, _useRSyntaxTextArea, data); + _useRSyntaxTextArea = data; + } + } + public boolean getUsePlainTextControl() { *************** *** 275,374 **** - // public boolean getBracketHighlighting() - // { - // return _bracketHighlighting; - // } - // - // public void setBracketHighlighting(boolean data) - // { - // if (_bracketHighlighting != data) - // { - // final boolean oldValue = _bracketHighlighting; - // _bracketHighlighting = data; - // getPropertyChangeReporter().firePropertyChange(IPropertyNames.BRACKET_HIGHLIGHTING, - // oldValue, _bracketHighlighting); - // } - // } - // - // public boolean isBlockCaretEnabled() - // { - // return _blockCaretEnabled; - // } - // - // public void setBlockCaretEnabled(boolean data) - // { - // if (_blockCaretEnabled != data) - // { - // final boolean oldValue = _blockCaretEnabled; - // _blockCaretEnabled = data; - // getPropertyChangeReporter().firePropertyChange(IPropertyNames.BLOCK_CARET_ENABLED, - // oldValue, _blockCaretEnabled); - // } - // } - // - // public boolean getEOLMarkers() - // { - // return _showEndOfLineMarkers; - // } - // - // public void setEOLMarkers(boolean data) - // { - // if (_showEndOfLineMarkers != data) - // { - // final boolean oldValue = _showEndOfLineMarkers; - // _showEndOfLineMarkers = data; - // getPropertyChangeReporter().firePropertyChange(IPropertyNames.EOL_MARKERS, - // oldValue, _showEndOfLineMarkers); - // } - // } - // - // public boolean getCurrentLineHighlighting() - // { - // return _currentLineHighlighting; - // } - // - // public void setCurrentLineHighlighting(boolean data) - // { - // if (_currentLineHighlighting != data) - // { - // final boolean oldValue = _currentLineHighlighting; - // _currentLineHighlighting = data; - // getPropertyChangeReporter().firePropertyChange(IPropertyNames.CURRENT_LINE_HIGHLIGHTING, - // oldValue, _currentLineHighlighting); - // } - // } - // - // public boolean getBlinkCaret() - // { - // return _blinkCaret; - // } - // - // public void setBlinkCaret(boolean data) - // { - // if (_blinkCaret != data) - // { - // final boolean oldValue = _blinkCaret; - // _blinkCaret = data; - // getPropertyChangeReporter().firePropertyChange(IPropertyNames.BLINK_CARET, - // oldValue, _blinkCaret); - // } - // } - // - // public boolean getShowLineNumbers() - // { - // return _showLineNumbers; - // } - // - // public void setShowLineNumbers(boolean data) - // { - // if (_showLineNumbers != data) - // { - // final boolean oldValue = _showLineNumbers; - // _showLineNumbers = data; - // getPropertyChangeReporter().firePropertyChange(IPropertyNames.SHOW_LINE_NBRS, - // oldValue, _showLineNumbers); - // } - // } - public boolean isTextLimitLineVisible() { --- 297,300 ---- *************** *** 405,408 **** --- 331,370 ---- + public boolean isHighlightCurrentLine() + { + return _highlightCurrentLine; + } + + + public void setHighlightCurrentLine(boolean data) + { + if (_highlightCurrentLine != data) + { + final Boolean oldValue = Boolean.valueOf(_highlightCurrentLine); + _highlightCurrentLine = data; + getPropertyChangeReporter().firePropertyChange(IPropertyNames.HIGHLIGHT_CURRENT_LINE, + oldValue, Boolean.valueOf(_highlightCurrentLine)); + } + + } + + public boolean isLineNumbersEnabled() + { + return _lineNumbersEnabled; + } + + public void setLineNumbersEnabled(boolean data) + { + if (_lineNumbersEnabled != data) + { + final Boolean oldValue = Boolean.valueOf(_lineNumbersEnabled); + _lineNumbersEnabled = data; + getPropertyChangeReporter().firePropertyChange(IPropertyNames.LINE_NUMBERS_ENABLED, + oldValue, Boolean.valueOf(_lineNumbersEnabled)); + } + + } + + public SyntaxStyle getCommentStyle() { Index: SyntaxPluginResources.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/SyntaxPluginResources.properties,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SyntaxPluginResources.properties 10 Oct 2005 05:51:38 -0000 1.8 --- SyntaxPluginResources.properties 29 Nov 2009 21:17:53 -0000 1.9 *************** *** 22,32 **** ! action.net.sourceforge.squirrel_sql.plugins.syntax.netbeans.FindAction.image=find.gif ! action.net.sourceforge.squirrel_sql.plugins.syntax.netbeans.FindAction.name=Find ... ! action.net.sourceforge.squirrel_sql.plugins.syntax.netbeans.FindAction.tooltip=Find ! action.net.sourceforge.squirrel_sql.plugins.syntax.netbeans.ReplaceAction.image=replace.gif ! action.net.sourceforge.squirrel_sql.plugins.syntax.netbeans.ReplaceAction.name=Replace ... ! action.net.sourceforge.squirrel_sql.plugins.syntax.netbeans.ReplaceAction.tooltip=Replace action.net.sourceforge.squirrel_sql.plugins.syntax.DuplicateLineAction.image= --- 22,53 ---- ! action.net.sourceforge.squirrel_sql.plugins.syntax.FindAction.image=find.gif ! action.net.sourceforge.squirrel_sql.plugins.syntax.FindAction.name=Find ... ! action.net.sourceforge.squirrel_sql.plugins.syntax.FindAction.tooltip=Find ! action.net.sourceforge.squirrel_sql.plugins.syntax.FindSelectedAction.image= ! action.net.sourceforge.squirrel_sql.plugins.syntax.FindSelectedAction.name=Find selected ! action.net.sourceforge.squirrel_sql.plugins.syntax.FindSelectedAction.tooltip=Find selected ! ! action.net.sourceforge.squirrel_sql.plugins.syntax.RepeatLastFindAction.image= ! action.net.sourceforge.squirrel_sql.plugins.syntax.RepeatLastFindAction.name=Repeat last find ! action.net.sourceforge.squirrel_sql.plugins.syntax.RepeatLastFindAction.tooltip=Repeat last find ! ! action.net.sourceforge.squirrel_sql.plugins.syntax.GoToLineAction.image= ! action.net.sourceforge.squirrel_sql.plugins.syntax.GoToLineAction.name=Go to line ... ! action.net.sourceforge.squirrel_sql.plugins.syntax.GoToLineAction.tooltip=Go to line ! ! action.net.sourceforge.squirrel_sql.plugins.syntax.MarkSelectedAction.image= ! action.net.sourceforge.squirrel_sql.plugins.syntax.MarkSelectedAction.name=Mark selected ! action.net.sourceforge.squirrel_sql.plugins.syntax.MarkSelectedAction.tooltip=Mark selected ! ! action.net.sourceforge.squirrel_sql.plugins.syntax.UnmarkAction.image= ! action.net.sourceforge.squirrel_sql.plugins.syntax.UnmarkAction.name=Unmark all ! action.net.sourceforge.squirrel_sql.plugins.syntax.UnmarkAction.tooltip=Unmark all ! ! ! action.net.sourceforge.squirrel_sql.plugins.syntax.ReplaceAction.image=replace.gif ! action.net.sourceforge.squirrel_sql.plugins.syntax.ReplaceAction.name=Replace ... ! action.net.sourceforge.squirrel_sql.plugins.syntax.ReplaceAction.tooltip=Replace action.net.sourceforge.squirrel_sql.plugins.syntax.DuplicateLineAction.image= *************** *** 59,67 **** menuitem.net.sourceforge.squirrel_sql.plugins.syntax.ConfigureAutoCorrectAction.mnemonic=C ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.netbeans.FindAction.accelerator=control F ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.netbeans.FindAction.mnemonic= ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.netbeans.ReplaceAction.accelerator=control H ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.netbeans.ReplaceAction.mnemonic= menuitem.net.sourceforge.squirrel_sql.plugins.syntax.DuplicateLineAction.accelerator=control D --- 80,103 ---- menuitem.net.sourceforge.squirrel_sql.plugins.syntax.ConfigureAutoCorrectAction.mnemonic=C ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.FindAction.accelerator=control F ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.FindAction.mnemonic= ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.FindSelectedAction.accelerator=shift F3 ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.FindSelectedAction.mnemonic= ! ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.RepeatLastFindAction.accelerator=F3 ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.RepeatLastFindAction.mnemonic= ! ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.GoToLineAction.accelerator=control G ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.GoToLineAction.mnemonic= ! ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.MarkSelectedAction.accelerator=control shift F3 ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.MarkSelectedAction.mnemonic= ! ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.UnmarkAction.accelerator=ESCAPE ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.UnmarkAction.mnemonic= ! ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.ReplaceAction.accelerator=control H ! menuitem.net.sourceforge.squirrel_sql.plugins.syntax.ReplaceAction.mnemonic= menuitem.net.sourceforge.squirrel_sql.plugins.syntax.DuplicateLineAction.accelerator=control D --- NEW FILE: MarkSelectedAction.java --- package net.sourceforge.squirrel_sql.plugins.syntax; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.action.SquirrelAction; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI; import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction; import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPluginResources; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.RSyntaxSQLEntryPanel; import net.sourceforge.squirrel_sql.plugins.syntax.netbeans.NetbeansSQLEntryPanel; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import javax.swing.*; import java.awt.event.ActionEvent; public class MarkSelectedAction extends SquirrelAction implements ISQLPanelAction { private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(MarkSelectedAction.class); private ISession _session; private ISQLEntryPanel _sqlEntryPanel; public MarkSelectedAction(IApplication app, SyntaxPluginResources rsrc, ISQLEntryPanel sqlEntryPanel) { this(app, rsrc); _sqlEntryPanel = sqlEntryPanel; } public MarkSelectedAction(IApplication app, SyntaxPluginResources rsrc) { super(app, rsrc); } public void actionPerformed(ActionEvent evt) { if(null != _sqlEntryPanel) { doActionPerformed(_sqlEntryPanel, evt); } else if(null != _session) { ISQLEntryPanel sqlEntryPanel = _session.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel(); doActionPerformed(sqlEntryPanel, evt); } } private void doActionPerformed(ISQLEntryPanel sqlEntryPanel, ActionEvent evt) { if(sqlEntryPanel instanceof RSyntaxSQLEntryPanel) { SquirrelRSyntaxTextArea rsep = (SquirrelRSyntaxTextArea) sqlEntryPanel.getTextComponent(); rsep.markSelected(evt); } else { String msg = s_stringMgr.getString("syntax.markSelectedOnlyOnRecommendedEditors"); JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), msg); } } public void setSQLPanel(ISQLPanelAPI panel) { if(null != panel) { _session = panel.getSession(); } else { _session = null; } setEnabled(null != _session); } } Index: I18NStrings.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/I18NStrings.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** I18NStrings.properties 4 Dec 2006 21:36:09 -0000 1.4 --- I18NStrings.properties 29 Nov 2009 21:17:53 -0000 1.5 *************** *** 4,18 **** SyntaxPlugin.duplicateline=duplicateline SyntaxPlugin.find=find SyntaxPlugin.replace=replace SyntaxPlugin.tolowercase=tolowercase SyntaxPlugin.touppercase=touppercase SyntaxPlugin.uncomment=uncomment syntax.prefSyntax=Syntax syntax.prefSyntaxHint=Syntax Highlighting ! syntax.prefUseNetbeans=Use Netbeans editor (recommended) syntax.prefUseOster=Use Ostermiller editor syntax.prefUsePlain=Use plain editor ! syntax.osterExplain=Note: The preferable editor is the Netbeans editor. The Netbeans editor\n- is less memory consuming,\n- its highlightning is more... [truncated message content] |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:07
|
Update of /cvsroot/squirrel-sql/sql12/test/mockobjects/net/sourceforge/squirrel_sql/client/session In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/test/mockobjects/net/sourceforge/squirrel_sql/client/session Modified Files: MockSQLEntryPanel.java Log Message: RSyntax editor integration Index: MockSQLEntryPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/test/mockobjects/net/sourceforge/squirrel_sql/client/session/MockSQLEntryPanel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MockSQLEntryPanel.java 26 Nov 2008 20:56:44 -0000 1.5 --- MockSQLEntryPanel.java 29 Nov 2009 21:17:54 -0000 1.6 *************** *** 4,11 **** import java.awt.event.MouseListener; ! import javax.swing.Action; ! import javax.swing.JMenu; ! import javax.swing.JMenuItem; ! import javax.swing.JTextArea; import javax.swing.event.CaretListener; import javax.swing.event.UndoableEditListener; --- 4,8 ---- import java.awt.event.MouseListener; ! import javax.swing.*; import javax.swing.event.CaretListener; import javax.swing.event.UndoableEditListener; *************** *** 14,17 **** --- 11,15 ---- import net.sourceforge.squirrel_sql.fw.id.IIdentifier; + import net.sourceforge.squirrel_sql.client.session.mainpanel.IUndoHandler; public class MockSQLEntryPanel implements ISQLEntryPanel { *************** *** 211,215 **** } ! public void setUndoActions(Action undo, Action redo) { --- 209,213 ---- } ! public void addRedoUndoActionsToSQLEntryAreaMenu(Action undo, Action redo) { *************** *** 234,236 **** --- 232,252 ---- } + + @Override + public IUndoHandler createUndoHandler() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public String getWordAtCursor() + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public JScrollPane createScrollPane(JTextComponent textComponent) + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } } |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:07
|
Update of /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/completion In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/completion Modified Files: HqlSyntaxHighlightTokenMatcher.java Log Message: RSyntax editor integration Index: HqlSyntaxHighlightTokenMatcher.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/completion/HqlSyntaxHighlightTokenMatcher.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HqlSyntaxHighlightTokenMatcher.java 25 Jul 2007 23:33:41 -0000 1.1 --- HqlSyntaxHighlightTokenMatcher.java 29 Nov 2009 21:17:54 -0000 1.2 *************** *** 17,20 **** --- 17,26 ---- + @Override + public boolean isError(int offset, int len) + { + return false; + } + public boolean isTable(char[] buffer, int offset, int len) { |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:07
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel Modified Files: SQLPanel.java Added Files: UndoHandlerImpl.java IUndoHandler.java Log Message: RSyntax editor integration Index: SQLPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLPanel.java,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** SQLPanel.java 25 Dec 2008 19:09:30 -0000 1.50 --- SQLPanel.java 29 Nov 2009 21:17:53 -0000 1.51 *************** *** 37,40 **** --- 37,41 ---- import javax.swing.*; + import javax.swing.text.JTextComponent; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; *************** *** 42,46 **** import javax.swing.event.DocumentListener; import javax.swing.event.EventListenerList; - import javax.swing.undo.UndoManager; import net.sourceforge.squirrel_sql.client.IApplication; --- 43,46 ---- *************** *** 52,57 **** import net.sourceforge.squirrel_sql.client.session.SQLPanelAPI; import net.sourceforge.squirrel_sql.client.session.action.OpenSqlHistoryAction; - import net.sourceforge.squirrel_sql.client.session.action.RedoAction; - import net.sourceforge.squirrel_sql.client.session.action.UndoAction; import net.sourceforge.squirrel_sql.client.session.event.IResultTabListener; import net.sourceforge.squirrel_sql.client.session.event.ISQLExecutionListener; --- 52,55 ---- *************** *** 67,71 **** import net.sourceforge.squirrel_sql.fw.gui.MemoryComboBox; import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection; - import net.sourceforge.squirrel_sql.fw.util.Resources; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; --- 65,68 ---- *************** *** 105,109 **** private IntegerField _nbrRows = new IntegerField(); - private JScrollPane _sqlEntryScroller; transient private SqlComboListener _sqlComboListener = new SqlComboListener(); --- 102,105 ---- *************** *** 149,155 **** private EventListenerList _listeners = new EventListenerList(); ! private UndoManager _undoManager = new SquirrelDefaultUndoManager(); ! ! /** Factory for generating unique IDs for new <TT>ResultTab</TT> objects. */ // private IntegerIdentifierFactory _idFactory = new IntegerIdentifierFactory(); --- 145,149 ---- private EventListenerList _listeners = new EventListenerList(); ! /** Factory for generating unique IDs for new <TT>ResultTab</TT> objects. */ // private IntegerIdentifierFactory _idFactory = new IntegerIdentifierFactory(); *************** *** 162,167 **** private static final String PREFS_KEY_SPLIT_DIVIDER_LOC = "squirrelSql_sqlPanel_divider_loc"; - private UndoAction _undoAction; - private RedoAction _redoAction; /** --- 156,159 ---- *************** *** 172,175 **** --- 164,168 ---- transient private SQLPanel.SQLExecutorHistoryListener _sqlExecutorHistoryListener = new SQLExecutorHistoryListener(); private ArrayList<SqlPanelListener> _sqlPanelListeners = new ArrayList<SqlPanelListener>(); + private IUndoHandler _undoHandler; *************** *** 444,480 **** final int pos = _splitPane.getDividerLocation(); - if (!_sqlEntry.getDoesTextComponentHaveScroller()) - { - _sqlEntryScroller = new JScrollPane(_sqlEntry.getTextComponent()); - _sqlEntryScroller.setBorder(BorderFactory.createEmptyBorder()); - _splitPane.add(_sqlEntryScroller); - } - else - { - _splitPane.add(_sqlEntry.getTextComponent(), JSplitPane.LEFT); - } - _splitPane.setDividerLocation(pos); ! if (!_sqlEntry.hasOwnUndoableManager()) ! { ! IApplication app = _session.getApplication(); ! Resources res = app.getResources(); ! _undoAction = new UndoAction(app, _undoManager); ! _redoAction = new RedoAction(app, _undoManager); - JComponent comp = _sqlEntry.getTextComponent(); - comp.registerKeyboardAction(_undoAction, res.getKeyStroke(_undoAction), - WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); - comp.registerKeyboardAction(_redoAction, res.getKeyStroke(_redoAction), - WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); - _sqlEntry.setUndoActions(_undoAction, _redoAction); ! _sqlEntry.setUndoManager(_undoManager); ! } fireSQLEntryAreaInstalled(); } - public void setVisible(boolean value) { --- 437,462 ---- final int pos = _splitPane.getDividerLocation(); ! JScrollPane scrollPane = _sqlEntry.createScrollPane(_sqlEntry.getTextComponent()); ! _splitPane.add(scrollPane); ! ! // if (!_sqlEntry.getDoesTextComponentHaveScroller()) ! // { ! // JScrollPane sqlEntryScroller = createScrollPane(_sqlEntry.getTextComponent()); ! // _splitPane.add(sqlEntryScroller); ! // } ! // else ! // { ! // _splitPane.add(_sqlEntry.getTextComponent(), JSplitPane.LEFT); ! // } ! _splitPane.setDividerLocation(pos); ! ! _undoHandler = new UndoHandlerImpl(_session.getApplication(), _sqlEntry); fireSQLEntryAreaInstalled(); } public void setVisible(boolean value) { *************** *** 947,956 **** public Action getUndoAction() { ! return _undoAction; } public Action getRedoAction() { ! return _redoAction; } --- 929,938 ---- public Action getUndoAction() { ! return _undoHandler.getUndoAction(); } public Action getRedoAction() { ! return _undoHandler.getRedoAction(); } --- NEW FILE: IUndoHandler.java --- package net.sourceforge.squirrel_sql.client.session.mainpanel; import javax.swing.*; /** * Created by IntelliJ IDEA. * User: gerd * Date: 20.10.2009 * Time: 13:37:21 * To change this template use File | Settings | File Templates. */ public interface IUndoHandler { Action getUndoAction(); Action getRedoAction(); } --- NEW FILE: UndoHandlerImpl.java --- package net.sourceforge.squirrel_sql.client.session.mainpanel; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.action.UndoAction; import net.sourceforge.squirrel_sql.client.session.action.RedoAction; import net.sourceforge.squirrel_sql.fw.util.Resources; import javax.swing.*; public class UndoHandlerImpl implements IUndoHandler { private UndoAction _undoAction; private RedoAction _redoAction; public UndoHandlerImpl(IApplication application, ISQLEntryPanel entry) { if (!entry.hasOwnUndoableManager()) { SquirrelDefaultUndoManager undoManager = new SquirrelDefaultUndoManager(); Resources res = application.getResources(); _undoAction = new UndoAction(application, undoManager); _redoAction = new RedoAction(application, undoManager); JComponent comp = entry.getTextComponent(); comp.registerKeyboardAction(_undoAction, res.getKeyStroke(_undoAction), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); comp.registerKeyboardAction(_redoAction, res.getKeyStroke(_redoAction), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); entry.setUndoManager(undoManager); } else { IUndoHandler undoHandler = entry.createUndoHandler(); _undoAction = new UndoAction(application, undoHandler.getUndoAction()); _redoAction = new RedoAction(application, undoHandler.getRedoAction()); } entry.addRedoUndoActionsToSQLEntryAreaMenu(_undoAction, _redoAction); } public Action getUndoAction() { return _undoAction; } public Action getRedoAction() { return _redoAction; } } |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:07
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/app/src/net/sourceforge/squirrel_sql/client/session/action Modified Files: UndoAction.java ViewObjectAtCursorInObjectTreeAction.java RedoAction.java Log Message: RSyntax editor integration Index: RedoAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/RedoAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RedoAction.java 5 Mar 2003 10:27:53 -0000 1.3 --- RedoAction.java 29 Nov 2009 21:17:54 -0000 1.4 *************** *** 1,45 **** ! package net.sourceforge.squirrel_sql.client.session.action; ! /* ! * Copyright (C) 2002-2003 Johan Compagner ! * jco...@j-... ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! */ ! import java.awt.event.ActionEvent; ! ! import javax.swing.undo.UndoManager; ! ! import net.sourceforge.squirrel_sql.client.IApplication; ! import net.sourceforge.squirrel_sql.client.action.SquirrelAction; ! ! public class RedoAction extends SquirrelAction ! { ! private UndoManager _undo; ! ! public RedoAction(IApplication app, UndoManager undo) ! { ! super(app); ! if(undo == null) throw new IllegalArgumentException("UndoManager == null"); ! _undo = undo; ! } ! /* ! * @see ActionListener#actionPerformed(ActionEvent) ! */ ! public void actionPerformed(ActionEvent e) ! { ! if(_undo.canRedo()) _undo.redo(); ! } ! ! } --- 1,61 ---- ! package net.sourceforge.squirrel_sql.client.session.action; ! /* ! * Copyright (C) 2002-2003 Johan Compagner ! * jco...@j-... ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! */ ! import java.awt.event.ActionEvent; ! ! import javax.swing.undo.UndoManager; ! import javax.swing.*; ! ! import net.sourceforge.squirrel_sql.client.IApplication; ! import net.sourceforge.squirrel_sql.client.action.SquirrelAction; ! ! public class RedoAction extends SquirrelAction ! { ! private UndoManager _undo; ! private Action _delegate; ! ! public RedoAction(IApplication app, UndoManager undo) ! { ! super(app); ! if(undo == null) throw new IllegalArgumentException("UndoManager == null"); ! _undo = undo; ! } ! ! public RedoAction(IApplication app, Action delegate) ! { ! super(app); ! _delegate = delegate; ! } ! ! /* ! * @see ActionListener#actionPerformed(ActionEvent) ! */ ! public void actionPerformed(ActionEvent e) ! { ! if (null == _delegate) ! { ! if(_undo.canRedo()) _undo.redo(); ! } ! else ! { ! _delegate.actionPerformed(e); ! } ! } ! ! } Index: ViewObjectAtCursorInObjectTreeAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/ViewObjectAtCursorInObjectTreeAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ViewObjectAtCursorInObjectTreeAction.java 27 Dec 2008 19:20:53 -0000 1.8 --- ViewObjectAtCursorInObjectTreeAction.java 29 Nov 2009 21:17:54 -0000 1.9 *************** *** 8,11 **** --- 8,13 ---- import net.sourceforge.squirrel_sql.client.session.ObjectTreeSearch; + import javax.swing.text.JTextComponent; + public class ViewObjectAtCursorInObjectTreeAction extends SquirrelAction *************** *** 47,87 **** } ! String stringAtCursor = getStringAtCursor(); new ObjectTreeSearch().viewObjectInObjectTree(stringAtCursor, _panel.getSession()); } - - private String getStringAtCursor() - { - String text = _panel.getSQLEntryPanel().getText(); - int caretPos = _panel.getSQLEntryPanel().getCaretPosition(); - - int lastIndexOfText = Math.max(0,text.length()-1); - int beginPos = Math.min(caretPos, lastIndexOfText); // The Math.min is for the Caret at the end of the text - while(0 < beginPos && false == isParseStop(text.charAt(beginPos), false)) - { - --beginPos; - } - - int endPos = caretPos; - while(endPos < text.length() && false == isParseStop(text.charAt(endPos), true)) - { - ++endPos; - } - - return text.substring(beginPos, endPos).trim(); - - - } - - private boolean isParseStop(char c, boolean treatDotAsStop) - { - return - '(' == c || - ')' == c || - '\'' == c || - Character.isWhitespace(c) || - (treatDotAsStop && '.' == c); - - } } --- 49,55 ---- } ! String stringAtCursor = _panel.getSQLEntryPanel().getWordAtCursor(); new ObjectTreeSearch().viewObjectInObjectTree(stringAtCursor, _panel.getSession()); } } Index: UndoAction.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/action/UndoAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UndoAction.java 5 Mar 2003 10:27:53 -0000 1.3 --- UndoAction.java 29 Nov 2009 21:17:54 -0000 1.4 *************** *** 1,49 **** ! package net.sourceforge.squirrel_sql.client.session.action; ! /* ! * Copyright (C) 2001-2003 Johan Compagner ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! */ ! import java.awt.event.ActionEvent; ! ! import javax.swing.undo.UndoManager; ! ! import net.sourceforge.squirrel_sql.client.IApplication; ! import net.sourceforge.squirrel_sql.client.action.SquirrelAction; ! ! public class UndoAction extends SquirrelAction ! { ! private UndoManager _undo; ! ! public UndoAction(IApplication app, UndoManager undo) ! { ! super(app); ! if (undo == null) ! { ! throw new IllegalArgumentException("UndoManager == null"); ! } ! _undo = undo; ! } ! /* ! * @see ActionListener#actionPerformed(ActionEvent) ! */ ! public void actionPerformed(ActionEvent e) ! { ! if (_undo.canUndo()) ! { ! _undo.undo(); ! } ! } ! } --- 1,66 ---- ! package net.sourceforge.squirrel_sql.client.session.action; ! /* ! * Copyright (C) 2001-2003 Johan Compagner ! * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Lesser General Public ! * License as published by the Free Software Foundation; either ! * version 2.1 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Lesser General Public License for more details. ! * ! * You should have received a copy of the GNU Lesser General Public ! * License along with this library; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! */ ! import java.awt.event.ActionEvent; ! ! import javax.swing.undo.UndoManager; ! import javax.swing.*; ! ! import net.sourceforge.squirrel_sql.client.IApplication; ! import net.sourceforge.squirrel_sql.client.action.SquirrelAction; ! ! public class UndoAction extends SquirrelAction ! { ! private UndoManager _undo; ! private Action _delegate; ! ! public UndoAction(IApplication app, UndoManager undo) ! { ! super(app); ! if (undo == null) ! { ! throw new IllegalArgumentException("UndoManager == null"); ! } ! _undo = undo; ! } ! ! public UndoAction(IApplication app, Action delegate) ! { ! super(app); ! _delegate = delegate; ! } ! ! ! /* ! * @see ActionListener#actionPerformed(ActionEvent) ! */ ! public void actionPerformed(ActionEvent e) ! { ! if (null == _delegate) ! { ! if (_undo.canUndo()) ! { ! _undo.undo(); ! } ! } ! else ! { ! _delegate.actionPerformed(e); ! } ! } ! } |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:07
|
Update of /cvsroot/squirrel-sql/sql12/fw/lib In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/fw/lib Added Files: rsyntaxtextarea.jar autocomplete.jar RText.jar fife.common.jar Log Message: RSyntax editor integration --- NEW FILE: fife.common.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: RText.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: autocomplete.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rsyntaxtextarea.jar --- (This appears to be a binary file; contents omitted.) |
Update of /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans Modified Files: SqlSyntaxHighlightTokenMatcher.java NetbeansSQLEntryPanel.java Removed Files: ReplaceAction.java FindAction.java Log Message: RSyntax editor integration --- FindAction.java DELETED --- Index: NetbeansSQLEntryPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/NetbeansSQLEntryPanel.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** NetbeansSQLEntryPanel.java 27 Dec 2007 22:10:39 -0000 1.24 --- NetbeansSQLEntryPanel.java 29 Nov 2009 21:17:53 -0000 1.25 *************** *** 429,433 **** public void removeSQLTokenListener(SQLTokenListener tl) { ! _syntaxFactory.addSQLTokenListeners(_session, tl); } --- 429,433 ---- public void removeSQLTokenListener(SQLTokenListener tl) { ! _syntaxFactory.removeSQLTokenListeners(_session, tl); } Index: SqlSyntaxHighlightTokenMatcher.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/netbeans/SqlSyntaxHighlightTokenMatcher.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SqlSyntaxHighlightTokenMatcher.java 16 Aug 2007 01:51:50 -0000 1.2 --- SqlSyntaxHighlightTokenMatcher.java 29 Nov 2009 21:17:53 -0000 1.3 *************** *** 32,35 **** --- 32,43 ---- } + @Override + public boolean isError(int offset, int len) + { + // Not nice, see end of ... .netbeans.SQLSyntax + // But Netbeans will be replaced by RSyntax soon. Then all Netbeans stuff this will be thrown away. + return false; + } + public boolean isTable(char[] buffer, int offset, int len) { --- ReplaceAction.java DELETED --- |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:05
|
Update of /cvsroot/squirrel-sql/sql12/app/cmd In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/app/cmd Modified Files: squirrel-sql.bat Log Message: RSyntax editor integration Index: squirrel-sql.bat =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/cmd/squirrel-sql.bat,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** squirrel-sql.bat 23 Mar 2009 00:53:33 -0000 1.18 --- squirrel-sql.bat 29 Nov 2009 21:17:54 -0000 1.19 *************** *** 46,59 **** @rem start "SQuirreL SQL Client" /B "%LOCAL_JAVA%w" -Xmx256m -cp %TMP_CP%;<your working dir here> net.sourceforge.squirrel_sql.client.Main %TMP_PARMS% @rem To change the language edit and uncomment this line: ! @rem start "SQuirreL SQL Client" /B "%LOCAL_JAVA%w" -Xmx256m -cp %TMP_CP%;<your working dir here> -Duser.language=<your language here> net.sourceforge.squirrel_sql.client.Main %TMP_PARMS% @rem Run with no command window. This may not work with older versions of Windows. Use the command above then. ! start "SQuirreL SQL Client" /B "%LOCAL_JAVA%w" -Xmx256m -cp %SQUIRREL_CP% net.sourceforge.squirrel_sql.client.Main %TMP_PARMS% @rem Run the executable jar file with or without a cmd window. However the @rem classes from the %CLASSPATH% environment variable will not be available. @rem "%LOCAL_JAVA%" -jar "%SQUIRREL_SQL_HOME%\squirrel-sql.jar" %TMP_PARMS% ! @rem start "SQuirreL SQL Client" /B "%LOCAL_JAVA%w" -jar "%SQUIRREL_SQL_HOME%\squirrel-sql.jar" %TMP_PARMS% :ExitForWrongJavaVersion --- 46,61 ---- @rem start "SQuirreL SQL Client" /B "%LOCAL_JAVA%w" -Xmx256m -cp %TMP_CP%;<your working dir here> net.sourceforge.squirrel_sql.client.Main %TMP_PARMS% + @rem -Dsun.java2d.noddraw=true prevents performance problems on Win32 systems. + @rem To change the language edit and uncomment this line: ! @rem start "SQuirreL SQL Client" /B "%LOCAL_JAVA%w" -Xmx256m -Dsun.java2d.noddraw=true -cp %TMP_CP%;<your working dir here> -Duser.language=<your language here> net.sourceforge.squirrel_sql.client.Main %TMP_PARMS% @rem Run with no command window. This may not work with older versions of Windows. Use the command above then. ! start "SQuirreL SQL Client" /B "%LOCAL_JAVA%w" -Xmx256m -Dsun.java2d.noddraw=true -cp %SQUIRREL_CP% net.sourceforge.squirrel_sql.client.Main %TMP_PARMS% @rem Run the executable jar file with or without a cmd window. However the @rem classes from the %CLASSPATH% environment variable will not be available. @rem "%LOCAL_JAVA%" -jar "%SQUIRREL_SQL_HOME%\squirrel-sql.jar" %TMP_PARMS% ! @rem start "SQuirreL SQL Client" /B "%LOCAL_JAVA%w" -Dsun.java2d.noddraw=true -jar "%SQUIRREL_SQL_HOME%\squirrel-sql.jar" %TMP_PARMS% :ExitForWrongJavaVersion |
Update of /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax Added Files: RSyntaxHighlightTokenMatcherProxy.java RSyntaxPropertiesWrapper.java SquirrelTokenMarkerFactory.java RSyntaxSQLEntryPanel.java RSyntaxHighlightTokenMatcher.java SquirrelSyntaxScheme.java I18NStrings.properties SquirrelTokenMakerBase.flex SquirreLRSyntaxTextAreaUI.java RSyntaxSQLEntryAreaFactory.java SquirrelTokenMarker.java SquirrelTokenMakerBase.java SquirrelRSyntaxTextArea.java Log Message: RSyntax editor integration --- NEW FILE: RSyntaxPropertiesWrapper.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISyntaxHighlightTokenMatcher; import net.sourceforge.squirrel_sql.client.session.ISyntaxHighlightTokenMatcherFactory; import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor; import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessorFactory; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; import java.util.HashMap; public class RSyntaxPropertiesWrapper { private HashMap<String, Object> _props; public RSyntaxPropertiesWrapper(HashMap<String, Object> props) { _props = props; } public IParserEventsProcessor getParserEventsProcessor(IIdentifier sqlEntryPanelIdentifier, ISession sess) { if(false == _props.containsKey(IParserEventsProcessorFactory.class.getName())) { return sess.getParserEventsProcessor(sqlEntryPanelIdentifier); } else if(null == _props.get(IParserEventsProcessorFactory.class.getName())) { return null; } else { IParserEventsProcessorFactory fact = (IParserEventsProcessorFactory) _props.get(IParserEventsProcessorFactory.class.getName()); return fact.getParserEventsProcessor(sqlEntryPanelIdentifier, sess); } } public ISyntaxHighlightTokenMatcher getSyntaxHighlightTokenMatcher(ISession sess, SquirrelRSyntaxTextArea rSyntaxTextArea, IIdentifier sqlEntryPanelIdentifier) { if(false == _props.containsKey(ISyntaxHighlightTokenMatcherFactory.class.getName())) { return new RSyntaxHighlightTokenMatcher(sess, rSyntaxTextArea, sqlEntryPanelIdentifier, this); } else { ISyntaxHighlightTokenMatcherFactory fact = (ISyntaxHighlightTokenMatcherFactory) _props.get(ISyntaxHighlightTokenMatcherFactory.class.getName()); return fact.getSyntaxHighlightTokenMatcher(sess, rSyntaxTextArea); } } } --- NEW FILE: SquirrelTokenMarker.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax; import org.fife.ui.rsyntaxtextarea.Token; import net.sourceforge.squirrel_sql.client.session.ISyntaxHighlightTokenMatcher; public class SquirrelTokenMarker extends SquirrelTokenMakerBase { private static int _curTokenArrayIndex =Token.NUM_TOKEN_TYPES; public static final int TOKEN_IDENTIFIER_TABLE = _curTokenArrayIndex++; public static final int TOKEN_IDENTIFIER_DATA_TYPE = _curTokenArrayIndex++; public static final int TOKEN_IDENTIFIER_COLUMN = _curTokenArrayIndex++; public static final int TOKEN_IDENTIFIER_FUNCTION = _curTokenArrayIndex++; public static final int TOKEN_IDENTIFIER_STATEMENT_SEPARATOR = _curTokenArrayIndex++; // public static final int TOKEN_IDENTIFIER_ERROR = _curTokenArrayIndex++; // public static final int TOKEN_IDENTIFIER_SCHEMA = _curTokenArrayIndex++; // public static final int TOKEN_IDENTIFIER_CATALOG = _curTokenArrayIndex++; private ISyntaxHighlightTokenMatcher _syntaxHighlightTokenMatcher; public static int getNumTokenTypes() { return _curTokenArrayIndex; } public SquirrelTokenMarker(final SquirrelRSyntaxTextArea squirrelRSyntaxTextArea, ISyntaxHighlightTokenMatcher syntaxHighlightTokenMatcher) { _syntaxHighlightTokenMatcher = syntaxHighlightTokenMatcher; } public void addToken(char[] array, int start, int end, int tokenType, int startOffset, boolean hyperlink) { int len = end + 1 - start; if(_syntaxHighlightTokenMatcher.isError(startOffset, len)) { // Errors must be first. super.addToken(array, start, end, Token.ERROR_IDENTIFIER, startOffset, hyperlink); } else if(Token.IDENTIFIER == tokenType) { // String s = new String(array).substring(start, end+1); // System.out.println("Squirrel: -->" + s + "<--"); if(_syntaxHighlightTokenMatcher.isKeyword(array, start, len)) { super.addToken(array, start, end, Token.RESERVED_WORD, startOffset, hyperlink); } else if(_syntaxHighlightTokenMatcher.isTable(array, start, len)) { super.addToken(array, start, end, TOKEN_IDENTIFIER_TABLE, startOffset, hyperlink); } else if(_syntaxHighlightTokenMatcher.isDataType(array, start, len)) { super.addToken(array, start, end, TOKEN_IDENTIFIER_DATA_TYPE, startOffset, hyperlink); } else if(_syntaxHighlightTokenMatcher.isColumn(array, start, len)) { super.addToken(array, start, end, TOKEN_IDENTIFIER_COLUMN, startOffset, hyperlink); } else if(_syntaxHighlightTokenMatcher.isFunction(array, start, len)) { super.addToken(array, start, end, TOKEN_IDENTIFIER_FUNCTION, startOffset, hyperlink); } else if(_syntaxHighlightTokenMatcher.isStatementSeparator(array, start, len)) { super.addToken(array, start, end, TOKEN_IDENTIFIER_STATEMENT_SEPARATOR, startOffset, hyperlink); } else { super.addToken(array, start, end, tokenType, startOffset, hyperlink); } } else { super.addToken(array, start, end, tokenType, startOffset, hyperlink); } } } --- NEW FILE: I18NStrings.properties --- syntax.useNoDDrawOnWIn32=Please use the Java-VM parameter -Dsun.java2d.noddraw=true in your SQuirreL start batch to prevent performance problems --- NEW FILE: RSyntaxHighlightTokenMatcherProxy.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax; import net.sourceforge.squirrel_sql.client.session.ISyntaxHighlightTokenMatcher; import net.sourceforge.squirrel_sql.client.session.SQLTokenListener; import javax.swing.text.JTextComponent; public class RSyntaxHighlightTokenMatcherProxy implements ISyntaxHighlightTokenMatcher { private ISyntaxHighlightTokenMatcher _delegate; private JTextComponent _editorPane; @Override public boolean isError(int offset, int len) { if(null == _delegate) { return false; } return _delegate.isError(offset, len); } public boolean isTable(char[] buffer, int offset, int len) { if(null == _delegate) { return false; } return _delegate.isTable(buffer, offset, len); } public boolean isFunction(char[] buffer, int offset, int len) { if(null == _delegate) { return false; } return _delegate.isFunction(buffer, offset, len); } public boolean isDataType(char[] buffer, int offset, int len) { if(null == _delegate) { return false; } return _delegate.isDataType(buffer, offset, len); } public boolean isStatementSeparator(char[] buffer, int offset, int len) { if(null == _delegate) { return false; } return _delegate.isStatementSeparator(buffer, offset, len); } public boolean isColumn(char[] buffer, int offset, int len) { if(null == _delegate) { return false; } return _delegate.isColumn(buffer, offset, len); } public boolean isKeyword(char[] buffer, int offset, int len) { if(null == _delegate) { return false; } return _delegate.isKeyword(buffer, offset, len); } public void removeSQLTokenListener(SQLTokenListener tl) { if(null == _delegate) { return; } _delegate.removeSQLTokenListener(tl); } public void addSQLTokenListener(SQLTokenListener tl) { if(null == _delegate) { return; } _delegate.addSQLTokenListener(tl); } public void setDelegate(ISyntaxHighlightTokenMatcher delegate) { _delegate = delegate; if(null != _editorPane) { _editorPane.repaint(); } } public void setEditorPane(JTextComponent editorPane) { _editorPane = editorPane; _editorPane.repaint(); } } --- NEW FILE: SquirreLRSyntaxTextAreaUI.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax; import net.sourceforge.squirrel_sql.client.session.mainpanel.IUndoHandler; import net.sourceforge.squirrel_sql.client.session.SQLEntryPanelUtil; import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaDefaultInputMap; import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaEditorKit; import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaUI; import org.fife.ui.rtextarea.RTextArea; import org.fife.ui.rtextarea.RTextAreaEditorKit; import javax.swing.*; import javax.swing.plaf.InputMapUIResource; import javax.swing.text.EditorKit; import javax.swing.text.JTextComponent; import javax.swing.text.TextAction; import java.awt.event.ActionEvent; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; public class SquirreLRSyntaxTextAreaUI extends RSyntaxTextAreaUI { public static final String RS_ACCELERATOR_STRING_TO_UPPER_CASE = "ctrl shift u"; public static final String RS_ACCELERATOR_STRING_TO_LOWER_CASE = "ctrl shift l"; private static final EditorKit _squirrel_defaultKit = new RSyntaxTextAreaEditorKit() { @Override public Action[] getActions() { return TextAction.augmentList(super.getActions(), new Action[]{new SQuirrelSelectWordAction()}); } }; private SquirrelRSyntaxTextArea _squirrelRSyntaxTextArea; public SquirreLRSyntaxTextAreaUI(SquirrelRSyntaxTextArea squirrelRSyntaxTextArea) { super(squirrelRSyntaxTextArea); _squirrelRSyntaxTextArea = squirrelRSyntaxTextArea; } protected InputMap getRTextAreaInputMap() { // Except from modifiyKeystrokes() this is copied from RSyntaxTextAreaUI. // Not too nice InputMap map = new InputMapUIResource(); InputMap shared = (InputMap)UIManager.get("RSyntaxTextAreaUI.inputMap"); if (shared==null) { shared = new RSyntaxTextAreaDefaultInputMap(); modifiyKeystrokes(shared); UIManager.put("RSyntaxTextAreaUI.inputMap", shared); } //KeyStroke[] keys = shared.allKeys(); //for (int i=0; i<keys.length; i++) // System.err.println(keys[i] + " -> " + shared.get(keys[i])); map.setParent(shared); return map; } private void modifiyKeystrokes(InputMap shared) { shared.remove(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, InputEvent.CTRL_MASK)); shared.remove(KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK)); shared.remove(KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK)); shared.put(KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK), RTextAreaEditorKit.rtaUpperSelectionCaseAction); shared.put(KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK), RTextAreaEditorKit.rtaLowerSelectionCaseAction); KeyStroke rsyntaxRedoStroke = KeyStroke.getKeyStroke(KeyEvent.VK_Y, InputEvent.CTRL_MASK); KeyStroke squirrelRedoStroke = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK); shared.put(squirrelRedoStroke,shared.get(rsyntaxRedoStroke)); } public IUndoHandler createUndoHandler() { return new IUndoHandler() { @Override public Action getUndoAction() { return onGetUndoAction(); } @Override public Action getRedoAction() { return onGetRedoAction(); } }; } private Action onGetUndoAction() { return getActionForName(_squirrelRSyntaxTextArea, RTextAreaEditorKit.rtaUndoAction); } private Action onGetRedoAction() { return getActionForName(_squirrelRSyntaxTextArea, RTextAreaEditorKit.rtaRedoAction); } public static Action getActionForName(SquirrelRSyntaxTextArea squirrelRSyntaxTextArea, String actionName) { Action[] actions = squirrelRSyntaxTextArea.getUI().getEditorKit(squirrelRSyntaxTextArea).getActions(); for (Action action : actions) { if(actionName.equals(action.getValue(Action.NAME))) { return action; } } throw new IllegalStateException("Action " + actionName + "not found"); } @Override public EditorKit getEditorKit(JTextComponent tc) { return _squirrel_defaultKit; } private static class SQuirrelSelectWordAction extends RSyntaxTextAreaEditorKit.SelectWordAction { public void actionPerformedImpl(ActionEvent e, RTextArea textArea) { int[] wordBoundsAtCursor = SQLEntryPanelUtil.getWordBoundsAtCursor(textArea, false); textArea.setSelectionStart(wordBoundsAtCursor[0]); textArea.setSelectionEnd(wordBoundsAtCursor[1]); } } } --- NEW FILE: SquirrelRSyntaxTextArea.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.SQLTokenListener; import net.sourceforge.squirrel_sql.client.session.parser.ParserEventsAdapter; import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor; import net.sourceforge.squirrel_sql.client.session.parser.kernel.ErrorInfo; import net.sourceforge.squirrel_sql.client.session.mainpanel.IUndoHandler; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import net.sourceforge.squirrel_sql.plugins.syntax.KeyManager; import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPreferences; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search.SquirrelRSyntaxSearchEngine; import org.fife.ui.rsyntaxtextarea.RSyntaxDocument; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.SyntaxScheme; import org.fife.ui.rtextarea.RTextAreaUI; import javax.swing.*; import javax.swing.event.UndoableEditListener; import javax.swing.text.Document; import java.awt.event.MouseEvent; import java.awt.event.ActionEvent; public class SquirrelRSyntaxTextArea extends RSyntaxTextArea { private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(SquirrelRSyntaxTextArea.class); private ISession _session; private SyntaxPreferences _prefs; private RSyntaxPropertiesWrapper _propertiesWrapper; private IIdentifier _sqlEntryPanelIdentifier; private RSyntaxHighlightTokenMatcherProxy _rSyntaxHighlightTokenMatcherProxy; private IUndoHandler _undoHandler; private SquirrelSyntaxScheme _squirrelSyntaxScheme; private ErrorInfo[] _currentErrorInfos = new ErrorInfo[0]; private boolean _parsingInitialized; private SquirrelRSyntaxSearchEngine _squirrelRSyntaxSearchEngine; public SquirrelRSyntaxTextArea(ISession session, SyntaxPreferences prefs, RSyntaxPropertiesWrapper propertiesWrapper, IIdentifier sqlEntryPanelIdentifier) { _session = session; _prefs = prefs; _propertiesWrapper = propertiesWrapper; _sqlEntryPanelIdentifier = sqlEntryPanelIdentifier; _rSyntaxHighlightTokenMatcherProxy.setDelegate(_propertiesWrapper.getSyntaxHighlightTokenMatcher(session, this, sqlEntryPanelIdentifier)); updateFromPreferences(); new KeyManager(this); _squirrelRSyntaxSearchEngine = new SquirrelRSyntaxSearchEngine(_session, this); setToolTipText("Just to make getToolTiptext() to be called"); setMarginLineEnabled(prefs.isTextLimitLineVisible()); setMarginLinePosition(prefs.getTextLimitLineWidth()); setHighlightCurrentLine(prefs.isHighlightCurrentLine()); if(null != System.getProperty("os.name") && System.getProperty("os.name").toUpperCase().startsWith("WINDOWS")) { if(null == System.getProperty("sun.java2d.noddraw") || false == "true".equals(System.getProperty("sun.java2d.noddraw"))) { session.getApplication().getMessageHandler().showWarningMessage(s_stringMgr.getString("syntax.useNoDDrawOnWIn32")); } } } protected RTextAreaUI createRTextAreaUI() { // Will be called from the super class constructor SquirreLRSyntaxTextAreaUI ret = new SquirreLRSyntaxTextAreaUI(this); _undoHandler = ret.createUndoHandler(); return ret; } @Override protected JPopupMenu createPopupMenu() { // SQuirreL creates its own popup menu. return null; } protected Document createDefaultModel() { // Is called from the super class constructor. // That is why initialization takes place here. _rSyntaxHighlightTokenMatcherProxy = new RSyntaxHighlightTokenMatcherProxy(); RSyntaxDocument ret = new RSyntaxDocument(new SquirrelTokenMarkerFactory(this, _rSyntaxHighlightTokenMatcherProxy), SYNTAX_STYLE_SQL); return ret; } public SyntaxScheme getDefaultSyntaxScheme() { // Is called from the super class constructor. // That is why initialization takes place here. _squirrelSyntaxScheme = new SquirrelSyntaxScheme(); return _squirrelSyntaxScheme; } public IUndoHandler createUndoHandler() { return _undoHandler; } public void addUndoableEditListener(UndoableEditListener um) { getDocument().addUndoableEditListener(um); } public void updateFromPreferences() { _squirrelSyntaxScheme.initSytles(_prefs); repaint(); } public void addSQLTokenListeners(ISession session, SQLTokenListener tl) { _rSyntaxHighlightTokenMatcherProxy.addSQLTokenListener(tl); } public void removeSQLTokenListeners(ISession session, SQLTokenListener tl) { _rSyntaxHighlightTokenMatcherProxy.removeSQLTokenListener(tl); } public String getToolTipText(MouseEvent event) { int pos = viewToModel(event.getPoint()); initParsing(); for (int i = 0; i < _currentErrorInfos.length; i++) { if(_currentErrorInfos[i].beginPos-1 <= pos && pos <= _currentErrorInfos[i].endPos) { return _currentErrorInfos[i].message; } } return null; } private void initParsing() { IParserEventsProcessor parserEventsProcessor = _propertiesWrapper.getParserEventsProcessor(_sqlEntryPanelIdentifier, _session); if(false == _parsingInitialized && null != parserEventsProcessor) { _parsingInitialized = true; parserEventsProcessor.addParserEventsListener(new ParserEventsAdapter() { public void errorsFound(ErrorInfo[] errorInfos) { onErrorsFound(errorInfos); } }); } } private void onErrorsFound(ErrorInfo[] errorInfos) { _currentErrorInfos = errorInfos; } public void showFindDialog(ActionEvent evt) { _squirrelRSyntaxSearchEngine.find(evt); } public void findSelected(ActionEvent evt) { _squirrelRSyntaxSearchEngine.findSelected(evt); } public void repeatLastFind(ActionEvent evt) { _squirrelRSyntaxSearchEngine.repeatLastFind(evt); } public void markSelected(ActionEvent evt) { _squirrelRSyntaxSearchEngine.markSelected(evt); } public void unmarkAll() { _squirrelRSyntaxSearchEngine.unmarkAll(); } public void showReplaceDialog(ActionEvent evt) { _squirrelRSyntaxSearchEngine.replace(evt); } public void showGoToLineDialog(ActionEvent evt) { _squirrelRSyntaxSearchEngine.goToLine(); } } --- NEW FILE: RSyntaxSQLEntryPanel.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax; /* * Copyright (C) 2004 Gerd Wagner * co...@us... * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import net.sourceforge.squirrel_sql.client.gui.dnd.FileEditorDropTargetListener; import net.sourceforge.squirrel_sql.client.session.BaseSQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.SQLTokenListener; import net.sourceforge.squirrel_sql.client.session.mainpanel.IUndoHandler; import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; import net.sourceforge.squirrel_sql.plugins.syntax.SyntaxPreferences; import javax.swing.*; import javax.swing.event.CaretListener; import javax.swing.event.UndoableEditListener; import javax.swing.text.Document; import javax.swing.text.Element; import javax.swing.text.JTextComponent; import javax.swing.text.PlainDocument; import javax.swing.undo.UndoManager; import java.awt.*; import java.awt.dnd.DropTarget; import java.awt.event.MouseListener; import java.util.HashMap; import org.fife.ui.rtextarea.RTextScrollPane; public class RSyntaxSQLEntryPanel extends BaseSQLEntryPanel { /** Logger for this class. */ private static final ILogger s_log = LoggerController.createLogger(RSyntaxSQLEntryPanel.class); /** Text component. */ private SquirrelRSyntaxTextArea _textArea; private ISession _session; private RSyntaxPropertiesWrapper _propertiesWrapper; @SuppressWarnings("unused") private DropTarget dt; private RTextScrollPane _textScrollPane; RSyntaxSQLEntryPanel(ISession session, SyntaxPreferences prefs, HashMap<String, Object> props) { super(session.getApplication()); if (session == null) { throw new IllegalArgumentException("Null ISession passed"); } _session = session; _propertiesWrapper = new RSyntaxPropertiesWrapper(props); _textArea = new SquirrelRSyntaxTextArea(session, prefs, _propertiesWrapper, getIdentifier()); _textScrollPane = new RTextScrollPane(_textArea); _textScrollPane.setLineNumbersEnabled(prefs.isLineNumbersEnabled()); dt = new DropTarget(_textArea, new FileEditorDropTargetListener(session)); } public int getCaretLineNumber() { final int pos = getCaretPosition(); final Document doc = _textArea.getDocument(); final Element docElem = doc.getDefaultRootElement(); return docElem.getElementIndex(pos); } /** * @see ISQLEntryPanel#gettextComponent() */ public JTextComponent getTextComponent() { return _textArea; } /** * If the component returned by <TT>getTextComponent</TT> contains its own * scroll bars return <TT>true</TT> other wise this component will be * wrapped in the scroll pane when added to the SQL panel. * * @return <TT>true</TT> if text component already handles scrolling. */ public boolean getDoesTextComponentHaveScroller() { return false; } /** * @see ISQLEntryPanel#getText() */ public String getText() { return _textArea.getText(); } public void setFont(Font font) { // See SQLSettingsInitializer to find out how fonts are // _textArea.setFont(font); } /** * @see ISQLEntryPanel#getSelectedText() */ public String getSelectedText() { return _textArea.getSelectedText(); } /** * Replace the contents of the SQL entry area with the passed SQL script * without selecting it. * * @param sqlScript * The script to be placed in the SQL entry area.. */ public void setText(String text) { setText(text, true); triggerParser(); } /** * Replace the contents of the SQL entry area with the passed SQL script and * specify whether to select it. * * @param sqlScript * The script to be placed in the SQL entry area.. * @param select * If <TT>true</TT> then select the passed script in the sql * entry area. */ public void setText(String text, boolean select) { _textArea.setText(text); if (select) { setSelectionEnd(_textArea.getDocument().getLength()); setSelectionStart(0); } triggerParser(); } /** * Append the passed SQL script to the SQL entry area but don't select it. * * @param sqlScript * The script to be appended. */ public void appendText(String sqlScript) { appendText(sqlScript, false); } /** * Append the passed SQL script to the SQL entry area and specify whether it * should be selected. * * @param sqlScript * The script to be appended. * @param select * If <TT>true</TT> then select the passed script in the sql * entry area. */ public void appendText(String sqlScript, boolean select) { Document doc = _textArea.getDocument(); try { int start = 0; if (select) { start = doc.getLength(); } doc.insertString(doc.getLength(), sqlScript, null); if (select) { setSelectionEnd(doc.getLength()); setSelectionStart(start); } triggerParser(); } catch (Exception ex) { s_log.error("Error appending text to text area", ex); } } /** * @see ISQLEntryPanel#getCaretPosition() */ public int getCaretPosition() { return _textArea.getCaretPosition(); } public void setCaretPosition(int value) { _textArea.setCaretPosition(value); } /** * @see ISQLEntryPanel#setTabSize(int) */ public void setTabSize(int tabSize) { _textArea.getDocument().putProperty(PlainDocument.tabSizeAttribute, Integer.valueOf(tabSize)); } /** * @see ISQLEntryPanel#getSelectionStart() */ public int getSelectionStart() { return _textArea.getSelectionStart(); } /** * @see ISQLEntryPanel#setSelectionStart(int) */ public void setSelectionStart(int pos) { _textArea.setSelectionStart(pos); } /** * @see ISQLEntryPanel#getSelectionEnd() */ public int getSelectionEnd() { return _textArea.getSelectionEnd(); } /** * @see ISQLEntryPanel#setSelectionEnd(int) */ public void setSelectionEnd(int pos) { _textArea.setSelectionEnd(pos); } /** * Replace the currently selected text in the SQL entry area with the passed * text. * * @param sqlScript * The script to be placed in the SQL entry area. */ public void replaceSelection(String sqlScript) { _textArea.replaceSelection(sqlScript); triggerParser(); } private void triggerParser() { IParserEventsProcessor parserEventsProcessor = _propertiesWrapper.getParserEventsProcessor(getIdentifier(), _session); if (null != parserEventsProcessor) { parserEventsProcessor.triggerParser(); } } /** * @see ISQLEntryPanel#hasFocus() */ public boolean hasFocus() { return _textArea.hasFocus(); } /** * @see ISQLEntryPanel#requestFocus() */ public void requestFocus() { SwingUtilities.invokeLater(new Runnable() { public void run() { _textArea.requestFocus(); } }); } /** * @see ISQLEntryPanel#addMouseListener(java.awt.event.MouseListener) */ public void addMouseListener(MouseListener lis) { _textArea.addMouseListener(lis); } /** * @see ISQLEntryPanel#removeMouseListener(java.awt.event.MouseListener) */ public void removeMouseListener(MouseListener lis) { _textArea.removeMouseListener(lis); } public void updateFromPreferences() { _textArea.updateFromPreferences(); } /** * @see ISQLEntryPanel#addUndoableEditListener(javax.swing.event.UndoableEditListener) */ public void addUndoableEditListener(UndoableEditListener listener) { _textArea.addUndoableEditListener(listener); } /** * @see ISQLEntryPanel#removeUndoableEditListener(javax.swing.event.UndoableEditListener) */ public void removeUndoableEditListener(UndoableEditListener listener) { _textArea.getDocument().removeUndoableEditListener(listener); } /** * @see ISQLEntryPanel#getCaretLinePosition() */ public int getCaretLinePosition() { String textTillCarret = getText().substring(0, getCaretPosition()); int lineFeedIndex = textTillCarret.lastIndexOf('\n'); if (-1 == lineFeedIndex) { return getCaretPosition(); } else { return getCaretPosition() - lineFeedIndex - 1; } // this didn't work // final int pos = getCaretPosition(); // final Document doc = _textArea.getStyledDocument(); // final Element docElem = doc.getDefaultRootElement(); // final Element lineElem = docElem.getElement(getCaretLineNumber()); // return lineElem.getElementIndex(pos); } /** * @see ISQLEntryPanel#addCaretListener(javax.swing.event.CaretListener) */ public void addCaretListener(CaretListener lis) { _textArea.addCaretListener(lis); } /** * @see ISQLEntryPanel#removeCaretListener(javax.swing.event.CaretListener) */ public void removeCaretListener(CaretListener lis) { _textArea.removeCaretListener(lis); } public void addSQLTokenListener(SQLTokenListener tl) { _textArea.addSQLTokenListeners(_session, tl); } public void removeSQLTokenListener(SQLTokenListener tl) { _textArea.removeSQLTokenListeners(_session, tl); } public ISession getSession() { return _session; } // public void showFindDialog(ActionEvent evt) // { // SQLKit kit = (SQLKit) _textArea.getEditorKit(); // kit.getActionByName(ExtKit.findAction).actionPerformed(evt); // } // // public void showReplaceDialog(ActionEvent evt) // { // SQLKit kit = (SQLKit) _textArea.getEditorKit(); // kit.getActionByName(ExtKit.replaceAction).actionPerformed(evt); // } /** * @see ISQLEntryPanel#hasOwnUndoableManager() */ public boolean hasOwnUndoableManager() { return true; } @Override public IUndoHandler createUndoHandler() { return _textArea.createUndoHandler(); //To change body of overridden methods use File | Settings | File Templates. } public void setUndoManager(UndoManager manager) { //_textArea.setUndoManager(manager); } /** * Sets the session referenced by this class to null so that it can be * garbage-collected. */ public void sessionEnding() { _session = null; } @Override public JScrollPane createScrollPane(JTextComponent textComponent) { return _textScrollPane; } } --- NEW FILE: SquirrelTokenMakerBase.java --- /* The following code was generated by JFlex 1.4.3 on 18.10.09 22:57 */ /* * 02/15/2005 * * SQLTokenMaker.java - Scanner for SQL. * Copyright (C) 2005 Robert Futrell * robert_futrell at users.sourceforge.net * http://fifesoft.com/rsyntaxtextarea * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax; import java.io.*; import javax.swing.text.Segment; import org.fife.ui.rsyntaxtextarea.*; /** * This class generates tokens representing a text stream as SQL.<p> * * This implementation was created using * <a href="http://www.jflex.de/">JFlex</a> 1.4.1; however, the generated file * was modified for performance. Memory allocation needs to be almost * completely removed to be competitive with the handwritten lexers (subclasses * of <code>AbstractTokenMaker</code>, so this class has been modified so that * Strings are never allocated (via yytext()), and the scanner never has to * worry about refilling its buffer (needlessly copying chars around). * We can achieve this because RText always scans exactly 1 line of tokens at a * time, and hands the scanner this line as an array of characters (a Segment * really). Since tokens contain pointers to char arrays instead of Strings * holding their contents, there is no need for allocating new memory for * Strings.<p> * * The actual algorithm generated for scanning has, of course, not been * modified.<p> * * If you wish to regenerate this file yourself, keep in mind the following: * <ul> * <li>The generated SQLTokenMaker.java</code> file will contain two * definitions of both <code>zzRefill</code> and <code>yyreset</code>. * You should hand-delete the second of each definition (the ones * generated by the lexer), as these generated methods modify the input * buffer, which we'll never have to do.</li> * <li>You should also change the declaration/definition of zzBuffer to NOT * be initialized. This is a needless memory allocation for us since we * will be pointing the array somewhere else anyway.</li> * <li>You should NOT call <code>yylex()</code> on the generated scanner * directly; rather, you should use <code>getTokenList</code> as you would * with any other <code>TokenMaker</code> instance.</li> * </ul> * * @author Robert Futrell * @version 0.5 * */ public class SquirrelTokenMakerBase extends AbstractJFlexTokenMaker { /** This character denotes the end of file */ public static final int YYEOF = -1; /** lexical states */ public static final int STRING = 2; public static final int YYINITIAL = 0; public static final int MLC = 6; public static final int CHAR = 4; /** * Translates characters to character classes */ private static final String ZZ_CMAP_PACKED = "\11\0\1\4\1\1\25\0\1\4\1\0\1\21\4\0\1\22\2\15"+ "\1\13\1\11\1\0\1\12\1\17\1\14\12\3\1\16\1\0\1\10"+ "\1\7\1\6\2\0\4\2\1\20\25\2\1\23\1\0\1\24\1\0"+ "\1\5\1\0\4\2\1\20\25\2\uff85\0"; /** * Translates characters to character classes */ private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); /** * Translates DFA states to action switch labels. */ private static final int [] ZZ_ACTION = zzUnpackAction(); private static final String ZZ_ACTION_PACKED_0 = "\10\0\1\1\1\2\1\1\1\3\1\4\7\5\1\6"+ "\1\1\1\7\1\10\1\11\1\12\1\13\1\14\1\15"+ "\1\13\1\16\1\17\1\13\1\20\1\13\1\1\1\3"+ "\1\7\1\0\1\4\3\5\1\21\1\22\1\1\1\7"+ "\1\0\1\12\1\23\2\13\1\24\1\7\1\0\1\7"+ "\1\0\1\21\1\1\1\7\1\0\1\7\1\0"; private static int [] zzUnpackAction() { int [] result = new int[63]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; } private static int zzUnpackAction(String packed, int offset, int [] result) { int i = 0; /* index in packed string */ int j = offset; /* index in unpacked array */ int l = packed.length(); while (i < l) { int count = packed.charAt(i++); int value = packed.charAt(i++); do result[j++] = value; while (--count > 0); } return j; } /** * Translates a state to a row index in the transition table */ private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); private static final String ZZ_ROWMAP_PACKED_0 = "\0\0\0\0\0\25\0\25\0\52\0\52\0\77\0\77"+ "\0\124\0\124\0\151\0\176\0\223\0\250\0\124\0\275"+ "\0\124\0\322\0\124\0\347\0\124\0\374\0\u0111\0\124"+ "\0\124\0\u0126\0\u013b\0\124\0\u0150\0\u0165\0\124\0\u017a"+ "\0\u018f\0\124\0\u01a4\0\151\0\176\0\u01b9\0\u01ce\0\223"+ "\0\124\0\124\0\124\0\u01e3\0\124\0\u01f8\0\u0111\0\u020d"+ "\0\u0126\0\124\0\124\0\124\0\124\0\u01b9\0\u0222\0\u0237"+ "\0\u0237\0\u01e3\0\u01f8\0\u024c\0\u024c\0\u0261\0\u0261"; private static int [] zzUnpackRowMap() { int [] result = new int[63]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; } private static int zzUnpackRowMap(String packed, int offset, int [] result) { int i = 0; /* index in packed string */ int j = offset; /* index in unpacked array */ int l = packed.length(); while (i < l) { int high = packed.charAt(i++) << 16; result[j++] = high | packed.charAt(i++); } return j; } /** * The transition table of the DFA */ private static final int [] ZZ_TRANS = zzUnpackTrans(); private static final String ZZ_TRANS_PACKED_0 = "\1\11\1\12\1\13\1\14\1\15\1\11\1\16\1\17"+ "\1\20\1\21\1\22\1\23\1\24\1\25\1\26\1\27"+ "\1\13\1\30\1\31\1\32\1\11\1\33\1\34\17\33"+ "\1\35\3\33\1\36\1\37\20\36\1\40\2\36\1\41"+ "\1\42\11\41\1\43\11\41\27\0\2\44\1\0\1\44"+ "\12\0\1\44\7\0\1\45\13\0\1\46\1\47\10\0"+ "\1\50\27\0\1\51\23\0\1\52\1\53\27\0\1\54"+ "\25\0\1\55\13\0\1\56\15\0\1\56\7\0\1\57"+ "\14\0\1\60\4\0\24\61\1\62\1\33\1\0\17\33"+ "\1\0\3\33\21\0\1\63\3\0\1\36\1\0\20\36"+ "\1\0\2\36\22\0\1\64\2\0\1\41\1\0\11\41"+ "\1\0\11\41\14\0\1\65\13\0\1\66\14\0\1\67"+ "\7\0\1\70\5\0\2\71\12\0\1\72\1\0\23\72"+ "\2\0\2\73\1\0\1\73\12\0\1\73\7\0\1\74"+ "\5\0\2\75\15\0\1\76\5\0\2\77\15\0\1\70"+ "\24\0\1\74\24\0\1\76\21\0"; private static int [] zzUnpackTrans() { int [] result = new int[630]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; } private static int zzUnpackTrans(String packed, int offset, int [] result) { int i = 0; /* index in packed string */ int j = offset; /* index in unpacked array */ int l = packed.length(); while (i < l) { int count = packed.charAt(i++); int value = packed.charAt(i++); value--; do result[j++] = value; while (--count > 0); } return j; } /* error codes */ private static final int ZZ_UNKNOWN_ERROR = 0; private static final int ZZ_NO_MATCH = 1; private static final int ZZ_PUSHBACK_2BIG = 2; /* error messages for the codes above */ private static final String ZZ_ERROR_MSG[] = { "Unkown internal scanner error", "Error: could not match input", "Error: pushback value was too large" }; /** * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code> */ private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); private static final String ZZ_ATTRIBUTE_PACKED_0 = "\10\0\2\11\4\1\1\11\1\1\1\11\1\1\1\11"+ "\1\1\1\11\2\1\2\11\2\1\1\11\2\1\1\11"+ "\2\1\1\11\4\1\1\0\1\1\3\11\1\1\1\11"+ "\2\1\1\0\1\1\4\11\1\1\1\0\1\1\1\0"+ "\3\1\1\0\1\1\1\0"; private static int [] zzUnpackAttribute() { int [] result = new int[63]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; } private static int zzUnpackAttribute(String packed, int offset, int [] result) { int i = 0; /* index in packed string */ int j = offset; /* index in unpacked array */ int l = packed.length(); while (i < l) { int count = packed.charAt(i++); int value = packed.charAt(i++); do result[j++] = value; while (--count > 0); } return j; } /** the input device */ private java.io.Reader zzReader; /** the current state of the DFA */ private int zzState; /** the current lexical state */ private int zzLexicalState = YYINITIAL; /** this buffer contains the current text to be matched and is the source of the yytext() string */ private char zzBuffer[]; /** the textposition at the last accepting state */ private int zzMarkedPos; /** the current text position in the buffer */ private int zzCurrentPos; /** startRead marks the beginning of the yytext() string in the buffer */ private int zzStartRead; /** endRead marks the last character in the buffer, that has been read from input */ private int zzEndRead; /** zzAtEOF == true <=> the scanner is at the EOF */ private boolean zzAtEOF; /* user code: */ /** * Constructor. This must be here because JFlex does not generate a * no-parameter constructor. */ public SquirrelTokenMakerBase() { super(); } /** * Adds the token specified to the current linked list of tokens. * * @param tokenType The token's type. */ private void addToken(int tokenType) { addToken(zzStartRead, zzMarkedPos-1, tokenType); } /** * Adds the token specified to the current linked list of tokens. * * @param tokenType The token's type. */ private void addToken(int start, int end, int tokenType) { int so = start + offsetShift; addToken(zzBuffer, start,end, tokenType, so); } /** * Adds the token specified to the current linked list of tokens. * * @param array The character array. * @param start The starting offset in the array. * @param end The ending offset in the array. * @param tokenType The token's type. * @param startOffset The offset in the document at which this token * occurs. */ public void addToken(char[] array, int start, int end, int tokenType, int startOffset) { super.addToken(array, start,end, tokenType, startOffset); zzStartRead = zzMarkedPos; } /** * Returns the text to place at the beginning and end of a * line to "comment" it in a this programming language. * * @return The start and end strings to add to a line to "comment" * it out. */ public String[] getLineCommentStartAndEnd() { return new String[] { "--", null }; } /** * Returns the first token in the linked list of tokens generated * from <code>text</code>. This method must be implemented by * subclasses so they can correctly implement syntax highlighting. * * @param text The text from which to get tokens. * @param initialTokenType The token type we should start with. * @param startOffset The offset into the document at which * <code>text</code> starts. * @return The first <code>Token</code> in a linked list representing * the syntax highlighted text. */ public Token getTokenList(Segment text, int initialTokenType, int startOffset) { resetTokenList(); this.offsetShift = -text.offset + startOffset; // Start off in the proper state. int state = Token.NULL; switch (initialTokenType) { case Token.LITERAL_STRING_DOUBLE_QUOTE: state = STRING; start = text.offset; break; case Token.LITERAL_CHAR: state = CHAR; start = text.offset; break; case Token.COMMENT_MULTILINE: state = MLC; start = text.offset; break; default: state = Token.NULL; } s = text; try { yyreset(zzReader); yybegin(state); return yylex(); } catch (IOException ioe) { ioe.printStackTrace(); return new DefaultToken(); } } /** * Refills the input buffer. * * @return <code>true</code> if EOF was reached, otherwise * <code>false</code>. */ private boolean zzRefill() { return zzCurrentPos>=s.offset+s.count; } /** * Resets the scanner to read from a new input stream. * Does not close the old reader. * * All internal variables are reset, the old input stream * <b>cannot</b> be reused (internal buffer is discarded and lost). * Lexical state is set to <tt>YY_INITIAL</tt>. * * @param reader the new input stream */ public final void yyreset(java.io.Reader reader) { // 's' has been updated. zzBuffer = s.array; /* * We replaced the line below with the two below it because zzRefill * no longer "refills" the buffer (since the way we do it, it's always * "full" the first time through, since it points to the segment's * array). So, we assign zzEndRead here. */ //zzStartRead = zzEndRead = s.offset; zzStartRead = s.offset; zzEndRead = zzStartRead + s.count - 1; zzCurrentPos = zzMarkedPos = s.offset; zzLexicalState = YYINITIAL; zzReader = reader; zzAtEOF = false; } /** * Creates a new scanner * There is also a java.io.InputStream version of this constructor. * * @param in the java.io.Reader to read input from. */ public SquirrelTokenMakerBase(java.io.Reader in) { this.zzReader = in; } /** * Creates a new scanner. * There is also java.io.Reader version of this constructor. * * @param in the java.io.Inputstream to read input from. */ public SquirrelTokenMakerBase(java.io.InputStream in) { this(new java.io.InputStreamReader(in)); } /** * Unpacks the compressed character translation table. * * @param packed the packed character translation table * @return the unpacked character translation table */ private static char [] zzUnpackCMap(String packed) { char [] map = new char[0x10000]; int i = 0; /* index in packed string */ int j = 0; /* index in unpacked array */ while (i < 72) { int count = packed.charAt(i++); char value = packed.charAt(i++); do map[j++] = value; while (--count > 0); } return map; } /** * Closes the input stream. */ public final void yyclose() throws java.io.IOException { zzAtEOF = true; /* indicate end of file */ zzEndRead = zzStartRead; /* invalidate buffer */ if (zzReader != null) zzReader.close(); } /** * Returns the current lexical state. */ public final int yystate() { return zzLexicalState; } /** * Enters a new lexical state * * @param newState the new lexical state */ public final void yybegin(int newState) { zzLexicalState = newState; } /** * Returns the text matched by the current regular expression. */ public final String yytext() { return new String( zzBuffer, zzStartRead, zzMarkedPos-zzStartRead ); } /** * Returns the character at position <tt>pos</tt> from the * matched text. * * It is equivalent to yytext().charAt(pos), but faster * * @param pos the position of the character to fetch. * A value from 0 to yylength()-1. * * @return the character at position pos */ public final char yycharat(int pos) { return zzBuffer[zzStartRead+pos]; } /** * Returns the length of the matched text region. */ public final int yylength() { return zzMarkedPos-zzStartRead; } /** * Reports an error that occured while scanning. * * In a wellformed scanner (no or only correct usage of * yypushback(int) and a match-all fallback rule) this method * will only be called with things that "Can't Possibly Happen". * If this method is called, something is seriously wrong * (e.g. a JFlex bug producing a faulty scanner etc.). * * Usual syntax/scanner level error handling should be done * in error fallback rules. * * @param errorCode the code of the errormessage to display */ private void zzScanError(int errorCode) { String message; try { message = ZZ_ERROR_MSG[errorCode]; } catch (ArrayIndexOutOfBoundsException e) { message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR]; } throw new Error(message); } /** * Pushes the specified amount of characters back into the input stream. * * They will be read again by then next call of the scanning method * * @param number the number of characters to be read again. * This number must not be greater than yylength()! */ public void yypushback(int number) { if ( number > yylength() ) zzScanError(ZZ_PUSHBACK_2BIG); zzMarkedPos -= number; } /** * Resumes scanning until the next regular expression is matched, * the end of input is encountered or an I/O-Error occurs. * * @return the next token * @exception java.io.IOException if any I/O-Error occurs */ public org.fife.ui.rsyntaxtextarea.Token yylex() throws java.io.IOException { int zzInput; int zzAction; // cached fields: int zzCurrentPosL; int zzMarkedPosL; int zzEndReadL = zzEndRead; char [] zzBufferL = zzBuffer; char [] zzCMapL = ZZ_CMAP; int [] zzTransL = ZZ_TRANS; int [] zzRowMapL = ZZ_ROWMAP; int [] zzAttrL = ZZ_ATTRIBUTE; while (true) { zzMarkedPosL = zzMarkedPos; zzAction = -1; zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; zzState = zzLexicalState; zzForAction: { while (true) { if (zzCurrentPosL < zzEndReadL) zzInput = zzBufferL[zzCurrentPosL++]; else if (zzAtEOF) { zzInput = YYEOF; break zzForAction; } else { // store back cached positions zzCurrentPos = zzCurrentPosL; zzMarkedPos = zzMarkedPosL; boolean eof = zzRefill(); // get translated positions and possibly new buffer zzCurrentPosL = zzCurrentPos; zzMarkedPosL = zzMarkedPos; zzBufferL = zzBuffer; zzEndReadL = zzEndRead; if (eof) { zzInput = YYEOF; break zzForAction; } else { zzInput = zzBufferL[zzCurrentPosL++]; } } int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ]; if (zzNext == -1) break zzForAction; zzState = zzNext; int zzAttributes = zzAttrL[zzState]; if ( (zzAttributes & 1) == 1 ) { zzAction = zzState; zzMarkedPosL = zzCurrentPosL; if ( (zzAttributes & 8) == 8 ) break zzForAction; } } } // store back cached position zzMarkedPos = zzMarkedPosL; switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { case 19: { addToken(Token.PREPROCESSOR); } case 21: break; case 2: { addNullToken(); return firstToken; } case 22: break; case 20: { yybegin(YYINITIAL); addToken(start,zzStartRead+1, Token.COMMENT_MULTILINE); } case 23: break; case 18: { start = zzMarkedPos-2; yybegin(MLC); } case 24: break; case 4: { addToken(Token.WHITESPACE); } case 25: break; case 14: { addToken(start,zzStartRead-1, Token.LITERAL_CHAR); return firstToken; } case 26: break; case 9: { start = zzMarkedPos-1; yybegin(CHAR); } case 27: break; case 7: { addToken(Token.LITERAL_NUMBER_FLOAT); } case 28: break; case 6: { addToken(Token.SEPARATOR); } case 29: break; case 15: { yybegin(YYINITIAL); addToken(start,zzStartRead, Token.LITERAL_CHAR); } case 30: break; case 1: { addToken(Token.IDENTIFIER); } case 31: break; case 12: { addToken(start,zzStartRead-1, Token.LITERAL_STRING_DOUBLE_QUOTE); return firstToken; } case 32: break; case 17: { addToken(Token.COMMENT_EOL); } case 33: break; case 8: { start = zzMarkedPos-1; yybegin(STRING); } case 34: break; case 3: { addToken(Token.LITERAL_NUMBER_DECIMAL_INT); } case 35: break; case 5: { addToken(Token.OPERATOR); } case 36: break; case 13: { yybegin(YYINITIAL); addToken(start,zzStartRead, Token.LITERAL_STRING_DOUBLE_QUOTE); } case 37: break; case 10: { addToken(Token.ERROR_IDENTIFIER); addNullToken(); return firstToken; } case 38: break; case 11: { } case 39: break; case 16: { addToken(start,zzStartRead-1, Token.COMMENT_MULTILINE); return firstToken; } case 40: break; default: if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { zzAtEOF = true; switch (zzLexicalState) { case STRING: { addToken(start,zzStartRead-1, Token.LITERAL_STRING_DOUBLE_QUOTE); return firstToken; } case 64: break; case YYINITIAL: { addNullToken(); return firstToken; } case 65: break; case MLC: { addToken(start,zzStartRead-1, Token.COMMENT_MULTILINE); return firstToken; } case 66: break; case CHAR: { addToken(start,zzStartRead-1, Token.LITERAL_CHAR); return firstToken; } case 67: break; default: return null; } } else { zzScanError(ZZ_NO_MATCH); } } } } } --- NEW FILE: RSyntaxHighlightTokenMatcher.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax; import net.sourceforge.squirrel_sql.client.session.ISyntaxHighlightTokenMatcher; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.SQLTokenListener; import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessor; import net.sourceforge.squirrel_sql.client.session.parser.ParserEventsAdapter; import net.sourceforge.squirrel_sql.client.session.parser.kernel.ErrorInfo; import net.sourceforge.squirrel_sql.client.session.schemainfo.SchemaInfo; import net.sourceforge.squirrel_sql.client.session.schemainfo.CaseInsensitiveString; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; import javax.swing.*; import java.util.Hashtable; import java.util.Vector; import java.util.Arrays; public class RSyntaxHighlightTokenMatcher implements ISyntaxHighlightTokenMatcher { private ISession _sess; private SquirrelRSyntaxTextArea _squirrelRSyntaxTextArea; private CaseInsensitiveString _caseInsensitiveStringBuffer = new CaseInsensitiveString(); private Hashtable<CaseInsensitiveString, String> _knownTables = new Hashtable<CaseInsensitiveString, String>(); private Vector<SQLTokenListener> _sqlTokenListeners = new Vector<SQLTokenListener>(); private Vector<ErrorInfo> _currentErrorInfos = new Vector<ErrorInfo>(); public RSyntaxHighlightTokenMatcher(ISession sess, SquirrelRSyntaxTextArea squirrelRSyntaxTextArea, IParserEventsProcessor parserEventsProcessor) { } public RSyntaxHighlightTokenMatcher(ISession sess, SquirrelRSyntaxTextArea squirrelRSyntaxTextArea, final IIdentifier sqlEntryPanelIdentifier, final RSyntaxPropertiesWrapper rSyntaxPropertiesWrapper) { _sess = sess; _squirrelRSyntaxTextArea = squirrelRSyntaxTextArea; SwingUtilities.invokeLater(new Runnable() { // Invoke later because of initialization problems when getParserEventsProcessor() is called directly from the constructor. public void run() { initParsing(rSyntaxPropertiesWrapper, sqlEntryPanelIdentifier); } }); } private void initParsing(RSyntaxPropertiesWrapper rSyntaxPropertiesWrapper, IIdentifier sqlEntryPanelIdentifier) { IParserEventsProcessor parserEventsProcessor = rSyntaxPropertiesWrapper.getParserEventsProcessor(sqlEntryPanelIdentifier, _sess); if (null != parserEventsProcessor) { parserEventsProcessor.addParserEventsListener(new ParserEventsAdapter() { @Override public void errorsFound(ErrorInfo[] errorInfos) { onErrorsFound(errorInfos); } }); } } private void onErrorsFound(ErrorInfo[] errorInfos) { boolean errorsChanged = false; if(_currentErrorInfos.size() == errorInfos.length) { for (int i = 0; i < errorInfos.length; i++) { if(false == errorInfos[i].equals(_currentErrorInfos.get(i))) { errorsChanged = true; break; } } } else { errorsChanged = true; } if(errorsChanged) { _currentErrorInfos.clear(); _currentErrorInfos.addAll(Arrays.asList(errorInfos)); _squirrelRSyntaxTextArea.repaint(); } } @Override public boolean isError(int offset, int len) { //System.out.println("Error: offset = " + offset + " len = " + len); for (int i = 0; i < _currentErrorInfos.size(); i++) { ErrorInfo errInf = _currentErrorInfos.elementAt(i); if(offset <= errInf.beginPos && errInf.endPos <= offset + len) { return true; } } return false; } public boolean isTable(char[] buffer, int offset, int len) { _caseInsensitiveStringBuffer.setCharBuffer(buffer, offset, len); // No new here, method is called very often int tableExtRes = _sess.getSchemaInfo().isTableExt(_caseInsensitiveStringBuffer); if(SchemaInfo.TABLE_EXT_COLS_LOADED_BEFORE == tableExtRes || SchemaInfo.TABLE_EXT_COLS_LOADED_IN_THIS_CALL == tableExtRes) { // _knownTables is just a cache to prevent creating a new String each time String table = _knownTables.get(_caseInsensitiveStringBuffer); if(null == table) { table = new String(buffer, offset, len); _knownTables.put(new CaseInsensitiveString(table), table); } if(SchemaInfo.TABLE_EXT_COLS_LOADED_IN_THIS_CALL == tableExtRes) { _squirrelRSyntaxTextArea.repaint(); } fireTableOrViewFound(table); return true; } return false; } private void fireTableOrViewFound(String tableOrViewName) { for (int i = 0; i < _sqlTokenListeners.size(); i++) { SQLTokenListener sqlTokenListener = _sqlTokenListeners.elementAt(i); sqlTokenListener.tableOrViewFound(tableOrViewName); } } public void addSQLTokenListener(SQLTokenListener tl) { removeSQLTokenListener(tl); _sqlTokenListeners.add(tl); } public boolean isFunction(char[] buffer, int offset, int len) { _caseInsensitiveStringBuffer.setCharBuffer(buffer, offset, len); if(_sess.getSchemaInfo().isFunction(_caseInsensitiveStringBuffer)) { return true; } if(_sess.getSchemaInfo().isProcedure(_caseInsensitiveStringBuffer)) { return true; } return false; } public boolean isDataType(char[] buffer, int offset, int len) { _caseInsensitiveStringBuffer.setCharBuffer(buffer, offset, len); if(_sess.getSchemaInfo().isDataType(_caseInsensitiveStringBuffer)) { return true; } return false; } public boolean isStatementSeparator(char[] buffer, int offset, int len) { _caseInsensitiveStringBuffer.setCharBuffer(buffer, offset, len); String statSep = _sess.getQueryTokenizer().getSQLStatementSeparator(); if(statSep.length() != len) { return false; } // no new here, method is called very often. for(int i=0; i < statSep.length(); ++i) { if(buffer[offset +i] != statSep.charAt(i)) { return false; } } return true; } public boolean isColumn(char[] buffer, int offset, int len) { // No new here, method is called very often //String s = new String(buffer, ... [truncated message content] |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:04
|
Update of /cvsroot/squirrel-sql/sql12/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/doc Modified Files: changes.txt Log Message: RSyntax editor integration Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v retrieving revision 1.515 retrieving revision 1.516 diff -C2 -d -r1.515 -r1.516 *** changes.txt 28 Nov 2009 21:44:17 -0000 1.515 --- changes.txt 29 Nov 2009 21:17:54 -0000 1.516 *************** *** 7,10 **** --- 7,23 ---- Enhancements: + New editor component: RSyntaxTextArea by fifesoft.com. + New features: + - No long line problems + - Enhanced search functions: + shift F3: Find selected. + F3: Repeat last find. + control shift F3: Mark selected. + escape: Unmark all. + - Line numbers can be displayed + - Current line can be highlighted + Note: On MS-Windows systems the Java-VM parameter -Dsun.java2d.noddraw=true must be set in your SQUirreL start batch to prevent performance problems. + + - New Polish translation available (Thanks to Miron Sadziak) |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:04
|
Update of /cvsroot/squirrel-sql/sql12/plugins/syntax/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/plugins/syntax/doc Added Files: RSyntaxTextArea.License.txt Log Message: RSyntax editor integration --- NEW FILE: RSyntaxTextArea.License.txt --- GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU General Public License. "The Library" refers to a covered work governed by this License, other than an Application or a Combined Work as defined below. An "Application" is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library. A "Combined Work" is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the "Linked Version". The "Minimal Corresponding Source" for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version. The "Corresponding Application Code" for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work. 1. Exception to Section 3 of the GNU GPL. You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL. 2. Conveying Modified Versions. If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version: a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy. 3. Object Code Incorporating Material from Library Header Files. The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following: a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License. b) Accompany the object code with a copy of the GNU GPL and this license document. 4. Combined Works. You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following: a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License. b) Accompany the Combined Work with a copy of the GNU GPL and this license document. c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document. d) Do one of the following: 0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source. 1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.) 5. Combined Libraries. You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License. b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 6. Revised Versions of the GNU Lesser General Public License. The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation. If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:04
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/app/src/net/sourceforge/squirrel_sql/client/session Modified Files: ISyntaxHighlightTokenMatcherFactory.java ISyntaxHighlightTokenMatcher.java BaseSQLEntryPanel.java ISQLEntryPanel.java Added Files: SQLEntryPanelUtil.java Log Message: RSyntax editor integration Index: BaseSQLEntryPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/BaseSQLEntryPanel.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** BaseSQLEntryPanel.java 31 Jul 2007 01:01:24 -0000 1.20 --- BaseSQLEntryPanel.java 29 Nov 2009 21:17:54 -0000 1.21 *************** *** 6,16 **** import java.awt.event.MouseListener; ! import javax.swing.Action; ! import javax.swing.JMenu; ! import javax.swing.JMenuItem; ! import javax.swing.SwingUtilities; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.session.action.ViewObjectAtCursorInObjectTreeAction; import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; import net.sourceforge.squirrel_sql.fw.gui.TextPopupMenu; --- 6,15 ---- import java.awt.event.MouseListener; ! import javax.swing.*; ! import javax.swing.text.JTextComponent; import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.session.action.ViewObjectAtCursorInObjectTreeAction; + import net.sourceforge.squirrel_sql.client.session.mainpanel.IUndoHandler; import net.sourceforge.squirrel_sql.fw.gui.GUIUtils; import net.sourceforge.squirrel_sql.fw.gui.TextPopupMenu; *************** *** 317,324 **** } ! /** ! * @see ISQLEntryPanel#setUndoActions(javax.swing.Action, javax.swing.Action) */ ! public void setUndoActions(Action undo, Action redo) { _textPopupMenu.addSeparator(); --- 316,323 ---- } ! /** ! * @see ISQLEntryPanel#addRedoUndoActionsToSQLEntryAreaMenu(javax.swing.Action, javax.swing.Action) */ ! public void addRedoUndoActionsToSQLEntryAreaMenu(Action undo, Action redo) { _textPopupMenu.addSeparator(); *************** *** 335,338 **** --- 334,350 ---- } + @Override + public boolean hasOwnUndoableManager() + { + return false; + } + + @Override + public IUndoHandler createUndoHandler() + { + return null; + } + + public void dispose() { *************** *** 340,344 **** } ! private final class MyMouseListener extends MouseAdapter { public void mousePressed(MouseEvent evt) --- 352,372 ---- } ! @Override ! public String getWordAtCursor() ! { ! int[] beginAndEndPos = SQLEntryPanelUtil.getWordBoundsAtCursor(getTextComponent(), true); ! return getTextComponent().getText().substring(beginAndEndPos[0], beginAndEndPos[1]).trim(); ! } ! ! @Override ! public JScrollPane createScrollPane(JTextComponent textComponent) ! { ! JScrollPane sqlEntryScroller = new JScrollPane(textComponent); ! sqlEntryScroller.setBorder(BorderFactory.createEmptyBorder()); ! return sqlEntryScroller; ! } ! ! ! private final class MyMouseListener extends MouseAdapter { public void mousePressed(MouseEvent evt) --- NEW FILE: SQLEntryPanelUtil.java --- package net.sourceforge.squirrel_sql.client.session; import javax.swing.text.JTextComponent; public class SQLEntryPanelUtil { public static int[] getWordBoundsAtCursor(JTextComponent textComponent, boolean qualified) { String text = textComponent.getText(); int caretPos = textComponent.getCaretPosition(); int[] beginAndEndPos = new int[2]; int lastIndexOfText = Math.max(0,text.length()-1); beginAndEndPos[0] = Math.min(caretPos, lastIndexOfText); // The Math.min is for the Caret at the end of the text while(0 < beginAndEndPos[0]) { if(isParseStop(text.charAt(beginAndEndPos[0] - 1), false == qualified)) { break; } --beginAndEndPos[0]; } beginAndEndPos[1] = caretPos; while(beginAndEndPos[1] < text.length() && false == isParseStop(text.charAt(beginAndEndPos[1]), true)) { ++beginAndEndPos[1]; } return beginAndEndPos; } static boolean isParseStop(char c, boolean treatDotAsStop) { return '(' == c || ')' == c || ',' == c || ';' == c || '\'' == c || Character.isWhitespace(c) || (treatDotAsStop && '.' == c); } } Index: ISQLEntryPanel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/ISQLEntryPanel.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ISQLEntryPanel.java 13 Sep 2007 22:14:47 -0000 1.13 --- ISQLEntryPanel.java 29 Nov 2009 21:17:54 -0000 1.14 *************** *** 21,28 **** import java.awt.event.MouseListener; ! import javax.swing.Action; ! import javax.swing.JComponent; ! import javax.swing.JMenu; ! import javax.swing.JMenuItem; import javax.swing.text.JTextComponent; import javax.swing.event.CaretListener; --- 21,25 ---- import java.awt.event.MouseListener; ! import javax.swing.*; import javax.swing.text.JTextComponent; import javax.swing.event.CaretListener; *************** *** 31,34 **** --- 28,32 ---- import net.sourceforge.squirrel_sql.fw.id.IHasIdentifier; + import net.sourceforge.squirrel_sql.client.session.mainpanel.IUndoHandler; public interface ISQLEntryPanel extends IHasIdentifier *************** *** 154,157 **** --- 152,163 ---- boolean hasOwnUndoableManager(); + /** + * Will only be called if hasOwnUndoableManager() returns true + */ + IUndoHandler createUndoHandler(); + + /** + * Will only be called if hasOwnUndoableManager() returns false + */ void setUndoManager(UndoManager manager); *************** *** 160,164 **** void removeUndoableEditListener(UndoableEditListener listener); ! void setUndoActions(Action undo, Action redo); void addCaretListener(CaretListener lis); --- 166,170 ---- void removeUndoableEditListener(UndoableEditListener listener); ! void addRedoUndoActionsToSQLEntryAreaMenu(Action undo, Action redo); void addCaretListener(CaretListener lis); *************** *** 171,173 **** --- 177,183 ---- ISession getSession(); + + String getWordAtCursor(); + + JScrollPane createScrollPane(JTextComponent textComponent); } Index: ISyntaxHighlightTokenMatcher.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/ISyntaxHighlightTokenMatcher.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ISyntaxHighlightTokenMatcher.java 25 Jul 2007 23:33:41 -0000 1.1 --- ISyntaxHighlightTokenMatcher.java 29 Nov 2009 21:17:54 -0000 1.2 *************** *** 3,6 **** --- 3,8 ---- public interface ISyntaxHighlightTokenMatcher { + boolean isError(int offset, int len); + boolean isTable(char[] buffer, int offset, int len); Index: ISyntaxHighlightTokenMatcherFactory.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/ISyntaxHighlightTokenMatcherFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ISyntaxHighlightTokenMatcherFactory.java 25 Jul 2007 23:33:41 -0000 1.1 --- ISyntaxHighlightTokenMatcherFactory.java 29 Nov 2009 21:17:54 -0000 1.2 *************** *** 2,8 **** import javax.swing.*; public interface ISyntaxHighlightTokenMatcherFactory { ! public ISyntaxHighlightTokenMatcher getSyntaxHighlightTokenMatcher(ISession sess, JEditorPane editorPane); } --- 2,9 ---- import javax.swing.*; + import javax.swing.text.JTextComponent; public interface ISyntaxHighlightTokenMatcherFactory { ! public ISyntaxHighlightTokenMatcher getSyntaxHighlightTokenMatcher(ISession sess, JTextComponent editorPane); } |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:03
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/resources In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/app/src/net/sourceforge/squirrel_sql/client/resources Modified Files: squirrel.properties Log Message: RSyntax editor integration Index: squirrel.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/resources/squirrel.properties,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** squirrel.properties 23 Jan 2009 18:02:13 -0000 1.71 --- squirrel.properties 29 Nov 2009 21:17:54 -0000 1.72 *************** *** 746,750 **** # The former corntrol w is already used by the Netbeans editor so we use control F5 which might be a problem to linux mutliple desktop users. ! menuitem.net.sourceforge.squirrel_sql.client.session.action.CloseSessionAction.accelerator=control F3 menuitem.net.sourceforge.squirrel_sql.client.session.action.CloseSessionAction.mnemonic=S --- 746,751 ---- # The former corntrol w is already used by the Netbeans editor so we use control F5 which might be a problem to linux mutliple desktop users. ! # Moved from F3 to F6 because F3 ist to much involved in searchning and we should prevent unintended Session closing ! menuitem.net.sourceforge.squirrel_sql.client.session.action.CloseSessionAction.accelerator=control F6 menuitem.net.sourceforge.squirrel_sql.client.session.action.CloseSessionAction.mnemonic=S |
Update of /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate Modified Files: EntryPanelManagerBase.java HQLEntryPanelManager.java HqlSyntaxHighlightTokenMatcherProxy.java Log Message: RSyntax editor integration Index: EntryPanelManagerBase.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/EntryPanelManagerBase.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EntryPanelManagerBase.java 13 Sep 2007 22:14:51 -0000 1.4 --- EntryPanelManagerBase.java 29 Nov 2009 21:17:53 -0000 1.5 *************** *** 4,14 **** import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISyntaxHighlightTokenMatcherFactory; ! import net.sourceforge.squirrel_sql.client.session.action.UndoAction; ! import net.sourceforge.squirrel_sql.client.session.action.RedoAction; ! import net.sourceforge.squirrel_sql.client.session.mainpanel.SquirrelDefaultUndoManager; import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessorFactory; - import net.sourceforge.squirrel_sql.client.IApplication; import net.sourceforge.squirrel_sql.client.gui.session.ToolsPopupAccessor; - import net.sourceforge.squirrel_sql.fw.util.Resources; import javax.swing.*; --- 4,10 ---- import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.ISyntaxHighlightTokenMatcherFactory; ! import net.sourceforge.squirrel_sql.client.session.mainpanel.UndoHandlerImpl; import net.sourceforge.squirrel_sql.client.session.parser.IParserEventsProcessorFactory; import net.sourceforge.squirrel_sql.client.gui.session.ToolsPopupAccessor; import javax.swing.*; *************** *** 52,72 **** } ! if (!_entry.hasOwnUndoableManager()) ! { ! SquirrelDefaultUndoManager undoManager = new SquirrelDefaultUndoManager(); ! IApplication app = _session.getApplication(); ! Resources res = app.getResources(); ! UndoAction undoAction = new UndoAction(app, undoManager); ! RedoAction redoAction = new RedoAction(app, undoManager); ! ! JComponent comp = _entry.getTextComponent(); ! comp.registerKeyboardAction(undoAction, res.getKeyStroke(undoAction), ! JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); ! comp.registerKeyboardAction(redoAction, res.getKeyStroke(redoAction), ! JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); ! _entry.setUndoActions(undoAction, redoAction); ! ! _entry.setUndoManager(undoManager); ! } } --- 48,52 ---- } ! new UndoHandlerImpl(_session.getApplication(), _entry); } Index: HqlSyntaxHighlightTokenMatcherProxy.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/HqlSyntaxHighlightTokenMatcherProxy.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** HqlSyntaxHighlightTokenMatcherProxy.java 25 Jul 2007 23:33:41 -0000 1.1 --- HqlSyntaxHighlightTokenMatcherProxy.java 29 Nov 2009 21:17:53 -0000 1.2 *************** *** 2,14 **** import net.sourceforge.squirrel_sql.client.session.ISyntaxHighlightTokenMatcher; - import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.client.session.SQLTokenListener; ! import javax.swing.*; public class HqlSyntaxHighlightTokenMatcherProxy implements ISyntaxHighlightTokenMatcher { private ISyntaxHighlightTokenMatcher _delegate; ! private JEditorPane _editorPane; public boolean isTable(char[] buffer, int offset, int len) --- 2,24 ---- import net.sourceforge.squirrel_sql.client.session.ISyntaxHighlightTokenMatcher; import net.sourceforge.squirrel_sql.client.session.SQLTokenListener; ! import javax.swing.text.JTextComponent; public class HqlSyntaxHighlightTokenMatcherProxy implements ISyntaxHighlightTokenMatcher { private ISyntaxHighlightTokenMatcher _delegate; ! private JTextComponent _editorPane; ! ! @Override ! public boolean isError(int offset, int len) ! { ! if(null == _delegate) ! { ! return false; ! } ! ! return _delegate.isError(offset, len); ! } public boolean isTable(char[] buffer, int offset, int len) *************** *** 89,93 **** } ! public void setEditorPane(JEditorPane editorPane) { _editorPane = editorPane; --- 99,103 ---- } ! public void setEditorPane(JTextComponent editorPane) { _editorPane = editorPane; Index: HQLEntryPanelManager.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** HQLEntryPanelManager.java 17 Sep 2007 02:21:34 -0000 1.10 --- HQLEntryPanelManager.java 29 Nov 2009 21:17:53 -0000 1.11 *************** *** 10,13 **** --- 10,14 ---- import javax.swing.*; + import javax.swing.text.JTextComponent; import java.awt.event.ActionEvent; *************** *** 110,114 **** return new ISyntaxHighlightTokenMatcherFactory() { ! public ISyntaxHighlightTokenMatcher getSyntaxHighlightTokenMatcher(ISession sess, JEditorPane editorPane) { _hqlSyntaxHighlightTokenMatcherProxy.setEditorPane(editorPane); --- 111,115 ---- return new ISyntaxHighlightTokenMatcherFactory() { ! public ISyntaxHighlightTokenMatcher getSyntaxHighlightTokenMatcher(ISession sess, JTextComponent editorPane) { _hqlSyntaxHighlightTokenMatcherProxy.setEditorPane(editorPane); |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:03
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/app/src/net/sourceforge/squirrel_sql/client/gui/db Modified Files: JTreeAliasesListImpl.java Log Message: RSyntax editor integration Index: JTreeAliasesListImpl.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** JTreeAliasesListImpl.java 15 Nov 2009 13:18:40 -0000 1.11 --- JTreeAliasesListImpl.java 29 Nov 2009 21:17:54 -0000 1.12 *************** *** 329,334 **** DefaultMutableTreeNode parent = (DefaultMutableTreeNode) delNode.getParent(); treeModel.removeNodeFromParent(delNode); ! treeModel.nodeStructureChanged(parent); if(null != nextToSel) --- 329,337 ---- DefaultMutableTreeNode parent = (DefaultMutableTreeNode) delNode.getParent(); + int indexOfChild = treeModel.getIndexOfChild(parent, delNode); treeModel.removeNodeFromParent(delNode); ! ! treeModel.nodesWereRemoved(parent, new int[]{indexOfChild}, new Object[]{delNode}); ! //treeModel.nodeStructureChanged(parent); if(null != nextToSel) *************** *** 485,491 **** removeAllAliasesFromNode(selNode); - selNode.removeFromParent(); DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel(); ! dtm.nodeStructureChanged(parent); } } --- 488,496 ---- removeAllAliasesFromNode(selNode); DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel(); ! int indexOfChild = dtm.getIndexOfChild(parent, selNode); ! selNode.removeFromParent(); ! dtm.nodesWereRemoved(parent, new int[]{indexOfChild}, new Object[]{selNode}); ! //dtm.nodeStructureChanged(parent); } } *************** *** 671,676 **** { DefaultMutableTreeNode parent = (DefaultMutableTreeNode) tn.getParent(); ! parent.insert(newFolder, parent.getIndex(tn) + 1); ! treeModel.nodeStructureChanged(parent); } else --- 676,682 ---- { DefaultMutableTreeNode parent = (DefaultMutableTreeNode) tn.getParent(); ! int childIndex = parent.getIndex(tn) + 1; ! parent.insert(newFolder, childIndex); ! treeModel.nodesWereInserted(parent, new int[]{childIndex}); } else *************** *** 683,688 **** { DefaultMutableTreeNode root = (DefaultMutableTreeNode) _tree.getModel().getRoot(); root.add(newFolder); ! treeModel.nodeStructureChanged(root); } --- 689,696 ---- { DefaultMutableTreeNode root = (DefaultMutableTreeNode) _tree.getModel().getRoot(); + + int[] childIndices = new int[]{root.getChildCount()}; root.add(newFolder); ! treeModel.nodesWereInserted(root, childIndices); } *************** *** 837,845 **** DefaultMutableTreeNode root = (DefaultMutableTreeNode) dtm.getRoot(); for (int i = 0; i < cutNodes.size(); i++) { root.add(cutNodes.get(i)); } ! dtm.nodeStructureChanged(root); } else --- 845,856 ---- DefaultMutableTreeNode root = (DefaultMutableTreeNode) dtm.getRoot(); + int[] childIndices = new int[cutNodes.size()]; for (int i = 0; i < cutNodes.size(); i++) { + childIndices[i] = root.getChildCount(); root.add(cutNodes.get(i)); } ! //dtm.nodeStructureChanged(root); ! dtm.nodesWereInserted(root, childIndices); } else |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:03
|
Update of /cvsroot/squirrel-sql/sql12/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/plugins/syntax/src/net/sourceforge/squirrel_sql/plugins/syntax/rsyntax/search Added Files: SquirrelGoToDialog.java SearchDialogClosingListener.java CaretState.java SquirrelRSyntaxSearchEngine.java SquirrelReplaceDialog.java I18NStrings.properties ISquirrelSearchDialog.java SearchDialogState.java SquirrelFindDialog.java Log Message: RSyntax editor integration --- NEW FILE: I18NStrings.properties --- syntax.SquirrelRSyntaxSearchEngine.noMatchRestart=No match found.\nStart from begin? syntax.SquirrelRSyntaxSearchEngine.noMatch=No match found. syntax.SquirrelRSyntaxSearchEngine.RegExErrMsg=Invalid regular expression:\n{0}\nPlease check your regular expression search string. syntax.SquirrelRSyntaxSearchEngine.RegExErrTitle=Regular expression error syntax.SquirrelRSyntaxSearchEngine.countOccurencesReplaced={0} occurences replaced SquirrelRSyntaxSearchEngine.findUsageHint=Find tips: shift F3: Find selected. F3: Repeat last find. control shift F3: Mark selected. escape: Unmark all syntax.SquirrelRSyntaxSearchEngine.InvalidLineNumber=Invalid line number. syntax.SquirrelGoToDialog.LineNumber=Line number syntax.SquirrelGoToDialog.OKButtonLabel=OK syntax.SquirrelGoToDialog.OKButtonMnemonic=O syntax.SquirrelGoToDialog.Cancel=Cancel syntax.SquirrelGoToDialog.CancelMnemonic=C syntax.SquirrelGoToDialog.GotoDialogTitle=Go to line syntax.SquirrelGoToDialog.LineNumberRange=Line number out of range\nMaximum line number is: {0}. syntax.SquirrelGoToDialog.ErrorDialogTitle=Invalid line number --- NEW FILE: SquirrelReplaceDialog.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search; import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame; import org.fife.ui.search.ReplaceDialog; import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.util.ArrayList; import java.util.HashMap; public class SquirrelReplaceDialog extends ReplaceDialog implements ISquirrelSearchDialog { private ArrayList<SearchDialogClosingListener> _closingListeners = new ArrayList<SearchDialogClosingListener>(); private HashMap<ActionListener, ActionListener> _listener_listenerProxy = new HashMap<ActionListener, ActionListener>(); public SquirrelReplaceDialog(MainFrame mainFrame) { super(mainFrame, null /* This ActionListener is not used, propably a bug in RText*/); cancelButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { close(); } }); addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { fireClosing(); } }); } @Override protected void escapePressed() { fireClosing(); super.escapePressed(); } @Override public void close() { fireClosing(); setVisible(false); dispose(); } private void fireClosing() { SearchDialogClosingListener[] listeners = _closingListeners.toArray(new SearchDialogClosingListener[_closingListeners.size()]); for (SearchDialogClosingListener listener : listeners) { listener.searchDialogClosing(); } } @Override public boolean isMatchCase() { return caseCheckBox.isSelected(); } @Override public boolean isWholeWord() { return wholeWordCheckBox.isSelected(); } @Override public boolean isRegExp() { return regExpCheckBox.isSelected(); } @Override public boolean isSearchUp() { return upButton.isSelected(); } @Override public boolean isMarkAll() { return markAllCheckBox.isSelected(); } @Override public JDialog getDialog() { return this; } @Override public void addClosingListener(SearchDialogClosingListener l) { _closingListeners.add(l); } @Override public void removeClosingListener(SearchDialogClosingListener l) { _closingListeners.remove(l); } @Override public void addFindActionListener(ActionListener actionListener) { findNextButton.addActionListener(actionListener); } @Override public void removeFindActionListener(ActionListener actionListener) { findNextButton.removeActionListener(actionListener); } @Override public void addReplaceActionListener(final ActionListener actionListener) { ActionListener actionListenerProxy = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { onReplace(e, actionListener); } }; addActionListener(actionListenerProxy); _listener_listenerProxy.put(actionListener, actionListenerProxy); } /////////////////////////////////////////////////////////////////////////////////// // Only the action command decides if the replace odr replace all button was hit. // The design in RText is an bit funny at this point private void onReplace(ActionEvent e, ActionListener actionListener) { if("Replace".equals(e.getActionCommand())) { actionListener.actionPerformed(e); } } private void onReplaceAll(ActionEvent e, ActionListener actionListener) { if("ReplaceAll".equals(e.getActionCommand())) { actionListener.actionPerformed(e); } } // /////////////////////////////////////////////////////////////////////////////////// @Override public void removeReplaceActionListener(ActionListener actionListener) { removeReplaceListener(actionListener); } private void removeReplaceListener(ActionListener actionListener) { ActionListener actionListenerProxy = _listener_listenerProxy.remove(actionListener); if(null != actionListenerProxy) { removeActionListener(actionListenerProxy); } } @Override public void addReplaceAllActionListener(final ActionListener actionListener) { ActionListener actionListenerProxy = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { onReplaceAll(e, actionListener); } }; addActionListener(actionListenerProxy); _listener_listenerProxy.put(actionListener, actionListenerProxy); } @Override public void removeReplaceAllActionListener(ActionListener actionListener) { removeReplaceListener(actionListener); } } --- NEW FILE: SquirrelRSyntaxSearchEngine.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search; import net.sourceforge.squirrel_sql.client.session.ISession; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import org.fife.ui.rtextarea.SearchEngine; import javax.swing.*; import javax.swing.text.BadLocationException; import java.awt.event.*; import java.util.Vector; import java.util.regex.PatternSyntaxException; public class SquirrelRSyntaxSearchEngine { private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(SquirrelRSyntaxSearchEngine.class); private ISession _session; private SquirrelRSyntaxTextArea _squirrelRSyntaxTextArea; private ISquirrelSearchDialog _dialog; private boolean _foundAtLeastOne; private String _lastSearchString; private CaretState _storedCaretState; private SearchDialogState _storedSearchDialogState; public SquirrelRSyntaxSearchEngine(ISession session, SquirrelRSyntaxTextArea squirrelRSyntaxTextArea) { _session = session; _squirrelRSyntaxTextArea = squirrelRSyntaxTextArea; } public void find(ActionEvent squirrelEvt) { _session.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("SquirrelRSyntaxSearchEngine.findUsageHint")); search(squirrelEvt, false); } public void replace(ActionEvent squirrelEvt) { search(squirrelEvt, true); } public void search(ActionEvent squirrelEvt, boolean replace) { if(null != _dialog) { _dialog.requestFocus(); return; } if (replace) { _dialog = new SquirrelReplaceDialog(_session.getApplication().getMainFrame()); } else { _dialog = new SquirrelFindDialog(_session.getApplication().getMainFrame()); } _dialog.addFindActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { onFind(); } }); _dialog.addReplaceActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { onReplace(); } }); _dialog.addReplaceAllActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { onReplaceAll(); } }); Vector<String> comboBoxStrings = new Vector<String>(); if(null != _lastSearchString) { comboBoxStrings.add(_lastSearchString); } (_dialog).setSearchParameters(comboBoxStrings, false, false, false, false, false); String selectedText = _squirrelRSyntaxTextArea.getSelectedText(); if (null != selectedText) { _dialog.setSearchString(selectedText); } _dialog.setVisible(true); _dialog.addClosingListener(new SearchDialogClosingListener(){ @Override public void searchDialogClosing() { onDialogClosing(); } }); storeCaretState(); _foundAtLeastOne = false; } private void onReplaceAll() { _lastSearchString = _dialog.getSearchString(); int count = SearchEngine.replaceAll(_squirrelRSyntaxTextArea, _lastSearchString, _dialog.getReplaceString(), _dialog.isMatchCase(), _dialog.isWholeWord(), _dialog.isRegExp()); if (_dialog.isMarkAll() && null != _dialog.getReplaceString() && 0 < _dialog.getReplaceString().length()) { invokeMarkAllForReplaceLater(); } _session.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("syntax.SquirrelRSyntaxSearchEngine.countOccurencesReplaced", count)); } private void onReplace() { try { _lastSearchString = _dialog.getSearchString(); boolean found = SearchEngine.replace( _squirrelRSyntaxTextArea, _lastSearchString, _dialog.getReplaceString(), !_dialog.isSearchUp(), _dialog.isMatchCase(), _dialog.isWholeWord(), _dialog.isRegExp()); if (_dialog.isMarkAll() && null != _dialog.getReplaceString() && 0 < _dialog.getReplaceString().length()) { invokeMarkAllForReplaceLater(); } if(false == found) { String msg = s_stringMgr.getString("syntax.SquirrelRSyntaxSearchEngine.noMatchRestart"); if(JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(_dialog.getDialog(), msg)) { if (_dialog.isSearchUp()) { _squirrelRSyntaxTextArea.setCaretPosition(_squirrelRSyntaxTextArea.getText().length()); } else { _squirrelRSyntaxTextArea.setCaretPosition(0); } found = SearchEngine.replace( _squirrelRSyntaxTextArea, _lastSearchString, _dialog.getReplaceString(), !_dialog.isSearchUp(), _dialog.isMatchCase(), _dialog.isWholeWord(), _dialog.isRegExp()); if (_dialog.isMarkAll() && null != _dialog.getReplaceString() && 0 < _dialog.getReplaceString().length()) { invokeMarkAllForReplaceLater(); } if(false == found) { JOptionPane.showMessageDialog(_dialog.getDialog(), s_stringMgr.getString("syntax.SquirrelRSyntaxSearchEngine.noMatch")); } else { _foundAtLeastOne = true; } } } else { _foundAtLeastOne = true; } } catch (PatternSyntaxException pse) { // // There was a problem with the user's regex search string. String msg = s_stringMgr.getString("syntax.SquirrelRSyntaxSearchEngine.RegExErrMsg"); String title = s_stringMgr.getString("syntax.SquirrelRSyntaxSearchEngine.RegExErrTitle", pse.toString()); JOptionPane.showMessageDialog(_dialog.getDialog(), msg, title, JOptionPane.ERROR_MESSAGE); } } private void invokeMarkAllForReplaceLater() { _squirrelRSyntaxTextArea.clearMarkAllHighlights(); SwingUtilities.invokeLater(new Runnable() { public void run() { _squirrelRSyntaxTextArea.markAll( _dialog.getReplaceString(), _dialog.isMatchCase(), _dialog.isWholeWord(), _dialog.isRegExp()); } }); } private void storeCaretState() { _storedCaretState = new CaretState(_squirrelRSyntaxTextArea); } private void onDialogClosing() { _storedSearchDialogState = new SearchDialogState(_dialog); if(false == _foundAtLeastOne) { _storedCaretState.restoreCaretState(_squirrelRSyntaxTextArea); } _dialog = null; } private void onFind() { try { _lastSearchString = _dialog.getSearchString(); if (_dialog.isMarkAll()) { _squirrelRSyntaxTextArea.markAll( _lastSearchString, _dialog.isMatchCase(), _dialog.isWholeWord(), _dialog.isRegExp()); } boolean found = SearchEngine.find( _squirrelRSyntaxTextArea, _lastSearchString, !_dialog.isSearchUp(), _dialog.isMatchCase(), _dialog.isWholeWord(), _dialog.isRegExp()); if(false == found) { String msg = s_stringMgr.getString("syntax.SquirrelRSyntaxSearchEngine.noMatchRestart"); if(JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(_dialog.getDialog(), msg)) { if (_dialog.isSearchUp()) { _squirrelRSyntaxTextArea.setCaretPosition(_squirrelRSyntaxTextArea.getText().length()); } else { _squirrelRSyntaxTextArea.setCaretPosition(0); } found = SearchEngine.find( _squirrelRSyntaxTextArea, _lastSearchString, !_dialog.isSearchUp(), _dialog.isMatchCase(), _dialog.isWholeWord(), _dialog.isRegExp()); if(false == found) { JOptionPane.showMessageDialog(_dialog.getDialog(), s_stringMgr.getString("syntax.SquirrelRSyntaxSearchEngine.noMatch")); } else { _foundAtLeastOne = true; } } } else { _foundAtLeastOne = true; } } catch (PatternSyntaxException pse) { // // There was a problem with the user's regex search string. String msg = s_stringMgr.getString("syntax.SquirrelRSyntaxSearchEngine.RegExErrMsg"); String title = s_stringMgr.getString("syntax.SquirrelRSyntaxSearchEngine.RegExErrTitle", pse.toString()); JOptionPane.showMessageDialog(_dialog.getDialog(), msg, title, JOptionPane.ERROR_MESSAGE); } } public void findSelected(ActionEvent evt) { String selectedText = _squirrelRSyntaxTextArea.getSelectedText(); if(null == selectedText || 0 == selectedText.length()) { return; } _lastSearchString = selectedText; _storedSearchDialogState = SearchDialogState.createForLastFind(); _repeatLastFind(_storedSearchDialogState); } private void _repeatLastFind(SearchDialogState searchDialogState) { boolean found = SearchEngine.find( _squirrelRSyntaxTextArea, _lastSearchString, !searchDialogState.isSearchUp(), searchDialogState.isMatchCase(), searchDialogState.isWholeWord(), searchDialogState.isRegExp()); if(false == found) { storeCaretState(); if (searchDialogState.isSearchUp()) { _squirrelRSyntaxTextArea.setCaretPosition(_squirrelRSyntaxTextArea.getText().length()); } else { _squirrelRSyntaxTextArea.setCaretPosition(0); } found = SearchEngine.find( _squirrelRSyntaxTextArea, _lastSearchString, !searchDialogState.isSearchUp(), searchDialogState.isMatchCase(), searchDialogState.isWholeWord(), searchDialogState.isRegExp()); if(false == found) { _storedCaretState.restoreCaretState(_squirrelRSyntaxTextArea); } } } public void repeatLastFind(ActionEvent evt) { if(null == _lastSearchString || 0 == _lastSearchString.length() || null == _storedSearchDialogState) { return; } _repeatLastFind(_storedSearchDialogState); } public void markSelected(ActionEvent evt) { String selectedText = _squirrelRSyntaxTextArea.getSelectedText(); if(null == selectedText || 0 == selectedText.length()) { return; } _lastSearchString = selectedText; _storedSearchDialogState = SearchDialogState.createForLastFind(); _squirrelRSyntaxTextArea.markAll( _lastSearchString, _storedSearchDialogState.isMatchCase(), _storedSearchDialogState.isWholeWord(), _storedSearchDialogState.isRegExp()); } public void unmarkAll() { _squirrelRSyntaxTextArea.clearMarkAllHighlights(); } public void goToLine() { SquirrelGoToDialog squirrelGoToDialog = new SquirrelGoToDialog(_session.getApplication().getMainFrame()); squirrelGoToDialog.setMaxLineNumberAllowed(_squirrelRSyntaxTextArea.getLineCount()); squirrelGoToDialog.setVisible(true); int lineNumber = squirrelGoToDialog.getLineNumber(); if (lineNumber > 0) { try { _squirrelRSyntaxTextArea.setCaretPosition(_squirrelRSyntaxTextArea.getLineStartOffset(lineNumber - 1)); } catch (BadLocationException ble) { JOptionPane.showMessageDialog(_session.getApplication().getMainFrame(), s_stringMgr.getString("syntax.SquirrelRSyntaxSearchEngine.InvalidLineNumber")); } } } } --- NEW FILE: SearchDialogClosingListener.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search; public interface SearchDialogClosingListener { void searchDialogClosing(); } --- NEW FILE: SquirrelFindDialog.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search; import org.fife.ui.search.AbstractFindReplaceDialog; import org.fife.ui.search.FindDialog; import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame; import javax.swing.*; import java.awt.event.*; import java.util.ArrayList; public class SquirrelFindDialog extends FindDialog implements ISquirrelSearchDialog { private ArrayList<SearchDialogClosingListener> _closingListeners = new ArrayList<SearchDialogClosingListener>(); public SquirrelFindDialog(MainFrame mainFrame) { super(mainFrame, null /* This ActionListener is not used, propably a bug in RText*/); cancelButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { close(); } }); addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { fireClosing(); } }); } @Override protected void escapePressed() { fireClosing(); super.escapePressed(); } @Override public void close() { fireClosing(); setVisible(false); dispose(); } private void fireClosing() { SearchDialogClosingListener[] listeners = _closingListeners.toArray(new SearchDialogClosingListener[_closingListeners.size()]); for (SearchDialogClosingListener listener : listeners) { listener.searchDialogClosing(); } } @Override public boolean isMatchCase() { return caseCheckBox.isSelected(); } @Override public boolean isWholeWord() { return wholeWordCheckBox.isSelected(); } @Override public boolean isRegExp() { return regExpCheckBox.isSelected(); } @Override public boolean isSearchUp() { return upButton.isSelected(); } @Override public boolean isMarkAll() { return markAllCheckBox.isSelected(); } @Override public JDialog getDialog() { return this; } @Override public void addClosingListener(SearchDialogClosingListener l) { _closingListeners.add(l); } @Override public void removeClosingListener(SearchDialogClosingListener l) { _closingListeners.remove(l); } @Override public void addFindActionListener(ActionListener actionListener) { findNextButton.addActionListener(actionListener); } @Override public void removeFindActionListener(ActionListener actionListener) { findNextButton.removeActionListener(actionListener); } @Override public void addReplaceActionListener(ActionListener actionListener) { } @Override public void removeReplaceActionListener(ActionListener actionListener) { } @Override public void addReplaceAllActionListener(ActionListener actionListener) { } @Override public void removeReplaceAllActionListener(ActionListener actionListener) { } @Override public String getReplaceString() { throw new UnsupportedOperationException("Only available in SquirrelReplaceDialog"); } } --- NEW FILE: CaretState.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search; import net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.SquirrelRSyntaxTextArea; public class CaretState { private int _selectionStart; private int _selectionEnd; private int _caretPosition; public CaretState(SquirrelRSyntaxTextArea squirrelRSyntaxTextArea) { _selectionStart = squirrelRSyntaxTextArea.getSelectionStart(); _selectionEnd = squirrelRSyntaxTextArea.getSelectionEnd(); _caretPosition = squirrelRSyntaxTextArea.getCaretPosition(); } void restoreCaretState(SquirrelRSyntaxTextArea squirrelRSyntaxTextArea) { if (_selectionStart < squirrelRSyntaxTextArea.getText().length()) { squirrelRSyntaxTextArea.setSelectionStart(_selectionStart); } if (_selectionEnd < squirrelRSyntaxTextArea.getText().length()) { squirrelRSyntaxTextArea.setSelectionEnd(_selectionEnd); } if (_caretPosition < squirrelRSyntaxTextArea.getText().length()) { squirrelRSyntaxTextArea.setSelectionEnd(_caretPosition); } } } --- NEW FILE: SearchDialogState.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search; public class SearchDialogState { private boolean _searchUp; private boolean _matchCase; private boolean _wholeWord; private boolean _regExp; public SearchDialogState(ISquirrelSearchDialog dialog) { _searchUp = dialog.isSearchUp(); _matchCase = dialog.isMatchCase(); _wholeWord = dialog.isWholeWord(); _regExp = dialog.isRegExp(); } private SearchDialogState(boolean searchUp, boolean matchCase, boolean wholeWord, boolean regExp) { _searchUp = searchUp; _matchCase = matchCase; _wholeWord = wholeWord; _regExp = regExp; } public boolean isSearchUp() { return _searchUp; } public boolean isMatchCase() { return _matchCase; } public boolean isWholeWord() { return _wholeWord; } public boolean isRegExp() { return _regExp; } public static SearchDialogState createForLastFind() { return new SearchDialogState(false, false, false, false); } } --- NEW FILE: ISquirrelSearchDialog.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search; import javax.swing.*; import java.awt.event.ActionListener; import java.awt.event.WindowListener; import java.awt.*; import java.util.Vector; public interface ISquirrelSearchDialog { void setSearchParameters(Vector findComboBoxStrings, boolean matchCase, boolean wholeWord, boolean regExp, boolean searchUp, boolean markAll); void setSearchString(String selectedText); void setVisible(boolean b); String getSearchString(); void close(); boolean isMatchCase(); boolean isWholeWord(); boolean isRegExp(); boolean isSearchUp(); boolean isMarkAll(); JDialog getDialog(); void addClosingListener(SearchDialogClosingListener searchDialogClosingListener); void removeClosingListener(SearchDialogClosingListener searchDialogClosingListener); void requestFocus(); void addFindActionListener(ActionListener actionListener); void removeFindActionListener(ActionListener actionListener); void addReplaceActionListener(ActionListener actionListener); void removeReplaceActionListener(ActionListener actionListener); void addReplaceAllActionListener(ActionListener actionListener); void removeReplaceAllActionListener(ActionListener actionListener); String getReplaceString(); } --- NEW FILE: SquirrelGoToDialog.java --- package net.sourceforge.squirrel_sql.plugins.syntax.rsyntax.search; /* * 11/14/2003 * * GoToDialog.java - A dialog allowing you to skip to a specific line number * in a document in RText. * Copyright (C) 2003 Robert Futrell * robert_futrell at users.sourceforge.net * http://rtext.fifesoft.com * * This file is a part of RText. * * RText is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or any later version. * * RText is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import org.fife.ui.EscapableDialog; import org.fife.ui.RButton; import org.fife.ui.ResizableFrameContentPane; import javax.swing.*; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.text.AbstractDocument; import javax.swing.text.AttributeSet; import javax.swing.text.BadLocationException; import javax.swing.text.DocumentFilter; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; /** * A "Go To" dialog allowing you to go to a specific line number in a document * in RText. * * @author Robert Futrell * @version 1.0 * * Had to be copied because it worked with the RText class * */ public class SquirrelGoToDialog extends EscapableDialog { private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(SquirrelGoToDialog.class); private JButton okButton; private JButton cancelButton; private JTextField lineNumberField; private int maxLineNumberAllowed; // Number of lines in the document. private int lineNumber; // The line to go to, or -1 for Cancel. /** * Creates a new <code>GoToDialog</code>. * * @param owner The rtext window that owns this dialog. */ public SquirrelGoToDialog(JFrame parent) { // Let it be known who the owner of this dialog is. super(parent); ComponentOrientation orientation = ComponentOrientation. getOrientation(getLocale()); lineNumber = 1; maxLineNumberAllowed = 1; // Empty document has 1 line. GoToListener listener = new GoToListener(); // Set the main content pane for the "GoTo" dialog. JPanel contentPane = new ResizableFrameContentPane(new BorderLayout()); contentPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); setContentPane(contentPane); // Make a panel containing the "Line Number" edit box. JPanel enterLineNumberPane = new JPanel(); BoxLayout box = new BoxLayout(enterLineNumberPane, BoxLayout.LINE_AXIS); enterLineNumberPane.setLayout(box); lineNumberField = new JTextField(16); lineNumberField.setText("" + lineNumber); AbstractDocument doc = (AbstractDocument) lineNumberField.getDocument(); doc.addDocumentListener(listener); doc.setDocumentFilter(new GoToDocumentFilter()); enterLineNumberPane.add(new JLabel(s_stringMgr.getString("syntax.SquirrelGoToDialog.LineNumber"))); enterLineNumberPane.add(lineNumberField); // Make a panel containing the OK and Cancel buttons. JPanel buttonPanel = new JPanel(new GridLayout(1, 2, 5, 5)); okButton = createRButton(s_stringMgr.getString("syntax.SquirrelGoToDialog.OKButtonLabel"), s_stringMgr.getString("syntax.SquirrelGoToDialog.OKButtonMnemonic")); okButton.setActionCommand("OK"); okButton.addActionListener(listener); cancelButton = createRButton(s_stringMgr.getString("syntax.SquirrelGoToDialog.Cancel"), s_stringMgr.getString("syntax.SquirrelGoToDialog.CancelMnemonic")); cancelButton.setActionCommand("Cancel"); cancelButton.addActionListener(listener); buttonPanel.add(okButton); buttonPanel.add(cancelButton); // Put everything into a neat little package. contentPane.add(enterLineNumberPane, BorderLayout.NORTH); JPanel temp = new JPanel(); temp.add(buttonPanel); contentPane.add(temp, BorderLayout.SOUTH); JRootPane rootPane = getRootPane(); rootPane.setDefaultButton(okButton); setTitle(s_stringMgr.getString("syntax.SquirrelGoToDialog.GotoDialogTitle")); setModal(true); applyComponentOrientation(orientation); pack(); setLocationRelativeTo(parent); } public static final RButton createRButton(String textKey, String mnemonicKey) { RButton b = new RButton(textKey); b.setMnemonic((int) mnemonicKey.charAt(0)); return b; } /** * Called when they've clicked OK or pressed Enter; check the line number * they entered for validity and if it's okay, close this dialog. If it * isn't okay, display an error message. */ private void attemptToGetGoToLine() { try { lineNumber = Integer.parseInt(lineNumberField.getText()); if (lineNumber < 1 || lineNumber > maxLineNumberAllowed) throw new NumberFormatException(); // If we have a valid line number, close the dialog! setVisible(false); } catch (NumberFormatException nfe) { JOptionPane.showMessageDialog(this, s_stringMgr.getString("syntax.SquirrelGoToDialog.LineNumberRange", maxLineNumberAllowed), s_stringMgr.getString("syntax.SquirrelGoToDialog.ErrorDialogTitle"), JOptionPane.ERROR_MESSAGE); return; } } /** * Called when the user clicks Cancel or hits the Escape key. This * hides the dialog. */ protected void escapePressed() { lineNumber = -1; super.escapePressed(); } /** * Gets the line number the user entered to go to. * * @return The line number the user decided to go to, or <code>-1</code> * if the dialog was canceled. */ public int getLineNumber() { return lineNumber; } /** * Sets the maximum line number for them to enter. * * @param max The new maximum line number value. */ public void setMaxLineNumberAllowed(int max) { this.maxLineNumberAllowed = max; } /** * Overrides <code>JDialog</code>'s <code>setVisible</code> method; decides * whether or not buttons are enabled if the user is enabling the dialog. */ public void setVisible(boolean visible) { if (visible) { lineNumber = -1; okButton.setEnabled(lineNumberField.getDocument().getLength() > 0); SwingUtilities.invokeLater(new Runnable() { public void run() { lineNumberField.requestFocusInWindow(); lineNumberField.selectAll(); } }); } super.setVisible(visible); } /** * A document filter that only allows numbers. */ static class GoToDocumentFilter extends DocumentFilter { private final String cleanse(String text) { boolean beep = false; if (text != null) { int length = text.length(); for (int i = 0; i < length; i++) { if (!Character.isDigit(text.charAt(i))) { text = text.substring(0, i) + text.substring(i + 1); i--; length--; beep = true; } } } if (beep) UIManager.getLookAndFeel().provideErrorFeedback(null); return text; } public void insertString(DocumentFilter.FilterBypass fb, int offset, String text, AttributeSet attr) throws BadLocationException { fb.insertString(offset, cleanse(text), attr); } public void remove(DocumentFilter.FilterBypass fb, int offset, int length) throws BadLocationException { fb.remove(offset, length); } public void replace(DocumentFilter.FilterBypass fb, int offset, int length, String text, AttributeSet attr) throws BadLocationException { fb.replace(offset, length, cleanse(text), attr); } } /** * Listens for events in this dialog. */ private class GoToListener implements ActionListener, DocumentListener { public void actionPerformed(ActionEvent e) { String command = e.getActionCommand(); if (command.equals("OK")) attemptToGetGoToLine(); else if (command.equals("Cancel")) escapePressed(); } public void changedUpdate(DocumentEvent e) { } public void insertUpdate(DocumentEvent e) { okButton.setEnabled(lineNumberField.getDocument().getLength() > 0); } public void removeUpdate(DocumentEvent e) { okButton.setEnabled(lineNumberField.getDocument().getLength() > 0); } } } |
|
From: Gerd W. <ger...@us...> - 2009-11-29 21:18:03
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1806/app/src/net/sourceforge/squirrel_sql/client/gui/session Modified Files: RowColumnLabel.java I18NStrings.properties Log Message: RSyntax editor integration Index: RowColumnLabel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session/RowColumnLabel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RowColumnLabel.java 30 Oct 2005 11:38:39 -0000 1.1 --- RowColumnLabel.java 29 Nov 2009 21:17:54 -0000 1.2 *************** *** 2,5 **** --- 2,7 ---- import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel; + import net.sourceforge.squirrel_sql.fw.util.StringManager; + import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import javax.swing.*; *************** *** 14,18 **** private StringBuffer _msg = new StringBuffer(); ! RowColumnLabel(ISQLEntryPanel sqlEntryPanel) { super(" ", JLabel.CENTER); --- 16,24 ---- private StringBuffer _msg = new StringBuffer(); ! private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(RowColumnLabel.class); ! private Dimension _dim; ! ! ! RowColumnLabel(ISQLEntryPanel sqlEntryPanel) { super(" ", JLabel.CENTER); *************** *** 29,33 **** }); ! writePosition(0,0); } --- 35,41 ---- }); ! writePosition(0,0, 0); ! ! setToolTipText(s_stringMgr.getString("RowColumnLabel.tooltip")); } *************** *** 36,48 **** int caretLineNumber = _sqlEntryPanel.getCaretLineNumber(); int caretLinePosition = _sqlEntryPanel.getCaretLinePosition(); ! writePosition(caretLineNumber, caretLinePosition); } ! private void writePosition(int caretLineNumber, int caretLinePosition) { _msg.setLength(0); ! _msg.append(caretLineNumber + 1) ! .append(",").append(caretLinePosition + 1); setText(_msg.toString()); } --- 44,56 ---- int caretLineNumber = _sqlEntryPanel.getCaretLineNumber(); int caretLinePosition = _sqlEntryPanel.getCaretLinePosition(); + int caretPosition = _sqlEntryPanel.getCaretPosition(); ! writePosition(caretLineNumber, caretLinePosition, caretPosition); } ! private void writePosition(int caretLineNumber, int caretLinePosition, int caretPosition) { _msg.setLength(0); ! _msg.append(caretLineNumber + 1).append(",").append(caretLinePosition + 1).append(" / ").append(caretPosition + 1); setText(_msg.toString()); } *************** *** 55,78 **** public Dimension getPreferredSize() { ! Dimension dim = super.getPreferredSize(); ! FontMetrics fm = getFontMetrics(getFont()); ! dim.width = fm.stringWidth("000,000"); ! Border border = getBorder(); ! if (border != null) ! { ! Insets ins = border.getBorderInsets(this); ! if (ins != null) ! { ! dim.width += (ins.left + ins.right); ! } ! } ! Insets ins = getInsets(); ! if (ins != null) ! { ! dim.width += (ins.left + ins.right); ! } ! return dim; } } --- 63,95 ---- public Dimension getPreferredSize() { ! if (null == _dim) ! { ! _dim = calcPrefSize(); ! } ! return _dim; } + private Dimension calcPrefSize() + { + Dimension dim = super.getPreferredSize(); + FontMetrics fm = getFontMetrics(getFont()); + dim.width = fm.stringWidth("000,000 / 00000000"); + Border border = getBorder(); + if (border != null) + { + Insets ins = border.getBorderInsets(this); + if (ins != null) + { + dim.width += (ins.left + ins.right); + } + } + Insets ins = getInsets(); + if (ins != null) + { + dim.width += (ins.left + ins.right); + } + return dim; + } + } Index: I18NStrings.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session/I18NStrings.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** I18NStrings.properties 14 Nov 2005 15:22:59 -0000 1.4 --- I18NStrings.properties 29 Nov 2009 21:17:54 -0000 1.5 *************** *** 31,33 **** ! ObjectTreeInternalFrame.error.retrievecatalog=Unable to retrieve catalog info \ No newline at end of file --- 31,35 ---- ! ObjectTreeInternalFrame.error.retrievecatalog=Unable to retrieve catalog info ! ! RowColumnLabel.tooltip=line,column / position \ No newline at end of file |
|
From: Rob M. <man...@us...> - 2009-11-29 01:34:30
|
Update of /cvsroot/squirrel-sql/sql12/doc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8233/doc Modified Files: Tag: squirrel_3_0_branch changes.txt Log Message: Update for 3.0.3 release. Index: changes.txt =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v retrieving revision 1.479.2.18 retrieving revision 1.479.2.19 diff -C2 -d -r1.479.2.18 -r1.479.2.19 *** changes.txt 29 Nov 2009 01:30:58 -0000 1.479.2.18 --- changes.txt 29 Nov 2009 01:34:22 -0000 1.479.2.19 *************** *** 2,6 **** ============================== ! 3.0.3 (??/??/????) ================== --- 2,6 ---- ============================== ! 3.0.3 (11/29/2009) ================== |
|
From: Rob M. <man...@us...> - 2009-11-29 01:32:50
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7803/app/src/net/sourceforge/squirrel_sql/client Modified Files: Tag: squirrel_3_0_branch Version.java Log Message: Update for 3.0.3 release. Index: Version.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/Version.java,v retrieving revision 1.33.2.2 retrieving revision 1.33.2.3 diff -C2 -d -r1.33.2.2 -r1.33.2.3 *** Version.java 18 Apr 2009 00:35:55 -0000 1.33.2.2 --- Version.java 29 Nov 2009 01:32:39 -0000 1.33.2.3 *************** *** 34,38 **** private static final int MAJOR_VERSION = 3; private static final int MINOR_VERSION = 0; ! private static final int RELEASE = 2; private static final String COPYRIGHT = s_stringMgr.getString("Version.copyright"); --- 34,38 ---- private static final int MAJOR_VERSION = 3; private static final int MINOR_VERSION = 0; ! private static final int RELEASE = 3; private static final String COPYRIGHT = s_stringMgr.getString("Version.copyright"); |
|
From: Rob M. <man...@us...> - 2009-11-29 01:31:11
|
Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7289/fw/src/net/sourceforge/squirrel_sql/fw/gui Modified Files: Tag: squirrel_3_0_branch StatusBar.java Log Message: Feature request #1656320 : Provide Background Color Configuration Index: StatusBar.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/gui/StatusBar.java,v retrieving revision 1.9 retrieving revision 1.9.8.1 diff -C2 -d -r1.9 -r1.9.8.1 *** StatusBar.java 20 Nov 2006 20:12:20 -0000 1.9 --- StatusBar.java 29 Nov 2009 01:30:58 -0000 1.9.8.1 *************** *** 30,33 **** --- 30,35 ---- public class StatusBar extends JPanel { + private static final long serialVersionUID = 1L; + /** * Message to display if there is no msg to display. Defaults to a *************** *** 224,226 **** --- 226,245 ---- } } + + /** + * @see javax.swing.JComponent#setBackground(java.awt.Color) + */ + @Override + public void setBackground(Color bg) + { + super.setBackground(bg); + if (_pnlLabelOrProgress != null) { + _pnlLabelOrProgress.setBackground(bg); + } + if (_progressBar != null) { + _progressBar.setBackground(bg); + } + } + + } |
![http://www.netbeans.org/images/v4/netbeans_logo.gif"](http://www.netbeans.org/images/v4/netbeans_logo.gif"){kind=link}
![http://fifesoft.com/Fifesoft_blue.png"](http://fifesoft.com/Fifesoft_blue.png"){kind=link}