Merge of changes made in IFS svn between svn export and now.
authorChristian L?vsund <chrislovsund@netbeans.org>
Tue, 27 Sep 2011 09:54:06 +0200
changeset 27edd622f3717d
parent 26 c0f359bcd2fa
child 28 431314cb731e
child 29 ae70f75de2c3
Merge of changes made in IFS svn between svn export and now.
Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/DatabaseConnectionManager.java
Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/DatabaseContentUtilities.java
Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/DatabaseParseUtilities.java
     1.1 --- a/Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/DatabaseConnectionManager.java	Tue Sep 27 09:52:58 2011 +0200
     1.2 +++ b/Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/DatabaseConnectionManager.java	Tue Sep 27 09:54:06 2011 +0200
     1.3 @@ -301,7 +301,7 @@
     1.4                  }
     1.5              }
     1.6              logger.log(Level.FINEST, "Creating new connection. Total number of connections created={0}", ++connectionCount);
     1.7 -            return DatabaseConnection.create(templateConnection.getJDBCDriver(), templateConnection.getDatabaseURL(), templateConnection.getUser(), templateConnection.getSchema(), templateConnection.getPassword(), true);
     1.8 +            return DatabaseConnection.create(templateConnection.getJDBCDriver(), templateConnection.getDatabaseURL(), templateConnection.getUser(), templateConnection.getSchema(), templateConnection.getPassword(), true, templateConnection.getDisplayName());
     1.9          }
    1.10      }
    1.11  
    1.12 @@ -532,7 +532,7 @@
    1.13              if (!online) {
    1.14                  //ConnectionManager.getDefault().disconnect(templateConnection);
    1.15                  //reset the connection
    1.16 -                templateConnection = DatabaseConnection.create(templateConnection.getJDBCDriver(), templateConnection.getDatabaseURL(), templateConnection.getUser(), templateConnection.getSchema(), templateConnection.getPassword(), true);
    1.17 +                templateConnection = DatabaseConnection.create(templateConnection.getJDBCDriver(), templateConnection.getDatabaseURL(), templateConnection.getUser(), templateConnection.getSchema(), templateConnection.getPassword(), true, templateConnection.getDisplayName());
    1.18                  clearConnectionPool();
    1.19                  this.debugConnection = null;
    1.20                  DatabaseConnection[] oldConnections = new DatabaseConnection[connections.length];
     2.1 --- a/Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/DatabaseContentUtilities.java	Tue Sep 27 09:52:58 2011 +0200
     2.2 +++ b/Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/DatabaseContentUtilities.java	Tue Sep 27 09:54:06 2011 +0200
     2.3 @@ -1507,7 +1507,7 @@
     2.4                 List<String> objList = new ArrayList<String>();
     2.5                 ResultSet objSet = null;
     2.6  
     2.7 -               String query = "SELECT to_char(FILE_TIME_STAMP, 'yyyy-MM-dd HH:mm:ss') FROM FNDBAS_MODEL_OBJECT_TAB A WHERE OBJECT_TYPE = ? AND OBJECT_NAME= ?";
     2.8 +               String query = "SELECT FILE_TIME_STAMP FROM FNDBAS_MODEL_OBJECT_TAB A WHERE OBJECT_TYPE = ? AND OBJECT_NAME= ?";
     2.9                 PreparedStatement stmt = null;
    2.10                 try {
    2.11                    stmt = connection.getJDBCConnection().prepareStatement(query);
     3.1 --- a/Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/DatabaseParseUtilities.java	Tue Sep 27 09:52:58 2011 +0200
     3.2 +++ b/Utilities/Oracle/src/org/netbeans/modules/plsqlsupport/db/DatabaseParseUtilities.java	Tue Sep 27 09:54:06 2011 +0200
     3.3 @@ -47,6 +47,9 @@
     3.4  
     3.5  public class DatabaseParseUtilities {
     3.6  
     3.7 +    private DatabaseParseUtilities() { } //singleton
     3.8 +    
     3.9 +       
    3.10      private static void addItem(Map<String, String> result, String line) {
    3.11          int index = line.lastIndexOf(' ');
    3.12          if (index == -1) {