Close an sql execution window when the db connection is gone => error release701
authorSubhashini Sooriarachchi <subslk@netbeans.org>
Thu, 24 May 2012 10:13:43 +0530
branchrelease701
changeset 229c0a56e4dd133
parent 228 e2e717f9d9f7
child 230 b13b428b953d
Close an sql execution window when the db connection is gone => error
PLSQL/FileType/src/org/netbeans/modules/plsql/filetype/PlsqlEditor.java
     1.1 --- a/PLSQL/FileType/src/org/netbeans/modules/plsql/filetype/PlsqlEditor.java	Thu May 24 10:09:05 2012 +0530
     1.2 +++ b/PLSQL/FileType/src/org/netbeans/modules/plsql/filetype/PlsqlEditor.java	Thu May 24 10:13:43 2012 +0530
     1.3 @@ -90,21 +90,22 @@
     1.4             if (connection.getJDBCConnection() != null) {
     1.5  
     1.6                 DatabaseConnectionManager connectionProvider = DatabaseConnectionManager.getInstance(dataObject);
     1.7 -
     1.8 -               if (DatabaseConnectionManager.getInstance(dataObject).hasDataToCommit(connection)) {
     1.9 -                   String msg = "There are pending transactions in the database. Do you want to commit?";
    1.10 -                   String title = dataObject.getNodeDelegate().getDisplayName();
    1.11 -                   int result = JOptionPane.showOptionDialog(null, msg, title, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, null, null);
    1.12 -                   if (result == JOptionPane.YES_OPTION) {
    1.13 -                       //commit
    1.14 -                       connectionProvider.commitRollbackTransactions(connection, true);
    1.15 -                   } else if (result == JOptionPane.NO_OPTION) {
    1.16 -                       //rollback
    1.17 -                       connectionProvider.commitRollbackTransactions(connection, false);
    1.18 -                   } else {
    1.19 -                       return false;
    1.20 +               if(connectionProvider.testConnection(connection)){
    1.21 +                   if (DatabaseConnectionManager.getInstance(dataObject).hasDataToCommit(connection)) {
    1.22 +                       String msg = "There are pending transactions in the database. Do you want to commit?";
    1.23 +                       String title = dataObject.getNodeDelegate().getDisplayName();
    1.24 +                       int result = JOptionPane.showOptionDialog(null, msg, title, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, null, null);
    1.25 +                       if (result == JOptionPane.YES_OPTION) {
    1.26 +                           //commit
    1.27 +                           connectionProvider.commitRollbackTransactions(connection, true);
    1.28 +                       } else if (result == JOptionPane.NO_OPTION) {
    1.29 +                           //rollback
    1.30 +                           connectionProvider.commitRollbackTransactions(connection, false);
    1.31 +                       } else {
    1.32 +                           return false;
    1.33 +                       }
    1.34                     }
    1.35 -               }
    1.36 +               } 
    1.37             }
    1.38             FileUtil.toFile(dataObject.getPrimaryFile()).delete();
    1.39         }