diff --git a/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF b/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
index ec23be5..60eaf87 100644
--- a/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Sqlite transaction database
+Bundle-Name: SQLite transaction database
Bundle-SymbolicName: com.minres.scviewer.database.sqlite
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: MINRES Technologies GmbH
diff --git a/com.minres.scviewer.feature/feature.xml b/com.minres.scviewer.feature/feature.xml
index e040765..73a9b1e 100644
--- a/com.minres.scviewer.feature/feature.xml
+++ b/com.minres.scviewer.feature/feature.xml
@@ -12,7 +12,10 @@ a SQLite based recording as well as the built-in text base recording.
Copyright (c) 2015 MINRES Technologies GmbH.
-All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0 which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
diff --git a/com.minres.scviewer.ui/.classpath b/com.minres.scviewer.ui/.classpath
index 9dc0b5c..cdd848a 100644
--- a/com.minres.scviewer.ui/.classpath
+++ b/com.minres.scviewer.ui/.classpath
@@ -4,6 +4,5 @@
-
diff --git a/com.minres.scviewer.ui/META-INF/MANIFEST.MF b/com.minres.scviewer.ui/META-INF/MANIFEST.MF
index b26eeb6..39d3f04 100644
--- a/com.minres.scviewer.ui/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Graph
Bundle-SymbolicName: com.minres.scviewer.ui;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: com.minres.scviewer.ui.TxEditorPlugin
-Bundle-Vendor: ITJW
+Bundle-Vendor: MINRES Technologies GmbH
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.jface.text,
diff --git a/com.minres.scviewer.ui/icons/sample.gif b/com.minres.scviewer.ui/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
Binary files a/com.minres.scviewer.ui/icons/sample.gif and /dev/null differ
diff --git a/com.minres.scviewer.ui/icons/scviewer.gif b/com.minres.scviewer.ui/icons/scviewer.gif
new file mode 100644
index 0000000..229a663
Binary files /dev/null and b/com.minres.scviewer.ui/icons/scviewer.gif differ
diff --git a/com.minres.scviewer.ui/plugin.xml b/com.minres.scviewer.ui/plugin.xml
index 1874abb..646f2dc 100644
--- a/com.minres.scviewer.ui/plugin.xml
+++ b/com.minres.scviewer.ui/plugin.xml
@@ -21,7 +21,8 @@
class="com.minres.scviewer.ui.TxEditorPart"
contributorClass="com.minres.scviewer.ui.TxEditorActionBarContributor"
extensions="txdb"
- icon="icons/sample.gif"
+ filenames="*.txdb,*.txlog"
+ icon="icons/scviewer.gif"
id="com.minres.scviewer.ui.TxEditorPart"
name="Wave Viewer">
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
index 734b056..5a35437 100644
--- a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
+++ b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
@@ -136,10 +136,10 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
}
}
}
- } catch (InvalidSyntaxException e) {
+ } catch (Exception e) {
}
MessageDialog.openError(PlatformUI.getWorkbench().getDisplay().getActiveShell(),
- "Error loading database", "Could not find database loader implementation");
+ "Error loading database", "Could not find an usable and applicable database loader implementation");
database=null;
// if(TxEditorPlugin.getDefault().getTransactionDbFactory()!=null){
// database = TxEditorPlugin.getDefault().getTransactionDbFactory().createDatabase();
diff --git a/scv_tr_sqlite/.gitignore b/scv_tr_sqlite/.gitignore
index 2fc424a..307509b 100644
--- a/scv_tr_sqlite/.gitignore
+++ b/scv_tr_sqlite/.gitignore
@@ -1,3 +1,3 @@
/Debug/
-/my_db.log
-/my_db.tx
+/*.txlog
+/*.txdb
diff --git a/scv_tr_sqlite/src/scv_tr_sqlite.cpp b/scv_tr_sqlite/src/scv_tr_sqlite.cpp
index 1417755..d0a1a8b 100644
--- a/scv_tr_sqlite/src/scv_tr_sqlite.cpp
+++ b/scv_tr_sqlite/src/scv_tr_sqlite.cpp
@@ -81,16 +81,16 @@ typedef scv_extensions_if::data_type data_type;
static void dbCb(const scv_tr_db& _scv_tr_db, scv_tr_db::callback_reason reason, void* data) {
// This is called from the scv_tr_db ctor.
- static string my_sqlite_file_name("DEFAULT_scv_tr_sqlite");
+ static string fName("DEFAULT_scv_tr_sqlite");
switch (reason) {
case scv_tr_db::CREATE:
- if ((_scv_tr_db.get_name() != NULL) && (strlen(_scv_tr_db.get_name()) != 0)) {
- my_sqlite_file_name = _scv_tr_db.get_name();
- }
+ if ((_scv_tr_db.get_name() != NULL) && (strlen(_scv_tr_db.get_name()) != 0))
+ fName = _scv_tr_db.get_name();
try {
- my_sqlite_file_name+=".tx";
- remove(my_sqlite_file_name.c_str());
- db.open(my_sqlite_file_name.c_str());
+ if(fName.size()<5 || fName.find(".txdb", fName.size() - 5) == string::npos)
+ fName+=".txdb";
+ remove(fName.c_str());
+ db.open(fName.c_str());
// scv_out << "TB Transaction Recording has started, file = " << my_sqlite_file_name << endl;
db.exec("CREATE TABLE IF NOT EXISTS " STREAM_TABLE "(id INTEGER NOT NULL PRIMARY KEY, name TEXT, kind TEXT);");
db.exec("CREATE TABLE IF NOT EXISTS " GENERATOR_TABLE "(id INTEGER NOT NULL PRIMARY KEY, stream INTEGER REFERENCES " STREAM_TABLE "(id), name TEXT, begin_attr INTEGER, end_attr INTEGER);");