Merge branch 'release/2.0' into develop

com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF

@@ -15,3 +15,4 @@ Bundle-ActivationPolicy: lazy
 Embed-Dependency: sqlite-jdbc
 Embedded-Artifacts: sqlite-jdbc-3.8.7.jar;g="org.xerial";
  a="sqlite-jdbc";v="3.8.7"
+Automatic-Module-Name: com.minres.scviewer.database.sqlite

com.minres.scviewer.database.test/META-INF/MANIFEST.MF

@@ -12,3 +12,4 @@ Require-Bundle: org.junit,
  com.minres.scviewer.database.vcd;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/component.xml
+Automatic-Module-Name: com.minres.scviewer.database.test

com.minres.scviewer.database.text/META-INF/MANIFEST.MF

@@ -15,3 +15,4 @@ Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
  com.google.guava;bundle-version="15.0.0"
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: com.minres.scviewer.database.text

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SWT widget
 Bundle-SymbolicName: com.minres.scviewer.database.ui.swt
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
@@ -17,3 +17,4 @@ Export-Package: com.minres.scviewer.database.swt
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.minres.scviewer.database.swt.DatabaseUiPlugin
+Automatic-Module-Name: com.minres.scviewer.database.ui.swt

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

@@ -1,6 +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.database.ui.swt</artifactId>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <parent>
   	<groupId>com.minres.scviewer</groupId>
@@ -8,5 +9,4 @@
   	<version>1.0.0-SNAPSHOT</version>
   	<relativePath>../com.minres.scviewer.parent</relativePath>
   </parent>
-  <version>1.1.0-SNAPSHOT</version>
 </project>

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

@@ -242,14 +242,12 @@ public class SignalPainter extends TrackPainter {
 	private class MultiBitStencilAnalog implements SignalStencil {
 
 		final boolean continous;
-		final boolean signed;
 		private long minVal;
 		private long range;
 
 		@SuppressWarnings("unchecked")
 		public MultiBitStencilAnalog(NavigableMap<Long, ? extends ISignalChange> entries, ISignalChange left, boolean continous, boolean signed) {
 			this.continous=continous;
-			this.signed=signed;
 			Collection<ISignalChangeBitVector> values = ((NavigableMap<Long, ISignalChangeBitVector>) entries).values();
 			minVal=((ISignalChangeBitVector) left).getValue().toUnsignedValue();
 			range=2;

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

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

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

@@ -1,12 +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.database.ui</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>1.0.0-SNAPSHOT</version>
+  	<version>2.0.0-SNAPSHOT</version>
   	<relativePath>../com.minres.scviewer.parent</relativePath>
   </parent>
   </project>

com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VCD signal database
 Bundle-SymbolicName: com.minres.scviewer.database.vcd
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
@@ -13,3 +13,4 @@ Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
 Service-Component: OSGI-INF/component.xml
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.common.collect
+Automatic-Module-Name: com.minres.scviewer.database.vcd

com.minres.scviewer.database.vcd/pom.xml

@@ -4,8 +4,9 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>1.0.0-SNAPSHOT</version>
+  	<version>2.0.0-SNAPSHOT</version>
   	<relativePath>../com.minres.scviewer.parent</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>
+  <version>2.0.0-SNAPSHOT</version>
 </project>

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

@@ -149,7 +149,6 @@ class VCDFileParser {
 		if (tokenizer.sval.charAt(0) == '#') {	// If the line begins with a #, this is a timestamp.
 			currentTime = Long.parseLong(tokenizer.sval.substring(1)) * picoSecondsPerIncrement;
 		} else {
-			boolean isReal=false;
 			if(tokenizer.sval.equals("$comment")){
 				do {
 					if (!nextToken()) return false;

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

@@ -11,3 +11,4 @@ Service-Component: OSGI-INF/component.xml,OSGI-INF/component2.xml
 Require-Bundle: org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.osgi.services;bundle-version="3.4.0"
+Automatic-Module-Name: com.minres.scviewer.database

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

@@ -142,7 +142,7 @@
       </children>
     </trimBars>
   </children>
-  <children xsi:type="basic:Dialog" xmi:id="_8BTkQIytEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.dialog.aboutscviewer" toBeRendered="false" visible="false" selectedElement="__VNlAIytEeWid7xO48ZBXw" label="About SCViewer" x="200" y="200">
+  <children xsi:type="basic:Window" xmi:id="_8BTkQIytEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.dialog.aboutscviewer" toBeRendered="false" visible="false" selectedElement="__VNlAIytEeWid7xO48ZBXw" label="About SCViewer" x="200" y="200">
     <children xsi:type="basic:Part" xmi:id="__VNlAIytEeWid7xO48ZBXw" elementId="com.minres.scviewer.e4.application.part.0" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.parts.AboutDialog"/>
   </children>
   <handlers xmi:id="_95PfvXNmEeWBq8z1Dv39LA" elementId="com.minres.scviewer.e4.application.handler.quitCommand" contributionURI="bundleclass://com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.handlers.QuitHandler" command="_95PfvHNmEeWBq8z1Dv39LA"/>

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: 1.1.1.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
   org.eclipse.core.runtime;bundle-version="3.11.1",
@@ -35,3 +35,4 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.minres.scviewer.database,
   javax.inject;version="1.0.0"
+Automatic-Module-Name: com.minres.scviewer.e4.application

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

@@ -4,9 +4,8 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>1.0.0-SNAPSHOT</version>
+  	<version>2.0.0-SNAPSHOT</version>
   	<relativePath>../com.minres.scviewer.parent</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>
-  <version>1.1.1-SNAPSHOT</version>
   </project>

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

@@ -27,7 +27,6 @@ import com.minres.scviewer.database.ISignalChange;
 import com.minres.scviewer.database.ISignalChangeBitVector;
 import com.minres.scviewer.database.ISignalChangeReal;
 import com.minres.scviewer.database.ui.TrackEntry;
-import com.minres.scviewer.database.ui.TrackEntry.ValueDisplay;
 import com.minres.scviewer.e4.application.parts.WaveformViewer;
 
 public class WaveformPopupMenuContribution {

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

@@ -10,11 +10,8 @@
  *******************************************************************************/
 package com.minres.scviewer.e4.application.handlers;
 
-import javax.inject.Named;
-
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.ui.basic.MDialog;
 import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.swt.widgets.Shell;
@@ -25,7 +22,7 @@ public class AboutHandler {
 	
 	@Execute
 	public void execute(Shell shell, MApplication app, MWindow window, EModelService ms /*@Named("mdialog01.dialog.0") MDialog dialog*/) {
-		MDialog dialog = (MDialog) ms.find(DIALOG_ID, app); //$NON-NLS-1$
+		MWindow dialog = (MWindow) ms.find(DIALOG_ID, app); //$NON-NLS-1$
 		dialog.setToBeRendered(true);
 		dialog.setToBeRendered(false);
 	}

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

@@ -1,5 +1,5 @@
-AboutDialog_0=\nSCViewer - a SystemC waveform viewer\n\nVersion: 1.2.2\n
+AboutDialog_0=\nSCViewer - a SystemC waveform viewer\n\nVersion: 2.0\n
-AboutDialog_1=\nCopyright (c) 2015,2016,2017 MINRES Technologies GmbH and others.\n\nAll rights reserved. MINRES and the MINRES logo are trademarks of MINRES Technologies GmbH, http://www.minres.com/. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html\n\nParts of the software are governed by the Apache License Version 2.0 available at http://www.apache.org/licenses/. These are namely org.apache.jdbm and org.sqlite JDBC driver\n\nSources code is hosted at GitHub: https://github.com/minres/SCViewer\n
+AboutDialog_1=\nCopyright (c) 2015, 2018 MINRES Technologies GmbH and others.\n\nAll rights reserved. MINRES and the MINRES logo are trademarks of MINRES Technologies GmbH, http://www.minres.com/. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html\n\nParts of the software are governed by the Apache License Version 2.0 available at http://www.apache.org/licenses/. These are namely org.apache.jdbm and org.sqlite JDBC driver\n\nSources code is hosted at GitHub: https://github.com/minres/SCViewer\n
 DesignBrowser_12=Append all after
 DesignBrowser_16=Insert all before
 DesignBrowser_2=Enter text to filter waveforms

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/Options.java

@@ -135,7 +135,6 @@ public class Options {
   private Prefix                               prefix              = null;
   private Multiplicity                         defaultMultiplicity = null;
   private String[]                             arguments           = null;
-  private boolean                              ignoreUnmatched     = false;
   private int                                  defaultMinData      = 0;
   private int                                  defaultMaxData      = 0;
   private StringBuffer                         checkErrors         = null;
@@ -634,6 +633,7 @@ public class Options {
         case ONCE:         if (optionData.getResultCount() != 1) err = true; break;
         case ONCE_OR_MORE: if (optionData.getResultCount() == 0) err = true; break;
         case ZERO_OR_ONE:  if (optionData.getResultCount() > 1)  err = true; break;
+        case ZERO_OR_MORE: break;
       }
 
       if (err) {

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java

@@ -133,7 +133,7 @@ public class AboutDialog extends Dialog {
 				// links are activated on mouse down when the control key is held down 
 //				if ((event.stateMask & SWT.MOD1) != 0) {
 					try {
-						int offset = ((StyledText)event.widget).getOffsetAtLocation(new Point (event.x, event.y));
+						int offset = ((StyledText)event.widget).getOffsetAtPoint(new Point (event.x, event.y));
 						StyleRange style = ((StyledText)event.widget).getStyleRangeAtOffset(offset);
 						if (style != null && style.underline && style.underlineStyle == SWT.UNDERLINE_LINK) {
 							Desktop.getDesktop().browse(new java.net.URI(style.data.toString()));

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

@@ -147,15 +147,15 @@ public class ResourceManager extends SWTResourceManager {
 			CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor() {
 				@Override
 				protected void drawCompositeImage(int width, int height) {
-					drawImage(baseImage.getImageData(), 0, 0);
+					drawImage(createCachedImageDataProvider(baseImage), 0, 0);
 					if (corner == TOP_LEFT) {
-						drawImage(decorator.getImageData(), 0, 0);
+						drawImage(createCachedImageDataProvider(decorator), 0, 0);
 					} else if (corner == TOP_RIGHT) {
-						drawImage(decorator.getImageData(), bib.width - dib.width, 0);
+						drawImage(createCachedImageDataProvider(decorator), bib.width - dib.width, 0);
 					} else if (corner == BOTTOM_LEFT) {
-						drawImage(decorator.getImageData(), 0, bib.height - dib.height);
+						drawImage(createCachedImageDataProvider(decorator), 0, bib.height - dib.height);
 					} else if (corner == BOTTOM_RIGHT) {
-						drawImage(decorator.getImageData(), bib.width - dib.width, bib.height - dib.height);
+						drawImage(createCachedImageDataProvider(decorator), bib.width - dib.width, bib.height - dib.height);
 					}
 				}
 				@Override

com.minres.scviewer.e4.product/pom.xml

@@ -6,11 +6,10 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
 		<relativePath>../com.minres.scviewer.parent</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>

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="1.3.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.0.0.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -33,7 +33,6 @@
       </win>
    </launcher>
 
-
    <vm>
    </vm>
 

com.minres.scviewer.parent/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.minres.scviewer</groupId>
 	<artifactId>com.minres.scviewer.parent</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>../com.minres.scviewer.target</module>

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

@@ -23,3 +23,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.common.collect
 Service-Component: OSGI-INF/component.xml
+Automatic-Module-Name: com.minres.scviewer.ui

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

@@ -347,12 +347,18 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage
 			addStreamToList(stream);
 	}
 
-	public void removeStreamFromList(IWaveform<? extends IWaveformEvent> obj){
+	public void removeStreamFromList(IWaveform<? extends IWaveformEvent> waveform){
-		if(getEditorInput() instanceof TxEditorInput && ((TxEditorInput) getEditorInput()).getStreamNames().contains(obj.getFullName())){
+		if(getEditorInput() instanceof TxEditorInput && ((TxEditorInput) getEditorInput()).getStreamNames().contains(waveform.getFullName())){
-			((TxEditorInput) getEditorInput()).getStreamNames().remove(obj.getFullName());
+			((TxEditorInput) getEditorInput()).getStreamNames().remove(waveform.getFullName());
-			txDisplay.getStreamList().remove(obj);
+		}
-		} else
+		TrackEntry entry=null;
-			txDisplay.getStreamList().remove(obj);
+		for(TrackEntry e:txDisplay.getStreamList()) {
+			if(e.waveform==waveform) {
+				entry=e;
+				break;
+			}
+		}
+		txDisplay.getStreamList().remove(entry);
 	}
 
 	public void removeStreamsFromList(IWaveform<? extends IWaveformEvent>[] iWaveforms){

com.opcoach.e4.preferences/META-INF/MANIFEST.MF

@@ -16,3 +16,4 @@ Require-Bundle: javax.inject,
 Export-Package: com.opcoach.e4.preferences,
  com.opcoach.e4.preferences.handlers
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: com.opcoach.e4.preferences