Merge branch 'hotfix/#29_cannot_delete_signals'

comparison of objects were done by idendity not .equals()

com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java

@@ -193,7 +193,7 @@ public class TxStream extends HierNode implements ITxStream<ITxEvent> {
 
 	@Override
 	public Boolean equals(IWaveform other) {
-		return(other instanceof TxStream && this.getId()==other.getId());
+		return(other instanceof TxStream && this.getId().equals(other.getId()));
 	}
 
 }

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SCViewer database tests
 Bundle-SymbolicName: com.minres.scviewer.database.test
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
 Bundle-Vendor: MINRES Technologies GnbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,

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

@@ -2,6 +2,7 @@
 	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.test</artifactId>
+	<version>1.0.1-SNAPSHOT</version>
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
@@ -27,5 +28,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<version>1.0.0-SNAPSHOT</version>
 </project>

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

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Textual transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.text
-Bundle-Version: 2.0.1.qualifier
+Bundle-Version: 2.0.2.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="1.3.0"

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

@@ -2,7 +2,7 @@
 	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.text</artifactId>
-	<version>2.0.1-SNAPSHOT</version>
+	<version>2.0.2-SNAPSHOT</version>
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>

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

@@ -117,7 +117,7 @@ public class VCDSignal<T> extends HierNode implements ISignal<T> {
 
 	@Override
 	public Boolean equals(IWaveform other) {
-		return(other instanceof VCDSignal<?> && this.getId()==other.getId());
+		return( other instanceof VCDSignal<?> && this.getId().equals(other.getId()));
 	}
 
 	@Override

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

@@ -140,7 +140,7 @@ public class WaveformDb extends HierNode implements IWaveformDb {
 						break;
 					}
 				}
-				if(name == hier[hier.length-1]){ //leaf
+				if(name.equals(hier[hier.length-1])){ //leaf
 					if(n1!=null) {
 						if(n1 instanceof HierNode){
 							node.getChildNodes().remove(n1);

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.1.4.qualifier
+Bundle-Version: 2.1.6.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
   org.eclipse.core.runtime;bundle-version="3.11.1",

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.1.4-SNAPSHOT</version>
+  <version>2.1.6-SNAPSHOT</version>
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>

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

@@ -9,6 +9,7 @@ public class Messages extends NLS {
 	public static String DesignBrowser_12;
 	public static String DesignBrowser_16;
 	public static String DesignBrowser_2;
+	public static String DesignBrowser_3;
 	public static String DesignBrowser_4;
 	public static String DesignBrowser_8;
 	public static String LoadingWaveformDb_0;

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

@@ -3,6 +3,7 @@ AboutDialog_1=\nCopyright (c) 2015, 2019 MINRES Technologies GmbH and others.\n\
 DesignBrowser_12=Append all after
 DesignBrowser_16=Insert all before
 DesignBrowser_2=Enter text to filter waveforms
+DesignBrowser_3=Enter text to filter hierarchy
 DesignBrowser_4=Append after
 DesignBrowser_8=Insert before
 LoadingWaveformDb_0=Database loading...

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

@@ -68,6 +68,7 @@ import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.wb.swt.ResourceManager;
 import org.eclipse.wb.swt.SWTResourceManager;
 
+import com.minres.scviewer.database.HierNode;
 import com.minres.scviewer.database.IHierNode;
 import com.minres.scviewer.database.ITx;
 import com.minres.scviewer.database.IWaveform;
@@ -110,8 +111,17 @@ public class DesignBrowser {
 	/** The tree viewer. */
 	private TreeViewer treeViewer;
 
+	/** The name filter of the design browser tree. */
+	private Text treeNameFilter;
+
+	/** The attribute filter. */
+	WaveformAttributeFilter treeAttributeFilter;
+
 	/** The name filter. */
-	private Text nameFilter;
+	private Text tableNameFilter;
+
+	/** The attribute filter. */
+	WaveformAttributeFilter tableAttributeFilter;
 
 	/** The tx table viewer. */
 	private TableViewer txTableViewer;
@@ -119,9 +129,6 @@ public class DesignBrowser {
 	/** The append all item. */
 	ToolItem appendItem, insertItem, insertAllItem, appendAllItem;
 
-	/** The attribute filter. */
-	WaveformAttributeFilter attributeFilter;
-
 	/** The other selection count. */
 	int thisSelectionCount=0, otherSelectionCount=0;
 
@@ -189,10 +196,25 @@ public class DesignBrowser {
 	 */
 	public void createTreeViewerComposite(Composite parent) {
 		parent.setLayout(new GridLayout(1, false));
+
+		treeNameFilter = new Text(parent, SWT.BORDER);
+		treeNameFilter.setMessage(Messages.DesignBrowser_3);
+		treeNameFilter.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent e) {
+				treeAttributeFilter.setSearchText(((Text) e.widget).getText());
+				treeViewer.refresh();
+			}
+		});
+		treeNameFilter.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+		treeAttributeFilter = new WaveformAttributeFilter();
+
 		treeViewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
 		treeViewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH));
 		treeViewer.setContentProvider(new TxDbContentProvider());
 		treeViewer.setLabelProvider(new TxDbLabelProvider());
+		treeViewer.addFilter(treeAttributeFilter);
 		treeViewer.setUseHashlookup(true);
 		treeViewer.setAutoExpandLevel(2);
 		treeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -223,25 +245,25 @@ public class DesignBrowser {
 	public void createTableComposite(Composite parent) {
 		parent.setLayout(new GridLayout(1, false));
 
-		nameFilter = new Text(parent, SWT.BORDER);
+		tableNameFilter = new Text(parent, SWT.BORDER);
-		nameFilter.setMessage(Messages.DesignBrowser_2);
+		tableNameFilter.setMessage(Messages.DesignBrowser_2);
-		nameFilter.addModifyListener(new ModifyListener() {
+		tableNameFilter.addModifyListener(new ModifyListener() {
 			@Override
 			public void modifyText(ModifyEvent e) {
-				attributeFilter.setSearchText(((Text) e.widget).getText());
+				tableAttributeFilter.setSearchText(((Text) e.widget).getText());
 				updateButtons();
 				txTableViewer.refresh();
 			}
 		});
-		nameFilter.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		tableNameFilter.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 
-		attributeFilter = new WaveformAttributeFilter();
+		tableAttributeFilter = new WaveformAttributeFilter();
 
 		txTableViewer = new TableViewer(parent);
 		txTableViewer.setContentProvider(new TxDbContentProvider(true));
 		txTableViewer.setLabelProvider(new TxDbLabelProvider());
 		txTableViewer.getTable().setLayoutData(new GridData(GridData.FILL_BOTH));
-		txTableViewer.addFilter(attributeFilter);
+		txTableViewer.addFilter(tableAttributeFilter);
 		txTableViewer.addDoubleClickListener(new IDoubleClickListener() {
 			@Override
 			public void doubleClick(DoubleClickEvent event) {
@@ -469,12 +491,24 @@ public class DesignBrowser {
 			if (searchString == null || searchString.length() == 0) {
 				return true;
 			}
-			IWaveform p = (IWaveform) element;
+			if(element instanceof IWaveform) {
-			try {
+				IWaveform p = (IWaveform) element;
-				if (p.getName().matches(searchString))
+				try {
+					if (p.getName().matches(searchString))
+						return true;
+				} catch (PatternSyntaxException e) {
 					return true;
-			} catch (PatternSyntaxException e) {
+				}
+			} else if(element instanceof IWaveformDb) {
 				return true;
+			} else if(element instanceof HierNode) {
+				HierNode n = (HierNode) element;
+				try {
+					if (n.getFullName().matches(searchString))
+						return true;
+				} catch (PatternSyntaxException e) {
+					return true;
+				}
 			}
 			return false;
 		}

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

@@ -669,12 +669,9 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 	 * @param persistedState the persisted state
 	 */
 	protected void saveWaveformViewerState(Map<String, String> persistedState) {
-		Integer index;
-		boolean isStream = false;
 		persistedState.put(SHOWN_WAVEFORM + "S", Integer.toString(waveformPane.getStreamList().size())); //$NON-NLS-1$
-		index = 0;
+		Integer index = 0;
 		for (TrackEntry trackEntry : waveformPane.getStreamList()) {
-			if(trackEntry.isStream()) { isStream=true; }
 			persistedState.put(SHOWN_WAVEFORM + index, trackEntry.waveform.getFullName());
 			persistedState.put(SHOWN_WAVEFORM + index + VALUE_DISPLAY, trackEntry.valueDisplay.toString());
 			persistedState.put(SHOWN_WAVEFORM + index + WAVE_DISPLAY, trackEntry.waveDisplay.toString());
@@ -693,23 +690,24 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis
 		
 		// get selected transaction	of a stream	
 		ISelection selection = waveformPane.getSelection();
-		if (!selection.isEmpty() && isStream) {
+		if (!selection.isEmpty()) {
 			List<Object> t = getISelection(selection);
-			ITx tx = (ITx) t.get(0);
+			if(t.get(0) instanceof ITx) {
-			TrackEntry te = (TrackEntry) t.get(1);
+				ITx tx = (ITx) t.get(0);
-			// get transaction id
+				TrackEntry te = (TrackEntry) t.get(1);
-			persistedState.put(SELECTED_TX_ID, Long.toString(tx.getId()));
+				// get transaction id
-			//get TrackEntry name
+				persistedState.put(SELECTED_TX_ID, Long.toString(tx.getId()));
-			String name = te.getStream().getFullName();
+				//get TrackEntry name
-			persistedState.put(SELECTED_TRACKENTRY_NAME, name);
+				String name = te.getStream().getFullName();
+				persistedState.put(SELECTED_TRACKENTRY_NAME, name);
+			}
 		}
 	}
 
 	protected List<Object> getISelection(ISelection selection){
 	    List<Object> result = new LinkedList<Object> ();
 
-	    if ( selection instanceof IStructuredSelection )
+	    if ( selection instanceof IStructuredSelection ) {
-	    {
 	        Iterator<?> i = ((IStructuredSelection)selection).iterator();
 	        while (i.hasNext()){
 	            Object o = i.next ();

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

@@ -10,7 +10,7 @@
 		<relativePath>../com.minres.scviewer.parent</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-  	<version>2.1.4-SNAPSHOT</version>
+  	<version>2.1.6-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="2.1.4.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.1.6.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>