[Squirrel-sql-commits] sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate EntryPanelManagerBase.java, 1.4, 1.5 HQLEntryPanelManager.java, 1.10, 1.11 HqlSyntaxHighlightTokenMatcherProxy.java, 1.1, 1.2

[Gerd W. <ger...@us...>]

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);