fix Sonarlint warnings

plugins/com.minres.scviewer.database.text/lib/LICENSE.txt

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

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

@@ -587,12 +587,11 @@ public class WaveformView implements IWaveformView {
 							if (evt instanceof ITxEvent) {
 								ITx tx = ((ITxEvent) evt).getTransaction();
 								if ((evt.getKind() == EventKind.BEGIN || evt.getKind() == EventKind.SINGLE)
-										&& tx.getBeginTime() <= time && tx.getEndTime() >= time) {
+										&& tx.getBeginTime() <= time && tx.getEndTime() >= time
-									if (resultsList[tx.getConcurrencyIndex()] == null)
+										&& resultsList[tx.getConcurrencyIndex()] == null)
 									resultsList[tx.getConcurrencyIndex()] = ((ITxEvent) evt).getTransaction();
 							}
 						}
-						}
 						firstTx = entry.waveform.getEvents().lowerEntry(firstTx.getKey());
 					} while (firstTx != null && !isArrayFull(resultsList));
 					boolean separator = false;

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

@@ -124,7 +124,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	@Override
 	public boolean load(File inp) {
 		for (IWaveformDbLoader loader : loaders) {
-			if(loader.canLoad(inp)) {
+			if (loader.canLoad(inp)) {
 				try {
 					loader.addPropertyChangeListener(this);
 					loader.load(this, inp);
@@ -186,13 +186,13 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 
 	@Override
 	public void propertyChange(PropertyChangeEvent evt) {
-		if(IWaveformDbLoader.SIGNAL_ADDED.equals(evt.getPropertyName()) || 
+		if (IWaveformDbLoader.SIGNAL_ADDED.equals(evt.getPropertyName())
-				IWaveformDbLoader.STREAM_ADDED.equals(evt.getPropertyName())) {
+				|| IWaveformDbLoader.STREAM_ADDED.equals(evt.getPropertyName())) {
 			IWaveform waveform = (IWaveform) evt.getNewValue();
 			putInHierarchy(waveform);
 			pcs.firePropertyChange(IHierNode.WAVEFORMS, null, waveforms);
 			pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes);
-		} else if(IWaveformDbLoader.GENERATOR_ADDED.equals(evt.getPropertyName())) {
+		} else if (IWaveformDbLoader.GENERATOR_ADDED.equals(evt.getPropertyName())) {
 			pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes);
 		}
 	}
@@ -201,14 +201,14 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
 	 * Builds the hierarchy nodes.
 	 */
 	private void buildHierarchyNodes() {
-		boolean needsSorting=false;
+		boolean needsSorting = false;
 		for (IWaveform stream : getAllWaves()) {
-			if(stream.getParent()==null) {
+			if (stream.getParent() == null) {
 				putInHierarchy(stream);
-				needsSorting=true;
+				needsSorting = true;
 			}
 		}
-		if(needsSorting) {
+		if (needsSorting) {
 			pcs.firePropertyChange(IHierNode.WAVEFORMS, null, waveforms);
 			pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes);
 		}

plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/HeapStatus.java

@@ -9,14 +9,14 @@
  *     MINRES Technologies GmbH - initial API and implementation
  *******************************************************************************/
 package com.minres.scviewer.e4.application.internal.status;
+
+import java.lang.ref.WeakReference;
 import java.lang.reflect.Method;
 
 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.jface.action.Action;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -29,7 +29,6 @@ import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.wb.swt.ResourceManager;
@@ -39,8 +38,8 @@ import org.osgi.service.prefs.Preferences;
 import com.minres.scviewer.e4.application.Constants;
 
 /**
- * The Heap Status control, which shows the heap usage statistics in the window trim.
+ * The Heap Status control, which shows the heap usage statistics in the window
- * Part of the code is taken from the eclipse internal implementation
+ * trim. Part of the code is taken from the eclipse internal implementation
  */
 public class HeapStatus extends Composite {
 
@@ -54,7 +53,8 @@ public class HeapStatus extends Composite {
 	private Image disabledGcImage;
 
 	/** The arm col. */
-	private Color bgCol, usedMemCol, lowMemCol, freeMemCol, topLeftCol, bottomRightCol, sepCol, textCol, markCol, armCol;
+	private Color bgCol, usedMemCol, lowMemCol, freeMemCol, topLeftCol, bottomRightCol, sepCol, textCol, markCol,
+			armCol;
 
 	/** The button. */
 	private Canvas button;
@@ -88,7 +88,7 @@ public class HeapStatus extends Composite {
 
 	/** The img bounds. */
 	// start with 12x12
-	private Rectangle imgBounds = new Rectangle(0,0,12,12);
+	private Rectangle imgBounds = new Rectangle(0, 0, 12, 12);
 
 	/** The max mem. */
 	private long maxMem = Long.MAX_VALUE;
@@ -127,23 +127,17 @@ public class HeapStatus extends Composite {
 	};
 
 	/** The pref listener. */
-    private final IPreferenceChangeListener prefListener = new IPreferenceChangeListener() {
+	private final IPreferenceChangeListener prefListener = event -> {
-		@Override
-		public void preferenceChange(PreferenceChangeEvent event) {
 		if (IHeapStatusConstants.PREF_UPDATE_INTERVAL.equals(event.getKey())) {
 			setUpdateIntervalInMS(preferences.getInt(IHeapStatusConstants.PREF_UPDATE_INTERVAL, 100));
-			}
+		} else if (IHeapStatusConstants.PREF_SHOW_MAX.equals(event.getKey())) {
-			else if (IHeapStatusConstants.PREF_SHOW_MAX.equals(event.getKey())) {
 			showMax = preferences.getBoolean(IHeapStatusConstants.PREF_SHOW_MAX, true);
 		}
-			
-		}
 	};
 
 	/**
-     * Creates a new heap status control with the given parent, and using
+	 * Creates a new heap status control with the given parent, and using the given
-     * the given preference store to obtain settings such as the refresh
+	 * preference store to obtain settings such as the refresh interval.
-     * interval.
 	 *
 	 * @param parent      the parent composite
 	 * @param preferences the preference store
@@ -155,8 +149,8 @@ public class HeapStatus extends Composite {
 		maxMemKnown = maxMem != Long.MAX_VALUE;
 
 		this.preferences = preferences;
-        if(this.preferences instanceof IEclipsePreferences)
+		if (this.preferences instanceof IEclipsePreferences)
-        	((IEclipsePreferences)this.preferences).addPreferenceChangeListener(prefListener);
+			((IEclipsePreferences) this.preferences).addPreferenceChangeListener(prefListener);
 
 		setUpdateIntervalInMS(preferences.getInt(IHeapStatusConstants.PREF_UPDATE_INTERVAL, 100));
 		showMax = preferences.getBoolean(IHeapStatusConstants.PREF_SHOW_MAX, true);
@@ -181,10 +175,7 @@ public class HeapStatus extends Composite {
 
 		createContextMenu();
 
-        Listener listener = new Listener() {
+		Listener listener = event -> {
-
-            @Override
-			public void handleEvent(Event event) {
 			switch (event.type) {
 			case SWT.Dispose:
 				doDispose();
@@ -196,28 +187,23 @@ public class HeapStatus extends Composite {
 			case SWT.Paint:
 				if (event.widget == HeapStatus.this) {
 					paintComposite(event.gc);
-                    }
+				} else if (event.widget == button) {
-                    else if (event.widget == button) {
 					paintButton(event.gc);
 				}
 				break;
 			case SWT.MouseUp:
-                    if (event.button == 1) {
+				if (event.button == 1 && !isInGC) {
-						if (!isInGC) {
 					arm(false);
 					gc();
 				}
-                    }
 				break;
 			case SWT.MouseDown:
 				if (event.button == 1) {
 					if (event.widget == HeapStatus.this) {
 						setMark();
-						} else if (event.widget == button) {
+					} else if (event.widget == button && !isInGC)
-							if (!isInGC)
 						arm(true);
 				}
-                    }
 				break;
 			case SWT.MouseEnter:
 				HeapStatus.this.updateTooltip = true;
@@ -233,8 +219,6 @@ public class HeapStatus extends Composite {
 			default:
 				break;
 			}
-            }
-
 		};
 		addListener(SWT.Dispose, listener);
 		addListener(SWT.MouseDown, listener);
@@ -250,18 +234,18 @@ public class HeapStatus extends Composite {
 		// make sure stats are updated before first paint
 		updateStats();
 
-        getDisplay().asyncExec(new Runnable() {
+		getDisplay().asyncExec(() -> {
-			@Override
-			public void run() {
 			if (!isDisposed()) {
 				getDisplay().timerExec(updateInterval, timer);
 			}
-			}
 		});
 	}
 
-	/* (non-Javadoc)
+	/*
-	 * @see org.eclipse.swt.widgets.Control#setBackground(org.eclipse.swt.graphics.Color)
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.swt.widgets.Control#setBackground(org.eclipse.swt.graphics.Color)
 	 */
 	@Override
 	public void setBackground(Color color) {
@@ -270,8 +254,11 @@ public class HeapStatus extends Composite {
 		button.update();
 	}
 
-	/* (non-Javadoc)
+	/*
-	 * @see org.eclipse.swt.widgets.Control#setForeground(org.eclipse.swt.graphics.Color)
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.eclipse.swt.widgets.Control#setForeground(org.eclipse.swt.graphics.Color)
 	 */
 	@Override
 	public void setForeground(Color color) {
@@ -285,7 +272,9 @@ public class HeapStatus extends Composite {
 		button.update();
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.eclipse.swt.widgets.Control#getForeground()
 	 */
 	@Override
@@ -310,9 +299,9 @@ public class HeapStatus extends Composite {
 			if (o instanceof Long) {
 				max = ((Long) o).longValue();
 			}
-		}
+		} catch (Exception e) {
-		catch (Exception e) {
+			// ignore if method missing or if there are other failures trying to determine
-			// ignore if method missing or if there are other failures trying to determine the max
+			// the max
 		}
 		return max;
 	}
@@ -330,8 +319,8 @@ public class HeapStatus extends Composite {
 	 * Do dispose.
 	 */
 	private void doDispose() {
-		if(preferences instanceof IEclipsePreferences)
+		if (preferences instanceof IEclipsePreferences)
-        	((IEclipsePreferences)preferences).removePreferenceChangeListener(prefListener);
+			((IEclipsePreferences) preferences).removePreferenceChangeListener(prefListener);
 		if (gcImage != null) {
 			gcImage.dispose();
 		}
@@ -340,7 +329,9 @@ public class HeapStatus extends Composite {
 		}
 	}
 
-	/* (non-Javadoc)
+	/*
+	 * (non-Javadoc)
+	 * 
 	 * @see org.eclipse.swt.widgets.Composite#computeSize(int, int, boolean)
 	 */
 	@Override
@@ -392,12 +383,7 @@ public class HeapStatus extends Composite {
 	private void createContextMenu() {
 		MenuManager menuMgr = new MenuManager();
 		menuMgr.setRemoveAllWhenShown(true);
-        menuMgr.addMenuListener(new IMenuListener() {
+		menuMgr.addMenuListener(mgr -> fillMenu(mgr));
-			@Override
-			public void menuAboutToShow(IMenuManager menuMgr) {
-				fillMenu(menuMgr);
-			}
-		});
 		Menu menu = menuMgr.createContextMenu(this);
 		setMenu(menu);
 	}
@@ -411,10 +397,6 @@ public class HeapStatus extends Composite {
 		menuMgr.add(new SetMarkAction());
 		menuMgr.add(new ClearMarkAction());
 		menuMgr.add(new ShowMaxAction());
-        menuMgr.add(new CloseHeapStatusAction());
-//        if (isKyrsoftViewAvailable()) {
-//        	menuMgr.add(new ShowKyrsoftViewAction());
-//        }
 	}
 
 	/**
@@ -445,7 +427,10 @@ public class HeapStatus extends Composite {
 			@Override
 			public void run() {
 				busyGC();
-				getDisplay().asyncExec(() -> { if (!isDisposed()) gcRunning(false);	});
+				getDisplay().asyncExec(() -> {
+					if (!isDisposed())
+						gcRunning(false);
+				});
 			}
 		};
 		t.start();
@@ -455,10 +440,13 @@ public class HeapStatus extends Composite {
 	 * Busy gc.
 	 */
 	private void busyGC() {
-        for (int i = 0; i < 2; ++i) {
+		Object obj = new Object();
+		WeakReference<Object> ref = new WeakReference<>(obj);
+		obj = null;
+		do {
 			System.gc();
 			System.runFinalization();
-        }
+		} while (ref.get() != null);
 	}
 
 	/**
@@ -522,16 +510,16 @@ public class HeapStatus extends Composite {
 		gc.drawLine(dx, y, dx, y + h);
 		gc.drawLine(ux, y, ux, y + h);
 		gc.setForeground(topLeftCol);
-        gc.drawLine(x, y, x+w, y);
+		gc.drawLine(x, y, x + w, y);
-		gc.drawLine(x, y, x, y+h);
+		gc.drawLine(x, y, x, y + h);
 		gc.setForeground(bottomRightCol);
-        gc.drawLine(x+w-1, y, x+w-1, y+h);
+		gc.drawLine(x + w - 1, y, x + w - 1, y + h);
-		gc.drawLine(x, y+h-1, x+w, y+h-1);
+		gc.drawLine(x, y + h - 1, x + w, y + h - 1);
 
 		gc.setBackground(usedMemCol);
 		gc.fillRectangle(x + 1, y + 1, uw, h - 2);
 
-        String s =  convertToMegString(usedMem)+" of "+ convertToMegString(totalMem);
+		String s = convertToMegString(usedMem) + " of " + convertToMegString(totalMem);
 		Point p = gc.textExtent(s);
 		int sx = (rect.width - 15 - p.x) / 2 + rect.x + 1;
 		int sy = (rect.height - 2 - p.y) / 2 + rect.y + 1;
@@ -573,13 +561,13 @@ public class HeapStatus extends Composite {
 		gc.drawLine(ux, y, ux, y + h);
 		gc.drawLine(tx, y, tx, y + h);
 		gc.setForeground(topLeftCol);
-        gc.drawLine(x, y, x+w, y);
+		gc.drawLine(x, y, x + w, y);
-		gc.drawLine(x, y, x, y+h);
+		gc.drawLine(x, y, x, y + h);
 		gc.setForeground(bottomRightCol);
-        gc.drawLine(x+w-1, y, x+w-1, y+h);
+		gc.drawLine(x + w - 1, y, x + w - 1, y + h);
-		gc.drawLine(x, y+h-1, x+w, y+h-1);
+		gc.drawLine(x, y + h - 1, x + w, y + h - 1);
 
-        if (lowMemThreshold != 0 && ((double)(maxMem - usedMem) / (double)maxMem < lowMemThreshold)) {
+		if (lowMemThreshold != 0 && ((double) (maxMem - usedMem) / (double) maxMem < lowMemThreshold)) {
 			gc.setBackground(lowMemCol);
 		} else {
 			gc.setBackground(usedMemCol);
@@ -596,7 +584,7 @@ public class HeapStatus extends Composite {
 			gc.drawLine(thresholdX, y + 1, thresholdX, y + h - 2);
 		}
 
-        String s = convertToMegString(usedMem)+" of "+convertToMegString(totalMem);
+		String s = convertToMegString(usedMem) + " of " + convertToMegString(totalMem);
 		Point p = gc.textExtent(s);
 		int sx = (rect.width - 15 - p.x) / 2 + rect.x + 1;
 		int sy = (rect.height - 2 - p.y) / 2 + rect.y + 1;
@@ -620,9 +608,9 @@ public class HeapStatus extends Composite {
 	 */
 	private void paintMark(GC gc, int x, int y, int h) {
 		gc.setForeground(markCol);
-		gc.drawLine(x, y+1, x, y+h-2);
+		gc.drawLine(x, y + 1, x, y + h - 2);
-		gc.drawLine(x-1, y+1, x+1, y+1);
+		gc.drawLine(x - 1, y + 1, x + 1, y + 1);
-		gc.drawLine(x-1, y+h-2, x+1, y+h-2);
+		gc.drawLine(x - 1, y + h - 2, x + 1, y + h - 2);
 	}
 
 	/**
@@ -653,24 +641,26 @@ public class HeapStatus extends Composite {
 		String totalStr = convertToMegString(totalMem);
 		String maxStr = maxMemKnown ? convertToMegString(maxMem) : "<unknown>";
 		String markStr = mark == -1 ? "<none>" : convertToMegString(mark);
-        String toolTip = "Heap size: "+usedStr+" of total: "+totalStr+" max: "+maxStr+" mark: "+markStr;
+		String toolTip = "Heap size: " + usedStr + " of total: " + totalStr + " max: " + maxStr + " mark: " + markStr;
 		if (!toolTip.equals(getToolTipText())) {
 			setToolTipText(toolTip);
 		}
 	}
 
 	/**
-     * Converts the given number of bytes to a printable number of megabytes (rounded up).
+	 * Converts the given number of bytes to a printable number of megabytes
+	 * (rounded up).
 	 *
 	 * @param numBytes the num bytes
 	 * @return the string
 	 */
 	private String convertToMegString(long numBytes) {
-        return Long.toString(convertToMeg(numBytes))+"M";
+		return Long.toString(convertToMeg(numBytes)) + "M";
 	}
 
 	/**
-     * Converts the given number of bytes to the corresponding number of megabytes (rounded up).
+	 * Converts the given number of bytes to the corresponding number of megabytes
+	 * (rounded up).
 	 *
 	 * @param numBytes the num bytes
 	 * @return the long
@@ -679,7 +669,6 @@ public class HeapStatus extends Composite {
 		return (numBytes + (512 * 1024)) / (1024 * 1024);
 	}
 
-
 	/**
 	 * The Class SetMarkAction.
 	 */
@@ -692,7 +681,9 @@ public class HeapStatus extends Composite {
 			super("&Set Mark");
 		}
 
-        /* (non-Javadoc)
+		/*
+		 * (non-Javadoc)
+		 * 
 		 * @see org.eclipse.jface.action.Action#run()
 		 */
 		@Override
@@ -713,7 +704,9 @@ public class HeapStatus extends Composite {
 			super("&Clear Mark");
 		}
 
-        /* (non-Javadoc)
+		/*
+		 * (non-Javadoc)
+		 * 
 		 * @see org.eclipse.jface.action.Action#run()
 		 */
 		@Override
@@ -736,7 +729,9 @@ public class HeapStatus extends Composite {
 			setChecked(showMax);
 		}
 
-        /* (non-Javadoc)
+		/*
+		 * (non-Javadoc)
+		 * 
 		 * @see org.eclipse.jface.action.Action#run()
 		 */
 		@Override
@@ -745,32 +740,4 @@ public class HeapStatus extends Composite {
 			redraw();
 		}
 	}
-
-    /**
-     * The Class CloseHeapStatusAction.
-     */
-    class CloseHeapStatusAction extends Action{
-
-    	/**
-	     * Instantiates a new close heap status action.
-	     */
-	    CloseHeapStatusAction(){
-    		super("&Close");
-    	}
-
-    	/* (non-Javadoc)
-	     * @see org.eclipse.jface.action.Action#run()
-	     */
-	    @Override
-		public void run(){
-//			WorkbenchWindow wbw = (WorkbenchWindow) PlatformUI.getWorkbench()
-//					.getActiveWorkbenchWindow();
-//			if (wbw != null) {
-//				wbw.showHeapStatus(false);
-//			}
-    		System.out.println("NYI");
-    	}
-    }
-
 }
-

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

@@ -16,11 +16,13 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -355,8 +357,10 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 					case SWT.ARROW_DOWN:
 						waveformPane.moveSelection(GotoDirection.DOWN);
 						return;
-					case SWT.HOME:			return; //TODO: should be handled
+					case SWT.HOME:
-					case SWT.END:			return; //TODO: should be handled
+						return;
+					case SWT.END:
+						return;
 					default:
 						break;
 					}
@@ -763,25 +767,25 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 */
 	protected void restoreWaveformViewerState(Map<String, String> state) {
 		Integer waves = state.containsKey(SHOWN_WAVEFORM+"S") ? Integer.parseInt(state.get(SHOWN_WAVEFORM + "S")):0; //$NON-NLS-1$ //$NON-NLS-2$
-		List<TrackEntry> res = new LinkedList<>();
+		List<TrackEntry> trackEntries = new LinkedList<>();
 		for (int i = 0; i < waves; i++) {
 			IWaveform waveform = database.getStreamByName(state.get(SHOWN_WAVEFORM + i));
 			if (waveform != null) {
-				TrackEntry t = waveformPane.addWaveform(waveform, -1);
+				TrackEntry trackEntry = waveformPane.addWaveform(waveform, -1);
 				//check if t is selected
 				boolean isSelected = Boolean.parseBoolean(state.get(SHOWN_WAVEFORM + i + WAVEFORM_SELECTED));
 				if(isSelected) {
-					t.selected = true;
+					trackEntry.selected = true;
 				} else {
-					t.selected = false;
+					trackEntry.selected = false;
 				}
-				res.add(t);
+				trackEntries.add(trackEntry);
 				String v = state.get(SHOWN_WAVEFORM + i + VALUE_DISPLAY);
 				if(v!=null)
-					t.valueDisplay=ValueDisplay.valueOf(v);
+					trackEntry.valueDisplay=ValueDisplay.valueOf(v);
 				String s = state.get(SHOWN_WAVEFORM + i + WAVE_DISPLAY);
 				if(s!=null)
-					t.waveDisplay=WaveDisplay.valueOf(s);
+					trackEntry.waveDisplay=WaveDisplay.valueOf(s);
 			}
 		}
 		Integer cursorLength = state.containsKey(SHOWN_CURSOR+"S")?Integer.parseInt(state.get(SHOWN_CURSOR + "S")):0; //$NON-NLS-1$ //$NON-NLS-2$
@@ -810,32 +814,11 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 			try {
 				Long txId = Long.parseLong(state.get(SELECTED_TX_ID));
 				String trackentryName = state.get(SELECTED_TRACKENTRY_NAME);
-				
 				//get TrackEntry Object based on name and TX Object by id and put into selectionList
-				for(TrackEntry te : res) {
+				trackEntries.stream().filter(e->trackentryName.equals(e.waveform.getFullName())).forEach(trackEntry ->
-					if(te.waveform.getFullName().compareTo(trackentryName)==0) {
+				trackEntry.waveform.getEvents().values().stream().filter(Objects::nonNull).forEach(entries-> 
-						boolean found = false;
+				Arrays.stream(entries).filter(e->e instanceof ITxEvent && txId.equals(((ITxEvent)e).getTransaction().getId())).forEach(event ->
-						// TODO: find transaction by time? To avoid 3x for-loop
+				waveformPane.setSelection(new StructuredSelection(new Object[] {((ITxEvent)event).getTransaction(), trackEntry})))));
-						for( IEvent[] lev : te.waveform.getEvents().values() ) {
-							if(lev != null)
-								for(IEvent itxe : lev) {
-									if(itxe instanceof ITxEvent) {
-										ITx itx = ((ITxEvent)itxe).getTransaction();
-										if(itx.getId().equals(txId)) {
-											found = true;
-											ArrayList<Object> selectionList = new ArrayList<>();
-											selectionList.add(te);
-											selectionList.add(itx);
-											waveformPane.setSelection(new StructuredSelection (selectionList));
-											break;
-										}
-									}
-								}
-							if(found) break;
-						}
-						break;
-					}
-				}
 			} catch (NumberFormatException e) {
 			}
 		}