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,10 +587,9 @@ 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();
+									resultsList[tx.getConcurrencyIndex()] = ((ITxEvent) evt).getTransaction();
-								}
 							}
 						}
 						firstTx = entry.waveform.getEvents().lowerEntry(firstTx.getKey());

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/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) {
 			}
 		}