mirror/Jailer
1
0
Fork 0
mirror of https://github.com/Wisser/Jailer.git synced 2026-02-21 10:18:32 -06:00
Code Issues Packages Projects Releases 102 Wiki Activity

renamed demo databases

Browse Source 
git-svn-id: https://svn.code.sf.net/p/jailer/code/trunk@900 3dd849cd-670e-4645-a7cd-dd197c8d0e81
This commit is contained in:
rwisser
2011-11-28 07:17:25 +00:00
parent da03003609
commit 4c764ce57c
5 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
admin/demo.h2.db → admin/demo-scott.h2.db
View File

BIN
demo-sakila.h2.db Normal file
View File

Binary file not shown.

0
demo.h2.db → demo-scott.h2.db
View File

1
src/main/net/sf/jailer/ui/DataModelManagerDialog.java
View File

@@ -539,6 +539,7 @@ public abstract class DataModelManagerDialog extends javax.swing.JFrame {
private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
hasSelectedModel = false;
setVisible(false);
dispose();
}//GEN-LAST:event_jButton2ActionPerformed
private void analyzeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_analyzeButtonActionPerformed

22
src/main/net/sf/jailer/ui/DbConnectionDialog.java
View File

@@ -342,6 +342,7 @@ public class DbConnectionDialog extends javax.swing.JDialog {
connectionList = new ArrayList<ConnectionInfo>();
currentConnection = null;
boolean ok = false;
boolean preV4 = true;
try {
File file = new File(CONNECTIONS_FILE);
@@ -354,8 +355,9 @@ public class DbConnectionDialog extends javax.swing.JDialog {
for (int n = 0; n < dma.size(); ++n) {
cis.get(n).dataModelFolder = dma.get(n);
}
preV4 = false;
} catch (Throwable t) {
// ignore. pre 3.8 files do not contain data model assignments.
// ignore. pre 4.0 files do not contain data model assignments.
}
in.close();
connectionList = cis;
@@ -398,13 +400,25 @@ public class DbConnectionDialog extends javax.swing.JDialog {
}
if (connectionList.size() == 0) {
ConnectionInfo ci = new ConnectionInfo();
ci.alias = applicationName + "DemoDatabase";
ci.alias = "Demo Scott";
ci.driverClass = "org.h2.Driver";
ci.jar1 = "lib" + File.separator + "h2-1.3.160.jar";
ci.url = "jdbc:h2:demo";
ci.url = "jdbc:h2:demo-scott";
ci.user = "sa";
ci.password = "";
ci.dataModelFolder = "Demo";
ci.dataModelFolder = "Demo-Scott";
connectionList.add(ci);
store();
}
if (preV4) {
ConnectionInfo ci = new ConnectionInfo();
ci.alias = "Demo Sakila";
ci.driverClass = "org.h2.Driver";
ci.jar1 = "lib" + File.separator + "h2-1.3.160.jar";
ci.url = "jdbc:h2:demo-sakila";
ci.user = "sa";
ci.password = "";
ci.dataModelFolder = "Demo-Sakila";
connectionList.add(ci);
store();
}