update version numbers

streams

.launch/Build and deploy SCViewer.launch

@@ -9,7 +9,7 @@
     <listAttribute key="M2_PROPERTIES"/>
     <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
     <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-    <intAttribute key="M2_THREADS" value="1"/>
+    <intAttribute key="M2_THREADS" value="4"/>
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
     <stringAttribute key="M2_USER_SETTINGS" value=""/>
     <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>

doc/com.minres.scviewer.doc/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.19.0</version>
+		<version>2.19.4</version>
 		<relativePath>../..</relativePath>
 	</parent>
 

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

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

features/com.minres.scviewer.database.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>3.0.0-SNAPSHOT</version>

features/com.minres.scviewer.e4.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

features/com.minres.scviewer.e4.help.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.0.0-SNAPSHOT</version>

features/com.minres.scviewer.e4.platform.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.0.0-SNAPSHOT</version>

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

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

features/com.minres.scviewer.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="com.minres.scviewer.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="2.19.4"
       provider-name="%providerName">
 
    <description>
@@ -46,22 +46,14 @@ http://www.eclipse.org/legal/epl-v10.html
 
    <plugin
          id="org.junit"
-         download-size="0"
-         install-size="0"
          version="0.0.0"/>
 
    <plugin
          id="org.hamcrest.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
    <plugin
          id="com.minres.scviewer.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         version="0.0.0"/>
 
 </feature>

features/com.minres.scviewer.feature/pom.xml

@@ -5,8 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<relativePath>../..</relativePath>
   </parent>
-  <version>1.1.0-SNAPSHOT</version>
 </project>

features/com.minres.scviewer.ui.feature/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

plugins/com.minres.scviewer.database.fst/.classpath

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

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

@@ -4,7 +4,7 @@ Bundle-Name: FST signal database
 Bundle-SymbolicName: com.minres.scviewer.database.fst
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"

plugins/com.minres.scviewer.database.fst/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.19.0</version>
+		<version>2.19.4</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database.ftr/.classpath

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

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

@@ -2,9 +2,9 @@ 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.2.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.osgi.framework;version="1.3.0",
  org.slf4j;version="1.7.2"
 Require-Bundle: com.minres.scviewer.database,

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">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>com.minres.scviewer.database.ftr</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.19.0</version>
+		<version>2.19.4</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

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);
@@ -240,9 +239,9 @@ public class FtrDbLoader implements IWaveformDbLoader {
 					long startTime = cborDecoder.readInt()*time_scale_factor;
 					long endTime = cborDecoder.readInt()*time_scale_factor;
 					TxGenerator gen = txGenerators.get(genId);
-					FtrTx scvTx = new FtrTx(txId, gen.stream.getId(), genId, startTime, endTime, blockId, blockOffset);
+					TxStream stream = gen.stream;
+					FtrTx scvTx = new FtrTx(txId, stream.getId(), genId, startTime, endTime, blockId, blockOffset);
 					updateTransactions(txId, scvTx);
-					TxStream stream = txStreams.get(gen.stream.getId());
 					if (scvTx.beginTime == scvTx.endTime) {
 						stream.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime));
 						gen.addEvent(new TxEvent(this, EventKind.SINGLE, txId, scvTx.beginTime));
@@ -298,10 +297,10 @@ public class FtrDbLoader implements IWaveformDbLoader {
 				case 6: // id/generator/start/end
 					long len = cborDecoder.readArrayLength();
 					assert(len==4);
-					cborDecoder.readInt();
-					cborDecoder.readInt();
-					cborDecoder.readInt();
-					cborDecoder.readInt();
+					cborDecoder.readInt(); //txid
+					cborDecoder.readInt(); // genId
+					cborDecoder.readInt(); // startTime
+					cborDecoder.readInt(); // endTime
 					break;
 				default:  { // skip over 7:begin attr, 8:record attr, 9:end attr
 					long sz = cborDecoder.readArrayLength();

plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrTx.java

@@ -77,8 +77,8 @@ class FtrTx implements Serializable {
 	public List<ITxAttribute> getAttributes(FtrDbLoader loader) {
 		if(attributes.size()==0)
 			try {
-				TxStream stream = loader.txStreams.get(streamId);
-				byte[] chunk = stream.getChunks().get((int)blockId);
+				final TxStream stream = loader.txStreams.get(streamId);
+				final byte[] chunk = stream.getChunks().get((int)blockId);
 				attributes.addAll(loader.parseAtrributes(chunk, blockOffset));
 			} catch (InputFormatException e) {
 				// TODO Auto-generated catch block

plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/TxGenerator.java

@@ -65,12 +65,12 @@ class TxGenerator extends AbstractTxStream {
 	 */
 	@Override
 	public IEventList getEvents() {
-		if(events.size()==0) {
+		if(stream.events.size()==0) {
 			try {
 				List<byte[]> chunks = stream.getChunks();
 				int blockid = 0;
 				for (byte[] bs : chunks) {
-					loader.parseTx(stream, blockid, bs);
+					loader.parseTx(stream, blockid++, bs);
 				}
 			} catch (InputFormatException e) {
 				// TODO Auto-generated catch block

plugins/com.minres.scviewer.database.sqlite/.classpath

@@ -1,8 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="sqlite-jdbc-3.8.7.jar"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

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

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

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

@@ -4,7 +4,7 @@ Bundle-Name: SQLite transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.sqlite
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0"
 Bundle-ClassPath: .,sqlite-jdbc-3.8.7.jar
 Service-Component: OSGI-INF/component.xml

plugins/com.minres.scviewer.database.sqlite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database.text/.classpath

@@ -1,8 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="lib/mapdb-3.0.7.jar" sourcepath="lib/mapdb-3.0.7-sources.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:platform:/resource/com.minres.scviewer.database.text/lib/mapdb-3.0.7-javadoc.jar!/"/>
@@ -11,5 +20,10 @@
 	<classpathentry exported="true" kind="lib" path="lib/kotlin-stdlib-1.2.42.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lz4-1.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/elsa-3.0.0-M5.jar"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

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

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

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

@@ -4,7 +4,7 @@ Bundle-Name: Textual transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.text
 Bundle-Version: 4.0.1.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.osgi.framework;version="1.3.0"
 Require-Bundle: com.minres.scviewer.database,
  org.eclipse.osgi.services;bundle-version="3.4.0",

plugins/com.minres.scviewer.database.text/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.19.0</version>
+		<version>2.19.4</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database.ui.swt/.classpath

@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

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

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

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

@@ -4,7 +4,7 @@ Bundle-Name: SWT database widget
 Bundle-SymbolicName: com.minres.scviewer.database.ui.swt
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
  com.minres.scviewer.database;bundle-version="1.0.0",
  com.google.guava;bundle-version="15.0.0",

plugins/com.minres.scviewer.database.ui.swt/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>4.0.0-SNAPSHOT</version>

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java

@@ -84,7 +84,10 @@ public class ArrowPainter implements IPainter {
 	private int getConcurrencyIndex(ITx tx) {
 		IEvent[] eventList = tx.getStream().getEventsBeforeTime(tx.getBeginTime());
 		Optional<Integer> res = Arrays.stream(eventList).map(e -> ((ITxEvent)e).getRowIndex()).findFirst();
-		return res.isPresent()? res.get():0;
+		if(res.isPresent() && res.get()>0) {
+			return res.get();
+		} else 			
+			return 0;
 	}
 	
 	protected boolean calculateGeometries() {
@@ -98,8 +101,10 @@ public class ArrowPainter implements IPainter {
 			return true;
 		}
 		int laneHeight = painter.getHeight() / tx.getStream().getRowCount();
+		int laneOffset = laneHeight * getConcurrencyIndex(tx);
+		int rulerHeight = waveCanvas.rulerHeight;
 		txRectangle = new Rectangle((int) (tx.getBeginTime() / scaleFactor),
-				waveCanvas.rulerHeight + painter.getVerticalOffset() + laneHeight * getConcurrencyIndex(tx),
+				rulerHeight + painter.getVerticalOffset() + laneOffset,
 				(int) ((tx.getEndTime() - tx.getBeginTime()) / scaleFactor), laneHeight);
 		deriveGeom(tx.getIncomingRelations(), iRect, false);
 		deriveGeom(tx.getOutgoingRelations(), oRect, true);
@@ -114,12 +119,13 @@ public class ArrowPainter implements IPainter {
 					if (waveCanvas.wave2painterMap.containsKey(iWaveform)) {
 						IWaveformPainter painter = waveCanvas.wave2painterMap.get(iWaveform);
 						if(painter!=null) {
-							int height = waveCanvas.styleProvider.getTrackHeight();
+							int laneHeight = waveCanvas.styleProvider.getTrackHeight();
+							int laneOffset = laneHeight * getConcurrencyIndex(tx);
 							Rectangle bb = new Rectangle(
 									(int) (otherTx.getBeginTime() / scaleFactor),
-									waveCanvas.rulerHeight + painter.getVerticalOffset() + height * getConcurrencyIndex(otherTx),
+									waveCanvas.rulerHeight + painter.getVerticalOffset() + laneOffset,
 									(int) ((otherTx.getEndTime() - otherTx.getBeginTime()) / scaleFactor),
-									height);
+									laneHeight);
 							res.add(new LinkEntry(bb, iTxRelation.getRelationType()));				
 						}
 					}

plugins/com.minres.scviewer.database.vcd/.classpath

@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

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

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

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

@@ -4,7 +4,7 @@ Bundle-Name: VCD signal database
 Bundle-SymbolicName: com.minres.scviewer.database.vcd
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"

plugins/com.minres.scviewer.database.vcd/pom.xml

@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database/.classpath

@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/com.minres.scviewer.database/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

plugins/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs

@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -13,4 +13,4 @@ org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17

plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: Waveform database
 Bundle-SymbolicName: com.minres.scviewer.database
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: com.minres.scviewer.database,
  com.minres.scviewer.database.tx
 Import-Package: org.slf4j

plugins/com.minres.scviewer.database/pom.xml

@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java

@@ -15,10 +15,10 @@ import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,13 +44,13 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	private boolean loaded;
 
 	/** The relation types. */
-	private List<RelationType> relationTypes;
+	private List<RelationType> relationTypes = new ArrayList<>();;
 
 	/** The waveforms. */
-	private Map<String, IWaveform> waveforms;
+	private Map<String, IWaveform> waveforms = Collections.synchronizedMap(new HashMap<>()) ;;
 
 	/** The max time. */
-	private long maxTime = -1;
+	private long maxTime = 0L;
 	
 	private static final Logger LOG = LoggerFactory.getLogger(WaveformDb.class);
 	
@@ -81,16 +81,6 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 		return Collections.unmodifiableList(loaderFactories);
 	}
 
-	/**
-	 * Instantiates a new waveform db.
-	 */
-	public WaveformDb() {
-		super();
-		waveforms = new ConcurrentHashMap<>();
-		relationTypes = new ArrayList<>();
-		maxTime = 0L;
-	}
-
 	/**
 	 * Gets the max time.
 	 *
@@ -143,15 +133,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());
 			}
 		}

plugins/com.minres.scviewer.e4.application.help/.classpath

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

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.4
 Bundle-Vendor: MINRES Technologies GmbH
 Automatic-Module-Name: com.minres.scviewer.e4.application.help
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17

plugins/com.minres.scviewer.e4.application.help/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.19.0</version>
+		<version>2.19.4</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

plugins/com.minres.scviewer.e4.application/.classpath

@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

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.4
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.11.1",
@@ -40,7 +40,7 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.help.webapp;bundle-version="3.9.800",
  org.eclipse.help.base;bundle-version="4.2.900",
  com.minres.scviewer.e4.application.help;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: com.minres.scviewer.database,
  javax.annotation;version="1.0.0";resolution:=optional,
  javax.inject;version="1.0.0"

plugins/com.minres.scviewer.e4.application/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.19.0</version>
+		<version>2.19.4</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>

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<IWaveformDb>)input).get(0);

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionList.java

@@ -267,6 +267,7 @@ public class TransactionList extends Composite {
 						.map(e -> new AttributeNameBean(e.getKey(), e.getValue()))
 						.collect(Collectors.toList());
 				getDisplay().asyncExec(() -> {
+					if(tableViewer.getControl().isDisposed()) return;
 					tableViewer.setInput(txList);
 					attrNames.clear();
 					attrNames.addAll(newAttrNames);

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<String, String> 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()));
 			}
 		});
@@ -826,7 +828,18 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 				if(Boolean.parseBoolean(state.get(SHOWN_WAVEFORM + i + WAVEFORM_SELECTED)))
 					selectedTrackEntries.add(trackEntry);
 			} else {
-				IWaveform waveform = database.getStreamByName(state.get(SHOWN_WAVEFORM + i));
+				String name = state.get(SHOWN_WAVEFORM + i);
+				IWaveform waveform = database.getStreamByName(name);
+				if (waveform == null) {
+					int pos = name.lastIndexOf('.');
+					waveform = database.getStreamByName(name.substring(0, pos));
+					if(waveform!=null) {
+						List<IHierNode> childs = waveform.getChildNodes();
+						waveform = (IWaveform) childs.stream().filter(node -> name.substring(pos+1).equals(node.getName()))
+						  .findAny()
+						  .orElse(null);
+					}
+				}
 				if (waveform != null) {
 					TrackEntry trackEntry = waveformPane.addWaveform(waveform, -1);
 					//check if t is selected

plugins/com.minres.scviewer.ui/.classpath

@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

plugins/com.minres.scviewer.ui/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF

@@ -18,7 +18,7 @@ Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
  org.eclipse.osgi,
  org.eclipse.core.expressions;bundle-version="3.4.600",
  org.eclipse.jface
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.common.collect
 Service-Component: OSGI-INF/component.xml

plugins/com.minres.scviewer.ui/pom.xml

@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.minres.scviewer</groupId>
 	<artifactId>com.minres.scviewer.parent</artifactId>
-	<version>2.19.0</version>
+	<version>2.19.4</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>releng/com.minres.scviewer.target</module>
@@ -71,13 +71,13 @@
 						<artifact>
 							<groupId>com.minres.scviewer</groupId>
 							<artifactId>com.minres.scviewer.target</artifactId>
-							<version>2.19.0</version>
+							<version>2.19.4</version>
 						</artifact>
 					</target>
 					<executionEnvironment>
-						org.eclipse.justj.openjdk.hotspot.jre.minimal-15</executionEnvironment>
+						org.eclipse.justj.openjdk.hotspot.jre.minimal-17</executionEnvironment>
 					<executionEnvironmentDefault>
-						org.eclipse.justj.openjdk.hotspot.jre.minimal-15</executionEnvironmentDefault>
+						org.eclipse.justj.openjdk.hotspot.jre.minimal-17</executionEnvironmentDefault>
 					<includePackedArtifacts>true</includePackedArtifacts>
 					<environments>
 						<environment>

products/com.minres.scviewer.e4.product/pom.xml

@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.19.0</version>
+		<version>2.19.4</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>

products/com.minres.scviewer.e4.product/scviewer.product

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.19.0" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.19.4" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
@@ -34,9 +34,9 @@
    </launcher>
 
    <vm>
-      <linux include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
-      <macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
-      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
+      <linux include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
+      <macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</macos>
+      <windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
    </vm>
 
    <license>

releng/com.minres.scviewer.target/com.minres.scviewer.target.target

@@ -36,7 +36,7 @@
 		<unit id="org.eclipse.collections.feature.source.feature.group" version="0.0.0"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://download.eclipse.org/justj/jres/15/updates/release/latest"/>
+		<repository location="https://download.eclipse.org/justj/jres/17/updates/release/latest"/>
 		<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">

releng/com.minres.scviewer.target/pom.xml

@@ -12,7 +12,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.19.0</version>
+  	<version>2.19.4</version>
   	<relativePath>../..</relativePath>
   </parent>
 

releng/com.minres.scviewer.updateSite/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.19.0</version>
+		<version>2.19.4</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<build>

releng/com.minres.scviewer.updateSite/src/main/resources/web/site.xsl

@@ -5,11 +5,11 @@
 <xsl:for-each select="site">
 	<html>
 	<head>
-	<title>com.itjw.txviewer.updateSite</title>
+	<title>com.minres.scviewer.updateSite</title>
 	<style>@import url("web/site.css");</style>
 	</head>
 	<body>
-	<h1 class="title">com.itjw.txviewer.updateSite</h1>
+	<h1 class="title">com.minres.scviewer.updateSite</h1>
 	<p class="bodyText"><xsl:value-of select="description"/></p>
 	<table width="100%" border="0" cellspacing="1" cellpadding="2">
 	<xsl:for-each select="category-def">

tests/com.minres.scviewer.database.test/.classpath

@@ -1,10 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
-			<attribute name="test" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

tests/com.minres.scviewer.database.test/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: SCViewer database tests
 Bundle-SymbolicName: com.minres.scviewer.database.test
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: com.minres.scviewer.database,
  com.minres.scviewer.database.sqlite;bundle-version="1.0.0",
  com.minres.scviewer.database.text;bundle-version="1.0.0",

tests/com.minres.scviewer.database.test/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.19.0</version>
+		<version>2.19.4</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-test-plugin</packaging>