Skip to content

Commit 97d6062

Browse files
committed
Merge branch 'release/2.19.4'
2 parents 7af8b73 + 92428a3 commit 97d6062

File tree

62 files changed

+175
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+175
-99
lines changed

Diff for: .launch/Build and deploy SCViewer.launch

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<listAttribute key="M2_PROPERTIES"/>
1010
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
1111
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
12-
<intAttribute key="M2_THREADS" value="1"/>
12+
<intAttribute key="M2_THREADS" value="4"/>
1313
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
1414
<stringAttribute key="M2_USER_SETTINGS" value=""/>
1515
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>

Diff for: doc/com.minres.scviewer.doc/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.minres.scviewer</groupId>
99
<artifactId>com.minres.scviewer.parent</artifactId>
10-
<version>2.19.3</version>
10+
<version>2.19.4</version>
1111
<relativePath>../..</relativePath>
1212
</parent>
1313

Diff for: features/com.minres.scviewer.database.feature/.settings/org.eclipse.core.resources.prefs

-2
This file was deleted.

Diff for: features/com.minres.scviewer.database.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.minres.scviewer</groupId>
77
<artifactId>com.minres.scviewer.parent</artifactId>
8-
<version>2.19.3</version>
8+
<version>2.19.4</version>
99
<relativePath>../..</relativePath>
1010
</parent>
1111
<version>3.0.0-SNAPSHOT</version>

Diff for: features/com.minres.scviewer.e4.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.minres.scviewer</groupId>
77
<artifactId>com.minres.scviewer.parent</artifactId>
8-
<version>2.19.3</version>
8+
<version>2.19.4</version>
99
<relativePath>../..</relativePath>
1010
</parent>
1111
<version>1.1.0-SNAPSHOT</version>

Diff for: features/com.minres.scviewer.e4.help.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.minres.scviewer</groupId>
77
<artifactId>com.minres.scviewer.parent</artifactId>
8-
<version>2.19.3</version>
8+
<version>2.19.4</version>
99
<relativePath>../..</relativePath>
1010
</parent>
1111
<version>1.0.0-SNAPSHOT</version>

Diff for: features/com.minres.scviewer.e4.platform.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.minres.scviewer</groupId>
77
<artifactId>com.minres.scviewer.parent</artifactId>
8-
<version>2.19.3</version>
8+
<version>2.19.4</version>
99
<relativePath>../..</relativePath>
1010
</parent>
1111
<version>1.0.0-SNAPSHOT</version>

Diff for: features/com.minres.scviewer.feature/.settings/org.eclipse.core.resources.prefs

-2
This file was deleted.

Diff for: features/com.minres.scviewer.feature/feature.xml

+3-11
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="com.minres.scviewer.feature"
44
label="%featureName"
5-
version="1.1.0.qualifier"
5+
version="2.19.4"
66
provider-name="%providerName">
77

88
<description>
@@ -46,22 +46,14 @@ http://www.eclipse.org/legal/epl-v10.html
4646

4747
<plugin
4848
id="org.junit"
49-
download-size="0"
50-
install-size="0"
5149
version="0.0.0"/>
5250

5351
<plugin
5452
id="org.hamcrest.core"
55-
download-size="0"
56-
install-size="0"
57-
version="0.0.0"
58-
unpack="false"/>
53+
version="0.0.0"/>
5954

6055
<plugin
6156
id="com.minres.scviewer.ui"
62-
download-size="0"
63-
install-size="0"
64-
version="0.0.0"
65-
unpack="false"/>
57+
version="0.0.0"/>
6658

6759
</feature>

Diff for: features/com.minres.scviewer.feature/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
<parent>
66
<groupId>com.minres.scviewer</groupId>
77
<artifactId>com.minres.scviewer.parent</artifactId>
8-
<version>2.19.3</version>
8+
<version>2.19.4</version>
99
<relativePath>../..</relativePath>
1010
</parent>
11-
<version>1.1.0-SNAPSHOT</version>
1211
</project>

Diff for: features/com.minres.scviewer.ui.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.minres.scviewer</groupId>
77
<artifactId>com.minres.scviewer.parent</artifactId>
8-
<version>2.19.3</version>
8+
<version>2.19.4</version>
99
<relativePath>../..</relativePath>
1010
</parent>
1111
<version>1.1.0-SNAPSHOT</version>

Diff for: plugins/com.minres.scviewer.database.fst/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
44
<attributes>
55
<attribute name="module" value="true"/>
66
</attributes>

Diff for: plugins/com.minres.scviewer.database.fst/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: FST signal database
44
Bundle-SymbolicName: com.minres.scviewer.database.fst
55
Bundle-Version: 1.0.0.qualifier
66
Bundle-Vendor: MINRES Technologies GmbH
7-
Bundle-RequiredExecutionEnvironment: JavaSE-11
7+
Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
99
org.eclipse.osgi.services;bundle-version="3.4.0",
1010
com.google.guava;bundle-version="15.0.0"

Diff for: plugins/com.minres.scviewer.database.fst/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.minres.scviewer</groupId>
88
<artifactId>com.minres.scviewer.parent</artifactId>
9-
<version>2.19.3</version>
9+
<version>2.19.4</version>
1010
<relativePath>../..</relativePath>
1111
</parent>
1212
<packaging>eclipse-plugin</packaging>

Diff for: plugins/com.minres.scviewer.database.ftr/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
44
<attributes>
55
<attribute name="module" value="true"/>
66
</attributes>

Diff for: plugins/com.minres.scviewer.database.ftr/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: CBOR transaction database
44
Bundle-SymbolicName: com.minres.scviewer.database.ftr
55
Bundle-Version: 1.0.2.qualifier
66
Bundle-Vendor: MINRES Technologies GmbH
7-
Bundle-RequiredExecutionEnvironment: JavaSE-11
7+
Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Import-Package: org.osgi.framework;version="1.3.0",
99
org.slf4j;version="1.7.2"
1010
Require-Bundle: com.minres.scviewer.database,

Diff for: plugins/com.minres.scviewer.database.ftr/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.minres.scviewer</groupId>
88
<artifactId>com.minres.scviewer.parent</artifactId>
9-
<version>2.19.3</version>
9+
<version>2.19.4</version>
1010
<relativePath>../..</relativePath>
1111
</parent>
1212
<packaging>eclipse-plugin</packaging>

Diff for: plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ void parseTx(TxStream txStream, long blockId, byte[] chunk) throws IOException {
239239
long startTime = cborDecoder.readInt()*time_scale_factor;
240240
long endTime = cborDecoder.readInt()*time_scale_factor;
241241
TxGenerator gen = txGenerators.get(genId);
242-
FtrTx scvTx = new FtrTx(txId, gen.stream.getId(), genId, startTime, endTime, blockId, blockOffset);
242+
TxStream stream = gen.stream;
243+
FtrTx scvTx = new FtrTx(txId, stream.getId(), genId, startTime, endTime, blockId, blockOffset);
243244
updateTransactions(txId, scvTx);
244-
TxStream stream = txStreams.get(gen.stream.getId());
245245
if (scvTx.beginTime == scvTx.endTime) {
246246
stream.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime));
247247
gen.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime));

Diff for: plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public boolean isSame(IWaveform other) {
6565
*/
6666
@Override
6767
public IEventList getEvents() {
68-
if(events.size()==0) {
68+
if(stream.events.size()==0) {
6969
try {
7070
List<byte[]> chunks = stream.getChunks();
7171
int blockid = 0;
+16-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
4+
<attributes>
5+
<attribute name="maven.pomderived" value="true"/>
6+
</attributes>
7+
</classpathentry>
48
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src"/>
9+
<classpathentry kind="src" output="target/classes" path="src">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
615
<classpathentry exported="true" kind="lib" path="sqlite-jdbc-3.8.7.jar"/>
16+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
17+
<attributes>
18+
<attribute name="maven.pomderived" value="true"/>
19+
</attributes>
20+
</classpathentry>
721
<classpathentry kind="output" path="target/classes"/>
822
</classpath>

Diff for: plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.core.resources.prefs

-2
This file was deleted.

Diff for: plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: SQLite transaction database
44
Bundle-SymbolicName: com.minres.scviewer.database.sqlite
55
Bundle-Version: 1.1.0.qualifier
66
Bundle-Vendor: MINRES Technologies GmbH
7-
Bundle-RequiredExecutionEnvironment: JavaSE-11
7+
Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0"
99
Bundle-ClassPath: .,sqlite-jdbc-3.8.7.jar
1010
Service-Component: OSGI-INF/component.xml

Diff for: plugins/com.minres.scviewer.database.sqlite/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.minres.scviewer</groupId>
66
<artifactId>com.minres.scviewer.parent</artifactId>
7-
<version>2.19.3</version>
7+
<version>2.19.4</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<packaging>eclipse-plugin</packaging>

Diff for: plugins/com.minres.scviewer.database.text/.classpath

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
4+
<attributes>
5+
<attribute name="maven.pomderived" value="true"/>
6+
</attributes>
7+
</classpathentry>
48
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src/"/>
9+
<classpathentry kind="src" output="target/classes" path="src">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
615
<classpathentry exported="true" kind="lib" path="lib/mapdb-3.0.7.jar" sourcepath="lib/mapdb-3.0.7-sources.jar">
716
<attributes>
817
<attribute name="javadoc_location" value="jar:platform:/resource/com.minres.scviewer.database.text/lib/mapdb-3.0.7-javadoc.jar!/"/>
@@ -11,5 +20,10 @@
1120
<classpathentry exported="true" kind="lib" path="lib/kotlin-stdlib-1.2.42.jar"/>
1221
<classpathentry exported="true" kind="lib" path="lib/lz4-1.3.0.jar"/>
1322
<classpathentry exported="true" kind="lib" path="lib/elsa-3.0.0-M5.jar"/>
23+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
24+
<attributes>
25+
<attribute name="maven.pomderived" value="true"/>
26+
</attributes>
27+
</classpathentry>
1428
<classpathentry kind="output" path="target/classes"/>
1529
</classpath>

Diff for: plugins/com.minres.scviewer.database.text/.settings/org.eclipse.core.resources.prefs

-2
This file was deleted.

Diff for: plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: Textual transaction database
44
Bundle-SymbolicName: com.minres.scviewer.database.text
55
Bundle-Version: 4.0.1.qualifier
66
Bundle-Vendor: MINRES Technologies GmbH
7-
Bundle-RequiredExecutionEnvironment: JavaSE-11
7+
Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Import-Package: org.osgi.framework;version="1.3.0"
99
Require-Bundle: com.minres.scviewer.database,
1010
org.eclipse.osgi.services;bundle-version="3.4.0",

Diff for: plugins/com.minres.scviewer.database.text/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.minres.scviewer</groupId>
88
<artifactId>com.minres.scviewer.parent</artifactId>
9-
<version>2.19.3</version>
9+
<version>2.19.4</version>
1010
<relativePath>../..</relativePath>
1111
</parent>
1212
<packaging>eclipse-plugin</packaging>
+16-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
4+
<attributes>
5+
<attribute name="maven.pomderived" value="true"/>
6+
</attributes>
7+
</classpathentry>
48
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src"/>
9+
<classpathentry kind="src" output="target/classes" path="src">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
620
<classpathentry kind="output" path="target/classes"/>
721
</classpath>

Diff for: plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.core.resources.prefs

-2
This file was deleted.

Diff for: plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: SWT database widget
44
Bundle-SymbolicName: com.minres.scviewer.database.ui.swt
55
Bundle-Version: 4.0.0.qualifier
66
Bundle-Vendor: MINRES Technologies GmbH
7-
Bundle-RequiredExecutionEnvironment: JavaSE-11
7+
Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
99
com.minres.scviewer.database;bundle-version="1.0.0",
1010
com.google.guava;bundle-version="15.0.0",

Diff for: plugins/com.minres.scviewer.database.ui.swt/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.minres.scviewer</groupId>
77
<artifactId>com.minres.scviewer.parent</artifactId>
8-
<version>2.19.3</version>
8+
<version>2.19.4</version>
99
<relativePath>../..</relativePath>
1010
</parent>
1111
<version>4.0.0-SNAPSHOT</version>

Diff for: plugins/com.minres.scviewer.database.vcd/.classpath

+16-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
4+
<attributes>
5+
<attribute name="maven.pomderived" value="true"/>
6+
</attributes>
7+
</classpathentry>
48
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5-
<classpathentry kind="src" path="src"/>
9+
<classpathentry kind="src" output="target/classes" path="src">
10+
<attributes>
11+
<attribute name="optional" value="true"/>
12+
<attribute name="maven.pomderived" value="true"/>
13+
</attributes>
14+
</classpathentry>
15+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
16+
<attributes>
17+
<attribute name="maven.pomderived" value="true"/>
18+
</attributes>
19+
</classpathentry>
620
<classpathentry kind="output" path="target/classes"/>
721
</classpath>

Diff for: plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.core.resources.prefs

-2
This file was deleted.

Diff for: plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-Name: VCD signal database
44
Bundle-SymbolicName: com.minres.scviewer.database.vcd
55
Bundle-Version: 4.0.0.qualifier
66
Bundle-Vendor: MINRES Technologies GmbH
7-
Bundle-RequiredExecutionEnvironment: JavaSE-11
7+
Bundle-RequiredExecutionEnvironment: JavaSE-17
88
Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
99
org.eclipse.osgi.services;bundle-version="3.4.0",
1010
com.google.guava;bundle-version="15.0.0"

Diff for: plugins/com.minres.scviewer.database.vcd/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.minres.scviewer</groupId>
77
<artifactId>com.minres.scviewer.parent</artifactId>
8-
<version>2.19.3</version>
8+
<version>2.19.4</version>
99
<relativePath>../..</relativePath>
1010
</parent>
1111
<packaging>eclipse-plugin</packaging>

Diff for: plugins/com.minres.scviewer.database/.classpath

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
44
<attributes>
55
<attribute name="module" value="true"/>
6+
<attribute name="maven.pomderived" value="true"/>
67
</attributes>
78
</classpathentry>
89
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
9-
<classpathentry kind="src" path="src"/>
10+
<classpathentry kind="src" output="target/classes" path="src">
11+
<attributes>
12+
<attribute name="optional" value="true"/>
13+
<attribute name="maven.pomderived" value="true"/>
14+
</attributes>
15+
</classpathentry>
16+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
17+
<attributes>
18+
<attribute name="maven.pomderived" value="true"/>
19+
</attributes>
20+
</classpathentry>
1021
<classpathentry kind="output" path="target/classes"/>
1122
</classpath>

0 commit comments

Comments
 (0)