diff --git a/doc/com.minres.scviewer.doc/pom.xml b/doc/com.minres.scviewer.doc/pom.xml index a8af533..337b296 100644 --- a/doc/com.minres.scviewer.doc/pom.xml +++ b/doc/com.minres.scviewer.doc/pom.xml @@ -7,7 +7,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. diff --git a/features/com.minres.scviewer.database.feature/pom.xml b/features/com.minres.scviewer.database.feature/pom.xml index f9ae1a4..b6a2489 100644 --- a/features/com.minres.scviewer.database.feature/pom.xml +++ b/features/com.minres.scviewer.database.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. 3.0.0-SNAPSHOT diff --git a/features/com.minres.scviewer.e4.feature/pom.xml b/features/com.minres.scviewer.e4.feature/pom.xml index b8fd56a..e1c0cf3 100644 --- a/features/com.minres.scviewer.e4.feature/pom.xml +++ b/features/com.minres.scviewer.e4.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. 1.1.0-SNAPSHOT diff --git a/features/com.minres.scviewer.e4.help.feature/pom.xml b/features/com.minres.scviewer.e4.help.feature/pom.xml index db16f9c..58a2925 100644 --- a/features/com.minres.scviewer.e4.help.feature/pom.xml +++ b/features/com.minres.scviewer.e4.help.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. 1.0.0-SNAPSHOT diff --git a/features/com.minres.scviewer.e4.platform.feature/pom.xml b/features/com.minres.scviewer.e4.platform.feature/pom.xml index 0628e30..d102ca8 100644 --- a/features/com.minres.scviewer.e4.platform.feature/pom.xml +++ b/features/com.minres.scviewer.e4.platform.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. 1.0.0-SNAPSHOT diff --git a/features/com.minres.scviewer.feature/pom.xml b/features/com.minres.scviewer.feature/pom.xml index c2dd0fd..53095cb 100644 --- a/features/com.minres.scviewer.feature/pom.xml +++ b/features/com.minres.scviewer.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. 1.1.0-SNAPSHOT diff --git a/features/com.minres.scviewer.ui.feature/pom.xml b/features/com.minres.scviewer.ui.feature/pom.xml index d3b9d13..191984b 100644 --- a/features/com.minres.scviewer.ui.feature/pom.xml +++ b/features/com.minres.scviewer.ui.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. 1.1.0-SNAPSHOT diff --git a/plugins/com.minres.scviewer.database.fst/pom.xml b/plugins/com.minres.scviewer.database.fst/pom.xml index 7ec4749..33fec8c 100644 --- a/plugins/com.minres.scviewer.database.fst/pom.xml +++ b/plugins/com.minres.scviewer.database.fst/pom.xml @@ -6,7 +6,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database.ftr/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.ftr/META-INF/MANIFEST.MF index a517a3d..716ed8c 100644 --- a/plugins/com.minres.scviewer.database.ftr/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.database.ftr/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: CBOR transaction database Bundle-SymbolicName: com.minres.scviewer.database.ftr -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.1.qualifier Bundle-Vendor: MINRES Technologies GmbH Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.osgi.framework;version="1.3.0", diff --git a/plugins/com.minres.scviewer.database.ftr/pom.xml b/plugins/com.minres.scviewer.database.ftr/pom.xml index 15a4bae..1166209 100644 --- a/plugins/com.minres.scviewer.database.ftr/pom.xml +++ b/plugins/com.minres.scviewer.database.ftr/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.minres.scviewer.database.ftr - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java index a68dbb4..c65c702 100644 --- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java +++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java @@ -178,7 +178,6 @@ public class FtrDbLoader implements IWaveformDbLoader { */ @Override public void load(File file) throws InputFormatException { - dispose(); this.file=file; try { fis = new FileInputStream(file); diff --git a/plugins/com.minres.scviewer.database.sqlite/pom.xml b/plugins/com.minres.scviewer.database.sqlite/pom.xml index 2eac89d..8609dfd 100644 --- a/plugins/com.minres.scviewer.database.sqlite/pom.xml +++ b/plugins/com.minres.scviewer.database.sqlite/pom.xml @@ -4,7 +4,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database.text/pom.xml b/plugins/com.minres.scviewer.database.text/pom.xml index 72d9939..9cbb16a 100644 --- a/plugins/com.minres.scviewer.database.text/pom.xml +++ b/plugins/com.minres.scviewer.database.text/pom.xml @@ -6,7 +6,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database.ui.swt/pom.xml b/plugins/com.minres.scviewer.database.ui.swt/pom.xml index 218180c..2254faa 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/pom.xml +++ b/plugins/com.minres.scviewer.database.ui.swt/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. 4.0.0-SNAPSHOT diff --git a/plugins/com.minres.scviewer.database.vcd/pom.xml b/plugins/com.minres.scviewer.database.vcd/pom.xml index 71af497..54d151b 100644 --- a/plugins/com.minres.scviewer.database.vcd/pom.xml +++ b/plugins/com.minres.scviewer.database.vcd/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database/pom.xml b/plugins/com.minres.scviewer.database/pom.xml index 9ad8cfd..685c136 100644 --- a/plugins/com.minres.scviewer.database/pom.xml +++ b/plugins/com.minres.scviewer.database/pom.xml @@ -4,7 +4,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java index 023c713..c7f30d2 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java @@ -143,15 +143,15 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL retval=false; } loader.removePropertyChangeListener(this); - for (IWaveform w : loader.getAllWaves()) { - waveforms.put(w.getFullName(), w); - } +// for (IWaveform w : loader.getAllWaves()) { +// waveforms.put(w.getFullName(), w); +// } if (loader.getMaxTime() > maxTime) { maxTime = loader.getMaxTime(); } if (name == null) name = getFileBasename(inp.getName()); - buildHierarchyNodes(); + //buildHierarchyNodes(); relationTypes.addAll(loader.getAllRelationTypes()); } } diff --git a/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF index 7daccd5..5583a45 100644 --- a/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: SCViewer Help Bundle-SymbolicName: com.minres.scviewer.e4.application.help;singleton:=true -Bundle-Version: 2.19.0 +Bundle-Version: 2.19.1 Bundle-Vendor: MINRES Technologies GmbH Automatic-Module-Name: com.minres.scviewer.e4.application.help Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/plugins/com.minres.scviewer.e4.application.help/pom.xml b/plugins/com.minres.scviewer.e4.application.help/pom.xml index e042d88..865e301 100644 --- a/plugins/com.minres.scviewer.e4.application.help/pom.xml +++ b/plugins/com.minres.scviewer.e4.application.help/pom.xml @@ -6,7 +6,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF index 1cbdf89..fbe509a 100644 --- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.minres.scviewer.e4.application;singleton:=true -Bundle-Version: 2.19.0 +Bundle-Version: 2.19.1 Bundle-Vendor: %Bundle-Vendor Require-Bundle: javax.inject;bundle-version="1.0.0", org.eclipse.core.runtime;bundle-version="3.11.1", diff --git a/plugins/com.minres.scviewer.e4.application/pom.xml b/plugins/com.minres.scviewer.e4.application/pom.xml index 05a3499..0b8f988 100644 --- a/plugins/com.minres.scviewer.e4.application/pom.xml +++ b/plugins/com.minres.scviewer.e4.application/pom.xml @@ -6,7 +6,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java index b01b1da..a224c12 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java @@ -366,10 +366,14 @@ public class DesignBrowser { } } - @SuppressWarnings("unchecked") public void setWaveformViewer(WaveformViewer waveformViewerPart) { this.waveformViewerPart=waveformViewerPart; IWaveformDb database = waveformViewerPart.getDatabase(); + setWaveformDb(database); + } + + @SuppressWarnings("unchecked") + public void setWaveformDb(IWaveformDb database) { Object input = treeViewer.getInput(); if(input instanceof List){ IWaveformDb db = ((List)input).get(0); diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java index 5d6ba8a..a0e5489 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java @@ -176,7 +176,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis /** The factory. */ WaveformViewFactory factory = new WaveformViewFactory(); - DesignBrowser browser = null; + DesignBrowser designBrowser = null; TransactionDetails detailsView = null; @@ -206,8 +206,6 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis IEclipsePreferences store = null; - @Inject @Optional DesignBrowser designBrowser; - /** The database. */ private IWaveformDb database; @@ -295,7 +293,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis middleSash.setWeights(new int[] {75, 25}); ctx.set(Composite.class, left); - browser = ContextInjectionFactory.make(DesignBrowser.class, ctx); + designBrowser = ContextInjectionFactory.make(DesignBrowser.class, ctx); ctx.set(Composite.class, right); detailsView = ContextInjectionFactory.make(TransactionDetails.class, ctx); @@ -623,6 +621,8 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis loadState(partConfig); if (state != null && !state.isEmpty()) restoreWaveformViewerState(state); + if(designBrowser!=null) + designBrowser.setWaveformDb(database); fileChecker = null; if (checkForUpdates) fileChecker = fileMonitor.addFileChangeListener(WaveformViewer.this, filesToLoad, FILE_CHECK_INTERVAL); @@ -654,9 +654,11 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis Map state = new HashMap<>(); saveWaveformViewerState(state); waveformPane.getStreamList().clear(); + if(database.isLoaded()) + database.close(); database = dbFactory.getDatabase(); database.addPropertyChangeListener(evt -> { - if (IHierNode.WAVEFORMS.equals(evt.getPropertyName())) { //$NON-NLS-1$ + if (IHierNode.WAVEFORMS.equals(evt.getPropertyName()) || IHierNode.LOADING_FINISHED.equals(evt.getPropertyName())) { //$NON-NLS-1$ myParent.getDisplay().syncExec(() -> waveformPane.setMaxTime(database.getMaxTime())); } }); diff --git a/plugins/com.minres.scviewer.ui/pom.xml b/plugins/com.minres.scviewer.ui/pom.xml index b9d1f5c..77cc2b6 100644 --- a/plugins/com.minres.scviewer.ui/pom.xml +++ b/plugins/com.minres.scviewer.ui/pom.xml @@ -4,7 +4,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. eclipse-plugin diff --git a/pom.xml b/pom.xml index 8754121..6e23e8c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 pom releng/com.minres.scviewer.target @@ -71,13 +71,13 @@ com.minres.scviewer com.minres.scviewer.target - 2.19.0 + 2.19.1 - org.eclipse.justj.openjdk.hotspot.jre.minimal-15 + org.eclipse.justj.openjdk.hotspot.jre.minimal-17 - org.eclipse.justj.openjdk.hotspot.jre.minimal-15 + org.eclipse.justj.openjdk.hotspot.jre.minimal-17 true diff --git a/products/com.minres.scviewer.e4.product/pom.xml b/products/com.minres.scviewer.e4.product/pom.xml index 9b7d727..254371a 100644 --- a/products/com.minres.scviewer.e4.product/pom.xml +++ b/products/com.minres.scviewer.e4.product/pom.xml @@ -6,11 +6,11 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. com.minres.scviewer.e4.product - 2.19.0 + 2.19.1 eclipse-repository com.minres.scviewer diff --git a/products/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product index 839590f..7ce5205 100644 --- a/products/com.minres.scviewer.e4.product/scviewer.product +++ b/products/com.minres.scviewer.e4.product/scviewer.product @@ -1,7 +1,7 @@ - + @@ -34,7 +34,7 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 diff --git a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target index a8e4b18..101cb67 100644 --- a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target +++ b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target @@ -36,7 +36,7 @@ - + diff --git a/releng/com.minres.scviewer.target/pom.xml b/releng/com.minres.scviewer.target/pom.xml index 9c683f1..a18529c 100644 --- a/releng/com.minres.scviewer.target/pom.xml +++ b/releng/com.minres.scviewer.target/pom.xml @@ -12,7 +12,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. diff --git a/releng/com.minres.scviewer.updateSite/pom.xml b/releng/com.minres.scviewer.updateSite/pom.xml index 98d70a7..f743142 100644 --- a/releng/com.minres.scviewer.updateSite/pom.xml +++ b/releng/com.minres.scviewer.updateSite/pom.xml @@ -7,7 +7,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. diff --git a/releng/com.minres.scviewer.updateSite/src/main/resources/web/site.xsl b/releng/com.minres.scviewer.updateSite/src/main/resources/web/site.xsl index f459714..96486ba 100644 --- a/releng/com.minres.scviewer.updateSite/src/main/resources/web/site.xsl +++ b/releng/com.minres.scviewer.updateSite/src/main/resources/web/site.xsl @@ -5,11 +5,11 @@ - com.itjw.txviewer.updateSite + com.minres.scviewer.updateSite -

com.itjw.txviewer.updateSite

+

com.minres.scviewer.updateSite

diff --git a/tests/com.minres.scviewer.database.test/inputs/test.0.fst b/tests/com.minres.scviewer.database.test/inputs/test.0.fst new file mode 100755 index 0000000..cf1e318 Binary files /dev/null and b/tests/com.minres.scviewer.database.test/inputs/test.0.fst differ diff --git a/tests/com.minres.scviewer.database.test/inputs/test.0.ftr b/tests/com.minres.scviewer.database.test/inputs/test.0.ftr new file mode 100755 index 0000000..9707319 Binary files /dev/null and b/tests/com.minres.scviewer.database.test/inputs/test.0.ftr differ diff --git a/tests/com.minres.scviewer.database.test/inputs/test.fst b/tests/com.minres.scviewer.database.test/inputs/test.fst new file mode 100644 index 0000000..6796911 Binary files /dev/null and b/tests/com.minres.scviewer.database.test/inputs/test.fst differ diff --git a/tests/com.minres.scviewer.database.test/pom.xml b/tests/com.minres.scviewer.database.test/pom.xml index ac9e79f..6ef3963 100644 --- a/tests/com.minres.scviewer.database.test/pom.xml +++ b/tests/com.minres.scviewer.database.test/pom.xml @@ -6,7 +6,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.0 + 2.19.1 ../.. eclipse-test-plugin