Merge branch 'feature/generater_as_stream' into develop

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

@@ -12,7 +12,7 @@ text base recording.
    </description>
 
    <copyright>
-      Copyright (c) 2015 MINRES Technologies GmbH.
+      Copyright (c) 2015-2021 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 

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

@@ -12,7 +12,7 @@ built-in text base recording.
    </description>
 
    <copyright>
-      Copyright (c) 2015 MINRES Technologies GmbH.
+      Copyright (c) 2015-2021 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 

plugins/com.minres.scviewer.database.sqlite/build.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2014, 2015 MINRES Technologies GmbH and others.
+# Copyright (c) 2014, 2015-2021 MINRES Technologies GmbH and others.
 # 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java

@@ -0,0 +1,129 @@
+/*******************************************************************************
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
+ * 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
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
+package com.minres.scviewer.database.sqlite;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import com.minres.scviewer.database.EventKind;
+import com.minres.scviewer.database.HierNode;
+import com.minres.scviewer.database.IEvent;
+import com.minres.scviewer.database.IWaveform;
+import com.minres.scviewer.database.RelationType;
+import com.minres.scviewer.database.RelationTypeFactory;
+import com.minres.scviewer.database.WaveformType;
+import com.minres.scviewer.database.sqlite.db.IDatabase;
+import com.minres.scviewer.database.tx.ITx;
+
+abstract class AbstractTxStream extends HierNode implements IWaveform {
+
+	protected IDatabase database;
+
+	private long streamId;
+	
+	private Integer maxConcurrency;
+
+	private TreeMap<Long, IEvent[]> events;
+
+	private List<RelationType> usedRelationsList;
+
+	public AbstractTxStream(IDatabase database, String name, long streamId) {
+		super(name);
+		this.database=database;
+		this.streamId=streamId;
+	}
+
+	@Override
+	public int getWidth() {
+		if(maxConcurrency==null){
+			StringBuilder sb = new StringBuilder();
+			sb.append("SELECT MAX(concurrencyLevel) as concurrencyLevel FROM ScvTx where stream=");
+			sb.append(streamId);
+			try(
+					java.sql.Connection connection = database.createConnection();
+					java.sql.Statement statement = connection.createStatement();
+					java.sql.ResultSet resultSet = statement.executeQuery(sb.toString());
+					) {
+				while (resultSet.next()) {
+					if(maxConcurrency==null) maxConcurrency=0;
+					Object value = resultSet.getObject("concurrencyLevel");
+					if(value!=null)
+						maxConcurrency=(Integer) value;
+				}
+			} catch (SQLException e) {
+				if(maxConcurrency==null) maxConcurrency=0;
+			}
+			maxConcurrency+=1;
+		}
+		return maxConcurrency;
+	}
+
+	@Override
+	public  NavigableMap<Long, IEvent[]> getEvents(){
+		if(events==null){
+			events=new TreeMap<>();
+			for(Entry<Integer, ITx> entry:getTransactions().entrySet()){
+				putEvent(new TxEvent(EventKind.BEGIN, entry.getValue()));
+				putEvent(new TxEvent(EventKind.END, entry.getValue()));
+			}	
+		}
+		return events;
+	}
+
+	private void putEvent(TxEvent ev){
+		Long time = ev.getTime();
+		if(events.containsKey(time)) {
+			IEvent[] oldV = events.get(time);
+			IEvent[] newV = new IEvent[oldV.length+1];
+			System.arraycopy(oldV, 0, newV, 0, oldV.length);
+			newV[oldV.length]=ev;
+			events.put(time, newV);
+		} else {
+			events.put(time, new IEvent[] {ev});
+		}
+	}
+
+	protected abstract Map<Integer, ITx> getTransactions();
+
+	@Override
+	public IEvent[] getEventsAtTime(Long time) {
+		return getEvents().get(time);
+	}
+
+	public void setRelationTypeList(List<RelationType> usedRelationsList){
+		this.usedRelationsList=usedRelationsList;
+	}
+
+	public RelationType getRelationType(String name) {
+		RelationType relType=RelationTypeFactory.create(name);
+		if(!usedRelationsList.contains(relType)) usedRelationsList.add(relType);
+		return relType;
+	}
+
+	@Override
+	public IEvent[] getEventsBeforeTime(Long time) {
+		Entry<Long, IEvent[]> e = events.floorEntry(time);
+		if(e==null)
+			return new IEvent[]{};
+		else
+			return  events.floorEntry(time).getValue();
+	}
+
+	@Override
+	public WaveformType getType() {
+		return WaveformType.TRANSACTION;
+	}
+
+}

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxAttribute.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -10,19 +10,33 @@
  *******************************************************************************/
 package com.minres.scviewer.database.sqlite;
 
+import java.beans.IntrospectionException;
+import java.lang.reflect.InvocationTargetException;
+import java.sql.SQLException;
+import java.util.Map;
+import java.util.TreeMap;
+
 import com.minres.scviewer.database.IWaveform;
+import com.minres.scviewer.database.sqlite.db.IDatabase;
+import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler;
 import com.minres.scviewer.database.sqlite.tables.ScvGenerator;
+import com.minres.scviewer.database.sqlite.tables.ScvTx;
+import com.minres.scviewer.database.tx.ITx;
 import com.minres.scviewer.database.tx.ITxGenerator;
 
-public class TxGenerator implements ITxGenerator {
+public class TxGenerator extends AbstractTxStream implements ITxGenerator {
 
-	private IWaveform  stream;
+	private TxStream  stream;
 	
 	private ScvGenerator scvGenerator;
 
-	public TxGenerator(IWaveform stream, ScvGenerator scvGenerator) {
+	private TreeMap<Integer, ITx> transactions;
+
+	public TxGenerator(IDatabase database, TxStream stream, ScvGenerator scvGenerator) {
+		super(database, scvGenerator.getName(), stream.getId());
 		this.stream=stream;
 		this.scvGenerator=scvGenerator;
+		stream.addChild(this);
 	}
 
 	@Override
@@ -40,4 +54,32 @@ public class TxGenerator implements ITxGenerator {
 		return scvGenerator.getName();
 	}
 
+	@Override
+	public boolean isSame(IWaveform other) {
+		return(other instanceof TxGenerator && this.getId().equals(other.getId()));
+	}
+
+	@Override
+	public String getKind() {
+		return stream.getKind();
+	}
+
+	@Override
+	protected Map<Integer, ITx> getTransactions() {
+		if(transactions==null){
+			transactions = new TreeMap<>();
+			SQLiteDatabaseSelectHandler<ScvTx> handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class, database,
+					"stream="+stream.getId()+" and generator="+scvGenerator.getId());
+			try {
+				for(ScvTx scvTx:handler.selectObjects()){
+					transactions.put(scvTx.getId(), new Tx(database, (TxStream) stream, this, scvTx));
+				}
+			} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
+					| InvocationTargetException | SQLException | IntrospectionException e) {
+				e.printStackTrace();
+			}
+		}
+		return transactions;
+	}
+
 }

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxRelation.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -16,17 +16,10 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
 import java.util.TreeMap;
 
-import com.minres.scviewer.database.EventKind;
-import com.minres.scviewer.database.HierNode;
 import com.minres.scviewer.database.IEvent;
 import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.RelationType;
-import com.minres.scviewer.database.RelationTypeFactory;
-import com.minres.scviewer.database.WaveformType;
 import com.minres.scviewer.database.sqlite.db.IDatabase;
 import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler;
 import com.minres.scviewer.database.sqlite.tables.ScvGenerator;
@@ -35,9 +28,7 @@ import com.minres.scviewer.database.sqlite.tables.ScvTx;
 import com.minres.scviewer.database.tx.ITx;
 import com.minres.scviewer.database.tx.ITxGenerator;
 
-public class TxStream extends HierNode implements IWaveform {
+public class TxStream extends AbstractTxStream {
-
-	private IDatabase database;
 
 	private String fullName;
 
@@ -47,15 +38,8 @@ public class TxStream extends HierNode implements IWaveform {
 
 	private TreeMap<Integer, ITx> transactions;
 
-	private Integer maxConcurrency;
-
-	private TreeMap<Long, IEvent[]> events;
-
-	private List<RelationType> usedRelationsList;
-
 	public TxStream(IDatabase database, ScvStream scvStream) {
-		super(scvStream.getName());
+		super(database, scvStream.getName(), scvStream.getId());
-		this.database=database;
 		fullName=scvStream.getName();
 		this.scvStream=scvStream;
 	}
@@ -77,7 +61,7 @@ public class TxStream extends HierNode implements IWaveform {
 			generators=new TreeMap<>();
 			try {
 				for(ScvGenerator scvGenerator:handler.selectObjects()){
-					generators.put(scvGenerator.getId(), new TxGenerator(this, scvGenerator));
+					generators.put(scvGenerator.getId(), new TxGenerator(database, this, scvGenerator));
 				}
 			} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
 					| InvocationTargetException | SQLException | IntrospectionException e) {
@@ -87,56 +71,6 @@ public class TxStream extends HierNode implements IWaveform {
 		return new ArrayList<>(generators.values());
 	}
 
-	@Override
-	public int getWidth() {
-		if(maxConcurrency==null){
-			StringBuilder sb = new StringBuilder();
-			sb.append("SELECT MAX(concurrencyLevel) as concurrencyLevel FROM ScvTx where stream=");
-			sb.append(scvStream.getId());
-			try(
-					java.sql.Connection connection = database.createConnection();
-					java.sql.Statement statement = connection.createStatement();
-					java.sql.ResultSet resultSet = statement.executeQuery(sb.toString());
-					) {
-				while (resultSet.next()) {
-					if(maxConcurrency==null) maxConcurrency=0;
-					Object value = resultSet.getObject("concurrencyLevel");
-					if(value!=null)
-						maxConcurrency=(Integer) value;
-				}
-			} catch (SQLException e) {
-				if(maxConcurrency==null) maxConcurrency=0;
-			}
-			maxConcurrency+=1;
-		}
-		return maxConcurrency;
-	}
-
-	@Override
-	public  NavigableMap<Long, IEvent[]> getEvents(){
-		if(events==null){
-			events=new TreeMap<>();
-			for(Entry<Integer, ITx> entry:getTransactions().entrySet()){
-				putEvent(new TxEvent(EventKind.BEGIN, entry.getValue()));
-				putEvent(new TxEvent(EventKind.END, entry.getValue()));
-			}	
-		}
-		return events;
-	}
-
-	private void putEvent(TxEvent ev){
-		Long time = ev.getTime();
-		if(events.containsKey(time)) {
-			IEvent[] oldV = events.get(time);
-			IEvent[] newV = new IEvent[oldV.length+1];
-			System.arraycopy(oldV, 0, newV, 0, oldV.length);
-			newV[oldV.length]=ev;
-			events.put(time, newV);
-		} else {
-			events.put(time, new IEvent[] {ev});
-		}
-	}
-
 	protected Map<Integer, ITx> getTransactions() {
 		if(transactions==null){
 			if(generators==null) getGenerators();
@@ -160,33 +94,13 @@ public class TxStream extends HierNode implements IWaveform {
 		return getEvents().get(time);
 	}
 
-	public void setRelationTypeList(List<RelationType> usedRelationsList){
-		this.usedRelationsList=usedRelationsList;
-	}
-
-	public RelationType getRelationType(String name) {
-		RelationType relType=RelationTypeFactory.create(name);
-		if(!usedRelationsList.contains(relType)) usedRelationsList.add(relType);
-		return relType;
-	}
-
 	@Override
 	public boolean isSame(IWaveform other) {
 		return(other instanceof TxStream && this.getId().equals(other.getId()));
 	}
 
 	@Override
-	public IEvent[] getEventsBeforeTime(Long time) {
+	public String getKind() {
-		Entry<Long, IEvent[]> e = events.floorEntry(time);
+		return scvStream.getKind();
-		if(e==null)
-			return new IEvent[]{};
-		else
-			return  events.floorEntry(time).getValue();
 	}
-
-	@Override
-	public WaveformType getType() {
-		return WaveformType.TRANSACTION;
-	}
-
 }

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/AbstractDatabaseHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/IDatabase.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabase.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseInsertHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseSelectHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -77,7 +77,6 @@ public class SQLiteDatabaseSelectHandler<T> extends AbstractDatabaseHandler<T> {
 	 * @throws InvocationTargetException
 	 */
 	public synchronized List<T> selectObjects() throws SQLException,
-			SecurityException, IllegalArgumentException,
 			InstantiationException, IllegalAccessException,
 			IntrospectionException, InvocationTargetException {
 
@@ -116,12 +115,11 @@ public class SQLiteDatabaseSelectHandler<T> extends AbstractDatabaseHandler<T> {
 	 * @throws InvocationTargetException
 	 */
 	private List<T> createObjects(ResultSet resultSet)
-			throws SecurityException, IllegalArgumentException,
+			throws SQLException, InstantiationException,
-			SQLException, InstantiationException,
 			IllegalAccessException, IntrospectionException,
 			InvocationTargetException {
 
-		List<T> list = new ArrayList<T>();
+		List<T> list = new ArrayList<>();
 
 		while (resultSet.next()) {
 

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvGenerator.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvSimProps.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvStream.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTx.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxAttribute.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxEvent.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxRelation.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.text/build.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2014, 2015 MINRES Technologies GmbH and others.
+# Copyright (c) 2014, 2015-2021 MINRES Technologies GmbH and others.
 # 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

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java

@@ -0,0 +1,159 @@
+/*******************************************************************************
+ * Copyright (c) 2012 IT Just working
+ * Copyright (c) 2020 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
+ *
+ * Contributors:
+ *     IT Just working - initial API and implementation
+ *******************************************************************************/
+package com.minres.scviewer.database.text;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Map.Entry;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import com.minres.scviewer.database.EventKind;
+import com.minres.scviewer.database.HierNode;
+import com.minres.scviewer.database.IEvent;
+import com.minres.scviewer.database.IWaveform;
+import com.minres.scviewer.database.WaveformType;
+import com.minres.scviewer.database.tx.ITxEvent;
+
+/**
+ * The Class AbstractTxStream.
+ */
+abstract class AbstractTxStream extends HierNode implements IWaveform {
+
+	/** The id. */
+	private Long id;
+
+	/** The loader. */
+	protected TextDbLoader loader;
+
+	/** The events. */
+	TreeMap<Long, IEvent[]> events = new TreeMap<>();
+
+	/** The concurrency calculated. */
+	boolean concurrencyCalculated = false;
+
+	/**
+	 * Instantiates a new abstract tx stream.
+	 *
+	 * @param loader the loader
+	 * @param id     the id
+	 * @param name   the name
+	 */
+	public AbstractTxStream(TextDbLoader loader, Long id, String name) {
+		super(name);
+		this.loader = loader;
+		this.id = id;
+	}
+
+	/**
+	 * Adds the event.
+	 *
+	 * @param evt the evt
+	 */
+	public void addEvent(ITxEvent evt) {
+		if (!events.containsKey(evt.getTime()))
+			events.put(evt.getTime(), new IEvent[] { evt });
+		else {
+			IEvent[] evts = events.get(evt.getTime());
+			IEvent[] newEvts = Arrays.copyOf(evts, evts.length + 1);
+			newEvts[evts.length] = evt;
+			events.put(evt.getTime(), newEvts);
+		}
+	}
+
+	/**
+	 * Gets the events.
+	 *
+	 * @return the events
+	 */
+	@Override
+	public NavigableMap<Long, IEvent[]> getEvents() {
+		if (!concurrencyCalculated)
+			calculateConcurrency();
+		return events;
+	}
+
+	/**
+	 * Gets the events at time.
+	 *
+	 * @param time the time
+	 * @return the events at time
+	 */
+	@Override
+	public IEvent[] getEventsAtTime(Long time) {
+		if (!concurrencyCalculated)
+			calculateConcurrency();
+		return events.get(time);
+	}
+
+	/**
+	 * Gets the events before time.
+	 *
+	 * @param time the time
+	 * @return the events before time
+	 */
+	@Override
+	public IEvent[] getEventsBeforeTime(Long time) {
+		if (!concurrencyCalculated)
+			calculateConcurrency();
+		Entry<Long, IEvent[]> e = events.floorEntry(time);
+		if (e == null)
+			return new IEvent[] {};
+		else
+			return events.floorEntry(time).getValue();
+	}
+
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
+	@Override
+	public WaveformType getType() {
+		return WaveformType.TRANSACTION;
+	}
+
+	/**
+	 * Gets the id.
+	 *
+	 * @return the id
+	 */
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	/**
+	 * Calculate concurrency.
+	 */
+	synchronized void calculateConcurrency() {
+		if (concurrencyCalculated)
+			return;
+		ArrayList<Long> rowendtime = new ArrayList<>();
+		events.entrySet().stream().forEach(entry -> {
+			IEvent[] values = entry.getValue();
+			Arrays.asList(values).stream().filter(e -> e.getKind() == EventKind.BEGIN).forEach(evt -> {
+				Tx tx = (Tx) ((TxEvent) evt).getTransaction();
+				int rowIdx = 0;
+				for (; rowIdx < rowendtime.size() && rowendtime.get(rowIdx) > tx.getBeginTime(); rowIdx++)
+					;
+				if (rowendtime.size() <= rowIdx)
+					rowendtime.add(tx.getEndTime());
+				else
+					rowendtime.set(rowIdx, tx.getEndTime());
+				tx.setConcurrencyIndex(rowIdx);
+			});
+		});
+		concurrencyCalculated = true;
+	}
+
+}

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/ScvRelation.java

@@ -1,21 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2020 MINRES Technologies GmbH and others.
+ * 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
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
 package com.minres.scviewer.database.text;
 
 import java.io.Serializable;
 
 import com.minres.scviewer.database.RelationType;
 
-class ScvRelation implements Serializable {
 /**
-	 * 
+ * The Class ScvRelation.
  */
+class ScvRelation implements Serializable {
+
+	/** The Constant serialVersionUID. */
 	private static final long serialVersionUID = -347668857680574140L;
 
+	/** The source. */
 	final long source;
 
+	/** The target. */
 	final long target;
 
+	/** The relation type. */
 	final RelationType relationType;
 
+	/**
+	 * Instantiates a new scv relation.
+	 *
+	 * @param relationType the relation type
+	 * @param source       the source
+	 * @param target       the target
+	 */
 	public ScvRelation(RelationType relationType, long source, long target) {
 		this.source = source;
 		this.target = target;

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/ScvTx.java

@@ -1,5 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2012 IT Just working.
+ * Copyright (c) 2020 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
@@ -16,25 +17,40 @@ import java.util.List;
 
 import com.minres.scviewer.database.tx.ITxAttribute;
 
+/**
+ * The Class ScvTx.
+ */
 class ScvTx implements Serializable {
 
-	/**
+	/** The Constant serialVersionUID. */
-	 * 
-	 */
 	private static final long serialVersionUID = -855200240003328221L;
 
+	/** The id. */
 	final long id;
 
+	/** The generator id. */
 	final long generatorId;
 
+	/** The stream id. */
 	final long streamId;
 
+	/** The begin time. */
 	long beginTime;
 
+	/** The end time. */
 	long endTime;
 
+	/** The attributes. */
 	final List<ITxAttribute> attributes = new ArrayList<>();
 
+	/**
+	 * Instantiates a new scv tx.
+	 *
+	 * @param id          the id
+	 * @param streamId    the stream id
+	 * @param generatorId the generator id
+	 * @param begin       the begin
+	 */
 	ScvTx(long id, long streamId, long generatorId, long begin) {
 		this.id = id;
 		this.streamId = streamId;
@@ -43,5 +59,12 @@ class ScvTx implements Serializable{
 		this.endTime = begin;
 	}
 
-	Long getId() {return id;}
+	/**
+	 * Gets the id.
+	 *
+	 * @return the id
+	 */
+	Long getId() {
+		return id;
+	}
 }

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java

@@ -1,5 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2012 IT Just working.
+ * Copyright (c) 2020 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
@@ -47,49 +48,84 @@ import com.minres.scviewer.database.RelationType;
 import com.minres.scviewer.database.RelationTypeFactory;
 import com.minres.scviewer.database.tx.ITx;
 
+/**
+ * The Class TextDbLoader.
+ */
 public class TextDbLoader implements IWaveformDbLoader {
 
+	/** The max time. */
 	private Long maxTime = 0L;
 
+	/** The map db. */
 	DB mapDb = null;
 
+	/** The attr values. */
 	final List<String> attrValues = new ArrayList<>();
 
+	/** The relation types. */
 	final Map<String, RelationType> relationTypes = UnifiedMap.newMap();
 
+	/** The tx streams. */
 	final Map<Long, TxStream> txStreams = UnifiedMap.newMap();
 
+	/** The tx generators. */
 	final Map<Long, TxGenerator> txGenerators = UnifiedMap.newMap();
 
+	/** The transactions. */
 	Map<Long, ScvTx> transactions = null;
 
+	/** The attribute types. */
 	final Map<String, TxAttributeType> attributeTypes = UnifiedMap.newMap();
 
+	/** The relations in. */
 	final HashMultimap<Long, ScvRelation> relationsIn = HashMultimap.create();
 
+	/** The relations out. */
 	final HashMultimap<Long, ScvRelation> relationsOut = HashMultimap.create();
 
+	/** The tx cache. */
 	HashMap<Long, Tx> txCache = new HashMap<>();
 
+	/** The threads. */
 	List<Thread> threads = new ArrayList<>();
 
+	/**
+	 * Gets the max time.
+	 *
+	 * @return the max time
+	 */
 	@Override
 	public Long getMaxTime() {
 		return maxTime;
 	}
 
+	/**
+	 * Gets the all waves.
+	 *
+	 * @return the all waves
+	 */
 	@Override
 	public Collection<IWaveform> getAllWaves() {
 		return new ArrayList<>(txStreams.values());
 	}
 
+	/** The Constant x. */
 	static final byte[] x = "scv_tr_stream".getBytes();
 
+	/**
+	 * Load.
+	 *
+	 * @param db   the db
+	 * @param file the file
+	 * @return true, if successful
+	 * @throws InputFormatException the input format exception
+	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public boolean load(IWaveformDb db, File file) throws InputFormatException {
 		dispose();
-		if(file.isDirectory() || !file.exists()) return false;
+		if (file.isDirectory() || !file.exists())
+			return false;
 		TextDbParser parser = new TextDbParser(this);
 		boolean gzipped = isGzipped(file);
 		try {
@@ -99,13 +135,10 @@ public class TextDbLoader implements IWaveformDbLoader{
 			throw new InputFormatException();
 		}
 
-		if(file.length() < 75000000*(gzipped?1:10) || "memory".equals(System.getProperty("ScvBackingDB", "file")))
+		if (file.length() < 75000000 * (gzipped ? 1 : 10)
-			mapDb = DBMaker
+				|| "memory".equals(System.getProperty("ScvBackingDB", "file")))
-			.memoryDirectDB()
+			mapDb = DBMaker.memoryDirectDB().allocateStartSize(512l * 1024l * 1024l)
-			.allocateStartSize(512l*1024l*1024l)
+					.allocateIncrement(128l * 1024l * 1024l).cleanerHackEnable().make();
-			.allocateIncrement(128l*1024l*1024l)
-			.cleanerHackEnable()
-			.make();
 		else {
 			File mapDbFile;
 			try {
@@ -114,15 +147,9 @@ public class TextDbLoader implements IWaveformDbLoader{
 			} catch (IOException e1) {
 				return false;
 			}
-			mapDb = DBMaker
+			mapDb = DBMaker.fileDB(mapDbFile).fileMmapEnable() // Always enable mmap
-			.fileDB(mapDbFile)
+					.fileMmapEnableIfSupported().fileMmapPreclearDisable().allocateStartSize(512l * 1024l * 1024l)
-			.fileMmapEnable()            // Always enable mmap
+					.allocateIncrement(128l * 1024l * 1024l).cleanerHackEnable().make();
-			.fileMmapEnableIfSupported()
-			.fileMmapPreclearDisable()
-			.allocateStartSize(512l*1024l*1024l)
-			.allocateIncrement(128l*1024l*1024l)
-			.cleanerHackEnable()
-			.make();
 			mapDbFile.deleteOnExit();
 		}
 		try {
@@ -141,7 +168,8 @@ public class TextDbLoader implements IWaveformDbLoader{
 				public void run() {
 					try {
 						stream.calculateConcurrency();
-					} catch (Exception e) {/* don't let exceptions bubble up */ }
+					} catch (Exception e) {
+						/* don't let exceptions bubble up */ }
 				}
 			};
 			threads.add(t);
@@ -150,6 +178,9 @@ public class TextDbLoader implements IWaveformDbLoader{
 		return true;
 	}
 
+	/**
+	 * Dispose.
+	 */
 	@Override
 	public void dispose() {
 		attrValues.clear();
@@ -166,6 +197,12 @@ public class TextDbLoader implements IWaveformDbLoader{
 		}
 	}
 
+	/**
+	 * Checks if is txfile.
+	 *
+	 * @param istream the istream
+	 * @return true, if is txfile
+	 */
 	private static boolean isTxfile(InputStream istream) {
 		byte[] buffer = new byte[x.length];
 		try {
@@ -173,7 +210,8 @@ public class TextDbLoader implements IWaveformDbLoader{
 			istream.close();
 			if (readCnt == x.length) {
 				for (int i = 0; i < x.length; i++)
-					if(buffer[i]!=x[i]) return false;
+					if (buffer[i] != x[i])
+						return false;
 			}
 			return true;
 		} catch (IOException e) {
@@ -181,6 +219,12 @@ public class TextDbLoader implements IWaveformDbLoader{
 		}
 	}
 
+	/**
+	 * Checks if is gzipped.
+	 *
+	 * @param f the f
+	 * @return true, if is gzipped
+	 */
 	private static boolean isGzipped(File f) {
 		try (InputStream is = new FileInputStream(f)) {
 			byte[] signature = new byte[2];
@@ -191,33 +235,70 @@ public class TextDbLoader implements IWaveformDbLoader{
 		}
 	}
 
+	/**
+	 * Gets the all relation types.
+	 *
+	 * @return the all relation types
+	 */
 	public Collection<RelationType> getAllRelationTypes() {
 		return relationTypes.values();
 	}
 
+	/**
+	 * The Class TextDbParser.
+	 */
 	static class TextDbParser {
-		static final Pattern scv_tr_stream = Pattern.compile("^scv_tr_stream\\s+\\(ID (\\d+),\\s+name\\s+\"([^\"]+)\",\\s+kind\\s+\"([^\"]+)\"\\)$");
-		static final Pattern scv_tr_generator = Pattern.compile("^scv_tr_generator\\s+\\(ID\\s+(\\d+),\\s+name\\s+\"([^\"]+)\",\\s+scv_tr_stream\\s+(\\d+),$");
-		static final Pattern begin_attribute = Pattern.compile("^begin_attribute \\(ID (\\d+), name \"([^\"]+)\", type \"([^\"]+)\"\\)$");
-		static final Pattern end_attribute = Pattern.compile("^end_attribute \\(ID (\\d+), name \"([^\"]+)\", type \"([^\"]+)\"\\)$");
 
+		/** The Constant scv_tr_stream. */
+		static final Pattern scv_tr_stream = Pattern
+				.compile("^scv_tr_stream\\s+\\(ID (\\d+),\\s+name\\s+\"([^\"]+)\",\\s+kind\\s+\"([^\"]+)\"\\)$");
+
+		/** The Constant scv_tr_generator. */
+		static final Pattern scv_tr_generator = Pattern
+				.compile("^scv_tr_generator\\s+\\(ID\\s+(\\d+),\\s+name\\s+\"([^\"]+)\",\\s+scv_tr_stream\\s+(\\d+),$");
+
+		/** The Constant begin_attribute. */
+		static final Pattern begin_attribute = Pattern
+				.compile("^begin_attribute \\(ID (\\d+), name \"([^\"]+)\", type \"([^\"]+)\"\\)$");
+
+		/** The Constant end_attribute. */
+		static final Pattern end_attribute = Pattern
+				.compile("^end_attribute \\(ID (\\d+), name \"([^\"]+)\", type \"([^\"]+)\"\\)$");
+
+		/** The loader. */
 		final TextDbLoader loader;
 
+		/** The transaction by id. */
 		HashMap<Long, ScvTx> transactionById = new HashMap<>();
 
+		/** The tx sink. */
 		TreeMapSink<Long, ScvTx> txSink;
 
+		/** The reader. */
 		BufferedReader reader = null;
 
+		/** The generator. */
 		TxGenerator generator = null;
 
+		/** The attr value lut. */
 		Map<String, Integer> attrValueLut = new HashMap<>();
 
+		/**
+		 * Instantiates a new text db parser.
+		 *
+		 * @param loader the loader
+		 */
 		public TextDbParser(TextDbLoader loader) {
 			super();
 			this.loader = loader;
 		}
 
+		/**
+		 * Parses the input.
+		 *
+		 * @param inputStream the input stream
+		 * @throws IOException Signals that an I/O exception has occurred.
+		 */
 		void parseInput(InputStream inputStream) throws IOException {
 			reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
 			String curLine = reader.readLine();
@@ -229,6 +310,14 @@ public class TextDbLoader implements IWaveformDbLoader{
 				parseLine(curLine, nextLine);
 		}
 
+		/**
+		 * Gets the attr type.
+		 *
+		 * @param name     the name
+		 * @param dataType the data type
+		 * @param type     the type
+		 * @return the attr type
+		 */
 		private TxAttributeType getAttrType(String name, DataType dataType, AssociationType type) {
 			String key = name + "-" + dataType.toString();
 			TxAttributeType res;
@@ -241,20 +330,30 @@ public class TextDbLoader implements IWaveformDbLoader{
 			return res;
 		}
 
+		/**
+		 * Parses the line.
+		 *
+		 * @param curLine  the cur line
+		 * @param nextLine the next line
+		 * @return the string
+		 * @throws IOException Signals that an I/O exception has occurred.
+		 */
 		private String parseLine(String curLine, String nextLine) throws IOException {
 			String[] tokens = curLine.split("\\s+");
 			if ("tx_record_attribute".equals(tokens[0])) {
 				Long id = Long.parseLong(tokens[1]);
 				String name = tokens[2].substring(1, tokens[2].length());
 				DataType type = DataType.valueOf(tokens[3]);
-				String remaining = tokens.length>5?String.join(" ", Arrays.copyOfRange(tokens, 5, tokens.length)):"";
+				String remaining = tokens.length > 5 ? String.join(" ", Arrays.copyOfRange(tokens, 5, tokens.length))
+						: "";
 				TxAttributeType attrType = getAttrType(name, type, AssociationType.RECORD);
 				transactionById.get(id).attributes.add(new TxAttribute(attrType, getAttrString(attrType, remaining)));
 			} else if ("tx_begin".equals(tokens[0])) {
 				Long id = Long.parseLong(tokens[1]);
 				Long genId = Long.parseLong(tokens[2]);
 				TxGenerator gen = loader.txGenerators.get(genId);
-				ScvTx scvTx = new ScvTx(id, gen.stream.getId(), genId, Long.parseLong(tokens[3])*stringToScale(tokens[4]));
+				ScvTx scvTx = new ScvTx(id, gen.stream.getId(), genId,
+						Long.parseLong(tokens[3]) * stringToScale(tokens[4]));
 				loader.maxTime = loader.maxTime > scvTx.beginTime ? loader.maxTime : scvTx.beginTime;
 				TxStream stream = loader.txStreams.get(gen.stream.getId());
 				stream.setConcurrency(stream.getConcurrency() + 1);
@@ -279,11 +378,17 @@ public class TextDbLoader implements IWaveformDbLoader{
 				loader.maxTime = loader.maxTime > scvTx.endTime ? loader.maxTime : scvTx.endTime;
 				TxGenerator gen = loader.txGenerators.get(scvTx.generatorId);
 				TxStream stream = loader.txStreams.get(gen.stream.getId());
-				if(scvTx.beginTime==scvTx.endTime)
+				if (scvTx.beginTime == scvTx.endTime) {
-					stream.addEvent(new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime));
+					TxEvent evt = new TxEvent(loader, EventKind.SINGLE, id, scvTx.beginTime);
-				else {
+					stream.addEvent(evt);
-					stream.addEvent(new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime));
+					gen.addEvent(evt);
-					stream.addEvent(new TxEvent(loader, EventKind.END, id, scvTx.endTime));
+				} else {
+					TxEvent begEvt = new TxEvent(loader, EventKind.BEGIN, id, scvTx.beginTime);
+					stream.addEvent(begEvt);
+					gen.addEvent(begEvt);
+					TxEvent endEvt = new TxEvent(loader, EventKind.END, id, scvTx.endTime);
+					stream.addEvent(endEvt);
+					gen.addEvent(endEvt);
 				}
 				stream.setConcurrency(stream.getConcurrency() - 1);
 				if (nextLine != null && nextLine.charAt(0) == 'a') {
@@ -318,19 +423,21 @@ public class TextDbLoader implements IWaveformDbLoader{
 				if ((matcher.matches())) {
 					Long id = Long.parseLong(matcher.group(1));
 					TxStream stream = loader.txStreams.get(Long.parseLong(matcher.group(3)));
-					generator=new TxGenerator(id, stream, matcher.group(2));
+					generator = new TxGenerator(loader, id, matcher.group(2), stream);
 					loader.txGenerators.put(id, generator);
 				}
 			} else if ("begin_attribute".equals(tokens[0])) {
 				Matcher matcher = begin_attribute.matcher(curLine);
 				if ((matcher.matches())) {
-					TxAttributeType attrType = getAttrType(matcher.group(2), DataType.valueOf(matcher.group(3)), AssociationType.BEGIN);
+					TxAttributeType attrType = getAttrType(matcher.group(2), DataType.valueOf(matcher.group(3)),
+							AssociationType.BEGIN);
 					generator.beginAttrs.add(attrType);
 				}
 			} else if ("end_attribute".equals(tokens[0])) {
 				Matcher matcher = end_attribute.matcher(curLine);
 				if ((matcher.matches())) {
-					TxAttributeType attrType = getAttrType(matcher.group(2), DataType.valueOf(matcher.group(3)), AssociationType.END);
+					TxAttributeType attrType = getAttrType(matcher.group(2), DataType.valueOf(matcher.group(3)),
+							AssociationType.END);
 					generator.endAttrs.add(attrType);
 				}
 			} else if (")".equals(tokens[0])) {
@@ -342,6 +449,13 @@ public class TextDbLoader implements IWaveformDbLoader{
 			return nextLine;
 		}
 
+		/**
+		 * Gets the attr string.
+		 *
+		 * @param attrType the attr type
+		 * @param string   the string
+		 * @return the attr string
+		 */
 		private String getAttrString(TxAttributeType attrType, String string) {
 			String value;
 			switch (attrType.getDataType()) {
@@ -361,18 +475,36 @@ public class TextDbLoader implements IWaveformDbLoader{
 			}
 		}
 
+		/**
+		 * String to scale.
+		 *
+		 * @param scale the scale
+		 * @return the long
+		 */
 		private long stringToScale(String scale) {
 			String cmp = scale.trim();
-			if("fs".equals(cmp)) return 1L;
+			if ("fs".equals(cmp))
-			if("ps".equals(cmp)) return 1000L;
+				return 1L;
-			if("ns".equals(cmp)) return 1000000L;
+			if ("ps".equals(cmp))
-			if("us".equals(cmp)) return 1000000000L;
+				return 1000L;
-			if("ms".equals(cmp)) return 1000000000000L;
+			if ("ns".equals(cmp))
-			if("s".equals(cmp) ) return 1000000000000000L;
+				return 1000000L;
+			if ("us".equals(cmp))
+				return 1000000000L;
+			if ("ms".equals(cmp))
+				return 1000000000000L;
+			if ("s".equals(cmp))
+				return 1000000000000000L;
 			return 1L;
 		}
 	}
 
+	/**
+	 * Gets the transaction.
+	 *
+	 * @param txId the tx id
+	 * @return the transaction
+	 */
 	public ITx getTransaction(long txId) {
 		if (txCache.containsKey(txId))
 			return txCache.get(txId);
@@ -382,4 +514,3 @@ public class TextDbLoader implements IWaveformDbLoader{
 	}
 
 }
-

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.java

@@ -1,5 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2012 IT Just working.
+ * Copyright (c) 2020 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
@@ -21,40 +22,76 @@ import com.minres.scviewer.database.tx.ITxAttribute;
 import com.minres.scviewer.database.tx.ITxGenerator;
 import com.minres.scviewer.database.tx.ITxRelation;
 
+/**
+ * The Class Tx.
+ */
 class Tx implements ITx {
 
+	/** The loader. */
 	private final TextDbLoader loader;
 
+	/** The id. */
 	private long id;
 
+	/** The begin time. */
 	long beginTime = -1;
 
+	/** The end time. */
 	long endTime = -1;
 
+	/** The concurrency index. */
 	private int concurrencyIndex;
 
+	/**
+	 * Instantiates a new tx.
+	 *
+	 * @param loader the loader
+	 * @param scvTx  the scv tx
+	 */
 	public Tx(TextDbLoader loader, ScvTx scvTx) {
 		this.loader = loader;
 		id = scvTx.id;
 	}
 
+	/**
+	 * Instantiates a new tx.
+	 *
+	 * @param loader the loader
+	 * @param txId   the tx id
+	 */
 	public Tx(TextDbLoader loader, long txId) {
 		this.loader = loader;
 		id = txId;
 	}
 
+	/**
+	 * Gets the incoming relations.
+	 *
+	 * @return the incoming relations
+	 */
 	@Override
 	public Collection<ITxRelation> getIncomingRelations() {
 		Set<ScvRelation> rels = loader.relationsIn.get(id);
 		return rels.stream().map(rel -> new TxRelation(loader, rel)).collect(Collectors.toList());
 	}
 
+	/**
+	 * Gets the outgoing relations.
+	 *
+	 * @return the outgoing relations
+	 */
 	@Override
 	public Collection<ITxRelation> getOutgoingRelations() {
 		Set<ScvRelation> rels = loader.relationsOut.get(id);
 		return rels.stream().map(rel -> new TxRelation(loader, rel)).collect(Collectors.toList());
 	}
 
+	/**
+	 * Compare to.
+	 *
+	 * @param o the o
+	 * @return the int
+	 */
 	@Override
 	public int compareTo(ITx o) {
 		int res = getBeginTime().compareTo(o.getBeginTime());
@@ -64,68 +101,138 @@ class Tx implements ITx {
 			return getId().compareTo(o.getId());
 	}
 
+	/**
+	 * Equals.
+	 *
+	 * @param obj the obj
+	 * @return true, if successful
+	 */
 	@Override
 	public boolean equals(Object obj) {
-        if (this == obj) return true;
+		if (this == obj)
-        if (obj == null || getClass() != obj.getClass()) return false;
+			return true;
+		if (obj == null || getClass() != obj.getClass())
+			return false;
 		return this.getScvTx().equals(((Tx) obj).getScvTx());
 	}
 
+	/**
+	 * Hash code.
+	 *
+	 * @return the int
+	 */
 	@Override
 	public int hashCode() {
 		return getScvTx().hashCode();
 	}
 
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
 	@Override
 	public String toString() {
 		return "tx#" + getId() + "[" + getBeginTime() / 1000000 + "ns - " + getEndTime() / 1000000 + "ns]";
 	}
 
+	/**
+	 * Gets the id.
+	 *
+	 * @return the id
+	 */
 	@Override
 	public Long getId() {
 		return getScvTx().id;
 	}
 
+	/**
+	 * Gets the stream.
+	 *
+	 * @return the stream
+	 */
 	@Override
 	public IWaveform getStream() {
 		return loader.txStreams.get(getScvTx().streamId);
 	}
 
+	/**
+	 * Gets the generator.
+	 *
+	 * @return the generator
+	 */
 	@Override
 	public ITxGenerator getGenerator() {
 		return loader.txGenerators.get(getScvTx().generatorId);
 	}
 
+	/**
+	 * Gets the begin time.
+	 *
+	 * @return the begin time
+	 */
 	@Override
 	public Long getBeginTime() {
-		if(beginTime<0)	beginTime=getScvTx().beginTime;
+		if (beginTime < 0)
+			beginTime = getScvTx().beginTime;
 		return beginTime;
 	}
 
+	/**
+	 * Gets the end time.
+	 *
+	 * @return the end time
+	 */
 	@Override
 	public Long getEndTime() {
-		if(endTime<0) endTime=getScvTx().endTime;
+		if (endTime < 0)
+			endTime = getScvTx().endTime;
 		return endTime;
 	}
 
+	/**
+	 * Sets the end time.
+	 *
+	 * @param time the new end time
+	 */
 	void setEndTime(Long time) {
 		getScvTx().endTime = time;
 	}
 
+	/**
+	 * Gets the concurrency index.
+	 *
+	 * @return the concurrency index
+	 */
 	@Override
 	public int getConcurrencyIndex() {
 		return concurrencyIndex;
 	}
 
+	/**
+	 * Sets the concurrency index.
+	 *
+	 * @param idx the new concurrency index
+	 */
 	void setConcurrencyIndex(int idx) {
 		concurrencyIndex = idx;
 	}
 
+	/**
+	 * Gets the attributes.
+	 *
+	 * @return the attributes
+	 */
 	@Override
 	public List<ITxAttribute> getAttributes() {
 		return getScvTx().attributes;
 	}
 
+	/**
+	 * Gets the scv tx.
+	 *
+	 * @return the scv tx
+	 */
 	private ScvTx getScvTx() {
 		return loader.transactions.get(id);
 	}

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttribute.java

@@ -1,5 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2012 IT Just working.
+ * Copyright (c) 2020 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
@@ -16,37 +17,66 @@ import com.minres.scviewer.database.AssociationType;
 import com.minres.scviewer.database.DataType;
 import com.minres.scviewer.database.tx.ITxAttribute;
 
+/**
+ * The Class TxAttribute.
+ */
 public class TxAttribute implements ITxAttribute, Serializable {
 
-	/**
+	/** The Constant serialVersionUID. */
-	 * 
-	 */
 	private static final long serialVersionUID = 4767726016651807152L;
 
+	/** The attribute type. */
 	private final TxAttributeType attributeType;
 
+	/** The value. */
 	private final String value;
 
+	/**
+	 * Instantiates a new tx attribute.
+	 *
+	 * @param type  the type
+	 * @param value the value
+	 */
 	TxAttribute(TxAttributeType type, String value) {
 		this.attributeType = type;
 		this.value = value;
 	}
 
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
 	@Override
 	public String getName() {
 		return attributeType.getName();
 	}
 
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
 	@Override
 	public AssociationType getType() {
 		return attributeType.getType();
 	}
 
+	/**
+	 * Gets the data type.
+	 *
+	 * @return the data type
+	 */
 	@Override
 	public DataType getDataType() {
 		return attributeType.getDataType();
 	}
 
+	/**
+	 * Gets the value.
+	 *
+	 * @return the value
+	 */
 	@Override
 	public Object getValue() {
 		return value;

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeType.java

@@ -1,5 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2012 IT Just working.
+ * Copyright (c) 2020 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
@@ -16,34 +17,61 @@ import com.minres.scviewer.database.AssociationType;
 import com.minres.scviewer.database.DataType;
 import com.minres.scviewer.database.tx.ITxAttributeType;
 
-class TxAttributeType implements ITxAttributeType, Serializable {
 /**
-	 * 
+ * The Class TxAttributeType.
  */
+class TxAttributeType implements ITxAttributeType, Serializable {
+
+	/** The Constant serialVersionUID. */
 	private static final long serialVersionUID = 7159721937208946828L;
 
+	/** The name. */
 	private String name;
 
+	/** The data type. */
 	private DataType dataType;
 
+	/** The type. */
 	private AssociationType type;
 
+	/**
+	 * Instantiates a new tx attribute type.
+	 *
+	 * @param name     the name
+	 * @param dataType the data type
+	 * @param type     the type
+	 */
 	TxAttributeType(String name, DataType dataType, AssociationType type) {
 		this.name = name;
 		this.dataType = dataType;
 		this.type = type;
 	}
 
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
 	@Override
 	public String getName() {
 		return name;
 	}
 
+	/**
+	 * Gets the data type.
+	 *
+	 * @return the data type
+	 */
 	@Override
 	public DataType getDataType() {
 		return dataType;
 	}
 
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
 	@Override
 	public AssociationType getType() {
 		return type;

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.java

@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2020 MINRES Technologies GmbH and others.
+ * 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
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
 package com.minres.scviewer.database.text;
 
 import com.minres.scviewer.database.EventKind;
@@ -5,16 +15,31 @@ import com.minres.scviewer.database.WaveformType;
 import com.minres.scviewer.database.tx.ITx;
 import com.minres.scviewer.database.tx.ITxEvent;
 
+/**
+ * The Class TxEvent.
+ */
 class TxEvent implements ITxEvent {
 
+	/** The loader. */
 	final TextDbLoader loader;
 
+	/** The kind. */
 	final EventKind kind;
 
-	final Long transaction;
+	/** The transaction. */
+	final long transaction;
 
-	final Long time;
+	/** The time. */
+	final long time;
 
+	/**
+	 * Instantiates a new tx event.
+	 *
+	 * @param loader      the loader
+	 * @param kind        the kind
+	 * @param transaction the transaction
+	 * @param time        the time
+	 */
 	TxEvent(TextDbLoader loader, EventKind kind, Long transaction, Long time) {
 		this.loader = loader;
 		this.kind = kind;
@@ -22,33 +47,62 @@ class TxEvent implements ITxEvent {
 		this.time = time;
 	}
 
+	/**
+	 * Duplicate.
+	 *
+	 * @return the i tx event
+	 * @throws CloneNotSupportedException the clone not supported exception
+	 */
 	@Override
-	public
+	public ITxEvent duplicate() throws CloneNotSupportedException {
-	ITxEvent duplicate() throws CloneNotSupportedException {
 		return new TxEvent(loader, kind, transaction, time);
 	}
 
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
 	@Override
-	public
+	public String toString() {
-	String toString() {
 		return kind.toString() + "@" + time + " of tx #" + transaction;
 	}
 
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
 	@Override
 	public WaveformType getType() {
 		return WaveformType.TRANSACTION;
 	}
 
+	/**
+	 * Gets the kind.
+	 *
+	 * @return the kind
+	 */
 	@Override
 	public EventKind getKind() {
 		return kind;
 	}
 
+	/**
+	 * Gets the time.
+	 *
+	 * @return the time
+	 */
 	@Override
 	public Long getTime() {
 		return time;
 	}
 
+	/**
+	 * Gets the transaction.
+	 *
+	 * @return the transaction
+	 */
 	@Override
 	public ITx getTransaction() {
 		return loader.getTransaction(transaction);

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

@@ -1,5 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2012 IT Just working.
+ * Copyright (c) 2020 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
@@ -13,51 +14,93 @@ package com.minres.scviewer.database.text;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.minres.scviewer.database.HierNode;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.tx.ITxGenerator;
 
-class TxGenerator extends HierNode implements ITxGenerator {
+/**
+ * The Class TxGenerator.
+ */
+class TxGenerator extends AbstractTxStream implements ITxGenerator {
 
-	Long id;
+	/** The stream. */
-
+	TxStream stream;
-	IWaveform stream;
-		
-	Boolean active = false;
 
+	/** The begin attrs. */
 	List<TxAttributeType> beginAttrs = new ArrayList<>();
 
+	/** The end attrs. */
 	List<TxAttributeType> endAttrs = new ArrayList<>();
 
-	TxGenerator(Long id, TxStream stream, String name){
+	/**
-		super(name, stream);
+	 * Instantiates a new tx generator.
-		this.id=id;
+	 *
+	 * @param loader the loader
+	 * @param id     the id
+	 * @param name   the name
+	 * @param stream the stream
+	 */
+	TxGenerator(TextDbLoader loader, Long id, String name, TxStream stream) {
+		super(loader, id, name);
 		this.stream = stream;
+		stream.addChild(this);
 	}
 
-	@Override
+	/**
-	public Long getId() {
+	 * Gets the stream.
-		return id;
+	 *
-	}
+	 * @return the stream
-
+	 */
 	@Override
 	public IWaveform getStream() {
 		return stream;
 	}
 
+	/**
+	 * Checks if is same.
+	 *
+	 * @param other the other
+	 * @return true, if is same
+	 */
 	@Override
-	public String getName() {
+	public boolean isSame(IWaveform other) {
-		return name;
+		return (other instanceof TxGenerator && this.getId().equals(other.getId()));
 	}
 
+	/**
+	 * Gets the begin attrs.
+	 *
+	 * @return the begin attrs
+	 */
 	public List<TxAttributeType> getBeginAttrs() {
 		return beginAttrs;
 	}
 
+	/**
+	 * Gets the end attrs.
+	 *
+	 * @return the end attrs
+	 */
 	public List<TxAttributeType> getEndAttrs() {
 		return endAttrs;
 	}
 
-	Boolean isActive() {return active;}
+	/**
-
+	 * Gets the kind.
+	 *
+	 * @return the kind
+	 */
+	@Override
+	public String getKind() {
+		return stream.getKind();
+	}
+
+	/**
+	 * Gets the width.
+	 *
+	 * @return the width
+	 */
+	@Override
+	public int getWidth() {
+		return stream.getWidth();
+	}
 }

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.java

@@ -1,30 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2020 MINRES Technologies GmbH and others.
+ * 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
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
 package com.minres.scviewer.database.text;
 
 import com.minres.scviewer.database.RelationType;
 import com.minres.scviewer.database.tx.ITx;
 import com.minres.scviewer.database.tx.ITxRelation;
 
+/**
+ * The Class TxRelation.
+ */
 class TxRelation implements ITxRelation {
 
+	/** The loader. */
 	final TextDbLoader loader;
 
+	/** The scv relation. */
 	final ScvRelation scvRelation;
 
+	/**
+	 * Instantiates a new tx relation.
+	 *
+	 * @param loader      the loader
+	 * @param scvRelation the scv relation
+	 */
 	public TxRelation(TextDbLoader loader, ScvRelation scvRelation) {
 		this.loader = loader;
 		this.scvRelation = scvRelation;
 	}
 
+	/**
+	 * Gets the relation type.
+	 *
+	 * @return the relation type
+	 */
 	@Override
 	public RelationType getRelationType() {
 		return scvRelation.relationType;
 	}
 
+	/**
+	 * Gets the source.
+	 *
+	 * @return the source
+	 */
 	@Override
 	public ITx getSource() {
 		return loader.getTransaction(scvRelation.source);
 	}
 
+	/**
+	 * Gets the target.
+	 *
+	 * @return the target
+	 */
 	@Override
 	public ITx getTarget() {
 		return loader.getTransaction(scvRelation.target);

plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.java

@@ -1,5 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2012 IT Just working.
+ * Copyright (c) 2020 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
@@ -10,129 +11,84 @@
  *******************************************************************************/
 package com.minres.scviewer.database.text;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import com.minres.scviewer.database.EventKind;
-import com.minres.scviewer.database.HierNode;
-import com.minres.scviewer.database.IEvent;
 import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.WaveformType;
-import com.minres.scviewer.database.tx.ITxEvent;
-import com.minres.scviewer.database.tx.ITxGenerator;
 
-class TxStream extends HierNode implements IWaveform {
+/**
-
+ * The Class TxStream.
-	private Long id;
+ */
-			
+class TxStream extends AbstractTxStream {
-	private TextDbLoader loader;
 
+	/** The kind. */
 	final String kind;
 
+	/**
+	 * Instantiates a new tx stream.
+	 *
+	 * @param loader the loader
+	 * @param id     the id
+	 * @param name   the name
+	 * @param kind   the kind
+	 */
+	TxStream(TextDbLoader loader, Long id, String name, String kind) {
+		super(loader, id, name);
+		this.kind = kind;
+	}
+
+	/**
+	 * Checks if is same.
+	 *
+	 * @param other the other
+	 * @return true, if is same
+	 */
+	@Override
+	public boolean isSame(IWaveform other) {
+		return (other instanceof TxStream && this.getId().equals(other.getId()));
+	}
+
+	/**
+	 * Gets the kind.
+	 *
+	 * @return the kind
+	 */
+	@Override
+	public String getKind() {
+		return kind;
+	}
+
+	/** The max concurrency. */
 	private int maxConcurrency = 0;
 
+	/** The concurrency. */
 	private int concurrency = 0;
 
-	boolean concurrencyCalculated = false;
+	/**
- 
+	 * Sets the concurrency.
+	 *
+	 * @param concurrency the new concurrency
+	 */
 	void setConcurrency(int concurrency) {
 		this.concurrency = concurrency;
 		if (concurrency > maxConcurrency)
 			maxConcurrency = concurrency;
 	}
 
+	/**
+	 * Gets the concurrency.
+	 *
+	 * @return the concurrency
+	 */
 	int getConcurrency() {
 		return this.concurrency;
 	}
 
-	TreeMap<Long, IEvent[]> events = new TreeMap<>();
+	/**
-	
+	 * Gets the width.
-	TxStream(TextDbLoader loader, Long id, String name, String kind){
+	 *
-		super(name);
+	 * @return the width
-		this.id=id;
+	 */
-		this.loader=loader;
-		this.kind=kind;
-	}
-
-	List<ITxGenerator> getGenerators(){
-		return new ArrayList<>(loader.txGenerators.values());
-	}
-
 	@Override
 	public int getWidth() {
 		return maxConcurrency;
 	}
 
-	public void addEvent(ITxEvent evt) {
-		if(!events.containsKey(evt.getTime()))
-			events.put(evt.getTime(), new IEvent[] {evt});
-		else {
-			IEvent[] evts = events.get(evt.getTime());
-			IEvent[] newEvts = Arrays.copyOf(evts, evts.length+1);
-			newEvts[evts.length]=evt;
-			events.put(evt.getTime(), newEvts);
-		}
-	}
-	
-	@Override
-	public NavigableMap<Long, IEvent[]> getEvents() {
-		if(!concurrencyCalculated) calculateConcurrency();
-		return events;
-	}
-
-	@Override
-	public IEvent[] getEventsAtTime(Long time) {
-		if(!concurrencyCalculated) calculateConcurrency();
-		return events.get(time);
-	}
-	
-	@Override
-	public boolean isSame(IWaveform other) {
-		return(other instanceof TxStream && this.getId().equals(other.getId()));
-	}
-
-	@Override
-	public IEvent[] getEventsBeforeTime(Long time) {
-		if(!concurrencyCalculated)
-			calculateConcurrency();
-    	Entry<Long, IEvent[]> e = events.floorEntry(time);
-    	if(e==null)
-    		return new IEvent[] {};
-    	else
-    		return  events.floorEntry(time).getValue();
-	}
-
-	@Override
-	public WaveformType getType() {
-		return WaveformType.TRANSACTION;
-	}
-
-	@Override
-	public Long getId() {
-		return id;
-	}
-
-	synchronized void calculateConcurrency() {
-		if(concurrencyCalculated) return;
-		ArrayList<Long> rowendtime = new ArrayList<>();
-		events.entrySet().stream().forEach( entry -> {
-			IEvent[] values = entry.getValue();
-			Arrays.asList(values).stream().filter(e->e.getKind()==EventKind.BEGIN).forEach(evt -> {
-				Tx tx = (Tx) ((TxEvent)evt).getTransaction();
-				int rowIdx = 0;
-				for(; rowIdx<rowendtime.size() && rowendtime.get(rowIdx)>tx.getBeginTime(); rowIdx++);
-				if(rowendtime.size()<=rowIdx)
-					rowendtime.add(tx.getEndTime());
-				else
-					rowendtime.set(rowIdx, tx.getEndTime());
-				tx.setConcurrencyIndex(rowIdx);
-			});
-		});
-		concurrencyCalculated=true;
-	}
-
 }

plugins/com.minres.scviewer.database.ui.swt/build.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2014, 2015 MINRES Technologies GmbH and others.
+# Copyright (c) 2014, 2015-2021 MINRES Technologies GmbH and others.
 # 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

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/GotoDirection.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/ICursor.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformView.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Control;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;
 import com.minres.scviewer.database.RelationTypeFactory;
+import com.minres.scviewer.database.tx.ITx;
 
 public interface IWaveformView extends PropertyChangeListener, ISelectionProvider{
 
@@ -64,7 +65,9 @@ public interface IWaveformView extends PropertyChangeListener, ISelectionProvide
 
 	public List<TrackEntry> getStreamList();
 
-	public TrackEntry getEntryForStream(IWaveform source);
+	public TrackEntry getEntryFor(ITx source);
+	
+	public TrackEntry getEntryFor(IWaveform source);
 	
 	public List<Object> getElementsAt(Point pt);
 	

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/IWaveformViewFactory.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/TrackEntry.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/WaveformColors.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/DatabaseUiPlugin.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/WaveformViewFactory.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.NavigableMap;
 import java.util.NoSuchElementException;
+import java.util.Optional;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
@@ -696,30 +697,36 @@ public class WaveformView implements IWaveformView  {
 		boolean selectionChanged = false;
 		currentWaveformSelection.forEach(e->e.selected=false);
 		if (selection instanceof IStructuredSelection) {
-			if(((IStructuredSelection) selection).size()==0){
+			IStructuredSelection sel = (IStructuredSelection) selection;
+			if(sel.size()==0){
 				selectionChanged = currentTxSelection!=null||currentWaveformSelection!=null;  
 				currentTxSelection = null;
 				currentWaveformSelection .clear();
 			} else {
 				if(!add) currentWaveformSelection.clear();
-				for(Object sel:((IStructuredSelection) selection).toArray()){
+				List<?> selList = sel.toList();
-					if (sel instanceof ITx){
+				if(selList.get(0) instanceof ITx) {
-						ITx txSel = (ITx) sel;
+					ITx txSel = (ITx) selList.get(0);
-						TrackEntry trackEntry = getEntryForStream(txSel.getStream());
+					TrackEntry trackEntry =  selList.size()==2 && selList.get(1) instanceof TrackEntry?
+							(TrackEntry) selList.get(1):null;
+					if(trackEntry==null) {
+						trackEntry = getEntryFor(txSel);
 						if(trackEntry==null && addIfNeeded){
 							trackEntry=new TrackEntry(txSel.getStream(), styleProvider);
 							streams.add(trackEntry);
 						}
+					}
 					currentTxSelection = txSel;
 					currentWaveformSelection.clear();
 					currentWaveformSelection.add(trackEntry);
 					selectionChanged = true;					
-					} else if (sel instanceof TrackEntry && !currentWaveformSelection.contains(sel)) {
+				} else if(selList.size()==1 && selList.get(0) instanceof TrackEntry) {
-						currentWaveformSelection.add((TrackEntry)sel);
+					currentWaveformSelection.add((TrackEntry)selList.get(0));
-						if(currentTxSelection!=null && !selectionChanged)
+					if(currentTxSelection!=null)
 						currentTxSelection=null;						
 					selectionChanged = true;
-					}            		
+				} else {
+					System.err.println("Invalid selection");
 				}
 			}
 		} else {
@@ -773,7 +780,7 @@ public class WaveformView implements IWaveformView  {
 	public void moveSelection(GotoDirection direction, RelationType relationType) {
 		if(currentWaveformSelection.size() !=1 && currentTxSelection==null) return;
 		TrackEntry selectedWaveform=currentWaveformSelection.size() == 1?
-				currentWaveformSelection.get(0) : getEntryForStream(currentTxSelection.getStream());
+				currentWaveformSelection.get(0) : getEntryFor(currentTxSelection);
 		if(selectedWaveform.waveform.getType()==WaveformType.TRANSACTION && currentTxSelection!=null) {
 			if(relationType.equals(IWaveformView.NEXT_PREV_IN_STREAM)){
 				ITx transaction = null;
@@ -1167,9 +1174,21 @@ public class WaveformView implements IWaveformView  {
 		});
 	}
 
-	public TrackEntry getEntryForStream(IWaveform source) {
+	public TrackEntry getEntryFor(ITx source) {
-		for(TrackEntry trackEntry:streams)
+		Optional<TrackEntry> optGen = streams.stream().filter(e->source.getGenerator().equals(e.waveform)).findFirst();
-			if(trackEntry.waveform.isSame(source)) return trackEntry;
+		if(optGen.isPresent())
+			return optGen.get();
+		Optional<TrackEntry> optStr = streams.stream().filter(e->source.getStream().equals(e.waveform)).findFirst();
+		if(optStr.isPresent())
+			return optStr.get();
+		return null;
+	}
+
+	@Override
+	public TrackEntry getEntryFor(IWaveform source) {
+		Optional<TrackEntry> optGen = streams.stream().filter(e->source.equals(e.waveform)).findFirst();
+		if(optGen.isPresent())
+			return optGen.get();
 		return null;
 	}
 

plugins/com.minres.scviewer.database.vcd/build.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2014, 2015 MINRES Technologies GmbH and others.
+# Copyright (c) 2014, 2015-2021 MINRES Technologies GmbH and others.
 # 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

plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/IVCDDatabaseBuilder.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -113,4 +113,9 @@ public class VCDSignal<T extends IEvent> extends HierNode implements IWaveform {
 		return width;
 	}
 
+	@Override
+	public String getKind() {
+		return "signal";
+	}
+
 }

plugins/com.minres.scviewer.database/build.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2014, 2015 MINRES Technologies GmbH and others.
+# Copyright (c) 2014, 2015-2021 MINRES Technologies GmbH and others.
 # 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

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/AssociationType.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -10,6 +10,15 @@
  *******************************************************************************/
 package com.minres.scviewer.database;
 
+/**
+ * The Enum AssociationType.
+ */
 public enum AssociationType {
-	BEGIN, RECORD, END
+
+	/** The begin. */
+	BEGIN,
+	/** The record. */
+	RECORD,
+	/** The end. */
+	END
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/BitValue.java

@@ -1,12 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2020 MINRES Technologies GmbH and others.
+ * 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
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
 package com.minres.scviewer.database;
+
+/**
+ * The Enum BitValue.
+ */
 public enum BitValue {
+
+	/** The zero. */
 	ZERO,
+
+	/** The one. */
 	ONE,
+
+	/** The x. */
 	X,
+
+	/** The z. */
 	Z;
 
+	/** The Constant ORDINAL_TABLE. */
 	private static final BitValue[] ORDINAL_TABLE = BitValue.values();
 
+	/**
+	 * From char.
+	 *
+	 * @param c the c
+	 * @return the bit value
+	 */
 	public static BitValue fromChar(char c) {
 		switch (c) {
 		case '0':
@@ -24,6 +53,11 @@ public enum BitValue {
 		}
 	}
 
+	/**
+	 * To char.
+	 *
+	 * @return the char
+	 */
 	public char toChar() {
 		switch (this) {
 		case ZERO:
@@ -39,6 +73,12 @@ public enum BitValue {
 		return ' '; // Unreachable?
 	}
 
+	/**
+	 * From int.
+	 *
+	 * @param i the i
+	 * @return the bit value
+	 */
 	public static BitValue fromInt(int i) {
 		if (i == 0) {
 			return ZERO;
@@ -47,14 +87,31 @@ public enum BitValue {
 		}
 	}
 
+	/**
+	 * To int.
+	 *
+	 * @return the int
+	 */
 	public int toInt() {
 		return (this == ONE) ? 1 : 0;
 	}
 
+	/**
+	 * From ordinal.
+	 *
+	 * @param ord the ord
+	 * @return the bit value
+	 */
 	public static BitValue fromOrdinal(int ord) {
 		return ORDINAL_TABLE[ord];
 	}
 
+	/**
+	 * Compare.
+	 *
+	 * @param other the other
+	 * @return the int
+	 */
 	public int compare(BitValue other) {
 		if (this == ONE && other == ZERO) {
 			return 1;

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/BitVector.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -10,18 +10,35 @@
  *******************************************************************************/
 package com.minres.scviewer.database;
 
+/**
+ * The Class BitVector.
+ */
 public class BitVector implements IEvent {
 
+	/** The width. */
 	private final int width;
 
+	/** The packed values. */
 	private int[] packedValues;
 
+	/**
+	 * Instantiates a new bit vector.
+	 *
+	 * @param netWidth the net width
+	 */
 	public BitVector(int netWidth) {
 		this.width = netWidth;
 		packedValues = new int[(netWidth + 15) / 16];
-		for(int i=0; i<packedValues.length; i++) packedValues[i]=0;
+		for (int i = 0; i < packedValues.length; i++)
+			packedValues[i] = 0;
 	}
 
+	/**
+	 * Sets the value.
+	 *
+	 * @param i     the i
+	 * @param value the value
+	 */
 	public void setValue(int i, BitValue value) {
 		int bitIndex = i * 2;
 		int wordOffset = bitIndex >> 5;
@@ -30,6 +47,11 @@ public class BitVector implements IEvent {
 		packedValues[wordOffset] |= value.ordinal() << bitOffset;
 	}
 
+	/**
+	 * Gets the value.
+	 *
+	 * @return the value
+	 */
 	public char[] getValue() {
 		int bitOffset = 0;
 		int wordOffset = 0;
@@ -47,6 +69,11 @@ public class BitVector implements IEvent {
 		return res;
 	}
 
+	/**
+	 * Sets the value.
+	 *
+	 * @param value the new value
+	 */
 	public void setValue(char[] value) {
 		int bitIndex = width;
 		int wordOffset = bitIndex >> 4;
@@ -61,14 +88,29 @@ public class BitVector implements IEvent {
 		}
 	}
 
+	/**
+	 * Gets the width.
+	 *
+	 * @return the width
+	 */
 	public int getWidth() {
 		return width;
 	}
 
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
 	public String toString() {
 		return new String(getValue());
 	}
 
+	/**
+	 * To hex string.
+	 *
+	 * @return the string
+	 */
 	public String toHexString() {
 		int resWidth = (width - 1) / 4 + 1;
 		char[] value = getValue();
@@ -96,6 +138,11 @@ public class BitVector implements IEvent {
 		return new String(res);
 	}
 
+	/**
+	 * To unsigned value.
+	 *
+	 * @return the long
+	 */
 	public long toUnsignedValue() {
 		long res = 0;
 		int bitOffset = 0;
@@ -103,7 +150,8 @@ public class BitVector implements IEvent {
 		int currentWord = 0;
 		// Copy values out of packed array
 		for (int i = 0; i < width; i++) {
-			if(bitOffset==0) currentWord = packedValues[wordOffset];
+			if (bitOffset == 0)
+				currentWord = packedValues[wordOffset];
 			switch (currentWord & 3) {
 			case 1:
 				res |= 1 << i;
@@ -125,6 +173,11 @@ public class BitVector implements IEvent {
 		return res;
 	}
 
+	/**
+	 * To signed value.
+	 *
+	 * @return the long
+	 */
 	public long toSignedValue() {
 		long res = 0;
 		int bitOffset = 0;
@@ -133,7 +186,8 @@ public class BitVector implements IEvent {
 		int lastVal = 0;
 		// Copy values out of packed array
 		for (int i = 0; i < width; i++) {
-			if(bitOffset==0) currentWord = packedValues[wordOffset];
+			if (bitOffset == 0)
+				currentWord = packedValues[wordOffset];
 			lastVal = 0;
 			switch (currentWord & 3) {
 			case 1:
@@ -158,19 +212,34 @@ public class BitVector implements IEvent {
 		return res;
 	}
 
+	/**
+	 * Gets the kind.
+	 *
+	 * @return the kind
+	 */
 	@Override
 	public EventKind getKind() {
 		return EventKind.SINGLE;
 	}
 
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
 	@Override
 	public WaveformType getType() {
 		return WaveformType.SIGNAL;
 	}
 
+	/**
+	 * Duplicate.
+	 *
+	 * @return the i event
+	 * @throws CloneNotSupportedException the clone not supported exception
+	 */
 	@Override
 	public IEvent duplicate() throws CloneNotSupportedException {
 		return (IEvent) this.clone();
 	}
 }
-

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/DataType.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -10,19 +10,47 @@
  *******************************************************************************/
 package com.minres.scviewer.database;
 
+/**
+ * The Enum DataType.
+ */
 public enum DataType {
-	BOOLEAN, // bool
+
-	ENUMERATION, // enum
+	/** The boolean. */
-	INTEGER, // char, short, int, long, long long, sc_int, sc_bigint
+	BOOLEAN,
+	/** The enumeration. */
+	// bool
+	ENUMERATION,
+	/** The integer. */
+	// enum
+	INTEGER,
+	/** The unsigned. */
+	// char, short, int, long, long long, sc_int, sc_bigint
 	UNSIGNED, // unsigned { char, short, int, long, long long }, sc_uint,
+	/** The floating point number. */
 	// sc_biguint
-	FLOATING_POINT_NUMBER, // float, double
+	FLOATING_POINT_NUMBER,
-	BIT_VECTOR, // sc_bit, sc_bv
+	/** The bit vector. */
-	LOGIC_VECTOR, // sc_logic, sc_lv
+	// float, double
-	FIXED_POINT_INTEGER, // sc_fixed
+	BIT_VECTOR,
-	UNSIGNED_FIXED_POINT_INTEGER, // sc_ufixed
+	/** The logic vector. */
-	RECORD, // struct/class
+	// sc_bit, sc_bv
-	POINTER, // T*
+	LOGIC_VECTOR,
-	ARRAY, // T[N]
+	/** The fixed point integer. */
+	// sc_logic, sc_lv
+	FIXED_POINT_INTEGER,
+	/** The unsigned fixed point integer. */
+	// sc_fixed
+	UNSIGNED_FIXED_POINT_INTEGER,
+	/** The record. */
+	// sc_ufixed
+	RECORD,
+	/** The pointer. */
+	// struct/class
+	POINTER,
+	/** The array. */
+	// T*
+	ARRAY,
+	/** The string. */
+	// T[N]
 	STRING // string, std::string
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/DoubleVal.java

@@ -1,23 +1,58 @@
+/*******************************************************************************
+ * Copyright (c) 2020 MINRES Technologies GmbH and others.
+ * 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
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
 package com.minres.scviewer.database;
 
+/**
+ * The Class DoubleVal.
+ */
 public class DoubleVal implements IEvent {
 
+	/** The value. */
 	public final double value;
 
+	/**
+	 * Instantiates a new double val.
+	 *
+	 * @param value the value
+	 */
 	public DoubleVal(double value) {
 		this.value = value;
 	}
 
+	/**
+	 * Gets the kind.
+	 *
+	 * @return the kind
+	 */
 	@Override
 	public EventKind getKind() {
 		return EventKind.SINGLE;
 	}
 
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
 	@Override
 	public WaveformType getType() {
 		return WaveformType.SIGNAL;
 	}
 
+	/**
+	 * Duplicate.
+	 *
+	 * @return the i event
+	 * @throws CloneNotSupportedException the clone not supported exception
+	 */
 	@Override
 	public IEvent duplicate() throws CloneNotSupportedException {
 		return (IEvent) clone();

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/EventKind.java

@@ -1,5 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2020 MINRES Technologies GmbH and others.
+ * 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
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
 package com.minres.scviewer.database;
 
+/**
+ * The Enum EventKind.
+ */
 public enum EventKind {
-	SINGLE, BEGIN, END
+
+	/** The single. */
+	SINGLE,
+	/** The begin. */
+	BEGIN,
+	/** The end. */
+	END
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/HierNode.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -15,43 +15,78 @@ import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * The Class HierNode.
+ */
 public class HierNode implements IHierNode {
 
+	/** The name. */
 	protected String name;
 
+	/** The parent. */
 	protected IHierNode parent = null;
 
+	/** The childs. */
 	protected ArrayList<IHierNode> childs;
 
+	/** The pcs. */
 	protected PropertyChangeSupport pcs;
 
+	/**
+	 * Instantiates a new hier node.
+	 */
 	public HierNode() {
 		childs = new ArrayList<>();
 		pcs = new PropertyChangeSupport(this);
 	}
 
+	/**
+	 * Instantiates a new hier node.
+	 *
+	 * @param name the name
+	 */
 	public HierNode(String name) {
 		this();
 		this.name = name;
 	}
 
+	/**
+	 * Instantiates a new hier node.
+	 *
+	 * @param name   the name
+	 * @param parent the parent
+	 */
 	public HierNode(String name, IHierNode parent) {
 		this();
 		this.name = name;
 		this.parent = parent;
 	}
 
+	/**
+	 * Adds the property change listener.
+	 *
+	 * @param l the l
+	 */
 	@Override
 	public void addPropertyChangeListener(PropertyChangeListener l) {
 		pcs.addPropertyChangeListener(l);
 	}
 
+	/**
+	 * Removes the property change listener.
+	 *
+	 * @param l the l
+	 */
 	@Override
 	public void removePropertyChangeListener(PropertyChangeListener l) {
 		pcs.removePropertyChangeListener(l);
 	}
 
-
+	/**
+	 * Gets the full name.
+	 *
+	 * @return the full name
+	 */
 	@Override
 	public String getFullName() {
 		if (parent != null)
@@ -60,31 +95,74 @@ public class HierNode implements IHierNode {
 			return name;
 	}
 
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
 	@Override
 	public String getName() {
 		return name;
 	}
 
+	/**
+	 * Sets the name.
+	 *
+	 * @param name the new name
+	 */
 	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	/**
+	 * Sets the parent.
+	 *
+	 * @param parent the new parent
+	 */
 	@Override
 	public void setParent(IHierNode parent) {
 		this.parent = parent;
 	}
 
+	/**
+	 * Gets the child nodes.
+	 *
+	 * @return the child nodes
+	 */
 	@Override
 	public List<IHierNode> getChildNodes() {
 		return childs;
 	}
 
+	/**
+	 * Adds the child.
+	 *
+	 * @param child the child
+	 */
+	public void addChild(IHierNode child) {
+		if (!childs.contains(child)) {
+			childs.add(child);
+			child.setParent(this);
+		}
+	}
+
+	/**
+	 * Compare to.
+	 *
+	 * @param o the o
+	 * @return the int
+	 */
 	@Override
 	public int compareTo(IHierNode o) {
 		return getFullName().compareTo(o.getFullName());
 	}
 
+	/**
+	 * Derive waveform.
+	 *
+	 * @return the i derived waveform
+	 */
 	@Override
 	public IDerivedWaveform deriveWaveform() {
 		return null;

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IDerivedWaveform.java

@@ -15,5 +15,10 @@ package com.minres.scviewer.database;
  */
 public interface IDerivedWaveform extends IWaveform {
 
+	/**
+	 * Adds the source waveform.
+	 *
+	 * @param waveform the waveform
+	 */
 	void addSourceWaveform(IWaveform waveform);
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IEvent.java

@@ -1,11 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2020 MINRES Technologies GmbH and others.
+ * 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
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
 package com.minres.scviewer.database;
 
+/**
+ * The Interface IEvent.
+ */
 public interface IEvent {
 
+	/**
+	 * Duplicate.
+	 *
+	 * @return the i event
+	 * @throws CloneNotSupportedException the clone not supported exception
+	 */
 	public IEvent duplicate() throws CloneNotSupportedException;
 
+	/**
+	 * Gets the kind.
+	 *
+	 * @return the kind
+	 */
 	public EventKind getKind();
 
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
 	public WaveformType getType();
 
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IHierNode.java

@@ -21,18 +21,15 @@ public interface IHierNode extends Comparable<IHierNode>{
 	/**
 	 * Attach a non-null PropertyChangeListener to this object.
 	 * 
-	 * @param l
+	 * @param l a non-null PropertyChangeListener instance
-	 *            a non-null PropertyChangeListener instance
+	 * @throws IllegalArgumentException if the parameter is null
-	 * @throws IllegalArgumentException
-	 *             if the parameter is null
 	 */
 	public void addPropertyChangeListener(PropertyChangeListener l);
 
 	/**
 	 * Remove a PropertyChangeListener from this component.
 	 * 
-	 * @param l
+	 * @param l a PropertyChangeListener instance
-	 *            a PropertyChangeListener instance
 	 */
 	public void removePropertyChangeListener(PropertyChangeListener l);
 

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveform.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -12,20 +12,70 @@ package com.minres.scviewer.database;
 
 import java.util.NavigableMap;
 
+/**
+ * The Interface IWaveform.
+ *
+ * @author eyck
+ */
 public interface IWaveform extends IHierNode {
 
+	/**
+	 * Gets the id.
+	 *
+	 * @return the id
+	 */
 	public Long getId();
 
+	/**
+	 * Checks if is same.
+	 *
+	 * @param other the other
+	 * @return true, if is same
+	 */
 	public boolean isSame(IWaveform other);
 
+	/**
+	 * Gets the events.
+	 *
+	 * @return the events
+	 */
 	public NavigableMap<Long, IEvent[]> getEvents();
 
+	/**
+	 * Gets the events at time.
+	 *
+	 * @param time the time
+	 * @return the events at time
+	 */
 	public IEvent[] getEventsAtTime(Long time);
 
+	/**
+	 * Gets the events before time.
+	 *
+	 * @param time the time
+	 * @return the events before time
+	 */
 	public IEvent[] getEventsBeforeTime(Long time);
 
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
 	public WaveformType getType();
 
+	/**
+	 * Gets the kind.
+	 *
+	 * @return the kind
+	 */
+	public String getKind();
+
+	/**
+	 * Gets the width.
+	 *
+	 * @return the width
+	 */
 	public int getWidth();
 
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDb.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -13,21 +13,58 @@ package com.minres.scviewer.database;
 import java.io.File;
 import java.util.List;
 
-
+/**
+ * The Interface IWaveformDb.
+ */
 public interface IWaveformDb extends IHierNode {
 
+	/**
+	 * Gets the max time.
+	 *
+	 * @return the max time
+	 */
 	public Long getMaxTime();
 
+	/**
+	 * Gets the stream by name.
+	 *
+	 * @param name the name
+	 * @return the stream by name
+	 */
 	public IWaveform getStreamByName(String name);
 
+	/**
+	 * Gets the all waves.
+	 *
+	 * @return the all waves
+	 */
 	public List<IWaveform> getAllWaves();
 
+	/**
+	 * Gets the all relation types.
+	 *
+	 * @return the all relation types
+	 */
 	public List<RelationType> getAllRelationTypes();
 
+	/**
+	 * Load.
+	 *
+	 * @param inp the inp
+	 * @return true, if successful
+	 */
 	public boolean load(File inp);
 
+	/**
+	 * Checks if is loaded.
+	 *
+	 * @return true, if is loaded
+	 */
 	public boolean isLoaded();
 
+	/**
+	 * Clear.
+	 */
 	public void clear();
 
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbFactory.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -10,7 +10,15 @@
  *******************************************************************************/
 package com.minres.scviewer.database;
 
+/**
+ * A factory for creating IWaveformDb objects.
+ */
 public interface IWaveformDbFactory {
 
+	/**
+	 * Gets the database.
+	 *
+	 * @return the database
+	 */
 	IWaveformDb getDatabase();
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbLoader.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -13,15 +13,66 @@ package com.minres.scviewer.database;
 import java.io.File;
 import java.util.Collection;
 
+/**
+ * The Interface IWaveformDbLoader.
+ */
 public interface IWaveformDbLoader {
+//	static final String STREAM_ADDED = "StreamAdded";
+//	
+//	static final String GENERATOR_ADDED = "GeneratorAdded";
+//	
+//	static final String LOADING_FINISHED = "LoadingFinished";
+//	/**
+//	 * Attach a non-null PropertyChangeListener to this object.
+//	 * 
+//	 * @param l
+//	 *            a non-null PropertyChangeListener instance
+//	 * @throws IllegalArgumentException
+//	 *             if the parameter is null
+//	 */
+//	public void addPropertyChangeListener(PropertyChangeListener l);
+//
+//	/**
+//	 * Remove a PropertyChangeListener from this component.
+//	 * 
+//	 * @param l
+//	 *            a PropertyChangeListener instance
+//	 */
+//	public void removePropertyChangeListener(PropertyChangeListener l) ;
 
+	/**
+	 * Load.
+	 *
+	 * @param db  the db
+	 * @param inp the inp
+	 * @return true, if successful
+	 * @throws InputFormatException the input format exception
+	 */
 	public boolean load(IWaveformDb db, File inp) throws InputFormatException;
 
+	/**
+	 * Gets the max time.
+	 *
+	 * @return the max time
+	 */
 	public Long getMaxTime();
 
+	/**
+	 * Gets the all waves.
+	 *
+	 * @return the all waves
+	 */
 	public Collection<IWaveform> getAllWaves();
 
+	/**
+	 * Gets the all relation types.
+	 *
+	 * @return the all relation types
+	 */
 	public Collection<RelationType> getAllRelationTypes();
 
+	/**
+	 * Dispose.
+	 */
 	public void dispose();
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/InputFormatException.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -10,11 +10,12 @@
  *******************************************************************************/
 package com.minres.scviewer.database;
 
+/**
+ * The Class InputFormatException.
+ */
 public class InputFormatException extends Exception {
 
-	/**
+	/** The Constant serialVersionUID. */
-	 * 
-	 */
 	private static final long serialVersionUID = 8676129878197783368L;
 
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/RelationType.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -12,36 +12,70 @@ package com.minres.scviewer.database;
 
 import java.io.Serializable;
 
-public class RelationType implements Serializable {
 /**
-	 * 
+ * The Class RelationType.
  */
+public class RelationType implements Serializable {
+
+	/** The Constant serialVersionUID. */
 	private static final long serialVersionUID = 6394859077558971735L;
 
+	/** The name. */
 	private String name;
 
+	/**
+	 * Instantiates a new relation type.
+	 *
+	 * @param name the name
+	 */
 	RelationType(String name) {
 		super();
 		this.name = name;
 	}
 
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
 	public String getName() {
 		return name;
 	}
 
+	/**
+	 * Sets the name.
+	 *
+	 * @param name the new name
+	 */
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	/**
+	 * To string.
+	 *
+	 * @return the string
+	 */
 	public String toString() {
 		return name;
 	}
 
+	/**
+	 * Hash code.
+	 *
+	 * @return the int
+	 */
 	@Override
 	public int hashCode() {
 		return name.hashCode();
 	}
 
+	/**
+	 * Equals.
+	 *
+	 * @param obj the obj
+	 * @return true, if successful
+	 */
 	@Override
 	public boolean equals(Object obj) {
 		if (obj instanceof RelationType)

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/RelationTypeFactory.java

@@ -1,9 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2020 MINRES Technologies GmbH and others.
+ * 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
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
 package com.minres.scviewer.database;
 
 import java.util.HashMap;
 
+/**
+ * A factory for creating RelationType objects.
+ */
 public class RelationTypeFactory {
 
+	/**
+	 * Creates the.
+	 *
+	 * @param name the name
+	 * @return the relation type
+	 */
 	public static RelationType create(String name) {
 		if (registry.containsKey(name)) {
 			return registry.get(name);
@@ -15,8 +34,13 @@ public class RelationTypeFactory {
 
 	}
 
-	private RelationTypeFactory() {}
+	/**
+	 * Instantiates a new relation type factory.
+	 */
+	private RelationTypeFactory() {
+	}
 
+	/** The registry. */
 	private static HashMap<String, RelationType> registry = new HashMap<>();
 
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/WaveformType.java

@@ -1,5 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2020 MINRES Technologies GmbH and others.
+ * 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
+ *
+ * Contributors:
+ *     MINRES Technologies GmbH - initial API and implementation
+ *******************************************************************************/
 package com.minres.scviewer.database;
 
+/**
+ * The Enum WaveformType.
+ */
 public enum WaveformType {
-	SIGNAL, TRANSACTION, FILTER
+
+	/** The signal. */
+	SIGNAL,
+	/** The transaction. */
+	TRANSACTION,
+	/** The filter. */
+	FILTER
 }

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -25,32 +25,56 @@ import com.minres.scviewer.database.IWaveformDb;
 import com.minres.scviewer.database.IWaveformDbLoader;
 import com.minres.scviewer.database.RelationType;
 
+/**
+ * The Class WaveformDb.
+ */
 public class WaveformDb extends HierNode implements IWaveformDb {
 
+	/** The loaders. */
 	private static List<IWaveformDbLoader> loaders = new LinkedList<>();
 
+	/** The loaded. */
 	private boolean loaded;
 
+	/** The relation types. */
 	private List<RelationType> relationTypes;
 
+	/** The waveforms. */
 	private Map<String, IWaveform> waveforms;
 
+	/** The max time. */
 	private Long maxTime;
 
-	
+	/**
+	 * Bind.
+	 *
+	 * @param loader the loader
+	 */
 	public synchronized void bind(IWaveformDbLoader loader) {
 		loaders.add(loader);
 	}
 
+	/**
+	 * Unbind.
+	 *
+	 * @param loader the loader
+	 */
 	public synchronized void unbind(IWaveformDbLoader loader) {
 		loaders.remove(loader);
 	}
 
-	
+	/**
+	 * Gets the loaders.
+	 *
+	 * @return the loaders
+	 */
 	public static List<IWaveformDbLoader> getLoaders() {
 		return Collections.unmodifiableList(loaders);
 	}
 
+	/**
+	 * Instantiates a new waveform db.
+	 */
 	public WaveformDb() {
 		super();
 		waveforms = new HashMap<>();
@@ -58,21 +82,43 @@ public class WaveformDb extends HierNode implements IWaveformDb {
 		maxTime = 0L;
 	}
 
+	/**
+	 * Gets the max time.
+	 *
+	 * @return the max time
+	 */
 	@Override
 	public Long getMaxTime() {
 		return maxTime;
 	}
 
+	/**
+	 * Gets the stream by name.
+	 *
+	 * @param name the name
+	 * @return the stream by name
+	 */
 	@Override
 	public IWaveform getStreamByName(String name) {
 		return waveforms.get(name);
 	}
 
+	/**
+	 * Gets the all waves.
+	 *
+	 * @return the all waves
+	 */
 	@Override
 	public List<IWaveform> getAllWaves() {
 		return new ArrayList<>(waveforms.values());
 	}
 
+	/**
+	 * Load.
+	 *
+	 * @param inp the inp
+	 * @return true, if successful
+	 */
 	@Override
 	public boolean load(File inp) {
 		for (IWaveformDbLoader loader : loaders) {
@@ -84,7 +130,8 @@ public class WaveformDb extends HierNode implements IWaveformDb {
 					if (loader.getMaxTime() > maxTime) {
 						maxTime = loader.getMaxTime();
 					}
-					if(name==null) name=getFileBasename(inp.getName());
+					if (name == null)
+						name = getFileBasename(inp.getName());
 					buildHierarchyNodes();
 					relationTypes.addAll(loader.getAllRelationTypes());
 					pcs.firePropertyChange("WAVEFORMS", null, waveforms);
@@ -99,6 +146,12 @@ public class WaveformDb extends HierNode implements IWaveformDb {
 		return false;
 	}
 
+	/**
+	 * Gets the file basename.
+	 *
+	 * @param f the f
+	 * @return the file basename
+	 */
 	protected static String getFileBasename(String f) {
 		String ext = "";
 		int i = f.lastIndexOf('.');
@@ -108,6 +161,9 @@ public class WaveformDb extends HierNode implements IWaveformDb {
 		return ext;
 	}
 
+	/**
+	 * Clear.
+	 */
 	@Override
 	public void clear() {
 		waveforms.clear();
@@ -115,10 +171,18 @@ public class WaveformDb extends HierNode implements IWaveformDb {
 		loaded = false;
 	}
 
+	/**
+	 * Checks if is loaded.
+	 *
+	 * @return true, if is loaded
+	 */
 	public boolean isLoaded() {
 		return loaded;
 	}
 
+	/**
+	 * Builds the hierarchy nodes.
+	 */
 	private void buildHierarchyNodes() {
 		for (IWaveform stream : getAllWaves()) {
 			String[] hier = stream.getName().split("\\.");
@@ -148,6 +212,11 @@ public class WaveformDb extends HierNode implements IWaveformDb {
 		sortRecursive(this);
 	}
 
+	/**
+	 * Sort recursive.
+	 *
+	 * @param node the node
+	 */
 	private void sortRecursive(IHierNode node) {
 		Collections.sort(node.getChildNodes(), (IHierNode o1, IHierNode o2) -> o1.getName().compareTo(o2.getName()));
 		for (IHierNode n : node.getChildNodes()) {
@@ -156,6 +225,11 @@ public class WaveformDb extends HierNode implements IWaveformDb {
 		}
 	}
 
+	/**
+	 * Gets the all relation types.
+	 *
+	 * @return the all relation types
+	 */
 	@Override
 	public List<RelationType> getAllRelationTypes() {
 		return relationTypes;

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -17,12 +17,20 @@ import com.minres.scviewer.database.IWaveformDb;
 import com.minres.scviewer.database.IWaveformDbFactory;
 
 /**
- * @author eyck
+ * A factory for creating WaveformDb objects.
  *
+ * @author eyck
  */
 public class WaveformDbFactory implements IWaveformDbFactory {
 
-	/* (non-Javadoc)
+	/**
+	 * Gets the database.
+	 *
+	 * @return the database
+	 */
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see com.minres.scviewer.database.IWaveformDbFactory#getDatabase()
 	 */
 	@Override

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITx.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -15,23 +15,71 @@ import java.util.List;
 
 import com.minres.scviewer.database.IWaveform;
 
+/**
+ * The Interface ITx.
+ */
 public interface ITx extends Comparable<ITx> {
 
+	/**
+	 * Gets the id.
+	 *
+	 * @return the id
+	 */
 	public Long getId();
 
+	/**
+	 * Gets the stream.
+	 *
+	 * @return the stream
+	 */
 	public IWaveform getStream();
 
+	/**
+	 * Gets the generator.
+	 *
+	 * @return the generator
+	 */
 	public ITxGenerator getGenerator();
 
+	/**
+	 * Gets the begin time.
+	 *
+	 * @return the begin time
+	 */
 	public Long getBeginTime();
 
+	/**
+	 * Gets the end time.
+	 *
+	 * @return the end time
+	 */
 	public Long getEndTime();
 
+	/**
+	 * Gets the concurrency index.
+	 *
+	 * @return the concurrency index
+	 */
 	public int getConcurrencyIndex();
 
+	/**
+	 * Gets the attributes.
+	 *
+	 * @return the attributes
+	 */
 	public List<ITxAttribute> getAttributes();
 
+	/**
+	 * Gets the incoming relations.
+	 *
+	 * @return the incoming relations
+	 */
 	public Collection<ITxRelation> getIncomingRelations();
 
+	/**
+	 * Gets the outgoing relations.
+	 *
+	 * @return the outgoing relations
+	 */
 	public Collection<ITxRelation> getOutgoingRelations();
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxAttribute.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -10,6 +10,15 @@
  *******************************************************************************/
 package com.minres.scviewer.database.tx;
 
+/**
+ * The Interface ITxAttribute.
+ */
 public interface ITxAttribute extends ITxAttributeType {
+
+	/**
+	 * Gets the value.
+	 *
+	 * @return the value
+	 */
 	public Object getValue();
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxAttributeType.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -13,8 +13,29 @@ package com.minres.scviewer.database.tx;
 import com.minres.scviewer.database.AssociationType;
 import com.minres.scviewer.database.DataType;
 
+/**
+ * The Interface ITxAttributeType.
+ */
 public interface ITxAttributeType {
+
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
 	public String getName();
+
+	/**
+	 * Gets the data type.
+	 *
+	 * @return the data type
+	 */
 	public DataType getDataType();
+
+	/**
+	 * Gets the type.
+	 *
+	 * @return the type
+	 */
 	public AssociationType getType();
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxEvent.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -12,9 +12,22 @@ package com.minres.scviewer.database.tx;
 
 import com.minres.scviewer.database.IEvent;
 
+/**
+ * The Interface ITxEvent.
+ */
 public interface ITxEvent extends IEvent {
 
+	/**
+	 * Gets the time.
+	 *
+	 * @return the time
+	 */
 	public Long getTime();
 
+	/**
+	 * Gets the transaction.
+	 *
+	 * @return the transaction
+	 */
 	public ITx getTransaction();
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxGenerator.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -12,8 +12,16 @@ package com.minres.scviewer.database.tx;
 
 import com.minres.scviewer.database.IWaveform;
 
-public interface ITxGenerator {
+/**
-	public Long getId();
+ * The Interface ITxGenerator.
+ */
+public interface ITxGenerator extends IWaveform {
+
+	/**
+	 * Gets the stream.
+	 *
+	 * @return the stream
+	 */
 	public IWaveform getStream();
-	public String getName();
+
 }

plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxRelation.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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
@@ -12,11 +12,29 @@ package com.minres.scviewer.database.tx;
 
 import com.minres.scviewer.database.RelationType;
 
+/**
+ * The Interface ITxRelation.
+ */
 public interface ITxRelation {
 
+	/**
+	 * Gets the relation type.
+	 *
+	 * @return the relation type
+	 */
 	RelationType getRelationType();
 
+	/**
+	 * Gets the source.
+	 *
+	 * @return the source
+	 */
 	ITx getSource();
 
+	/**
+	 * Gets the target.
+	 *
+	 * @return the target
+	 */
 	ITx getTarget();
 }

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/NavigateToolbarContribution.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/RelationTypeToolControl.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AboutHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddWaveformHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/DeleteWaveformHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/LoadStoreSettingsHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/MoveWaveformHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateEvent.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateTrans.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/QuitHandler.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2015-2021 MINRES Technologies GmbH and others.
  * 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