Merge branch 'release/2.9.0'

.gitignore

@@ -8,3 +8,4 @@ SCViewer.xcf
 SCViewer_1.png
 *.launch
 copyrightLog.txt
+/workspace

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

@@ -29,26 +29,12 @@ http://www.eclipse.org/legal/epl-v10.html
    </url>
 
    <requires>
+      <import plugin="org.codehaus.groovy" version="2.5.8" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi.services" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi"/>
       <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views.properties.tabbed"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.swt" version="3.103.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.registry"/>
-      <import plugin="org.codehaus.groovy" version="2.5.8" match="greaterOrEqual"/>
-      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

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

@@ -41,7 +41,6 @@
       <import plugin="org.eclipse.e4.ui.di" version="1.1.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.e4.core.contexts" version="1.4.0" match="greaterOrEqual"/>
       <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui"/>
       <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi.services" version="3.5.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.e4.core.services" version="2.0.0" match="greaterOrEqual"/>
@@ -51,17 +50,15 @@
       <import plugin="org.eclipse.equinox.preferences"/>
       <import plugin="org.eclipse.core.expressions"/>
       <import plugin="org.eclipse.e4.core.commands" version="0.11.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.workbench.addons.swt"/>
-      <import plugin="com.opcoach.e4.preferences"/>
       <import plugin="org.eclipse.e4.core.di.extensions"/>
       <import plugin="org.eclipse.e4.ui.css.swt.theme" version="0.10.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.13.0" match="greaterOrEqual"/>
-      <import plugin="com.opcoach.e4.preferences.mainmenu" version="1.2.0" match="greaterOrEqual"/>
       <import feature="com.opcoach.e4.preferences.feature" version="1.3.0.202004072127"/>
       <import feature="org.eclipse.equinox.executable" version="3.8.700.v20200207-2156"/>
       <import feature="org.eclipse.equinox.sdk" version="3.20.100.v20200303-1901"/>
       <import feature="org.eclipse.sdk" version="4.15.0.v20200305-0155"/>
       <import feature="org.eclipse.rcptt.core" version="2.5.1.M3"/>
+      <import plugin="org.eclipse.core.commands"/>
    </requires>
 
    <plugin

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

@@ -37,8 +37,8 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"/>
 
    <requires>
+      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
       <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
@@ -52,7 +52,6 @@ http://www.eclipse.org/legal/epl-v10.html
       <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface"/>
       <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
-      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

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

@@ -17,12 +17,19 @@
       [Enter License Description here.]
    </license>
 
-   <plugin
+   <includes
-         id="com.minres.scviewer.database.ui"
+         id="com.minres.scviewer.database.feature"
-         download-size="0"
+         version="0.0.0"/>
-         install-size="0"
+
-         version="0.0.0"
+   <requires>
-         unpack="false"/>
+      <import plugin="org.eclipse.swt" version="3.103.1" match="greaterOrEqual"/>
+      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.equinox.registry"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.osgi"/>
+   </requires>
 
    <plugin
          id="com.minres.scviewer.database.ui.swt"

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

@@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

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

@@ -98,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT widget
 Bundle-SymbolicName: com.minres.scviewer.database.ui.swt
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.3.1.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
@@ -10,11 +10,21 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
  com.google.guava;bundle-version="15.0.0",
  org.eclipse.jface,
  org.eclipse.equinox.registry,
- com.minres.scviewer.database.ui,
  org.eclipse.core.runtime,
  org.eclipse.osgi
-Export-Package: com.minres.scviewer.database.swt
+Export-Package: com.minres.scviewer.database.ui;
+  uses:="org.eclipse.swt.events,
+   org.eclipse.swt.graphics,
+   org.eclipse.swt.widgets,
+   com.minres.scviewer.database,
+   org.eclipse.jface.viewers",
+ com.minres.scviewer.database.ui.swt;
+  uses:="org.osgi.framework,
+   org.eclipse.core.runtime,
+   com.minres.scviewer.database.ui,
+   org.eclipse.swt.graphics,
+   org.eclipse.swt.widgets"
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
-Bundle-Activator: com.minres.scviewer.database.swt.DatabaseUiPlugin
+Bundle-Activator: com.minres.scviewer.database.ui.swt.DatabaseUiPlugin
 Automatic-Module-Name: com.minres.scviewer.database.ui.swt

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

@@ -8,5 +8,5 @@
   	<version>2.0.0-SNAPSHOT</version>
 	<relativePath>../..</relativePath>
   </parent>
-  <version>2.2.0-SNAPSHOT</version>
+  <version>2.3.1-SNAPSHOT</version>
 </project>

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

@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Control;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;
 
-public interface IWaveformViewer extends PropertyChangeListener, ISelectionProvider{
+public interface IWaveformView extends PropertyChangeListener, ISelectionProvider{
 
 	String CURSOR_PROPERTY = "cursor_time";
 	
@@ -51,7 +51,9 @@ public interface IWaveformViewer extends PropertyChangeListener, ISelectionProvi
 
 	public void setSelection(ISelection selection);
 
-	public void setSelection(ISelection selection, boolean addIfNeeded);
+	public void setSelection(ISelection selection, boolean showIfNeeded);
+
+	public void addToSelection(ISelection selection, boolean showIfNeeded);
 
 	public void moveSelection(GotoDirection direction);
 
@@ -110,4 +112,6 @@ public interface IWaveformViewer extends PropertyChangeListener, ISelectionProvi
 	public void scrollHorizontal(int percent);
 	
 	public void addDisposeListener( DisposeListener listener );
+
+	public void deleteSelectedTracks();
 }

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

@@ -12,6 +12,6 @@ package com.minres.scviewer.database.ui;
 
 import org.eclipse.swt.widgets.Composite;
 
-public interface IWaveformViewerFactory {
+public interface IWaveformViewFactory {
-	public IWaveformViewer createPanel(Composite parent);
+	public IWaveformView createPanel(Composite parent);
 }

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

@@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt;
+package com.minres.scviewer.database.ui.swt;
 
 public class Constants {
 

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt;
+package com.minres.scviewer.database.ui.swt;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Plugin;

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

@@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt;
+package com.minres.scviewer.database.ui.swt;
 
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Composite;

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

@@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt;
+package com.minres.scviewer.database.ui.swt;
 
 import org.eclipse.swt.widgets.Widget;
 

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

@@ -8,19 +8,19 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt;
+package com.minres.scviewer.database.ui.swt;
 
 import org.eclipse.swt.widgets.Composite;
 
-import com.minres.scviewer.database.swt.internal.WaveformViewer;
+import com.minres.scviewer.database.ui.IWaveformView;
-import com.minres.scviewer.database.ui.IWaveformViewer;
+import com.minres.scviewer.database.ui.IWaveformViewFactory;
-import com.minres.scviewer.database.ui.IWaveformViewerFactory;
+import com.minres.scviewer.database.ui.swt.internal.WaveformView;
 
-public class WaveformViewerFactory implements IWaveformViewerFactory {
+public class WaveformViewFactory implements IWaveformViewFactory {
 
 	@Override
-	public IWaveformViewer createPanel(Composite parent) {
+	public IWaveformView createPanel(Composite parent) {
-		return new WaveformViewer(parent);
+		return new WaveformView(parent);
 	}
 
 }

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import java.util.Collection;
 import java.util.LinkedList;
@@ -49,7 +49,7 @@ public class ArrowPainter implements IPainter {
 	
 	long scaleFactor;
 
-	boolean deferredUpdate;
+	boolean deferUpdate;
 
 	public ArrowPainter(WaveformCanvas waveCanvas, RelationType relationType) {
 		this.waveCanvas = waveCanvas;
@@ -80,12 +80,14 @@ public class ArrowPainter implements IPainter {
 	}
 
 	protected void calculateGeometries() {
-		deferredUpdate = false;
+		deferUpdate = false;
+		iRect.clear();
+		oRect.clear();
 		ITxStream<?> stream = tx.getStream();
 		IWaveformPainter painter = waveCanvas.wave2painterMap.get(stream);
 		if (painter == null) { // stream has been added but painter not yet
 								// created
-			deferredUpdate = true;
+			deferUpdate = true;
 			return;
 		}
 		int laneHeight = painter.getHeight() / stream.getMaxConcurrency();
@@ -117,33 +119,27 @@ public class ArrowPainter implements IPainter {
 		Color fgColor = waveCanvas.colors[WaveformColors.REL_ARROW.ordinal()];
 		Color highliteColor = waveCanvas.colors[WaveformColors.REL_ARROW_HIGHLITE.ordinal()];
 
-		if (deferredUpdate || (tx != null && waveCanvas.getScaleFactor() != scaleFactor)) {
+		if(tx==null) return;
+		if (!deferUpdate) {
 			scaleFactor = waveCanvas.getScaleFactor();
 			calculateGeometries();
 		}
-		if(txRectangle == null) return;
+		if(deferUpdate) return;
 		int correctionValue = (int)(selectionOffset);
 		Rectangle correctedTargetRectangle = new Rectangle(txRectangle.x+correctionValue, txRectangle.y, txRectangle.width, txRectangle.height);
 		for (LinkEntry entry : iRect) {
 			Rectangle correctedRectangle = new Rectangle(entry.rectangle.x+correctionValue, entry.rectangle.y, entry.rectangle.width, entry.rectangle.height);
-			Point target = drawPath(proj, highlightType.equals(entry.relationType) ? highliteColor : fgColor,
+			drawArrow(proj, highlightType.equals(entry.relationType) ? highliteColor : fgColor,
 					correctedRectangle, correctedTargetRectangle);
-			drawArrow(proj, target);
 		}
 		for (LinkEntry entry : oRect) {
 			Rectangle correctedRectangle = new Rectangle(entry.rectangle.x+correctionValue, entry.rectangle.y, entry.rectangle.width, entry.rectangle.height);
-			Point target = drawPath(proj, highlightType.equals(entry.relationType) ? highliteColor : fgColor, correctedTargetRectangle,
+			drawArrow(proj, highlightType.equals(entry.relationType) ? highliteColor : fgColor, correctedTargetRectangle,
 					correctedRectangle);
-			drawArrow(proj, target);
 		}
 	}
 
-	protected void drawArrow(Projection proj, Point target) {
+	protected void drawArrow(Projection proj, Color fgColor, Rectangle srcRectangle, Rectangle tgtRectangle) {
-		proj.drawLine(target.x - 8, target.y - 5, target.x, target.y);
-		proj.drawLine(target.x - 8, target.y + 5, target.x, target.y);
-	}
-
-	protected Point drawPath(Projection proj, Color fgColor, Rectangle srcRectangle, Rectangle tgtRectangle) {
 		Point point1 = proj.project(new Point(srcRectangle.x, srcRectangle.y + srcRectangle.height / 2));
 		Point point2 = proj.project(new Point(tgtRectangle.x, tgtRectangle.y + tgtRectangle.height / 2));
 
@@ -160,11 +156,15 @@ public class ArrowPainter implements IPainter {
 			path.cubicTo(center.x + xCtrlOffset, center.y, point2.x - xCtrlOffset, point2.y, point2.x, point2.y);
 		} else
 			path.cubicTo(point1.x + xCtrlOffset, point1.y, point2.x - xCtrlOffset, point2.y, point2.x, point2.y);
+
 		proj.setAntialias(SWT.ON);
 		proj.setForeground(fgColor);
 		proj.getGC().drawPath(path);
 		path.dispose();
-		return point2;
+		// now draw the arrow head
+		proj.getGC().drawLine(point2.x - 8, point2.y - 5, point2.x, point2.y);
+		proj.getGC().drawLine(point2.x - 8, point2.y + 5, point2.x, point2.y);
+
 	}
 
 	class LinkEntry {

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Rectangle;

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import org.eclipse.swt.graphics.Rectangle;
 

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import com.minres.scviewer.database.ui.TrackEntry;
 

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;

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

@@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import java.util.Arrays;
 
@@ -44,10 +44,6 @@ public class Projection {
 	public void setFillRule(int rule) {
 		gc.setFillRule(rule);
 	}
-	public void fillRectangle(Rectangle rect) {
-		gc.fillRectangle(rect.x+translation.x, rect.y+translation.y, rect.width, rect.height);
-	}
-
 	public void setLineStyle(int style) {
 		gc.setLineStyle(style);
 	}
@@ -69,6 +65,10 @@ public class Projection {
 		return gc;
 	}
 
+	public void fillRectangle(Rectangle rect) {
+		gc.fillRectangle(rect.x+translation.x, rect.y+translation.y, rect.width, rect.height);
+	}
+
 	public void drawRectangle(Rectangle rect) {
 		gc.drawRectangle(rect.x+translation.y, rect.y+translation.y, rect.width, rect.height);		
 	}

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

@@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import static org.eclipse.swt.events.SelectionListener.widgetSelectedAdapter;
 

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import java.text.DecimalFormat;
 

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import java.util.Collection;
 import java.util.Map.Entry;
@@ -249,7 +249,7 @@ public class SignalPainter extends TrackPainter {
 		final boolean continous;
 		private long minVal;
 		private long range;
-
+		double yRange = (yOffsetB-yOffsetT);
 		public MultiBitStencilAnalog(NavigableMap<Long, ?> entries, Object left, boolean continous, boolean signed) {
 			this.continous=continous;
 			Collection<?> values = ((NavigableMap<Long, ?>) entries).values();
@@ -276,8 +276,8 @@ public class SignalPainter extends TrackPainter {
 			long leftVal = ((BitVector) left).toUnsignedValue();
 			long rightVal= ((BitVector) right).toUnsignedValue();
 			proj.setForeground(waveCanvas.colors[WaveformColors.SIGNAL_REAL.ordinal()]);
-			int yOffsetLeft = (int) ((leftVal-minVal) / range * (yOffsetB-yOffsetT));
+			int yOffsetLeft = (int) ((leftVal-minVal) * yRange / range);
-			int yOffsetRight = (int) ((rightVal-minVal) / range * (yOffsetB-yOffsetT));
+			int yOffsetRight = (int) ((rightVal-minVal) * yRange / range);
 			if(continous) {
 				if (xEnd > maxPosX) {
 					proj.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetRight);
@@ -401,8 +401,8 @@ public class SignalPainter extends TrackPainter {
 				}
 			} else {				
 				proj.setForeground(waveCanvas.colors[WaveformColors.SIGNAL_REAL.ordinal()]);
-				int yOffsetLeft = (int) ((leftVal-minVal) / range * (yOffsetB-yOffsetT));
+				int yOffsetLeft = (int) ((leftVal-minVal) * (yOffsetB-yOffsetT) / range);
-				int yOffsetRight = Double.isNaN(rightVal)?yOffsetLeft:(int) ((rightVal-minVal) / range * (yOffsetB-yOffsetT));
+				int yOffsetRight = Double.isNaN(rightVal)?yOffsetLeft:(int) ((rightVal-minVal) * (yOffsetB-yOffsetT) / range);
 				if(continous) {
 					if (xEnd > maxPosX) {
 						proj.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetRight);

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import java.util.Collection;
 import java.util.List;
@@ -135,9 +135,6 @@ public class StreamPainter extends TrackPainter{
 		if(bb.x+bb.width<area.x || bb.x>area.x+area.width) return;
 		if(bb.width==0){
 			proj.drawLine(bb.x, bb.y, bb.x, bb.y+bb.height);
-		} else if(bb.width<10){
-			proj.fillRectangle(bb);
-			proj.drawRectangle(bb);
 		} else {
 			if(bb.x < area.x) {
 				bb.width = bb.width-(area.x-bb.x)+5;
@@ -149,8 +146,9 @@ public class StreamPainter extends TrackPainter{
 				bb_x2=area_x2+5;
 				bb.width= bb_x2-bb.x;
 			}
-			proj.fillRoundRectangle(bb.x, bb.y, bb.width, bb.height, 5, 5);
+			int arc = bb.width<10?1:5;
-			proj.drawRoundRectangle(bb.x, bb.y, bb.width, bb.height, 5, 5);
+			proj.fillRoundRectangle(bb.x, bb.y, bb.width, bb.height, arc, arc);
+			proj.drawRoundRectangle(bb.x, bb.y, bb.width, bb.height, arc, arc);
 		}
 	}
 

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

@@ -1,4 +1,4 @@
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
@@ -13,9 +13,9 @@ import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Widget;
 
-import com.minres.scviewer.database.swt.Constants;
+import com.minres.scviewer.database.ui.swt.Constants;
-import com.minres.scviewer.database.swt.ToolTipContentProvider;
+import com.minres.scviewer.database.ui.swt.ToolTipContentProvider;
-import com.minres.scviewer.database.swt.ToolTipHelpTextProvider;
+import com.minres.scviewer.database.ui.swt.ToolTipHelpTextProvider;
 
 class ToolTipHandler {
 

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import java.util.Map.Entry;
 import java.util.TreeMap;

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import com.minres.scviewer.database.ui.TrackEntry;
 

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,6 +25,7 @@ import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
@@ -39,15 +40,17 @@ import com.google.common.collect.Lists;
 import com.minres.scviewer.database.ITx;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;
-import com.minres.scviewer.database.swt.Constants;
+import com.minres.scviewer.database.ui.IWaveformView;
-import com.minres.scviewer.database.ui.IWaveformViewer;
 import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.database.ui.WaveformColors;
+import com.minres.scviewer.database.ui.swt.Constants;
 
 public class WaveformCanvas extends Canvas {
 	
     Color[] colors = new Color[WaveformColors.values().length];
 
+    private boolean doubleBuffering = true;
+    	
     private int trackHeight = 50;
     
     private long scaleFactor = 1000000L; // 1ns
@@ -108,10 +111,10 @@ public class WaveformCanvas extends Canvas {
 		// order is important: it is bottom to top
         trackAreaPainter=new TrackAreaPainter(this);
         painterList.add(trackAreaPainter);
+        arrowPainter=new ArrowPainter(this, IWaveformView.NEXT_PREV_IN_STREAM);
+        painterList.add(arrowPainter);
         rulerPainter=new RulerPainter(this);
         painterList.add(rulerPainter);
-        arrowPainter=new ArrowPainter(this, IWaveformViewer.NEXT_PREV_IN_STREAM);
-        painterList.add(arrowPainter);
 		CursorPainter cp = new CursorPainter(this, scaleFactor * 10, cursorPainters.size()-1);
 		painterList.add(cp);
 		cursorPainters.add(cp);
@@ -226,10 +229,10 @@ public class WaveformCanvas extends Canvas {
     }
 
     public void setZoomLevel(int level, long centerTime) {
+    	//FIXME: keep center if zoom-out and cursor is not in view
     	long oldScaleFactor=scaleFactor;
     	if(level<0) level = 0;
     	if(level<Constants.unitMultiplier.length*Constants.unitString.length){
-    		this.level = level;
     		this.scaleFactor = (long) Math.pow(10, level/2);
     		if(level%2==1) this.scaleFactor*=3;
     		ITx tx = arrowPainter.getTx();
@@ -240,18 +243,19 @@ public class WaveformCanvas extends Canvas {
     		 * xcn = tc/newScaleFactor
     		 * t0n = (xcn-xoffs)*scaleFactor
     		 */
-    		long xc=centerTime/oldScaleFactor; // cursor total x-offset
+			long xc=centerTime/oldScaleFactor; // cursor total x-offset
-    		long xoffs=xc+origin.x; // cursor offset relative to left border
+			long xoffs=xc+origin.x; // cursor offset relative to left border
-    		long xcn=centerTime/scaleFactor; // new total x-offset
+			long xcn=centerTime/scaleFactor; // new total x-offset
-    		long originX=xcn-xoffs;
+			long originX=xcn-xoffs;
-    		if(originX>0) {
+			if(originX>0) {
-    			origin.x=(int) -originX; // new cursor time offset relative to left border
+				origin.x=(int) -originX; // new cursor time offset relative to left border
-    		}else {
+			}else {
-    			origin.x=0;
+				origin.x=0;
-    		}
+			}
     		syncScrollBars();
     		arrowPainter.setTx(tx);    		
     		redraw();
+    		this.level = level;
     	}
     }
 
@@ -397,8 +401,20 @@ public class WaveformCanvas extends Canvas {
 
     /* Paint function */
     private void paint(GC gc) {
+        Point pt = getSize();
+        if(pt.x==0  || pt.y==0) return;
         Rectangle clientRect = getClientArea(); /* Canvas' painting area */
-        Projection p = new Projection(gc);
+        GC thisGc = gc;
+        Image d_backingImg = null;
+        if(doubleBuffering) {
+            d_backingImg = new Image(getDisplay(), pt.x, pt.y);
+            thisGc = new GC(d_backingImg);
+            thisGc.setBackground(gc.getBackground());
+            thisGc.setForeground(gc.getForeground());
+            thisGc.setFont(gc.getFont());
+            
+        }
+        Projection p = new Projection(thisGc);
         p.setTranslation(origin);
         if (painterList.size() > 0 ) {
             for (IPainter painter : painterList)
@@ -407,6 +423,11 @@ public class WaveformCanvas extends Canvas {
             gc.fillRectangle(clientRect);
             initScrollBars();
         }
+        if(doubleBuffering) {
+            gc.drawImage(d_backingImg, 0, 0);
+            d_backingImg.dispose();
+            thisGc.dispose();
+        }
     }
 
     public List<Object> getElementsAt(Point point) {

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

@@ -8,7 +8,7 @@
  * Contributors:
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
+package com.minres.scviewer.database.ui.swt.internal;
 
 import java.awt.Color;
 import java.beans.PropertyChangeEvent;
@@ -52,7 +52,6 @@ import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.MouseMoveListener;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -86,14 +85,14 @@ import com.minres.scviewer.database.ITxRelation;
 import com.minres.scviewer.database.ITxStream;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.RelationType;
-import com.minres.scviewer.database.swt.Constants;
 import com.minres.scviewer.database.ui.GotoDirection;
 import com.minres.scviewer.database.ui.ICursor;
-import com.minres.scviewer.database.ui.IWaveformViewer;
+import com.minres.scviewer.database.ui.IWaveformView;
 import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.database.ui.WaveformColors;
+import com.minres.scviewer.database.ui.swt.Constants;
 
-public class WaveformViewer implements IWaveformViewer  {
+public class WaveformView implements IWaveformView  {
 
 	private ListenerList<ISelectionChangedListener> selectionChangedListeners = new ListenerList<ISelectionChangedListener>();
 
@@ -103,7 +102,7 @@ public class WaveformViewer implements IWaveformViewer  {
 
 	private ITx currentTxSelection;
 
-	private TrackEntry currentWaveformSelection;
+	private ArrayList<TrackEntry> currentWaveformSelection = new ArrayList<>();
 
 	private ScrolledComposite nameListScrolled;
 
@@ -133,51 +132,49 @@ public class WaveformViewer implements IWaveformViewer  {
 
 	private Font nameFont, nameFontB;
 
+	protected TrackEntry lastClickedEntry;
+
 	protected MouseListener nameValueMouseListener = new MouseAdapter() {
+		
 		@Override
 		public void mouseDown(MouseEvent e) {
 			if (e.button == 1) {
 				Entry<Integer, TrackEntry> entry = trackVerticalOffset.floorEntry(e.y);
-				if (entry != null)
+				if(entry!=null)
-					setSelection(new StructuredSelection(entry.getValue()));
+					entry.getValue().selected=true;
 			} else if (e.button == 3) {
 				Menu topMenu= top.getMenu();
 				if(topMenu!=null) topMenu.setVisible(true);
 			}
 		}
+		
+		@Override
+		public void mouseUp(MouseEvent e) {
+			if (e.button == 1) {
+				Entry<Integer, TrackEntry> entry = trackVerticalOffset.floorEntry(e.y);
+				if (entry != null) {
+					if((e.stateMask & SWT.SHIFT) != 0) {
+						if(lastClickedEntry.selected) {
+							int firstIdx=streams.indexOf(lastClickedEntry);
+							int lastIdx = streams.indexOf(entry.getValue());
+							List<TrackEntry> res = firstIdx>lastIdx?streams.subList(lastIdx, firstIdx+1):streams.subList(firstIdx, lastIdx+1);
+							setSelection(new StructuredSelection(res), (e.stateMask & SWT.CTRL) !=0 , false);
+						} else
+							setSelection(new StructuredSelection(entry.getValue()), (e.stateMask & SWT.CTRL) !=0 , false);
+					} else {
+						setSelection(new StructuredSelection(entry.getValue()), (e.stateMask & SWT.CTRL) !=0 , false);
+					}
+					lastClickedEntry = entry.getValue();
+				}
+			}
+		}
 	};
 	
-	class WaveformMouseListener implements MouseMoveListener, MouseListener, PaintListener {
+	class WaveformMouseListener implements PaintListener, Listener {
 		Point start, end;
 		List<Object> initialSelected;
 		boolean down=false;
 
-		@Override
-		public void mouseDoubleClick(MouseEvent e) {
-		}
-
-		@Override
-		public void mouseDown(MouseEvent e) {
-			start=new Point(e.x, e.y);
-			end=new Point(e.x, e.y);
-			down=true;
-			if((e.stateMask&SWT.MODIFIER_MASK)!=0) return; //don't react on modifier
-			if (e.button ==  1) {	
-				initialSelected = waveformCanvas.getElementsAt(start);
-			} else if (e.button == 3) {
-				Menu topMenu= top.getMenu();
-				if(topMenu!=null) topMenu.setVisible(true);
-			}
-		}
-
-		@Override
-		public void mouseMove(MouseEvent e) {
-			if(down) {
-				end=new Point(e.x, e.y);
-				asyncUpdate(e.widget);
-			}	
-		}
-		
 		@Override
 		public void paintControl(PaintEvent e) {
 			if(down) {
@@ -185,19 +182,17 @@ public class WaveformViewer implements IWaveformViewer  {
 	            gc.setAlpha(128);
 	            int minX = Math.min(start.x, end.x);
 	            int width = Math.max(start.x, end.x) - minX;
-	            Point origin = waveformCanvas.getOrigin();
+	            int y_top = waveformCanvas.getRulerHeight();
-	            int y_top = waveformCanvas.getRulerHeight()- origin.y;
 	            int y_bottom = waveformCanvas.getSize().y;
 	            gc.fillRectangle(minX, y_top, width,y_bottom);
 			}
 		}
 
-		@Override
+		private void mouseUp(MouseEvent e) {
-		public void mouseUp(MouseEvent e) {
 			down=false;
 			if(start==null) return;
 			if((e.stateMask&SWT.MODIFIER_MASK&~SWT.SHIFT)!=0) return; //don't react on modifier except shift
-			if(!start.equals(end)){
+			if(e.button ==  1 && Math.abs(e.x-start.x)>3){
 				asyncUpdate(e.widget);
 				long startTime = waveformCanvas.getTimeForOffset(start.x);
 				long endTime = waveformCanvas.getTimeForOffset(end.x);
@@ -285,10 +280,45 @@ public class WaveformViewer implements IWaveformViewer  {
 			return time;
 		}
 
-	};
+		@Override
-	protected WaveformMouseListener waveformMouseListener = new WaveformMouseListener();
+		public void handleEvent(Event e) {
+			switch (e.type) {
+			case SWT.MouseWheel:
+				break;
+			case SWT.MouseDown:
+				start=new Point(e.x, e.y);
+				end=new Point(e.x, e.y);
+				if((e.stateMask&SWT.MODIFIER_MASK)!=0) return; //don't react on modifier
+				if (e.button ==  1) {	
+					down=true;
+					initialSelected = waveformCanvas.getElementsAt(start);
+				} else if (e.button == 3) {
+					Menu topMenu= top.getMenu();
+					if(topMenu!=null) topMenu.setVisible(true);
+				}
+				break;
+			case SWT.MouseUp:
+				mouseUp(new MouseEvent(e));
+				break;
+			//case SWT.MouseDoubleClick:
+				//mouseDoubleClick(new MouseEvent(e));
+				//break;
+			case SWT.MouseMove:
+				if(down) {
+					end=new Point(e.x, e.y);
+					asyncUpdate(e.widget);
+				}	
+				break;
+			default:
+				break;
+			}
+			
+		}
 
-	public WaveformViewer(Composite parent) {
+	};
+	protected WaveformMouseListener waveformMouseListener  = new WaveformMouseListener();
+
+	public WaveformView(Composite parent) {
 		pcs=new PropertyChangeSupport(this);
 
 		trackVerticalOffset = new TreeMap<Integer, TrackEntry>();
@@ -300,7 +330,7 @@ public class WaveformViewer implements IWaveformViewer  {
 		streams = new ObservableList<>();
 		streams.addPropertyChangeListener("content", this);
 
-		top = new Composite(parent, SWT.NONE);
+		top = parent;
 		top.setLayout(new FillLayout(SWT.HORIZONTAL));
 
 		SashForm topSash = new SashForm(top, SWT.SMOOTH);
@@ -385,9 +415,12 @@ public class WaveformViewer implements IWaveformViewer  {
 		valueListScrolled.setContent(valueList);
 
 		waveformCanvas.setMaxTime(1); 
-		waveformCanvas.addMouseListener(waveformMouseListener);
+		waveformCanvas.addPaintListener(waveformMouseListener);	
-		waveformCanvas.addMouseMoveListener(waveformMouseListener);
+		waveformCanvas.addListener(SWT.MouseDown,waveformMouseListener);
-		waveformCanvas.addPaintListener(waveformMouseListener);
+		waveformCanvas.addListener(SWT.MouseUp,waveformMouseListener);
+		//waveformCanvas.addListener(SWT.MouseDoubleClick,waveformMouseListener);
+		waveformCanvas.addListener(SWT.MouseMove,waveformMouseListener);
+		waveformCanvas.addListener(SWT.MouseWheel, waveformMouseListener);
 		
 		nameListScrolled.getVerticalBar().addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
@@ -458,7 +491,7 @@ public class WaveformViewer implements IWaveformViewer  {
 					@Override
 					public void run() {
 						update();
-						waveformCanvas.reveal(currentWaveformSelection.waveform);
+						currentWaveformSelection.stream().forEach(e -> waveformCanvas.reveal(e.waveform));
 						valueList.redraw();
 						nameList.redraw();
 					}
@@ -481,13 +514,11 @@ public class WaveformViewer implements IWaveformViewer  {
 		trackVerticalOffset.clear();
 		waveformCanvas.clearAllWaveformPainter(false);
 		boolean even = true;
-		boolean clearSelection = true;
 		TextLayout tl = new TextLayout(waveformCanvas.getDisplay());
 		tl.setFont(nameFontB);
 		for (TrackEntry streamEntry : streams) {
 			streamEntry.height = waveformCanvas.getTrackHeight();
 			streamEntry.vOffset=trackVerticalHeight;
-			clearSelection &= currentWaveformSelection!=null && (streamEntry.waveform != currentWaveformSelection.waveform);
 			if (streamEntry.isStream()) {
 				streamEntry.currentValue="";
 				streamEntry.height *= streamEntry.getStream().getMaxConcurrency();
@@ -513,7 +544,6 @@ public class WaveformViewer implements IWaveformViewer  {
 		if (trackVerticalOffset.isEmpty()){
 			waveformCanvas.setOrigin(0, 0);
 		}
-		if(clearSelection) setSelection(new StructuredSelection());
 	}
 
 	private int calculateValueWidth() {
@@ -651,14 +681,13 @@ public class WaveformViewer implements IWaveformViewer  {
 	 */
 	@Override
 	public ISelection getSelection() {
+		ArrayList<Object> sel = new ArrayList<>();
 		if (currentTxSelection != null) {
-			Object[] elem = {currentTxSelection, currentWaveformSelection};
+			sel.add(currentTxSelection);
-			return new StructuredSelection(elem);
+		}
-		} else if (currentWaveformSelection != null) {
+		// sel.addAll(currentWaveformSelection.stream().map(e -> e.waveform).collect(Collectors.toList()));
-			Object[] elem = {currentWaveformSelection.waveform, currentWaveformSelection};
+		sel.addAll(currentWaveformSelection);
-			return new StructuredSelection(elem);
+		return new StructuredSelection(sel.toArray());
-		} else
-			return new StructuredSelection();
 	}
 
 	/* (non-Javadoc)
@@ -666,22 +695,33 @@ public class WaveformViewer implements IWaveformViewer  {
 	 */
 	@Override
 	public void setSelection(ISelection selection) {
-		setSelection(selection, false);
+		setSelection(selection, false, false);
 	}
-
 	/* (non-Javadoc)
 	 * @see com.minres.scviewer.database.swt.IWaveformPanel#setSelection(org.eclipse.jface.viewers.ISelection, boolean)
 	 */
 	@Override
-	public void setSelection(ISelection selection, boolean addIfNeeded) {
+	public void setSelection(ISelection selection, boolean showIfNeeded) {
+		setSelection(selection, false, showIfNeeded);
+	}
+	/* (non-Javadoc)
+	 * @see com.minres.scviewer.database.swt.IWaveformPanel#addToSelection(org.eclipse.jface.viewers.ISelection, boolean)
+	 */
+	@Override
+	public void addToSelection(ISelection selection, boolean showIfNeeded) {
+		setSelection(selection, true, showIfNeeded);		
+	}
+	
+	public void setSelection(ISelection selection, boolean add, boolean addIfNeeded) {
 		boolean selectionChanged = false;
-		if(currentWaveformSelection!=null) currentWaveformSelection.selected=false;
+		currentWaveformSelection.forEach(e->e.selected=false);
 		if (selection instanceof IStructuredSelection) {
 			if(((IStructuredSelection) selection).size()==0){
 				selectionChanged = currentTxSelection!=null||currentWaveformSelection!=null;  
 				currentTxSelection = null;
-				currentWaveformSelection = null;
+				currentWaveformSelection .clear();
 			} else {
+				if(!add) currentWaveformSelection.clear();
 				for(Object sel:((IStructuredSelection) selection).toArray()){
 					if (sel instanceof ITx && currentTxSelection != sel){
 						ITx txSel = (ITx) sel;
@@ -694,26 +734,27 @@ public class WaveformViewer implements IWaveformViewer  {
 							streams.add(trackEntry);
 						}
 						currentTxSelection = txSel;
-						if(trackEntry!=null) currentWaveformSelection = trackEntry;
+//						if(trackEntry!=null) {
+//							currentWaveformSelection.add((TrackEntry)sel);
+//						}
 						selectionChanged = true;
-					} else if (sel instanceof TrackEntry && currentWaveformSelection != sel) {
+					} else if (sel instanceof TrackEntry && !currentWaveformSelection.contains(sel)) {
-						currentWaveformSelection = (TrackEntry) sel;
+						currentWaveformSelection.add((TrackEntry)sel);
-						if(currentTxSelection!=null && currentTxSelection.getStream()!=currentWaveformSelection)
+						if(currentTxSelection!=null && !selectionChanged)
-							currentTxSelection=null;
+							currentTxSelection=null;						
-						
 						selectionChanged = true;
 					}            		
 				}
 			}
 		} else {
-			if (currentTxSelection != null || currentWaveformSelection != null)
+			if (currentTxSelection != null || currentWaveformSelection.size() > 0)
 				selectionChanged = true;
 			currentTxSelection = null;
-			currentWaveformSelection = null;
+			currentWaveformSelection.clear();
 		}
-		if(currentWaveformSelection!=null) currentWaveformSelection.selected=true;
+		currentWaveformSelection.forEach(e -> e.selected = true);
 		if (selectionChanged) {
-			if(currentWaveformSelection!=null) waveformCanvas.reveal(currentWaveformSelection.waveform);
+			currentWaveformSelection.forEach(e -> waveformCanvas.reveal(e.waveform));
 			waveformCanvas.setSelected(currentTxSelection);
 			valueList.redraw();
 			nameList.redraw();
@@ -723,13 +764,11 @@ public class WaveformViewer implements IWaveformViewer  {
 
 	protected void fireSelectionChanged() {
 		if(currentWaveformSelection==null) return;
-		IStructuredSelection selection=currentTxSelection!=null?
+		ISelection selection=getSelection();
-				new StructuredSelection(new Object[]{currentTxSelection, currentWaveformSelection.waveform}):
+		Object[] list = selectionChangedListeners.getListeners();
-					new StructuredSelection(currentWaveformSelection.waveform);
+		for (int i = 0; i < list.length; i++) {
-				Object[] list = selectionChangedListeners.getListeners();
+			((ISelectionChangedListener) list[i]).selectionChanged(new SelectionChangedEvent(this, selection));
-				for (int i = 0; i < list.length; i++) {
+		}
-					((ISelectionChangedListener) list[i]).selectionChanged(new SelectionChangedEvent(this, selection));
-				}
 	}
 
 	/* (non-Javadoc)
@@ -740,12 +779,14 @@ public class WaveformViewer implements IWaveformViewer  {
 		if(direction==GotoDirection.NEXT || direction==GotoDirection.PREV)
 			moveSelection(direction, NEXT_PREV_IN_STREAM) ;
 		else {
-			int idx = streams.indexOf(currentWaveformSelection);
+			if(currentWaveformSelection.size()==1) {
+			int idx = streams.indexOf(currentWaveformSelection.get(0));
 			if(direction==GotoDirection.UP && idx>0) {
 				setSelection(new StructuredSelection(streams.get(idx-1)));
 			} else if(direction==GotoDirection.DOWN && idx<(streams.size()-1)) {
 				setSelection(new StructuredSelection(streams.get(idx+1)));
 			}
+			}
 		}
 	}
 
@@ -754,9 +795,15 @@ public class WaveformViewer implements IWaveformViewer  {
 	 */
 	@Override
 	public void moveSelection(GotoDirection direction, RelationType relationType) {
-		if (currentWaveformSelection!=null && currentWaveformSelection.isStream() && currentTxSelection!=null) {
+		TrackEntry selectedWaveform=null;
-			if(relationType.equals(IWaveformViewer.NEXT_PREV_IN_STREAM)){
+		if(currentTxSelection!=null)
-				ITxStream<? extends ITxEvent> stream = currentWaveformSelection.getStream();
+			selectedWaveform = getEntryForStream(currentTxSelection.getStream());
+		else if(currentWaveformSelection.size()!=1) return;
+		if(selectedWaveform==null)
+			selectedWaveform = currentWaveformSelection.get(1);
+		if (selectedWaveform!=null && selectedWaveform.isStream() && currentTxSelection!=null) {
+			if(relationType.equals(IWaveformView.NEXT_PREV_IN_STREAM)){
+				ITxStream<? extends ITxEvent> stream = selectedWaveform.getStream();
 				ITx transaction = null;
 				if (direction == GotoDirection.NEXT) {
 					List<ITxEvent> thisEntryList = stream.getEvents().get(currentTxSelection.getBeginTime());
@@ -856,14 +903,14 @@ public class WaveformViewer implements IWaveformViewer  {
 	 */
 	@Override
 	public void moveCursor(GotoDirection direction) {
+		if(currentWaveformSelection.size()!=1) return;
+		TrackEntry sel = currentWaveformSelection.get(0);
 		long time = getCursorTime();
 		NavigableMap<Long, ?> map=null;
-		if(currentWaveformSelection!=null) {
+		if(sel.isStream()){
-			if(currentWaveformSelection.isStream()){
+			map=sel.getStream().getEvents();
-				map=currentWaveformSelection.getStream().getEvents();
+		} else if(sel.isSignal()){
-			} else if(currentWaveformSelection.isSignal()){
+			map=sel.getSignal().getEvents();
-				map=currentWaveformSelection.getSignal().getEvents();
-			}
 		}
 		if(map!=null){
 			Entry<Long, ?> entry=direction==GotoDirection.PREV?map.lowerEntry(time):map.higherEntry(time);
@@ -885,29 +932,37 @@ public class WaveformViewer implements IWaveformViewer  {
 	public List<TrackEntry> getStreamList() {
 		return streams;
 	}
-
+	/* (non-Javadoc)
+	 * @see com.minres.scviewer.database.swt.IWaveformPanel#deleteSelectedTracks()
+	 */
+	@Override
+	public void deleteSelectedTracks() {
+		List<TrackEntry> streams = getStreamList();
+		for (Object o : (IStructuredSelection)getSelection()) {
+			if(o instanceof TrackEntry) {
+				TrackEntry e = (TrackEntry) o;
+				e.selected=false;
+				streams.remove(e);				
+			}
+		}
+		setSelection(new StructuredSelection());
+		update();
+	}
 	/* (non-Javadoc)
 	 * @see com.minres.scviewer.database.swt.IWaveformPanel#moveSelected(int)
 	 */
 	@Override
 	public void moveSelectedTrack(int i) {
-		if(currentWaveformSelection!=null){
+		if(currentWaveformSelection.size()>0){
-			int idx = streams.indexOf(currentWaveformSelection);
+			int idx = streams.indexOf(currentWaveformSelection.get(0));
-			int newIdx=idx+i;
+			for(Object o: currentWaveformSelection)
-			if(newIdx>=0 && newIdx<streams.size()){
+				streams.remove(o);
-				Collections.swap(streams,idx,newIdx);
+			int tgtIdx=idx+i;
-				revealSelected=true;
+			if(tgtIdx<0) tgtIdx=0;
-//				update();
+			if(tgtIdx>=streams.size())
-//				ITx selectedTx=currentTxSelection;
+				streams.addAll(currentWaveformSelection);
-//				if(selectedTx!=null){
+			else
-//					setSelection(new StructuredSelection(new Object[]{selectedTx, currentWaveformSelection.waveform}));
+				streams.addAll(tgtIdx, currentWaveformSelection);
-//				} else {
-//					setSelection(new StructuredSelection(currentWaveformSelection.waveform));
-//				}
-//				waveformCanvas.reveal(currentWaveformSelection.waveform);
-//				valueList.redraw();
-//				nameList.redraw();
-			}
 		}	
 	}
 
@@ -1109,38 +1164,30 @@ public class WaveformViewer implements IWaveformViewer  {
 		dropTarget.setTransfer(types);
 
 		dropTarget.addDropListener(new DropTargetAdapter() {
+			@SuppressWarnings("unchecked")
 			public void drop(DropTargetEvent event) {
 				if (LocalSelectionTransfer.getTransfer().isSupportedType(event.currentDataType)){
-					ISelection sel = LocalSelectionTransfer.getTransfer().getSelection();
+					ISelection s = LocalSelectionTransfer.getTransfer().getSelection();
-					if(sel!=null && sel instanceof IStructuredSelection){
+					if(s!=null && s instanceof IStructuredSelection){
-						Object source = ((IStructuredSelection)sel).getFirstElement();
+						IStructuredSelection sel = (IStructuredSelection) s;
+						for(Object o: sel.toList())
+							streams.remove(o);
 						DropTarget tgt = (DropTarget) event.widget;
 						Point dropPoint = ((Canvas) tgt.getControl()).toControl(event.x, event.y);
-						Object target = trackVerticalOffset.floorEntry(dropPoint.y).getValue();
+						// extract all elements being selected
-						if(source instanceof TrackEntry && target instanceof TrackEntry){
+						if( dropPoint.y > trackVerticalOffset.lastKey()) {
-							TrackEntry srcWave=(TrackEntry) source;
+							streams.addAll(sel.toList());
-							int srcIdx=streams.indexOf(srcWave);
+						} else {
-							streams.remove(srcWave);
+							TrackEntry target = trackVerticalOffset.floorEntry(dropPoint.y).getValue();
 							int tgtIdx=streams.indexOf(target);
-							if(srcIdx<=tgtIdx) tgtIdx++;
+							streams.addAll(tgtIdx, sel.toList());
-							if(tgtIdx>=streams.size())
+						}	
-								streams.add(srcWave);
-							else
-								streams.add(tgtIdx, srcWave);
-							currentWaveformSelection=srcWave;
-							update();
-						} else if(source instanceof CursorPainter){
-							((CursorPainter)source).setTime(0);
-							updateValueList();
-						}
 					}
 				}
 			}
 
-
 			public void dropAccept(DropTargetEvent event) {
-				Point offset = canvas.toControl(event.x, event.y); 
+				if (event.detail != DND.DROP_MOVE) {
-				if (event.detail != DND.DROP_MOVE || offset.y > trackVerticalOffset.lastKey() + waveformCanvas.getTrackHeight()) {
 					event.detail = DND.DROP_NONE;
 				}
 			}
@@ -1351,4 +1398,5 @@ public class WaveformViewer implements IWaveformViewer  {
 	public void addDisposeListener( DisposeListener listener ) {
 		waveformCanvas.addDisposeListener(listener);
 	}
+
 }

plugins/com.minres.scviewer.database.ui.swt/src/org/eclipse/wb/swt/SWTResourceManager.java

@@ -1,13 +1,13 @@
-/*******************************************************************************
+/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2011 Google, Inc.
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
- *
+ *
- * Contributors:
+ * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
+ *    Google, Inc. - initial API and implementation
- *******************************************************************************/
+ *******************************************************************************/
 package org.eclipse.wb.swt;
 
 import java.io.FileInputStream;

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

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

plugins/com.minres.scviewer.database.ui/.project

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.minres.scviewer.database.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

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

@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8

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

@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false

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

@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Database UI
-Bundle-SymbolicName: com.minres.scviewer.database.ui
-Bundle-Version: 2.0.0.qualifier
-Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: com.minres.scviewer.database.ui
-Require-Bundle: com.minres.scviewer.database,
- org.eclipse.jface,
- org.eclipse.swt
-Automatic-Module-Name: com.minres.scviewer.database.ui

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

@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

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

@@ -1,12 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>com.minres.scviewer.database.ui</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-  <parent>
-  	<groupId>com.minres.scviewer</groupId>
-  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.0.0-SNAPSHOT</version>
-	<relativePath>../..</relativePath>
-  </parent>
-  </project>

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

@@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

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

@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

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

@@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

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

@@ -1,3 +1,2 @@
 eclipse.preferences.version=1
 pluginProject.extensions=false
-resolve.requirebundle=false

plugins/com.minres.scviewer.e4.application/Application.e4xmi

@@ -3,41 +3,16 @@
   <children xsi:type="basic:TrimmedWindow" xmi:id="_95PfsXNmEeWBq8z1Dv39LA" label="SC Viewer" bindingContexts="_95PfunNmEeWBq8z1Dv39LA" width="1280" height="700">
     <children xsi:type="advanced:PerspectiveStack" xmi:id="_95QGxnNmEeWBq8z1Dv39LA">
       <children xsi:type="advanced:Perspective" xmi:id="_95QGx3NmEeWBq8z1Dv39LA">
-        <children xsi:type="basic:PartSashContainer" xmi:id="_95QGyHNmEeWBq8z1Dv39LA" horizontal="true">
+        <children xsi:type="basic:PartStack" xmi:id="_95QGyXNmEeWBq8z1Dv39LA" elementId="org.eclipse.editorss" containerData="7500">
-          <children xsi:type="basic:Part" xmi:id="_95QGynNmEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.parts.DesignBrowser" containerData="2000" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.parts.DesignBrowser" label="Design Browser" bindingContexts="_iQ3kQGVmEeqSQM-A6dw9ig">
+          <tags>NoAutoCollapse</tags>
-            <handlers xmi:id="_JIWOYIq-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.handler.addWaveformCommand" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.AddWaveformHandler" command="_2PehEHr9EeWVM_sKoXvptg"/>
-            <menus xsi:type="menu:PopupMenu" xmi:id="_HvUl8Iq-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.parts.DesignBrowser.popupmenu">
-              <children xsi:type="menu:HandledMenuItem" xmi:id="_HvUl8Yq-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.handledmenuitem.append" label="Append after" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/append_wave.png" command="_2PehEHr9EeWVM_sKoXvptg">
-                <parameters xmi:id="_HvUl8oq-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.parameter.21" name="com.minres.scviewer.e4.application.command.addwaveform.where" value="after"/>
-                <parameters xmi:id="_HvUl84q-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.parameter.25" name="com.minres.scviewer.e4.application.command.addwaveform.all" value="false"/>
-              </children>
-              <children xsi:type="menu:HandledMenuItem" xmi:id="_HvUl9Iq-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.handledmenuitem.insertbefore" label="Insert before" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/insert_wave.png" command="_2PehEHr9EeWVM_sKoXvptg">
-                <parameters xmi:id="_HvUl9Yq-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.parameter.22" name="com.minres.scviewer.e4.application.command.addwaveform.where" value="before"/>
-                <parameters xmi:id="_HvUl9oq-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.parameter.26" name="com.minres.scviewer.e4.application.command.addwaveform.all" value="false"/>
-              </children>
-              <children xsi:type="menu:HandledMenuItem" xmi:id="_HvUl94q-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.handledmenuitem.appendall" label="Append all" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/append_all_waves.png" command="_2PehEHr9EeWVM_sKoXvptg">
-                <parameters xmi:id="_HvUl-Iq-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.parameter.23" name="com.minres.scviewer.e4.application.command.addwaveform.where" value="after"/>
-                <parameters xmi:id="_HvUl-Yq-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.parameter.27" name="com.minres.scviewer.e4.application.command.addwaveform.all" value="true"/>
-              </children>
-              <children xsi:type="menu:HandledMenuItem" xmi:id="_HvUl-oq-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.handledmenuitem.insertall" label="Insert All" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/insert_all_waves.png" command="_2PehEHr9EeWVM_sKoXvptg">
-                <parameters xmi:id="_HvUl-4q-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.parameter.24" name="com.minres.scviewer.e4.application.command.addwaveform.where" value="before"/>
-                <parameters xmi:id="_HvUl_Iq-EeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.parameter.28" name="com.minres.scviewer.e4.application.command.addwaveform.all" value="true"/>
-              </children>
-            </menus>
-          </children>
-          <children xsi:type="basic:PartSashContainer" xmi:id="_uT9BIHgtEeWwZ-9vrAR2UQ" elementId="" containerData="8000">
-            <children xsi:type="basic:PartStack" xmi:id="_95QGyXNmEeWBq8z1Dv39LA" elementId="org.eclipse.editorss" containerData="7500">
-              <tags>NoAutoCollapse</tags>
-            </children>
-            <children xsi:type="basic:Part" xmi:id="_vtfm8HgtEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.parts.WaveformDetails" containerData="2500" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.parts.TransactionDetails" label="Waveform Details"/>
-          </children>
         </children>
       </children>
     </children>
     <children xsi:type="basic:Part" xmi:id="__VNlAIytEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.dialog.aboutscviewer" toBeRendered="false" visible="false" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.parts.AboutDialog" label="About SCViewer" bindingContexts="_95Pfu3NmEeWBq8z1Dv39LA"/>
     <mainMenu xmi:id="_95PfyXNmEeWBq8z1Dv39LA" elementId="menu:org.eclipse.ui.main.menu">
       <children xsi:type="menu:Menu" xmi:id="_95QGwHNmEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.menu.file" label="File">
-        <children xsi:type="menu:HandledMenuItem" xmi:id="_VJG3YHgvEeWwZ-9vrAR2UQ" elementId="" label="Open Database" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/folder_database.png" mnemonics="M1+O" command="_95PfwHNmEeWBq8z1Dv39LA"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_igsK0BkREeudD5MqrWoETQ" elementId="" label="Open Database" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/folder_database.png" mnemonics="M1+O" command="_95PfwHNmEeWBq8z1Dv39LA"/>
+        <children xsi:type="menu:HandledMenuItem" xmi:id="_VJG3YHgvEeWwZ-9vrAR2UQ" elementId="" label="Re-load Database" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/database_refresh.png" mnemonics="M1+R" command="_srACsBkREeudD5MqrWoETQ"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_e7MOYJedEeW09eyIbHsdvg" elementId="" label="Load active tab settings" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/folder_page.png" command="_7-AIMJebEeW09eyIbHsdvg">
           <parameters xmi:id="_4vtYgJehEeW09eyIbHsdvg" elementId="com.minres.scviewer.e4.application.parameter.30" name="com.minres.scviewer.e4.application.commandparameter.loadStore" value="load"/>
         </children>
@@ -84,7 +59,8 @@
     </mainMenu>
     <trimBars xmi:id="_95QGy3NmEeWBq8z1Dv39LA" elementId="org.eclipse.ui.main.toolbar">
       <children xsi:type="menu:ToolBar" xmi:id="_95QGzHNmEeWBq8z1Dv39LA" elementId="toolbar:org.eclipse.ui.main.toolbar">
-        <children xsi:type="menu:HandledToolItem" xmi:id="_95QGzXNmEeWBq8z1Dv39LA" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/folder_database.png" tooltip="Open new database" command="_95PfwHNmEeWBq8z1Dv39LA"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_ZSajwBkZEeudD5MqrWoETQ" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/folder_database.png" tooltip="Open new database" command="_95PfwHNmEeWBq8z1Dv39LA"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_95QGzXNmEeWBq8z1Dv39LA" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/database_refresh.png" tooltip="Re-load database" command="_srACsBkREeudD5MqrWoETQ"/>
         <children xsi:type="menu:HandledToolItem" xmi:id="_o9UBUJeiEeW09eyIbHsdvg" elementId="com.minres.scviewer.e4.application.handledtoolitem.loadsettings" label="Load settings" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/folder_page.png" command="_7-AIMJebEeW09eyIbHsdvg">
           <parameters xmi:id="_tQZAEJeiEeW09eyIbHsdvg" elementId="com.minres.scviewer.e4.application.parameter.32" name="com.minres.scviewer.e4.application.commandparameter.loadStore" value="load"/>
         </children>
@@ -159,6 +135,8 @@
   <handlers xmi:id="_V4EscIuGEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.handler.setreleationtype" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.SetRelationTypeHandler" command="_E9lUgIt2EeWid7xO48ZBXw"/>
   <handlers xmi:id="__99WoJebEeW09eyIbHsdvg" elementId="com.minres.scviewer.e4.application.handler.loadStoreSettings" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.LoadStoreSettingsHandler" command="_7-AIMJebEeW09eyIbHsdvg"/>
   <handlers xmi:id="_x4pSEGtTEeqmlpoaaMHoiw" elementId="com.minres.scviewer.e4.application.handler.0" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.EnableHover" command="_uyeyYGtTEeqmlpoaaMHoiw"/>
+  <handlers xmi:id="_h3jU8BkWEeudD5MqrWoETQ" elementId="com.minres.scviewer.e4.application.handler.reloadCommand" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.ReloadHandler" command="_srACsBkREeudD5MqrWoETQ"/>
+  <handlers xmi:id="_gn_boBlEEeuiP60JNw0iiA" elementId="com.minres.scviewer.e4.application.handler.txSearch" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.SearchHandler" command="_XDxTYBlEEeuiP60JNw0iiA"/>
   <bindingTables xmi:id="_95PfvnNmEeWBq8z1Dv39LA" bindingContext="_95PfuXNmEeWBq8z1Dv39LA">
     <bindings xmi:id="_95Pfv3NmEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.keybinding.quit" keySequence="M1+Q" command="_95PfvHNmEeWBq8z1Dv39LA">
       <tags>type:user</tags>
@@ -223,6 +201,10 @@
       <children xsi:type="menu:HandledMenuItem" xmi:id="_Vj4jUHXIEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledmenuitem.remove" label="Remove" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/cross.png" tooltip="Remove stream/waveform from list" command="_WUZ2wHXHEeWwZ-9vrAR2UQ">
         <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_f6MH0HsCEeWVM_sKoXvptg" coreExpressionId="com.minres.scviewer.e4.application.oneWaveSeleted"/>
       </children>
+      <children xsi:type="menu:MenuSeparator" xmi:id="_KSB5EBmuEeuiP60JNw0iiA" elementId="com.minres.scviewer.e4.application.menuseparator.0"/>
+      <children xsi:type="menu:HandledMenuItem" xmi:id="_HOLGgBmuEeuiP60JNw0iiA" elementId="com.minres.scviewer.e4.application.handledmenuitem.search" label="Search Tx..." iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/find.png" command="_XDxTYBlEEeuiP60JNw0iiA">
+        <visibleWhen xsi:type="ui:ImperativeExpression" xmi:id="_HOLGgRmuEeuiP60JNw0iiA" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.SearchHandler"/>
+      </children>
     </menus>
     <menus xsi:type="menu:PopupMenu" xmi:id="_CxJvAHXGEeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.popupmenu.wavecontext" label="Wave Menu">
       <children xsi:type="menu:HandledMenuItem" xmi:id="_7HrlwHXREeWwZ-9vrAR2UQ" elementId="com.minres.scviewer.e4.application.handledmenuitem.moveup" label="Move up" iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/up_blue.png" command="_N_sOkHXHEeWwZ-9vrAR2UQ">
@@ -249,6 +231,9 @@
         <visibleWhen xsi:type="ui:ImperativeExpression" xmi:id="_psvR0M1gEei6rfTGo88R-w" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.elements.WaveformPopupMenuContribution"/>
         <children xsi:type="menu:DynamicMenuContribution" xmi:id="_IQZZQM3hEei6rfTGo88R-w" elementId="com.minres.scviewer.e4.application.dynamicmenucontribution.0" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.elements.WaveformPopupMenuContribution"/>
       </children>
+      <children xsi:type="menu:HandledMenuItem" xmi:id="_NnJA4BlEEeuiP60JNw0iiA" elementId="com.minres.scviewer.e4.application.handledmenuitem.search" label="Search Tx..." iconURI="platform:/plugin/com.minres.scviewer.e4.application/icons/find.png" command="_XDxTYBlEEeuiP60JNw0iiA">
+        <visibleWhen xsi:type="ui:ImperativeExpression" xmi:id="_Se1voBlEEeuiP60JNw0iiA" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.SearchHandler"/>
+      </children>
     </menus>
   </descriptors>
   <commands xmi:id="_95PfvHNmEeWBq8z1Dv39LA" elementId="org.eclipse.ui.file.exit" commandName="Quit Command"/>
@@ -290,6 +275,8 @@
     <parameters xmi:id="_4C_asc3ZEei6rfTGo88R-w" elementId="com.minres.scviewer.e4.application.commandparameter.changevaluedisplay" name="Type" optional="false"/>
   </commands>
   <commands xmi:id="_uyeyYGtTEeqmlpoaaMHoiw" elementId="com.minres.scviewer.e4.application.command.enablehover" commandName="Enable hover" description="Enable hover window in waveform"/>
+  <commands xmi:id="_srACsBkREeudD5MqrWoETQ" elementId="com.minres.scviewer.e4.application.reload" commandName="Reload Command"/>
+  <commands xmi:id="_XDxTYBlEEeuiP60JNw0iiA" elementId="com.minres.scviewer.e4.application.txSearch" commandName="Search Command"/>
   <addons xmi:id="_95PfsnNmEeWBq8z1Dv39LA" elementId="org.eclipse.e4.core.commands.service" contributionURI="bundleclass://org.eclipse.e4.core.commands/org.eclipse.e4.core.commands.CommandServiceAddon"/>
   <addons xmi:id="_95Pfs3NmEeWBq8z1Dv39LA" elementId="org.eclipse.e4.ui.contexts.service" contributionURI="bundleclass://org.eclipse.e4.ui.services/org.eclipse.e4.ui.services.ContextServiceAddon"/>
   <addons xmi:id="_95PftHNmEeWBq8z1Dv39LA" elementId="org.eclipse.e4.ui.bindings.service" contributionURI="bundleclass://org.eclipse.e4.ui.bindings/org.eclipse.e4.ui.bindings.BindingServiceAddon"/>

plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.minres.scviewer.e4.application;singleton:=true
-Bundle-Version: 2.6.1.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.11.1",
@@ -15,7 +15,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.e4.ui.di;bundle-version="1.1.0",
  org.eclipse.e4.core.contexts;bundle-version="1.4.0",
  com.minres.scviewer.database.ui.swt;bundle-version="1.0.0",
- com.minres.scviewer.database.ui,
  com.minres.scviewer.database;bundle-version="1.0.0",
  org.eclipse.osgi.services;bundle-version="3.5.0",
  org.eclipse.e4.core.services;bundle-version="2.0.0",
@@ -29,7 +28,10 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  com.opcoach.e4.preferences,
  org.eclipse.e4.core.di.extensions,
  org.eclipse.e4.ui.css.swt.theme;bundle-version="0.10.0",
- org.eclipse.core.resources;bundle-version="3.13.0"
+ org.eclipse.core.resources;bundle-version="3.13.0",
+ javax.annotation;bundle-version="1.2.0",
+ org.eclipse.core.databinding,
+ org.eclipse.jface.databinding
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.minres.scviewer.database,
  javax.inject;version="1.0.0"

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

@@ -22,6 +22,27 @@
          </property>
       </product>
    </extension>
+   <extension
+         id="product_slim"
+         point="org.eclipse.core.runtime.products">
+      <product
+            application="org.eclipse.e4.ui.workbench.swt.E4Application"
+            description="%product.description"
+            name="SCViewer">
+         <property
+               name="lifeCycleURI"
+               value="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.E4LifeCycle">
+         </property>
+         <property
+               name="appName"
+               value="SCViewer">
+         </property>
+         <property
+               name="applicationCSS"
+               value="platform:/plugin/com.minres.scviewer.e4.application/css/default.css">
+         </property>
+      </product>
+   </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
       <definition

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

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>com.minres.scviewer.e4.application</artifactId>
-  <version>2.6.1-SNAPSHOT</version>
+  <version>2.9.0-SNAPSHOT</version>
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>

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

@@ -10,14 +10,11 @@
  *******************************************************************************/
 package com.minres.scviewer.e4.application;
 
-import java.io.File;
 import java.io.IOException;
 
 import javax.annotation.PostConstruct;
-import javax.inject.Inject;
 
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -64,9 +61,11 @@ public class E4LifeCycle {
 	 * @param eventBroker the event broker
 	 */
 	@PostContextCreate
-	void postContextCreate(IApplicationContext appContext, final IEventBroker eventBroker) {
+	void postContextCreate(IApplicationContext appContext, final IEventBroker eventBroker,  
+			final IEclipseContext workbenchContext) {
+		
 		final String[] args = (String[])appContext.getArguments().get(IApplicationContext.APPLICATION_ARGS);
-		Options opt = new Options(args, 0, 1);
+		final Options opt = new Options(args, 0, Integer.MAX_VALUE);
 		opt.getSet()
 			.addOption("clearPersistedState", Multiplicity.ZERO_OR_ONE)
 			.addOption("c", Separator.BLANK, Multiplicity.ZERO_OR_ONE);
@@ -77,22 +76,14 @@ public class E4LifeCycle {
 		final String confFile =opt.getSet().isSet("c")?opt.getSet().getOption("c").getResultValue(0):"";
 
 		// react on the first view being created, at that time the UI is available
-		eventBroker.subscribe(UIEvents.UILifeCycle.ACTIVATE, new EventHandler() {
+//		eventBroker.subscribe(UIEvents.UILifeCycle.ACTIVATE, new EventHandler() {
-			@Override
+//			@Override
-			public void handleEvent(Event event) {
+//			public void handleEvent(Event event) {
-				MPart part = (MPart) event.getProperty("ChangedElement"); //$NON-NLS-1$
+//				MPart part = (MPart) event.getProperty("ChangedElement"); //$NON-NLS-1$
-				if(part!=null){
+//				if(part!=null){
-					IEclipseContext ctx = part.getContext();
+//				}
-					OpenViewHandler openViewHandler= new OpenViewHandler();
+//			}
-					if(confFile.length()>0) openViewHandler.setConfigFile(confFile);
+//		});
-					ContextInjectionFactory.inject(openViewHandler, ctx);
-					eventBroker.unsubscribe(this);
-					for(String name:opt.getSet().getData()){
-						openViewHandler.openViewForFile(name);
-					}
-				}
-			}
-		});
 		eventBroker.subscribe(UIEvents.UILifeCycle.APP_STARTUP_COMPLETE, new EventHandler() {
 			@Override
 			public void handleEvent(Event event) {
@@ -101,9 +92,20 @@ public class E4LifeCycle {
 					boolean isLocked = instanceLocation.isLocked();
 					if(isLocked)
 						instanceLocation.release();
-				} catch (IOException e) {
+				} catch (IOException e) { }
-					// TODO Auto-generated catch block
+				if(opt.getSet().getData().size()>0) {
-					e.printStackTrace();
+					MApplication app= workbenchContext.get(MApplication.class);
+					EModelService modelService = workbenchContext.get(EModelService.class);
+					EPartService partService= workbenchContext.get(EPartService.class);
+					MPart part = partService .createPart("com.minres.scviewer.e4.application.partdescriptor.waveformviewer"); //$NON-NLS-1$
+					part.setLabel(opt.getSet().getData().get(0));
+					MPartStack partStack = (MPartStack)modelService.find("org.eclipse.editorss", app); //$NON-NLS-1$
+					partStack.getChildren().add(part);
+					partService.showPart(part, PartState.CREATE);
+					partService.showPart(part, PartState.ACTIVATE);
+					IEclipseContext ctx = part.getContext();
+					ctx.modify("input", opt.getSet().getData());
+					ctx.modify("config", confFile); //$NON-NLS-1$
 				}
 			}
 		});
@@ -135,70 +137,4 @@ public class E4LifeCycle {
 	@ProcessRemovals
 	void processRemovals(IEclipseContext workbenchContext) {
 	}
-
-	/**
-	 * Join.
-	 *
-	 * @param tokens the tokens
-	 * @return the string
-	 */
-	String join(String[] tokens){
-		StringBuilder sb = new StringBuilder();
-		boolean first=true;
-		for(String token:tokens){
-			if(!first) sb.append(","); //$NON-NLS-1$
-			sb.append(token);
-			first=false;
-		}
-		return sb.toString();
-	}
-	
-	/**
-	 * The Class OpenViewHandler.
-	 */
-	private class OpenViewHandler {
-		
-		/** The app. */
-		@Inject MApplication app;
-		
-		/** The model service. */
-		@Inject EModelService modelService;
-		
-		/** The part service. */
-		@Inject EPartService partService;
-		
-		String confFile="";
-		/**
-		 * Open view for file.
-		 *
-		 * @param name the name
-		 */
-		public void openViewForFile(String name){
-			File file = new File(getFirstFileName(name));
-			if(!file.exists())
-				return;
-			MPart part = partService.createPart("com.minres.scviewer.e4.application.partdescriptor.waveformviewer"); //$NON-NLS-1$
-			part.setLabel(file.getName());
-			MPartStack partStack = (MPartStack)modelService.find("org.eclipse.editorss", app); //$NON-NLS-1$
-			partStack.getChildren().add(part);
-			partService.showPart(part, PartState.ACTIVATE);
-			IEclipseContext ctx=part.getContext();
-			ctx.modify("input", name); //$NON-NLS-1$
-			//ctx.declareModifiable("input"); //$NON-NLS-1$
-			ctx.modify("config", confFile); //$NON-NLS-1$
-			//ctx.declareModifiable("config"); //$NON-NLS-1$				
-		}
-
-		private String getFirstFileName(String name) {
-			if(name.contains(",")) {
-				String[] tokens = name.split(",");
-				return tokens[0];
-			} else
-				return name;
-		}
-
-		public void setConfigFile(String confFile) {
-			this.confFile=confFile;
-		}
-	}
 }

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

@@ -41,6 +41,7 @@ public class Messages extends NLS {
 	public static String TransactionDetails_21;
 	public static String TransactionDetails_3;
 	public static String TransactionDetails_4;
+	public static String WaveformPreferencesPage_description;
 	public static String WaveformPreferencesPage_1;
 	public static String WaveformViewer_13;
 	public static String WaveformViewer_14;
@@ -61,6 +62,30 @@ public class Messages extends NLS {
 	public static String WaveStatusBarControl_6;
 	public static String WaveStatusBarControl_7;
 	public static String WaveStatusBarControl_8;
+	public static String line;
+	public static String line_highlite;
+	public static String track_bg_even;
+	public static String track_bg_odd;
+	public static String track_bg_highlite;
+	public static String tx_bg;
+	public static String tx_bg_highlite;
+	public static String tx_border;
+	public static String signal0;
+	public static String signal1;
+	public static String signalz;
+	public static String signalx;
+	public static String signalu;
+	public static String signal_text;
+	public static String signal_real;
+	public static String signal_nan;
+	public static String cursor;
+	public static String cursor_drag;
+	public static String cursor_text;
+	public static String marker;
+	public static String marker_text;
+	public static String rel_arrow;
+	public static String rel_arrow_highlite;
+
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

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

@@ -123,7 +123,7 @@ public class RelationTypeToolControl extends PartListener implements ISelectionC
 			    return;
 			}
 		}
-		comboViewer.getCombo().setEnabled(false);
+		if(comboViewer!=null) comboViewer.getCombo().setEnabled(false);
 	}
 
 	/* (non-Javadoc)

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

@@ -1,7 +1,6 @@
  
 package com.minres.scviewer.e4.application.elements;
 
-import java.util.Iterator;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -34,22 +33,46 @@ public class WaveformPopupMenuContribution {
 		
 	final TrackEntry nullEntry = new TrackEntry(null);
 	
+	private boolean selHasBitVector(ISelection sel, boolean checkForDouble) {
+		if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
+			for(Object elem:(IStructuredSelection)sel) {
+				if(elem instanceof TrackEntry) {
+					TrackEntry e = (TrackEntry) elem;
+					if(e.waveform instanceof ISignal<?>) {
+						Object o = ((ISignal<?>) e.waveform).getEvents().firstEntry().getValue();
+						if(checkForDouble && o instanceof Double) 
+							return true;
+						else if(o instanceof BitVector && ((BitVector)o).getWidth()>1)
+							return true;
+						else
+							return false;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	private TrackEntry getSingleTrackEntry(ISelection sel) {
+		TrackEntry entry=null;
+		if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
+			for(Object elem:(IStructuredSelection)sel) {
+				if(elem instanceof TrackEntry) {
+					if(entry != null)
+						return null;
+					entry = (TrackEntry) elem;
+				}
+			}
+		}
+		return entry;
+	}
+	
 	@Evaluate
 	public boolean evaluate() {
 		Object obj = activePart.getObject();
 		if(obj instanceof WaveformViewer){
 			WaveformViewer wfv = (WaveformViewer)obj;
-			ISelection sel = wfv.getSelection();
+			return selHasBitVector(wfv.getSelection(), true);
-			if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
-				Object selected = ((IStructuredSelection)sel).getFirstElement();
-				if(selected instanceof ISignal<?>) {
-					Object x = ((ISignal<?>) selected).getEvents().firstEntry().getValue();
-					if((x instanceof BitVector) && ((BitVector)x).getWidth()==1) {
-						return false;
-					} else
-						return true;
-				}
-			}
 		}
 		return false;
 	}
@@ -60,39 +83,24 @@ public class WaveformPopupMenuContribution {
 		if(obj instanceof WaveformViewer){
 			WaveformViewer wfv = (WaveformViewer)obj;
 			ISelection sel = wfv.getSelection();
-			if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
+			TrackEntry elem = getSingleTrackEntry(sel);
-				Iterator<?> it = ((IStructuredSelection)sel).iterator();
+			if(selHasBitVector(sel, false)) {
-				Object first = it.next();
+				addValueMenuItem(items, application, modelService, "hex", TrackEntry.ValueDisplay.DEFAULT, elem);
-				Object second=null;
+				addValueMenuItem(items, application, modelService, "unsigned", TrackEntry.ValueDisplay.UNSIGNED, elem);
-				if(it.hasNext()) second=it.next();
+				addValueMenuItem(items, application, modelService, "signed", TrackEntry.ValueDisplay.SIGNED, elem);
-				if(first instanceof ISignal<?>) {
+				items.add(MMenuFactory.INSTANCE.createMenuSeparator());
-					Object o = ((ISignal<?>) first).getEvents().firstEntry().getValue();
+				addWaveMenuItem(items, application, modelService, "bit vector", TrackEntry.WaveDisplay.DEFAULT, elem);
-					//com.minres.scviewer.e4.application.menu.mulitvaluesettings
+			}						
-					if((o instanceof Double) || (o instanceof BitVector)) {
+			addWaveMenuItem(items, application, modelService, "analog step-wise", TrackEntry.WaveDisplay.STEP_WISE, elem);
-						TrackEntry entry=nullEntry;
+			addWaveMenuItem(items, application, modelService, "analog continous", TrackEntry.WaveDisplay.CONTINOUS, elem);
-						if(second instanceof TrackEntry)
-							entry=(TrackEntry)second;
-						if(o instanceof BitVector) {
-						    addValueMenuItem(items, application, modelService, "hex", TrackEntry.ValueDisplay.DEFAULT, entry.valueDisplay);
-						    addValueMenuItem(items, application, modelService, "unsigned", TrackEntry.ValueDisplay.UNSIGNED, entry.valueDisplay);
-						    addValueMenuItem(items, application, modelService, "signed", TrackEntry.ValueDisplay.SIGNED, entry.valueDisplay);
-							items.add(MMenuFactory.INSTANCE.createMenuSeparator());
-							addWaveMenuItem(items, application, modelService, "bit vector", TrackEntry.WaveDisplay.DEFAULT, entry.waveDisplay);
-						}						
-						addWaveMenuItem(items, application, modelService, "analog step-wise", TrackEntry.WaveDisplay.STEP_WISE, entry.waveDisplay);
-						addWaveMenuItem(items, application, modelService, "analog continous", TrackEntry.WaveDisplay.CONTINOUS, entry.waveDisplay);
-					}
-				}
-			}
 		}
-
 	}
 
 	private void addValueMenuItem(List<MMenuElement> items, MApplication application, EModelService modelService,
-			String label, TrackEntry.ValueDisplay value, TrackEntry.ValueDisplay actual) {
+			String label, TrackEntry.ValueDisplay value, TrackEntry elem) {
 		MHandledMenuItem item = MMenuFactory.INSTANCE.createHandledMenuItem();
 		item.setType(ItemType.RADIO);
-		item.setSelected(value==actual);
+		item.setSelected(elem != null && elem.valueDisplay == value);
 		item.setLabel("Show as "+label);
 		item.setContributorURI("platform:/plugin/com.minres.scviewer.e4.application");
 		List<MCommand> cmds = modelService.findElements(application, "com.minres.scviewer.e4.application.command.changevaluedisplay", MCommand.class, null);
@@ -106,10 +114,10 @@ public class WaveformPopupMenuContribution {
 	}
 	
 	private void addWaveMenuItem(List<MMenuElement> items, MApplication application, EModelService modelService,
-			String label, TrackEntry.WaveDisplay value, TrackEntry.WaveDisplay actual) {
+			String label, TrackEntry.WaveDisplay value, TrackEntry elem) {
 		MHandledMenuItem item = MMenuFactory.INSTANCE.createHandledMenuItem();
 		item.setType(ItemType.RADIO);
-		item.setSelected(value==actual);
+		item.setSelected(elem != null && elem.waveDisplay==value);
 		item.setLabel("Render "+label);
 		item.setContributorURI("platform:/plugin/com.minres.scviewer.e4.application");
 		List<MCommand> cmds = modelService.findElements(application, "com.minres.scviewer.e4.application.command.changewavedisplay", MCommand.class, null);

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

@@ -1,8 +1,6 @@
  
 package com.minres.scviewer.e4.application.handlers;
 
-import java.util.Iterator;
-
 import javax.inject.Named;
 
 import org.eclipse.e4.core.di.annotations.CanExecute;
@@ -34,18 +32,14 @@ public class ChangeValueDisplay {
 			WaveformViewer wfv = (WaveformViewer)obj;
 			ISelection sel = wfv.getSelection();
 			if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
-				Iterator<?> it = ((IStructuredSelection)sel).iterator();
+				for(Object elem:(IStructuredSelection)sel) {
-				it.next();
+					if(elem instanceof TrackEntry) {
-				if(it.hasNext()) {
+						TrackEntry.ValueDisplay val= TrackEntry.ValueDisplay.valueOf(param);
-						Object second = it.next();
+						((TrackEntry)elem).valueDisplay=val;
-						if(second instanceof TrackEntry) {
+					}
-							TrackEntry.ValueDisplay val = TrackEntry.ValueDisplay.valueOf(param);
-							((TrackEntry)second).valueDisplay=val;
-							wfv.update();
-						}
 				}
+				wfv.update();
 			}
 		}
 	}
-		
 }

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

@@ -1,8 +1,6 @@
  
 package com.minres.scviewer.e4.application.handlers;
 
-import java.util.Iterator;
-
 import javax.inject.Named;
 
 import org.eclipse.e4.core.di.annotations.CanExecute;
@@ -34,16 +32,13 @@ public class ChangeWaveformDisplay {
 			WaveformViewer wfv = (WaveformViewer)obj;
 			ISelection sel = wfv.getSelection();
 			if(!sel.isEmpty() && sel instanceof IStructuredSelection) {
-				Iterator<?> it = ((IStructuredSelection)sel).iterator();
+				for(Object elem:(IStructuredSelection)sel) {
-				it.next();
+					if(elem instanceof TrackEntry) {
-				if(it.hasNext()) {
+						TrackEntry.WaveDisplay val= TrackEntry.WaveDisplay.valueOf(param);
-						Object second = it.next();
+						((TrackEntry)elem).waveDisplay=val;
-						if(second instanceof TrackEntry) {
+					}
-							TrackEntry.WaveDisplay val= TrackEntry.WaveDisplay.valueOf(param);
-							((TrackEntry)second).waveDisplay=val;
-							wfv.update();
-						}
 				}
+				wfv.update();
 			}
 		}
 	}

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

@@ -17,23 +17,30 @@ import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
-import com.minres.scviewer.database.IWaveform;
+import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.e4.application.parts.WaveformViewer;
 
 public class DeleteWaveformHandler {
 	
+	@SuppressWarnings("unchecked")
 	@CanExecute
 	public Boolean canExecute(ESelectionService selectionService){
 		Object o = selectionService.getSelection();
-		return o instanceof IStructuredSelection && ((IStructuredSelection)o).getFirstElement() instanceof IWaveform;
+		if(o instanceof IStructuredSelection) {
+			IStructuredSelection sel = (IStructuredSelection) o;
+			if(sel.size()>0)
+				return sel.toList().stream().allMatch(e-> e instanceof TrackEntry);
+			else
+				return false;
+		} else
+			return false;
 	}
 	
 	@Execute
 	public void execute(ESelectionService selectionService, MPart activePart) {
 		Object o = activePart.getObject();
-		Object sel = selectionService.getSelection();
+		if(o instanceof WaveformViewer){
-		if(o instanceof WaveformViewer && ((IStructuredSelection)sel).getFirstElement() instanceof IWaveform){
+			((WaveformViewer)o).removeSelectedStreamsFromList();
-			((WaveformViewer)o).removeStreamFromList((IWaveform) ((IStructuredSelection)sel).getFirstElement());
 		}	
 	}	
 }

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

@@ -22,6 +22,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 
 import com.minres.scviewer.database.ITx;
 import com.minres.scviewer.database.IWaveform;
+import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.e4.application.parts.WaveformViewer;
 
 public class MoveWaveformHandler {
@@ -33,7 +34,7 @@ public class MoveWaveformHandler {
 		Object sel = selectionService.getSelection();
 		if( sel instanceof IStructuredSelection) {
 			Object o= ((IStructuredSelection)sel).getFirstElement();
-			return o instanceof IWaveform || o instanceof ITx;
+			return o instanceof IWaveform || o instanceof ITx | o instanceof TrackEntry;
 		}
 		return false;
 	}

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

@@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import com.minres.scviewer.database.ITx;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.ui.GotoDirection;
+import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.e4.application.parts.WaveformViewer;
 
 public class NavigateEvent {
@@ -34,7 +35,7 @@ public class NavigateEvent {
 		Object sel = selectionService.getSelection();
 		if( sel instanceof IStructuredSelection) {
 			Object o= ((IStructuredSelection)sel).getFirstElement();
-			return o instanceof IWaveform || o instanceof ITx;
+			return o instanceof IWaveform || o instanceof ITx || o instanceof TrackEntry;
 		}
 		return false;
 	}

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

@@ -11,6 +11,7 @@
 package com.minres.scviewer.e4.application.handlers;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -39,13 +40,14 @@ public class OpenHandler {
 		part.setLabel(files.get(0).getName());
 		MPartStack partStack = (MPartStack)modelService.find("org.eclipse.editorss", app); //$NON-NLS-1$
 		partStack.getChildren().add(part);
-		partService.showPart(part, PartState.ACTIVATE);
+		partService.showPart(part, PartState.CREATE);
 		final IEclipseContext ctx=part.getContext();
-		files.stream()
+		List<String> inputs=new ArrayList<>();
-			.map(x -> x.getAbsolutePath())
+		for(File f: files)
-			.reduce((s1, s2) -> s1 + "," + s2)
+			inputs.add(f.getAbsolutePath());
-			.ifPresent(s -> ctx.modify("input", s)); //$NON-NLS-1$
+		ctx.modify("input", inputs);
-		ctx.modify("config", ""); //$NON-NLS-1$				
+		ctx.modify("config", ""); //$NON-NLS-1$
+		partStack.setSelectedElement(part);
 	}
 	
 }

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

@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.e4.application.handlers;
+
+import org.eclipse.e4.core.di.annotations.CanExecute;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.swt.widgets.Shell;
+
+import com.minres.scviewer.e4.application.parts.WaveformViewer;
+public class ReloadHandler {
+
+	@CanExecute
+	public boolean canExecute(EPartService partService) {
+		MPart part = partService.getActivePart();
+		if(part==null) return false;
+		return (part.getObject() instanceof WaveformViewer);
+	}
+
+	@Execute
+	public void execute(Shell shell, MApplication app, EModelService modelService, 
+			EPartService partService){
+		
+		MPart part = partService.getActivePart();
+		Object obj = part.getObject();
+		if(part!=null && (obj instanceof WaveformViewer)) { 
+			((WaveformViewer)obj).reloadDatabase();
+		}
+	    
+	}
+}

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

@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2015 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.e4.application.handlers;
+
+import org.eclipse.e4.core.di.annotations.Evaluate;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.widgets.Shell;
+
+import com.minres.scviewer.database.ui.TrackEntry;
+import com.minres.scviewer.e4.application.parts.WaveformViewer;
+public class SearchHandler {
+
+	@Evaluate
+	public boolean evaluate(MPart activePart) {
+		Object obj = activePart.getObject();
+		if(obj instanceof WaveformViewer){
+			WaveformViewer wfv = (WaveformViewer)obj;
+			ISelection sel = wfv.getSelection();
+			if(sel instanceof StructuredSelection) {
+				Object[] elem = ((StructuredSelection)sel).toArray();
+				if(elem.length ==0) return false;
+				TrackEntry e = findTrackEntry(elem);
+				return e!=null && e.isStream();
+			}
+		}
+		return false;
+	}
+
+	@Execute
+	public void execute(Shell shell, MPart activePart){
+		Object obj = activePart.getObject();
+		if(obj instanceof WaveformViewer){
+			WaveformViewer wfv = (WaveformViewer)obj;
+			wfv.showSearch();
+//			ISelection sel = wfv.getSelection();
+//			if(sel instanceof StructuredSelection) {
+//				TrackEntry e = findTrackEntry(((StructuredSelection)sel).toArray());
+//				SearchTxDialog dlg = new SearchTxDialog(shell, e.getStream());
+//				if (dlg.open() != Window.OK) return;
+//				wfv.search(dlg.getPropName(), dlg.getPropType(), dlg.getPropValue());
+//			}
+		}
+	}
+	
+	private TrackEntry findTrackEntry(Object[] elems) {
+		for(Object o: elems)
+			if(o instanceof TrackEntry)
+				return (TrackEntry)o;
+		return null;
+	}
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties

@@ -35,6 +35,7 @@ TransactionDetails_20=Time
 TransactionDetails_21=End time
 TransactionDetails_3=Value
 TransactionDetails_4=Relation
+WaveformPreferencesPage_description=Default Waveform Window Settings
 WaveformPreferencesPage_1=Color for 
 WaveformViewer_13=Database Load Status
 WaveformViewer_14=Database Load Cancelled
@@ -55,3 +56,27 @@ WaveStatusBarControl_5=C:
 WaveStatusBarControl_6=M:
 WaveStatusBarControl_7=C-M:
 WaveStatusBarControl_8=Z:
+line=Track line
+line_highlite=higlighted Track line 
+track_bg_even=even Track Background
+track_bg_odd=odd Track Background
+track_bg_highlite=highlighted Track Background
+tx_bg=Transaction Background
+tx_bg_highlite=highlighted Transaction Background
+tx_border=Transaction Border
+signal0=Signal Value '0'
+signal1=Signal Value '1'
+signalz=Signal Value 'Z'
+signalx=Signal Value 'X'
+signalu=Signal Value 'U'
+signal_text=Signal text
+signal_real=Signal real Value
+signal_nan=Signal NaN Value
+cursor=Cursor
+cursor_drag=dragged Cursor
+cursor_text=Cursor Text
+marker=Marker
+marker_text=Marker TExt
+rel_arrow=Relation arrow
+rel_arrow_highlite=highlighted Relation arrorw
+

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

@@ -64,6 +64,7 @@ import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -149,6 +150,14 @@ public class DesignBrowser {
 						treeViewer.refresh();
 					}
 				});
+			} else if("WAVEFORMS".equals(evt.getPropertyName())) {
+				treeViewer.getTree().getDisplay().asyncExec(new Runnable() {					
+					@Override
+					public void run() {
+						IWaveformDb database = waveformViewerPart.getDatabase();
+						treeViewer.setInput(Arrays.asList(database.isLoaded()?new IWaveformDb[]{database}:new IWaveformDb[]{new LoadingWaveformDb()}));
+					}
+				});
 			}
 		}
 	};
@@ -177,7 +186,8 @@ public class DesignBrowser {
 	 * @param parent the parent
 	 */
 	@PostConstruct
-	public void createComposite(Composite parent) {
+	public void createComposite(Composite parent, @Optional WaveformViewer waveformViewerPart) {
+		parent.setLayout(new FillLayout(SWT.HORIZONTAL));
 		sashForm = new SashForm(parent, SWT.BORDER | SWT.SMOOTH | SWT.VERTICAL);
 
 		top = new Composite(sashForm, SWT.NONE);
@@ -193,6 +203,8 @@ public class DesignBrowser {
 				top.removeControlListener(this);
 			}
 		});
+		if(waveformViewerPart!=null)
+			setWaveformViewer(waveformViewerPart);
 	}
 	
 	/**
@@ -366,13 +378,11 @@ public class DesignBrowser {
 	 * @param waveformViewerPart the waveform viewer part
 	 * @return the status event
 	 */
-	@SuppressWarnings("unchecked")
 	@Inject @Optional
 	public void  getActiveWaveformViewerEvent(@UIEventTopic(WaveformViewer.ACTIVE_WAVEFORMVIEW) WaveformViewer waveformViewerPart) {
-		if(this.waveformViewerPart!=null) { 
-			this.waveformViewerPart.storeDesignBrowerState(new DBState());
-		}
 		if( this.waveformViewerPart == null || this.waveformViewerPart != waveformViewerPart ) {
+			if(this.waveformViewerPart!=null)
+				this.waveformViewerPart.storeDesignBrowerState(new DBState());
 			waveformViewerPart.addDisposeListener( new DisposeListener() {
 				@Override
 				public void widgetDisposed(DisposeEvent e) {
@@ -384,7 +394,12 @@ public class DesignBrowser {
 					}
 				}
 			} );
+			setWaveformViewer(waveformViewerPart);
 		}
+	}
+
+	@SuppressWarnings("unchecked")
+	public void setWaveformViewer(WaveformViewer waveformViewerPart) {
 		this.waveformViewerPart=waveformViewerPart;
 		IWaveformDb database = waveformViewerPart.getDatabase();
 		Object input = treeViewer.getInput();

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

@@ -381,16 +381,12 @@ public class FileBrowserDialog extends TrayDialog {
 	class FileTreeLabelProvider implements ILabelProvider {
 		private List<ILabelProviderListener> listeners;
 
-		private Image file;
-
-		private Image dir;
-
 		public FileTreeLabelProvider() {
 			listeners = new ArrayList<ILabelProviderListener>();
 		}
 
 		public Image getImage(Object arg0) {
-			return ((File) arg0).isDirectory() ? folderImage : file;
+			return ((File) arg0).isDirectory() ? folderImage : fileImage;
 		}
 
 		public String getText(Object arg0) {
@@ -402,16 +398,12 @@ public class FileBrowserDialog extends TrayDialog {
 			listeners.add(arg0);
 		}
 
+		@Override
 		public void dispose() {
-			// Dispose the images
-			if (dir != null)
-				dir.dispose();
-			if (file != null)
-				file.dispose();
 		}
 
 		public boolean isLabelProperty(Object arg0, String arg1) {
-			return false;
+			return true;
 		}
 
 		public void removeListener(ILabelProviderListener arg0) {

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

@@ -0,0 +1,181 @@
+package com.minres.scviewer.e4.application.parts;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TitleAreaDialog;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.wb.swt.ResourceManager;
+
+import com.minres.scviewer.database.DataType;
+import com.minres.scviewer.database.ITxEvent;
+import com.minres.scviewer.database.ITxStream;
+
+public class SearchTxDialog extends TitleAreaDialog {
+	private ComboViewer propNameComboViewer = null; 
+
+	private Text propValueText = null;
+
+	private String propName="";
+	private DataType propType=null;
+	private String propValue="";
+	
+	private ITxStream<? extends ITxEvent> stream;
+	
+	private ConcurrentHashMap<String, DataType> propNames=new ConcurrentHashMap<String, DataType>();
+	
+	/**
+	 * Create the dialog.
+	 * @param parentShell
+	 * @param iTxStream 
+	 */
+	public SearchTxDialog(Shell parentShell, ITxStream<? extends ITxEvent> iTxStream) {
+		super(parentShell);
+		setShellStyle(SWT.BORDER | SWT.RESIZE | SWT.TITLE | SWT.APPLICATION_MODAL);
+		stream=iTxStream;
+		new Thread() {
+			public void run() {
+				stream.getEvents().values().parallelStream().forEach(evtLst -> {
+					evtLst.forEach(evt -> {
+						 evt.getTransaction().getAttributes().stream().forEach(attr -> {
+							 propNames.put(attr.getName(), attr.getDataType());
+						 });
+					});
+				});
+				parentShell.getDisplay().asyncExec(new Runnable() {
+					@Override
+					public void run() {
+						if (propNameComboViewer!=null) {
+							propNameComboViewer.setInput(getEntries());
+							propNameComboViewer.setSelection(new StructuredSelection(propNameComboViewer.getElementAt(0)));
+						}
+					}
+				});
+			}
+		}.run();
+	}
+
+	/**
+	 * Create contents of the dialog.
+	 * @param parent
+	 */
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		setMessage("Specify property name and value to search for");
+		setTitleImage(ResourceManager.getPluginImage("com.minres.scviewer.e4.application", "icons/Minres_logo.png"));
+		setTitle("Search Tx in stream");
+		final Composite area = (Composite) super.createDialogArea(parent);
+		final GridLayout gridLayout = (GridLayout) area.getLayout();
+		gridLayout.marginTop = 10;
+		gridLayout.marginBottom = 10;
+		final Composite container = new Composite(area, SWT.NONE);
+		final GridLayout gl_container = new GridLayout(2, false);
+		gl_container.horizontalSpacing = 2;
+		container.setLayout(gl_container);
+		container.setLayoutData(new GridData(GridData.FILL_BOTH));
+		
+		final Label header = new Label(container, SWT.CENTER | SWT.WRAP);
+		GridData gd_header = new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1);
+		gd_header.verticalIndent = 10;
+		header.setLayoutData(gd_header);
+		header.setText("Stream: "+stream.getName());
+		
+		final Label propNameLabel = new Label(container, SWT.NONE);
+		propNameLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+		propNameLabel.setText("Property Name:");
+		
+		propNameComboViewer = new ComboViewer(container, SWT.NONE);
+		propNameComboViewer.getCombo().setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+		propNameComboViewer.setContentProvider(ArrayContentProvider.getInstance());
+		propNameComboViewer.setLabelProvider(new LabelProvider() {
+			@SuppressWarnings("unchecked")
+			@Override
+			public String getText(Object element) {
+				Map.Entry<String, DataType> e = (Map.Entry<String, DataType>)element;	
+				return e.getKey()+" ("+e.getValue().name()+")";
+			}
+
+		});
+		propNameComboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			
+			@SuppressWarnings("unchecked")
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				IStructuredSelection sel = event.getStructuredSelection();
+				Map.Entry<String, DataType> e = (Map.Entry<String, DataType>)sel.getFirstElement();
+				propName=e.getKey();
+				propType=e.getValue();
+			}
+		});
+		propNameComboViewer.setInput(getEntries());
+		propNameComboViewer.setSelection(new StructuredSelection(propNameComboViewer.getElementAt(0)));
+		
+		final Label propValueLabel = new Label(container, SWT.NONE);
+		propValueLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+		propValueLabel.setText("Property Value:");
+		
+		propValueText = new Text(container, SWT.BORDER);
+		propValueText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+
+		return area;
+	}
+
+	private List<Entry<String,DataType>> getEntries() {
+		return propNames.entrySet().stream().sorted((e1,e2)->e1.getKey().compareTo(e2.getKey())).collect(Collectors.toList());
+	}
+
+	/**
+	 * Create contents of the button bar.
+	 * @param parent
+	 */
+	@Override
+	protected void createButtonsForButtonBar(Composite parent) {
+		final Button okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
+		okButton.setImage(ResourceManager.getPluginImage("com.minres.scviewer.e4.application", "icons/tick.png"));
+		final Button cancelButton = createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
+		cancelButton.setImage(ResourceManager.getPluginImage("com.minres.scviewer.e4.application", "icons/cross.png"));
+	}
+
+	protected void constrainShellSize() {
+		super.constrainShellSize();
+		getShell().setMinimumSize(getShell().computeSize(-1, -1));
+
+	}
+
+	@Override
+	protected void okPressed() {
+		propValue=propValueText.getText();
+		super.okPressed();
+	}
+
+	public String getPropName() {
+		return propName;
+	}
+
+	public DataType getPropType() {
+		return propType;
+	}
+	
+	public String getPropValue() {
+		return propValue;
+	}
+}

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

@@ -10,15 +10,10 @@
  *******************************************************************************/
 package com.minres.scviewer.e4.application.parts;
 
-import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.TreeMap;
-import java.util.Vector;
-import java.util.regex.PatternSyntaxException;
 import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
@@ -34,23 +29,16 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.ITreeViewerListener;
-import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TreeExpansionEvent;
 import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
@@ -63,15 +51,19 @@ import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 
-import com.minres.scviewer.database.DataType;
 import com.minres.scviewer.database.ITx;
-import com.minres.scviewer.database.ITxAttribute;
-import com.minres.scviewer.database.ITxRelation;
 import com.minres.scviewer.e4.application.Messages;
+import com.minres.scviewer.e4.application.parts.txTableTree.AttributeLabelProvider;
+import com.minres.scviewer.e4.application.parts.txTableTree.AbstractTransactionTreeContentProvider;
+import com.minres.scviewer.e4.application.parts.txTableTree.TransactionTreeNode;
+import com.minres.scviewer.e4.application.parts.txTableTree.TransactionTreeNodeType;
+import com.minres.scviewer.e4.application.parts.txTableTree.TxAttributeFilter;
+import com.minres.scviewer.e4.application.parts.txTableTree.TxAttributeViewerSorter;
 import com.minres.scviewer.e4.application.provider.TxPropertiesLabelProvider;
 
 /**
@@ -113,17 +105,21 @@ public class TransactionDetails {
 	/** The waveform viewer part. */
 	private WaveformViewer waveformViewerPart;
 
-
+	private Composite top;
+	
 	/**
 	 * Creates the composite.
 	 *
 	 * @param parent the parent
 	 */
 	@PostConstruct
-	public void createComposite(final Composite parent) {
+	public void createComposite(final Composite parent, @Optional WaveformViewer waveformViewerPart) {
-		parent.setLayout(new GridLayout(1, false));
+		this.waveformViewerPart=waveformViewerPart;
+		
+		top = new Composite(parent, SWT.NONE);
+		top.setLayout(new GridLayout(1, false));
 
-		nameFilter = new Text(parent, SWT.BORDER);
+		nameFilter = new Text(top, SWT.BORDER);
 		nameFilter.setMessage(Messages.TransactionDetails_0);
 		nameFilter.addModifyListener(new ModifyListener() {
 			@Override
@@ -139,8 +135,19 @@ public class TransactionDetails {
 		attributeFilter = new TxAttributeFilter();
 		viewSorter = new TxAttributeViewerSorter();
 
-		treeViewer = new TreeViewer(parent);
+		treeViewer = new TreeViewer(top);
-		treeViewer.setContentProvider(new TransactionTreeContentProvider());
+		treeViewer.setContentProvider(new AbstractTransactionTreeContentProvider(waveformViewerPart) {
+			
+			@Override
+			public Object[] getElements(Object element) {
+				return new Object[]{
+						new TransactionTreeNode((ITx)element, TransactionTreeNodeType.PROPS),  
+						new TransactionTreeNode((ITx)element, TransactionTreeNodeType.ATTRS),  
+						new TransactionTreeNode((ITx)element, TransactionTreeNodeType.IN_REL),
+						new TransactionTreeNode((ITx)element, TransactionTreeNodeType.OUT_REL)
+				};
+			}
+		});
 		treeViewer.setLabelProvider(new TxPropertiesLabelProvider());
 		treeViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
 		treeViewer.addFilter(attributeFilter);
@@ -166,7 +173,7 @@ public class TransactionDetails {
 		col1 = new TreeViewerColumn(treeViewer, SWT.NONE);
 		col1.getColumn().setText(Messages.TransactionDetails_1);
 		col1.getColumn().setResizable(true);
-		col1.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(AttributeLabelProvider.NAME)));
+		col1.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(waveformViewerPart, AttributeLabelProvider.NAME)));
 		col1.getColumn().addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent event) {
 				((TxAttributeViewerSorter) treeViewer.getComparator()).doSort(COLUMN_FIRST);
@@ -177,7 +184,7 @@ public class TransactionDetails {
 		col2 = new TreeViewerColumn(treeViewer, SWT.NONE);
 		col2.getColumn().setText(Messages.TransactionDetails_2);
 		col2.getColumn().setResizable(true);
-		col2.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(AttributeLabelProvider.TYPE)));
+		col2.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(waveformViewerPart, AttributeLabelProvider.TYPE)));
 		col2.getColumn().addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent event) {
 				((TxAttributeViewerSorter) treeViewer.getComparator()).doSort(COLUMN_SECOND);
@@ -188,7 +195,7 @@ public class TransactionDetails {
 		col3 = new TreeViewerColumn(treeViewer, SWT.NONE);
 		col3.getColumn().setText(Messages.TransactionDetails_3);
 		col3.getColumn().setResizable(true);
-		col3.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(AttributeLabelProvider.VALUE)));
+		col3.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(waveformViewerPart, AttributeLabelProvider.VALUE)));
 		col3.getColumn().addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent event) {
 				((TxAttributeViewerSorter) treeViewer.getComparator()).doSort(COLUMN_SECOND);
@@ -223,10 +230,10 @@ public class TransactionDetails {
 			}
 
 		});
-		parent.addControlListener(new ControlAdapter() {
+		top.addControlListener(new ControlAdapter() {
 			public void controlResized(ControlEvent e) {
 				Tree table = treeViewer.getTree();
-				Rectangle area = parent.getClientArea();
+				Rectangle area = top.getClientArea();
 				Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT);
 				int width = area.width - 2*table.getBorderWidth();
 				if (preferredSize.y > area.height + table.getHeaderHeight()) {
@@ -257,12 +264,16 @@ public class TransactionDetails {
 		});
 	}
 
+	public Control getControl() {
+		return top;
+	}
 	/**
 	 * Sets the focus.
 	 */
 	@Focus
 	public void setFocus() {
-		treeViewer.getTree().setFocus();
+		if(treeViewer!=null)
+			treeViewer.getTree().setFocus();
 	}
 
 	/**
@@ -324,15 +335,15 @@ public class TransactionDetails {
 		if(paths==null)
 			treeViewer.setAutoExpandLevel(2);
 		else {
-			TransactionTreeContentProvider cp = (TransactionTreeContentProvider) treeViewer.getContentProvider();
+			AbstractTransactionTreeContentProvider cp = (AbstractTransactionTreeContentProvider) treeViewer.getContentProvider();
 			Object[] elems = cp.getElements(treeViewer.getInput());
 			for(TreePath path: paths) {
-				TreeNode firstSeg = (TreeNode)path.getFirstSegment();
+				TransactionTreeNode firstSeg = (TransactionTreeNode)path.getFirstSegment();
 				for(Object elem : elems) {
-					if(((TreeNode)elem).type == firstSeg.type) {
+					if(((TransactionTreeNode)elem).type == firstSeg.type) {
 						treeViewer.setExpandedState(elem, true);
-						if(firstSeg.type==TransactionDetails.Type.ATTRS && path.getSegmentCount()>1)
+						if(firstSeg.type==TransactionTreeNodeType.ATTRS && path.getSegmentCount()>1)
-							expandSubNodes(path, 1, (TreeNode)elem);
+							expandSubNodes(path, 1, (TransactionTreeNode)elem);
 						break;
 					}
 				}
@@ -340,14 +351,14 @@ public class TransactionDetails {
 		}
 	}
 
-	private void expandSubNodes(TreePath path, int level, TreeNode elem) {
+	private void expandSubNodes(TreePath path, int level, TransactionTreeNode elem) {
 		if(level==path.getSegmentCount()) return;
-		TransactionTreeContentProvider cp = (TransactionTreeContentProvider) treeViewer.getContentProvider();
+		AbstractTransactionTreeContentProvider cp = (AbstractTransactionTreeContentProvider) treeViewer.getContentProvider();
 		Object[] childs = cp.getChildren(elem);
-		TreeNode nextSeg = (TreeNode)path.getSegment(level);
+		TransactionTreeNode nextSeg = (TransactionTreeNode)path.getSegment(level);
 		for(Object child:childs) {
-			if(child instanceof TreeNode) {
+			if(child instanceof TransactionTreeNode) {
-				TreeNode node = (TreeNode) child;
+				TransactionTreeNode node = (TransactionTreeNode) child;
 				if(nextSeg.toString().equals(node.toString())) {
 					treeViewer.setExpandedState(node, true);
 					expandSubNodes(path, level+1, node);
@@ -389,414 +400,13 @@ public class TransactionDetails {
 	public void setSelection(@Named(IServiceConstants.ACTIVE_SELECTION) @Optional IStructuredSelection selection, EPartService partService){
 		// only react if selection is actually from the WaveformViewer and nothing else
 		MPart part = partService.getActivePart();
-		if( part == null || ! (part.getObject() instanceof WaveformViewer ) )
+		if( part == null || ! (part.getObject() instanceof WaveformViewer )  || part.getObject() != waveformViewerPart)
 			return;
 		if(treeViewer!=null && selection!=null && !treeViewer.getTree().isDisposed()){
-			if( selection instanceof IStructuredSelection) {
+			if( selection instanceof IStructuredSelection && !selection.isEmpty()) {
 				setInput(((IStructuredSelection)selection).getFirstElement());		
 			}
 		}
 	}
-
-	/**
-	 * Time to string.
-	 *
-	 * @param time the time
-	 * @return the string
-	 */
-	String timeToString(Long time){
-		return waveformViewerPart.getScaledTime(time);
-	}
-
-	/**
-	 * Tx to string.
-	 *
-	 * @param tx the tx
-	 * @return the string
-	 */
-	String txToString(ITx tx){
-		StringBuilder sb = new StringBuilder();
-		sb.append("tx#").append(tx.getId()).append("[").append(timeToString(tx.getBeginTime())); //$NON-NLS-1$ //$NON-NLS-2$
-		sb.append(" - ").append(timeToString(tx.getEndTime())).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
-		return sb.toString();
-	}
-
-	/**
-	 * The Class TxAttributeViewerSorter.
-	 */
-	class TxAttributeViewerSorter extends ViewerComparator {
-
-		/** The Constant ASCENDING. */
-		private static final int ASCENDING = 0;
-
-		/** The Constant DESCENDING. */
-		private static final int DESCENDING = 1;
-
-		/** The column. */
-		private int column;
-
-		/** The direction. */
-		private int direction;
-
-		/**
-		 * Does the sort. If it's a different column from the previous sort, do an
-		 * ascending sort. If it's the same column as the last sort, toggle the sort
-		 * direction.
-		 *
-		 * @param column the column
-		 */
-		public void doSort(int column) {
-			if (column == this.column) {
-				// Same column as last sort; toggle the direction
-				direction = 1 - direction;
-			} else {
-				// New column; do an ascending sort
-				this.column = column;
-				direction = ASCENDING;
-			}
-		}
-
-		/**
-		 * Compares the object for sorting.
-		 *
-		 * @param viewer the viewer
-		 * @param e1 the e1
-		 * @param e2 the e2
-		 * @return the int
-		 */
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			int rc = 0;
-			if(e1 instanceof ITxAttribute && e2 instanceof ITxAttribute){
-				ITxAttribute p1 = (ITxAttribute) e1;
-				ITxAttribute p2 = (ITxAttribute) e2;
-				// Determine which column and do the appropriate sort
-				switch (column) {
-				case COLUMN_FIRST:
-					rc = getComparator().compare(p1.getName(), p2.getName());
-					break;
-				case COLUMN_SECOND:
-					rc = getComparator().compare(p1.getDataType().name(), p2.getDataType().name());
-					break;
-				case COLUMN_THIRD:
-					rc = getComparator().compare(p1.getValue().toString(), p2.getValue().toString());
-					break;
-				}
-				// If descending order, flip the direction
-				if (direction == DESCENDING) rc = -rc;
-			}
-			return rc;
-		}
-	}
-
-	/**
-	 * The Class TxAttributeFilter.
-	 */
-	class TxAttributeFilter extends ViewerFilter {
-
-		/** The search string. */
-		private String searchString;
-
-		/**
-		 * Sets the search text.
-		 *
-		 * @param s the new search text
-		 */
-		public void setSearchText(String s) {
-			this.searchString = ".*" + s + ".*"; //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		@Override
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-
-			if (searchString == null || searchString.length() == 0) {
-				return true;
-			}
-			if(element instanceof TreeNode) {
-				return true;
-			}
-			if(element instanceof ITxAttribute){
-				try {
-					return (((ITxAttribute) element).getName().toLowerCase().matches(searchString.toLowerCase()));
-				} catch (PatternSyntaxException e) {
-					return true;
-				}
-			} 
-			if(element instanceof Object[]) {
-				try {
-					return (((Object[])element)[0]).toString().toLowerCase().matches(searchString.toLowerCase());	
-				} catch (PatternSyntaxException e) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * The Enum Type.
-	 */
-	enum Type {
-		PROPS,  /** The props. */
-		ATTRS,  /** The attrs. */
-		IN_REL, /** The in rel. */ 
-		OUT_REL,/** The out rel. */
-		HIER
-		}
-
-	/**
-	 * The Class TreeNode.
-	 */
-	class TreeNode implements Comparable<TreeNode>{
-
-		/** The type. */
-		public Type type;
-
-		/** The element. */
-		public ITx element;
-
-		private String hier_path;
-		/**
-		 * Instantiates a new tree node.
-		 *
-		 * @param element the element
-		 * @param type the type
-		 */
-		public TreeNode(ITx element, Type type){
-			this.element=element;
-			this.type=type;
-			this.hier_path="";
-		}
-
-		public TreeNode(ITx element, String path){
-			this.element=element;
-			this.type=Type.HIER;
-			this.hier_path=path;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
-		public String toString(){
-			switch(type){
-			case PROPS:      return Messages.TransactionDetails_10;
-			case ATTRS:	     return Messages.TransactionDetails_11;
-			case IN_REL:     return Messages.TransactionDetails_12;
-			case OUT_REL:    return Messages.TransactionDetails_13;
-			case HIER:{
-				String[] tokens = hier_path.split("\\.");
-				return tokens[tokens.length-1];
-			}
-			}
-			return ""; //$NON-NLS-1$
-		}
-		
-		public Object[] getAttributeListForHier() {
-			if(childs==null) {
-				Map<String, Object> res = element.getAttributes().stream()
-				.filter(txAttr -> txAttr.getName().startsWith(hier_path))
-				.map(txAttr -> {
-					String target = hier_path.length()==0?txAttr.getName():txAttr.getName().replace(hier_path+'.', "");
-					String[] tokens = target.split("\\.");
-					if(tokens.length==1)
-						return new AbstractMap.SimpleEntry<>(tokens[0], txAttr);
-					else 
-						return new AbstractMap.SimpleEntry<>(tokens[0], new TreeNode(element, hier_path.length()>0?hier_path+"."+tokens[0]:tokens[0]));
-				})
-				.collect(Collectors.toMap(p -> p.getKey(), p -> p.getValue(), (first, second) -> first));
-				childs = new TreeMap<String, Object>(res).values().toArray();
-			}
-			return childs;
-		}
-		
-		private Object[] childs=null;
-
-		@Override
-		public boolean equals(Object o) {
-			if(o instanceof TreeNode) {
-				TreeNode t = (TreeNode) o;
-				return type==t.type && hier_path.equals(t.hier_path); 
-			}
-			return false;
-		}
-		
-		@Override
-		public int compareTo(TreeNode o) {
-			int res1 = type.compareTo(o.type);
-			if(res1==0) {
-				return hier_path.compareTo(o.hier_path);
-			} else
-				return res1;
-		}
-	}
-
-	/**
-	 * The Class TransactionTreeContentProvider.
-	 */
-	class TransactionTreeContentProvider implements ITreeContentProvider {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
-		@Override
-		public void dispose() {	}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		@Override
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)
-		 */
-		@Override
-		public Object[] getElements(Object element) {
-			return new Object[]{
-					new TreeNode((ITx)element, Type.PROPS),  
-					new TreeNode((ITx)element, Type.ATTRS),  
-					new TreeNode((ITx)element, Type.IN_REL),
-					new TreeNode((ITx)element, Type.OUT_REL)
-			};
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-		 */
-		@Override
-		public Object[] getChildren(Object element) {
-			if(element instanceof TreeNode){
-				TreeNode propertyHolder=(TreeNode) element;
-				if(propertyHolder.type == Type.PROPS){
-					return new Object[][]{
-						{Messages.TransactionDetails_1, Messages.TransactionDetails_16, propertyHolder.element.getStream().getFullName()},
-						{Messages.TransactionDetails_2, Messages.TransactionDetails_16, propertyHolder.element.getGenerator().getName()},
-						{Messages.TransactionDetails_19, Messages.TransactionDetails_20, timeToString(propertyHolder.element.getBeginTime())},
-						{Messages.TransactionDetails_21, Messages.TransactionDetails_20, timeToString(propertyHolder.element.getEndTime())}
-					};
-				}else if(propertyHolder.type == Type.ATTRS || propertyHolder.type == Type.HIER)
-					return propertyHolder.getAttributeListForHier();
-				else if(propertyHolder.type == Type.IN_REL){
-					Vector<Object[] > res = new Vector<>();
-					for(ITxRelation rel:propertyHolder.element.getIncomingRelations()){
-						res.add(new Object[]{
-								rel.getRelationType(), 
-								rel.getSource().getGenerator().getName(), 
-								rel.getSource()});
-					}
-					return res.toArray();
-				} else if(propertyHolder.type == Type.OUT_REL){
-					Vector<Object[] > res = new Vector<>();
-					for(ITxRelation rel:propertyHolder.element.getOutgoingRelations()){
-						res.add(new Object[]{
-								rel.getRelationType(), 
-								rel.getTarget().getGenerator().getName(), 
-								rel.getTarget()});
-					}
-					return res.toArray();
-				}
-			}
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-		 */
-		@Override
-		public Object getParent(Object element) {
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-		 */
-		@Override
-		public boolean hasChildren(Object element) {
-			return getChildren(element)!=null;
-		}
-
-	}
-
-	/**
-	 * The Class AttributeLabelProvider.
-	 */
-	class AttributeLabelProvider extends LabelProvider implements IStyledLabelProvider {
-
-		/** The field. */
-		final int field;
-
-		/** The Constant NAME. */
-		public static final int NAME=0;
-
-		/** The Constant TYPE. */
-		public static final int TYPE=1;
-
-		/** The Constant VALUE. */
-		public static final int VALUE=2;
-
-		/**
-		 * Instantiates a new attribute label provider.
-		 *
-		 * @param field the field
-		 */
-		public  AttributeLabelProvider(int field) {
-			this.field=field;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
-		 */
-		@Override
-		public StyledString getStyledText(Object element) {
-			switch(field){
-			case NAME:
-				if (element instanceof ITxAttribute) {
-					ITxAttribute attribute = (ITxAttribute) element;
-					String[] tokens = attribute.getName().split("\\.");
-					return new StyledString(tokens[tokens.length-1]);
-				}else if (element instanceof ITxRelation) {
-					return new StyledString(Messages.TransactionDetails_4);
-				}else if(element instanceof Object[]){
-					Object[] elements = (Object[]) element;
-					return new StyledString(elements[field].toString());
-				} else 
-					return new StyledString(element.toString());
-			case TYPE:
-				if (element instanceof ITxAttribute) {
-					ITxAttribute attribute = (ITxAttribute) element;
-					return new StyledString(attribute.getDataType().toString());
-				}else if(element instanceof Object[]){
-					Object[] elements = (Object[]) element;
-					return new StyledString(elements[field].toString());
-				}else 
-					return new StyledString("");					 //$NON-NLS-1$
-			default:
-				if (element instanceof ITxAttribute) {
-					ITxAttribute attribute = (ITxAttribute) element;
-					String value = attribute.getValue().toString();
-					if((DataType.UNSIGNED == attribute.getDataType() || DataType.INTEGER==attribute.getDataType()) && !"0".equals(value)) {
-						try {
-							value += " [0x"+Long.toHexString(Long.parseLong(attribute.getValue().toString()))+"]";
-						} catch(NumberFormatException e) { }
-					}
-					return new StyledString(value);
-				}else if(element instanceof Object[]){
-					Object[] elements = (Object[]) element;
-					Object o = elements[field];
-					if(o instanceof ITx) {
-						ITx tx = (ITx)o;
-						return new StyledString(txToString(tx)+" ("+tx.getStream().getFullName()+")");
-					} else
-						return new StyledString(o.toString());
-				} else if(element instanceof ITx){
-					return new StyledString(txToString((ITx) element));
-				}else 
-					return new StyledString("");					 //$NON-NLS-1$
-			}
-		}
-	}
 }
 

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

@@ -0,0 +1,286 @@
+package com.minres.scviewer.e4.application.parts;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import org.eclipse.core.databinding.observable.list.ObservableList;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ITreeSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.TreeViewerColumn;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.TreeColumn;
+
+import com.minres.scviewer.database.DataType;
+import com.minres.scviewer.database.ITx;
+import com.minres.scviewer.database.ITxAttribute;
+import com.minres.scviewer.database.ITxEvent;
+import com.minres.scviewer.database.ITxEvent.Type;
+import com.minres.scviewer.database.ITxStream;
+import com.minres.scviewer.database.ui.TrackEntry;
+import com.minres.scviewer.e4.application.parts.txTableTree.AbstractTransactionTreeContentProvider;
+import com.minres.scviewer.e4.application.parts.txTableTree.AttributeLabelProvider;
+import com.minres.scviewer.e4.application.parts.txTableTree.TxFilter;
+
+public class TransactionList extends Composite {
+	public class AttributeNameBean {
+		public String getName() {
+			return name;
+		}
+		public void setName(String name) {
+			this.name = name;
+		}
+		public DataType getType() {
+			return type;
+		}
+		public void setType(DataType type) {
+			this.type = type;
+		}
+		public AttributeNameBean(String name, DataType type) {
+			super();
+			this.name = name;
+			this.type = type;
+		}
+		String name;
+		DataType type;
+
+	}
+
+	private ComboViewer searchPropComboViewer = null;
+
+	private ComboViewer viewPropComboViewer = null;
+
+	private Text searchPropValue;
+
+	private TreeViewer treeViewer = null; 
+
+	private TreeColumn valueColumn = null;
+
+	private AttributeLabelProvider nameLabelProvider = null;
+
+	private ITxStream<? extends ITxEvent> stream;
+
+	private ObservableList<AttributeNameBean> attrNames = new WritableList<AttributeNameBean>();
+
+	private List<ITx> eventList = new ArrayList<ITx>();
+
+	private List<ITx> emptyList = new ArrayList<ITx>();
+
+	TxFilter txFilter;
+
+	/**
+	 * Create the composite.
+	 * @param parent
+	 * @param style
+	 */
+	public TransactionList(Composite parent, int style, WaveformViewer waveformViewer) {
+		super(parent, style);
+		setLayout(new GridLayout(3, false));
+		txFilter = new TxFilter();
+
+		searchPropComboViewer = new ComboViewer(this, SWT.NONE);
+		searchPropComboViewer.setLabelProvider(new LabelProvider() {
+			public String getText(Object element) {
+				AttributeNameBean entry = (AttributeNameBean) element;
+				return entry.getName()+" ["+entry.getType().toString()+"]";
+			}
+		});
+		searchPropComboViewer.setContentProvider(new ObservableListContentProvider<AttributeNameBean>());
+		searchPropComboViewer.setInput(attrNames);
+		Combo searchPropCombo = searchPropComboViewer.getCombo();
+		searchPropCombo.setLayoutData(new GridData(SWT.LEFT, SWT.FILL, false, false, 1, 1));
+		searchPropCombo.addSelectionListener(new SelectionListener() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				int idx = searchPropCombo.getSelectionIndex();
+				AttributeNameBean sel = attrNames.get(idx);
+				txFilter.setSearchProp(sel.getName(), sel.getType());
+			}
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) { 
+				int idx = searchPropCombo.getSelectionIndex();
+				AttributeNameBean sel = attrNames.get(idx);
+				txFilter.setSearchProp(sel.getName(), sel.getType());
+			}
+		});
+
+		searchPropValue = new Text(this, SWT.BORDER);
+		searchPropValue.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1));
+		searchPropValue.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent e) {
+				txFilter.setSearchValue(((Text) e.widget).getText());
+				treeViewer.refresh();
+				//treeViewer.expandAll(false);
+			}
+		});
+
+		viewPropComboViewer = new ComboViewer(this, SWT.NONE);
+		viewPropComboViewer.setLabelProvider(new LabelProvider() {
+			public String getText(Object element) {
+				AttributeNameBean entry = (AttributeNameBean) element;
+				return entry.getName()+" ["+entry.getType().toString()+"]";
+			}
+		});
+		viewPropComboViewer.setContentProvider(new ObservableListContentProvider<AttributeNameBean>());
+		viewPropComboViewer.setInput(attrNames);
+		Combo viewPropCombo = viewPropComboViewer.getCombo();
+		viewPropCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+		viewPropCombo.addSelectionListener(new SelectionListener() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				int idx = viewPropCombo.getSelectionIndex();
+				AttributeNameBean sel = attrNames.get(idx);
+				nameLabelProvider.setShowProp(sel.getName());
+				treeViewer.refresh(true);
+			}
+			@Override
+			public void widgetDefaultSelected(SelectionEvent e) { }
+		});
+
+		treeViewer = new TreeViewer(this, SWT.BORDER);
+		treeViewer.setContentProvider(new AbstractTransactionTreeContentProvider(waveformViewer) {
+
+			@SuppressWarnings("rawtypes")
+			@Override
+			public Object[] getElements(Object inputElement) {
+				if (inputElement instanceof Object[]) {
+					return (Object[]) inputElement;
+				}
+				if (inputElement instanceof Collection) {
+					return ((Collection) inputElement).toArray();
+				}
+				return new Object[0];
+			}
+		});
+		treeViewer.addFilter(txFilter);
+		treeViewer.addDoubleClickListener(new IDoubleClickListener() {
+			@Override
+			public void doubleClick(DoubleClickEvent event) {
+				ITreeSelection treeSelection = treeViewer.getStructuredSelection();
+				Object selected = treeSelection.getFirstElement();
+				if(selected instanceof ITx){
+					waveformViewer.setSelection(new StructuredSelection(selected));
+				}
+			}
+		});
+		
+		Tree tree = treeViewer.getTree();
+		tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 3, 1));
+
+		TreeViewerColumn nameColumnViewer = new TreeViewerColumn(treeViewer, SWT.NONE);
+		TreeColumn nameColumn = nameColumnViewer.getColumn();
+		nameColumn.setWidth(200);
+		nameColumn.setText("Tx ID");
+		nameColumn.setResizable(true);
+		nameColumnViewer.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(waveformViewer, AttributeLabelProvider.NAME)));
+
+		TreeViewerColumn timeColumnViewer = new TreeViewerColumn(treeViewer, SWT.NONE);
+		TreeColumn timeColumn = timeColumnViewer.getColumn();
+		timeColumn.setAlignment(SWT.RIGHT);
+		timeColumn.setWidth(150);
+		timeColumn.setText("Start time");
+		timeColumn.setResizable(true);
+		timeColumnViewer.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(waveformViewer, AttributeLabelProvider.TX_TIME)));
+
+		TreeViewerColumn typeColumnViewer = new TreeViewerColumn(treeViewer, SWT.NONE);
+		TreeColumn typeColumn = typeColumnViewer.getColumn();
+		typeColumn.setAlignment(SWT.RIGHT);
+		typeColumn.setWidth(150);
+		typeColumn.setText("Type");
+		typeColumn.setResizable(true);
+		typeColumnViewer.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(waveformViewer, AttributeLabelProvider.TYPE)));
+
+		TreeViewerColumn valueColumnViewer = new TreeViewerColumn(treeViewer, SWT.NONE);
+		valueColumn = valueColumnViewer.getColumn();
+		valueColumn.setWidth(150);
+		valueColumn.setText("Value");
+		valueColumn.setResizable(true);
+		nameLabelProvider= new AttributeLabelProvider(waveformViewer, AttributeLabelProvider.VALUE);
+		valueColumnViewer.setLabelProvider(new DelegatingStyledCellLabelProvider(nameLabelProvider));
+
+		// Turn on the header and the lines
+		tree.setHeaderVisible(true);
+		tree.setLinesVisible(true);
+	}
+
+	public void setInput(TrackEntry trackEntry) {
+		if(trackEntry==null || !trackEntry.isStream()) {
+			attrNames.clear();
+			treeViewer.setInput(emptyList);
+		} else { 
+			stream=trackEntry.getStream();
+			treeViewer.setInput(emptyList);
+			new Thread() {
+				private ConcurrentHashMap<String, DataType> propNames=new ConcurrentHashMap<String, DataType>();
+
+				private List<AttributeNameBean> getEntries() {
+					return propNames.entrySet().stream()
+							.sorted((e1,e2)->e1.getKey().compareTo(e2.getKey()))
+							.map(e -> new AttributeNameBean(e.getKey(), e.getValue()))
+							.collect(Collectors.toList());
+				}
+
+				public void run() {
+					stream.getEvents().values().parallelStream().forEach(evtLst -> {
+						evtLst.forEach(evt -> {
+							if(evt.getType()==Type.BEGIN) {
+								eventList.add(evt.getTransaction());
+								for(ITxAttribute attr: evt.getTransaction().getAttributes()) {
+									propNames.put(attr.getName(), attr.getDataType());
+								}
+							}
+						});
+					});
+					eventList = eventList.parallelStream().sorted((t1, t2)-> t1.getBeginTime().compareTo(t2.getBeginTime())).collect(Collectors.toList());
+					getDisplay().asyncExec(new Runnable() {
+						@Override
+						public void run() {
+							treeViewer.setInput(eventList);
+							attrNames.clear();
+							attrNames.addAll(getEntries());
+							searchPropComboViewer.getCombo().select(0);
+							txFilter.setSearchProp(attrNames.get(0).getName(), attrNames.get(0).getType());
+							if (searchPropComboViewer!=null) {
+								searchPropComboViewer.setInput(attrNames);
+								searchPropComboViewer.setSelection(new StructuredSelection(searchPropComboViewer.getElementAt(0)));
+							}
+						}
+					});
+				}
+			}.run();
+		}
+	}
+	
+	public void setSearchProps(String propName, DataType type, String propValue) {
+		for(int i=0; i<attrNames.size(); ++i) {
+			AttributeNameBean e = attrNames.get(i);
+			if(propName.equals(e.getName()) && type.equals(e.getType())) {
+				searchPropComboViewer.getCombo().select(i);
+				break;
+			}
+		}
+		searchPropValue.setText(propValue);
+	}
+
+}

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

@@ -0,0 +1,84 @@
+package com.minres.scviewer.e4.application.parts;
+
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.services.events.IEventBroker;
+import org.eclipse.e4.ui.di.Focus;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.services.IServiceConstants;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+
+import com.minres.scviewer.database.ui.TrackEntry;
+
+public class TransactionListView {
+	private WaveformViewer waveformViewer;
+
+	private TransactionList transactionList;
+		
+	/** The event broker. */
+	@Inject IEventBroker eventBroker;
+
+	/** The selection service. */
+	@Inject	ESelectionService selectionService;
+
+	/**
+	 * Create the composite.
+	 * @param parent
+	 * @param style
+	 */
+	/**
+	 * Creates the composite.
+	 *
+	 * @param parent the parent
+	 */
+	@PostConstruct
+	public void createComposite(final Composite parent, @Optional WaveformViewer waveformViewer) {
+		this.waveformViewer=waveformViewer;
+		transactionList = new TransactionList(parent, SWT.BORDER, waveformViewer);
+	}
+	
+	@Focus
+	public void setFocus() {
+		if(transactionList!=null)
+			transactionList.setFocus();
+	}
+	/**
+	 * Sets the selection.
+	 *
+	 * @param selection the new selection
+	 */
+	@Inject
+	public void setSelection(@Named(IServiceConstants.ACTIVE_SELECTION) @Optional IStructuredSelection selection, EPartService partService){
+		// only react if selection is actually from the WaveformViewer and nothing else
+		MPart part = partService.getActivePart();
+		if( part == null || ! (part.getObject() instanceof WaveformViewer )  || part.getObject() != waveformViewer)
+			return;
+		if(selection==null || selection.isEmpty())
+			transactionList.setInput(null);	
+		else if(selection instanceof IStructuredSelection) {
+			TrackEntry e = findTrackEntry(((StructuredSelection)selection).toArray());
+			if(e!=null)
+				transactionList.setInput(e);		
+		}
+	}
+
+	private TrackEntry findTrackEntry(Object[] elems) {
+		for(Object o: elems)
+			if(o instanceof TrackEntry)
+				return (TrackEntry)o;
+		return null;
+	}
+
+	public TransactionList getControl() {
+		return transactionList;
+	}
+
+}

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

@@ -41,6 +41,8 @@ import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
+import org.eclipse.e4.core.contexts.ContextInjectionFactory;
+import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.events.IEventBroker;
@@ -60,6 +62,9 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.FocusListener;
@@ -69,6 +74,7 @@ import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -90,17 +96,17 @@ import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.IWaveformDb;
 import com.minres.scviewer.database.IWaveformDbFactory;
 import com.minres.scviewer.database.RelationType;
-import com.minres.scviewer.database.swt.Constants;
-import com.minres.scviewer.database.swt.ToolTipContentProvider;
-import com.minres.scviewer.database.swt.ToolTipHelpTextProvider;
-import com.minres.scviewer.database.swt.WaveformViewerFactory;
 import com.minres.scviewer.database.ui.GotoDirection;
 import com.minres.scviewer.database.ui.ICursor;
-import com.minres.scviewer.database.ui.IWaveformViewer;
+import com.minres.scviewer.database.ui.IWaveformView;
 import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.database.ui.TrackEntry.ValueDisplay;
 import com.minres.scviewer.database.ui.TrackEntry.WaveDisplay;
 import com.minres.scviewer.database.ui.WaveformColors;
+import com.minres.scviewer.database.ui.swt.Constants;
+import com.minres.scviewer.database.ui.swt.ToolTipContentProvider;
+import com.minres.scviewer.database.ui.swt.ToolTipHelpTextProvider;
+import com.minres.scviewer.database.ui.swt.WaveformViewFactory;
 import com.minres.scviewer.e4.application.Messages;
 import com.minres.scviewer.e4.application.internal.status.WaveStatusBarControl;
 import com.minres.scviewer.e4.application.internal.util.FileMonitor;
@@ -164,11 +170,20 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	private static int disposeListenerNumber = 0;
 	
 	/** The factory. */
-	WaveformViewerFactory factory = new WaveformViewerFactory();
+	WaveformViewFactory factory = new WaveformViewFactory();
 
+	DesignBrowser browser = null;
+	
+	TransactionDetails detailsView = null;
+	
+	TransactionListView transactionList = null;
+	
 	/** The waveform pane. */
-	private IWaveformViewer waveformPane;
+	private IWaveformView waveformPane;
 
+	private CTabFolder tabFolder;
+	
+	private CTabItem tbtmSearchResults;
 	/** get UISynchronize injected as field */
 	@Inject UISynchronize sync;
 
@@ -199,7 +214,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	private boolean checkForUpdates;
 
 	/** The my part. */
-	private MPart myPart;
+	@Inject private MPart myPart;
 
 	/** The my parent. */
 	private Composite myParent;
@@ -207,6 +222,8 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	/** The files to load. */
 	ArrayList<File> filesToLoad = new ArrayList<>();
 
+	String partConfig = "";
+	
 	/** The persisted state. */
 	Map<String, String> persistedState;
 
@@ -217,7 +234,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	private Object detailsSettings;
 
 	/** The navigation relation type. */
-	private RelationType navigationRelationType=IWaveformViewer.NEXT_PREV_IN_STREAM ;
+	private RelationType navigationRelationType=IWaveformView.NEXT_PREV_IN_STREAM ;
 
 	/** The file monitor. */
 	FileMonitor fileMonitor = new FileMonitor();
@@ -225,6 +242,10 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	/** The file checker. */
 	IModificationChecker fileChecker;
 
+	@Inject IWaveformDbFactory dbFactory;
+	
+	@Inject Composite parent;
+	
 	private Boolean showHover;
 
 	/**
@@ -235,7 +256,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 * @param dbFactory the db factory
 	 */
 	@PostConstruct
-	public void createComposite(MPart part, Composite parent, IWaveformDbFactory dbFactory, @Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE) IEclipsePreferences prefs, @Preference(value = PreferenceConstants.SHOW_HOVER) Boolean hover) {
+	public void createComposite(MPart part, EMenuService menuService, @Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE) IEclipsePreferences prefs, @Preference(value = PreferenceConstants.SHOW_HOVER) Boolean hover) {
 		disposeListenerNumber += 1;
 		
 		myPart = part;
@@ -256,13 +277,51 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 				}
 			}
 		});
-		waveformPane = factory.createPanel(parent);
+		parent.setLayout(new FillLayout(SWT.HORIZONTAL));
+		SashForm sashFormTop = new SashForm(parent, SWT.BORDER | SWT.SMOOTH);
+
+		Composite left = new Composite(sashFormTop, SWT.NONE);
+		
+		IEclipseContext ctx = myPart.getContext();
+		ctx.set(WaveformViewer.class, this);
+		ctx.set(IWaveformDb.class, database);
+		ctx.set(Composite.class, left);
+
+		browser = ContextInjectionFactory.make(DesignBrowser.class, ctx);
+		
+		//Composite right = new Composite(sashFormTop, SWT.NONE);
+		SashForm sashFormRight = new SashForm(sashFormTop, SWT.BORDER | SWT.SMOOTH | SWT.VERTICAL);
+		sashFormTop.setWeights(new int[] {25, 75});
+
+		Composite rightTop = new Composite(sashFormRight, SWT.NONE);
+	
+		waveformPane = factory.createPanel(rightTop);
+		
+		tabFolder = new CTabFolder(sashFormRight, SWT.BORDER);
+		tabFolder.setSelectionBackground(Display.getCurrent().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND_GRADIENT));
+		
+		CTabItem tbtmDetails = new CTabItem(tabFolder, SWT.NONE);
+		tbtmDetails.setText("Transaction Details");
+		
+		ctx.set(Composite.class, tabFolder);
+		detailsView = ContextInjectionFactory.make(TransactionDetails.class, ctx);
+		tbtmDetails.setControl(detailsView.getControl());
+		
+		tbtmSearchResults = new CTabItem(tabFolder, SWT.NONE);
+		tbtmSearchResults.setText("Search Results");
+		
+		transactionList = ContextInjectionFactory.make(TransactionListView.class, ctx);
+		tbtmSearchResults.setControl(transactionList.getControl());
+		
+		sashFormRight.setWeights(new int[] {75, 25});
+		tabFolder.setSelection(0);
+
 		waveformPane.setMaxTime(0);
 		setupColors();
 		//set selection to empty selection when opening a new waveformPane
 		selectionService.setSelection(new StructuredSelection());
 		
-		waveformPane.addPropertyChangeListener(IWaveformViewer.CURSOR_PROPERTY, new PropertyChangeListener() {
+		waveformPane.addPropertyChangeListener(IWaveformView.CURSOR_PROPERTY, new PropertyChangeListener() {
 			@Override
 			public void propertyChange(PropertyChangeEvent evt) {
 				Long time = (Long) evt.getNewValue();
@@ -272,7 +331,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 
 			}
 		});
-		waveformPane.addPropertyChangeListener(IWaveformViewer.MARKER_PROPERTY, new PropertyChangeListener() {
+		waveformPane.addPropertyChangeListener(IWaveformView.MARKER_PROPERTY, new PropertyChangeListener() {
 			@Override
 			public void propertyChange(PropertyChangeEvent evt) {
 				Long time = (Long) evt.getNewValue();
@@ -478,13 +537,13 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	
 	@Inject
 	@Optional
-	public void reactOnShowHoverChange(@Preference(value = PreferenceConstants.SHOW_HOVER) Boolean hover) {
+	public void reactOnShowHoverChange(@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE, value = PreferenceConstants.SHOW_HOVER) Boolean hover) {
 		showHover=hover;
 	}
 	
 	@Inject
 	@Optional
-	public void reactOnReloadDatabaseChange(@Preference(value = PreferenceConstants.DATABASE_RELOAD) Boolean checkForUpdates) {
+	public void reactOnReloadDatabaseChange(@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE, value = PreferenceConstants.DATABASE_RELOAD) Boolean checkForUpdates) {
 		if (checkForUpdates) {
 			fileChecker = fileMonitor.addFileChangeListener(WaveformViewer.this, filesToLoad, FILE_CHECK_INTERVAL);
 		} else { 
@@ -538,6 +597,10 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 * @param state the state
 	 */
 	protected void loadDatabase(final Map<String, String> state) {
+		loadDatabase(state, 1000L);
+	}
+
+	protected void loadDatabase(final Map<String, String> state, long delay) {
 		fileMonitor.removeFileChangeListener(this);
 		Job job = new Job(Messages.WaveformViewer_15) {
 			@Override
@@ -580,8 +643,9 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 				return result;
 			}
 		};
+		job.setName("Load Database");
 		job.setSystem(true);
-		job.schedule(1000L); // let the UI initialize so that we have a progress monitor
+		job.schedule(delay); // let the UI initialize so that we have a progress monitor
 	}
 
 	/* (non-Javadoc)
@@ -595,18 +659,23 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 			public void run() {
 				if (MessageDialog.openQuestion(display.getActiveShell(), Messages.WaveformViewer_17,
 						Messages.WaveformViewer_18)) {
-					Map<String, String> state = new HashMap<>();
+					reloadDatabase();
-					saveWaveformViewerState(state);
-					waveformPane.getStreamList().clear();
-					database.clear();
-					if (filesToLoad.size() > 0)
-						loadDatabase(state);
 				}
 			}
+
 		});
 		fileMonitor.removeFileChangeListener(this);
 	}
 
+	public void reloadDatabase() {
+		Map<String, String> state = new HashMap<>();
+		saveWaveformViewerState(state);
+		waveformPane.getStreamList().clear();
+		database.clear();
+		if (filesToLoad.size() > 0)
+			loadDatabase(state, 0L);
+	}
+
 	/**
 	 * Sets the part input.
 	 *
@@ -614,48 +683,21 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 */
 	@Inject
 	@Optional
-	public void setPartInput(@Named("input") Object partInput, @Named("config") Object partConfig) {
+	public void setPartInput(@Named("input") List<String> partInput, @Named("config") String partConfig) {
-		if (partInput instanceof String) {
+		for(String s:partInput) {
-			String name = (String)partInput;
+			File file = new File(s);
-			filesToLoad = new ArrayList<File>();
+			if(file.isFile() && "CURRENT".equals(file.getName()))
-			boolean explicit = name.contains(",");
+				file=file.getParentFile();
-			for(String tok: name.split(",")) {
+			if (file.exists()) 
-				File file = new File(tok);
+				filesToLoad.add(file);
-				if(file.isFile() && "CURRENT".equals(file.getName())){
-					file=file.getParentFile();
-				}
-				if (file.exists()) {
-					filesToLoad.add(file);
-				}
-				if(!explicit)
-					try {
-						String ext = getFileExtension(file.getName());
-						if (Messages.WaveformViewer_19.equals(ext.toLowerCase())) {
-							if (askIfToLoad(new File(renameFileExtension(file.getCanonicalPath(), Messages.WaveformViewer_20)))) {
-								filesToLoad.add(new File(renameFileExtension(file.getCanonicalPath(), Messages.WaveformViewer_20)));
-							} else if (askIfToLoad(new File(renameFileExtension(file.getCanonicalPath(), Messages.WaveformViewer_21)))) {
-								filesToLoad.add(new File(renameFileExtension(file.getCanonicalPath(), Messages.WaveformViewer_21)));
-							} else if (askIfToLoad(new File(renameFileExtension(file.getCanonicalPath(), Messages.WaveformViewer_22)))) {
-								filesToLoad.add(new File(renameFileExtension(file.getCanonicalPath(), Messages.WaveformViewer_22)));
-							}
-						} else if (Messages.WaveformViewer_20.equals(ext.toLowerCase()) || 
-									Messages.WaveformViewer_21.equals(ext.toLowerCase()) ||
-									Messages.WaveformViewer_22.equals(ext.toLowerCase())
-								) {
-							if (askIfToLoad(new File(renameFileExtension(file.getCanonicalPath(), Messages.WaveformViewer_19)))) {
-								filesToLoad.add(new File(renameFileExtension(file.getCanonicalPath(), Messages.WaveformViewer_19)));
-							}
-						}
-					} catch (IOException e) { // silently ignore any error
-					}
-
-			}
-			if (filesToLoad.size() > 0)
-				loadDatabase(persistedState);
-			if(partConfig instanceof String && ((String)partConfig).length()>0) {
-				loadState((String) partConfig);
-			}
 		}
+		if(partConfig!=null) {
+			this.partConfig=partConfig;
+		}
+		if (filesToLoad.size() > 0)
+			loadDatabase(persistedState);
+		if(partConfig.length()>0)
+			loadState(partConfig);
 	}
 
 	/**
@@ -663,7 +705,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 */
 	@Focus
 	public void setFocus() {
-		waveformPane.getWaveformControl().setFocus();
+		if(waveformPane!=null) waveformPane.getWaveformControl().setFocus();
 	}
 
 	/**
@@ -756,10 +798,10 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		// get selected transaction	of a stream	
 		ISelection selection = waveformPane.getSelection();
 		if (!selection.isEmpty()) {
-			List<Object> t = getISelection(selection);
+			List<Object> sel = getISelection(selection);
-			if(t.get(0) instanceof ITx) {
+			if(sel.size()>1 && sel.get(0) instanceof ITx && sel.get(1) instanceof TrackEntry) {
-				ITx tx = (ITx) t.get(0);
+				ITx tx = (ITx) sel.get(0);
-				TrackEntry te = (TrackEntry) t.get(1);
+				TrackEntry te = (TrackEntry) sel.get(1);
 				// get transaction id
 				persistedState.put(SELECTED_TX_ID, Long.toString(tx.getId()));
 				//get TrackEntry name
@@ -992,68 +1034,36 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 			waveformPane.getStreamList().addAll(streams);
 		} else {
 			Object first = selection.getFirstElement();
-			IWaveform stream = (first instanceof ITx) ? ((ITx) first).getStream() : (IWaveform) first;
+			if(first instanceof ITx) {
-			TrackEntry trackEntry = waveformPane.getEntryForStream(stream);
+				IWaveform stream = (first instanceof ITx) ? ((ITx) first).getStream() : (IWaveform) first;
-			if (insert) {
+				TrackEntry trackEntry = waveformPane.getEntryForStream(stream);
-				int index = waveformPane.getStreamList().indexOf(trackEntry);
+				if (insert) {
-				waveformPane.getStreamList().addAll(index, streams);
+					int index = waveformPane.getStreamList().indexOf(trackEntry);
-			} else {
+					waveformPane.getStreamList().addAll(index, streams);
-				waveformPane.getStreamList().addAll(streams);
+				} else {
+					waveformPane.getStreamList().addAll(streams);
+				}
+			} else if(first instanceof TrackEntry) {
+				TrackEntry trackEntry = (TrackEntry) first;
+				if (insert) {
+					int index = waveformPane.getStreamList().indexOf(trackEntry);
+					waveformPane.getStreamList().addAll(index, streams);
+				} else {
+					waveformPane.getStreamList().addAll(streams);
+				}
 			}
 
 		}
 		setFocus();
 	}
 
-	/**
+	public void removeSelectedStreamsFromList() {
-	 * Removes the stream from list.
+		waveformPane.deleteSelectedTracks();
-	 *
-	 * @param stream the stream
-	 */
-	public void removeStreamFromList(IWaveform stream) {
-		TrackEntry trackEntry = waveformPane.getEntryForStream(stream);
-		List<TrackEntry> streams = waveformPane.getStreamList();
-		ISelection sel = waveformPane.getSelection();
-		TrackEntry newSelection=null;
-		
-		if(sel instanceof IStructuredSelection && ((IStructuredSelection) sel).size()==2) {
-				Iterator<?> it = ((IStructuredSelection)sel).iterator();
-				it.next();
-				int idx = streams.indexOf(it.next());
-				
-				if(idx==streams.size()-1) {
-					//last stream gets deleted, no more selection
-					if(idx==0) {
-						newSelection=null;
-					}
-					//more than 1 stream left, last gets deleted, selection jumps to new last stream
-					else {
-						newSelection=streams.get(idx-1);
-					}
-				}
-				//more than 1 stream left, any stream but the last gets deleted, selection jumps to the next stream
-				else {
-					newSelection=streams.get(idx+1);
-				}
-		}
-		waveformPane.setSelection(new StructuredSelection());
-		streams.remove(trackEntry);
-		if(newSelection!=null) {
-			Object[] o = {newSelection};
-			waveformPane.setSelection(new StructuredSelection(o));
-		}
 	}
 
-	/**
+	public void removeStreamFromList(ISelection sel) {
-	 * Removes the streams from list.
+		waveformPane.deleteSelectedTracks();
-	 *
-	 * @param iWaveforms the i waveforms
-	 */
-	public void removeStreamsFromList(IWaveform[] iWaveforms) {
-		for (IWaveform stream : iWaveforms)
-			removeStreamFromList(stream);
 	}
-
 	/**
 	 * Move selected.
 	 *
@@ -1150,7 +1160,10 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 * @return the selection
 	 */
 	public ISelection getSelection() {
-		return waveformPane.getSelection();
+		if(waveformPane!=null)
+			return waveformPane.getSelection();
+		else
+			return new StructuredSelection();
 	}
 
 	/**
@@ -1215,7 +1228,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 */
 	public List<RelationType> getAllRelationTypes() {
 		List<RelationType> res =new ArrayList<>();
-		res.add(IWaveformViewer.NEXT_PREV_IN_STREAM);
+		res.add(IWaveformView.NEXT_PREV_IN_STREAM);
 		res.addAll(database.getAllRelationTypes());
 		return res;
 	}
@@ -1227,7 +1240,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 */
 	public List<RelationType> getSelectionRelationTypes() {
 		List<RelationType> res =new ArrayList<>();
-		res.add(IWaveformViewer.NEXT_PREV_IN_STREAM);
+		res.add(IWaveformView.NEXT_PREV_IN_STREAM);
 		ISelection selection = waveformPane.getSelection();
 		if(selection instanceof IStructuredSelection && !selection.isEmpty()){
 			IStructuredSelection sel=(IStructuredSelection) selection;
@@ -1302,4 +1315,15 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
     	}
     }
 
+    public void showSearch() {
+    	tabFolder.setSelection(tbtmSearchResults);
+    }
+    
+	public void search(String propName, DataType type, String propValue) {
+//		StructuredSelection sel = (StructuredSelection) getSelection();
+//		TrackEntry e = findTrackEntry((sel).toArray());
+//		if(e==null) return;
+		tabFolder.setSelection(tbtmSearchResults);
+		transactionList.getControl().setSearchProps(propName, type, propValue);
+	}
 }

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AbstractTransactionTreeContentProvider.java

@@ -0,0 +1,102 @@
+package com.minres.scviewer.e4.application.parts.txTableTree;
+
+import java.util.Vector;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+import com.minres.scviewer.database.ITx;
+import com.minres.scviewer.database.ITxRelation;
+import com.minres.scviewer.e4.application.Messages;
+import com.minres.scviewer.e4.application.parts.WaveformViewer;
+
+/**
+ * The Class TransactionTreeContentProvider.
+ */
+public abstract class AbstractTransactionTreeContentProvider implements ITreeContentProvider {
+
+	/**
+	 * 
+	 */
+	private final WaveformViewer waveformViewerPart;
+
+	/**
+	 * @param transactionDetails
+	 */
+	public AbstractTransactionTreeContentProvider(WaveformViewer waveformViewerPart) {
+		this.waveformViewerPart = waveformViewerPart;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
+	 */
+	@Override
+	public void dispose() {	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 */
+	@Override
+	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
+	 */
+	@Override
+	public Object[] getChildren(Object element) {
+		if(element instanceof ITx) {
+			return new Object[]{
+					new TransactionTreeNode((ITx)element, TransactionTreeNodeType.ATTRS)  
+			};
+		} else if(element instanceof TransactionTreeNode){
+			TransactionTreeNode propertyHolder=(TransactionTreeNode) element;
+			if(propertyHolder.type == TransactionTreeNodeType.PROPS){
+				return new Object[][]{
+					{Messages.TransactionDetails_1, Messages.TransactionDetails_16, propertyHolder.element.getStream().getFullName()},
+					{Messages.TransactionDetails_2, Messages.TransactionDetails_16, propertyHolder.element.getGenerator().getName()},
+					{Messages.TransactionDetails_19, Messages.TransactionDetails_20, waveformViewerPart.getScaledTime(propertyHolder.element.getBeginTime())},
+					{Messages.TransactionDetails_21, Messages.TransactionDetails_20, waveformViewerPart.getScaledTime(propertyHolder.element.getEndTime())}
+				};
+			}else if(propertyHolder.type == TransactionTreeNodeType.ATTRS || propertyHolder.type == TransactionTreeNodeType.HIER)
+				return propertyHolder.getAttributeListForHier();
+			else if(propertyHolder.type == TransactionTreeNodeType.IN_REL){
+				Vector<Object[] > res = new Vector<>();
+				for(ITxRelation rel:propertyHolder.element.getIncomingRelations()){
+					res.add(new Object[]{
+							rel.getRelationType(), 
+							rel.getSource().getGenerator().getName(), 
+							rel.getSource()});
+				}
+				return res.toArray();
+			} else if(propertyHolder.type == TransactionTreeNodeType.OUT_REL){
+				Vector<Object[] > res = new Vector<>();
+				for(ITxRelation rel:propertyHolder.element.getOutgoingRelations()){
+					res.add(new Object[]{
+							rel.getRelationType(), 
+							rel.getTarget().getGenerator().getName(), 
+							rel.getTarget()});
+				}
+				return res.toArray();
+			}
+		}
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
+	 */
+	@Override
+	public Object getParent(Object element) {
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
+	 */
+	@Override
+	public boolean hasChildren(Object element) {
+		return getChildren(element)!=null;
+	}
+
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AttributeLabelProvider.java

@@ -0,0 +1,160 @@
+package com.minres.scviewer.e4.application.parts.txTableTree;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
+
+import com.minres.scviewer.database.DataType;
+import com.minres.scviewer.database.ITx;
+import com.minres.scviewer.database.ITxAttribute;
+import com.minres.scviewer.database.ITxRelation;
+import com.minres.scviewer.e4.application.Messages;
+import com.minres.scviewer.e4.application.parts.WaveformViewer;
+
+/**
+ * The Class AttributeLabelProvider.
+ */
+public class AttributeLabelProvider extends LabelProvider implements IStyledLabelProvider {
+
+	/**
+	 * 
+	 */
+	private final WaveformViewer waveformViewerPart;
+
+	/** The field. */
+	final int field;
+
+	/** The Constant NAME. */
+	public static final int NAME=0;
+
+	/** The Constant TYPE. */
+	public static final int TYPE=1;
+
+	/** The Constant VALUE. */
+	public static final int VALUE=2;
+
+	/** The Constant VALUE. */
+	public static final int TX_TIME=3;
+
+	String showProp;
+	
+	public String getShowProp() {
+		return showProp;
+	}
+
+	public void setShowProp(String showProp) {
+		this.showProp = showProp;
+	}
+
+	/**
+	 * Instantiates a new attribute label provider.
+	 *
+	 * @param field the field
+	 * @param transactionDetails TODO
+	 */
+	public  AttributeLabelProvider(WaveformViewer waveformViewerPart, int field) {
+		this.waveformViewerPart = waveformViewerPart;
+		this.field=field;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
+	 */
+	@Override
+	public StyledString getStyledText(Object element) {
+		if(element instanceof ITx) {
+			ITx iTx = (ITx) element;
+			switch(field){
+			case NAME:
+				return new StyledString(iTx.getId().toString());
+			case TX_TIME:
+				return new StyledString(waveformViewerPart.getScaledTime(iTx.getBeginTime()));
+			case VALUE:
+				if(showProp!=null){
+					List<ITxAttribute> res = iTx.getAttributes().stream().filter(a -> showProp.equals(a.getName())).collect(Collectors.toList());
+					if(res.size()==1)
+						return getAttrValueAsStyledString(res.get(0));
+				}
+				return new StyledString("");
+			}
+		} else {
+			switch(field){
+			case NAME:
+				if (element instanceof ITxAttribute) {
+					ITxAttribute attribute = (ITxAttribute) element;
+					String[] tokens = attribute.getName().split("\\.");
+					return new StyledString(tokens[tokens.length-1]);
+				}else if (element instanceof ITxRelation) {
+					return new StyledString(Messages.TransactionDetails_4);
+				}else if(element instanceof Object[]){
+					Object[] elements = (Object[]) element;
+					return new StyledString(elements[field].toString());
+				} else 
+					return new StyledString(element.toString());
+			case TYPE:
+				if (element instanceof ITxAttribute) {
+					ITxAttribute attribute = (ITxAttribute) element;
+					return new StyledString(attribute.getDataType().toString());
+				}else if(element instanceof Object[]){
+					Object[] elements = (Object[]) element;
+					return new StyledString(elements[field].toString());
+				}else 
+					return new StyledString("");					 //$NON-NLS-1$
+			case TX_TIME:
+				return new StyledString("");					 //$NON-NLS-1$
+			default:
+				if (element instanceof ITxAttribute) {
+					ITxAttribute attribute = (ITxAttribute) element;
+					return getAttrValueAsStyledString(attribute);
+				}else if(element instanceof Object[]){
+					Object[] elements = (Object[]) element;
+					Object o = elements[field];
+					if(o instanceof ITx) {
+						ITx tx = (ITx)o;
+						return new StyledString(this.txToString(tx)+" ("+tx.getStream().getFullName()+")");
+					} else
+						return new StyledString(o.toString());
+				} else if(element instanceof ITx){
+					return new StyledString(this.txToString((ITx) element));
+				}
+			}
+		}
+		return new StyledString("");					 //$NON-NLS-1$
+	}
+
+	public StyledString getAttrValueAsStyledString(ITxAttribute attribute) {
+		String value = attribute.getValue().toString();
+		if((DataType.UNSIGNED == attribute.getDataType() || DataType.INTEGER==attribute.getDataType()) && !"0".equals(value)) {
+			try {
+				value += " [0x"+Long.toHexString(Long.parseLong(attribute.getValue().toString()))+"]";
+			} catch(NumberFormatException e) { }
+		}
+		return new StyledString(value);
+	}
+	/**
+	 * Tx to string.
+	 *
+	 * @param tx the tx
+	 * @return the string
+	 */
+	String txToString(ITx tx){
+		StringBuilder sb = new StringBuilder();
+		sb.append("tx#").append(tx.getId()).append("[").append(timeToString(tx.getBeginTime())); //$NON-NLS-1$ //$NON-NLS-2$
+		sb.append(" - ").append(timeToString(tx.getEndTime())).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
+		return sb.toString();
+	}
+
+	/**
+	 * Time to string.
+	 *
+	 * @param time the time
+	 * @return the string
+	 */
+	String timeToString(Long time){
+		return waveformViewerPart.getScaledTime(time);
+	}
+
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TransactionTreeNode.java

@@ -0,0 +1,95 @@
+package com.minres.scviewer.e4.application.parts.txTableTree;
+
+import java.util.AbstractMap;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+import com.minres.scviewer.database.ITx;
+import com.minres.scviewer.e4.application.Messages;
+
+/**
+ * The Class TreeNode.
+ */
+public class TransactionTreeNode implements Comparable<TransactionTreeNode>{
+
+	/** The type. */
+	public TransactionTreeNodeType type;
+
+	/** The element. */
+	public ITx element;
+
+	private String hier_path;
+	/**
+	 * Instantiates a new tree node.
+	 *
+	 * @param element the element
+	 * @param type the type
+	 */
+	public TransactionTreeNode(ITx element, TransactionTreeNodeType type){
+		this.element=element;
+		this.type=type;
+		this.hier_path="";
+	}
+
+	public TransactionTreeNode(ITx element, String path){
+		this.element=element;
+		this.type=TransactionTreeNodeType.HIER;
+		this.hier_path=path;
+	}
+
+	/* (non-Javadoc)
+	 * @see java.lang.Object#toString()
+	 */
+	public String toString(){
+		switch(type){
+		case PROPS:      return Messages.TransactionDetails_10;
+		case ATTRS:	     return Messages.TransactionDetails_11;
+		case IN_REL:     return Messages.TransactionDetails_12;
+		case OUT_REL:    return Messages.TransactionDetails_13;
+		case HIER:{
+			String[] tokens = hier_path.split("\\.");
+			return tokens[tokens.length-1];
+		}
+		}
+		return ""; //$NON-NLS-1$
+	}
+	
+	public Object[] getAttributeListForHier() {
+		if(childs==null) {
+			Map<String, Object> res = element.getAttributes().stream()
+			.filter(txAttr -> txAttr.getName().startsWith(hier_path))
+			.map(txAttr -> {
+				String target = hier_path.length()==0?txAttr.getName():txAttr.getName().replace(hier_path+'.', "");
+				String[] tokens = target.split("\\.");
+				if(tokens.length==1)
+					return new AbstractMap.SimpleEntry<>(tokens[0], txAttr);
+				else 
+					return new AbstractMap.SimpleEntry<>(tokens[0], new TransactionTreeNode(element, hier_path.length()>0?hier_path+"."+tokens[0]:tokens[0]));
+			})
+			.collect(Collectors.toMap(p -> p.getKey(), p -> p.getValue(), (first, second) -> first));
+			childs = new TreeMap<String, Object>(res).values().toArray();
+		}
+		return childs;
+	}
+	
+	private Object[] childs=null;
+
+	@Override
+	public boolean equals(Object o) {
+		if(o instanceof TransactionTreeNode) {
+			TransactionTreeNode t = (TransactionTreeNode) o;
+			return type==t.type && hier_path.equals(t.hier_path); 
+		}
+		return false;
+	}
+	
+	@Override
+	public int compareTo(TransactionTreeNode o) {
+		int res1 = type.compareTo(o.type);
+		if(res1==0) {
+			return hier_path.compareTo(o.hier_path);
+		} else
+			return res1;
+	}
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TransactionTreeNodeType.java

@@ -0,0 +1,12 @@
+package com.minres.scviewer.e4.application.parts.txTableTree;
+
+/**
+ * The Enum Type.
+ */
+public enum TransactionTreeNodeType {
+	PROPS,  /** The props. */
+	ATTRS,  /** The attrs. */
+	IN_REL, /** The in rel. */ 
+	OUT_REL,/** The out rel. */
+	HIER
+	}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeFilter.java

@@ -0,0 +1,55 @@
+package com.minres.scviewer.e4.application.parts.txTableTree;
+
+import java.util.regex.PatternSyntaxException;
+
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+
+import com.minres.scviewer.database.ITxAttribute;
+
+/**
+ * The Class TxAttributeFilter.
+ */
+public class TxAttributeFilter extends ViewerFilter {
+
+	/** The search string. */
+	private String searchString;
+
+	/**
+	 * Sets the search text.
+	 *
+	 * @param s the new search text
+	 */
+	public void setSearchText(String s) {
+		this.searchString = ".*" + s + ".*"; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 */
+	@Override
+	public boolean select(Viewer viewer, Object parentElement, Object element) {
+
+		if (searchString == null || searchString.length() == 0) {
+			return true;
+		}
+		if(element instanceof TransactionTreeNode) {
+			return true;
+		}
+		if(element instanceof ITxAttribute){
+			try {
+				return (((ITxAttribute) element).getName().toLowerCase().matches(searchString.toLowerCase()));
+			} catch (PatternSyntaxException e) {
+				return true;
+			}
+		} 
+		if(element instanceof Object[]) {
+			try {
+				return (((Object[])element)[0]).toString().toLowerCase().matches(searchString.toLowerCase());	
+			} catch (PatternSyntaxException e) {
+				return true;
+			}
+		}
+		return false;
+	}
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeViewerSorter.java

@@ -0,0 +1,73 @@
+package com.minres.scviewer.e4.application.parts.txTableTree;
+
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
+
+import com.minres.scviewer.database.ITxAttribute;
+
+/**
+ * The Class TxAttributeViewerSorter.
+ */
+public class TxAttributeViewerSorter extends ViewerComparator {
+
+	/** The Constant ASCENDING. */
+	private static final int ASCENDING = 0;
+
+	/** The Constant DESCENDING. */
+	private static final int DESCENDING = 1;
+
+	/** The column. */
+	private int column;
+
+	/** The direction. */
+	private int direction;
+
+	/**
+	 * Does the sort. If it's a different column from the previous sort, do an
+	 * ascending sort. If it's the same column as the last sort, toggle the sort
+	 * direction.
+	 *
+	 * @param column the column
+	 */
+	public void doSort(int column) {
+		if (column == this.column) {
+			// Same column as last sort; toggle the direction
+			direction = 1 - direction;
+		} else {
+			// New column; do an ascending sort
+			this.column = column;
+			direction = ASCENDING;
+		}
+	}
+
+	/**
+	 * Compares the object for sorting.
+	 *
+	 * @param viewer the viewer
+	 * @param e1 the e1
+	 * @param e2 the e2
+	 * @return the int
+	 */
+	public int compare(Viewer viewer, Object e1, Object e2) {
+		int rc = 0;
+		if(e1 instanceof ITxAttribute && e2 instanceof ITxAttribute){
+			ITxAttribute p1 = (ITxAttribute) e1;
+			ITxAttribute p2 = (ITxAttribute) e2;
+			// Determine which column and do the appropriate sort
+			switch (column) {
+			case 0:
+				rc = getComparator().compare(p1.getName(), p2.getName());
+				break;
+			case 1:
+				rc = getComparator().compare(p1.getDataType().name(), p2.getDataType().name());
+				break;
+			case 2:
+				rc = getComparator().compare(p1.getValue().toString(), p2.getValue().toString());
+				break;
+			}
+			// If descending order, flip the direction
+			if (direction == DESCENDING) rc = -rc;
+		}
+		return rc;
+	}
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxFilter.java

@@ -0,0 +1,92 @@
+package com.minres.scviewer.e4.application.parts.txTableTree;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.regex.PatternSyntaxException;
+import java.util.stream.Collectors;
+
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+
+import com.minres.scviewer.database.DataType;
+import com.minres.scviewer.database.ITx;
+import com.minres.scviewer.database.ITxAttribute;
+
+/**
+ * The Class TxAttributeFilter.
+ */
+public class TxFilter extends ViewerFilter {
+
+	/** The search string. */
+	private String searchProp;
+	/** The search type. */
+	private DataType searchType;
+	/** The search string. */
+	private String searchValue;
+
+	/**
+	 * Sets the search text.
+	 *
+	 * @param s the new search text
+	 * @param dataType 
+	 */
+	public void setSearchProp(String s, DataType type) {
+		this.searchProp = s;
+		this.searchType = type;
+	}
+	/**
+	 * Sets the search text.
+	 *
+	 * @param s the new search text
+	 */
+	public void setSearchValue(String s) {
+		this.searchValue = s; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
+	 */
+	@Override
+	public boolean select(Viewer viewer, Object parentElement, Object element) {
+		if (searchValue == null || searchValue.length() == 0)
+			return true;
+		if(element instanceof ITx) {
+			ITx iTx = (ITx) element;
+			List<ITxAttribute> res = iTx.getAttributes().stream().filter(a -> searchProp.equals(a.getName())).collect(Collectors.toList());
+			if(res.size()==1) {
+				try {
+				ITxAttribute attr =res.get(0);
+				switch(searchType) {
+				case BOOLEAN: // bool
+				case ENUMERATION:
+					return searchValue.equalsIgnoreCase((String) attr.getValue());
+				case INTEGER:
+				case UNSIGNED:
+					BigInteger lval = new BigInteger(attr.getValue().toString());
+					BigInteger sval = parseBigInteger(searchValue);
+					return lval.equals(sval);
+				case STRING:
+					try {
+						return (((ITxAttribute) element).getName().toLowerCase().matches(searchValue.toLowerCase()));
+					} catch (PatternSyntaxException e) {
+						return true;
+					}
+				default:
+					break;
+				}
+				} catch(RuntimeException ex) {
+					return false;
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	private BigInteger parseBigInteger(String value) {
+		if(value.startsWith("0x") || value.startsWith("0X"))
+			return new BigInteger(value.substring(2), 16);
+		else
+			return new BigInteger(value);
+	}
+}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/WaveformPreferencesPage.java

@@ -10,6 +10,9 @@
  *******************************************************************************/
 package com.minres.scviewer.e4.application.preferences;
 
+import java.lang.reflect.Field;
+import java.util.HashMap;
+
 import org.eclipse.jface.preference.ColorFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 
@@ -26,6 +29,7 @@ public class WaveformPreferencesPage extends FieldEditorPreferencePage {
 	 */
 	public WaveformPreferencesPage() {
 		super(GRID);
+		setDescription(Messages.WaveformPreferencesPage_description);
 	}
 
 	/* (non-Javadoc)
@@ -33,9 +37,18 @@ public class WaveformPreferencesPage extends FieldEditorPreferencePage {
 	 */
 	@Override
 	protected void createFieldEditors() {
-
+		Field[] declaredFields = Messages.class.getDeclaredFields();
+		HashMap<String, String> staticFields = new HashMap<String, String>();
+		for (Field field : declaredFields) {
+		    if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
+		        try {
+					staticFields.put(field.getName(), (String)field.get(null));
+				} catch (IllegalArgumentException | IllegalAccessException e) {}
+		    }
+		}
 		for (WaveformColors c : WaveformColors.values()) {
-			addField(new ColorFieldEditor(c.name() + "_COLOR", Messages.WaveformPreferencesPage_1 + c.name().toLowerCase(), //$NON-NLS-1$
+			addField(new ColorFieldEditor(c.name() + "_COLOR", 
+					Messages.WaveformPreferencesPage_1 + staticFields.get(c.name().toLowerCase()), //$NON-NLS-1$
 					getFieldEditorParent()));
 		}
 	}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java

@@ -29,24 +29,24 @@ public class TxDbContentProvider implements ITreeContentProvider {
 
 	/** The show nodes. */
 	//	private List<HierNode> nodes;
-	private boolean showNodes;
+	private boolean tabelEntries;
 
 	/**
 	 * Instantiates a new tx db content provider.
 	 */
 	public TxDbContentProvider() {
 		super();
-		this.showNodes = false;
+		this.tabelEntries = false;
 	}
 
 	/**
 	 * Instantiates a new tx db content provider.
 	 *
-	 * @param showNodes the show nodes
+	 * @param tableEntries get nodes for waveform table entries
 	 */
-	public TxDbContentProvider(boolean showNodes) {
+	public TxDbContentProvider(boolean tableEntries) {
 		super();
-		this.showNodes = showNodes;
+		this.tabelEntries = tableEntries;
 	}
 
 	/* (non-Javadoc)
@@ -60,7 +60,6 @@ public class TxDbContentProvider implements ITreeContentProvider {
 	 */
 	@Override
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-//		showNodes=!(newInput instanceof IHierNode);
 	}
 
 	/* (non-Javadoc)
@@ -68,11 +67,13 @@ public class TxDbContentProvider implements ITreeContentProvider {
 	 */
 	@Override
 	public Object[] getElements(Object inputElement) {
-		if(inputElement instanceof IHierNode){
+		if(tabelEntries && inputElement instanceof IWaveformDb){
+			return new Object[]{};
+		}else if(inputElement instanceof IHierNode){
 			Collection<IHierNode> res = Collections2.filter(((IHierNode)inputElement).getChildNodes(), new Predicate<IHierNode>(){
 				@Override
 				public boolean apply(IHierNode arg0) {
-					if(showNodes){
+					if(tabelEntries){
 						return arg0 instanceof IWaveform;
 					} else{
 						return arg0.getChildNodes().size()!=0;
@@ -82,8 +83,6 @@ public class TxDbContentProvider implements ITreeContentProvider {
 			return res.toArray();
 		}else if(inputElement instanceof List<?>){
 			return ((List<?>)inputElement).toArray();
-		}else if(inputElement instanceof IWaveformDb){
-			return new Object[]{};
 		} else
 			return null;
 	}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java

@@ -63,12 +63,6 @@ public class TxDbLabelProvider implements ILabelProvider {
 	 */
 	@Override
 	public void dispose() {
-		if(loadinDatabase!=null) database.dispose();
-		if(database!=null) database.dispose();
-		if(stream!=null) stream.dispose();
-		if(folder!=null) folder.dispose();
-		if(signal!=null) signal.dispose();
-		if(wave!=null) wave.dispose();
 	}
 
 	/* (non-Javadoc)

plugins/com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/ResourceManager.java

@@ -1,13 +1,14 @@
-/*******************************************************************************
+/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
+ * Copyright (c) 2011 Google, Inc. and others
- * All rights reserved. This program and the accompanying materials
+ * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
- *
+ *
- * Contributors:
+ * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
+ *    Google, Inc. - initial API and implementation
- *******************************************************************************/
+ *    Wim Jongman  - 1.8 and higher compliance
+ *******************************************************************************/
 package org.eclipse.wb.swt;
 
 import java.io.File;
@@ -24,51 +25,61 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.CompositeImageDescriptor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.ImageDataProvider;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
-import org.osgi.framework.Bundle;
+import org.osgi.framework.Bundle;
-
+
 import com.minres.scviewer.e4.application.Messages;
 
 /**
- * Utility class for managing OS resources associated with SWT/JFace controls such as colors, fonts, images,
+ * Utility class for managing OS resources associated with SWT/JFace controls
- * etc.
+ * such as colors, fonts, images, etc.
  * 
- * !!! IMPORTANT !!! Application code must explicitly invoke the <code>dispose()</code> method to release the
+ * This class is created automatically when you fiddle around with images and
- * operating system resources managed by cached objects when those objects and OS resources are no longer
+ * colors in WB. You might want to prevent your application from using this
- * needed (e.g. on application shutdown)
+ * class and provide your own more effective means of resource caching.
+ * 
+ * Even though this class can be used to manage these resources, if they are
+ * here for the duration of the application and not used then you still have an
+ * effective resource leak. 
+ * 
+ * Application code must explicitly invoke the <code>dispose()</code> method to
+ * release the operating system resources managed by cached objects when those
+ * objects and OS resources are no longer needed.
  * 
  * This class may be freely distributed as part of any application or plugin.
  * <p>
  * 
  * @author scheglov_ke
  * @author Dan Rubel
+ * @author Wim Jongman
  */
 public class ResourceManager extends SWTResourceManager {
-	////////////////////////////////////////////////////////////////////////////
+
-	//
-	// Image
-	//
-	////////////////////////////////////////////////////////////////////////////
-	private static Map<ImageDescriptor, Image> m_descriptorImageMap = new HashMap<ImageDescriptor, Image>();
 	/**
-	 * Returns an {@link ImageDescriptor} stored in the file at the specified path relative to the specified
+	 * The map where we store our images. 
-	 * class.
+	 */
+	private static Map<ImageDescriptor, Image> m_descriptorImageMap = new HashMap<ImageDescriptor, Image>();
+
+	/**
+	 * Returns an {@link ImageDescriptor} stored in the file at the specified path
+	 * relative to the specified class.
 	 * 
-	 * @param clazz
+	 * @param clazz the {@link Class} relative to which to find the image
-	 *            the {@link Class} relative to which to find the image descriptor.
+	 *              descriptor.
-	 * @param path
+	 * @param path  the path to the image file.
-	 *            the path to the image file.
 	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
 	 */
 	public static ImageDescriptor getImageDescriptor(Class<?> clazz, String path) {
 		return ImageDescriptor.createFromFile(clazz, path);
 	}
+
 	/**
 	 * Returns an {@link ImageDescriptor} stored in the file at the specified path.
 	 * 
-	 * @param path
+	 * @param path the path to the image file.
-	 *            the path to the image file.
 	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
 	 */
 	public static ImageDescriptor getImageDescriptor(String path) {
@@ -78,11 +89,11 @@ public class ResourceManager extends SWTResourceManager {
 			return null;
 		}
 	}
+
 	/**
 	 * Returns an {@link Image} based on the specified {@link ImageDescriptor}.
 	 * 
-	 * @param descriptor
+	 * @param descriptor the {@link ImageDescriptor} for the {@link Image}.
-	 *            the {@link ImageDescriptor} for the {@link Image}.
 	 * @return the {@link Image} based on the specified {@link ImageDescriptor}.
 	 */
 	public static Image getImage(ImageDescriptor descriptor) {
@@ -96,23 +107,24 @@ public class ResourceManager extends SWTResourceManager {
 		}
 		return image;
 	}
+
 	/**
 	 * Maps images to decorated images.
 	 */
 	@SuppressWarnings("unchecked")
 	private static Map<Image, Map<Image, Image>>[] m_decoratedImageMap = new Map[LAST_CORNER_KEY];
+
 	/**
 	 * Returns an {@link Image} composed of a base image decorated by another image.
 	 * 
-	 * @param baseImage
+	 * @param baseImage the base {@link Image} that should be decorated.
-	 *            the base {@link Image} that should be decorated.
+	 * @param decorator the {@link Image} to decorate the base image.
-	 * @param decorator
-	 *            the {@link Image} to decorate the base image.
 	 * @return {@link Image} The resulting decorated image.
 	 */
 	public static Image decorateImage(Image baseImage, Image decorator) {
 		return decorateImage(baseImage, decorator, BOTTOM_RIGHT);
 	}
+
 	/**
 	 * Returns an {@link Image} composed of a base image decorated by another image.
 	 * 
@@ -149,13 +161,13 @@ public class ResourceManager extends SWTResourceManager {
 				protected void drawCompositeImage(int width, int height) {
 					drawImage(createCachedImageDataProvider(baseImage), 0, 0);
 					if (corner == TOP_LEFT) {
-						drawImage(createCachedImageDataProvider(decorator), 0, 0);
+						drawImage(getUnzoomedImageDataProvider(decorator.getImageData()) , 0, 0);
 					} else if (corner == TOP_RIGHT) {
-						drawImage(createCachedImageDataProvider(decorator), bib.width - dib.width, 0);
+						drawImage(getUnzoomedImageDataProvider(decorator.getImageData()), bib.width - dib.width, 0);
 					} else if (corner == BOTTOM_LEFT) {
-						drawImage(createCachedImageDataProvider(decorator), 0, bib.height - dib.height);
+						drawImage(getUnzoomedImageDataProvider(decorator.getImageData()), 0, bib.height - dib.height);
 					} else if (corner == BOTTOM_RIGHT) {
-						drawImage(createCachedImageDataProvider(decorator), bib.width - dib.width, bib.height - dib.height);
+						drawImage(getUnzoomedImageDataProvider(decorator.getImageData()), bib.width - dib.width, bib.height - dib.height);
 					}
 				}
 				@Override
@@ -169,6 +181,12 @@ public class ResourceManager extends SWTResourceManager {
 		}
 		return result;
 	}
+	
+	private static ImageDataProvider getUnzoomedImageDataProvider(ImageData imageData) {
+		return zoom -> zoom == 100 ? imageData : null;
+	}
+
+
 	/**
 	 * Dispose all of the cached images.
 	 */
@@ -202,6 +220,7 @@ public class ResourceManager extends SWTResourceManager {
 			m_URLImageMap.clear();
 		}
 	}
+
 	////////////////////////////////////////////////////////////////////////////
 	//
 	// Plugin images support
@@ -211,23 +230,25 @@ public class ResourceManager extends SWTResourceManager {
 	 * Maps URL to images.
 	 */
 	private static Map<String, Image> m_URLImageMap = new HashMap<String, Image>();
+
 	/**
 	 * Provider for plugin resources, used by WindowBuilder at design time.
 	 */
 	public interface PluginResourceProvider {
 		URL getEntry(String symbolicName, String path);
 	}
+
 	/**
-	 * Instance of {@link PluginResourceProvider}, used by WindowBuilder at design time.
+	 * Instance of {@link PluginResourceProvider}, used by WindowBuilder at design
+	 * time.
 	 */
 	private static PluginResourceProvider m_designTimePluginResourceProvider = null;
+
 	/**
 	 * Returns an {@link Image} based on a plugin and file path.
 	 * 
-	 * @param plugin
+	 * @param plugin the plugin {@link Object} containing the image
-	 *            the plugin {@link Object} containing the image
+	 * @param name   the path to the image within the plugin
-	 * @param name
-	 *            the path to the image within the plugin
 	 * @return the {@link Image} stored in the file at the specified path
 	 * 
 	 * @deprecated Use {@link #getPluginImage(String, String)} instead.
@@ -244,13 +265,12 @@ public class ResourceManager extends SWTResourceManager {
 		}
 		return null;
 	}
+
 	/**
 	 * Returns an {@link Image} based on a {@link Bundle} and resource entry path.
 	 * 
-	 * @param symbolicName
+	 * @param symbolicName the symbolic name of the {@link Bundle}.
-	 *            the symbolic name of the {@link Bundle}.
+	 * @param path         the path of the resource entry.
-	 * @param path
-	 *            the path of the resource entry.
 	 * @return the {@link Image} stored in the file at the specified path.
 	 */
 	public static Image getPluginImage(String symbolicName, String path) {
@@ -264,6 +284,7 @@ public class ResourceManager extends SWTResourceManager {
 		}
 		return null;
 	}
+
 	/**
 	 * Returns an {@link Image} based on given {@link URL}.
 	 */
@@ -290,13 +311,12 @@ public class ResourceManager extends SWTResourceManager {
 		}
 		return null;
 	}
+
 	/**
 	 * Returns an {@link ImageDescriptor} based on a plugin and file path.
 	 * 
-	 * @param plugin
+	 * @param plugin the plugin {@link Object} containing the image.
-	 *            the plugin {@link Object} containing the image.
+	 * @param name   the path to th eimage within the plugin.
-	 * @param name
-	 *            the path to th eimage within the plugin.
 	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
 	 * 
 	 * @deprecated Use {@link #getPluginImageDescriptor(String, String)} instead.
@@ -315,14 +335,15 @@ public class ResourceManager extends SWTResourceManager {
 		}
 		return null;
 	}
+
 	/**
-	 * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
+	 * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource
+	 * entry path.
 	 * 
-	 * @param symbolicName
+	 * @param symbolicName the symbolic name of the {@link Bundle}.
-	 *            the symbolic name of the {@link Bundle}.
+	 * @param path         the path of the resource entry.
-	 * @param path
+	 * @return the {@link ImageDescriptor} based on a {@link Bundle} and resource
-	 *            the path of the resource entry.
+	 *         entry path.
-	 * @return the {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
 	 */
 	public static ImageDescriptor getPluginImageDescriptor(String symbolicName, String path) {
 		try {
@@ -335,6 +356,7 @@ public class ResourceManager extends SWTResourceManager {
 		}
 		return null;
 	}
+
 	/**
 	 * Returns an {@link URL} based on a {@link Bundle} and resource entry path.
 	 */
@@ -353,13 +375,12 @@ public class ResourceManager extends SWTResourceManager {
 		// no such resource
 		return null;
 	}
+
 	/**
 	 * Returns an {@link URL} based on a plugin and file path.
 	 * 
-	 * @param plugin
+	 * @param plugin the plugin {@link Object} containing the file path.
-	 *            the plugin {@link Object} containing the file path.
+	 * @param name   the file path.
-	 * @param name
-	 *            the file path.
 	 * @return the {@link URL} representing the file at the specified path.
 	 * @throws Exception
 	 */
@@ -373,13 +394,13 @@ public class ResourceManager extends SWTResourceManager {
 				Object bundle = getBundleMethod.invoke(plugin, new Object[0]);
 				//
 				Class<?> PathClass = Class.forName("org.eclipse.core.runtime.Path"); //$NON-NLS-1$
-				Constructor<?> pathConstructor = PathClass.getConstructor(new Class[]{String.class});
+				Constructor<?> pathConstructor = PathClass.getConstructor(new Class[] { String.class });
-				Object path = pathConstructor.newInstance(new Object[]{name});
+				Object path = pathConstructor.newInstance(new Object[] { name });
 				//
 				Class<?> IPathClass = Class.forName("org.eclipse.core.runtime.IPath"); //$NON-NLS-1$
 				Class<?> PlatformClass = Class.forName("org.eclipse.core.runtime.Platform"); //$NON-NLS-1$
-				Method findMethod = PlatformClass.getMethod("find", new Class[]{BundleClass, IPathClass}); //$NON-NLS-1$
+				Method findMethod = PlatformClass.getMethod("find", new Class[] { BundleClass, IPathClass }); //$NON-NLS-1$
-				return (URL) findMethod.invoke(null, new Object[]{bundle, path});
+				return (URL) findMethod.invoke(null, new Object[] { bundle, path });
 			}
 		} catch (Throwable e) {
 			// Ignore any exceptions
@@ -390,24 +411,26 @@ public class ResourceManager extends SWTResourceManager {
 			if (PluginClass.isAssignableFrom(plugin.getClass())) {
 				//
 				Class<?> PathClass = Class.forName("org.eclipse.core.runtime.Path"); //$NON-NLS-1$
-				Constructor<?> pathConstructor = PathClass.getConstructor(new Class[]{String.class});
+				Constructor<?> pathConstructor = PathClass.getConstructor(new Class[] { String.class });
-				Object path = pathConstructor.newInstance(new Object[]{name});
+				Object path = pathConstructor.newInstance(new Object[] { name });
 				//
 				Class<?> IPathClass = Class.forName("org.eclipse.core.runtime.IPath"); //$NON-NLS-1$
-				Method findMethod = PluginClass.getMethod("find", new Class[]{IPathClass}); //$NON-NLS-1$
+				Method findMethod = PluginClass.getMethod("find", new Class[] { IPathClass }); //$NON-NLS-1$
-				return (URL) findMethod.invoke(plugin, new Object[]{path});
+				return (URL) findMethod.invoke(plugin, new Object[] { path });
 			}
 		}
 		return null;
 	}
+
 	////////////////////////////////////////////////////////////////////////////
 	//
 	// General
 	//
 	////////////////////////////////////////////////////////////////////////////
 	/**
-	 * Dispose of cached objects and their underlying OS resources. This should only be called when the cached
+	 * Dispose of cached objects and their underlying OS resources. This should only
-	 * objects are no longer needed (e.g. on application shutdown).
+	 * be called when the cached objects are no longer needed (e.g. on application
+	 * shutdown).
 	 */
 	public static void dispose() {
 		disposeColors();

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

@@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

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

@@ -6,7 +6,6 @@ Bundle-Version: 1.0.1.qualifier
 Bundle-Activator: com.minres.scviewer.ui.TxEditorPlugin
 Bundle-Vendor: MINRES Technologies GmbH
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- com.minres.scviewer.database.ui;bundle-version="1.0.0",
  com.minres.scviewer.database.ui.swt;bundle-version="1.0.0",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,

plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java

@@ -48,15 +48,15 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.IWaveformDb;
 import com.minres.scviewer.database.IWaveformDbFactory;
-import com.minres.scviewer.database.swt.WaveformViewerFactory;
 import com.minres.scviewer.database.ui.GotoDirection;
-import com.minres.scviewer.database.ui.IWaveformViewer;
+import com.minres.scviewer.database.ui.IWaveformView;
 import com.minres.scviewer.database.ui.TrackEntry;
+import com.minres.scviewer.database.ui.swt.WaveformViewFactory;
 import com.minres.scviewer.ui.views.TxOutlinePage;
 
 public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPageContributor {
 
-	private IWaveformDbFactory waveformDbFactory;
+	private static IWaveformDbFactory waveformDbFactory;
 	
 	public synchronized void bind(IWaveformDbFactory factory){
 		waveformDbFactory=factory;
@@ -78,7 +78,7 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
 
 	public static final String WAVE_ACTION_ID = "com.minres.scviewer.ui.action.AddToWave";
 
-	private IWaveformViewer txDisplay;
+	private IWaveformView txDisplay;
 
 	/** This is the root of the editor's model. */
 	private IWaveformDb database;
@@ -112,10 +112,10 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
 				}		
 			}
 		});
-		WaveformViewerFactory factory = new WaveformViewerFactory();
+		WaveformViewFactory factory = new WaveformViewFactory();
 		txDisplay = factory.createPanel(parent);
 		txDisplay.setMaxTime(0);
-		txDisplay.addPropertyChangeListener(IWaveformViewer.CURSOR_PROPERTY, new PropertyChangeListener() {
+		txDisplay.addPropertyChangeListener(IWaveformView.CURSOR_PROPERTY, new PropertyChangeListener() {
             @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 Long time = (Long) evt.getNewValue();

pom.xml

@@ -13,7 +13,6 @@
 		<module>plugins/com.minres.scviewer.database.text</module>
 		<module>plugins/com.minres.scviewer.database.vcd</module>
 		<module>tests/com.minres.scviewer.database.test</module>
-		<module>plugins/com.minres.scviewer.database.ui</module>
 		<module>plugins/com.minres.scviewer.database.ui.swt</module>
 		<module>plugins/com.minres.scviewer.e4.application</module>
 		<module>plugins/com.minres.scviewer.ui</module>
@@ -23,7 +22,8 @@
 		<module>features/com.minres.scviewer.e4.platform.feature</module>
 		<module>features/com.minres.scviewer.e4.feature</module>
 		<module>p2repositories//com.minres.scviewer.updateSite</module>
-		<module>com.minres.scviewer.e4.product</module>
+		<module>products/com.minres.scviewer.e4.product</module>
+		<module>products/com.minres.scviewer.e4.product_slim</module>
 	</modules>
 
 	<properties>