#103184 Additional support for Creator user settings migration cnd-repair-20070530
authorjbaker@netbeans.org
Thu, 24 May 2007 20:18:06 +0000
changeset 818e199125253c1
parent 817 b2e7ab638cae
child 819 90a20ddaca52
#103184 Additional support for Creator user settings migration

preparation for this task.
For now, don't remove the userdir setting , $userdir/config/[userdir release #]/context.xml
visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DatabaseSettingsImporter.java
     1.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DatabaseSettingsImporter.java	Thu May 24 19:41:13 2007 +0000
     1.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DatabaseSettingsImporter.java	Thu May 24 20:18:06 2007 +0000
     1.3 @@ -267,15 +267,7 @@
     1.4                          ConnectionManager.getDefault().addConnection(dbconn);
     1.5                      }
     1.6                  }
     1.7 -            }
     1.8 -            
     1.9 -            // Cleanup
    1.10 -            if (contextFile.exists()) {
    1.11 -                contextFile.delete();
    1.12 -                contextFile.getParentFile().delete();
    1.13 -            }
    1.14 -            
    1.15 -            //            dataSources = null;
    1.16 +            }                        
    1.17          } catch (DatabaseException de) {
    1.18              ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, de);
    1.19          }
    1.20 @@ -432,15 +424,7 @@
    1.21                  }
    1.22              }
    1.23          });
    1.24 -    }
    1.25 -    
    1.26 -    //     public void removeFromDSInfo(int index) {
    1.27 -    //         dataSourcesInfo.remove(index);
    1.28 -    //     }
    1.29 -    //
    1.30 -    //     public void clearDSInfo() {
    1.31 -    //         dataSourcesInfo = null;
    1.32 -    //     }
    1.33 +    }      
    1.34      
    1.35      public ArrayList <DataSourceInfo> getDataSourcesInfo() {
    1.36          return dataSourcesInfo;