[jboss-cvs] jbosside/netbeans/hibernate-console/src/org/hibernate/netbeans/console/output/result ...

[Leon Chiver]

  User: leonceeo
  Date: 06/09/19 15:29:06

  Modified:    netbeans/hibernate-console/src/org/hibernate/netbeans/console/output/result 
                        Tag: v_0_5_alpha1 QueryResultMultiViewElement.java
  Log:
  merged changes from trunk (as they were meant for the 0.5 release)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +12 -1     jbosside/netbeans/hibernate-console/src/org/hibernate/netbeans/console/output/result/QueryResultMultiViewElement.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: QueryResultMultiViewElement.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/netbeans/hibernate-console/src/org/hibernate/netbeans/console/output/result/QueryResultMultiViewElement.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -b -r1.4 -r1.4.2.1
  --- QueryResultMultiViewElement.java	4 Jul 2006 09:48:31 -0000	1.4
  +++ QueryResultMultiViewElement.java	19 Sep 2006 19:29:06 -0000	1.4.2.1
  @@ -43,6 +43,7 @@
   import javax.swing.JComponent;
   import javax.swing.JToolBar;
   import javax.swing.KeyStroke;
  +import org.hibernate.HibernateException;
   import org.hibernate.netbeans.console.BshCode;
   import org.hibernate.netbeans.console.Icons;
   import org.hibernate.netbeans.console.util.HibernateExecutor;
  @@ -56,6 +57,7 @@
   import org.hibernate.Session;
   import org.netbeans.api.progress.ProgressHandle;
   import org.netbeans.api.progress.ProgressHandleFactory;
  +import org.openide.util.Cancellable;
   import org.openide.util.Utilities;
   
   /**
  @@ -189,7 +191,16 @@
           final Session s = desc.getSession();
           HibernateExecutor.execute(new Runnable() {
               public void run() {
  -                ProgressHandle ph = ProgressHandleFactory.createHandle("Executing Query"); // TODO - i18n
  +                ProgressHandle ph = ProgressHandleFactory.createHandle("Executing Query", new Cancellable() {
  +                    public boolean cancel() {
  +                        try {
  +                            s.cancelQuery();
  +                        } catch (HibernateException ex) {
  +                            // Ignore it
  +                        }
  +                        return true;
  +                    }
  +                });
                   Thread currentThread = Thread.currentThread();
                   ClassLoader currentClassLoader = currentThread.getContextClassLoader();
                   boolean success = false;