From db1d377da697764783ac976a245789e5637e4f92 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Sat, 20 Jun 2020 17:58:26 +0200
Subject: [PATCH 1/6] fix redraw issues

---
 .../database/swt/internal/ArrowPainter.java   |  38 +++---
 .../database/swt/internal/CursorPainter.java  |  17 +--
 .../database/swt/internal/IPainter.java       |   3 +-
 .../database/swt/internal/Projection.java     | 123 ++++++++++++++++++
 .../database/swt/internal/RulerPainter.java   |   6 +-
 .../database/swt/internal/SignalPainter.java  | 111 ++++++++--------
 .../database/swt/internal/StreamPainter.java  |  50 +++----
 .../swt/internal/TrackAreaPainter.java        |  14 +-
 .../database/swt/internal/WaveformCanvas.java |  28 +---
 9 files changed, 244 insertions(+), 146 deletions(-)
 create mode 100644 plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/Projection.java

diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java
index 04dcbca..df17fb2 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java
@@ -89,9 +89,8 @@ public class ArrowPainter implements IPainter {
 			deferredUpdate = true;
 			return;
 		}
-		selectionOffset = waveCanvas.getXOffset();
 		int laneHeight = painter.getHeight() / stream.getMaxConcurrency();
-		txRectangle = new Rectangle((int) (tx.getBeginTime() / scaleFactor-waveCanvas.getXOffset()),
+		txRectangle = new Rectangle((int) (tx.getBeginTime() / scaleFactor),
 				waveCanvas.rulerHeight + painter.getVerticalOffset() + laneHeight * tx.getConcurrencyIndex(),
 				(int) ((tx.getEndTime() - tx.getBeginTime()) / scaleFactor), laneHeight);
 		deriveGeom(tx.getIncomingRelations(), iRect, false);
@@ -105,7 +104,7 @@ public class ArrowPainter implements IPainter {
 				ITxStream<?> stream = otherTx.getStream();
 				IWaveformPainter painter = waveCanvas.wave2painterMap.get(stream);
 				int laneHeight = painter.getHeight() / stream.getMaxConcurrency();
-				Rectangle bb = new Rectangle((int) (otherTx.getBeginTime() / scaleFactor-waveCanvas.getXOffset()),
+				Rectangle bb = new Rectangle((int) (otherTx.getBeginTime() / scaleFactor),
 						waveCanvas.rulerHeight + painter.getVerticalOffset()
 								+ laneHeight * otherTx.getConcurrencyIndex(),
 						(int) ((otherTx.getEndTime() - otherTx.getBeginTime()) / scaleFactor), laneHeight);
@@ -115,7 +114,7 @@ public class ArrowPainter implements IPainter {
 	}
 
 	@Override
-	public void paintArea(GC gc, Rectangle area) {
+	public void paintArea(Projection proj, Rectangle clientRect) {
 		Color fgColor = waveCanvas.colors[WaveformColors.REL_ARROW.ordinal()];
 		Color highliteColor = waveCanvas.colors[WaveformColors.REL_ARROW_HIGHLITE.ordinal()];
 
@@ -124,33 +123,30 @@ public class ArrowPainter implements IPainter {
 			calculateGeometries();
 		}
 		if(txRectangle == null) return;
-		int correctionValue = (int)(selectionOffset - waveCanvas.getXOffset());
+		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(gc, highlightType.equals(entry.relationType) ? highliteColor : fgColor,
+			Point target = drawPath(proj, highlightType.equals(entry.relationType) ? highliteColor : fgColor,
 					correctedRectangle, correctedTargetRectangle);
-			drawArrow(gc, target);
+			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(gc, highlightType.equals(entry.relationType) ? highliteColor : fgColor, correctedTargetRectangle,
+			Point target = drawPath(proj, highlightType.equals(entry.relationType) ? highliteColor : fgColor, correctedTargetRectangle,
 					correctedRectangle);
-			drawArrow(gc, target);
+			drawArrow(proj, target);
 		}
 	}
 
-	protected void drawArrow(GC gc, Point target) {
-		gc.drawLine(target.x - 8, target.y - 5, target.x, target.y);
-		gc.drawLine(target.x - 8, target.y + 5, target.x, target.y);
+	protected void drawArrow(Projection proj, Point target) {
+		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(GC gc, Color fgColor, Rectangle srcRectangle, Rectangle tgtRectangle) {
-		Point point1 = new Point(0, srcRectangle.y + srcRectangle.height / 2);
-		Point point2 = new Point(0, tgtRectangle.y + tgtRectangle.height / 2);
-
-		point1.x = srcRectangle.x;
-		point2.x = tgtRectangle.x;
+	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));
 
 		if (point2.x > point1.x + srcRectangle.width)
 			point1.x += srcRectangle.width;
@@ -165,9 +161,9 @@ 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);
-		gc.setAntialias(SWT.ON);
-		gc.setForeground(fgColor);
-		gc.drawPath(path);
+		proj.setAntialias(SWT.ON);
+		proj.setForeground(fgColor);
+		proj.getGC().drawPath(path);
 		path.dispose();
 		return point2;
 	}
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/CursorPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/CursorPainter.java
index a23e8c2..bd96c87 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/CursorPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/CursorPainter.java
@@ -12,6 +12,7 @@ package com.minres.scviewer.database.swt.internal;
 
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 
 import com.minres.scviewer.database.ui.ICursor;
@@ -62,30 +63,30 @@ public class CursorPainter implements IPainter, ICursor {
 	}
 
 	
-	public void paintArea(GC gc, Rectangle area) {			
+	public void paintArea(Projection proj, Rectangle clientRect) {
+		Rectangle area = proj.unProject(clientRect);
 		if(this.waveCanvas.painterList.size()>0){
 			
 			long scaleFactor=waveCanvas.getScaleFactor();
 			long beginPos = area.x;
 			
 			maxPosX = area.x + area.width;
-			maxValX = maxPosX + (int)waveCanvas.getXOffset();
+			maxValX = maxPosX;
 	        
 			// x position of marker in pixels on canvas
 			int x = (int) (time/scaleFactor);
 			// distance of marker from the top of Canvas' painting area
 			int top = id<0?area.y:area.y+15;
-			
 			Color drawColor=waveCanvas.colors[id<0?WaveformColors.CURSOR.ordinal():WaveformColors.MARKER.ordinal()];
 			Color dragColor = waveCanvas.colors[WaveformColors.CURSOR_DRAG.ordinal()];
 			Color textColor=waveCanvas.colors[id<0?WaveformColors.CURSOR_TEXT.ordinal():WaveformColors.MARKER_TEXT.ordinal()];
 			if(x>=beginPos && x<=maxValX){
-				gc.setForeground(isDragging?dragColor:drawColor);
-				gc.drawLine(x-(int)waveCanvas.getXOffset(), top, x-(int)waveCanvas.getXOffset(), area.y+area.height);
-				gc.setBackground(drawColor);
-				gc.setForeground(textColor);
+				proj.setForeground(isDragging?dragColor:drawColor);
+				proj.drawLine(x, top, x, area.y+area.height);
+				proj.setBackground(drawColor);
+				proj.setForeground(textColor);
 				Double dTime=new Double(time);
-				gc.drawText((dTime/waveCanvas.getScaleFactorPow10())+waveCanvas.getUnitStr(), x+1-(int)waveCanvas.getXOffset(), top);
+				proj.drawText((dTime/waveCanvas.getScaleFactorPow10())+waveCanvas.getUnitStr(), x+1, top);
 			}
 		}
 	}	
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/IPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/IPainter.java
index 60d2992..d093f71 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/IPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/IPainter.java
@@ -10,11 +10,10 @@
  *******************************************************************************/
 package com.minres.scviewer.database.swt.internal;
 
-import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Rectangle;
 
 public interface IPainter {
 
-	void paintArea(GC gc,Rectangle area);
+	void paintArea(Projection gc, Rectangle area);
 	
 }
\ No newline at end of file
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/Projection.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/Projection.java
new file mode 100644
index 0000000..7bd4592
--- /dev/null
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/Projection.java
@@ -0,0 +1,123 @@
+package com.minres.scviewer.database.swt.internal;
+
+import java.util.Arrays;
+
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Path;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+
+public class Projection {
+
+	private Point translation;
+	private GC gc;
+
+	public Projection(GC gc) {
+		super();
+		this.gc = gc;
+		translation=new Point(0, 0);
+	}
+
+	void setTranslation(Point t) {
+		translation = t;
+	}
+
+	void setGC(GC gc) {
+		this.gc=gc;
+	}
+
+	Point getTranslation() {
+		return translation;
+	}
+
+	Point project(Point p) {
+		return new Point(p.x+translation.x, p.y+translation.y);
+	}
+
+	public Rectangle unProject(Rectangle r) {
+		return new Rectangle(r.x-translation.x, r.y-translation.y, r.width, r.height);
+	}
+
+	public void setBackground(Color color) {
+		gc.setBackground(color);
+	}
+	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);
+	}
+
+	public void setLineWidth(int width) {
+		gc.setLineWidth(width);
+	}
+
+	public void setForeground(Color color) {
+		gc.setForeground(color);
+	}
+
+	public void drawLine(int x1, int y1, int x2, int y2) {
+		gc.drawLine(x1+translation.x, y1+translation.y, x2+translation.x, y2+translation.y);
+		
+	}
+
+	public GC getGC() {
+		return gc;
+	}
+
+	public void drawRectangle(Rectangle rect) {
+		gc.drawRectangle(rect.x+translation.y, rect.y+translation.y, rect.width, rect.height);		
+	}
+
+	public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth, int arcHeight) {
+		gc.fillRoundRectangle(x+translation.x, y+translation.y, width, height, arcWidth, arcHeight);
+	}
+
+	public void drawRoundRectangle(int x, int y, int width, int height, int arcWidth, int arcHeight) {
+		gc.drawRoundRectangle(x+translation.x, y+translation.y, width, height, arcWidth, arcHeight);	
+	}
+
+	public void setAntialias(int antialias) {
+		gc.setAntialias(antialias);
+	}
+
+	public void drawText(String string, int x, int y) {
+		gc.drawText(string, x+translation.x, y+translation.y);
+	}
+
+	private int[] project(int[] points) {
+		int[] res = Arrays.copyOf(points, points.length);
+		for(int i=0; i<points.length; i+=2) {
+			res[i]=points[i]+translation.x;
+			res[i+1]=points[i+1]+translation.y;
+		}
+		return res;
+	}
+
+	public void fillPolygon(int[] points) {
+		gc.fillPolygon(project(points));
+	}
+
+	public void drawPolygon(int[] points) {
+		gc.drawPolygon(project(points));
+	}
+
+	public Rectangle getClipping() {
+		Rectangle c = gc.getClipping();
+		return new Rectangle(c.x-translation.x, c.y-translation.y, c.width, c.height);
+	}
+
+	public void setClipping(int x, int y, int width, int height) {
+		gc.setClipping(x+translation.x, y+translation.y, width, height);
+	}
+
+	public void setClipping(Rectangle r) {
+		gc.setClipping(r.x+translation.x, r.y+translation.y, r.width, r.height);
+	}
+
+}
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RulerPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RulerPainter.java
index 92dfff2..9d5f52e 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RulerPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RulerPainter.java
@@ -31,8 +31,8 @@ public class RulerPainter implements IPainter {
     }
 
     @Override
-    public void paintArea(GC gc, Rectangle area) {
-
+    public void paintArea(Projection proj, Rectangle area) {
+    	GC gc = proj.getGC();
     	Color headerFgColor=waveCanvas.getDisplay().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND);
     	if(headerFgColor.isDisposed())
     		headerFgColor=SWTResourceManager.getColor(0,0,0);
@@ -44,7 +44,7 @@ public class RulerPainter implements IPainter {
         long scaleFactor=waveCanvas.getScaleFactor();
 
         long startPos=area.x*scaleFactor; 
-        long startVal=startPos + waveCanvas.getXOffset()*scaleFactor;
+        long startVal=startPos - proj.getTranslation().x*scaleFactor;
         long endPos=startPos+area.width*scaleFactor;
 
         long rulerTickMinor = rulerTickMinorC*scaleFactor;
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java
index eb8221b..6fe5420 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java
@@ -79,22 +79,22 @@ public class SignalPainter extends TrackPainter {
 	}
 
 	private int getXPosEnd(long time) {
-		long ltmp = time / this.waveCanvas.getScaleFactor() - waveCanvas.getXOffset();
+		long ltmp = time / this.waveCanvas.getScaleFactor();
 		return ltmp > maxPosX ? maxPosX : (int) ltmp;
 	}
 	
-	public void paintArea(GC gc, Rectangle area) {
+	public void paintArea(Projection proj, Rectangle area) {
 		ISignal<?> signal = trackEntry.getSignal();
 		if (trackEntry.selected)
-			gc.setBackground(this.waveCanvas.colors[WaveformColors.TRACK_BG_HIGHLITE.ordinal()]);
+			proj.setBackground(this.waveCanvas.colors[WaveformColors.TRACK_BG_HIGHLITE.ordinal()]);
 		else
-			gc.setBackground(this.waveCanvas.colors[even ? WaveformColors.TRACK_BG_EVEN.ordinal() : WaveformColors.TRACK_BG_ODD.ordinal()]);
-		gc.setFillRule(SWT.FILL_EVEN_ODD);
-		gc.fillRectangle(area);
+			proj.setBackground(this.waveCanvas.colors[even ? WaveformColors.TRACK_BG_EVEN.ordinal() : WaveformColors.TRACK_BG_ODD.ordinal()]);
+		proj.setFillRule(SWT.FILL_EVEN_ODD);
+		proj.fillRectangle(area);
 
 		long scaleFactor = this.waveCanvas.getScaleFactor();
 		long beginPos = area.x;
-		long beginTime = (beginPos + waveCanvas.getXOffset())*scaleFactor;
+		long beginTime = beginPos*scaleFactor;
         long endTime = beginTime + area.width*scaleFactor;
 		
 		Entry<Long, ?> first = signal.getEvents().floorEntry(beginTime);
@@ -106,18 +106,17 @@ public class SignalPainter extends TrackPainter {
 		} else if (last == null) {
 			last = signal.getEvents().lastEntry();
 		}
-		gc.setForeground(this.waveCanvas.colors[WaveformColors.LINE.ordinal()]);
-		gc.setLineStyle(SWT.LINE_SOLID);
-		gc.setLineWidth(1);
+		proj.setForeground(this.waveCanvas.colors[WaveformColors.LINE.ordinal()]);
+		proj.setLineStyle(SWT.LINE_SOLID);
+		proj.setLineWidth(1);
 		NavigableMap<Long, ?> entries = signal.getEvents().subMap(first.getKey(), false, last.getKey(), true);
 		SignalChange left = new SignalChange(first);
 		SignalChange right = new SignalChange(entries.size() > 0 ? entries.firstEntry() : first);
 		maxPosX = area.x + area.width;
-		maxValX = maxPosX + (int)waveCanvas.getXOffset();
 		yOffsetT = this.waveCanvas.getTrackHeight() / 5 + area.y;
 		yOffsetM = this.waveCanvas.getTrackHeight() / 2 + area.y;
 		yOffsetB = 4 * this.waveCanvas.getTrackHeight() / 5 + area.y;
-		int xSigChangeBeginVal = Math.max(area.x + (int)waveCanvas.getXOffset(), (int) (left.time / this.waveCanvas.getScaleFactor()));
+		int xSigChangeBeginVal = Math.max(area.x, (int) (left.time / this.waveCanvas.getScaleFactor()));
 		int xSigChangeBeginPos = area.x;
 		int xSigChangeEndPos = Math.max(area.x, getXPosEnd(right.time));
 		
@@ -138,9 +137,9 @@ public class SignalPainter extends TrackPainter {
 		}
 
 		
-		SignalStencil stencil = getStencil(gc, left, entries);
+		SignalStencil stencil = getStencil(proj.getGC(), left, entries);
 		do {
-			stencil.draw(gc, area, left.value, right.value, xSigChangeBeginPos, xSigChangeEndPos, multiple);
+			stencil.draw(proj, area, left.value, right.value, xSigChangeBeginPos, xSigChangeEndPos, multiple);
 			if (right.time >= endTime)
 				break;
 			left.assign(right);
@@ -179,7 +178,7 @@ public class SignalPainter extends TrackPainter {
 
 	private interface SignalStencil {
 
-		public void draw(GC gc, Rectangle area, Object left, Object right, int xBegin, int xEnd, boolean multiple);
+		public void draw(Projection proj, Rectangle area, Object left, Object right, int xBegin, int xEnd, boolean multiple);
 	}
 
 	private class MultiBitStencil implements SignalStencil {
@@ -193,7 +192,7 @@ public class SignalPainter extends TrackPainter {
 			tmpAwtFont = new java.awt.Font(fd.getName(), fd.getStyle(), height);
 		}
 
-		public void draw(GC gc, Rectangle area, Object left, Object right, int xBegin, int xEnd, boolean multiple) {
+		public void draw(Projection proj, Rectangle area, Object left, Object right, int xBegin, int xEnd, boolean multiple) {
 			Color colorBorder = waveCanvas.colors[WaveformColors.SIGNAL0.ordinal()];
 			BitVector last = (BitVector) left;
 			if (last.getValue().toString().contains("X")) {
@@ -211,9 +210,9 @@ public class SignalPainter extends TrackPainter {
 						xEnd - 1,   yOffsetB, 
 						xBegin + 1, yOffsetB
 				};
-				gc.setForeground(colorBorder);
-				gc.drawPolygon(points);
-				gc.setForeground(waveCanvas.colors[WaveformColors.SIGNAL_TEXT.ordinal()]);
+				proj.setForeground(colorBorder);
+				proj.drawPolygon(points);
+				proj.setForeground(waveCanvas.colors[WaveformColors.SIGNAL_TEXT.ordinal()]);
 				//TODO: this code should be provided from a central location
 				String label = null;
 				switch(trackEntry.valueDisplay) {
@@ -226,27 +225,23 @@ public class SignalPainter extends TrackPainter {
 				default:
 					label="h'"+last.toHexString();
 				}
-				Point bb = getBoxWidth(gc, label);
+				Point bb = new Point(DUMMY_PANEL.getFontMetrics(tmpAwtFont).stringWidth(label), height);
 				if (xBegin < area.x) {
 					xBegin = area.x;
 					width = xEnd - xBegin;
 				}
 				if (width > (bb.x+1)) {
-					Rectangle old = gc.getClipping();
-					gc.setClipping(xBegin + 3, yOffsetT, xEnd - xBegin - 5, yOffsetB - yOffsetT);
-					gc.drawText(label, xBegin + 3, yOffsetM - bb.y / 2 - 1);
-					gc.setClipping(old);
+					Rectangle old = proj.getClipping();
+					proj.setClipping(xBegin + 3, yOffsetT, xEnd - xBegin - 5, yOffsetB - yOffsetT);
+					proj.drawText(label, xBegin + 3, yOffsetM - bb.y / 2 - 1);
+					proj.setClipping(old);
 				}
 			} else {
-				gc.setForeground(colorBorder);
-				gc.drawLine(xEnd, yOffsetT, xEnd, yOffsetB);
+				proj.setForeground(colorBorder);
+				proj.drawLine(xEnd, yOffsetT, xEnd, yOffsetB);
 			}
 		}
 
-		private Point getBoxWidth(GC gc, String label) {
-			return new Point(DUMMY_PANEL.getFontMetrics(tmpAwtFont).stringWidth(label), height);
-		}
-
 	}
 
 	private class MultiBitStencilAnalog implements SignalStencil {
@@ -277,25 +272,25 @@ public class SignalPainter extends TrackPainter {
 			
 		}
 
-		public void draw(GC gc, Rectangle area, Object left, Object right, int xBegin, int xEnd, boolean multiple) {
+		public void draw(Projection proj, Rectangle area, Object left, Object right, int xBegin, int xEnd, boolean multiple) {
 			long leftVal = ((BitVector) left).toUnsignedValue();
 			long rightVal= ((BitVector) right).toUnsignedValue();
-			gc.setForeground(waveCanvas.colors[WaveformColors.SIGNAL_REAL.ordinal()]);
+			proj.setForeground(waveCanvas.colors[WaveformColors.SIGNAL_REAL.ordinal()]);
 			int yOffsetLeft = (int) ((leftVal-minVal) / range * (yOffsetB-yOffsetT));
 			int yOffsetRight = (int) ((rightVal-minVal) / range * (yOffsetB-yOffsetT));
 			if(continous) {
 				if (xEnd > maxPosX) {
-					gc.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetRight);
+					proj.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetRight);
 				} else {
-					gc.drawLine(xBegin, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetRight);
+					proj.drawLine(xBegin, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetRight);
 				}
 			} else {
 				if (xEnd > maxPosX) {
-					gc.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetLeft);
+					proj.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetLeft);
 				} else {
-					gc.drawLine(xBegin, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetLeft);
+					proj.drawLine(xBegin, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetLeft);
 					if(yOffsetRight!=yOffsetLeft) {
-						gc.drawLine(xEnd, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetRight);
+						proj.drawLine(xEnd, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetRight);
 					}
 				}
 			}
@@ -303,12 +298,12 @@ public class SignalPainter extends TrackPainter {
 	}
 
 	private class SingleBitStencil implements SignalStencil {
-		public void draw(GC gc, Rectangle area, Object left, Object right, int xBegin, int xEnd, boolean multiple) {
+		public void draw(Projection proj, Rectangle area, Object left, Object right, int xBegin, int xEnd, boolean multiple) {
 			if (multiple) {
-				gc.setForeground(waveCanvas.colors[WaveformColors.SIGNALU.ordinal()]);
-				gc.drawLine(xBegin, yOffsetT, xBegin, yOffsetB);
+				proj.setForeground(waveCanvas.colors[WaveformColors.SIGNALU.ordinal()]);
+				proj.drawLine(xBegin, yOffsetT, xBegin, yOffsetB);
 				if(xEnd>xBegin) 
-					gc.drawLine(xEnd, yOffsetT, xEnd, yOffsetB);
+					proj.drawLine(xEnd, yOffsetT, xEnd, yOffsetB);
 			} else {
 				Color color = waveCanvas.colors[WaveformColors.SIGNALX.ordinal()];
 				int yOffset = yOffsetM;
@@ -326,11 +321,11 @@ public class SignalPainter extends TrackPainter {
 					break;
 				default:
 				}
-				gc.setForeground(color);
+				proj.setForeground(color);
 				if (xEnd > maxPosX) {
-					gc.drawLine(xBegin, yOffset, maxPosX, yOffset);
+					proj.drawLine(xBegin, yOffset, maxPosX, yOffset);
 				} else {
-					gc.drawLine(xBegin, yOffset, xEnd, yOffset);
+					proj.drawLine(xBegin, yOffset, xEnd, yOffset);
 					int yNext = yOffsetM;
 					switch (((BitVector) right).getValue()[0]) {
 					case '1':
@@ -342,7 +337,7 @@ public class SignalPainter extends TrackPainter {
 					default:
 					}
 					if (yOffset != yNext)
-						gc.drawLine(xEnd, yOffset, xEnd, yNext);
+						proj.drawLine(xEnd, yOffset, xEnd, yNext);
 				}
 			}
 		}
@@ -383,7 +378,7 @@ public class SignalPainter extends TrackPainter {
 			}
 		}
 
-		public void draw(GC gc, Rectangle area, Object left, Object right, int xBegin, int xEnd, boolean multiple) {
+		public void draw(Projection proj, Rectangle area, Object left, Object right, int xBegin, int xEnd, boolean multiple) {
 			double leftVal = (Double) left;
 			double rightVal= (Double) right;
 			if(Double.isNaN(leftVal)) {
@@ -396,31 +391,31 @@ public class SignalPainter extends TrackPainter {
 							xEnd,   yOffsetB, 
 							xBegin, yOffsetB
 					};
-					gc.setForeground(color);
-					gc.drawPolygon(points);
-					gc.setBackground(color);
-					gc.fillPolygon(points);
+					proj.setForeground(color);
+					proj.drawPolygon(points);
+					proj.setBackground(color);
+					proj.fillPolygon(points);
 				} else {
-					gc.setForeground(color);
-					gc.drawLine(xEnd, yOffsetT, xEnd, yOffsetB);
+					proj.setForeground(color);
+					proj.drawLine(xEnd, yOffsetT, xEnd, yOffsetB);
 				}
 			} else {				
-				gc.setForeground(waveCanvas.colors[WaveformColors.SIGNAL_REAL.ordinal()]);
+				proj.setForeground(waveCanvas.colors[WaveformColors.SIGNAL_REAL.ordinal()]);
 				int yOffsetLeft = (int) ((leftVal-minVal) / range * (yOffsetB-yOffsetT));
 				int yOffsetRight = Double.isNaN(rightVal)?yOffsetLeft:(int) ((rightVal-minVal) / range * (yOffsetB-yOffsetT));
 				if(continous) {
 					if (xEnd > maxPosX) {
-						gc.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetRight);
+						proj.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetRight);
 					} else {
-						gc.drawLine(xBegin, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetRight);
+						proj.drawLine(xBegin, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetRight);
 					}
 				} else {
 					if (xEnd > maxPosX) {
-						gc.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetLeft);
+						proj.drawLine(xBegin, yOffsetB-yOffsetLeft, maxPosX, yOffsetB-yOffsetLeft);
 					} else {
-						gc.drawLine(xBegin, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetLeft);
+						proj.drawLine(xBegin, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetLeft);
 						if(yOffsetRight!=yOffsetLeft) {
-							gc.drawLine(xEnd, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetRight);
+							proj.drawLine(xEnd, yOffsetB-yOffsetLeft, xEnd, yOffsetB-yOffsetRight);
 						}
 					}
 				}
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/StreamPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/StreamPainter.java
index cad44fd..4d36c2b 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/StreamPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/StreamPainter.java
@@ -60,22 +60,22 @@ public class StreamPainter extends TrackPainter{
 	}
 
 	@SuppressWarnings("unchecked")
-	public void paintArea(GC gc, Rectangle area) {
+	public void paintArea(Projection proj, Rectangle area) {
 		if(stream.getEvents().size()==0) return;
 		int trackHeight=trackEntry.height/stream.getMaxConcurrency();
 		txBase=trackHeight/5;
 		txHeight=trackHeight*3/5;
 		if(trackEntry.selected) {
-			gc.setBackground(this.waveCanvas.colors[WaveformColors.TRACK_BG_HIGHLITE.ordinal()]);
+			proj.setBackground(this.waveCanvas.colors[WaveformColors.TRACK_BG_HIGHLITE.ordinal()]);
 		}
 		else
-			gc.setBackground(this.waveCanvas.colors[even?WaveformColors.TRACK_BG_EVEN.ordinal():WaveformColors.TRACK_BG_ODD.ordinal()]);
-		gc.setFillRule(SWT.FILL_EVEN_ODD);
-		gc.fillRectangle(area);
+			proj.setBackground(this.waveCanvas.colors[even?WaveformColors.TRACK_BG_EVEN.ordinal():WaveformColors.TRACK_BG_ODD.ordinal()]);
+		proj.setFillRule(SWT.FILL_EVEN_ODD);
+		proj.fillRectangle(area);
 		
 		long scaleFactor = this.waveCanvas.getScaleFactor();
 		long beginPos = area.x;
-		long beginTime = (beginPos + waveCanvas.getXOffset())*scaleFactor;
+		long beginTime = beginPos*scaleFactor;
 		//long endPos = beginPos + area.width;
         long endTime = beginTime + area.width*scaleFactor;
 
@@ -83,21 +83,21 @@ public class StreamPainter extends TrackPainter{
 		Entry<Long, ?> lastTx=stream.getEvents().ceilingEntry(endTime);
 		if(firstTx==null) firstTx = stream.getEvents().firstEntry();
 		if(lastTx==null) lastTx=stream.getEvents().lastEntry();
-        gc.setFillRule(SWT.FILL_EVEN_ODD);
-        gc.setLineStyle(SWT.LINE_SOLID);
-        gc.setLineWidth(1);
-        gc.setForeground(this.waveCanvas.colors[WaveformColors.LINE.ordinal()]);
+		proj.setFillRule(SWT.FILL_EVEN_ODD);
+		proj.setLineStyle(SWT.LINE_SOLID);
+		proj.setLineWidth(1);
+		proj.setForeground(this.waveCanvas.colors[WaveformColors.LINE.ordinal()]);
         
         for( int y1=area.y+trackHeight/2; y1<area.y+trackEntry.height; y1+=trackHeight)
-        	gc.drawLine(area.x, y1, area.x+area.width, y1);
+        	proj.drawLine(area.x, y1, area.x+area.width, y1);
 		if(firstTx==lastTx) {
 			for(ITxEvent txEvent:(Collection<?  extends ITxEvent>)firstTx.getValue())
-				drawTx(gc, area, txEvent.getTransaction(), false);
+				drawTx(proj, area, txEvent.getTransaction(), false);
 		}else{
 			seenTx.clear();
 			NavigableMap<Long,?> entries = stream.getEvents().subMap(firstTx.getKey(), true, lastTx.getKey(), true);
 			boolean highlighed=false;
-	        gc.setForeground(this.waveCanvas.colors[WaveformColors.LINE.ordinal()]);
+	        proj.setForeground(this.waveCanvas.colors[WaveformColors.LINE.ordinal()]);
 	        
 	        for(Entry<Long, ?> entry: entries.entrySet())
 				for(ITxEvent txEvent:(Collection<?  extends ITxEvent>)entry.getValue()){
@@ -106,38 +106,38 @@ public class StreamPainter extends TrackPainter{
 					if(txEvent.getType()==ITxEvent.Type.END){
 						ITx tx = txEvent.getTransaction();
 						highlighed|=waveCanvas.currentSelection!=null && waveCanvas.currentSelection.equals(tx);
-						drawTx(gc, area, tx, false);
+						drawTx(proj, area, tx, false);
 						seenTx.remove(tx);
 					}
 				}
 			for(ITx tx:seenTx){
-				drawTx(gc, area, tx, false);
+				drawTx(proj, area, tx, false);
 			}
 			if(highlighed){
-		        gc.setForeground(this.waveCanvas.colors[WaveformColors.LINE_HIGHLITE.ordinal()]);
-		        drawTx(gc, area, waveCanvas.currentSelection, true);
+		        proj.setForeground(this.waveCanvas.colors[WaveformColors.LINE_HIGHLITE.ordinal()]);
+		        drawTx(proj, area, waveCanvas.currentSelection, true);
 			}
 		}
 	}
 	
-	protected void drawTx(GC gc, Rectangle area, ITx tx, boolean highlighted ) {
+	protected void drawTx(Projection proj, Rectangle area, ITx tx, boolean highlighted ) {
 		// compute colors
         java.awt.Color[] fallbackColors = trackEntry.getColors();
         java.awt.Color[] transColor = TrackEntry.computeColor( tx.getGenerator().getName(), fallbackColors[0], fallbackColors[1] );
         
-        gc.setBackground( toSwtColor( gc, transColor[highlighted?1:0] ) );
+        proj.setBackground( toSwtColor( proj.getGC(), transColor[highlighted?1:0] ) );
         
 		int offset = tx.getConcurrencyIndex()*this.waveCanvas.getTrackHeight();
 		Rectangle bb = new Rectangle(
-				(int)(tx.getBeginTime()/this.waveCanvas.getScaleFactor()-waveCanvas.getXOffset()), area.y+offset+txBase,
+				(int)(tx.getBeginTime()/this.waveCanvas.getScaleFactor()), area.y+offset+txBase,
 				(int)((tx.getEndTime()-tx.getBeginTime())/this.waveCanvas.getScaleFactor()), txHeight);
 
 		if(bb.x+bb.width<area.x || bb.x>area.x+area.width) return;
 		if(bb.width==0){
-			gc.drawLine(bb.x, bb.y, bb.x, bb.y+bb.height);
+			proj.drawLine(bb.x, bb.y, bb.x, bb.y+bb.height);
 		} else if(bb.width<10){
-			gc.fillRectangle(bb);
-			gc.drawRectangle(bb);
+			proj.fillRectangle(bb);
+			proj.drawRectangle(bb);
 		} else {
 			if(bb.x < area.x) {
 				bb.width = bb.width-(area.x-bb.x)+5;
@@ -149,8 +149,8 @@ public class StreamPainter extends TrackPainter{
 				bb_x2=area_x2+5;
 				bb.width= bb_x2-bb.x;
 			}
-			gc.fillRoundRectangle(bb.x, bb.y, bb.width, bb.height, 5, 5);
-		    gc.drawRoundRectangle(bb.x, bb.y, bb.width, bb.height, 5, 5);
+			proj.fillRoundRectangle(bb.x, bb.y, bb.width, bb.height, 5, 5);
+			proj.drawRoundRectangle(bb.x, bb.y, bb.width, bb.height, 5, 5);
 		}
 	}
 
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackAreaPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackAreaPainter.java
index ed7fc13..ad61f52 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackAreaPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackAreaPainter.java
@@ -35,11 +35,11 @@ public class TrackAreaPainter implements IPainter {
 		this.trackVerticalOffset= new TreeMap<>();
 	}
 
-	public void paintArea(GC gc, Rectangle a) {
-	    Rectangle area = new Rectangle(a.x, a.y+waveCanvas.rulerHeight, a.width, a.height-waveCanvas.rulerHeight);
-		gc.setBackground(this.waveCanvas.colors[WaveformColors.TRACK_BG_EVEN.ordinal()]);
-		gc.setFillRule(SWT.FILL_EVEN_ODD);
-		gc.fillRectangle(area);
+	public void paintArea(Projection proj, Rectangle a) {
+	    Rectangle area = proj.unProject(new Rectangle(a.x, a.y+waveCanvas.rulerHeight, a.width, a.height-waveCanvas.rulerHeight));
+	    proj.setBackground(this.waveCanvas.colors[WaveformColors.TRACK_BG_EVEN.ordinal()]);
+	    proj.setFillRule(SWT.FILL_EVEN_ODD);
+	    proj.fillRectangle(area);
 		if(trackVerticalOffset.size()>0){
 			Integer firstKey=trackVerticalOffset.floorKey(area.y);
 			if(firstKey==null) firstKey=trackVerticalOffset.firstKey();
@@ -49,12 +49,12 @@ public class TrackAreaPainter implements IPainter {
 				subArea.y=firstKey;
 				IWaveformPainter p = trackVerticalOffset.get(firstKey);
 				subArea.height=p.getHeight();
-				p.paintArea(gc, subArea);
+				p.paintArea(proj, subArea);
 			}else{
 				for(Entry<Integer, IWaveformPainter> entry : trackVerticalOffset.subMap(firstKey, true, lastKey, true).entrySet()){
 					subArea.y=entry.getKey();
 					subArea.height=entry.getValue().getHeight();
-					entry.getValue().paintArea(gc, subArea);
+					entry.getValue().paintArea(proj, subArea);
 				}
 			}
 		}
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
index dd29137..d3f34bc 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
@@ -45,7 +45,7 @@ import com.minres.scviewer.database.ui.IWaveformViewer;
 import com.minres.scviewer.database.ui.TrackEntry;
 import com.minres.scviewer.database.ui.WaveformColors;
 
-public class WaveformCanvas extends Canvas{
+public class WaveformCanvas extends Canvas {
 	
     Color[] colors = new Color[WaveformColors.values().length];
 
@@ -60,9 +60,7 @@ public class WaveformCanvas extends Canvas{
     private long maxTime;
     
     protected Point origin; /* original size */
-    
-    protected Transform transform;
-    
+        
     protected int rulerHeight=40;
     
     protected List<IPainter> painterList;
@@ -89,7 +87,7 @@ public class WaveformCanvas extends Canvas{
      *            the style of this control.
      */
     public WaveformCanvas(final Composite parent, int style) {
-        super(parent, style | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND | SWT.NO_REDRAW_RESIZE | SWT.V_SCROLL | SWT.H_SCROLL);
+        super(parent, style | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND | SWT.V_SCROLL | SWT.H_SCROLL);
     	addControlListener(new ControlAdapter() { /* resize listener. */
             public void controlResized(ControlEvent event) {
                 syncScrollBars();
@@ -102,7 +100,6 @@ public class WaveformCanvas extends Canvas{
         });
         painterList = new LinkedList<IPainter>();
         origin = new Point(0, 0);
-        transform = new Transform(getDisplay());
         selectionListeners = new LinkedList<>();
         cursorPainters= new ArrayList<>();
         wave2painterMap=new HashMap<>();
@@ -150,10 +147,6 @@ public class WaveformCanvas extends Canvas{
 
     }
     
-    public long getXOffset() {
-    	return -origin.x;
-    }
-    
 	public void addCursoPainter(CursorPainter cursorPainter){
 		painterList.add(cursorPainter);
 		cursorPainters.add(cursorPainter);
@@ -323,7 +316,6 @@ public class WaveformCanvas extends Canvas{
      * Dispose the garbage here
      */
     public void dispose() {
-        transform.dispose();
         for (WaveformColors c : WaveformColors.values())
             colors[c.ordinal()].dispose();
         super.dispose();
@@ -402,24 +394,16 @@ public class WaveformCanvas extends Canvas{
         vertical.setSelection(-origin.y);
         redraw();
         fireSelectionEvent();
-
     }
 
     /* Paint function */
     private void paint(GC gc) {
         Rectangle clientRect = getClientArea(); /* Canvas' painting area */
-//      clientRect.x = -origin.x;
-        clientRect.y = -origin.y;
-        // reset the transform
-        transform.identity();
-        // shift the content
-        // DO NOT SHIFT HORIZONTALLY, the range is WAY TOO BIG for float!!!
-        transform.translate(0, origin.y);
-        gc.setTransform(transform);
-        gc.setClipping(clientRect);
+        Projection p = new Projection(gc);
+        p.setTranslation(origin);
         if (painterList.size() > 0 ) {
             for (IPainter painter : painterList)
-                painter.paintArea(gc, clientRect);
+                painter.paintArea(p, clientRect);
         } else {
             gc.fillRectangle(clientRect);
             initScrollBars();

From 95e2db60b69c87339d1f7af939449d32e57f5e64 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Sat, 20 Jun 2020 18:04:57 +0200
Subject: [PATCH 2/6] cleanup build and imports

---
 com.minres.scviewer.e4.product/scviewer.product       |  6 +++---
 .../com.minres.scviewer.target.target                 |  3 ++-
 features/com.minres.scviewer.e4.feature/feature.xml   |  7 +++++++
 .../scviewer/database/swt/internal/ArrowPainter.java  |  1 -
 .../scviewer/database/swt/internal/CursorPainter.java |  2 --
 .../scviewer/database/swt/internal/Projection.java    |  1 -
 .../database/swt/internal/TrackAreaPainter.java       |  1 -
 .../database/swt/internal/WaveformCanvas.java         |  1 -
 .../META-INF/MANIFEST.MF                              |  4 +---
 .../internal/status/StatusLineContributionItem.java   |  1 -
 .../internal/status/WaveStatusBarControl.java         | 11 -----------
 .../e4/application/parts/TransactionDetails.java      |  6 ------
 pom.xml                                               |  4 ++--
 13 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product
index a367b8e..80bf054 100644
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/com.minres.scviewer.e4.product/scviewer.product
@@ -3,7 +3,6 @@
 
 <product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
-
    <configIni use="default">
    </configIni>
 
@@ -18,7 +17,6 @@
 
    <windowImages/>
 
-
    <launcher name="scviewer">
       <linux icon="icons/SCViewer_512x512.xpm"/>
       <macosx icon="icons/SCViewer.icns"/>
@@ -35,7 +33,6 @@
       </win>
    </launcher>
 
-
    <vm>
       <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
       <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
@@ -51,6 +48,9 @@
 
    <features>
       <feature id="com.minres.scviewer.e4.feature" installMode="root"/>
+      <feature id="org.eclipse.e4.rcp" installMode="root"/>
+      <feature id="org.eclipse.emf.common" installMode="root"/>
+      <feature id="org.eclipse.emf.ecore" installMode="root"/>
    </features>
 
    <configurations>
diff --git a/com.minres.scviewer.target/com.minres.scviewer.target.target b/com.minres.scviewer.target/com.minres.scviewer.target.target
index 5242f57..57ff270 100644
--- a/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -8,8 +8,9 @@
 		<unit id="org.eclipse.equinox.p2.sdk.feature.jar" version="0.0.0"/> <!-- needed by Linux exectable-->
 		<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
 		<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-		<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/> <!-- org.junit for testing -->
+		<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/> <!-- org.eclipse.equinox.p2.iu -->
 		<unit id="org.eclipse.rcptt.core.feature.group" version="0.0.0"/><!-- com.google.guave-->
+		<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>	<!-- org.junit for testing -->
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 		<repository location="https://www.opcoach.com/repository/2020-03/"/>
diff --git a/features/com.minres.scviewer.e4.feature/feature.xml b/features/com.minres.scviewer.e4.feature/feature.xml
index d20eca7..ddfde0b 100644
--- a/features/com.minres.scviewer.e4.feature/feature.xml
+++ b/features/com.minres.scviewer.e4.feature/feature.xml
@@ -71,4 +71,11 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.opcoach.e4.preferences"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java
index df17fb2..4a65f2c 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java
@@ -16,7 +16,6 @@ import java.util.List;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Path;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/CursorPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/CursorPainter.java
index bd96c87..4559d2d 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/CursorPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/CursorPainter.java
@@ -11,8 +11,6 @@
 package com.minres.scviewer.database.swt.internal;
 
 import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 
 import com.minres.scviewer.database.ui.ICursor;
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/Projection.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/Projection.java
index 7bd4592..79c68c9 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/Projection.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/Projection.java
@@ -4,7 +4,6 @@ import java.util.Arrays;
 
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Path;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackAreaPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackAreaPainter.java
index ad61f52..0820afd 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackAreaPainter.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackAreaPainter.java
@@ -14,7 +14,6 @@ import java.util.Map.Entry;
 import java.util.TreeMap;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Rectangle;
 
 import com.minres.scviewer.database.ui.WaveformColors;
diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
index d3f34bc..d65180a 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
+++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
@@ -28,7 +28,6 @@ import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.graphics.Transform;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
diff --git a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
index c96729f..49ee11d 100644
--- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@@ -26,12 +26,10 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.equinox.preferences,
  org.eclipse.core.expressions,
  org.eclipse.e4.core.commands;bundle-version="0.11.0",
- org.eclipse.e4.ui.workbench.addons.swt,
  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",
- com.opcoach.e4.preferences.mainmenu;bundle-version="1.2.0"
+ org.eclipse.core.resources;bundle-version="3.13.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.minres.scviewer.database,
  javax.inject;version="1.0.0"
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/StatusLineContributionItem.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/StatusLineContributionItem.java
index 4b40081..9f19cb2 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/StatusLineContributionItem.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/StatusLineContributionItem.java
@@ -13,7 +13,6 @@ import org.eclipse.swt.widgets.Label;
 
 import org.eclipse.jface.action.ContributionItem;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.LegacyActionTools;
 import org.eclipse.jface.action.StatusLineLayoutData;
 import org.eclipse.jface.resource.JFaceColors;
 
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/WaveStatusBarControl.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/WaveStatusBarControl.java
index 767d22e..458860a 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/WaveStatusBarControl.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/WaveStatusBarControl.java
@@ -18,19 +18,8 @@ import org.eclipse.e4.ui.di.UIEventTopic;
 import org.eclipse.e4.ui.di.UISynchronize;
 import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
-import org.eclipse.jface.action.ContributionItem;
 import org.eclipse.jface.action.StatusLineManager;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Point;
-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 com.minres.scviewer.e4.application.Messages;
 
 /**
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
index 17bf32f..d8f1f7e 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
@@ -18,7 +18,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
 import java.util.Vector;
-import java.util.function.Function;
 import java.util.regex.PatternSyntaxException;
 import java.util.stream.Collectors;
 
@@ -38,7 +37,6 @@ 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.IElementComparer;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -152,15 +150,11 @@ public class TransactionDetails {
 
 			@Override
 			public void treeCollapsed(TreeExpansionEvent event) {
-				Object o = event.getElement();
-				TreePath[] paths = treeViewer.getExpandedTreePaths();
 				treeViewer.getSelection();
 			}
 
 			@Override
 			public void treeExpanded(TreeExpansionEvent event) {
-				Object o = event.getElement();
-				TreePath[] paths = treeViewer.getExpandedTreePaths();
 				treeViewer.getSelection();
 			}
 
diff --git a/pom.xml b/pom.xml
index 3943f88..b7518d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 				<version>${tycho-version}</version>
 				<extensions>true</extensions>
 			</plugin>
-
+<!--
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
@@ -55,7 +55,7 @@
 				</executions>
 			</plugin>
 
-<!-- 			<plugin>
+ 			<plugin>
 				<groupId>org.eclipse.tycho.extras</groupId>
 				<artifactId>tycho-source-feature-plugin</artifactId>
 				<version>${tycho-version}</version>

From ad51066f1c0e426ee14a975d66e571c01d745a36 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Sun, 21 Jun 2020 09:25:24 +0200
Subject: [PATCH 3/6] add tycho settings

---
 .../.settings/org.eclipse.m2e.core.prefs                      | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 features/com.minres.scviewer.database.feature/.settings/org.eclipse.m2e.core.prefs

diff --git a/features/com.minres.scviewer.database.feature/.settings/org.eclipse.m2e.core.prefs b/features/com.minres.scviewer.database.feature/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/features/com.minres.scviewer.database.feature/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

From 24720340be3ea2d859f8e5b41ee9ec3452865134 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Sun, 21 Jun 2020 12:21:30 +0200
Subject: [PATCH 4/6] update feature definition

---
 .project                                      |  20 ++--
 .settings/org.eclipse.m2e.core.prefs          |   4 +
 .../DatabaseServicesTest.launch               | 104 ------------------
 .../scviewer.product                          |   4 +-
 .../.gitignore                                |   1 +
 .../.project                                  |  17 +++
 .../build.properties                          |   1 +
 .../feature.xml                               |  61 ++++++++++
 .../pom.xml                                   |  12 ++
 pom.xml                                       |   1 +
 .../DatabaseServicesTest.launch               |   1 +
 11 files changed, 112 insertions(+), 114 deletions(-)
 create mode 100644 .settings/org.eclipse.m2e.core.prefs
 delete mode 100644 com.minres.scviewer.database.test/DatabaseServicesTest.launch
 create mode 100644 features/com.minres.scviewer.e4.platform.feature/.gitignore
 create mode 100644 features/com.minres.scviewer.e4.platform.feature/.project
 create mode 100644 features/com.minres.scviewer.e4.platform.feature/build.properties
 create mode 100644 features/com.minres.scviewer.e4.platform.feature/feature.xml
 create mode 100644 features/com.minres.scviewer.e4.platform.feature/pom.xml

diff --git a/.project b/.project
index ca46730..88bcd68 100644
--- a/.project
+++ b/.project
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>scviewer.parent</name>
+	<name>com.minres.scviewer.parent</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1591076960924</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -19,7 +25,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1591076960932</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -28,7 +34,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1591076960936</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -37,7 +43,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1591076960939</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -46,7 +52,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1591076960950</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -55,7 +61,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1591076960954</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/com.minres.scviewer.database.test/DatabaseServicesTest.launch b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
deleted file mode 100644
index f8e3594..0000000
--- a/com.minres.scviewer.database.test/DatabaseServicesTest.launch
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-    <booleanAttribute key="append.args" value="true"/>
-    <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-    <booleanAttribute key="askclear" value="false"/>
-    <booleanAttribute key="automaticAdd" value="true"/>
-    <booleanAttribute key="automaticValidate" value="false"/>
-    <stringAttribute key="bootstrap" value=""/>
-    <stringAttribute key="checked" value="[NONE]"/>
-    <booleanAttribute key="clearConfig" value="true"/>
-    <booleanAttribute key="clearws" value="true"/>
-    <booleanAttribute key="clearwslog" value="false"/>
-    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-    <booleanAttribute key="default" value="true"/>
-    <setAttribute key="deselected_workspace_bundles">
-        <setEntry value="com.minres.scviewer.e4.application"/>
-        <setEntry value="com.minres.scviewer.ui"/>
-    </setAttribute>
-    <booleanAttribute key="includeOptional" value="true"/>
-    <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/com.minres.scviewer.database.test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=com.minres.scviewer.database.test"/>
-    <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-    <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.minres.scviewer.database.test"/>
-    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>
-    <stringAttribute key="pde.version" value="3.3"/>
-    <stringAttribute key="product" value="com.minres.scviewer.e4.product"/>
-    <booleanAttribute key="run_in_ui_thread" value="true"/>
-    <setAttribute key="selected_target_bundles">
-        <setEntry value="com.google.guava@default:default"/>
-        <setEntry value="javax.annotation@default:default"/>
-        <setEntry value="javax.inject@default:default"/>
-        <setEntry value="javax.servlet@default:default"/>
-        <setEntry value="org.apache.ant@default:default"/>
-        <setEntry value="org.apache.commons.jxpath@default:default"/>
-        <setEntry value="org.apache.felix.gogo.command@default:default"/>
-        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
-        <setEntry value="org.codehaus.groovy@default:default"/>
-        <setEntry value="org.eclipse.ant.core@default:default"/>
-        <setEntry value="org.eclipse.core.commands@default:default"/>
-        <setEntry value="org.eclipse.core.contenttype@default:default"/>
-        <setEntry value="org.eclipse.core.expressions@default:default"/>
-        <setEntry value="org.eclipse.core.filesystem.macosx@default:false"/>
-        <setEntry value="org.eclipse.core.filesystem@default:default"/>
-        <setEntry value="org.eclipse.core.jobs@default:default"/>
-        <setEntry value="org.eclipse.core.resources@default:default"/>
-        <setEntry value="org.eclipse.core.runtime@default:true"/>
-        <setEntry value="org.eclipse.core.variables@default:default"/>
-        <setEntry value="org.eclipse.e4.core.contexts@default:default"/>
-        <setEntry value="org.eclipse.e4.core.di.annotations@default:default"/>
-        <setEntry value="org.eclipse.e4.core.di.extensions@default:default"/>
-        <setEntry value="org.eclipse.e4.core.di@default:default"/>
-        <setEntry value="org.eclipse.e4.core.services@default:default"/>
-        <setEntry value="org.eclipse.e4.emf.xpath@default:default"/>
-        <setEntry value="org.eclipse.e4.ui.di@default:default"/>
-        <setEntry value="org.eclipse.e4.ui.model.workbench@default:default"/>
-        <setEntry value="org.eclipse.e4.ui.services@default:default"/>
-        <setEntry value="org.eclipse.emf.common@default:default"/>
-        <setEntry value="org.eclipse.emf.ecore@default:default"/>
-        <setEntry value="org.eclipse.equinox.app@default:default"/>
-        <setEntry value="org.eclipse.equinox.bidi@default:default"/>
-        <setEntry value="org.eclipse.equinox.common@2:true"/>
-        <setEntry value="org.eclipse.equinox.ds@1:true"/>
-        <setEntry value="org.eclipse.equinox.preferences@default:default"/>
-        <setEntry value="org.eclipse.equinox.registry@default:default"/>
-        <setEntry value="org.eclipse.equinox.util@default:default"/>
-        <setEntry value="org.eclipse.jface@default:default"/>
-        <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
-        <setEntry value="org.eclipse.osgi.services@default:default"/>
-        <setEntry value="org.eclipse.osgi@-1:true"/>
-        <setEntry value="org.eclipse.swt.cocoa.macosx.x86_64@default:false"/>
-        <setEntry value="org.eclipse.swt@default:default"/>
-        <setEntry value="org.hamcrest.core@default:default"/>
-        <setEntry value="org.junit@default:default"/>
-    </setAttribute>
-    <setAttribute key="selected_workspace_bundles">
-        <setEntry value="com.minres.scviewer.database.sqlite@default:true"/>
-        <setEntry value="com.minres.scviewer.database.test@default:default"/>
-        <setEntry value="com.minres.scviewer.database.text@default:true"/>
-        <setEntry value="com.minres.scviewer.database.ui.swt@default:default"/>
-        <setEntry value="com.minres.scviewer.database.ui@default:default"/>
-        <setEntry value="com.minres.scviewer.database.vcd@default:default"/>
-        <setEntry value="com.minres.scviewer.database@default:true"/>
-        <setEntry value="com.opcoach.e4.preferences@default:default"/>
-    </setAttribute>
-    <booleanAttribute key="show_selected_only" value="false"/>
-    <booleanAttribute key="tracing" value="false"/>
-    <booleanAttribute key="useCustomFeatures" value="false"/>
-    <booleanAttribute key="useDefaultConfig" value="true"/>
-    <booleanAttribute key="useDefaultConfigArea" value="false"/>
-    <booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product
index 80bf054..3a9752b 100644
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/com.minres.scviewer.e4.product/scviewer.product
@@ -48,9 +48,7 @@
 
    <features>
       <feature id="com.minres.scviewer.e4.feature" installMode="root"/>
-      <feature id="org.eclipse.e4.rcp" installMode="root"/>
-      <feature id="org.eclipse.emf.common" installMode="root"/>
-      <feature id="org.eclipse.emf.ecore" installMode="root"/>
+      <feature id="com.minres.scviewer.e4.platform.feature" installMode="root"/>
    </features>
 
    <configurations>
diff --git a/features/com.minres.scviewer.e4.platform.feature/.gitignore b/features/com.minres.scviewer.e4.platform.feature/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/features/com.minres.scviewer.e4.platform.feature/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/features/com.minres.scviewer.e4.platform.feature/.project b/features/com.minres.scviewer.e4.platform.feature/.project
new file mode 100644
index 0000000..f503e75
--- /dev/null
+++ b/features/com.minres.scviewer.e4.platform.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.minres.scviewer.e4.platform.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/com.minres.scviewer.e4.platform.feature/build.properties b/features/com.minres.scviewer.e4.platform.feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/features/com.minres.scviewer.e4.platform.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/features/com.minres.scviewer.e4.platform.feature/feature.xml b/features/com.minres.scviewer.e4.platform.feature/feature.xml
new file mode 100644
index 0000000..3a5ab6e
--- /dev/null
+++ b/features/com.minres.scviewer.e4.platform.feature/feature.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.minres.scviewer.e4.platform.feature"
+      label="SCViewer Platform Feature"
+      version="1.0.0.qualifier"
+      provider-name="MINRES Technologies GmbH">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <includes
+         id="org.eclipse.e4.rcp"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.ecore"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.common"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.3.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.12.0" match="compatible"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.core.resources"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.linux.x86_64"
+         os="linux"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+</feature>
diff --git a/features/com.minres.scviewer.e4.platform.feature/pom.xml b/features/com.minres.scviewer.e4.platform.feature/pom.xml
new file mode 100644
index 0000000..a74562c
--- /dev/null
+++ b/features/com.minres.scviewer.e4.platform.feature/pom.xml
@@ -0,0 +1,12 @@
+<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.platform.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+  <parent>
+  	<groupId>com.minres.scviewer</groupId>
+  	<artifactId>com.minres.scviewer.parent</artifactId>
+  	<version>2.0.0-SNAPSHOT</version>
+	<relativePath>../..</relativePath>
+  </parent>
+  <version>1.0.0-SNAPSHOT</version>
+</project>
diff --git a/pom.xml b/pom.xml
index b7518d0..0130034 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
 		<module>features/com.minres.scviewer.database.feature</module>
 		<module>features/com.minres.scviewer.ui.feature</module>
 		<module>features/com.minres.scviewer.feature</module>
+		<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>
diff --git a/tests/com.minres.scviewer.database.test/DatabaseServicesTest.launch b/tests/com.minres.scviewer.database.test/DatabaseServicesTest.launch
index 4937b10..f8e3594 100644
--- a/tests/com.minres.scviewer.database.test/DatabaseServicesTest.launch
+++ b/tests/com.minres.scviewer.database.test/DatabaseServicesTest.launch
@@ -72,6 +72,7 @@
         <setEntry value="org.eclipse.equinox.app@default:default"/>
         <setEntry value="org.eclipse.equinox.bidi@default:default"/>
         <setEntry value="org.eclipse.equinox.common@2:true"/>
+        <setEntry value="org.eclipse.equinox.ds@1:true"/>
         <setEntry value="org.eclipse.equinox.preferences@default:default"/>
         <setEntry value="org.eclipse.equinox.registry@default:default"/>
         <setEntry value="org.eclipse.equinox.util@default:default"/>

From 7ad70411f3c8daeb436778eb32a2f336cc91addf Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Sun, 21 Jun 2020 15:37:38 +0200
Subject: [PATCH 5/6] fix preference handling

---
 .../plugin.xml                                |  7 --
 .../e4/application/handlers/EnableHover.java  | 30 +++----
 .../e4/application/parts/WaveformViewer.java  | 88 +++++++++----------
 .../preferences/DefaultValuesInitializer.java | 25 ++----
 .../preferences/PreferencesStoreProvider.java | 18 ----
 5 files changed, 64 insertions(+), 104 deletions(-)
 delete mode 100644 plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferencesStoreProvider.java

diff --git a/plugins/com.minres.scviewer.e4.application/plugin.xml b/plugins/com.minres.scviewer.e4.application/plugin.xml
index f585ee3..236f625 100644
--- a/plugins/com.minres.scviewer.e4.application/plugin.xml
+++ b/plugins/com.minres.scviewer.e4.application/plugin.xml
@@ -84,12 +84,5 @@
             category="com.minres.scviewer.e4.application.preferences.scviewer">
       </page>
    </extension>
-   <extension
-         point="com.opcoach.e4.preferences.e4PreferenceStoreProvider">
-      <preferenceStoreProvider
-            class="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.preferences.PreferencesStoreProvider"
-            pluginId="com.minres.scviewer.e4.application">
-      </preferenceStoreProvider>
-   </extension>
 
 </plugin>
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableHover.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableHover.java
index 2990c28..f5494a8 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableHover.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableHover.java
@@ -4,45 +4,43 @@ package com.minres.scviewer.e4.application.handlers;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
-import org.eclipse.core.runtime.preferences.ConfigurationScope;
-import org.eclipse.e4.core.contexts.Active;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.core.di.annotations.Optional;
+import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.model.application.ui.menu.MHandledItem;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
-import org.eclipse.jface.preference.IPreferenceStore;
+import org.osgi.service.prefs.BackingStoreException;
 
 import com.minres.scviewer.e4.application.preferences.PreferenceConstants;
-import com.opcoach.e4.preferences.ScopedPreferenceStore;
 
+@SuppressWarnings("restriction")
 public class EnableHover {
 	static final String TAG_NAME = "EnableHover"; //$NON-NLS-1$
 
 	@Inject
 	MApplication application;
 		
-	@PostConstruct
-	public void initialize(EModelService modelService) {
+	@Inject
+	@Optional
+	public void reactOnShowHoverChange(EModelService modelService, @Preference(value = PreferenceConstants.SHOW_HOVER) Boolean hover) {
 		List<String> tags = new LinkedList<>();
 		tags.add(TAG_NAME);
 		List<MHandledItem> elements = modelService.findElements(application, null, MHandledItem.class, tags );
-	   // cover initialization stuff, sync it with code
-		IPreferenceStore store = new ScopedPreferenceStore(ConfigurationScope.INSTANCE, PreferenceConstants.PREFERENCES_SCOPE);
-		boolean state = store.getBoolean(PreferenceConstants.SHOW_HOVER);
 		for( MHandledItem hi : elements ){
-			hi.setSelected(state);
+			hi.setSelected(hover);
 		}
 	}
 
 	@Execute
-	public void execute(@Active MPart part, @Active MWindow window, MHandledItem handledItem, EModelService modelService ) {
-		IPreferenceStore store = new ScopedPreferenceStore(ConfigurationScope.INSTANCE, PreferenceConstants.PREFERENCES_SCOPE);
-		store.setValue(PreferenceConstants.SHOW_HOVER, handledItem.isSelected());
+	public void execute(MHandledItem handledItem, @Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE) IEclipsePreferences prefs ) {
+		try {
+			prefs.putBoolean(PreferenceConstants.SHOW_HOVER, handledItem.isSelected());
+			prefs.flush();
+		} catch (BackingStoreException e) {}
 	}
 		
 }
\ No newline at end of file
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
index 81cb383..752a352 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
@@ -31,17 +31,18 @@ import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.eclipse.core.internal.preferences.InstancePreferences;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobGroup;
-import org.eclipse.core.runtime.preferences.ConfigurationScope;
+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.di.annotations.Optional;
+import org.eclipse.e4.core.di.extensions.Preference;
 import org.eclipse.e4.core.services.events.IEventBroker;
 import org.eclipse.e4.ui.di.Focus;
 import org.eclipse.e4.ui.di.PersistState;
@@ -52,9 +53,7 @@ import org.eclipse.e4.ui.services.EMenuService;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.StringConverter;
-import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -80,7 +79,7 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Widget;
-import org.osgi.service.prefs.BackingStoreException;
+import org.osgi.service.prefs.Preferences;
 
 import com.minres.scviewer.database.DataType;
 import com.minres.scviewer.database.ITx;
@@ -108,7 +107,6 @@ import com.minres.scviewer.e4.application.internal.util.FileMonitor;
 import com.minres.scviewer.e4.application.internal.util.IFileChangeListener;
 import com.minres.scviewer.e4.application.internal.util.IModificationChecker;
 import com.minres.scviewer.e4.application.preferences.PreferenceConstants;
-import com.opcoach.e4.preferences.ScopedPreferenceStore;
 
 /**
  * The Class WaveformViewerPart.
@@ -190,7 +188,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	@Inject
 	EPartService ePartService;
 
-	IPreferenceStore store = new ScopedPreferenceStore(ConfigurationScope.INSTANCE, PreferenceConstants.PREFERENCES_SCOPE);
+	IEclipsePreferences store = null;
 
 	@Inject @Optional DesignBrowser designBrowser;
 
@@ -207,7 +205,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	private Composite myParent;
 
 	/** The files to load. */
-	ArrayList<File> filesToLoad;
+	ArrayList<File> filesToLoad = new ArrayList<>();
 
 	/** The persisted state. */
 	Map<String, String> persistedState;
@@ -227,6 +225,8 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	/** The file checker. */
 	IModificationChecker fileChecker;
 
+	private Boolean showHover;
+
 	/**
 	 * Creates the composite.
 	 *
@@ -235,11 +235,13 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 * @param dbFactory the db factory
 	 */
 	@PostConstruct
-	public void createComposite(MPart part, Composite parent, IWaveformDbFactory dbFactory) {
+	public void createComposite(MPart part, Composite parent, IWaveformDbFactory dbFactory, @Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE) IEclipsePreferences prefs, @Preference(value = PreferenceConstants.SHOW_HOVER) Boolean hover) {
 		disposeListenerNumber += 1;
 		
 		myPart = part;
 		myParent = parent;
+		store=prefs;
+		showHover=hover;
 		database = dbFactory.getDatabase();
 		database.addPropertyChangeListener(new PropertyChangeListener() {
 			@Override
@@ -256,7 +258,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		});
 		waveformPane = factory.createPanel(parent);
 		waveformPane.setMaxTime(0);
-		
+		setupColors();
 		//set selection to empty selection when opening a new waveformPane
 		selectionService.setSelection(new StructuredSelection());
 		
@@ -344,8 +346,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		});
 		
 		zoomLevel = waveformPane.getZoomLevels();
-		setupColors();
-		checkForUpdates = store.getBoolean(PreferenceConstants.DATABASE_RELOAD);
+		checkForUpdates = store.getBoolean(PreferenceConstants.DATABASE_RELOAD, true);
 		filesToLoad = new ArrayList<File>();
 		persistedState = part.getPersistedState();
 		Integer files = persistedState.containsKey(DATABASE_FILE + "S") //$NON-NLS-1$
@@ -374,23 +375,6 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 				}
 			}
 		});
-		store.addPropertyChangeListener(new IPropertyChangeListener() {
-			@Override
-			public void propertyChange(org.eclipse.jface.util.PropertyChangeEvent event) {
-				if (PreferenceConstants.DATABASE_RELOAD.equals(event.getProperty())) {
-					checkForUpdates = (Boolean)event.getNewValue();
-					fileChecker = null;
-					if (checkForUpdates)
-						fileChecker = fileMonitor.addFileChangeListener(WaveformViewer.this, filesToLoad,
-								FILE_CHECK_INTERVAL);
-					else
-						fileMonitor.removeFileChangeListener(WaveformViewer.this);
-				} else if (!PreferenceConstants.SHOW_HOVER.equals(event.getProperty())){
-					setupColors();
-				}
-			}
-		});
-		
 		waveformPane.addDisposeListener(this);
 
 		waveformPane.getWaveformControl().setData(Constants.HELP_PROVIDER_TAG, new ToolTipHelpTextProvider() {
@@ -402,7 +386,7 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		waveformPane.getWaveformControl().setData(Constants.CONTENT_PROVIDER_TAG, new ToolTipContentProvider() {
 			@Override
 			public boolean createContent(Composite parent, Point pt) {
-				if(!store.getBoolean(PreferenceConstants.SHOW_HOVER)) return false;
+				if(!showHover) return false;
 				List<Object> res = waveformPane.getElementsAt(pt);
 				if(res.size()>0)
 					if(res.get(0) instanceof ITx) {
@@ -472,8 +456,6 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 						final Font font = new Font(Display.getCurrent(), "Terminal", 10, SWT.NORMAL);
 
 						final Label label = new Label(parent, SWT.NONE);
-						//label.setForeground(display.getSystemColor(SWT.COLOR_INFO_FOREGROUND));
-						//label.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
 						label.setText(te.waveform.getFullName());
 						label.setFont(font);
 						GridData labelGridData = new GridData();
@@ -487,35 +469,49 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		});
 	}
 
+	@Inject
+	@Optional
+	public void reactOnPrefsChange(@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE) IEclipsePreferences prefs) {
+		prefs.addPreferenceChangeListener(this);
+		
+	}
+	
+	@Inject
+	@Optional
+	public void reactOnShowHoverChange(@Preference(value = PreferenceConstants.SHOW_HOVER) Boolean hover) {
+		showHover=hover;
+	}
+	
+	@Inject
+	@Optional
+	public void reactOnReloadDatabaseChange(@Preference(value = PreferenceConstants.DATABASE_RELOAD) Boolean checkForUpdates) {
+		if (checkForUpdates) {
+			fileChecker = fileMonitor.addFileChangeListener(WaveformViewer.this, filesToLoad, FILE_CHECK_INTERVAL);
+		} else { 
+			fileMonitor.removeFileChangeListener(WaveformViewer.this);
+			fileChecker = null;
+		}
+	}
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
 	 */
 	@Override
 	public void preferenceChange(PreferenceChangeEvent event) {
-		InstancePreferences pref = (InstancePreferences)event.getSource();
-		if (PreferenceConstants.DATABASE_RELOAD.equals(event.getKey())) {
-			checkForUpdates = pref.getBoolean(PreferenceConstants.DATABASE_RELOAD, true);
-			fileChecker = null;
-			if (checkForUpdates)
-				fileChecker = fileMonitor.addFileChangeListener(WaveformViewer.this, filesToLoad,
-						FILE_CHECK_INTERVAL);
-			else
-				fileMonitor.removeFileChangeListener(this);
-		} else if (!PreferenceConstants.SHOW_HOVER.equals(event.getKey())){
+		if (!PreferenceConstants.DATABASE_RELOAD.equals(event.getKey()) && !PreferenceConstants.SHOW_HOVER.equals(event.getKey())){
 			setupColors();
 		}
-		try {
-			pref.flush();
-		} catch (BackingStoreException e) { }
 	}
 
 	/**
 	 * Setup colors.
 	 */
 	protected void setupColors() {
+		Preferences defaultPrefs= store.parent().parent().node("/"+DefaultScope.SCOPE+"/"+PreferenceConstants.PREFERENCES_SCOPE);
 		HashMap<WaveformColors, RGB> colorPref = new HashMap<>();
 		for (WaveformColors c : WaveformColors.values()) {
-			String prefValue = store.getString(c.name() + "_COLOR"); //$NON-NLS-1$
+			String key = c.name() + "_COLOR";
+			String prefValue = store.get(key, defaultPrefs.get(key,  "")); //$NON-NLS-1$
 			RGB rgb = StringConverter.asRGB(prefValue);
 			colorPref.put(c, rgb);
 		}
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java
index ca89128..71f299c 100644
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java
+++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java
@@ -12,14 +12,14 @@ package com.minres.scviewer.e4.application.preferences;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.wb.swt.SWTResourceManager;
+import org.osgi.framework.FrameworkUtil;
 
 import com.minres.scviewer.database.ui.WaveformColors;
-import com.opcoach.e4.preferences.ScopedPreferenceStore;
 
 /**
  * The Class DefaultValuesInitializer.
@@ -27,7 +27,7 @@ import com.opcoach.e4.preferences.ScopedPreferenceStore;
 public class DefaultValuesInitializer extends AbstractPreferenceInitializer {
 
     /** The default colors. */
-    public final Color[] colors = new Color[WaveformColors.values().length];
+    public static final Color[] colors = new Color[WaveformColors.values().length];
 
 	/**
 	 * Instantiates a new default values initializer.
@@ -64,21 +64,12 @@ public class DefaultValuesInitializer extends AbstractPreferenceInitializer {
 	 */
 	@Override
 	public void initializeDefaultPreferences() {
-//		IEclipsePreferences node = DefaultScope.INSTANCE.getNode(PreferenceConstants.PREFERENCES_SCOPE);
-//		if (node != null)
-//		{
-//			node.putBoolean(PreferenceConstants.DATABASE_RELOAD, true);
-//			node.putBoolean(PreferenceConstants.SHOW_HOVER, true);
-//	        for (WaveformColors c : WaveformColors.values()) {
-//	        	node.put(c.name()+"_COLOR", StringConverter.asString(colors[c.ordinal()].getRGB())); //$NON-NLS-1$
-//	        }
-//		}
-		IPreferenceStore store = new ScopedPreferenceStore(DefaultScope.INSTANCE, PreferenceConstants.PREFERENCES_SCOPE);
-
-		store.setDefault(PreferenceConstants.DATABASE_RELOAD, true);
-		store.setDefault(PreferenceConstants.SHOW_HOVER, true);
+		IEclipsePreferences store = DefaultScope.INSTANCE.getNode(FrameworkUtil.getBundle(getClass()).getSymbolicName());
+		
+		store.putBoolean(PreferenceConstants.DATABASE_RELOAD, true);
+		store.putBoolean(PreferenceConstants.SHOW_HOVER, true);
         for (WaveformColors c : WaveformColors.values()) {
-        	 store.setDefault(c.name()+"_COLOR", StringConverter.asString(colors[c.ordinal()].getRGB())); //$NON-NLS-1$
+        	 store.put(c.name()+"_COLOR", StringConverter.asString(colors[c.ordinal()].getRGB())); //$NON-NLS-1$
         }
 	}
 
diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferencesStoreProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferencesStoreProvider.java
deleted file mode 100644
index ad4e320..0000000
--- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferencesStoreProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.minres.scviewer.e4.application.preferences;
-import org.eclipse.core.runtime.preferences.ConfigurationScope;
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import com.opcoach.e4.preferences.IPreferenceStoreProvider;
-import com.opcoach.e4.preferences.ScopedPreferenceStore;
-
-public class PreferencesStoreProvider implements IPreferenceStoreProvider{
-
-	public PreferencesStoreProvider(){
-	}
-
-	@Override
-	public IPreferenceStore getPreferenceStore() {
-		return new ScopedPreferenceStore(ConfigurationScope.INSTANCE, PreferenceConstants.PREFERENCES_SCOPE);
-	}
-
-}
\ No newline at end of file

From ab975eadd19c9ab9ea6b55a20aff21037732514e Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Sun, 21 Jun 2020 16:04:22 +0200
Subject: [PATCH 6/6] udate version numbers

---
 com.minres.scviewer.e4.product/pom.xml                |  2 +-
 com.minres.scviewer.e4.product/scviewer.product       |  3 ++-
 .../feature.xml                                       | 11 +++++++++++
 .../META-INF/MANIFEST.MF                              |  2 +-
 plugins/com.minres.scviewer.e4.application/pom.xml    |  2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/com.minres.scviewer.e4.product/pom.xml b/com.minres.scviewer.e4.product/pom.xml
index 99973ca..59e17ee 100644
--- a/com.minres.scviewer.e4.product/pom.xml
+++ b/com.minres.scviewer.e4.product/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-  	<version>2.6.0-SNAPSHOT</version>
+  	<version>2.6.1-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>
diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product
index 3a9752b..e44db74 100644
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/com.minres.scviewer.e4.product/scviewer.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.6.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.6.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -17,6 +17,7 @@
 
    <windowImages/>
 
+
    <launcher name="scviewer">
       <linux icon="icons/SCViewer_512x512.xpm"/>
       <macosx icon="icons/SCViewer.icns"/>
diff --git a/features/com.minres.scviewer.e4.platform.feature/feature.xml b/features/com.minres.scviewer.e4.platform.feature/feature.xml
index 3a5ab6e..af86167 100644
--- a/features/com.minres.scviewer.e4.platform.feature/feature.xml
+++ b/features/com.minres.scviewer.e4.platform.feature/feature.xml
@@ -52,6 +52,17 @@
    <plugin
          id="org.eclipse.core.filesystem.linux.x86_64"
          os="linux"
+         arch="x86_64"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.win32.x86_64"
+         os="win32"
+         arch="x86_64"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
index 49ee11d..a8da3e0 100644
--- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.minres.scviewer.e4.application;singleton:=true
-Bundle-Version: 2.6.0.qualifier
+Bundle-Version: 2.6.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.11.1",
diff --git a/plugins/com.minres.scviewer.e4.application/pom.xml b/plugins/com.minres.scviewer.e4.application/pom.xml
index 8510b31..158788b 100644
--- a/plugins/com.minres.scviewer.e4.application/pom.xml
+++ b/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.0-SNAPSHOT</version>
+  <version>2.6.1-SNAPSHOT</version>
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>