From fce1bdb1e78548604a109866d11c47b216d82327 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 14 Oct 2017 20:46:22 +0200 Subject: [PATCH 1/2] Fixed parsing bug --- .../com/minres/scviewer/database/text/TextDbLoader.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy index 2cc5045..fc6bf7e 100644 --- a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy +++ b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy @@ -183,9 +183,11 @@ public class TextDbLoader implements IWaveformDbLoader{ break case "a"://matcher = line =~ /^a\s+(.+)$/ if(endTransaction){ - transaction.attributes << new TxAttribute(transaction.generator.end_attrs[0], tokens[1]) + transaction.attributes << new TxAttribute(transaction.generator.end_attrs[transaction.generator.end_attrs_idx], tokens[1]) + transaction.generator.end_attrs_idx++ } else { - transaction.attributes << new TxAttribute(transaction.generator.begin_attrs[0], tokens[1]) + transaction.attributes << new TxAttribute(transaction.generator.begin_attrs[transaction.generator.begin_attrs_idx], tokens[1]) + transaction.generator.begin_attrs_idx++ } break case "tx_relation"://matcher = line =~ /^tx_relation\s+\"(\S+)\"\s+(\d+)\s+(\d+)$/ From cdde384ed3ae8599946ec6260346d5a88d79ca77 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 14 Oct 2017 20:48:25 +0200 Subject: [PATCH 2/2] Updated version numbers --- com.minres.scviewer.database.text/META-INF/MANIFEST.MF | 2 +- com.minres.scviewer.database.text/pom.xml | 3 ++- .../src/com/minres/scviewer/e4/application/messages.properties | 2 +- com.minres.scviewer.e4.product/pom.xml | 2 +- com.minres.scviewer.e4.product/scviewer.product | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF index 9d71d4d..d2d630f 100644 --- a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Textual transaction database Bundle-SymbolicName: com.minres.scviewer.database.text -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.1.qualifier Bundle-Vendor: MINRES Technologies GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.minres.scviewer.database, diff --git a/com.minres.scviewer.database.text/pom.xml b/com.minres.scviewer.database.text/pom.xml index fe1a9e7..5f4fe8f 100644 --- a/com.minres.scviewer.database.text/pom.xml +++ b/com.minres.scviewer.database.text/pom.xml @@ -39,4 +39,5 @@ - \ No newline at end of file + 1.0.1-SNAPSHOT + \ No newline at end of file diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties index 95c44b4..7848715 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties @@ -1,4 +1,4 @@ -AboutDialog_0=\nSCViewer - a SystemC waveform viewer\n\nVersion: 1.2\n +AboutDialog_0=\nSCViewer - a SystemC waveform viewer\n\nVersion: 1.2.2\n AboutDialog_1=\nCopyright (c) 2015,2016,2017 MINRES Technologies GmbH and others.\n\nAll rights reserved. MINRES and the MINRES logo are trademarks of MINRES Technologies GmbH, http://www.minres.com/. 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\n\nParts of the software are governed by the Apache License Version 2.0 available at http://www.apache.org/licenses/. These are namely org.apache.jdbm and org.sqlite JDBC driver\n\nSources code is hosted at GitHub: https://github.com/minres/SCViewer\n DesignBrowser_12=Append all after DesignBrowser_16=Insert all before diff --git a/com.minres.scviewer.e4.product/pom.xml b/com.minres.scviewer.e4.product/pom.xml index 9aaba3d..9dd82b9 100644 --- a/com.minres.scviewer.e4.product/pom.xml +++ b/com.minres.scviewer.e4.product/pom.xml @@ -10,7 +10,7 @@ ../com.minres.scviewer.parent com.minres.scviewer.e4.product - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT eclipse-repository com.minres.scviewer diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product index 423a65b..630f22a 100644 --- a/com.minres.scviewer.e4.product/scviewer.product +++ b/com.minres.scviewer.e4.product/scviewer.product @@ -1,7 +1,7 @@ - +