[Squirrel-sql-commits] sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate HQLBookmarksAction.java, NONE, 1.1 BookmarksAccessor.java, NONE, 1.1 BoomarksExternalService.java, NONE, 1.1 HQLEntryPanelManager.java, 1.9, 1.10 I18NStrings.properties, 1.6, 1.7 HibernatePluginResources.properties, 1.4, 1.5

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

Update of /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24582/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate

Modified Files:
	HQLEntryPanelManager.java I18NStrings.properties 
	HibernatePluginResources.properties 
Added Files:
	HQLBookmarksAction.java BookmarksAccessor.java 
	BoomarksExternalService.java 
Log Message:
Hibernate Plugin: Bookmarks for Hibernate Plugin

Index: HibernatePluginResources.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/HibernatePluginResources.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HibernatePluginResources.properties	10 Sep 2007 21:29:42 -0000	1.4
--- HibernatePluginResources.properties	17 Sep 2007 02:21:34 -0000	1.5
***************
*** 32,35 ****
--- 32,39 ----
  action.net.sourceforge.squirrel_sql.plugins.hibernate.HQLToolsPopUpAction.tooltip=Show tools popup
  
+ action.net.sourceforge.squirrel_sql.plugins.hibernate.HQLBookmarksAction.image=
+ action.net.sourceforge.squirrel_sql.plugins.hibernate.HQLBookmarksAction.name=Select Bookmark
+ action.net.sourceforge.squirrel_sql.plugins.hibernate.HQLBookmarksAction.tooltip=Select Bookmark
+ 
  
  ########
***************
*** 42,43 ****
--- 46,50 ----
  menuitem.net.sourceforge.squirrel_sql.plugins.hibernate.HQLToolsPopUpAction.accelerator=control T
  menuitem.net.sourceforge.squirrel_sql.plugins.hibernate.HQLToolsPopUpAction.mnemonic=T
+ 
+ menuitem.net.sourceforge.squirrel_sql.plugins.hibernate.HQLBookmarksAction.accelerator=control J
+ menuitem.net.sourceforge.squirrel_sql.plugins.hibernate.HQLBookmarksAction.mnemonic=J

--- NEW FILE: HQLBookmarksAction.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate;

import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.fw.util.Resources;

import java.awt.event.ActionEvent;

public class HQLBookmarksAction extends SquirrelAction
{
   private ISQLEntryPanel _entryPanel;

   public HQLBookmarksAction(IApplication app, Resources rsrc, ISQLEntryPanel entryPanel)
   {
      super(app, rsrc);
      _entryPanel = entryPanel;
   }


   public void actionPerformed(ActionEvent e)
   {
      BookmarksAccessor.selectBookmark(_entryPanel);      
   }
}

--- NEW FILE: BoomarksExternalService.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate;

import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;

public interface BoomarksExternalService
{
   void selectBookmark(ISQLEntryPanel entryPanel);
}

Index: HQLEntryPanelManager.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/HQLEntryPanelManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** HQLEntryPanelManager.java	13 Sep 2007 22:14:51 -0000	1.9
--- HQLEntryPanelManager.java	17 Sep 2007 02:21:34 -0000	1.10
***************
*** 38,45 ****
        tpap.apply(this);
        initCodeCompletion();
  
  
!       // i18n[HQLEntryPanelManager,quoteHQL=Quote HQL]
!       AbstractAction quoteHql = new AbstractAction(s_stringMgr.getString("HQLEntryPanelManager,quoteHQL"))
        {
           public void actionPerformed(ActionEvent e)
--- 38,47 ----
        tpap.apply(this);
        initCodeCompletion();
+       initBookmarks();
  
  
!       // i18n[HQLEntryPanelManager.quoteHQL=Quote HQL]
!       String strQuote = s_stringMgr.getString("HQLEntryPanelManager.quoteHQL");
!       AbstractAction quoteHql = new AbstractAction(strQuote)
        {
           public void actionPerformed(ActionEvent e)
***************
*** 48,56 ****
           }
        };
!       quoteHql.putValue(Action.SHORT_DESCRIPTION, "Quote HQL");
        addToSQLEntryAreaMenu(quoteHql, "quote");
  
!       // i18n[HQLEntryPanelManager,quoteHQLsb=Quote HQL sb]
!       AbstractAction quoteSbHql = new AbstractAction(s_stringMgr.getString("HQLEntryPanelManager,quoteHQLsb"))
        {
           public void actionPerformed(ActionEvent e)
--- 50,59 ----
           }
        };
!       quoteHql.putValue(Action.SHORT_DESCRIPTION, strQuote);
        addToSQLEntryAreaMenu(quoteHql, "quote");
  
!       // i18n[HQLEntryPanelManager.quoteHQLsb=Quote HQL as StingBuffer]
!       String strQuoteSb = s_stringMgr.getString("HQLEntryPanelManager.quoteHQLsb");
!       AbstractAction quoteSbHql = new AbstractAction(strQuoteSb)
        {
           public void actionPerformed(ActionEvent e)
***************
*** 59,67 ****
           }
        };
!       quoteSbHql.putValue(Action.SHORT_DESCRIPTION, "Quote HQL as StringBuffer");
        addToSQLEntryAreaMenu(quoteSbHql, "quotesb");
  
!       // i18n[HQLEntryPanelManager,unquoteHQL=Unquote HQL]
!       AbstractAction unquoteHql = new AbstractAction(s_stringMgr.getString("HQLEntryPanelManager,unquoteHQL"))
        {
           public void actionPerformed(ActionEvent e)
--- 62,71 ----
           }
        };
!       quoteSbHql.putValue(Action.SHORT_DESCRIPTION, strQuoteSb);
        addToSQLEntryAreaMenu(quoteSbHql, "quotesb");
  
!       // i18n[HQLEntryPanelManager.unquoteHQL=Unquote HQL]
!       String strUnquote = s_stringMgr.getString("HQLEntryPanelManager.unquoteHQL");
!       AbstractAction unquoteHql = new AbstractAction(strUnquote)
        {
           public void actionPerformed(ActionEvent e)
***************
*** 70,77 ****
           }
        };
!       unquoteHql.putValue(Action.SHORT_DESCRIPTION, "Unquote HQL");
        addToSQLEntryAreaMenu(unquoteHql, "unquote");
     }
  
     private void initToolsPopUp()
     {
--- 74,90 ----
           }
        };
!       unquoteHql.putValue(Action.SHORT_DESCRIPTION, strUnquote);
        addToSQLEntryAreaMenu(unquoteHql, "unquote");
     }
  
+ 
+    private void initBookmarks()
+    {
+       HQLBookmarksAction hba = new HQLBookmarksAction(getSession().getApplication(), _resources, getEntryPanel());
+       JMenuItem item = addToSQLEntryAreaMenu(hba, "bookmarkselect");
+       _resources.configureMenuItem(hba, item);
+       registerKeyboardAction(hba, _resources.getKeyStroke(hba));
+    }
+ 
     private void initToolsPopUp()
     {

--- NEW FILE: BookmarksAccessor.java ---
package net.sourceforge.squirrel_sql.plugins.hibernate;

import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
import net.sourceforge.squirrel_sql.client.IApplication;

import javax.swing.*;

public class BookmarksAccessor
{

   private static final StringManager s_stringMgr =
      StringManagerFactory.getStringManager(BookmarksAccessor.class);


   private static BoomarksExternalService getService(IApplication application)
   {
      BoomarksExternalService si = (BoomarksExternalService) application.getPluginManager().bindExternalPluginService("sqlbookmark", BoomarksExternalService.class);
      if (null == si)
      {
         // i18n[BookmarksAccessor.bookmarksPluginNeeded=Running bookmarks is only available with the Bookmarks Plugin.\nGet the plugin from www.squirrelsql.org. It's free.]
         String msg = s_stringMgr.getString("BookmarksAccessor.bookmarksPluginNeeded");
         JOptionPane.showMessageDialog(application.getMainFrame(), msg);
         return null;
      }
      return si;
   }


   public static void selectBookmark(ISQLEntryPanel entryPanel)
   {
      getService(entryPanel.getSession().getApplication()).selectBookmark(entryPanel);
   }
}

Index: I18NStrings.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/hibernate/src/net/sourceforge/squirrel_sql/plugins/hibernate/I18NStrings.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** I18NStrings.properties	30 Aug 2007 23:13:07 -0000	1.6
--- I18NStrings.properties	17 Sep 2007 02:21:34 -0000	1.7
***************
*** 28,37 ****
  
  EditExtrasAccessor.editextrasPluginNeeded=Quoting is only available with the Edit Extras Plugin.\nGet the plugin from www.squirrelsql.org. It's free.
! HQLEntryPanelManager,quoteHQL=Quote HQL
! HQLEntryPanelManager,quoteHQLsb=Quote HQL sb
! HQLEntryPanelManager,unquoteHQL=Unquote HQL
  
  HQLTabPanel.mappedObjects=Mapped objects
  HQLTabPanel.hql=HQL
  
! hibernate.HibernateTabPanel.openConfigs=Open Hibernate configurations
\ No newline at end of file
--- 28,42 ----
  
  EditExtrasAccessor.editextrasPluginNeeded=Quoting is only available with the Edit Extras Plugin.\nGet the plugin from www.squirrelsql.org. It's free.
! HQLEntryPanelManager.quoteHQL=Quote HQL
! HQLEntryPanelManager.quoteHQLsb=Quote HQL as StingBuffer
! 
! HQLEntryPanelManager.unquoteHQL=Unquote HQL
  
  HQLTabPanel.mappedObjects=Mapped objects
  HQLTabPanel.hql=HQL
  
! hibernate.HibernateTabPanel.openConfigs=Open Hibernate configurations
! 
! HQLEntryPanelManager.runBookmark=Run Bookmark
! 
! BookmarksAccessor.bookmarksPluginNeeded=Running bookmarks is only available with the Bookmarks Plugin.\nGet the plugin from www.squirrelsql.org. It's free.
\ No newline at end of file