From fb283ab668cb594d92f40a1832309eab27542f95 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Thu, 2 Apr 2020 14:13:39 +0200
Subject: [PATCH 01/15] change database interface

---
 .../com/minres/scviewer/database/leveldb/LevelDBLoader.java   | 2 +-
 .../com/minres/scviewer/database/sqlite/SQLiteDbLoader.java   | 2 +-
 .../src/com/minres/scviewer/database/text/TextDbLoader.groovy | 4 ++--
 .../src/com/minres/scviewer/database/vcd/VCDDbLoader.java     | 2 +-
 .../src/com/minres/scviewer/database/IWaveformDbLoader.java   | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/LevelDBLoader.java b/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/LevelDBLoader.java
index 8f7ee35..c5c844a 100644
--- a/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/LevelDBLoader.java
+++ b/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/LevelDBLoader.java
@@ -64,7 +64,7 @@ public class LevelDBLoader implements IWaveformDbLoader {
 	}
 
 	@Override
-	public List<IWaveform> getAllWaves() {
+	public Collection<IWaveform> getAllWaves() {
 		List<IWaveform> streams=new ArrayList<IWaveform>();
 		SeekingIterator<String, String> it = levelDb.iterator();
 		it.seek("s~");
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java b/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java
index d90f686..a1f2ac6 100644
--- a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java
+++ b/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java
@@ -61,7 +61,7 @@ public class SQLiteDbLoader implements IWaveformDbLoader {
 	}
 
 	@Override
-	public List<IWaveform> getAllWaves() {
+	public Collection<IWaveform> getAllWaves() {
 		SQLiteDatabaseSelectHandler<ScvStream> handler = new SQLiteDatabaseSelectHandler<ScvStream>(ScvStream.class, database);
 		List<IWaveform> streams=new ArrayList<IWaveform>();
 		try {
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
index 2ae1676..3b3a45a 100644
--- a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
+++ b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
@@ -50,8 +50,8 @@ public class TextDbLoader implements IWaveformDbLoader{
 	}
 
 	@Override
-	public List<IWaveform> getAllWaves() {
-		return new LinkedList<IWaveform>(streams);
+	public Collection<IWaveform> getAllWaves() {
+		return streams;
 	}
 
 	public Map<Long, ITxGenerator> getGeneratorsById() {
diff --git a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java b/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java
index a0f12db..fb7f474 100644
--- a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java
+++ b/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java
@@ -128,7 +128,7 @@ public class VCDDbLoader implements IWaveformDbLoader, IVCDDatabaseBuilder {
 	 * @see com.minres.scviewer.database.ITrDb#getAllWaves()
 	 */
 	@Override
-	public List<IWaveform> getAllWaves() {
+	public Collection<IWaveform> getAllWaves() {
 		return signals;
 	}
 
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbLoader.java b/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbLoader.java
index 16f897d..1ccba07 100644
--- a/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbLoader.java
+++ b/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbLoader.java
@@ -12,7 +12,6 @@ package com.minres.scviewer.database;
 
 import java.io.File;
 import java.util.Collection;
-import java.util.List;
 
 public interface IWaveformDbLoader {
 	
@@ -20,7 +19,7 @@ public interface IWaveformDbLoader {
 	
 	public Long getMaxTime();
 	
-	public List<IWaveform> getAllWaves() ;
+	public Collection<IWaveform> getAllWaves() ;
 	
 	public Collection<RelationType> getAllRelationTypes() ;
 	

From 20824e75c109114491dda4113220eabb7e2986a1 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Thu, 2 Apr 2020 14:15:01 +0200
Subject: [PATCH 02/15] remove fixed color assignment

---
 .../scviewer/database/ui/TrackEntry.java      | 31 ++++---------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/TrackEntry.java b/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/TrackEntry.java
index 534d4a9..3bc00a5 100644
--- a/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/TrackEntry.java
+++ b/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/TrackEntry.java
@@ -51,31 +51,12 @@ public class TrackEntry {
 				
 		result[0] = fallback;
 		result[1] = highlightedFallback;
-		
-		// assign colors to standard values
-		if (streamValue.contains("read")){
-			result[0] = new Color(86,174,53);
-			result[1] = new Color (86,194,53);
-		}else if (streamValue.contains("rdata")){
-			result[0] = new Color(138,151,71);
-			result[1] = new Color (138,171,71);
-		}else if (streamValue.contains("addr")){
-			result[0] = new Color(233,187,68);
-			result[1] = new Color (233,207,68);
-		}else if (streamValue.contains("write")){
-			result[0] = new Color(1,128,191);
-			result[1] = new Color (1,128,211);
-		}else if (streamValue.contains("wdata")){
-			result[0] = new Color(2,181,160);
-			result[1] = new Color (2,201,160);
-			
-		}else {
-			// assign "random" color here, one name always results in the same color!
-			if( randomColors.length > 0 ) {
-				int index = Math.abs(streamValue.hashCode()) % randomColors.length;
-				result[0] = randomColors[index][0];
-				result[1] = randomColors[index][1];
-			}
+
+		// assign "random" color here, one name always results in the same color!
+		if( streamValue!=null && randomColors.length > 0 ) {
+			int index = Math.abs(streamValue.hashCode()) % randomColors.length;
+			result[0] = randomColors[index][0];
+			result[1] = randomColors[index][1];
 		}
 		
 		return result;

From 8b84f1341bf6c6c2e42c3b778b2d70fcdaf47371 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Fri, 8 May 2020 08:38:43 +0200
Subject: [PATCH 03/15] add performance improvement fixes

---
 com.minres.scviewer.database.text/pom.xml     |  4 +-
 .../database/text/TextDbLoader.groovy         | 47 ++++++-------------
 com.minres.scviewer.parent/pom.xml            |  4 +-
 3 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/com.minres.scviewer.database.text/pom.xml b/com.minres.scviewer.database.text/pom.xml
index 24efc0c..c09a4f5 100644
--- a/com.minres.scviewer.database.text/pom.xml
+++ b/com.minres.scviewer.database.text/pom.xml
@@ -24,8 +24,8 @@
 			        </compilerArguments>
 					<!-- set verbose to be true if you want lots of uninteresting messages -->
 					<!-- <verbose>true</verbose> -->
-					<source>1.7</source>
-					<target>1.7</target>
+					<source>1.8</source>
+					<target>1.8</target>
 				</configuration>
 				<dependencies>
 					<dependency>
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
index 3b3a45a..6fd56d6 100644
--- a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
+++ b/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
@@ -83,7 +83,7 @@ public class TextDbLoader implements IWaveformDbLoader{
 				.make()
 				// NPE here --->
 				parseInput(gzipped?new GZIPInputStream(new FileInputStream(file)):new FileInputStream(file))
-				calculateConcurrencyIndicees()
+				streams.each{ TxStream  stream -> stream.getMaxConcurrency() }
 				return true
 			}
 		} catch (IndexOutOfBoundsException e) {
@@ -136,7 +136,7 @@ public class TextDbLoader implements IWaveformDbLoader{
 			case "ms":return 1000000000000L
 			case "s": return 1000000000000000L
 		}
-		return "fs"
+		return 1L
 	}
 	
 	private def parseInput(InputStream inputStream){
@@ -153,23 +153,29 @@ public class TextDbLoader implements IWaveformDbLoader{
 			def tokens = line.split(/\s+/) as ArrayList
 			switch(tokens[0]){
 				case "scv_tr_stream":
-				case "scv_tr_generator":
-				case "begin_attribute":
-				case "end_attribute":
 					if ((matcher = line =~ /^scv_tr_stream\s+\(ID (\d+),\s+name\s+"([^"]+)",\s+kind\s+"([^"]+)"\)$/)) {
 						def id = Integer.parseInt(matcher[0][1])
 						def stream = new TxStream(this, id, matcher[0][2], matcher[0][3])
 						streams<<stream
 						streamsById[id]=stream
-					} else if ((matcher = line =~ /^scv_tr_generator\s+\(ID\s+(\d+),\s+name\s+"([^"]+)",\s+scv_tr_stream\s+(\d+),$/)) {
+					}
+					break;
+				case "scv_tr_generator":
+					if ((matcher = line =~ /^scv_tr_generator\s+\(ID\s+(\d+),\s+name\s+"([^"]+)",\s+scv_tr_stream\s+(\d+),$/)) {
 						def id = Integer.parseInt(matcher[0][1])
 						ITxStream stream=streamsById[Integer.parseInt(matcher[0][3])]
 						generator=new TxGenerator(id, stream, matcher[0][2])
 						stream.generators<<generator
 						generatorsById[id]=generator
-					} else if ((matcher = line =~ /^begin_attribute \(ID (\d+), name "([^"]+)", type "([^"]+)"\)$/)) {
+					}
+					break;
+				case "begin_attribute":
+					if ((matcher = line =~ /^begin_attribute \(ID (\d+), name "([^"]+)", type "([^"]+)"\)$/)) {
 						generator.begin_attrs << TxAttributeType.getAttrType(matcher[0][2], DataType.valueOf(matcher[0][3]), AssociationType.BEGIN)
-					} else if ((matcher = line =~ /^end_attribute \(ID (\d+), name "([^"]+)", type "([^"]+)"\)$/)) {
+					}
+					break;
+				case "end_attribute":
+					if ((matcher = line =~ /^end_attribute \(ID (\d+), name "([^"]+)", type "([^"]+)"\)$/)) {
 						generator.end_attrs << TxAttributeType.getAttrType(matcher[0][2], DataType.valueOf(matcher[0][3]), AssociationType.END)
 					}
 					break;
@@ -228,31 +234,6 @@ public class TextDbLoader implements IWaveformDbLoader{
 		}
 	}
 
-	private def toDataType(String str){
-		switch (str)
-		{
-			case "BOOLEAN": return DataType.                       BOOLEAN                      
-			case "ENUMERATION": return DataType.                   ENUMERATION                  
-			case "INTEGER": return DataType.                       INTEGER                      
-			case "UNSIGNED": return DataType.                      UNSIGNED                     
-			case "FLOATING_POINT_NUMBER": return DataType.         FLOATING_POINT_NUMBER        
-			case "BIT_VECTOR": return DataType.                    BIT_VECTOR                   
-			case "LOGIC_VECTOR": return DataType.                  LOGIC_VECTOR                 
-			case "FIXED_POINT_INTEGER": return DataType.           FIXED_POINT_INTEGER          
-			case "UNSIGNED_FIXED_POINT_INTEGER": return DataType.  UNSIGNED_FIXED_POINT_INTEGER 
-			case "RECORD": return DataType.                        RECORD                       
-			case "POINTER": return DataType.                       POINTER                      
-			case "ARRAY": return DataType.                         ARRAY                        
-			case "STRING": return DataType.                        STRING
-			default: return DataType.INTEGER
-		}
-	}
-	
-	private def calculateConcurrencyIndicees(){
-		streams.each{ TxStream  stream -> stream.getMaxConcurrency() }
-	}
-
-
 	public Collection<RelationType> getAllRelationTypes(){
 		return relationTypes.values();
 	}
diff --git a/com.minres.scviewer.parent/pom.xml b/com.minres.scviewer.parent/pom.xml
index edd3538..42dec6e 100644
--- a/com.minres.scviewer.parent/pom.xml
+++ b/com.minres.scviewer.parent/pom.xml
@@ -24,8 +24,8 @@
 
 	<properties>
 		<tycho-version>1.5.0</tycho-version>
-		<groovy-eclipse-compiler-version>3.5.0</groovy-eclipse-compiler-version>
-		<groovy-eclipse-batch-version>2.5.8-03</groovy-eclipse-batch-version>
+		<groovy-eclipse-compiler-version>3.6.0-03</groovy-eclipse-compiler-version>
+		<groovy-eclipse-batch-version>3.0.3-01</groovy-eclipse-batch-version>
 	</properties>
 
 	<build>

From 077a6f801127e8f6704b59b7a504bfc58b1a6fd7 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Fri, 8 May 2020 09:53:36 +0200
Subject: [PATCH 04/15] update to Eclipse 2020-03 RCP base

---
 .../META-INF/MANIFEST.MF                      |   1 -
 .../.settings/org.eclipse.jdt.core.prefs      |   1 +
 .../.settings/org.eclipse.jdt.core.prefs      |   1 +
 .../DatabaseServicesTest.launch               | 144 ++++++++++++------
 .../META-INF/MANIFEST.MF                      |   1 -
 .../.settings/org.eclipse.jdt.core.prefs      |   1 +
 .../.settings/org.eclipse.jdt.core.prefs      |   1 +
 .../META-INF/MANIFEST.MF                      |   1 -
 .../.settings/org.eclipse.jdt.core.prefs      |   1 +
 .../.settings/org.eclipse.jdt.core.prefs      |   1 +
 .../META-INF/MANIFEST.MF                      |   1 -
 .../scviewer/e4/application/E4LifeCycle.java  |   1 -
 .../com.minres.scviewer.target.target         |  29 ++--
 .../.settings/org.eclipse.jdt.core.prefs      |   1 +
 14 files changed, 124 insertions(+), 61 deletions(-)

diff --git a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
index 7e68178..ff10c05 100644
--- a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Import-Package: org.osgi.framework;version="1.3.0"
 Automatic-Module-Name: com.minres.scviewer.database.leveldb
 Service-Component: OSGI-INF/*.xml
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0"
 Bundle-ActivationPolicy: lazy
diff --git a/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..9f6ece8 100644
--- a/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs
@@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs
index 6e80039..4e4a3ad 100644
--- a/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs
@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.database.test/DatabaseServicesTest.launch b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
index c44770d..f8e3594 100644
--- a/com.minres.scviewer.database.test/DatabaseServicesTest.launch
+++ b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
@@ -1,46 +1,104 @@
 <?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"/>
-<stringAttribute key="deselected_workspace_plugins" value="com.minres.scviewer.e4.application,com.minres.scviewer.ui"/>
-<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"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,org.apache.ant@default:default,org.apache.commons.jxpath@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.codehaus.groovy@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.hamcrest.core@default:default,org.junit@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.minres.scviewer.database.sqlite@default:true,com.minres.scviewer.database.test@default:default,com.minres.scviewer.database.text@default:true,com.minres.scviewer.database.ui.swt@default:default,com.minres.scviewer.database.ui@default:default,com.minres.scviewer.database.vcd@default:default,com.minres.scviewer.database@default:true,com.opcoach.e4.preferences@default:default"/>
-<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"/>
+    <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.database.text/META-INF/MANIFEST.MF b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
index 605975f..d073c7a 100644
--- a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="1.3.0"
 Require-Bundle: com.minres.scviewer.database,
  org.codehaus.groovy;bundle-version="2.5.8",
- org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"
diff --git a/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs
index ce96ddf..ddb046a 100644
--- a/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs
@@ -98,4 +98,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..9f6ece8 100644
--- a/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs
@@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
index 3f0cc56..f83fd29 100644
--- a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 2.0.2.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"
diff --git a/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs
index 6e80039..4e4a3ad 100644
--- a/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs
@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs
index a698e59..87b7a7a 100644
--- a/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs
@@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
index 21b1443..32d5ccc 100644
--- a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  com.minres.scviewer.database.ui,
  com.minres.scviewer.database;bundle-version="1.0.0",
  org.eclipse.equinox.ds;bundle-version="1.4.300",
- org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.osgi.services;bundle-version="3.5.0",
  org.eclipse.e4.core.services;bundle-version="2.0.0",
  org.eclipse.osgi.services;bundle-version="3.5.0",
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
index 7532fb8..310323a 100644
--- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
+++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
@@ -46,7 +46,6 @@ import com.minres.scviewer.e4.application.options.Options.Separator;
  * <em>org.eclipse.core.runtime.products' extension point</em>) that references
  * this class.
  **/
-@SuppressWarnings("restriction")
 public class E4LifeCycle {
 
 	/**
diff --git a/com.minres.scviewer.target/com.minres.scviewer.target.target b/com.minres.scviewer.target/com.minres.scviewer.target.target
index 4571d61..e7ffad1 100644
--- a/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -3,23 +3,26 @@
 <target name="com.minres.scviewer.target" sequenceNumber="138">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.executable.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"/>
-<unit id="org.eclipse.rcp.sdk.id" version="0.0.0"/>
-<unit id="org.eclipse.rcptt.core.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/photon"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.700.v20200207-2156"/>
+<unit id="org.eclipse.platform.sdk" version="4.15.0.I20200305-0155"/>
+<unit id="org.eclipse.sdk.feature.group" version="4.15.0.v20200305-0155"/>
+<unit id="org.eclipse.rcp.sdk.id" version="4.15.0.I20200305-0155"/>
+<unit id="org.eclipse.rcptt.core.feature.group" version="2.5.1.M3"/>
+<unit id="org.eclipse.e4.rcp.feature.group" version="4.15.0.v20200304-0601"/>
+<unit id="org.eclipse.platform.feature.group" version="4.15.0.v20200305-0155"/>
+<repository location="http://download.eclipse.org/releases/2020-03"/>
+	<unit id="org.eclipse.core.runtime.feature.feature.group" version="1.2.800.v20200214-1600"/>
+	<unit id="org.eclipse.equinox.sdk.feature.group" version="3.20.100.v20200303-1901"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.codehaus.groovy24.feature.feature.group" version="3.5.1.v201909291550-e48"/>
-<repository location="http://dist.springsource.org/snapshot/GRECLIPSE/e4.8/"/>
-	<unit id="org.codehaus.groovy25.feature.feature.group" version="3.5.1.v201909291550-e48"/>
+<unit id="org.codehaus.groovy24.feature.feature.group" version="0.0.0"/>
+<unit id="org.codehaus.groovy25.feature.feature.group" version="0.0.0"/>
+<unit id="org.codehaus.groovy30.feature.feature.group" version="0.0.0"/>
+<repository location="https://dist.springsource.org/release/GRECLIPSE/e4.15"/>
 </location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://www.opcoach.com/repository/2018-12"/>
-		<unit id="com.opcoach.e4.preferences.feature.feature.group" version="1.3.0.201903181741"/>
+		<repository location="https://www.opcoach.com/repository/2020-03"/>
+		<unit id="com.opcoach.e4.preferences.feature.feature.group" version="0.0.0"/>
 	</location>
 </locations>
 <environment>
diff --git a/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs
index a698e59..87b7a7a 100644
--- a/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs
@@ -9,4 +9,5 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

From f8a177c9e05a56857bcefc9d33d973938159ab59 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Fri, 8 May 2020 10:39:43 +0200
Subject: [PATCH 05/15] Revert "update to Eclipse 2020-03 RCP base"

This reverts commit 077a6f801127e8f6704b59b7a504bfc58b1a6fd7.
---
 .../META-INF/MANIFEST.MF                      |   1 +
 .../.settings/org.eclipse.jdt.core.prefs      |   1 -
 .../.settings/org.eclipse.jdt.core.prefs      |   1 -
 .../DatabaseServicesTest.launch               | 144 ++++++------------
 .../META-INF/MANIFEST.MF                      |   1 +
 .../.settings/org.eclipse.jdt.core.prefs      |   1 -
 .../.settings/org.eclipse.jdt.core.prefs      |   1 -
 .../META-INF/MANIFEST.MF                      |   1 +
 .../.settings/org.eclipse.jdt.core.prefs      |   1 -
 .../.settings/org.eclipse.jdt.core.prefs      |   1 -
 .../META-INF/MANIFEST.MF                      |   1 +
 .../scviewer/e4/application/E4LifeCycle.java  |   1 +
 .../com.minres.scviewer.target.target         |  29 ++--
 .../.settings/org.eclipse.jdt.core.prefs      |   1 -
 14 files changed, 61 insertions(+), 124 deletions(-)

diff --git a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
index ff10c05..7e68178 100644
--- a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
@@ -9,6 +9,7 @@ Import-Package: org.osgi.framework;version="1.3.0"
 Automatic-Module-Name: com.minres.scviewer.database.leveldb
 Service-Component: OSGI-INF/*.xml
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
+ org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0"
 Bundle-ActivationPolicy: lazy
diff --git a/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs
index 9f6ece8..0c68a61 100644
--- a/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs
@@ -4,5 +4,4 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs
index 4e4a3ad..6e80039 100644
--- a/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs
@@ -5,5 +5,4 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.database.test/DatabaseServicesTest.launch b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
index f8e3594..c44770d 100644
--- a/com.minres.scviewer.database.test/DatabaseServicesTest.launch
+++ b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
@@ -1,104 +1,46 @@
 <?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"/>
+<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"/>
+<stringAttribute key="deselected_workspace_plugins" value="com.minres.scviewer.e4.application,com.minres.scviewer.ui"/>
+<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"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,org.apache.ant@default:default,org.apache.commons.jxpath@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.codehaus.groovy@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.hamcrest.core@default:default,org.junit@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="com.minres.scviewer.database.sqlite@default:true,com.minres.scviewer.database.test@default:default,com.minres.scviewer.database.text@default:true,com.minres.scviewer.database.ui.swt@default:default,com.minres.scviewer.database.ui@default:default,com.minres.scviewer.database.vcd@default:default,com.minres.scviewer.database@default:true,com.opcoach.e4.preferences@default:default"/>
+<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.database.text/META-INF/MANIFEST.MF b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
index d073c7a..605975f 100644
--- a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
@@ -8,6 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="1.3.0"
 Require-Bundle: com.minres.scviewer.database,
  org.codehaus.groovy;bundle-version="2.5.8",
+ org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"
diff --git a/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs
index ddb046a..ce96ddf 100644
--- a/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs
@@ -98,5 +98,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs
index 9f6ece8..0c68a61 100644
--- a/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs
@@ -4,5 +4,4 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
index f83fd29..3f0cc56 100644
--- a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 2.0.2.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
+ org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"
diff --git a/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs
index 4e4a3ad..6e80039 100644
--- a/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs
@@ -5,5 +5,4 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs
index 87b7a7a..a698e59 100644
--- a/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs
@@ -9,5 +9,4 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
diff --git a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
index 32d5ccc..21b1443 100644
--- a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@@ -18,6 +18,7 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  com.minres.scviewer.database.ui,
  com.minres.scviewer.database;bundle-version="1.0.0",
  org.eclipse.equinox.ds;bundle-version="1.4.300",
+ org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.osgi.services;bundle-version="3.5.0",
  org.eclipse.e4.core.services;bundle-version="2.0.0",
  org.eclipse.osgi.services;bundle-version="3.5.0",
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
index 310323a..7532fb8 100644
--- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
+++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
@@ -46,6 +46,7 @@ import com.minres.scviewer.e4.application.options.Options.Separator;
  * <em>org.eclipse.core.runtime.products' extension point</em>) that references
  * this class.
  **/
+@SuppressWarnings("restriction")
 public class E4LifeCycle {
 
 	/**
diff --git a/com.minres.scviewer.target/com.minres.scviewer.target.target b/com.minres.scviewer.target/com.minres.scviewer.target.target
index e7ffad1..4571d61 100644
--- a/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -3,26 +3,23 @@
 <target name="com.minres.scviewer.target" sequenceNumber="138">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.700.v20200207-2156"/>
-<unit id="org.eclipse.platform.sdk" version="4.15.0.I20200305-0155"/>
-<unit id="org.eclipse.sdk.feature.group" version="4.15.0.v20200305-0155"/>
-<unit id="org.eclipse.rcp.sdk.id" version="4.15.0.I20200305-0155"/>
-<unit id="org.eclipse.rcptt.core.feature.group" version="2.5.1.M3"/>
-<unit id="org.eclipse.e4.rcp.feature.group" version="4.15.0.v20200304-0601"/>
-<unit id="org.eclipse.platform.feature.group" version="4.15.0.v20200305-0155"/>
-<repository location="http://download.eclipse.org/releases/2020-03"/>
-	<unit id="org.eclipse.core.runtime.feature.feature.group" version="1.2.800.v20200214-1600"/>
-	<unit id="org.eclipse.equinox.sdk.feature.group" version="3.20.100.v20200303-1901"/>
+<unit id="org.eclipse.equinox.executable.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"/>
+<unit id="org.eclipse.rcp.sdk.id" version="0.0.0"/>
+<unit id="org.eclipse.rcptt.core.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/photon"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.codehaus.groovy24.feature.feature.group" version="0.0.0"/>
-<unit id="org.codehaus.groovy25.feature.feature.group" version="0.0.0"/>
-<unit id="org.codehaus.groovy30.feature.feature.group" version="0.0.0"/>
-<repository location="https://dist.springsource.org/release/GRECLIPSE/e4.15"/>
+<unit id="org.codehaus.groovy24.feature.feature.group" version="3.5.1.v201909291550-e48"/>
+<repository location="http://dist.springsource.org/snapshot/GRECLIPSE/e4.8/"/>
+	<unit id="org.codehaus.groovy25.feature.feature.group" version="3.5.1.v201909291550-e48"/>
 </location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://www.opcoach.com/repository/2020-03"/>
-		<unit id="com.opcoach.e4.preferences.feature.feature.group" version="0.0.0"/>
+		<repository location="https://www.opcoach.com/repository/2018-12"/>
+		<unit id="com.opcoach.e4.preferences.feature.feature.group" version="1.3.0.201903181741"/>
 	</location>
 </locations>
 <environment>
diff --git a/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs
index 87b7a7a..a698e59 100644
--- a/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs
@@ -9,5 +9,4 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8

From 5fe8b261ecfb8099c9de00d02e7c3d7523fcdb8a Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Fri, 8 May 2020 12:44:06 +0200
Subject: [PATCH 06/15] fix reference to org.eclipse.equinox.util

---
 .../META-INF/MANIFEST.MF                           |  1 -
 .../META-INF/MANIFEST.MF                           |  1 -
 .../META-INF/MANIFEST.MF                           |  3 ++-
 .../META-INF/MANIFEST.MF                           |  1 -
 .../META-INF/MANIFEST.MF                           |  1 -
 com.minres.scviewer.feature/feature.xml            | 14 ++++++--------
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
index 7e68178..ff10c05 100644
--- a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Import-Package: org.osgi.framework;version="1.3.0"
 Automatic-Module-Name: com.minres.scviewer.database.leveldb
 Service-Component: OSGI-INF/*.xml
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0"
 Bundle-ActivationPolicy: lazy
diff --git a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
index 605975f..d073c7a 100644
--- a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="1.3.0"
 Require-Bundle: com.minres.scviewer.database,
  org.codehaus.groovy;bundle-version="2.5.8",
- org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"
diff --git a/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF b/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF
index 7895eed..91e16dc 100644
--- a/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF
@@ -7,5 +7,6 @@ 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
+ org.eclipse.jface,
+ org.eclipse.swt
 Automatic-Module-Name: com.minres.scviewer.database.ui
diff --git a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
index 3f0cc56..f83fd29 100644
--- a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 2.0.2.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"
diff --git a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
index 21b1443..32d5ccc 100644
--- a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  com.minres.scviewer.database.ui,
  com.minres.scviewer.database;bundle-version="1.0.0",
  org.eclipse.equinox.ds;bundle-version="1.4.300",
- org.eclipse.equinox.util;bundle-version="1.0.500",
  org.eclipse.osgi.services;bundle-version="3.5.0",
  org.eclipse.e4.core.services;bundle-version="2.0.0",
  org.eclipse.osgi.services;bundle-version="3.5.0",
diff --git a/com.minres.scviewer.feature/feature.xml b/com.minres.scviewer.feature/feature.xml
index 289e335..f32b411 100644
--- a/com.minres.scviewer.feature/feature.xml
+++ b/com.minres.scviewer.feature/feature.xml
@@ -30,11 +30,12 @@ http://www.eclipse.org/legal/epl-v10.html
 
    <requires>
       <import plugin="org.eclipse.equinox.ds" version="1.4.200" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.util" version="1.0.500" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi.services" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.codehaus.groovy" version="1.8.6" match="greaterOrEqual"/>
+      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi"/>
+      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="com.minres.scviewer.database.ui" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.runtime"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.jface.text"/>
@@ -43,15 +44,12 @@ http://www.eclipse.org/legal/epl-v10.html
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.views.properties.tabbed"/>
       <import plugin="org.eclipse.swt"/>
-      <import plugin="org.apache.ant"/>
-      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface"/>
-      <import plugin="org.junit"/>
       <import plugin="org.eclipse.swt" version="3.103.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.equinox.registry"/>
+      <import plugin="org.codehaus.groovy" version="2.5.8" match="greaterOrEqual"/>
+      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

From 150c404cdb9ab2cc25750e97b2d56edea6d784cf Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sat, 9 May 2020 12:50:28 +0200
Subject: [PATCH 07/15] fix #33

---
 .../DatabaseServicesTest.launch               | 144 ++++++++++++------
 .../META-INF/MANIFEST.MF                      |   2 +-
 com.minres.scviewer.e4.application/pom.xml    |   2 +-
 .../e4/application/messages.properties        |   2 +-
 .../e4/application/parts/DesignBrowser.java   |  14 +-
 .../application/parts/TransactionDetails.java |  70 +++++++--
 com.minres.scviewer.e4.product/pom.xml        |   2 +-
 .../scviewer.product                          |   4 +-
 8 files changed, 174 insertions(+), 66 deletions(-)

diff --git a/com.minres.scviewer.database.test/DatabaseServicesTest.launch b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
index c44770d..f8e3594 100644
--- a/com.minres.scviewer.database.test/DatabaseServicesTest.launch
+++ b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
@@ -1,46 +1,104 @@
 <?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"/>
-<stringAttribute key="deselected_workspace_plugins" value="com.minres.scviewer.e4.application,com.minres.scviewer.ui"/>
-<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"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,org.apache.ant@default:default,org.apache.commons.jxpath@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.codehaus.groovy@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.hamcrest.core@default:default,org.junit@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.minres.scviewer.database.sqlite@default:true,com.minres.scviewer.database.test@default:default,com.minres.scviewer.database.text@default:true,com.minres.scviewer.database.ui.swt@default:default,com.minres.scviewer.database.ui@default:default,com.minres.scviewer.database.vcd@default:default,com.minres.scviewer.database@default:true,com.opcoach.e4.preferences@default:default"/>
-<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"/>
+    <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.application/META-INF/MANIFEST.MF b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
index 32d5ccc..7fcaa46 100644
--- a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/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.5.0.qualifier
+Bundle-Version: 2.6.0.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/com.minres.scviewer.e4.application/pom.xml b/com.minres.scviewer.e4.application/pom.xml
index e94b70a..4ab7a62 100644
--- a/com.minres.scviewer.e4.application/pom.xml
+++ b/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.5.0-SNAPSHOT</version>
+  <version>2.6.0-SNAPSHOT</version>
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties
index bde69ab..ea3c33b 100644
--- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties
+++ b/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: {0}\n
-AboutDialog_1=\nCopyright (c) 2015, 2019 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.mapdb and org.sqlite JDBC driver\n\nSource code is hosted at https://git.minres.com/VP-Tools/SCViewer and the master branch is mirrored to GitHub: https://github.com/minres/SCViewer\n
+AboutDialog_1=\nCopyright (c) 2015, 2019, 2020 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.mapdb and org.sqlite JDBC driver\n\nSource code is hosted at https://git.minres.com/VP-Tools/SCViewer and the master branch is mirrored to GitHub: https://github.com/minres/SCViewer\n
 DesignBrowser_12=Append all after
 DesignBrowser_16=Insert all before
 DesignBrowser_2=Enter text to filter waveforms
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java
index e49a360..37be256 100644
--- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java
+++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java
@@ -328,13 +328,15 @@ public class DesignBrowser {
 	 */
 	@Focus
 	public void setFocus() {
-		txTableViewer.getTable().setFocus();
-		IStructuredSelection selection = (IStructuredSelection)txTableViewer.getSelection();
-		if(selection.size()==0){
-			appendItem.setEnabled(false);
+		if(txTableViewer!=null) {
+			txTableViewer.getTable().setFocus();
+			IStructuredSelection selection = (IStructuredSelection)txTableViewer.getSelection();
+			if(selection.size()==0){
+				appendItem.setEnabled(false);
+			}
+			selectionService.setSelection(selection);
+			thisSelectionCount=selection.toList().size();
 		}
-		selectionService.setSelection(selection);
-		thisSelectionCount=selection.toList().size();
 		updateButtons();
 	}
 	
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
index a562c1e..db80d80 100644
--- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
+++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
@@ -10,8 +10,14 @@
  *******************************************************************************/
 package com.minres.scviewer.e4.application.parts;
 
+import java.util.AbstractMap;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TreeMap;
 import java.util.Vector;
+import java.util.regex.PatternSyntaxException;
+import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -477,12 +483,19 @@ public class TransactionDetails {
 				return true;
 			}
 			if(element instanceof ITxAttribute){
-				return (((ITxAttribute) element).getName().toLowerCase().matches(searchString.toLowerCase())); 
+				try {
+					return (((ITxAttribute) element).getName().toLowerCase().matches(searchString.toLowerCase()));
+				} catch (PatternSyntaxException e) {
+					return true;
+				}
 			} 
 			if(element instanceof Object[]) {
-				return (((Object[])element)[0]).toString().toLowerCase().matches(searchString.toLowerCase());	
+				try {
+					return (((Object[])element)[0]).toString().toLowerCase().matches(searchString.toLowerCase());	
+				} catch (PatternSyntaxException e) {
+					return true;
+				}
 			}
-
 			return false;
 		}
 	}
@@ -490,11 +503,13 @@ public class TransactionDetails {
 	/**
 	 * The Enum Type.
 	 */
-	enum Type {/** The props. */
-		PROPS, /** The attrs. */
-		ATTRS, /** The in rel. */
-		IN_REL, /** The out rel. */
-		OUT_REL}
+	enum Type {
+		PROPS,  /** The props. */
+		ATTRS,  /** The attrs. */
+		IN_REL, /** The in rel. */ 
+		OUT_REL,/** The out rel. */
+		HIER
+		}
 
 	/**
 	 * The Class TreeNode.
@@ -507,6 +522,7 @@ public class TransactionDetails {
 		/** The element. */
 		public ITx element;
 
+		private String hier_path;
 		/**
 		 * Instantiates a new tree node.
 		 *
@@ -516,6 +532,13 @@ public class TransactionDetails {
 		public TreeNode(ITx element, Type type){
 			this.element=element;
 			this.type=type;
+			this.hier_path="";
+		}
+
+		public TreeNode(ITx element, String path){
+			this.element=element;
+			this.type=Type.HIER;
+			this.hier_path=path;
 		}
 
 		/* (non-Javadoc)
@@ -527,9 +550,33 @@ public class TransactionDetails {
 			case ATTRS:	     return Messages.TransactionDetails_11;
 			case IN_REL:     return Messages.TransactionDetails_12;
 			case OUT_REL:    return Messages.TransactionDetails_13;
+			case HIER:{
+				String[] tokens = hier_path.split("\\.");
+				return tokens[tokens.length-1];
+			}
 			}
 			return ""; //$NON-NLS-1$
 		}
+		
+		public Object[] getAttributeListForHier() {
+			if(childs==null) {
+				Map<String, Object> res = element.getAttributes().stream()
+				.filter(txAttr -> txAttr.getName().startsWith(hier_path))
+				.map(txAttr -> {
+					String target = hier_path.length()==0?txAttr.getName():txAttr.getName().replace(hier_path+'.', "");
+					String[] tokens = target.split("\\.");
+					if(tokens.length==1)
+						return new AbstractMap.SimpleEntry<>(tokens[0], txAttr);
+					else 
+						return new AbstractMap.SimpleEntry<>(tokens[0], new TreeNode(element, hier_path.length()>0?hier_path+"."+tokens[0]:tokens[0]));
+				})
+				.collect(Collectors.toMap(p -> p.getKey(), p -> p.getValue(), (first, second) -> first));
+				childs = new TreeMap<String, Object>(res).values().toArray();
+			}
+			return childs;
+		}
+		
+		private Object[] childs=null;
 	}
 
 	/**
@@ -577,8 +624,8 @@ public class TransactionDetails {
 						{Messages.TransactionDetails_19, Messages.TransactionDetails_20, timeToString(propertyHolder.element.getBeginTime())},
 						{Messages.TransactionDetails_21, Messages.TransactionDetails_20, timeToString(propertyHolder.element.getEndTime())}
 					};
-				}else if(propertyHolder.type == Type.ATTRS)
-					return propertyHolder.element.getAttributes().toArray();
+				}else if(propertyHolder.type == Type.ATTRS || propertyHolder.type == Type.HIER)
+					return propertyHolder.getAttributeListForHier();
 				else if(propertyHolder.type == Type.IN_REL){
 					Vector<Object[] > res = new Vector<>();
 					for(ITxRelation rel:propertyHolder.element.getIncomingRelations()){
@@ -655,7 +702,8 @@ public class TransactionDetails {
 			case NAME:
 				if (element instanceof ITxAttribute) {
 					ITxAttribute attribute = (ITxAttribute) element;
-					return new StyledString(attribute.getName());
+					String[] tokens = attribute.getName().split("\\.");
+					return new StyledString(tokens[tokens.length-1]);
 				}else if (element instanceof ITxRelation) {
 					return new StyledString(Messages.TransactionDetails_4);
 				}else if(element instanceof Object[]){
diff --git a/com.minres.scviewer.e4.product/pom.xml b/com.minres.scviewer.e4.product/pom.xml
index edb91a5..f87674d 100644
--- a/com.minres.scviewer.e4.product/pom.xml
+++ b/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.5.0-SNAPSHOT</version>
+  	<version>2.6.0-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 2d7cfdd..0e3f141 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.5.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.6.0.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -56,6 +56,7 @@
       <plugin id="com.minres.scviewer.database.vcd"/>
       <plugin id="com.minres.scviewer.e4.application"/>
       <plugin id="com.opcoach.e4.preferences"/>
+      <plugin id="com.opcoach.e4.preferences.mainmenu"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.inject"/>
       <plugin id="org.apache.batik.constants"/>
@@ -113,7 +114,6 @@
       <plugin id="org.eclipse.equinox.app"/>
       <plugin id="org.eclipse.equinox.common"/>
       <plugin id="org.eclipse.equinox.concurrent"/>
-      <plugin id="org.eclipse.equinox.ds"/>
       <plugin id="org.eclipse.equinox.event"/>
       <plugin id="org.eclipse.equinox.preferences"/>
       <plugin id="org.eclipse.equinox.registry"/>

From e5bcb25d243df6aab645b7cc4e9226cb5d94517e Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sat, 9 May 2020 14:20:29 +0200
Subject: [PATCH 08/15] update RCP to 2019-12

---
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../META-INF/MANIFEST.MF                      |  1 -
 .../META-INF/MANIFEST.MF                      |  1 -
 .../scviewer/e4/application/E4LifeCycle.java  |  1 -
 .../application/parts/TransactionDetails.java |  1 -
 .../scviewer.product                          |  8 ++--
 com.minres.scviewer.parent/pom.xml            | 20 +++++-----
 .../com.minres.scviewer.target.target         | 38 +++++++++----------
 .../minres/scviewer/ui/TxEditorPlugin.java    |  3 +-
 9 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
index d073c7a..80af2a0 100644
--- a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
@@ -7,8 +7,7 @@ Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.osgi.framework;version="1.3.0"
 Require-Bundle: com.minres.scviewer.database,
- org.codehaus.groovy;bundle-version="2.5.8",
- org.eclipse.equinox.ds;bundle-version="1.4.200",
+ org.codehaus.groovy;bundle-version="2.5.0",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"
 Service-Component: OSGI-INF/component.xml
diff --git a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
index f83fd29..15323ef 100644
--- a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
@@ -6,7 +6,6 @@ Bundle-Version: 2.0.2.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"
 Service-Component: OSGI-INF/component.xml
diff --git a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
index 7fcaa46..c96729f 100644
--- a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  com.minres.scviewer.database.ui.swt;bundle-version="1.0.0",
  com.minres.scviewer.database.ui,
  com.minres.scviewer.database;bundle-version="1.0.0",
- org.eclipse.equinox.ds;bundle-version="1.4.300",
  org.eclipse.osgi.services;bundle-version="3.5.0",
  org.eclipse.e4.core.services;bundle-version="2.0.0",
  org.eclipse.osgi.services;bundle-version="3.5.0",
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
index 7532fb8..310323a 100644
--- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
+++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
@@ -46,7 +46,6 @@ import com.minres.scviewer.e4.application.options.Options.Separator;
  * <em>org.eclipse.core.runtime.products' extension point</em>) that references
  * this class.
  **/
-@SuppressWarnings("restriction")
 public class E4LifeCycle {
 
 	/**
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
index db80d80..48118da 100644
--- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
+++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
@@ -12,7 +12,6 @@ package com.minres.scviewer.e4.application.parts;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.Vector;
diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product
index 0e3f141..ec29a85 100644
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/com.minres.scviewer.e4.product/scviewer.product
@@ -3,6 +3,7 @@
 
 <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="false" includeLaunchers="true">
 
+
    <configIni use="default">
    </configIni>
 
@@ -19,6 +20,7 @@
 
    <windowImages/>
 
+
    <launcher name="scviewer">
       <linux icon="icons/SCViewer_512x512.xpm"/>
       <macosx icon="icons/SCViewer.icns"/>
@@ -35,6 +37,7 @@
       </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>
@@ -78,7 +81,6 @@
       <plugin id="org.eclipse.core.expressions"/>
       <plugin id="org.eclipse.core.filesystem"/>
       <plugin id="org.eclipse.core.filesystem.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
       <plugin id="org.eclipse.core.filesystem.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.resources"/>
@@ -97,6 +99,7 @@
       <plugin id="org.eclipse.e4.ui.css.swt"/>
       <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
       <plugin id="org.eclipse.e4.ui.di"/>
+      <plugin id="org.eclipse.e4.ui.dialogs"/>
       <plugin id="org.eclipse.e4.ui.model.workbench"/>
       <plugin id="org.eclipse.e4.ui.services"/>
       <plugin id="org.eclipse.e4.ui.swt.gtk" fragment="true"/>
@@ -104,7 +107,6 @@
       <plugin id="org.eclipse.e4.ui.workbench"/>
       <plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
       <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" fragment="true"/>
       <plugin id="org.eclipse.e4.ui.workbench.swt"/>
       <plugin id="org.eclipse.e4.ui.workbench3"/>
       <plugin id="org.eclipse.emf.common"/>
@@ -117,7 +119,6 @@
       <plugin id="org.eclipse.equinox.event"/>
       <plugin id="org.eclipse.equinox.preferences"/>
       <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.util"/>
       <plugin id="org.eclipse.jface"/>
       <plugin id="org.eclipse.jface.databinding"/>
       <plugin id="org.eclipse.osgi"/>
@@ -147,6 +148,7 @@
    </preferencesInfo>
 
    <cssInfo>
+      <file path="/com.minres.scviewer.e4.application/css/default.css"/>
    </cssInfo>
 
 </product>
diff --git a/com.minres.scviewer.parent/pom.xml b/com.minres.scviewer.parent/pom.xml
index 42dec6e..e016903 100644
--- a/com.minres.scviewer.parent/pom.xml
+++ b/com.minres.scviewer.parent/pom.xml
@@ -86,21 +86,21 @@
 						</artifact>
 					</target>
 					<environments>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
+<!-- 						<environment> -->
+<!-- 							<os>linux</os> -->
+<!-- 							<ws>gtk</ws> -->
+<!-- 							<arch>x86</arch> -->
+<!-- 						</environment> -->
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
 							<arch>x86_64</arch>
 						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
+<!-- 						<environment> -->
+<!-- 							<os>win32</os> -->
+<!-- 							<ws>win32</ws> -->
+<!-- 							<arch>x86</arch> -->
+<!-- 						</environment> -->
 						<environment>
 							<os>win32</os>
 							<ws>win32</ws>
diff --git a/com.minres.scviewer.target/com.minres.scviewer.target.target b/com.minres.scviewer.target/com.minres.scviewer.target.target
index 4571d61..6b8700f 100644
--- a/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -2,32 +2,30 @@
 <?pde version="3.8"?>
 <target name="com.minres.scviewer.target" sequenceNumber="138">
 <locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.executable.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"/>
-<unit id="org.eclipse.rcp.sdk.id" version="0.0.0"/>
-<unit id="org.eclipse.rcptt.core.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/photon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.codehaus.groovy24.feature.feature.group" version="3.5.1.v201909291550-e48"/>
-<repository location="http://dist.springsource.org/snapshot/GRECLIPSE/e4.8/"/>
-	<unit id="org.codehaus.groovy25.feature.feature.group" version="3.5.1.v201909291550-e48"/>
-</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://www.opcoach.com/repository/2018-12"/>
-		<unit id="com.opcoach.e4.preferences.feature.feature.group" version="1.3.0.201903181741"/>
+		<repository location="http://download.eclipse.org/releases/2019-12/"/>
+		<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+		<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.rcptt.core.feature.group" version="0.0.0"/><!-- com.google.guave-->
+	</location>
+	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<repository location="https://www.opcoach.com/repository/2019-12/"/>
+		<unit id="com.opcoach.e4.preferences.feature.feature.group" version="0.0.0"/>
+	</location>
+	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<repository location="http://dist.springsource.org/snapshot/GRECLIPSE/e4.14/"/>
+		<unit id="org.codehaus.groovy25.feature.feature.group" version="3.8.0.v202005090048-e1912"/>
 	</location>
 </locations>
 <environment>
-<arch>x86_64</arch>
-<nl>de_DE</nl>
+	<arch>x86_64</arch>
+	<nl>de_DE</nl>
 </environment>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 7 [1.7.0_45]"/>
 <launcherArgs>
-<vmArgs>-Dosgi.requiredJavaVersion=1.6 -XstartOnFirstThread  -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/Eclipse.icns -Xms40m -Xmx2G</vmArgs>
+	<vmArgs>-Dosgi.requiredJavaVersion=1.6 -XstartOnFirstThread  -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/Eclipse.icns -Xms40m -Xmx2G</vmArgs>
 </launcherArgs>
 </target>
\ No newline at end of file
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java
index bd14536..8550cd2 100644
--- a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java
+++ b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java
@@ -15,6 +15,7 @@ import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
@@ -93,7 +94,7 @@ public class TxEditorPlugin extends AbstractUIPlugin {
 	 */
 	public static ImageDescriptor getImageDescriptor(String path) {
 		String fullpath = File.separator+"res"+File.separator+"images"+File.separator+path;
-		return imageDescriptorFromPlugin(PLUGIN_ID, fullpath);
+		return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, fullpath).orElse(null);
 	}
 	
 	public static Image createImage(String name) {

From 572e999a5b0498c96964605b37fcdd9d6d2af344 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Mon, 1 Jun 2020 11:10:07 +0200
Subject: [PATCH 09/15] remove version constraint on groovy bundle

---
 com.minres.scviewer.target/com.minres.scviewer.target.target | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/com.minres.scviewer.target/com.minres.scviewer.target.target b/com.minres.scviewer.target/com.minres.scviewer.target.target
index 6b8700f..32faf2d 100644
--- a/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -17,7 +17,7 @@
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 		<repository location="http://dist.springsource.org/snapshot/GRECLIPSE/e4.14/"/>
-		<unit id="org.codehaus.groovy25.feature.feature.group" version="3.8.0.v202005090048-e1912"/>
+		<unit id="org.codehaus.groovy25.feature.feature.group" version="0.0.0"/>
 	</location>
 </locations>
 <environment>

From 4ab3000b699a8ebf45eb5b5c99843b8ad124ee66 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Mon, 1 Jun 2020 12:06:33 +0200
Subject: [PATCH 10/15] fix left-overs

---
 com.minres.scviewer.e4.product/scviewer.product           | 1 -
 .../com.minres.scviewer.target.target                     | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product
index ec29a85..008d29c 100644
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/com.minres.scviewer.e4.product/scviewer.product
@@ -139,7 +139,6 @@
    <configurations>
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
    </configurations>
 
diff --git a/com.minres.scviewer.target/com.minres.scviewer.target.target b/com.minres.scviewer.target/com.minres.scviewer.target.target
index 32faf2d..c2d147a 100644
--- a/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -20,12 +20,8 @@
 		<unit id="org.codehaus.groovy25.feature.feature.group" version="0.0.0"/>
 	</location>
 </locations>
-<environment>
-	<arch>x86_64</arch>
-	<nl>de_DE</nl>
-</environment>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 7 [1.7.0_45]"/>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <launcherArgs>
-	<vmArgs>-Dosgi.requiredJavaVersion=1.6 -XstartOnFirstThread  -Dorg.eclipse.swt.internal.carbon.smallFonts -Xdock:icon=../Resources/Eclipse.icns -Xms40m -Xmx2G</vmArgs>
+	<vmArgs>-Xms40m -Xmx2G</vmArgs>
 </launcherArgs>
 </target>
\ No newline at end of file

From ad80671dd23393d0bcb0bfb237f36a06a8d49110 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Mon, 1 Jun 2020 12:38:51 +0200
Subject: [PATCH 11/15] fxi start issues

---
 .../scviewer.product                          | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product
index 008d29c..3fc9e81 100644
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/com.minres.scviewer.e4.product/scviewer.product
@@ -3,24 +3,17 @@
 
 <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="false" includeLaunchers="true">
 
-
    <configIni use="default">
    </configIni>
 
    <launcherArgs>
-      <programArgs>-clearPersistedState
-      </programArgs>
-      <vmArgs>-Xmx2G
--Dosgi.instance.area=@user.home/.scviewer
--Dosgi.instance.area.default=@user.home/.scviewer
-      </vmArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-      </vmArgsMac>
+      <programArgs>-clearPersistedState</programArgs>
+      <vmArgs>-Xmx2G -Dosgi.instance.area=@user.home/.scviewer -Dosgi.instance.area.default=@user.home/.scviewer</vmArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
 
    <windowImages/>
 
-
    <launcher name="scviewer">
       <linux icon="icons/SCViewer_512x512.xpm"/>
       <macosx icon="icons/SCViewer.icns"/>
@@ -37,7 +30,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>
@@ -118,7 +110,11 @@
       <plugin id="org.eclipse.equinox.concurrent"/>
       <plugin id="org.eclipse.equinox.event"/>
       <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.region" fragment="true"/>
       <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.equinox.transforms.hook" fragment="true"/>
+      <plugin id="org.eclipse.equinox.weaving.hook" fragment="true"/>
+      <plugin id="org.eclipse.help"/>
       <plugin id="org.eclipse.jface"/>
       <plugin id="org.eclipse.jface.databinding"/>
       <plugin id="org.eclipse.osgi"/>
@@ -130,6 +126,7 @@
       <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
       <plugin id="org.eclipse.swt.win32.win32.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.ui.workbench"/>
       <plugin id="org.w3c.css.sac"/>
       <plugin id="org.w3c.dom.events"/>
       <plugin id="org.w3c.dom.smil"/>
@@ -137,9 +134,11 @@
    </plugins>
 
    <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
    </configurations>
 
    <preferencesInfo>

From 3e5ab7b0ac8e5dcbf002975ad7a4fc9dab5d41c6 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sat, 9 May 2020 14:27:27 +0200
Subject: [PATCH 12/15] cleanup use of org.equinox.ds

---
 .../META-INF/MANIFEST.MF                                 | 1 -
 .../DatabaseServicesTest.launch                          | 1 -
 com.minres.scviewer.database.test/pom.xml                | 9 ---------
 com.minres.scviewer.feature/feature.xml                  | 1 -
 4 files changed, 12 deletions(-)

diff --git a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
index ff10c05..e073c5b 100644
--- a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@ Import-Package: org.osgi.framework;version="1.3.0"
 Automatic-Module-Name: com.minres.scviewer.database.leveldb
 Service-Component: OSGI-INF/*.xml
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- org.eclipse.equinox.ds;bundle-version="1.4.200",
  org.eclipse.osgi.services;bundle-version="3.4.0"
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: leveldb-0.11-SNAPSHOT-uber.jar,
diff --git a/com.minres.scviewer.database.test/DatabaseServicesTest.launch b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
index f8e3594..4937b10 100644
--- a/com.minres.scviewer.database.test/DatabaseServicesTest.launch
+++ b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
@@ -72,7 +72,6 @@
         <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"/>
diff --git a/com.minres.scviewer.database.test/pom.xml b/com.minres.scviewer.database.test/pom.xml
index 37e3094..98726df 100644
--- a/com.minres.scviewer.database.test/pom.xml
+++ b/com.minres.scviewer.database.test/pom.xml
@@ -16,15 +16,6 @@
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tycho-version}</version>
-				<configuration>
-<!-- 					<bundleStartLevel /> -->
-					<dependencies>
-						<dependency>
-							<type>p2-installable-unit</type>
-							<artifactId>org.eclipse.equinox.ds</artifactId>
-						</dependency>
-					</dependencies>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/com.minres.scviewer.feature/feature.xml b/com.minres.scviewer.feature/feature.xml
index f32b411..bebca53 100644
--- a/com.minres.scviewer.feature/feature.xml
+++ b/com.minres.scviewer.feature/feature.xml
@@ -29,7 +29,6 @@ http://www.eclipse.org/legal/epl-v10.html
    </url>
 
    <requires>
-      <import plugin="org.eclipse.equinox.ds" version="1.4.200" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi.services" version="3.4.0" match="greaterOrEqual"/>
       <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi"/>

From 97693cd0c442ec5a44a61fdac2e4f9b5bd75e7b8 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Mon, 1 Jun 2020 17:26:56 +0200
Subject: [PATCH 13/15] [WIP ]reorganized dir structure

---
 com.minres.scviewer.e4.product/pom.xml        |   2 +-
 com.minres.scviewer.parent/.gitignore         |   1 -
 com.minres.scviewer.parent/.project           |  17 -
 .../com.minres.scviewer.target.target         |   6 +-
 com.minres.scviewer.target/pom.xml            |   4 +-
 .../.settings/org.eclipse.m2e.core.prefs      |   4 -
 .../internal/E4PreferenceRegistry.java        | 325 ------------------
 .../com.minres.scviewer.feature}/.gitignore   |   0
 .../com.minres.scviewer.feature}/.project     |   0
 .../.settings/org.eclipse.m2e.core.prefs      |   0
 .../build.properties                          |   0
 .../feature.properties                        |   0
 .../com.minres.scviewer.feature}/feature.xml  |   0
 .../com.minres.scviewer.feature}/pom.xml      |   4 +-
 .../.gitignore                                |   0
 .../com.minres.scviewer.updateSite}/.project  |   0
 .../.settings/org.eclipse.m2e.core.prefs      |   0
 .../category.xml                              |   0
 .../com.minres.scviewer.updateSite}/pom.xml   |   2 +-
 .../src/main/resources/index.html             |   0
 .../src/main/resources/web/site.css           |   0
 .../src/main/resources/web/site.xsl           |   0
 .../.classpath                                |   0
 .../.gitignore                                |   0
 .../.project                                  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.pde.core.prefs      |   0
 .../org.eclipse.pde.ds.annotations.prefs      |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/component.xml                    |   0
 .../build.properties                          |   0
 .../json-20180813-sources.jar                 | Bin
 .../json-20180813.jar                         | Bin
 .../leveldb-0.11-SNAPSHOT-sources.jar         | Bin
 .../leveldb-0.11-SNAPSHOT-uber.jar            | Bin
 .../pom.xml                                   |   4 +-
 .../database/leveldb/LevelDBLoader.java       |   0
 .../database/leveldb/StringDbIterator.java    |   0
 .../minres/scviewer/database/leveldb/Tx.java  |   0
 .../database/leveldb/TxAttribute.java         |   0
 .../database/leveldb/TxDBWrapper.java         |   0
 .../scviewer/database/leveldb/TxEvent.java    |   0
 .../database/leveldb/TxGenerator.java         |   0
 .../scviewer/database/leveldb/TxRelation.java |   0
 .../scviewer/database/leveldb/TxStream.java   |   0
 .../.classpath                                |   0
 .../.gitignore                                |   0
 .../.project                                  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.m2e.core.prefs      |   0
 .../.settings/org.eclipse.pde.core.prefs      |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/component.xml                    |   0
 .../build.properties                          |   0
 .../pom.xml                                   |   4 +-
 .../sqlite-jdbc-3.8.7.jar                     | Bin
 .../database/sqlite/SQLiteDbLoader.java       |   0
 .../minres/scviewer/database/sqlite/Tx.java   |   0
 .../scviewer/database/sqlite/TxAttribute.java |   0
 .../scviewer/database/sqlite/TxEvent.java     |   0
 .../scviewer/database/sqlite/TxGenerator.java |   0
 .../scviewer/database/sqlite/TxRelation.java  |   0
 .../scviewer/database/sqlite/TxStream.java    |   0
 .../sqlite/db/AbstractDatabaseHandler.java    |   0
 .../database/sqlite/db/IDatabase.java         |   0
 .../database/sqlite/db/SQLiteDatabase.java    |   0
 .../db/SQLiteDatabaseInsertHandler.java       |   0
 .../db/SQLiteDatabaseSelectHandler.java       |   0
 .../database/sqlite/tables/ScvGenerator.java  |   0
 .../database/sqlite/tables/ScvSimProps.java   |   0
 .../database/sqlite/tables/ScvStream.java     |   0
 .../database/sqlite/tables/ScvTx.java         |   0
 .../sqlite/tables/ScvTxAttribute.java         |   0
 .../database/sqlite/tables/ScvTxEvent.java    |   0
 .../database/sqlite/tables/ScvTxRelation.java |   0
 .../.classpath                                |   0
 .../.gitignore                                |   0
 .../.project                                  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../org.eclipse.jdt.groovy.core.prefs         |   0
 .../.settings/org.eclipse.m2e.core.prefs      |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/component.xml                    |   0
 .../build.properties                          |   0
 .../lib/eclipse-collections-9.2.0.jar         | Bin
 .../lib/eclipse-collections-api-9.2.0.jar     | Bin
 .../eclipse-collections-forkjoin-9.2.0.jar    | Bin
 .../lib/elsa-3.0.0-M5.jar                     | Bin
 .../lib/kotlin-stdlib-1.2.42.jar              | Bin
 .../lib/lz4-1.3.0.jar                         | Bin
 .../lib/mapdb-3.0.7-javadoc.jar               | Bin
 .../lib/mapdb-3.0.7-sources.jar               | Bin
 .../lib/mapdb-3.0.7.jar                       | Bin
 .../pom.xml                                   |   4 +-
 .../database/text/TextDbLoader.groovy         |   0
 .../minres/scviewer/database/text/Tx.groovy   |   0
 .../scviewer/database/text/TxAttribute.groovy |   0
 .../database/text/TxAttributeType.groovy      |   0
 .../text/TxAttributeTypeFactory.groovy        |   0
 .../scviewer/database/text/TxEvent.groovy     |   0
 .../scviewer/database/text/TxGenerator.groovy |   0
 .../scviewer/database/text/TxRelation.groovy  |   0
 .../scviewer/database/text/TxStream.groovy    |   0
 .../.classpath                                |   0
 .../.gitignore                                |   0
 .../.project                                  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.m2e.core.prefs      |   0
 .../.settings/org.eclipse.pde.core.prefs      |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../build.properties                          |   0
 .../pom.xml                                   |   4 +-
 .../scviewer/database/swt/Constants.java      |   0
 .../database/swt/DatabaseUiPlugin.java        |   0
 .../database/swt/ToolTipContentProvider.java  |   0
 .../database/swt/ToolTipHelpTextProvider.java |   0
 .../database/swt/WaveformViewerFactory.java   |   0
 .../database/swt/internal/ArrowPainter.java   |   0
 .../database/swt/internal/CursorPainter.java  |   0
 .../database/swt/internal/IPainter.java       |   0
 .../swt/internal/IWaveformPainter.java        |   0
 .../database/swt/internal/ObservableList.java |   0
 .../swt/internal/RelSelectionDialog.java      |   0
 .../database/swt/internal/RulerPainter.java   |   0
 .../database/swt/internal/SignalPainter.java  |   0
 .../database/swt/internal/StreamPainter.java  |   0
 .../database/swt/internal/ToolTipHandler.java |   0
 .../swt/internal/TrackAreaPainter.java        |   0
 .../database/swt/internal/TrackPainter.java   |   0
 .../database/swt/internal/WaveformCanvas.java |   0
 .../database/swt/internal/WaveformViewer.java |   0
 .../eclipse/wb/swt/SWTResourceManager.java    |   0
 .../.classpath                                |   0
 .../.gitignore                                |   0
 .../com.minres.scviewer.database.ui}/.project |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.pde.core.prefs      |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../build.properties                          |   0
 .../com.minres.scviewer.database.ui}/pom.xml  |   4 +-
 .../scviewer/database/ui/GotoDirection.java   |   0
 .../minres/scviewer/database/ui/ICursor.java  |   0
 .../scviewer/database/ui/IWaveformViewer.java |   0
 .../database/ui/IWaveformViewerFactory.java   |   0
 .../scviewer/database/ui/TrackEntry.java      |   0
 .../scviewer/database/ui/WaveformColors.java  |   0
 .../.classpath                                |   0
 .../.gitignore                                |   0
 .../.project                                  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.m2e.core.prefs      |   0
 .../.settings/org.eclipse.pde.core.prefs      |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/component.xml                    |   0
 .../build.properties                          |   0
 .../com.minres.scviewer.database.vcd}/pom.xml |   4 +-
 .../database/vcd/IVCDDatabaseBuilder.java     |   0
 .../scviewer/database/vcd/VCDDbLoader.java    |   0
 .../scviewer/database/vcd/VCDFileParser.java  |   0
 .../scviewer/database/vcd/VCDSignal.java      |   0
 .../com.minres.scviewer.database}/.classpath  |   0
 .../com.minres.scviewer.database}/.gitignore  |   0
 .../com.minres.scviewer.database}/.project    |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.m2e.core.prefs      |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/component.xml                    |   0
 .../OSGI-INF/component2.xml                   |   0
 .../build.properties                          |   0
 .../com.minres.scviewer.database}/pom.xml     |   4 +-
 .../scviewer/database/AssociationType.java    |   0
 .../minres/scviewer/database/BitValue.java    |   0
 .../minres/scviewer/database/BitVector.java   |   0
 .../minres/scviewer/database/DataType.java    |   0
 .../minres/scviewer/database/HierNode.java    |   0
 .../minres/scviewer/database/IHierNode.java   |   0
 .../com/minres/scviewer/database/ISignal.java |   0
 .../src/com/minres/scviewer/database/ITx.java |   0
 .../scviewer/database/ITxAttribute.java       |   0
 .../scviewer/database/ITxAttributeType.java   |   0
 .../minres/scviewer/database/ITxEvent.java    |   0
 .../scviewer/database/ITxGenerator.java       |   0
 .../minres/scviewer/database/ITxRelation.java |   0
 .../minres/scviewer/database/ITxStream.java   |   0
 .../minres/scviewer/database/IWaveform.java   |   0
 .../minres/scviewer/database/IWaveformDb.java |   0
 .../scviewer/database/IWaveformDbFactory.java |   0
 .../scviewer/database/IWaveformDbLoader.java  |   0
 .../scviewer/database/IWaveformEvent.java     |   0
 .../database/InputFormatException.java        |   0
 .../scviewer/database/RelationType.java       |   0
 .../database/internal/WaveformDb.java         |   0
 .../database/internal/WaveformDbFactory.java  |   0
 .../.classpath                                |   0
 .../.gitignore                                |   0
 .../.project                                  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../org.eclipse.ltk.core.refactoring.prefs    |   0
 .../.settings/org.eclipse.m2e.core.prefs      |   0
 .../.settings/org.eclipse.pde.core.prefs      |   0
 .../Application.e4xmi                         |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/l10n/bundle.properties           |   0
 .../SilkCompanion1.txt                        |   0
 .../build.properties                          |   0
 .../css/default.css                           |   0
 .../famfamfam_silk_icons_v013.txt             |   0
 .../icons/Minres_logo.png                     | Bin
 .../icons/SCViewer_logo.png                   | Bin
 .../icons/append_all_waves.png                | Bin
 .../icons/append_wave.png                     | Bin
 .../icons/arrow_up.png                        | Bin
 .../icons/bullet_plus.png                     | Bin
 .../icons/cross.png                           | Bin
 .../icons/database.png                        | Bin
 .../icons/database_go.png                     | Bin
 .../icons/down_blue.png                       | Bin
 .../icons/empty.png                           | Bin
 .../icons/folder.png                          | Bin
 .../icons/folder_database.png                 | Bin
 .../icons/folder_page.png                     | Bin
 .../icons/insert_all_waves.png                | Bin
 .../icons/insert_wave.png                     | Bin
 .../icons/lightbulb.png                       | Bin
 .../icons/magifier_zoom_out.png               | Bin
 .../icons/magnifier.png                       | Bin
 .../icons/magnifier_zoom_in.png               | Bin
 .../icons/page_white.png                      | Bin
 .../icons/play_blue.png                       | Bin
 .../icons/play_green.png                      | Bin
 .../icons/reverse_blue.png                    | Bin
 .../icons/reverse_green.png                   | Bin
 .../icons/save_edit.png                       | Bin
 .../icons/script_save.png                     | Bin
 .../icons/scviewer.png                        | Bin
 .../icons/signal.png                          | Bin
 .../icons/stream.png                          | Bin
 .../icons/tick.png                            | Bin
 .../icons/trash.png                           | Bin
 .../icons/up_blue.png                         | Bin
 .../icons/wave.png                            | Bin
 .../icons/zoom.png                            | Bin
 .../icons/zoom_in.png                         | Bin
 .../icons/zoom_out.png                        | Bin
 .../plugin.xml                                |   0
 .../pom.xml                                   |   4 +-
 .../scviewer/e4/application/AppModelId.java   |   0
 .../scviewer/e4/application/E4LifeCycle.java  |   0
 .../scviewer/e4/application/Messages.java     |   0
 .../elements/NavigateToolbarContribution.java |   0
 .../elements/RelationTypeToolControl.java     |   0
 .../WaveformPopupMenuContribution.java        |   0
 .../e4/application/handlers/AboutHandler.java |   0
 .../handlers/AddWaveformHandler.java          |   0
 .../handlers/ChangeValueDisplay.java          |   0
 .../handlers/ChangeWaveformDisplay.java       |   0
 .../handlers/DeleteWaveformHandler.java       |   0
 .../e4/application/handlers/EnableHover.java  |   0
 .../handlers/LoadStoreSettingsHandler.java    |   0
 .../handlers/MoveWaveformHandler.java         |   0
 .../application/handlers/NavigateEvent.java   |   0
 .../application/handlers/NavigateTrans.java   |   0
 .../e4/application/handlers/OpenHandler.java  |   0
 .../e4/application/handlers/QuitHandler.java  |   0
 .../e4/application/handlers/SaveHandler.java  |   0
 .../handlers/SelectAllHandler.java            |   0
 .../handlers/SetRelationTypeHandler.java      |   0
 .../application/handlers/ThemeSetHandler.java |   0
 .../e4/application/handlers/ZoomHandler.java  |   0
 .../internal/status/HeapStatus.java           |   0
 .../internal/status/IHeapStatusConstants.java |   0
 .../internal/status/StatusBarControl.java     |   0
 .../application/internal/status/TrimUtil.java |   0
 .../internal/status/WaveStatusBarControl.java |   0
 .../internal/util/FileMonitor.java            |   0
 .../internal/util/IFileChangeListener.java    |   0
 .../internal/util/IModificationChecker.java   |   0
 .../e4/application/messages.properties        |   0
 .../e4/application/options/OptionData.java    |   0
 .../e4/application/options/OptionSet.java     |   0
 .../e4/application/options/Options.java       |   0
 .../e4/application/parts/AboutDialog.java     |   0
 .../e4/application/parts/DesignBrowser.java   |   0
 .../application/parts/FileBrowserDialog.java  |   0
 .../application/parts/LoadingWaveformDb.java  |   0
 .../e4/application/parts/PartListener.java    |   0
 .../application/parts/TransactionDetails.java |   0
 .../e4/application/parts/WaveformViewer.java  |   0
 .../preferences/DefaultValuesInitializer.java |   0
 .../preferences/PreferenceConstants.java      |   0
 .../preferences/PreferencesStoreProvider.java |   0
 .../preferences/SCViewerPreferencesPage.java  |   0
 .../preferences/WaveformPreferencesPage.java  |   0
 .../provider/TxDbContentProvider.java         |   0
 .../provider/TxDbLabelProvider.java           |   0
 .../provider/TxPropertiesContentProvider.java |   0
 .../provider/TxPropertiesLabelProvider.java   |   0
 .../org/eclipse/wb/swt/ResourceManager.java   |   0
 .../eclipse/wb/swt/SWTResourceManager.java    |   0
 .../com.minres.scviewer.ui}/.classpath        |   0
 .../com.minres.scviewer.ui}/.gitignore        |   0
 .../com.minres.scviewer.ui}/.project          |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../org.eclipse.jdt.groovy.core.prefs         |   0
 .../.settings/org.eclipse.m2e.core.prefs      |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/component.xml                    |   0
 .../SilkCompanion1.txt                        |   0
 .../com.minres.scviewer.ui}/build.properties  |   0
 .../com.minres.scviewer.ui}/contexts.xml      |   0
 .../famfamfam_silk_icons_v013.txt             |   0
 .../com.minres.scviewer.ui}/plugin.xml        |   0
 .../com.minres.scviewer.ui}/pom.xml           |   4 +-
 .../res/images/cross.png                      | Bin
 .../res/images/database.png                   | Bin
 .../res/images/folder.png                     | Bin
 .../res/images/next-green-d.png               | Bin
 .../res/images/next-green.png                 | Bin
 .../res/images/previous-green-d.png           | Bin
 .../res/images/previous-green.png             | Bin
 .../res/images/scviewer.gif                   | Bin
 .../res/images/scviewer.png                   | Bin
 .../res/images/signal.png                     | Bin
 .../res/images/stream.png                     | Bin
 .../res/images/zoom.png                       | Bin
 .../res/images/zoom_in.png                    | Bin
 .../res/images/zoom_out.png                   | Bin
 .../src/com/minres/scviewer/ui/Hex.java       |   0
 .../ui/TxEditorActionBarContributor.java      |   0
 .../com/minres/scviewer/ui/TxEditorInput.java |   0
 .../scviewer/ui/TxEditorInputFactory.java     |   0
 .../com/minres/scviewer/ui/TxEditorPart.java  |   0
 .../minres/scviewer/ui/TxEditorPlugin.java    |   0
 .../adapter/ITransactionPropertySource.java   |   0
 .../scviewer/ui/adapter/TxAdapterFactory.java |   0
 .../minres/scviewer/ui/handler/GotoNext.java  |   0
 .../minres/scviewer/ui/handler/GotoPrev.java  |   0
 .../scviewer/ui/handler/RemoveHandler.java    |   0
 .../com/minres/scviewer/ui/handler/Zoom.java  |   0
 .../minres/scviewer/ui/handler/ZoomInOut.java |   0
 .../scviewer/ui/views/SelectionTableView.java |   0
 .../ui/views/TransactionPropertySheet.java    |   0
 .../scviewer/ui/views/TxOutlinePage.java      |   0
 .../provider/TxDbTreeContentProvider.java     |   0
 .../views/provider/TxDbTreeLabelProvider.java |   0
 .../ui/views/sections/AttributeProperty.java  |   0
 .../ui/views/sections/RelatedProperty.java    |   0
 .../eclipse/wb/swt/SWTResourceManager.java    |   0
 com.minres.scviewer.parent/pom.xml => pom.xml |  28 +-
 .../.classpath                                |   0
 .../.gitignore                                |   0
 .../.project                                  |   0
 .../.settings/org.eclipse.jdt.core.prefs      |   0
 .../.settings/org.eclipse.m2e.core.prefs      |   0
 .../.settings/org.eclipse.pde.core.prefs      |   0
 .../DatabaseServicesTest.launch               |   0
 .../META-INF/MANIFEST.MF                      |   0
 .../OSGI-INF/component.xml                    |   0
 .../build.properties                          |   0
 .../inputs/.gitignore                         |   0
 .../inputs/my_db.txlog                        |   0
 .../inputs/my_db.vcd                          |   0
 .../inputs/my_db_truncated.txlog              |   0
 .../inputs/my_ldb.txldb/000005.sst            | Bin
 .../inputs/my_ldb.txldb/000046.log            | Bin
 .../inputs/my_ldb.txldb/CURRENT               |   0
 .../inputs/my_ldb.txldb/LOCK                  |   0
 .../inputs/my_ldb.txldb/LOG                   |   0
 .../inputs/my_ldb.txldb/MANIFEST-000045       | Bin
 .../inputs/my_ldb.vcd                         |   0
 .../inputs/my_sqldb.txdb                      | Bin
 .../inputs/simple_system.vcd                  |   0
 .../pom.xml                                   |   4 +-
 .../database/test/DatabaseServicesTest.java   |   0
 374 files changed, 43 insertions(+), 390 deletions(-)
 delete mode 100644 com.minres.scviewer.parent/.gitignore
 delete mode 100644 com.minres.scviewer.parent/.project
 delete mode 100644 com.minres.scviewer.updateSite/.settings/org.eclipse.m2e.core.prefs
 delete mode 100644 com.opcoach.e4.preferences/src/com/opcoach/e4/preferences/internal/E4PreferenceRegistry.java
 rename {com.minres.scviewer.feature => features/com.minres.scviewer.feature}/.gitignore (100%)
 rename {com.minres.scviewer.feature => features/com.minres.scviewer.feature}/.project (100%)
 rename {com.minres.scviewer.database.sqlite => features/com.minres.scviewer.feature}/.settings/org.eclipse.m2e.core.prefs (100%)
 rename {com.minres.scviewer.feature => features/com.minres.scviewer.feature}/build.properties (100%)
 rename {com.minres.scviewer.feature => features/com.minres.scviewer.feature}/feature.properties (100%)
 rename {com.minres.scviewer.feature => features/com.minres.scviewer.feature}/feature.xml (100%)
 rename {com.minres.scviewer.feature => features/com.minres.scviewer.feature}/pom.xml (88%)
 rename {com.minres.scviewer.updateSite => p2repositories/com.minres.scviewer.updateSite}/.gitignore (100%)
 rename {com.minres.scviewer.updateSite => p2repositories/com.minres.scviewer.updateSite}/.project (100%)
 rename {com.minres.scviewer.database.test => p2repositories/com.minres.scviewer.updateSite}/.settings/org.eclipse.m2e.core.prefs (100%)
 rename {com.minres.scviewer.updateSite => p2repositories/com.minres.scviewer.updateSite}/category.xml (100%)
 rename {com.minres.scviewer.updateSite => p2repositories/com.minres.scviewer.updateSite}/pom.xml (90%)
 rename {com.minres.scviewer.updateSite => p2repositories/com.minres.scviewer.updateSite}/src/main/resources/index.html (100%)
 rename {com.minres.scviewer.updateSite => p2repositories/com.minres.scviewer.updateSite}/src/main/resources/web/site.css (100%)
 rename {com.minres.scviewer.updateSite => p2repositories/com.minres.scviewer.updateSite}/src/main/resources/web/site.xsl (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/.classpath (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/.gitignore (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/.project (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/.settings/org.eclipse.pde.core.prefs (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/.settings/org.eclipse.pde.ds.annotations.prefs (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/META-INF/MANIFEST.MF (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/OSGI-INF/component.xml (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/build.properties (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/json-20180813-sources.jar (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/json-20180813.jar (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/leveldb-0.11-SNAPSHOT-sources.jar (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/leveldb-0.11-SNAPSHOT-uber.jar (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/pom.xml (88%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/src/com/minres/scviewer/database/leveldb/LevelDBLoader.java (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/src/com/minres/scviewer/database/leveldb/StringDbIterator.java (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/src/com/minres/scviewer/database/leveldb/Tx.java (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/src/com/minres/scviewer/database/leveldb/TxAttribute.java (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/src/com/minres/scviewer/database/leveldb/TxDBWrapper.java (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/src/com/minres/scviewer/database/leveldb/TxEvent.java (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/src/com/minres/scviewer/database/leveldb/TxGenerator.java (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/src/com/minres/scviewer/database/leveldb/TxRelation.java (100%)
 rename {com.minres.scviewer.database.leveldb => plugins/com.minres.scviewer.database.leveldb}/src/com/minres/scviewer/database/leveldb/TxStream.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/.classpath (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/.gitignore (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/.project (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.sqlite}/.settings/org.eclipse.m2e.core.prefs (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/.settings/org.eclipse.pde.core.prefs (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/META-INF/MANIFEST.MF (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/OSGI-INF/component.xml (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/build.properties (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/pom.xml (90%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/sqlite-jdbc-3.8.7.jar (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/Tx.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/TxAttribute.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/TxEvent.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/TxGenerator.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/TxRelation.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/TxStream.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/db/AbstractDatabaseHandler.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/db/IDatabase.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabase.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseInsertHandler.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseSelectHandler.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/tables/ScvGenerator.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/tables/ScvSimProps.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/tables/ScvStream.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/tables/ScvTx.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/tables/ScvTxAttribute.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/tables/ScvTxEvent.java (100%)
 rename {com.minres.scviewer.database.sqlite => plugins/com.minres.scviewer.database.sqlite}/src/com/minres/scviewer/database/sqlite/tables/ScvTxRelation.java (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/.classpath (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/.gitignore (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/.project (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/.settings/org.eclipse.jdt.groovy.core.prefs (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.text}/.settings/org.eclipse.m2e.core.prefs (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/META-INF/MANIFEST.MF (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/OSGI-INF/component.xml (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/build.properties (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/lib/eclipse-collections-9.2.0.jar (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/lib/eclipse-collections-api-9.2.0.jar (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/lib/eclipse-collections-forkjoin-9.2.0.jar (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/lib/elsa-3.0.0-M5.jar (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/lib/kotlin-stdlib-1.2.42.jar (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/lib/lz4-1.3.0.jar (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/lib/mapdb-3.0.7-javadoc.jar (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/lib/mapdb-3.0.7-sources.jar (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/lib/mapdb-3.0.7.jar (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/pom.xml (95%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/src/com/minres/scviewer/database/text/TextDbLoader.groovy (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/src/com/minres/scviewer/database/text/Tx.groovy (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/src/com/minres/scviewer/database/text/TxAttribute.groovy (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/src/com/minres/scviewer/database/text/TxAttributeType.groovy (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/src/com/minres/scviewer/database/text/TxAttributeTypeFactory.groovy (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/src/com/minres/scviewer/database/text/TxEvent.groovy (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/src/com/minres/scviewer/database/text/TxGenerator.groovy (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/src/com/minres/scviewer/database/text/TxRelation.groovy (100%)
 rename {com.minres.scviewer.database.text => plugins/com.minres.scviewer.database.text}/src/com/minres/scviewer/database/text/TxStream.groovy (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/.classpath (100%)
 rename {com.minres.scviewer.database.test => plugins/com.minres.scviewer.database.ui.swt}/.gitignore (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/.project (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.ui.swt}/.settings/org.eclipse.m2e.core.prefs (100%)
 rename {com.minres.scviewer.database.test => plugins/com.minres.scviewer.database.ui.swt}/.settings/org.eclipse.pde.core.prefs (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/META-INF/MANIFEST.MF (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/build.properties (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/pom.xml (88%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/Constants.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/DatabaseUiPlugin.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/ToolTipContentProvider.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/ToolTipHelpTextProvider.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/WaveformViewerFactory.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/CursorPainter.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/IPainter.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/IWaveformPainter.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/ObservableList.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/RelSelectionDialog.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/RulerPainter.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/SignalPainter.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/StreamPainter.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/ToolTipHandler.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/TrackAreaPainter.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/TrackPainter.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui.swt}/src/org/eclipse/wb/swt/SWTResourceManager.java (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/.classpath (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui}/.gitignore (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/.project (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {com.minres.scviewer.database.ui.swt => plugins/com.minres.scviewer.database.ui}/.settings/org.eclipse.pde.core.prefs (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/META-INF/MANIFEST.MF (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/build.properties (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/pom.xml (87%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/src/com/minres/scviewer/database/ui/GotoDirection.java (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/src/com/minres/scviewer/database/ui/ICursor.java (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/src/com/minres/scviewer/database/ui/IWaveformViewer.java (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/src/com/minres/scviewer/database/ui/IWaveformViewerFactory.java (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/src/com/minres/scviewer/database/ui/TrackEntry.java (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.ui}/src/com/minres/scviewer/database/ui/WaveformColors.java (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.vcd}/.classpath (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.vcd}/.gitignore (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.vcd}/.project (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.vcd}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database.vcd}/.settings/org.eclipse.m2e.core.prefs (100%)
 rename {com.minres.scviewer.database.ui => plugins/com.minres.scviewer.database.vcd}/.settings/org.eclipse.pde.core.prefs (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.vcd}/META-INF/MANIFEST.MF (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.vcd}/OSGI-INF/component.xml (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.vcd}/build.properties (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.vcd}/pom.xml (88%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.vcd}/src/com/minres/scviewer/database/vcd/IVCDDatabaseBuilder.java (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.vcd}/src/com/minres/scviewer/database/vcd/VCDDbLoader.java (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.vcd}/src/com/minres/scviewer/database/vcd/VCDFileParser.java (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.database.vcd}/src/com/minres/scviewer/database/vcd/VCDSignal.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/.classpath (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/.gitignore (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/.project (100%)
 rename {com.minres.scviewer.database.test => plugins/com.minres.scviewer.database}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.database}/.settings/org.eclipse.m2e.core.prefs (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/META-INF/MANIFEST.MF (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/OSGI-INF/component.xml (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/OSGI-INF/component2.xml (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/build.properties (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/pom.xml (88%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/AssociationType.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/BitValue.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/BitVector.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/DataType.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/HierNode.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/IHierNode.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/ISignal.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/ITx.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/ITxAttribute.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/ITxAttributeType.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/ITxEvent.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/ITxGenerator.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/ITxRelation.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/ITxStream.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/IWaveform.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/IWaveformDb.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/IWaveformDbFactory.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/IWaveformDbLoader.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/IWaveformEvent.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/InputFormatException.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/RelationType.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/internal/WaveformDb.java (100%)
 rename {com.minres.scviewer.database => plugins/com.minres.scviewer.database}/src/com/minres/scviewer/database/internal/WaveformDbFactory.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/.classpath (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.e4.application}/.gitignore (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/.project (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/.settings/org.eclipse.ltk.core.refactoring.prefs (100%)
 rename {com.minres.scviewer.feature => plugins/com.minres.scviewer.e4.application}/.settings/org.eclipse.m2e.core.prefs (100%)
 rename {com.minres.scviewer.database.vcd => plugins/com.minres.scviewer.e4.application}/.settings/org.eclipse.pde.core.prefs (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/Application.e4xmi (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/META-INF/MANIFEST.MF (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/OSGI-INF/l10n/bundle.properties (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/SilkCompanion1.txt (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/build.properties (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/css/default.css (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/famfamfam_silk_icons_v013.txt (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/Minres_logo.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/SCViewer_logo.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/append_all_waves.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/append_wave.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/arrow_up.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/bullet_plus.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/cross.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/database.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/database_go.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/down_blue.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/empty.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/folder.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/folder_database.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/folder_page.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/insert_all_waves.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/insert_wave.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/lightbulb.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/magifier_zoom_out.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/magnifier.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/magnifier_zoom_in.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/page_white.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/play_blue.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/play_green.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/reverse_blue.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/reverse_green.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/save_edit.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/script_save.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/scviewer.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/signal.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/stream.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/tick.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/trash.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/up_blue.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/wave.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/zoom.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/zoom_in.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/icons/zoom_out.png (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/plugin.xml (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/pom.xml (87%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/AppModelId.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/E4LifeCycle.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/Messages.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/elements/NavigateToolbarContribution.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/elements/RelationTypeToolControl.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/AboutHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/AddWaveformHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/ChangeValueDisplay.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/ChangeWaveformDisplay.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/DeleteWaveformHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/EnableHover.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/LoadStoreSettingsHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/MoveWaveformHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/NavigateEvent.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/NavigateTrans.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/QuitHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/SaveHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/SetRelationTypeHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/ThemeSetHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/handlers/ZoomHandler.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/internal/status/HeapStatus.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/internal/status/IHeapStatusConstants.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/internal/status/StatusBarControl.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/internal/status/TrimUtil.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/internal/status/WaveStatusBarControl.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/internal/util/FileMonitor.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/internal/util/IFileChangeListener.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/internal/util/IModificationChecker.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/messages.properties (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/options/OptionData.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/options/OptionSet.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/options/Options.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/parts/AboutDialog.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/parts/FileBrowserDialog.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/parts/LoadingWaveformDb.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/parts/PartListener.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/preferences/PreferenceConstants.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/preferences/PreferencesStoreProvider.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/preferences/SCViewerPreferencesPage.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/preferences/WaveformPreferencesPage.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/provider/TxPropertiesContentProvider.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/com/minres/scviewer/e4/application/provider/TxPropertiesLabelProvider.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/org/eclipse/wb/swt/ResourceManager.java (100%)
 rename {com.minres.scviewer.e4.application => plugins/com.minres.scviewer.e4.application}/src/org/eclipse/wb/swt/SWTResourceManager.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/.classpath (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/.gitignore (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/.project (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/.settings/org.eclipse.jdt.groovy.core.prefs (100%)
 rename {com.minres.scviewer.parent => plugins/com.minres.scviewer.ui}/.settings/org.eclipse.m2e.core.prefs (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/META-INF/MANIFEST.MF (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/OSGI-INF/component.xml (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/SilkCompanion1.txt (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/build.properties (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/contexts.xml (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/famfamfam_silk_icons_v013.txt (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/plugin.xml (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/pom.xml (87%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/cross.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/database.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/folder.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/next-green-d.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/next-green.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/previous-green-d.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/previous-green.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/scviewer.gif (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/scviewer.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/signal.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/stream.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/zoom.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/zoom_in.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/res/images/zoom_out.png (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/Hex.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/TxEditorActionBarContributor.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/TxEditorInput.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/TxEditorInputFactory.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/TxEditorPart.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/TxEditorPlugin.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/adapter/ITransactionPropertySource.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/adapter/TxAdapterFactory.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/handler/GotoNext.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/handler/GotoPrev.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/handler/RemoveHandler.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/handler/Zoom.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/handler/ZoomInOut.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/views/SelectionTableView.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/views/TransactionPropertySheet.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/views/TxOutlinePage.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/views/provider/TxDbTreeContentProvider.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/views/sections/AttributeProperty.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/com/minres/scviewer/ui/views/sections/RelatedProperty.java (100%)
 rename {com.minres.scviewer.ui => plugins/com.minres.scviewer.ui}/src/org/eclipse/wb/swt/SWTResourceManager.java (100%)
 rename com.minres.scviewer.parent/pom.xml => pom.xml (81%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/.classpath (100%)
 rename {com.minres.scviewer.e4.application => tests/com.minres.scviewer.database.test}/.gitignore (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/.project (100%)
 rename {com.minres.scviewer.database => tests/com.minres.scviewer.database.test}/.settings/org.eclipse.jdt.core.prefs (100%)
 rename {com.minres.scviewer.ui => tests/com.minres.scviewer.database.test}/.settings/org.eclipse.m2e.core.prefs (100%)
 rename {com.minres.scviewer.e4.application => tests/com.minres.scviewer.database.test}/.settings/org.eclipse.pde.core.prefs (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/DatabaseServicesTest.launch (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/META-INF/MANIFEST.MF (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/OSGI-INF/component.xml (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/build.properties (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/.gitignore (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/my_db.txlog (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/my_db.vcd (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/my_db_truncated.txlog (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/my_ldb.txldb/000005.sst (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/my_ldb.txldb/000046.log (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/my_ldb.txldb/CURRENT (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/my_ldb.txldb/LOCK (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/my_ldb.txldb/LOG (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/my_ldb.txldb/MANIFEST-000045 (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/my_ldb.vcd (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/my_sqldb.txdb (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/inputs/simple_system.vcd (100%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/pom.xml (91%)
 rename {com.minres.scviewer.database.test => tests/com.minres.scviewer.database.test}/src/com/minres/scviewer/database/test/DatabaseServicesTest.java (100%)

diff --git a/com.minres.scviewer.e4.product/pom.xml b/com.minres.scviewer.e4.product/pom.xml
index f87674d..99973ca 100644
--- a/com.minres.scviewer.e4.product/pom.xml
+++ b/com.minres.scviewer.e4.product/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
-		<relativePath>../com.minres.scviewer.parent</relativePath>
+		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
   	<version>2.6.0-SNAPSHOT</version>
diff --git a/com.minres.scviewer.parent/.gitignore b/com.minres.scviewer.parent/.gitignore
deleted file mode 100644
index 9e440c0..0000000
--- a/com.minres.scviewer.parent/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/workspace/
diff --git a/com.minres.scviewer.parent/.project b/com.minres.scviewer.parent/.project
deleted file mode 100644
index a68889f..0000000
--- a/com.minres.scviewer.parent/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<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>
-</projectDescription>
diff --git a/com.minres.scviewer.target/com.minres.scviewer.target.target b/com.minres.scviewer.target/com.minres.scviewer.target.target
index c2d147a..5242f57 100644
--- a/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -3,7 +3,7 @@
 <target name="com.minres.scviewer.target" sequenceNumber="138">
 <locations>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="http://download.eclipse.org/releases/2019-12/"/>
+		<repository location="http://download.eclipse.org/releases/2020-03/"/>
 		<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 		<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"/>
@@ -12,11 +12,11 @@
 		<unit id="org.eclipse.rcptt.core.feature.group" version="0.0.0"/><!-- com.google.guave-->
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://www.opcoach.com/repository/2019-12/"/>
+		<repository location="https://www.opcoach.com/repository/2020-03/"/>
 		<unit id="com.opcoach.e4.preferences.feature.feature.group" version="0.0.0"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="http://dist.springsource.org/snapshot/GRECLIPSE/e4.14/"/>
+		<repository location="http://dist.springsource.org/snapshot/GRECLIPSE/e4.15/"/>
 		<unit id="org.codehaus.groovy25.feature.feature.group" version="0.0.0"/>
 	</location>
 </locations>
diff --git a/com.minres.scviewer.target/pom.xml b/com.minres.scviewer.target/pom.xml
index 459e328..d28de3c 100644
--- a/com.minres.scviewer.target/pom.xml
+++ b/com.minres.scviewer.target/pom.xml
@@ -13,7 +13,7 @@
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
   	<version>2.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
+  	<relativePath>..</relativePath>
   </parent>
 
-  </project>
\ No newline at end of file
+  </project>
diff --git a/com.minres.scviewer.updateSite/.settings/org.eclipse.m2e.core.prefs b/com.minres.scviewer.updateSite/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f..0000000
--- a/com.minres.scviewer.updateSite/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/com.opcoach.e4.preferences/src/com/opcoach/e4/preferences/internal/E4PreferenceRegistry.java b/com.opcoach.e4.preferences/src/com/opcoach/e4/preferences/internal/E4PreferenceRegistry.java
deleted file mode 100644
index de4baf8..0000000
--- a/com.opcoach.e4.preferences/src/com/opcoach/e4/preferences/internal/E4PreferenceRegistry.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 OPCoach.
- * All rights reserved. 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
- *
- * Contributors:
- *     OPCoach - initial API and implementation
- *******************************************************************************/
-package com.opcoach.e4.preferences.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Creatable;
-import org.eclipse.e4.core.services.contributions.IContributionFactory;
-import org.eclipse.e4.core.services.log.Logger;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.preference.PreferenceNode;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-
-import com.opcoach.e4.preferences.IPreferenceStoreProvider;
-import com.opcoach.e4.preferences.ScopedPreferenceStore;
-
-@SuppressWarnings("restriction")
-@Creatable
-public class E4PreferenceRegistry
-{
-
-	public static final String PREFS_PAGE_XP = "com.opcoach.e4.preferences.e4PreferencePages"; // $NON-NLS-1$
-	public static final String PREF_STORE_PROVIDER = "com.opcoach.e4.preferences.e4PreferenceStoreProvider"; // $NON-NLS-1$
-	public static final String KEY_PREF_STORE_PROVIDERS = "com.opcoach.e4.preferences.e4PreferenceStoreProviders"; // $NON-NLS-1$
-	protected static final String ELMT_PAGE = "page"; // $NON-NLS-1$
-	protected static final String ATTR_ID = "id"; // $NON-NLS-1$
-	protected static final String ATTR_CATEGORY = "category"; // $NON-NLS-1$
-	protected static final String ATTR_CLASS = "class"; // $NON-NLS-1$
-	protected static final String ATTR_NAME = "name"; // $NON-NLS-1$
-
-	protected static final String ATTR_PLUGIN_ID = "pluginId"; // $NON-NLS-1$
-	protected static final String ATTR_ID_IN_WBCONTEXT = "idInWorkbenchContext"; // $NON-NLS-1$
-
-	@Inject
-	protected Logger logger;
-
-	@Inject
-	protected IEclipseContext context;
-
-	@Inject
-	protected IExtensionRegistry registry;
-
-	private PreferenceManager pm = null;
-
-	// A map of (pluginId, { IPreferenceStoreProvider, or key in wbcontext }
-	private Map<String, Object> psProviders;
-
-	public PreferenceManager getPreferenceManager()
-	{
-
-		// Remember of the unbounded nodes to order parent pages.
-		// Map<category, list of children> (all nodes except root nodes)
-		Map<String, Collection<IPreferenceNode>> childrenNodes = new HashMap<String, Collection<IPreferenceNode>>();
-
-		if (pm != null)
-			return pm;
-
-		pm = new PreferenceManager();
-		IContributionFactory factory = context.get(IContributionFactory.class);
-
-		for (IConfigurationElement elmt : registry.getConfigurationElementsFor(PREFS_PAGE_XP))
-		{
-			String bundleId = elmt.getNamespaceIdentifier();
-			if (!elmt.getName().equals(ELMT_PAGE))
-			{
-				logger.warn("unexpected element: {0}", elmt.getName());
-				continue;
-			} else if (isEmpty(elmt.getAttribute(ATTR_ID)) || isEmpty(elmt.getAttribute(ATTR_NAME)))
-			{
-				logger.warn("missing id and/or name: {}", bundleId);
-				continue;
-			}
-			PreferenceNode pn = null;
-			if (elmt.getAttribute(ATTR_CLASS) != null)
-			{
-				PreferencePage page = null;
-				try
-				{
-					String prefPageURI = getClassURI(bundleId, elmt.getAttribute(ATTR_CLASS));
-					Object object = factory.create(prefPageURI, context);
-					if (!(object instanceof PreferencePage))
-					{
-						logger.error("Expected instance of PreferencePage: {0}", elmt.getAttribute(ATTR_CLASS));
-						continue;
-					}
-					page = (PreferencePage) object;
-					setPreferenceStore(bundleId, page);
-
-				} catch (ClassNotFoundException e)
-				{
-					logger.error(e);
-					continue;
-				}
-				ContextInjectionFactory.inject(page, context);
-				if ((page.getTitle() == null || page.getTitle().isEmpty()) && elmt.getAttribute(ATTR_NAME) != null)
-				{
-					page.setTitle(elmt.getAttribute(ATTR_NAME));
-				}
-
-				pn = new PreferenceNode(elmt.getAttribute(ATTR_ID), page);
-			} else
-			{
-				pn = new PreferenceNode(elmt.getAttribute(ATTR_ID), new EmptyPreferencePage(elmt.getAttribute(ATTR_NAME)));
-			}
-
-			// Issue 2 : Fix bug on order (see :
-			// https://github.com/opcoach/e4Preferences/issues/2)
-			// Add only pages at root level and remember of child pages for
-			// categories
-			String category = elmt.getAttribute(ATTR_CATEGORY);
-			if (isEmpty(category))
-			{
-				pm.addToRoot(pn);
-			} else
-			{
-				/*
-				 * IPreferenceNode parent = findNode(pm, category); if (parent
-				 * == null) { // No parent found, but may be the extension has
-				 * not been read yet. So remember of it unboundedNodes.put(pn,
-				 * category); } else { parent.add(pn); }
-				 */
-				// Check if this category is already registered.
-				Collection<IPreferenceNode> children = childrenNodes.get(category);
-				if (children == null)
-				{
-					children = new ArrayList<IPreferenceNode>();
-					childrenNodes.put(category, children);
-				}
-				children.add(pn);
-			}
-		}
-
-		// Must now bind pages that has not been added in nodes (depends on the
-		// preference page read order)
-		// Iterate on all possible categories
-		Collection<String> categoriesDone = new ArrayList<String>();
-
-		while (!childrenNodes.isEmpty())
-		{
-			for (String cat : Collections.unmodifiableSet(childrenNodes.keySet()))
-			{
-				// Is this category already in preference manager ? If not add
-				// it later...
-				IPreferenceNode parent = findNode(pm, cat);
-				if (parent != null)
-				{
-					// Can add the list of children to this parent page...
-					for (IPreferenceNode pn : childrenNodes.get(cat))
-					{
-						parent.add(pn);
-					}
-					// Ok This parent page is done. Can remove it from map
-					// outside of this loop
-					categoriesDone.add(cat);
-				}
-			}
-
-			for (String keyToRemove : categoriesDone)
-				childrenNodes.remove(keyToRemove);
-			categoriesDone.clear();
-
-		}
-
-		return pm;
-	}
-
-	private void setPreferenceStore(String bundleId, PreferencePage page)
-	{
-		// Affect preference store to this page if this is a
-		// PreferencePage, else, must manage it internally
-		// Set the issue#1 on github :
-		// https://github.com/opcoach/e4Preferences/issues/1
-		// And manage the extensions of IP
-		initialisePreferenceStoreProviders();
-
-		IPreferenceStore store = null;
-
-		// Get the preference store according to policy.
-		Object data = psProviders.get(bundleId);
-		if (data != null)
-		{
-			if (data instanceof IPreferenceStore)
-				store = (IPreferenceStore) data;
-			else if (data instanceof IPreferenceStoreProvider)
-				store = ((IPreferenceStoreProvider) data).getPreferenceStore();
-			else if (data instanceof String)
-				store = (IPreferenceStore) context.get((String) data);
-			
-		} else
-		{
-			// Default behavior : create a preference store for this bundle and remember of it
-			store = new ScopedPreferenceStore(InstanceScope.INSTANCE, bundleId);
-			psProviders.put(bundleId, store);
-		}
-
-		
-		if (store != null)
-			page.setPreferenceStore(store);
-		else
-		{
-			logger.warn("Unable to set the preferenceStore for page " + page.getTitle() + " defined in bundle " + bundleId);
-		}
-
-	}
-
-	/** Read the e4PreferenceStoreProvider extension point */
-	private void initialisePreferenceStoreProviders()
-	{
-		if (psProviders == null)
-		{
-			IContributionFactory factory = context.get(IContributionFactory.class);
-
-			psProviders = new HashMap<String, Object>();
-			IExtensionRegistry registry = context.get(IExtensionRegistry.class);
-
-			// Read extensions and fill the map...
-			for (IConfigurationElement elmt : registry.getConfigurationElementsFor(PREF_STORE_PROVIDER))
-			{
-				String declaringBundle = elmt.getNamespaceIdentifier();
-				String pluginId = elmt.getAttribute(ATTR_PLUGIN_ID);
-				if (isEmpty(pluginId))
-				{
-					logger.warn("missing plugin Id in extension " + PREF_STORE_PROVIDER + " check the plugin " + declaringBundle);
-					continue;
-				}
-
-				String classname = elmt.getAttribute(ATTR_CLASS);
-				String objectId = elmt.getAttribute(ATTR_ID_IN_WBCONTEXT);
-
-				if ((isEmpty(classname) && isEmpty(objectId)) || (((classname != null) && classname.length() > 0) && ((objectId != null) && objectId.length() > 0)))
-				{
-					logger.warn("In extension " + PREF_STORE_PROVIDER + " only one of the two attributes (pluginId or idInWorkbenchContext) must be set. Check the plugin "
-							+ declaringBundle);
-					continue;
-				}
-
-				// Ok can now work with data...
-				Object data = objectId;
-				if (classname != null)
-				{
-					data = factory.create("bundleclass://"+declaringBundle+"/"+classname, context);
-					if (!(data instanceof IPreferenceStoreProvider))
-					{
-						logger.warn("In extension " + PREF_STORE_PROVIDER + " the class must implements IPreferenceStoreProvider. Check the plugin " + declaringBundle);
-						continue;
-					}
-				}
-
-				psProviders.put(pluginId, data);
-
-			}
-			
-			context.set(KEY_PREF_STORE_PROVIDERS, psProviders);
-		}
-	}
-
-	private IPreferenceNode findNode(PreferenceManager pm, String categoryId)
-	{
-		for (Object o : pm.getElements(PreferenceManager.POST_ORDER))
-		{
-			if (o instanceof IPreferenceNode && ((IPreferenceNode) o).getId().equals(categoryId))
-			{
-				return (IPreferenceNode) o;
-			}
-		}
-		return null;
-	}
-
-	private String getClassURI(String definingBundleId, String spec) throws ClassNotFoundException
-	{
-		if (spec.startsWith("platform:"))
-		{
-			return spec;
-		} // $NON-NLS-1$
-		return "bundleclass://" + definingBundleId + '/' + spec;
-	}
-
-	private boolean isEmpty(String value)
-	{
-		return value == null || value.trim().isEmpty();
-	}
-
-	static class EmptyPreferencePage extends PreferencePage
-	{
-
-		public EmptyPreferencePage(String title)
-		{
-			setTitle(title);
-			noDefaultAndApplyButton();
-		}
-
-		@Override
-		protected Control createContents(Composite parent)
-		{
-			return new Label(parent, SWT.NONE);
-		}
-
-	}
-
-}
diff --git a/com.minres.scviewer.feature/.gitignore b/features/com.minres.scviewer.feature/.gitignore
similarity index 100%
rename from com.minres.scviewer.feature/.gitignore
rename to features/com.minres.scviewer.feature/.gitignore
diff --git a/com.minres.scviewer.feature/.project b/features/com.minres.scviewer.feature/.project
similarity index 100%
rename from com.minres.scviewer.feature/.project
rename to features/com.minres.scviewer.feature/.project
diff --git a/com.minres.scviewer.database.sqlite/.settings/org.eclipse.m2e.core.prefs b/features/com.minres.scviewer.feature/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.sqlite/.settings/org.eclipse.m2e.core.prefs
rename to features/com.minres.scviewer.feature/.settings/org.eclipse.m2e.core.prefs
diff --git a/com.minres.scviewer.feature/build.properties b/features/com.minres.scviewer.feature/build.properties
similarity index 100%
rename from com.minres.scviewer.feature/build.properties
rename to features/com.minres.scviewer.feature/build.properties
diff --git a/com.minres.scviewer.feature/feature.properties b/features/com.minres.scviewer.feature/feature.properties
similarity index 100%
rename from com.minres.scviewer.feature/feature.properties
rename to features/com.minres.scviewer.feature/feature.properties
diff --git a/com.minres.scviewer.feature/feature.xml b/features/com.minres.scviewer.feature/feature.xml
similarity index 100%
rename from com.minres.scviewer.feature/feature.xml
rename to features/com.minres.scviewer.feature/feature.xml
diff --git a/com.minres.scviewer.feature/pom.xml b/features/com.minres.scviewer.feature/pom.xml
similarity index 88%
rename from com.minres.scviewer.feature/pom.xml
rename to features/com.minres.scviewer.feature/pom.xml
index 8da4db3..309086f 100644
--- a/com.minres.scviewer.feature/pom.xml
+++ b/features/com.minres.scviewer.feature/pom.xml
@@ -6,7 +6,7 @@
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
   	<version>2.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
+	<relativePath>../..</relativePath>
   </parent>
   <version>1.0.0-SNAPSHOT</version>
-</project>
\ No newline at end of file
+</project>
diff --git a/com.minres.scviewer.updateSite/.gitignore b/p2repositories/com.minres.scviewer.updateSite/.gitignore
similarity index 100%
rename from com.minres.scviewer.updateSite/.gitignore
rename to p2repositories/com.minres.scviewer.updateSite/.gitignore
diff --git a/com.minres.scviewer.updateSite/.project b/p2repositories/com.minres.scviewer.updateSite/.project
similarity index 100%
rename from com.minres.scviewer.updateSite/.project
rename to p2repositories/com.minres.scviewer.updateSite/.project
diff --git a/com.minres.scviewer.database.test/.settings/org.eclipse.m2e.core.prefs b/p2repositories/com.minres.scviewer.updateSite/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.test/.settings/org.eclipse.m2e.core.prefs
rename to p2repositories/com.minres.scviewer.updateSite/.settings/org.eclipse.m2e.core.prefs
diff --git a/com.minres.scviewer.updateSite/category.xml b/p2repositories/com.minres.scviewer.updateSite/category.xml
similarity index 100%
rename from com.minres.scviewer.updateSite/category.xml
rename to p2repositories/com.minres.scviewer.updateSite/category.xml
diff --git a/com.minres.scviewer.updateSite/pom.xml b/p2repositories/com.minres.scviewer.updateSite/pom.xml
similarity index 90%
rename from com.minres.scviewer.updateSite/pom.xml
rename to p2repositories/com.minres.scviewer.updateSite/pom.xml
index b3a3c1e..3634c3d 100644
--- a/com.minres.scviewer.updateSite/pom.xml
+++ b/p2repositories/com.minres.scviewer.updateSite/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
-		<relativePath>../com.minres.scviewer.parent</relativePath>
+		<relativePath>../..</relativePath>
 	</parent>
 <!--	<build>
  		<finalName>resources</finalName>
diff --git a/com.minres.scviewer.updateSite/src/main/resources/index.html b/p2repositories/com.minres.scviewer.updateSite/src/main/resources/index.html
similarity index 100%
rename from com.minres.scviewer.updateSite/src/main/resources/index.html
rename to p2repositories/com.minres.scviewer.updateSite/src/main/resources/index.html
diff --git a/com.minres.scviewer.updateSite/src/main/resources/web/site.css b/p2repositories/com.minres.scviewer.updateSite/src/main/resources/web/site.css
similarity index 100%
rename from com.minres.scviewer.updateSite/src/main/resources/web/site.css
rename to p2repositories/com.minres.scviewer.updateSite/src/main/resources/web/site.css
diff --git a/com.minres.scviewer.updateSite/src/main/resources/web/site.xsl b/p2repositories/com.minres.scviewer.updateSite/src/main/resources/web/site.xsl
similarity index 100%
rename from com.minres.scviewer.updateSite/src/main/resources/web/site.xsl
rename to p2repositories/com.minres.scviewer.updateSite/src/main/resources/web/site.xsl
diff --git a/com.minres.scviewer.database.leveldb/.classpath b/plugins/com.minres.scviewer.database.leveldb/.classpath
similarity index 100%
rename from com.minres.scviewer.database.leveldb/.classpath
rename to plugins/com.minres.scviewer.database.leveldb/.classpath
diff --git a/com.minres.scviewer.database.leveldb/.gitignore b/plugins/com.minres.scviewer.database.leveldb/.gitignore
similarity index 100%
rename from com.minres.scviewer.database.leveldb/.gitignore
rename to plugins/com.minres.scviewer.database.leveldb/.gitignore
diff --git a/com.minres.scviewer.database.leveldb/.project b/plugins/com.minres.scviewer.database.leveldb/.project
similarity index 100%
rename from com.minres.scviewer.database.leveldb/.project
rename to plugins/com.minres.scviewer.database.leveldb/.project
diff --git a/com.minres.scviewer.database.leveldb/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database.leveldb/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.leveldb/.settings/org.eclipse.jdt.core.prefs
rename to plugins/com.minres.scviewer.database.leveldb/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.minres.scviewer.database.leveldb/.settings/org.eclipse.pde.core.prefs b/plugins/com.minres.scviewer.database.leveldb/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.leveldb/.settings/org.eclipse.pde.core.prefs
rename to plugins/com.minres.scviewer.database.leveldb/.settings/org.eclipse.pde.core.prefs
diff --git a/com.minres.scviewer.database.leveldb/.settings/org.eclipse.pde.ds.annotations.prefs b/plugins/com.minres.scviewer.database.leveldb/.settings/org.eclipse.pde.ds.annotations.prefs
similarity index 100%
rename from com.minres.scviewer.database.leveldb/.settings/org.eclipse.pde.ds.annotations.prefs
rename to plugins/com.minres.scviewer.database.leveldb/.settings/org.eclipse.pde.ds.annotations.prefs
diff --git a/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
similarity index 100%
rename from com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
rename to plugins/com.minres.scviewer.database.leveldb/META-INF/MANIFEST.MF
diff --git a/com.minres.scviewer.database.leveldb/OSGI-INF/component.xml b/plugins/com.minres.scviewer.database.leveldb/OSGI-INF/component.xml
similarity index 100%
rename from com.minres.scviewer.database.leveldb/OSGI-INF/component.xml
rename to plugins/com.minres.scviewer.database.leveldb/OSGI-INF/component.xml
diff --git a/com.minres.scviewer.database.leveldb/build.properties b/plugins/com.minres.scviewer.database.leveldb/build.properties
similarity index 100%
rename from com.minres.scviewer.database.leveldb/build.properties
rename to plugins/com.minres.scviewer.database.leveldb/build.properties
diff --git a/com.minres.scviewer.database.leveldb/json-20180813-sources.jar b/plugins/com.minres.scviewer.database.leveldb/json-20180813-sources.jar
similarity index 100%
rename from com.minres.scviewer.database.leveldb/json-20180813-sources.jar
rename to plugins/com.minres.scviewer.database.leveldb/json-20180813-sources.jar
diff --git a/com.minres.scviewer.database.leveldb/json-20180813.jar b/plugins/com.minres.scviewer.database.leveldb/json-20180813.jar
similarity index 100%
rename from com.minres.scviewer.database.leveldb/json-20180813.jar
rename to plugins/com.minres.scviewer.database.leveldb/json-20180813.jar
diff --git a/com.minres.scviewer.database.leveldb/leveldb-0.11-SNAPSHOT-sources.jar b/plugins/com.minres.scviewer.database.leveldb/leveldb-0.11-SNAPSHOT-sources.jar
similarity index 100%
rename from com.minres.scviewer.database.leveldb/leveldb-0.11-SNAPSHOT-sources.jar
rename to plugins/com.minres.scviewer.database.leveldb/leveldb-0.11-SNAPSHOT-sources.jar
diff --git a/com.minres.scviewer.database.leveldb/leveldb-0.11-SNAPSHOT-uber.jar b/plugins/com.minres.scviewer.database.leveldb/leveldb-0.11-SNAPSHOT-uber.jar
similarity index 100%
rename from com.minres.scviewer.database.leveldb/leveldb-0.11-SNAPSHOT-uber.jar
rename to plugins/com.minres.scviewer.database.leveldb/leveldb-0.11-SNAPSHOT-uber.jar
diff --git a/com.minres.scviewer.database.leveldb/pom.xml b/plugins/com.minres.scviewer.database.leveldb/pom.xml
similarity index 88%
rename from com.minres.scviewer.database.leveldb/pom.xml
rename to plugins/com.minres.scviewer.database.leveldb/pom.xml
index 2226782..2a9f3e7 100644
--- a/com.minres.scviewer.database.leveldb/pom.xml
+++ b/plugins/com.minres.scviewer.database.leveldb/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
-		<relativePath>../com.minres.scviewer.parent</relativePath>
+		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/LevelDBLoader.java b/plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/LevelDBLoader.java
similarity index 100%
rename from com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/LevelDBLoader.java
rename to plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/LevelDBLoader.java
diff --git a/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/StringDbIterator.java b/plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/StringDbIterator.java
similarity index 100%
rename from com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/StringDbIterator.java
rename to plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/StringDbIterator.java
diff --git a/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/Tx.java b/plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/Tx.java
similarity index 100%
rename from com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/Tx.java
rename to plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/Tx.java
diff --git a/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxAttribute.java b/plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxAttribute.java
similarity index 100%
rename from com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxAttribute.java
rename to plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxAttribute.java
diff --git a/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxDBWrapper.java b/plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxDBWrapper.java
similarity index 100%
rename from com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxDBWrapper.java
rename to plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxDBWrapper.java
diff --git a/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxEvent.java b/plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxEvent.java
similarity index 100%
rename from com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxEvent.java
rename to plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxEvent.java
diff --git a/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxGenerator.java b/plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxGenerator.java
similarity index 100%
rename from com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxGenerator.java
rename to plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxGenerator.java
diff --git a/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxRelation.java b/plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxRelation.java
similarity index 100%
rename from com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxRelation.java
rename to plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxRelation.java
diff --git a/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxStream.java b/plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxStream.java
similarity index 100%
rename from com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxStream.java
rename to plugins/com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/TxStream.java
diff --git a/com.minres.scviewer.database.sqlite/.classpath b/plugins/com.minres.scviewer.database.sqlite/.classpath
similarity index 100%
rename from com.minres.scviewer.database.sqlite/.classpath
rename to plugins/com.minres.scviewer.database.sqlite/.classpath
diff --git a/com.minres.scviewer.database.sqlite/.gitignore b/plugins/com.minres.scviewer.database.sqlite/.gitignore
similarity index 100%
rename from com.minres.scviewer.database.sqlite/.gitignore
rename to plugins/com.minres.scviewer.database.sqlite/.gitignore
diff --git a/com.minres.scviewer.database.sqlite/.project b/plugins/com.minres.scviewer.database.sqlite/.project
similarity index 100%
rename from com.minres.scviewer.database.sqlite/.project
rename to plugins/com.minres.scviewer.database.sqlite/.project
diff --git a/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs
rename to plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.minres.scviewer.database.text/.settings/org.eclipse.m2e.core.prefs b/plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.text/.settings/org.eclipse.m2e.core.prefs
rename to plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.m2e.core.prefs
diff --git a/com.minres.scviewer.database.sqlite/.settings/org.eclipse.pde.core.prefs b/plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.sqlite/.settings/org.eclipse.pde.core.prefs
rename to plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.pde.core.prefs
diff --git a/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
similarity index 100%
rename from com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
rename to plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
diff --git a/com.minres.scviewer.database.sqlite/OSGI-INF/component.xml b/plugins/com.minres.scviewer.database.sqlite/OSGI-INF/component.xml
similarity index 100%
rename from com.minres.scviewer.database.sqlite/OSGI-INF/component.xml
rename to plugins/com.minres.scviewer.database.sqlite/OSGI-INF/component.xml
diff --git a/com.minres.scviewer.database.sqlite/build.properties b/plugins/com.minres.scviewer.database.sqlite/build.properties
similarity index 100%
rename from com.minres.scviewer.database.sqlite/build.properties
rename to plugins/com.minres.scviewer.database.sqlite/build.properties
diff --git a/com.minres.scviewer.database.sqlite/pom.xml b/plugins/com.minres.scviewer.database.sqlite/pom.xml
similarity index 90%
rename from com.minres.scviewer.database.sqlite/pom.xml
rename to plugins/com.minres.scviewer.database.sqlite/pom.xml
index 116c43e..7d88cef 100644
--- a/com.minres.scviewer.database.sqlite/pom.xml
+++ b/plugins/com.minres.scviewer.database.sqlite/pom.xml
@@ -5,7 +5,7 @@
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
   	<version>2.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
+	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>
   <dependencies>
@@ -16,4 +16,4 @@
   	</dependency>
   </dependencies>
   <version>1.0.0-SNAPSHOT</version>
-</project>
\ No newline at end of file
+</project>
diff --git a/com.minres.scviewer.database.sqlite/sqlite-jdbc-3.8.7.jar b/plugins/com.minres.scviewer.database.sqlite/sqlite-jdbc-3.8.7.jar
similarity index 100%
rename from com.minres.scviewer.database.sqlite/sqlite-jdbc-3.8.7.jar
rename to plugins/com.minres.scviewer.database.sqlite/sqlite-jdbc-3.8.7.jar
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxAttribute.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxAttribute.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxAttribute.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxAttribute.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxRelation.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxRelation.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxRelation.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxRelation.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/AbstractDatabaseHandler.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/AbstractDatabaseHandler.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/AbstractDatabaseHandler.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/AbstractDatabaseHandler.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/IDatabase.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/IDatabase.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/IDatabase.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/IDatabase.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabase.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabase.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabase.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabase.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseInsertHandler.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseInsertHandler.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseInsertHandler.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseInsertHandler.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseSelectHandler.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseSelectHandler.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseSelectHandler.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseSelectHandler.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvGenerator.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvGenerator.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvGenerator.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvGenerator.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvSimProps.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvSimProps.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvSimProps.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvSimProps.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvStream.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvStream.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvStream.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvStream.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTx.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTx.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTx.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTx.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxAttribute.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxAttribute.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxAttribute.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxAttribute.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxEvent.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxEvent.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxEvent.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxEvent.java
diff --git a/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxRelation.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxRelation.java
similarity index 100%
rename from com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxRelation.java
rename to plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/tables/ScvTxRelation.java
diff --git a/com.minres.scviewer.database.text/.classpath b/plugins/com.minres.scviewer.database.text/.classpath
similarity index 100%
rename from com.minres.scviewer.database.text/.classpath
rename to plugins/com.minres.scviewer.database.text/.classpath
diff --git a/com.minres.scviewer.database.text/.gitignore b/plugins/com.minres.scviewer.database.text/.gitignore
similarity index 100%
rename from com.minres.scviewer.database.text/.gitignore
rename to plugins/com.minres.scviewer.database.text/.gitignore
diff --git a/com.minres.scviewer.database.text/.project b/plugins/com.minres.scviewer.database.text/.project
similarity index 100%
rename from com.minres.scviewer.database.text/.project
rename to plugins/com.minres.scviewer.database.text/.project
diff --git a/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.text/.settings/org.eclipse.jdt.core.prefs
rename to plugins/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.groovy.core.prefs b/plugins/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.groovy.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.text/.settings/org.eclipse.jdt.groovy.core.prefs
rename to plugins/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.groovy.core.prefs
diff --git a/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.m2e.core.prefs b/plugins/com.minres.scviewer.database.text/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/.settings/org.eclipse.m2e.core.prefs
rename to plugins/com.minres.scviewer.database.text/.settings/org.eclipse.m2e.core.prefs
diff --git a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
similarity index 100%
rename from com.minres.scviewer.database.text/META-INF/MANIFEST.MF
rename to plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
diff --git a/com.minres.scviewer.database.text/OSGI-INF/component.xml b/plugins/com.minres.scviewer.database.text/OSGI-INF/component.xml
similarity index 100%
rename from com.minres.scviewer.database.text/OSGI-INF/component.xml
rename to plugins/com.minres.scviewer.database.text/OSGI-INF/component.xml
diff --git a/com.minres.scviewer.database.text/build.properties b/plugins/com.minres.scviewer.database.text/build.properties
similarity index 100%
rename from com.minres.scviewer.database.text/build.properties
rename to plugins/com.minres.scviewer.database.text/build.properties
diff --git a/com.minres.scviewer.database.text/lib/eclipse-collections-9.2.0.jar b/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-9.2.0.jar
similarity index 100%
rename from com.minres.scviewer.database.text/lib/eclipse-collections-9.2.0.jar
rename to plugins/com.minres.scviewer.database.text/lib/eclipse-collections-9.2.0.jar
diff --git a/com.minres.scviewer.database.text/lib/eclipse-collections-api-9.2.0.jar b/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-api-9.2.0.jar
similarity index 100%
rename from com.minres.scviewer.database.text/lib/eclipse-collections-api-9.2.0.jar
rename to plugins/com.minres.scviewer.database.text/lib/eclipse-collections-api-9.2.0.jar
diff --git a/com.minres.scviewer.database.text/lib/eclipse-collections-forkjoin-9.2.0.jar b/plugins/com.minres.scviewer.database.text/lib/eclipse-collections-forkjoin-9.2.0.jar
similarity index 100%
rename from com.minres.scviewer.database.text/lib/eclipse-collections-forkjoin-9.2.0.jar
rename to plugins/com.minres.scviewer.database.text/lib/eclipse-collections-forkjoin-9.2.0.jar
diff --git a/com.minres.scviewer.database.text/lib/elsa-3.0.0-M5.jar b/plugins/com.minres.scviewer.database.text/lib/elsa-3.0.0-M5.jar
similarity index 100%
rename from com.minres.scviewer.database.text/lib/elsa-3.0.0-M5.jar
rename to plugins/com.minres.scviewer.database.text/lib/elsa-3.0.0-M5.jar
diff --git a/com.minres.scviewer.database.text/lib/kotlin-stdlib-1.2.42.jar b/plugins/com.minres.scviewer.database.text/lib/kotlin-stdlib-1.2.42.jar
similarity index 100%
rename from com.minres.scviewer.database.text/lib/kotlin-stdlib-1.2.42.jar
rename to plugins/com.minres.scviewer.database.text/lib/kotlin-stdlib-1.2.42.jar
diff --git a/com.minres.scviewer.database.text/lib/lz4-1.3.0.jar b/plugins/com.minres.scviewer.database.text/lib/lz4-1.3.0.jar
similarity index 100%
rename from com.minres.scviewer.database.text/lib/lz4-1.3.0.jar
rename to plugins/com.minres.scviewer.database.text/lib/lz4-1.3.0.jar
diff --git a/com.minres.scviewer.database.text/lib/mapdb-3.0.7-javadoc.jar b/plugins/com.minres.scviewer.database.text/lib/mapdb-3.0.7-javadoc.jar
similarity index 100%
rename from com.minres.scviewer.database.text/lib/mapdb-3.0.7-javadoc.jar
rename to plugins/com.minres.scviewer.database.text/lib/mapdb-3.0.7-javadoc.jar
diff --git a/com.minres.scviewer.database.text/lib/mapdb-3.0.7-sources.jar b/plugins/com.minres.scviewer.database.text/lib/mapdb-3.0.7-sources.jar
similarity index 100%
rename from com.minres.scviewer.database.text/lib/mapdb-3.0.7-sources.jar
rename to plugins/com.minres.scviewer.database.text/lib/mapdb-3.0.7-sources.jar
diff --git a/com.minres.scviewer.database.text/lib/mapdb-3.0.7.jar b/plugins/com.minres.scviewer.database.text/lib/mapdb-3.0.7.jar
similarity index 100%
rename from com.minres.scviewer.database.text/lib/mapdb-3.0.7.jar
rename to plugins/com.minres.scviewer.database.text/lib/mapdb-3.0.7.jar
diff --git a/com.minres.scviewer.database.text/pom.xml b/plugins/com.minres.scviewer.database.text/pom.xml
similarity index 95%
rename from com.minres.scviewer.database.text/pom.xml
rename to plugins/com.minres.scviewer.database.text/pom.xml
index c09a4f5..b47c051 100644
--- a/com.minres.scviewer.database.text/pom.xml
+++ b/plugins/com.minres.scviewer.database.text/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
-		<relativePath>../com.minres.scviewer.parent</relativePath>
+		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
 	
@@ -42,4 +42,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
similarity index 100%
rename from com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
rename to plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.groovy
similarity index 100%
rename from com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.groovy
rename to plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.groovy
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttribute.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttribute.groovy
similarity index 100%
rename from com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttribute.groovy
rename to plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttribute.groovy
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeType.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeType.groovy
similarity index 100%
rename from com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeType.groovy
rename to plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeType.groovy
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeTypeFactory.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeTypeFactory.groovy
similarity index 100%
rename from com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeTypeFactory.groovy
rename to plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeTypeFactory.groovy
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.groovy
similarity index 100%
rename from com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.groovy
rename to plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.groovy
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.groovy
similarity index 100%
rename from com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.groovy
rename to plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.groovy
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.groovy
similarity index 100%
rename from com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.groovy
rename to plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.groovy
diff --git a/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy
similarity index 100%
rename from com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy
rename to plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy
diff --git a/com.minres.scviewer.database.ui.swt/.classpath b/plugins/com.minres.scviewer.database.ui.swt/.classpath
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/.classpath
rename to plugins/com.minres.scviewer.database.ui.swt/.classpath
diff --git a/com.minres.scviewer.database.test/.gitignore b/plugins/com.minres.scviewer.database.ui.swt/.gitignore
similarity index 100%
rename from com.minres.scviewer.database.test/.gitignore
rename to plugins/com.minres.scviewer.database.ui.swt/.gitignore
diff --git a/com.minres.scviewer.database.ui.swt/.project b/plugins/com.minres.scviewer.database.ui.swt/.project
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/.project
rename to plugins/com.minres.scviewer.database.ui.swt/.project
diff --git a/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs
rename to plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.minres.scviewer.database.vcd/.settings/org.eclipse.m2e.core.prefs b/plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.vcd/.settings/org.eclipse.m2e.core.prefs
rename to plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.m2e.core.prefs
diff --git a/com.minres.scviewer.database.test/.settings/org.eclipse.pde.core.prefs b/plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.test/.settings/org.eclipse.pde.core.prefs
rename to plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.pde.core.prefs
diff --git a/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
rename to plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
diff --git a/com.minres.scviewer.database.ui.swt/build.properties b/plugins/com.minres.scviewer.database.ui.swt/build.properties
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/build.properties
rename to plugins/com.minres.scviewer.database.ui.swt/build.properties
diff --git a/com.minres.scviewer.database.ui.swt/pom.xml b/plugins/com.minres.scviewer.database.ui.swt/pom.xml
similarity index 88%
rename from com.minres.scviewer.database.ui.swt/pom.xml
rename to plugins/com.minres.scviewer.database.ui.swt/pom.xml
index 34b8a4f..670c76c 100644
--- a/com.minres.scviewer.database.ui.swt/pom.xml
+++ b/plugins/com.minres.scviewer.database.ui.swt/pom.xml
@@ -6,7 +6,7 @@
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
   	<version>2.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
+	<relativePath>../..</relativePath>
   </parent>
   <version>2.2.0-SNAPSHOT</version>
-</project>
\ No newline at end of file
+</project>
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/Constants.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/Constants.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/Constants.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/Constants.java
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/DatabaseUiPlugin.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/DatabaseUiPlugin.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/DatabaseUiPlugin.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/DatabaseUiPlugin.java
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/ToolTipContentProvider.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/ToolTipContentProvider.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/ToolTipContentProvider.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/ToolTipContentProvider.java
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/ToolTipHelpTextProvider.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/ToolTipHelpTextProvider.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/ToolTipHelpTextProvider.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/ToolTipHelpTextProvider.java
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/WaveformViewerFactory.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/WaveformViewerFactory.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/WaveformViewerFactory.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/WaveformViewerFactory.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/CursorPainter.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/CursorPainter.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/IPainter.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/IPainter.java
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/IWaveformPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/IWaveformPainter.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/IWaveformPainter.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/IWaveformPainter.java
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ObservableList.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ObservableList.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ObservableList.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ObservableList.java
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RelSelectionDialog.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RelSelectionDialog.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RelSelectionDialog.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RelSelectionDialog.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RulerPainter.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RulerPainter.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/StreamPainter.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/StreamPainter.java
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ToolTipHandler.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ToolTipHandler.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ToolTipHandler.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ToolTipHandler.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackAreaPainter.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackAreaPainter.java
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackPainter.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackPainter.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/TrackPainter.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java
diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformViewer.java
diff --git a/com.minres.scviewer.database.ui.swt/src/org/eclipse/wb/swt/SWTResourceManager.java b/plugins/com.minres.scviewer.database.ui.swt/src/org/eclipse/wb/swt/SWTResourceManager.java
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/src/org/eclipse/wb/swt/SWTResourceManager.java
rename to plugins/com.minres.scviewer.database.ui.swt/src/org/eclipse/wb/swt/SWTResourceManager.java
diff --git a/com.minres.scviewer.database.ui/.classpath b/plugins/com.minres.scviewer.database.ui/.classpath
similarity index 100%
rename from com.minres.scviewer.database.ui/.classpath
rename to plugins/com.minres.scviewer.database.ui/.classpath
diff --git a/com.minres.scviewer.database.ui.swt/.gitignore b/plugins/com.minres.scviewer.database.ui/.gitignore
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/.gitignore
rename to plugins/com.minres.scviewer.database.ui/.gitignore
diff --git a/com.minres.scviewer.database.ui/.project b/plugins/com.minres.scviewer.database.ui/.project
similarity index 100%
rename from com.minres.scviewer.database.ui/.project
rename to plugins/com.minres.scviewer.database.ui/.project
diff --git a/com.minres.scviewer.database.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/com.minres.scviewer.database.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.pde.core.prefs b/plugins/com.minres.scviewer.database.ui/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.ui.swt/.settings/org.eclipse.pde.core.prefs
rename to plugins/com.minres.scviewer.database.ui/.settings/org.eclipse.pde.core.prefs
diff --git a/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from com.minres.scviewer.database.ui/META-INF/MANIFEST.MF
rename to plugins/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF
diff --git a/com.minres.scviewer.database.ui/build.properties b/plugins/com.minres.scviewer.database.ui/build.properties
similarity index 100%
rename from com.minres.scviewer.database.ui/build.properties
rename to plugins/com.minres.scviewer.database.ui/build.properties
diff --git a/com.minres.scviewer.database.ui/pom.xml b/plugins/com.minres.scviewer.database.ui/pom.xml
similarity index 87%
rename from com.minres.scviewer.database.ui/pom.xml
rename to plugins/com.minres.scviewer.database.ui/pom.xml
index 559e80c..f166629 100644
--- a/com.minres.scviewer.database.ui/pom.xml
+++ b/plugins/com.minres.scviewer.database.ui/pom.xml
@@ -7,6 +7,6 @@
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
   	<version>2.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
+	<relativePath>../..</relativePath>
   </parent>
-  </project>
\ No newline at end of file
+  </project>
diff --git a/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/GotoDirection.java b/plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/GotoDirection.java
similarity index 100%
rename from com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/GotoDirection.java
rename to plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/GotoDirection.java
diff --git a/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/ICursor.java b/plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/ICursor.java
similarity index 100%
rename from com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/ICursor.java
rename to plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/ICursor.java
diff --git a/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/IWaveformViewer.java b/plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/IWaveformViewer.java
similarity index 100%
rename from com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/IWaveformViewer.java
rename to plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/IWaveformViewer.java
diff --git a/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/IWaveformViewerFactory.java b/plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/IWaveformViewerFactory.java
similarity index 100%
rename from com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/IWaveformViewerFactory.java
rename to plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/IWaveformViewerFactory.java
diff --git a/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/TrackEntry.java b/plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/TrackEntry.java
similarity index 100%
rename from com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/TrackEntry.java
rename to plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/TrackEntry.java
diff --git a/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/WaveformColors.java b/plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/WaveformColors.java
similarity index 100%
rename from com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/WaveformColors.java
rename to plugins/com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/WaveformColors.java
diff --git a/com.minres.scviewer.database.vcd/.classpath b/plugins/com.minres.scviewer.database.vcd/.classpath
similarity index 100%
rename from com.minres.scviewer.database.vcd/.classpath
rename to plugins/com.minres.scviewer.database.vcd/.classpath
diff --git a/com.minres.scviewer.database.ui/.gitignore b/plugins/com.minres.scviewer.database.vcd/.gitignore
similarity index 100%
rename from com.minres.scviewer.database.ui/.gitignore
rename to plugins/com.minres.scviewer.database.vcd/.gitignore
diff --git a/com.minres.scviewer.database.vcd/.project b/plugins/com.minres.scviewer.database.vcd/.project
similarity index 100%
rename from com.minres.scviewer.database.vcd/.project
rename to plugins/com.minres.scviewer.database.vcd/.project
diff --git a/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs
rename to plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.minres.scviewer.database/.settings/org.eclipse.m2e.core.prefs b/plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from com.minres.scviewer.database/.settings/org.eclipse.m2e.core.prefs
rename to plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.m2e.core.prefs
diff --git a/com.minres.scviewer.database.ui/.settings/org.eclipse.pde.core.prefs b/plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.ui/.settings/org.eclipse.pde.core.prefs
rename to plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.pde.core.prefs
diff --git a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
similarity index 100%
rename from com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
rename to plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
diff --git a/com.minres.scviewer.database.vcd/OSGI-INF/component.xml b/plugins/com.minres.scviewer.database.vcd/OSGI-INF/component.xml
similarity index 100%
rename from com.minres.scviewer.database.vcd/OSGI-INF/component.xml
rename to plugins/com.minres.scviewer.database.vcd/OSGI-INF/component.xml
diff --git a/com.minres.scviewer.database.vcd/build.properties b/plugins/com.minres.scviewer.database.vcd/build.properties
similarity index 100%
rename from com.minres.scviewer.database.vcd/build.properties
rename to plugins/com.minres.scviewer.database.vcd/build.properties
diff --git a/com.minres.scviewer.database.vcd/pom.xml b/plugins/com.minres.scviewer.database.vcd/pom.xml
similarity index 88%
rename from com.minres.scviewer.database.vcd/pom.xml
rename to plugins/com.minres.scviewer.database.vcd/pom.xml
index 606e69a..b03d4cb 100644
--- a/com.minres.scviewer.database.vcd/pom.xml
+++ b/plugins/com.minres.scviewer.database.vcd/pom.xml
@@ -6,7 +6,7 @@
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
   	<version>2.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
+	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>
-</project>
\ No newline at end of file
+</project>
diff --git a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/IVCDDatabaseBuilder.java b/plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/IVCDDatabaseBuilder.java
similarity index 100%
rename from com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/IVCDDatabaseBuilder.java
rename to plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/IVCDDatabaseBuilder.java
diff --git a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java b/plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java
similarity index 100%
rename from com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java
rename to plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java
diff --git a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java b/plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java
similarity index 100%
rename from com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java
rename to plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java
diff --git a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java b/plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java
similarity index 100%
rename from com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java
rename to plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java
diff --git a/com.minres.scviewer.database/.classpath b/plugins/com.minres.scviewer.database/.classpath
similarity index 100%
rename from com.minres.scviewer.database/.classpath
rename to plugins/com.minres.scviewer.database/.classpath
diff --git a/com.minres.scviewer.database/.gitignore b/plugins/com.minres.scviewer.database/.gitignore
similarity index 100%
rename from com.minres.scviewer.database/.gitignore
rename to plugins/com.minres.scviewer.database/.gitignore
diff --git a/com.minres.scviewer.database/.project b/plugins/com.minres.scviewer.database/.project
similarity index 100%
rename from com.minres.scviewer.database/.project
rename to plugins/com.minres.scviewer.database/.project
diff --git a/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs
rename to plugins/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.minres.scviewer.e4.application/.settings/org.eclipse.m2e.core.prefs b/plugins/com.minres.scviewer.database/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from com.minres.scviewer.e4.application/.settings/org.eclipse.m2e.core.prefs
rename to plugins/com.minres.scviewer.database/.settings/org.eclipse.m2e.core.prefs
diff --git a/com.minres.scviewer.database/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF
similarity index 100%
rename from com.minres.scviewer.database/META-INF/MANIFEST.MF
rename to plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF
diff --git a/com.minres.scviewer.database/OSGI-INF/component.xml b/plugins/com.minres.scviewer.database/OSGI-INF/component.xml
similarity index 100%
rename from com.minres.scviewer.database/OSGI-INF/component.xml
rename to plugins/com.minres.scviewer.database/OSGI-INF/component.xml
diff --git a/com.minres.scviewer.database/OSGI-INF/component2.xml b/plugins/com.minres.scviewer.database/OSGI-INF/component2.xml
similarity index 100%
rename from com.minres.scviewer.database/OSGI-INF/component2.xml
rename to plugins/com.minres.scviewer.database/OSGI-INF/component2.xml
diff --git a/com.minres.scviewer.database/build.properties b/plugins/com.minres.scviewer.database/build.properties
similarity index 100%
rename from com.minres.scviewer.database/build.properties
rename to plugins/com.minres.scviewer.database/build.properties
diff --git a/com.minres.scviewer.database/pom.xml b/plugins/com.minres.scviewer.database/pom.xml
similarity index 88%
rename from com.minres.scviewer.database/pom.xml
rename to plugins/com.minres.scviewer.database/pom.xml
index 4fc670b..a23746c 100644
--- a/com.minres.scviewer.database/pom.xml
+++ b/plugins/com.minres.scviewer.database/pom.xml
@@ -5,8 +5,8 @@
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
   	<version>2.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
+	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>
   <version>1.0.0-SNAPSHOT</version>
-</project>
\ No newline at end of file
+</project>
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/AssociationType.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/AssociationType.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/AssociationType.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/AssociationType.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/BitValue.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/BitValue.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/BitValue.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/BitValue.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/BitVector.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/BitVector.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/BitVector.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/BitVector.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/DataType.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/DataType.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/DataType.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/DataType.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/HierNode.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/HierNode.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/HierNode.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/HierNode.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/IHierNode.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IHierNode.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/IHierNode.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IHierNode.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/ISignal.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ISignal.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/ISignal.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ISignal.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/ITx.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITx.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/ITx.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITx.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttribute.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttribute.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttribute.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttribute.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttributeType.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttributeType.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttributeType.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttributeType.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxEvent.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxEvent.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/ITxEvent.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxEvent.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxGenerator.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxGenerator.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/ITxGenerator.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxGenerator.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxRelation.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxRelation.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/ITxRelation.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxRelation.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxStream.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxStream.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/ITxStream.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxStream.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveform.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveform.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveform.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveform.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDb.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDb.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDb.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDb.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbFactory.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbFactory.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbFactory.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbFactory.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbLoader.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbLoader.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbLoader.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformDbLoader.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformEvent.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformEvent.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformEvent.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/IWaveformEvent.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/InputFormatException.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/InputFormatException.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/InputFormatException.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/InputFormatException.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/RelationType.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/RelationType.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/RelationType.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/RelationType.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java
diff --git a/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDbFactory.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDbFactory.java
similarity index 100%
rename from com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDbFactory.java
rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDbFactory.java
diff --git a/com.minres.scviewer.e4.application/.classpath b/plugins/com.minres.scviewer.e4.application/.classpath
similarity index 100%
rename from com.minres.scviewer.e4.application/.classpath
rename to plugins/com.minres.scviewer.e4.application/.classpath
diff --git a/com.minres.scviewer.database.vcd/.gitignore b/plugins/com.minres.scviewer.e4.application/.gitignore
similarity index 100%
rename from com.minres.scviewer.database.vcd/.gitignore
rename to plugins/com.minres.scviewer.e4.application/.gitignore
diff --git a/com.minres.scviewer.e4.application/.project b/plugins/com.minres.scviewer.e4.application/.project
similarity index 100%
rename from com.minres.scviewer.e4.application/.project
rename to plugins/com.minres.scviewer.e4.application/.project
diff --git a/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs
rename to plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.minres.scviewer.e4.application/.settings/org.eclipse.ltk.core.refactoring.prefs b/plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.ltk.core.refactoring.prefs
similarity index 100%
rename from com.minres.scviewer.e4.application/.settings/org.eclipse.ltk.core.refactoring.prefs
rename to plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/com.minres.scviewer.feature/.settings/org.eclipse.m2e.core.prefs b/plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from com.minres.scviewer.feature/.settings/org.eclipse.m2e.core.prefs
rename to plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.m2e.core.prefs
diff --git a/com.minres.scviewer.database.vcd/.settings/org.eclipse.pde.core.prefs b/plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.vcd/.settings/org.eclipse.pde.core.prefs
rename to plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.pde.core.prefs
diff --git a/com.minres.scviewer.e4.application/Application.e4xmi b/plugins/com.minres.scviewer.e4.application/Application.e4xmi
similarity index 100%
rename from com.minres.scviewer.e4.application/Application.e4xmi
rename to plugins/com.minres.scviewer.e4.application/Application.e4xmi
diff --git a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
similarity index 100%
rename from com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
rename to plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
diff --git a/com.minres.scviewer.e4.application/OSGI-INF/l10n/bundle.properties b/plugins/com.minres.scviewer.e4.application/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from com.minres.scviewer.e4.application/OSGI-INF/l10n/bundle.properties
rename to plugins/com.minres.scviewer.e4.application/OSGI-INF/l10n/bundle.properties
diff --git a/com.minres.scviewer.e4.application/SilkCompanion1.txt b/plugins/com.minres.scviewer.e4.application/SilkCompanion1.txt
similarity index 100%
rename from com.minres.scviewer.e4.application/SilkCompanion1.txt
rename to plugins/com.minres.scviewer.e4.application/SilkCompanion1.txt
diff --git a/com.minres.scviewer.e4.application/build.properties b/plugins/com.minres.scviewer.e4.application/build.properties
similarity index 100%
rename from com.minres.scviewer.e4.application/build.properties
rename to plugins/com.minres.scviewer.e4.application/build.properties
diff --git a/com.minres.scviewer.e4.application/css/default.css b/plugins/com.minres.scviewer.e4.application/css/default.css
similarity index 100%
rename from com.minres.scviewer.e4.application/css/default.css
rename to plugins/com.minres.scviewer.e4.application/css/default.css
diff --git a/com.minres.scviewer.e4.application/famfamfam_silk_icons_v013.txt b/plugins/com.minres.scviewer.e4.application/famfamfam_silk_icons_v013.txt
similarity index 100%
rename from com.minres.scviewer.e4.application/famfamfam_silk_icons_v013.txt
rename to plugins/com.minres.scviewer.e4.application/famfamfam_silk_icons_v013.txt
diff --git a/com.minres.scviewer.e4.application/icons/Minres_logo.png b/plugins/com.minres.scviewer.e4.application/icons/Minres_logo.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/Minres_logo.png
rename to plugins/com.minres.scviewer.e4.application/icons/Minres_logo.png
diff --git a/com.minres.scviewer.e4.application/icons/SCViewer_logo.png b/plugins/com.minres.scviewer.e4.application/icons/SCViewer_logo.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/SCViewer_logo.png
rename to plugins/com.minres.scviewer.e4.application/icons/SCViewer_logo.png
diff --git a/com.minres.scviewer.e4.application/icons/append_all_waves.png b/plugins/com.minres.scviewer.e4.application/icons/append_all_waves.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/append_all_waves.png
rename to plugins/com.minres.scviewer.e4.application/icons/append_all_waves.png
diff --git a/com.minres.scviewer.e4.application/icons/append_wave.png b/plugins/com.minres.scviewer.e4.application/icons/append_wave.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/append_wave.png
rename to plugins/com.minres.scviewer.e4.application/icons/append_wave.png
diff --git a/com.minres.scviewer.e4.application/icons/arrow_up.png b/plugins/com.minres.scviewer.e4.application/icons/arrow_up.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/arrow_up.png
rename to plugins/com.minres.scviewer.e4.application/icons/arrow_up.png
diff --git a/com.minres.scviewer.e4.application/icons/bullet_plus.png b/plugins/com.minres.scviewer.e4.application/icons/bullet_plus.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/bullet_plus.png
rename to plugins/com.minres.scviewer.e4.application/icons/bullet_plus.png
diff --git a/com.minres.scviewer.e4.application/icons/cross.png b/plugins/com.minres.scviewer.e4.application/icons/cross.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/cross.png
rename to plugins/com.minres.scviewer.e4.application/icons/cross.png
diff --git a/com.minres.scviewer.e4.application/icons/database.png b/plugins/com.minres.scviewer.e4.application/icons/database.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/database.png
rename to plugins/com.minres.scviewer.e4.application/icons/database.png
diff --git a/com.minres.scviewer.e4.application/icons/database_go.png b/plugins/com.minres.scviewer.e4.application/icons/database_go.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/database_go.png
rename to plugins/com.minres.scviewer.e4.application/icons/database_go.png
diff --git a/com.minres.scviewer.e4.application/icons/down_blue.png b/plugins/com.minres.scviewer.e4.application/icons/down_blue.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/down_blue.png
rename to plugins/com.minres.scviewer.e4.application/icons/down_blue.png
diff --git a/com.minres.scviewer.e4.application/icons/empty.png b/plugins/com.minres.scviewer.e4.application/icons/empty.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/empty.png
rename to plugins/com.minres.scviewer.e4.application/icons/empty.png
diff --git a/com.minres.scviewer.e4.application/icons/folder.png b/plugins/com.minres.scviewer.e4.application/icons/folder.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/folder.png
rename to plugins/com.minres.scviewer.e4.application/icons/folder.png
diff --git a/com.minres.scviewer.e4.application/icons/folder_database.png b/plugins/com.minres.scviewer.e4.application/icons/folder_database.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/folder_database.png
rename to plugins/com.minres.scviewer.e4.application/icons/folder_database.png
diff --git a/com.minres.scviewer.e4.application/icons/folder_page.png b/plugins/com.minres.scviewer.e4.application/icons/folder_page.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/folder_page.png
rename to plugins/com.minres.scviewer.e4.application/icons/folder_page.png
diff --git a/com.minres.scviewer.e4.application/icons/insert_all_waves.png b/plugins/com.minres.scviewer.e4.application/icons/insert_all_waves.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/insert_all_waves.png
rename to plugins/com.minres.scviewer.e4.application/icons/insert_all_waves.png
diff --git a/com.minres.scviewer.e4.application/icons/insert_wave.png b/plugins/com.minres.scviewer.e4.application/icons/insert_wave.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/insert_wave.png
rename to plugins/com.minres.scviewer.e4.application/icons/insert_wave.png
diff --git a/com.minres.scviewer.e4.application/icons/lightbulb.png b/plugins/com.minres.scviewer.e4.application/icons/lightbulb.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/lightbulb.png
rename to plugins/com.minres.scviewer.e4.application/icons/lightbulb.png
diff --git a/com.minres.scviewer.e4.application/icons/magifier_zoom_out.png b/plugins/com.minres.scviewer.e4.application/icons/magifier_zoom_out.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/magifier_zoom_out.png
rename to plugins/com.minres.scviewer.e4.application/icons/magifier_zoom_out.png
diff --git a/com.minres.scviewer.e4.application/icons/magnifier.png b/plugins/com.minres.scviewer.e4.application/icons/magnifier.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/magnifier.png
rename to plugins/com.minres.scviewer.e4.application/icons/magnifier.png
diff --git a/com.minres.scviewer.e4.application/icons/magnifier_zoom_in.png b/plugins/com.minres.scviewer.e4.application/icons/magnifier_zoom_in.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/magnifier_zoom_in.png
rename to plugins/com.minres.scviewer.e4.application/icons/magnifier_zoom_in.png
diff --git a/com.minres.scviewer.e4.application/icons/page_white.png b/plugins/com.minres.scviewer.e4.application/icons/page_white.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/page_white.png
rename to plugins/com.minres.scviewer.e4.application/icons/page_white.png
diff --git a/com.minres.scviewer.e4.application/icons/play_blue.png b/plugins/com.minres.scviewer.e4.application/icons/play_blue.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/play_blue.png
rename to plugins/com.minres.scviewer.e4.application/icons/play_blue.png
diff --git a/com.minres.scviewer.e4.application/icons/play_green.png b/plugins/com.minres.scviewer.e4.application/icons/play_green.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/play_green.png
rename to plugins/com.minres.scviewer.e4.application/icons/play_green.png
diff --git a/com.minres.scviewer.e4.application/icons/reverse_blue.png b/plugins/com.minres.scviewer.e4.application/icons/reverse_blue.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/reverse_blue.png
rename to plugins/com.minres.scviewer.e4.application/icons/reverse_blue.png
diff --git a/com.minres.scviewer.e4.application/icons/reverse_green.png b/plugins/com.minres.scviewer.e4.application/icons/reverse_green.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/reverse_green.png
rename to plugins/com.minres.scviewer.e4.application/icons/reverse_green.png
diff --git a/com.minres.scviewer.e4.application/icons/save_edit.png b/plugins/com.minres.scviewer.e4.application/icons/save_edit.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/save_edit.png
rename to plugins/com.minres.scviewer.e4.application/icons/save_edit.png
diff --git a/com.minres.scviewer.e4.application/icons/script_save.png b/plugins/com.minres.scviewer.e4.application/icons/script_save.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/script_save.png
rename to plugins/com.minres.scviewer.e4.application/icons/script_save.png
diff --git a/com.minres.scviewer.e4.application/icons/scviewer.png b/plugins/com.minres.scviewer.e4.application/icons/scviewer.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/scviewer.png
rename to plugins/com.minres.scviewer.e4.application/icons/scviewer.png
diff --git a/com.minres.scviewer.e4.application/icons/signal.png b/plugins/com.minres.scviewer.e4.application/icons/signal.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/signal.png
rename to plugins/com.minres.scviewer.e4.application/icons/signal.png
diff --git a/com.minres.scviewer.e4.application/icons/stream.png b/plugins/com.minres.scviewer.e4.application/icons/stream.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/stream.png
rename to plugins/com.minres.scviewer.e4.application/icons/stream.png
diff --git a/com.minres.scviewer.e4.application/icons/tick.png b/plugins/com.minres.scviewer.e4.application/icons/tick.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/tick.png
rename to plugins/com.minres.scviewer.e4.application/icons/tick.png
diff --git a/com.minres.scviewer.e4.application/icons/trash.png b/plugins/com.minres.scviewer.e4.application/icons/trash.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/trash.png
rename to plugins/com.minres.scviewer.e4.application/icons/trash.png
diff --git a/com.minres.scviewer.e4.application/icons/up_blue.png b/plugins/com.minres.scviewer.e4.application/icons/up_blue.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/up_blue.png
rename to plugins/com.minres.scviewer.e4.application/icons/up_blue.png
diff --git a/com.minres.scviewer.e4.application/icons/wave.png b/plugins/com.minres.scviewer.e4.application/icons/wave.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/wave.png
rename to plugins/com.minres.scviewer.e4.application/icons/wave.png
diff --git a/com.minres.scviewer.e4.application/icons/zoom.png b/plugins/com.minres.scviewer.e4.application/icons/zoom.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/zoom.png
rename to plugins/com.minres.scviewer.e4.application/icons/zoom.png
diff --git a/com.minres.scviewer.e4.application/icons/zoom_in.png b/plugins/com.minres.scviewer.e4.application/icons/zoom_in.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/zoom_in.png
rename to plugins/com.minres.scviewer.e4.application/icons/zoom_in.png
diff --git a/com.minres.scviewer.e4.application/icons/zoom_out.png b/plugins/com.minres.scviewer.e4.application/icons/zoom_out.png
similarity index 100%
rename from com.minres.scviewer.e4.application/icons/zoom_out.png
rename to plugins/com.minres.scviewer.e4.application/icons/zoom_out.png
diff --git a/com.minres.scviewer.e4.application/plugin.xml b/plugins/com.minres.scviewer.e4.application/plugin.xml
similarity index 100%
rename from com.minres.scviewer.e4.application/plugin.xml
rename to plugins/com.minres.scviewer.e4.application/plugin.xml
diff --git a/com.minres.scviewer.e4.application/pom.xml b/plugins/com.minres.scviewer.e4.application/pom.xml
similarity index 87%
rename from com.minres.scviewer.e4.application/pom.xml
rename to plugins/com.minres.scviewer.e4.application/pom.xml
index 4ab7a62..8510b31 100644
--- a/com.minres.scviewer.e4.application/pom.xml
+++ b/plugins/com.minres.scviewer.e4.application/pom.xml
@@ -6,7 +6,7 @@
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
   	<version>2.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
+	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>
-  </project>
\ No newline at end of file
+  </project>
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/AppModelId.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/AppModelId.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/AppModelId.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/AppModelId.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/E4LifeCycle.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/Messages.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/NavigateToolbarContribution.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/NavigateToolbarContribution.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/NavigateToolbarContribution.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/NavigateToolbarContribution.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/RelationTypeToolControl.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/RelationTypeToolControl.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/RelationTypeToolControl.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/RelationTypeToolControl.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AboutHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AboutHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AboutHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AboutHandler.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddWaveformHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddWaveformHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddWaveformHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AddWaveformHandler.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeValueDisplay.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeValueDisplay.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeValueDisplay.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeValueDisplay.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeWaveformDisplay.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeWaveformDisplay.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeWaveformDisplay.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ChangeWaveformDisplay.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/DeleteWaveformHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/DeleteWaveformHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/DeleteWaveformHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/DeleteWaveformHandler.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableHover.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/EnableHover.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/LoadStoreSettingsHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/LoadStoreSettingsHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/LoadStoreSettingsHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/LoadStoreSettingsHandler.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/MoveWaveformHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/MoveWaveformHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/MoveWaveformHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/MoveWaveformHandler.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateEvent.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateEvent.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateEvent.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateEvent.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateTrans.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateTrans.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateTrans.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateTrans.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/QuitHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/QuitHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/QuitHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/QuitHandler.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SaveHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SaveHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SaveHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SaveHandler.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SetRelationTypeHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SetRelationTypeHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SetRelationTypeHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SetRelationTypeHandler.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ThemeSetHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ThemeSetHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ThemeSetHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ThemeSetHandler.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ZoomHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ZoomHandler.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ZoomHandler.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/ZoomHandler.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/HeapStatus.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/HeapStatus.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/HeapStatus.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/HeapStatus.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/IHeapStatusConstants.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/IHeapStatusConstants.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/IHeapStatusConstants.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/IHeapStatusConstants.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/StatusBarControl.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/StatusBarControl.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/StatusBarControl.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/StatusBarControl.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/TrimUtil.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/TrimUtil.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/TrimUtil.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/TrimUtil.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/WaveStatusBarControl.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/WaveStatusBarControl.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/FileMonitor.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/FileMonitor.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/FileMonitor.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/FileMonitor.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/IFileChangeListener.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/IFileChangeListener.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/IFileChangeListener.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/IFileChangeListener.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/IModificationChecker.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/IModificationChecker.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/IModificationChecker.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/util/IModificationChecker.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/OptionData.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/OptionData.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/OptionData.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/OptionData.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/OptionSet.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/OptionSet.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/OptionSet.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/OptionSet.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/Options.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/Options.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/Options.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/Options.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/FileBrowserDialog.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/FileBrowserDialog.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/FileBrowserDialog.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/FileBrowserDialog.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/LoadingWaveformDb.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/LoadingWaveformDb.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/LoadingWaveformDb.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/LoadingWaveformDb.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/PartListener.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/PartListener.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/PartListener.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/PartListener.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferenceConstants.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferenceConstants.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferenceConstants.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferenceConstants.java
diff --git a/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
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferencesStoreProvider.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferencesStoreProvider.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/SCViewerPreferencesPage.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/SCViewerPreferencesPage.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/SCViewerPreferencesPage.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/SCViewerPreferencesPage.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/WaveformPreferencesPage.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/WaveformPreferencesPage.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/WaveformPreferencesPage.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/WaveformPreferencesPage.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbContentProvider.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesContentProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesContentProvider.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesContentProvider.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesContentProvider.java
diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesLabelProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesLabelProvider.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesLabelProvider.java
rename to plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesLabelProvider.java
diff --git a/com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/ResourceManager.java b/plugins/com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/ResourceManager.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/ResourceManager.java
rename to plugins/com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/ResourceManager.java
diff --git a/com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/SWTResourceManager.java b/plugins/com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/SWTResourceManager.java
similarity index 100%
rename from com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/SWTResourceManager.java
rename to plugins/com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/SWTResourceManager.java
diff --git a/com.minres.scviewer.ui/.classpath b/plugins/com.minres.scviewer.ui/.classpath
similarity index 100%
rename from com.minres.scviewer.ui/.classpath
rename to plugins/com.minres.scviewer.ui/.classpath
diff --git a/com.minres.scviewer.ui/.gitignore b/plugins/com.minres.scviewer.ui/.gitignore
similarity index 100%
rename from com.minres.scviewer.ui/.gitignore
rename to plugins/com.minres.scviewer.ui/.gitignore
diff --git a/com.minres.scviewer.ui/.project b/plugins/com.minres.scviewer.ui/.project
similarity index 100%
rename from com.minres.scviewer.ui/.project
rename to plugins/com.minres.scviewer.ui/.project
diff --git a/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.minres.scviewer.ui/.settings/org.eclipse.jdt.groovy.core.prefs b/plugins/com.minres.scviewer.ui/.settings/org.eclipse.jdt.groovy.core.prefs
similarity index 100%
rename from com.minres.scviewer.ui/.settings/org.eclipse.jdt.groovy.core.prefs
rename to plugins/com.minres.scviewer.ui/.settings/org.eclipse.jdt.groovy.core.prefs
diff --git a/com.minres.scviewer.parent/.settings/org.eclipse.m2e.core.prefs b/plugins/com.minres.scviewer.ui/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from com.minres.scviewer.parent/.settings/org.eclipse.m2e.core.prefs
rename to plugins/com.minres.scviewer.ui/.settings/org.eclipse.m2e.core.prefs
diff --git a/com.minres.scviewer.ui/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from com.minres.scviewer.ui/META-INF/MANIFEST.MF
rename to plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF
diff --git a/com.minres.scviewer.ui/OSGI-INF/component.xml b/plugins/com.minres.scviewer.ui/OSGI-INF/component.xml
similarity index 100%
rename from com.minres.scviewer.ui/OSGI-INF/component.xml
rename to plugins/com.minres.scviewer.ui/OSGI-INF/component.xml
diff --git a/com.minres.scviewer.ui/SilkCompanion1.txt b/plugins/com.minres.scviewer.ui/SilkCompanion1.txt
similarity index 100%
rename from com.minres.scviewer.ui/SilkCompanion1.txt
rename to plugins/com.minres.scviewer.ui/SilkCompanion1.txt
diff --git a/com.minres.scviewer.ui/build.properties b/plugins/com.minres.scviewer.ui/build.properties
similarity index 100%
rename from com.minres.scviewer.ui/build.properties
rename to plugins/com.minres.scviewer.ui/build.properties
diff --git a/com.minres.scviewer.ui/contexts.xml b/plugins/com.minres.scviewer.ui/contexts.xml
similarity index 100%
rename from com.minres.scviewer.ui/contexts.xml
rename to plugins/com.minres.scviewer.ui/contexts.xml
diff --git a/com.minres.scviewer.ui/famfamfam_silk_icons_v013.txt b/plugins/com.minres.scviewer.ui/famfamfam_silk_icons_v013.txt
similarity index 100%
rename from com.minres.scviewer.ui/famfamfam_silk_icons_v013.txt
rename to plugins/com.minres.scviewer.ui/famfamfam_silk_icons_v013.txt
diff --git a/com.minres.scviewer.ui/plugin.xml b/plugins/com.minres.scviewer.ui/plugin.xml
similarity index 100%
rename from com.minres.scviewer.ui/plugin.xml
rename to plugins/com.minres.scviewer.ui/plugin.xml
diff --git a/com.minres.scviewer.ui/pom.xml b/plugins/com.minres.scviewer.ui/pom.xml
similarity index 87%
rename from com.minres.scviewer.ui/pom.xml
rename to plugins/com.minres.scviewer.ui/pom.xml
index 7552419..d932c0a 100644
--- a/com.minres.scviewer.ui/pom.xml
+++ b/plugins/com.minres.scviewer.ui/pom.xml
@@ -5,8 +5,8 @@
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
   	<version>2.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
+	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>
   <version>1.0.1-SNAPSHOT</version>
-</project>
\ No newline at end of file
+</project>
diff --git a/com.minres.scviewer.ui/res/images/cross.png b/plugins/com.minres.scviewer.ui/res/images/cross.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/cross.png
rename to plugins/com.minres.scviewer.ui/res/images/cross.png
diff --git a/com.minres.scviewer.ui/res/images/database.png b/plugins/com.minres.scviewer.ui/res/images/database.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/database.png
rename to plugins/com.minres.scviewer.ui/res/images/database.png
diff --git a/com.minres.scviewer.ui/res/images/folder.png b/plugins/com.minres.scviewer.ui/res/images/folder.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/folder.png
rename to plugins/com.minres.scviewer.ui/res/images/folder.png
diff --git a/com.minres.scviewer.ui/res/images/next-green-d.png b/plugins/com.minres.scviewer.ui/res/images/next-green-d.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/next-green-d.png
rename to plugins/com.minres.scviewer.ui/res/images/next-green-d.png
diff --git a/com.minres.scviewer.ui/res/images/next-green.png b/plugins/com.minres.scviewer.ui/res/images/next-green.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/next-green.png
rename to plugins/com.minres.scviewer.ui/res/images/next-green.png
diff --git a/com.minres.scviewer.ui/res/images/previous-green-d.png b/plugins/com.minres.scviewer.ui/res/images/previous-green-d.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/previous-green-d.png
rename to plugins/com.minres.scviewer.ui/res/images/previous-green-d.png
diff --git a/com.minres.scviewer.ui/res/images/previous-green.png b/plugins/com.minres.scviewer.ui/res/images/previous-green.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/previous-green.png
rename to plugins/com.minres.scviewer.ui/res/images/previous-green.png
diff --git a/com.minres.scviewer.ui/res/images/scviewer.gif b/plugins/com.minres.scviewer.ui/res/images/scviewer.gif
similarity index 100%
rename from com.minres.scviewer.ui/res/images/scviewer.gif
rename to plugins/com.minres.scviewer.ui/res/images/scviewer.gif
diff --git a/com.minres.scviewer.ui/res/images/scviewer.png b/plugins/com.minres.scviewer.ui/res/images/scviewer.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/scviewer.png
rename to plugins/com.minres.scviewer.ui/res/images/scviewer.png
diff --git a/com.minres.scviewer.ui/res/images/signal.png b/plugins/com.minres.scviewer.ui/res/images/signal.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/signal.png
rename to plugins/com.minres.scviewer.ui/res/images/signal.png
diff --git a/com.minres.scviewer.ui/res/images/stream.png b/plugins/com.minres.scviewer.ui/res/images/stream.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/stream.png
rename to plugins/com.minres.scviewer.ui/res/images/stream.png
diff --git a/com.minres.scviewer.ui/res/images/zoom.png b/plugins/com.minres.scviewer.ui/res/images/zoom.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/zoom.png
rename to plugins/com.minres.scviewer.ui/res/images/zoom.png
diff --git a/com.minres.scviewer.ui/res/images/zoom_in.png b/plugins/com.minres.scviewer.ui/res/images/zoom_in.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/zoom_in.png
rename to plugins/com.minres.scviewer.ui/res/images/zoom_in.png
diff --git a/com.minres.scviewer.ui/res/images/zoom_out.png b/plugins/com.minres.scviewer.ui/res/images/zoom_out.png
similarity index 100%
rename from com.minres.scviewer.ui/res/images/zoom_out.png
rename to plugins/com.minres.scviewer.ui/res/images/zoom_out.png
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/Hex.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/Hex.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/Hex.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/Hex.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorActionBarContributor.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorActionBarContributor.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorActionBarContributor.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorActionBarContributor.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorInput.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorInput.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorInput.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorInput.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorInputFactory.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorInputFactory.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorInputFactory.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorInputFactory.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPlugin.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/ITransactionPropertySource.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/ITransactionPropertySource.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/ITransactionPropertySource.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/ITransactionPropertySource.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/TxAdapterFactory.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/TxAdapterFactory.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/TxAdapterFactory.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/TxAdapterFactory.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/GotoNext.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/GotoNext.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/GotoNext.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/GotoNext.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/GotoPrev.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/GotoPrev.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/GotoPrev.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/GotoPrev.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/RemoveHandler.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/RemoveHandler.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/RemoveHandler.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/RemoveHandler.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/Zoom.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/Zoom.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/Zoom.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/Zoom.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/ZoomInOut.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/ZoomInOut.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/ZoomInOut.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/ZoomInOut.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/SelectionTableView.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/SelectionTableView.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/SelectionTableView.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/SelectionTableView.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/TransactionPropertySheet.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/TransactionPropertySheet.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/TransactionPropertySheet.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/TransactionPropertySheet.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/TxOutlinePage.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/TxOutlinePage.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/TxOutlinePage.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/TxOutlinePage.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeContentProvider.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeContentProvider.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeContentProvider.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeContentProvider.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/AttributeProperty.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/AttributeProperty.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/AttributeProperty.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/AttributeProperty.java
diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/RelatedProperty.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/RelatedProperty.java
similarity index 100%
rename from com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/RelatedProperty.java
rename to plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/RelatedProperty.java
diff --git a/com.minres.scviewer.ui/src/org/eclipse/wb/swt/SWTResourceManager.java b/plugins/com.minres.scviewer.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
similarity index 100%
rename from com.minres.scviewer.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
rename to plugins/com.minres.scviewer.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
diff --git a/com.minres.scviewer.parent/pom.xml b/pom.xml
similarity index 81%
rename from com.minres.scviewer.parent/pom.xml
rename to pom.xml
index e016903..bd842f0 100644
--- a/com.minres.scviewer.parent/pom.xml
+++ b/pom.xml
@@ -7,19 +7,19 @@
 	<version>2.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
-		<module>../com.minres.scviewer.target</module>
-		<module>../com.minres.scviewer.database</module>
-		<module>../com.minres.scviewer.database.sqlite</module>
-		<module>../com.minres.scviewer.database.text</module>
-		<module>../com.minres.scviewer.database.vcd</module>
-		<module>../com.minres.scviewer.database.test</module>
-		<module>../com.minres.scviewer.database.ui</module>
-		<module>../com.minres.scviewer.database.ui.swt</module>
-		<module>../com.minres.scviewer.e4.application</module>
-		<module>../com.minres.scviewer.ui</module>
-		<module>../com.minres.scviewer.feature</module>
-		<module>../com.minres.scviewer.updateSite</module>
-		<module>../com.minres.scviewer.e4.product</module>
+		<module>com.minres.scviewer.target</module>
+		<module>plugins/com.minres.scviewer.database</module>
+		<module>plugins/com.minres.scviewer.database.sqlite</module>
+		<module>plugins/com.minres.scviewer.database.text</module>
+		<module>plugins/com.minres.scviewer.database.vcd</module>
+		<module>tests/com.minres.scviewer.database.test</module>
+		<module>plugins/com.minres.scviewer.database.ui</module>
+		<module>plugins/com.minres.scviewer.database.ui.swt</module>
+		<module>plugins/com.minres.scviewer.e4.application</module>
+		<module>plugins/com.minres.scviewer.ui</module>
+		<module>features/com.minres.scviewer.feature</module>
+		<module>p2repositories//com.minres.scviewer.updateSite</module>
+		<module>com.minres.scviewer.e4.product</module>
 	</modules>
 
 	<properties>
@@ -140,4 +140,4 @@
 
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/com.minres.scviewer.database.test/.classpath b/tests/com.minres.scviewer.database.test/.classpath
similarity index 100%
rename from com.minres.scviewer.database.test/.classpath
rename to tests/com.minres.scviewer.database.test/.classpath
diff --git a/com.minres.scviewer.e4.application/.gitignore b/tests/com.minres.scviewer.database.test/.gitignore
similarity index 100%
rename from com.minres.scviewer.e4.application/.gitignore
rename to tests/com.minres.scviewer.database.test/.gitignore
diff --git a/com.minres.scviewer.database.test/.project b/tests/com.minres.scviewer.database.test/.project
similarity index 100%
rename from com.minres.scviewer.database.test/.project
rename to tests/com.minres.scviewer.database.test/.project
diff --git a/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs b/tests/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs
rename to tests/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.minres.scviewer.ui/.settings/org.eclipse.m2e.core.prefs b/tests/com.minres.scviewer.database.test/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from com.minres.scviewer.ui/.settings/org.eclipse.m2e.core.prefs
rename to tests/com.minres.scviewer.database.test/.settings/org.eclipse.m2e.core.prefs
diff --git a/com.minres.scviewer.e4.application/.settings/org.eclipse.pde.core.prefs b/tests/com.minres.scviewer.database.test/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from com.minres.scviewer.e4.application/.settings/org.eclipse.pde.core.prefs
rename to tests/com.minres.scviewer.database.test/.settings/org.eclipse.pde.core.prefs
diff --git a/com.minres.scviewer.database.test/DatabaseServicesTest.launch b/tests/com.minres.scviewer.database.test/DatabaseServicesTest.launch
similarity index 100%
rename from com.minres.scviewer.database.test/DatabaseServicesTest.launch
rename to tests/com.minres.scviewer.database.test/DatabaseServicesTest.launch
diff --git a/com.minres.scviewer.database.test/META-INF/MANIFEST.MF b/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF
similarity index 100%
rename from com.minres.scviewer.database.test/META-INF/MANIFEST.MF
rename to tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF
diff --git a/com.minres.scviewer.database.test/OSGI-INF/component.xml b/tests/com.minres.scviewer.database.test/OSGI-INF/component.xml
similarity index 100%
rename from com.minres.scviewer.database.test/OSGI-INF/component.xml
rename to tests/com.minres.scviewer.database.test/OSGI-INF/component.xml
diff --git a/com.minres.scviewer.database.test/build.properties b/tests/com.minres.scviewer.database.test/build.properties
similarity index 100%
rename from com.minres.scviewer.database.test/build.properties
rename to tests/com.minres.scviewer.database.test/build.properties
diff --git a/com.minres.scviewer.database.test/inputs/.gitignore b/tests/com.minres.scviewer.database.test/inputs/.gitignore
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/.gitignore
rename to tests/com.minres.scviewer.database.test/inputs/.gitignore
diff --git a/com.minres.scviewer.database.test/inputs/my_db.txlog b/tests/com.minres.scviewer.database.test/inputs/my_db.txlog
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/my_db.txlog
rename to tests/com.minres.scviewer.database.test/inputs/my_db.txlog
diff --git a/com.minres.scviewer.database.test/inputs/my_db.vcd b/tests/com.minres.scviewer.database.test/inputs/my_db.vcd
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/my_db.vcd
rename to tests/com.minres.scviewer.database.test/inputs/my_db.vcd
diff --git a/com.minres.scviewer.database.test/inputs/my_db_truncated.txlog b/tests/com.minres.scviewer.database.test/inputs/my_db_truncated.txlog
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/my_db_truncated.txlog
rename to tests/com.minres.scviewer.database.test/inputs/my_db_truncated.txlog
diff --git a/com.minres.scviewer.database.test/inputs/my_ldb.txldb/000005.sst b/tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/000005.sst
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/my_ldb.txldb/000005.sst
rename to tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/000005.sst
diff --git a/com.minres.scviewer.database.test/inputs/my_ldb.txldb/000046.log b/tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/000046.log
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/my_ldb.txldb/000046.log
rename to tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/000046.log
diff --git a/com.minres.scviewer.database.test/inputs/my_ldb.txldb/CURRENT b/tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/CURRENT
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/my_ldb.txldb/CURRENT
rename to tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/CURRENT
diff --git a/com.minres.scviewer.database.test/inputs/my_ldb.txldb/LOCK b/tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/LOCK
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/my_ldb.txldb/LOCK
rename to tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/LOCK
diff --git a/com.minres.scviewer.database.test/inputs/my_ldb.txldb/LOG b/tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/LOG
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/my_ldb.txldb/LOG
rename to tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/LOG
diff --git a/com.minres.scviewer.database.test/inputs/my_ldb.txldb/MANIFEST-000045 b/tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/MANIFEST-000045
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/my_ldb.txldb/MANIFEST-000045
rename to tests/com.minres.scviewer.database.test/inputs/my_ldb.txldb/MANIFEST-000045
diff --git a/com.minres.scviewer.database.test/inputs/my_ldb.vcd b/tests/com.minres.scviewer.database.test/inputs/my_ldb.vcd
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/my_ldb.vcd
rename to tests/com.minres.scviewer.database.test/inputs/my_ldb.vcd
diff --git a/com.minres.scviewer.database.test/inputs/my_sqldb.txdb b/tests/com.minres.scviewer.database.test/inputs/my_sqldb.txdb
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/my_sqldb.txdb
rename to tests/com.minres.scviewer.database.test/inputs/my_sqldb.txdb
diff --git a/com.minres.scviewer.database.test/inputs/simple_system.vcd b/tests/com.minres.scviewer.database.test/inputs/simple_system.vcd
similarity index 100%
rename from com.minres.scviewer.database.test/inputs/simple_system.vcd
rename to tests/com.minres.scviewer.database.test/inputs/simple_system.vcd
diff --git a/com.minres.scviewer.database.test/pom.xml b/tests/com.minres.scviewer.database.test/pom.xml
similarity index 91%
rename from com.minres.scviewer.database.test/pom.xml
rename to tests/com.minres.scviewer.database.test/pom.xml
index 98726df..7faec89 100644
--- a/com.minres.scviewer.database.test/pom.xml
+++ b/tests/com.minres.scviewer.database.test/pom.xml
@@ -7,7 +7,7 @@
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
 		<version>2.0.0-SNAPSHOT</version>
-		<relativePath>../com.minres.scviewer.parent</relativePath>
+		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-test-plugin</packaging>
 	<build>
@@ -19,4 +19,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java
similarity index 100%
rename from com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java
rename to tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java

From 688a6abd995c6d040aa5ee2890e9ab57dce13096 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Thu, 11 Jun 2020 08:31:24 +0200
Subject: [PATCH 14/15] add set of features

---
 .project                                      |  67 ++++++++++++
 .../.gitignore                                |   1 +
 .../.project                                  |  23 ++++
 .../build.properties                          |   2 +
 .../feature.properties                        | 102 ++++++++++++++++++
 .../feature.xml                               |  88 +++++++++++++++
 .../pom.xml                                   |  12 +++
 .../com.minres.scviewer.e4.feature/.project   |  17 +++
 .../build.properties                          |   1 +
 .../feature.xml                               |  74 +++++++++++++
 .../com.minres.scviewer.e4.feature/pom.xml    |  12 +++
 .../com.minres.scviewer.feature/feature.xml   |  78 +++-----------
 .../com.minres.scviewer.ui.feature/.gitignore |   1 +
 .../com.minres.scviewer.ui.feature/.project   |  17 +++
 .../build.properties                          |   1 +
 .../feature.xml                               |  20 ++++
 .../com.minres.scviewer.ui.feature/pom.xml    |  12 +++
 .../category.xml                              |   3 +
 pom.xml                                       |  49 +++++----
 .../inputs/.gitignore                         |   4 +-
 20 files changed, 499 insertions(+), 85 deletions(-)
 create mode 100644 .project
 create mode 100644 features/com.minres.scviewer.database.feature/.gitignore
 create mode 100644 features/com.minres.scviewer.database.feature/.project
 create mode 100644 features/com.minres.scviewer.database.feature/build.properties
 create mode 100644 features/com.minres.scviewer.database.feature/feature.properties
 create mode 100644 features/com.minres.scviewer.database.feature/feature.xml
 create mode 100644 features/com.minres.scviewer.database.feature/pom.xml
 create mode 100644 features/com.minres.scviewer.e4.feature/.project
 create mode 100644 features/com.minres.scviewer.e4.feature/build.properties
 create mode 100644 features/com.minres.scviewer.e4.feature/feature.xml
 create mode 100644 features/com.minres.scviewer.e4.feature/pom.xml
 create mode 100644 features/com.minres.scviewer.ui.feature/.gitignore
 create mode 100644 features/com.minres.scviewer.ui.feature/.project
 create mode 100644 features/com.minres.scviewer.ui.feature/build.properties
 create mode 100644 features/com.minres.scviewer.ui.feature/feature.xml
 create mode 100644 features/com.minres.scviewer.ui.feature/pom.xml

diff --git a/.project b/.project
new file mode 100644
index 0000000..ca46730
--- /dev/null
+++ b/.project
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>scviewer.parent</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1591076960924</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-features</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1591076960932</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-plugins</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1591076960936</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-com.minres.*</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1591076960939</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-product</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1591076960950</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-tests</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1591076960954</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-p2repositories</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/features/com.minres.scviewer.database.feature/.gitignore b/features/com.minres.scviewer.database.feature/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/features/com.minres.scviewer.database.feature/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/features/com.minres.scviewer.database.feature/.project b/features/com.minres.scviewer.database.feature/.project
new file mode 100644
index 0000000..8925c4a
--- /dev/null
+++ b/features/com.minres.scviewer.database.feature/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.minres.scviewer.database.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/com.minres.scviewer.database.feature/build.properties b/features/com.minres.scviewer.database.feature/build.properties
new file mode 100644
index 0000000..b3a611b
--- /dev/null
+++ b/features/com.minres.scviewer.database.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/com.minres.scviewer.database.feature/feature.properties b/features/com.minres.scviewer.database.feature/feature.properties
new file mode 100644
index 0000000..767ee18
--- /dev/null
+++ b/features/com.minres.scviewer.database.feature/feature.properties
@@ -0,0 +1,102 @@
+featureName=SystemC simulation results viewer
+providerName=MINRES Technologies GmbH
+updateSiteName=SC Viewer Database Updates
+description=A viewer for SystemC Verification Library transactions and VCD signals.
+licenseURL=license.html
+license=\
+ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
+March 17, 2005\n\
+\n\
+Usage Of Content\n\
+\n\
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
+BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
+Applicable Licenses\n\
+\n\
+Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
+is provided to you under the terms and conditions of the Eclipse Public\n\
+License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
+Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
+For purposes of the EPL, "Program" will mean the Content.\n\
+\n\
+Content includes, but is not limited to, source code, object code,\n\
+documentation and other files maintained in the Eclipse.org CVS\n\
+repository ("Repository") in CVS modules ("Modules") and made available\n\
+as downloadable archives ("Downloads").\n\
+\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
+\n\
+Features may also include other Features ("Included Features"). Files named\n\
+"feature.xml" may contain a list of the names and version numbers of\n\
+Included Features.\n\
+\n\
+The terms and conditions governing Plug-ins and Fragments should be\n\
+contained in files named "about.html" ("Abouts"). The terms and\n\
+conditions governing Features and Included Features should be contained\n\
+in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
+Licenses may be located in any directory of a Download or Module\n\
+including, but not limited to the following locations:\n\
+\n\
+   - The top-level (root) directory\n\
+   - Plug-in and Fragment directories\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
+   - Feature directories\n\
+\n\
+Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
+Eclipse Update Manager, you must agree to a license ("Feature Update\n\
+License") during the installation process. If the Feature contains\n\
+Included Features, the Feature Update License should either provide you\n\
+with the terms and conditions governing the Included Features or inform\n\
+you where you can locate them. Feature Update Licenses may be found in\n\
+the "license" property of files named "feature.properties". Such Abouts,\n\
+Feature Licenses and Feature Update Licenses contain the terms and\n\
+conditions (or references to such terms and conditions) that govern your\n\
+use of the associated Content in that directory.\n\
+\n\
+THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
+\n\
+    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
+    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
+    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
+    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
+    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
+    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
+\n\
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
+TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
+is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
+govern that particular Content.\n\
+\n\
+Cryptography\n\
+\n\
+Content may contain encryption software. The country in which you are\n\
+currently may have restrictions on the import, possession, and use,\n\
+and/or re-export to another country, of encryption software. BEFORE\n\
+using any encryption software, please check the country's laws,\n\
+regulations and policies concerning the import, possession, or use,\n\
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
diff --git a/features/com.minres.scviewer.database.feature/feature.xml b/features/com.minres.scviewer.database.feature/feature.xml
new file mode 100644
index 0000000..7550686
--- /dev/null
+++ b/features/com.minres.scviewer.database.feature/feature.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.minres.scviewer.database.feature"
+      label="%featureName"
+      version="1.0.0.qualifier"
+      provider-name="%providerName">
+
+   <description>
+      A viewer for SystemC Verification Library transactions and VCD 
+signals. It supports a SQLite based recording as well as the built-in
+text base recording.
+   </description>
+
+   <copyright>
+      Copyright (c) 2015 MINRES Technologies GmbH.
+All rights reserved. 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
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <url>
+      <update label="%updateSiteName" url="http://www.minres.com/scviewer/update"/>
+      <discovery label="MINRES Website" url="http://www.minres.com"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.osgi.services" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.osgi"/>
+      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="com.minres.scviewer.database.ui" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.jface.text"/>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.ui.editors"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.ui.views.properties.tabbed"/>
+      <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.swt" version="3.103.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.equinox.registry"/>
+      <import plugin="org.codehaus.groovy" version="2.5.8" match="greaterOrEqual"/>
+      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="com.minres.scviewer.database"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.minres.scviewer.database.text"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.minres.scviewer.database.sqlite"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.codehaus.groovy"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="com.minres.scviewer.database.vcd"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/com.minres.scviewer.database.feature/pom.xml b/features/com.minres.scviewer.database.feature/pom.xml
new file mode 100644
index 0000000..83ceb26
--- /dev/null
+++ b/features/com.minres.scviewer.database.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.database.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/features/com.minres.scviewer.e4.feature/.project b/features/com.minres.scviewer.e4.feature/.project
new file mode 100644
index 0000000..1dc2b2b
--- /dev/null
+++ b/features/com.minres.scviewer.e4.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.minres.scviewer.e4.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.feature/build.properties b/features/com.minres.scviewer.e4.feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/features/com.minres.scviewer.e4.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/features/com.minres.scviewer.e4.feature/feature.xml b/features/com.minres.scviewer.e4.feature/feature.xml
new file mode 100644
index 0000000..d20eca7
--- /dev/null
+++ b/features/com.minres.scviewer.e4.feature/feature.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.minres.scviewer.e4.feature"
+      label="SCViewer 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>
+
+   <url>
+      <update label="SC Viewer Updates" url="http://www.minres.com/scviewer/update"/>
+   </url>
+
+   <includes
+         id="com.minres.scviewer.database.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.minres.scviewer.ui.feature"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.11.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.swt" version="3.104.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.ui.model.workbench" version="1.1.100" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface" version="3.11.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.ui.services" version="1.2.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.ui.workbench" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.core.di" version="1.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.ui.di" version="1.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.core.contexts" version="1.4.0" match="greaterOrEqual"/>
+      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="com.minres.scviewer.database.ui"/>
+      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.osgi.services" version="3.5.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.core.services" version="2.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.jobs"/>
+      <import plugin="org.eclipse.osgi"/>
+      <import plugin="com.google.guava"/>
+      <import plugin="org.eclipse.equinox.preferences"/>
+      <import plugin="org.eclipse.core.expressions"/>
+      <import plugin="org.eclipse.e4.core.commands" version="0.11.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.e4.ui.workbench.addons.swt"/>
+      <import plugin="com.opcoach.e4.preferences"/>
+      <import plugin="org.eclipse.e4.core.di.extensions"/>
+      <import plugin="org.eclipse.e4.ui.css.swt.theme" version="0.10.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.resources" version="3.13.0" match="greaterOrEqual"/>
+      <import plugin="com.opcoach.e4.preferences.mainmenu" version="1.2.0" match="greaterOrEqual"/>
+      <import feature="com.opcoach.e4.preferences.feature" version="1.3.0.202004072127"/>
+      <import feature="org.eclipse.equinox.executable" version="3.8.700.v20200207-2156"/>
+      <import feature="org.eclipse.equinox.sdk" version="3.20.100.v20200303-1901"/>
+      <import feature="org.eclipse.sdk" version="4.15.0.v20200305-0155"/>
+      <import feature="org.eclipse.rcptt.core" version="2.5.1.M3"/>
+   </requires>
+
+   <plugin
+         id="com.minres.scviewer.e4.application"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/com.minres.scviewer.e4.feature/pom.xml b/features/com.minres.scviewer.e4.feature/pom.xml
new file mode 100644
index 0000000..9556b46
--- /dev/null
+++ b/features/com.minres.scviewer.e4.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.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/features/com.minres.scviewer.feature/feature.xml b/features/com.minres.scviewer.feature/feature.xml
index bebca53..f4f471e 100644
--- a/features/com.minres.scviewer.feature/feature.xml
+++ b/features/com.minres.scviewer.feature/feature.xml
@@ -28,10 +28,15 @@ http://www.eclipse.org/legal/epl-v10.html
       <discovery label="MINRES Website" url="http://www.minres.com"/>
    </url>
 
+   <includes
+         id="com.minres.scviewer.database.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="com.minres.scviewer.ui.feature"
+         version="0.0.0"/>
+
    <requires>
-      <import plugin="org.eclipse.osgi.services" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.osgi"/>
       <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="com.minres.scviewer.database.ui" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
@@ -43,69 +48,13 @@ http://www.eclipse.org/legal/epl-v10.html
       <import plugin="org.eclipse.ui.ide"/>
       <import plugin="org.eclipse.ui.views.properties.tabbed"/>
       <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.osgi"/>
       <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.swt" version="3.103.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.registry"/>
-      <import plugin="org.codehaus.groovy" version="2.5.8" match="greaterOrEqual"/>
+      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
       <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
    </requires>
 
-   <plugin
-         id="com.minres.scviewer.database"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.minres.scviewer.database.text"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.minres.scviewer.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.minres.scviewer.database.sqlite"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.codehaus.groovy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="com.minres.scviewer.database.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.minres.scviewer.database.ui.swt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.minres.scviewer.database.vcd"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.junit"
          download-size="0"
@@ -119,4 +68,11 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.minres.scviewer.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/features/com.minres.scviewer.ui.feature/.gitignore b/features/com.minres.scviewer.ui.feature/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/features/com.minres.scviewer.ui.feature/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/features/com.minres.scviewer.ui.feature/.project b/features/com.minres.scviewer.ui.feature/.project
new file mode 100644
index 0000000..4cc8d6a
--- /dev/null
+++ b/features/com.minres.scviewer.ui.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.minres.scviewer.ui.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.ui.feature/build.properties b/features/com.minres.scviewer.ui.feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/features/com.minres.scviewer.ui.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/features/com.minres.scviewer.ui.feature/feature.xml b/features/com.minres.scviewer.ui.feature/feature.xml
new file mode 100644
index 0000000..f9c3d4b
--- /dev/null
+++ b/features/com.minres.scviewer.ui.feature/feature.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.minres.scviewer.ui.feature"
+      label="SCViewer UI"
+      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>
+
+</feature>
diff --git a/features/com.minres.scviewer.ui.feature/pom.xml b/features/com.minres.scviewer.ui.feature/pom.xml
new file mode 100644
index 0000000..2d31c46
--- /dev/null
+++ b/features/com.minres.scviewer.ui.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.ui.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/p2repositories/com.minres.scviewer.updateSite/category.xml b/p2repositories/com.minres.scviewer.updateSite/category.xml
index a4f42b6..f11caad 100644
--- a/p2repositories/com.minres.scviewer.updateSite/category.xml
+++ b/p2repositories/com.minres.scviewer.updateSite/category.xml
@@ -3,6 +3,9 @@
    <feature url="features/com.minres.scviewer.feature_1.0.0.qualifier.jar" id="com.minres.scviewer.feature" version="1.0.0.qualifier">
       <category name="com.minres.scviewer"/>
    </feature>
+   <feature url="features/com.minres.scviewer.feature.source_1.0.0.qualifier.jar" id="com.minres.scviewer.feature.source" version="1.0.0.qualifier">
+      <category name="com.minres.scviewer"/>
+   </feature>
    <category-def name="com.minres.scviewer" label="SCViewer">
       <description>
          Viewer for SystemC Verification (SCV) library&apos;s transaction recording
diff --git a/pom.xml b/pom.xml
index bd842f0..bb5207c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,10 @@
 		<module>plugins/com.minres.scviewer.database.ui.swt</module>
 		<module>plugins/com.minres.scviewer.e4.application</module>
 		<module>plugins/com.minres.scviewer.ui</module>
+		<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.feature</module>
 		<module>p2repositories//com.minres.scviewer.updateSite</module>
 		<module>com.minres.scviewer.e4.product</module>
 	</modules>
@@ -52,6 +55,29 @@
 				</executions>
 			</plugin>
 
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho-version}</version>
+
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+
+				<configuration>
+					<excludes>
+						<!-- provide plug-ins not containing any source code -->
+						<plugin id="org.codehaus.groovy" />
+					</excludes>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-p2-plugin</artifactId>
@@ -115,29 +141,6 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho-version}</version>
-
-				<executions>
-					<execution>
-						<id>source-feature</id>
-						<phase>package</phase>
-						<goals>
-							<goal>source-feature</goal>
-						</goals>
-					</execution>
-				</executions>
-
-				<configuration>
-					<excludes>
-						<!-- provide plug-ins not containing any source code -->
-						<plugin id="org.codehaus.groovy" />
-					</excludes>
-				</configuration>
-			</plugin>
-
 		</plugins>
 	</build>
 </project>
diff --git a/tests/com.minres.scviewer.database.test/inputs/.gitignore b/tests/com.minres.scviewer.database.test/inputs/.gitignore
index e89429b..947900c 100644
--- a/tests/com.minres.scviewer.database.test/inputs/.gitignore
+++ b/tests/com.minres.scviewer.database.test/inputs/.gitignore
@@ -1,2 +1,4 @@
 /.scviewer.*
-/.my_db.txlog*
\ No newline at end of file
+/.my_db.txlog*
+/EyeQ6_mem_platform.txlog
+/EyeQ6_mem_platform.vcd

From 35ccc71f102f1188fddd76f876958a8b68f2506f Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Thu, 11 Jun 2020 10:51:59 +0200
Subject: [PATCH 15/15] fix TransactionDetails handling of attributes

---
 .../com.minres.scviewer.e4.feature/.gitignore |   1 +
 .../application/parts/TransactionDetails.java | 162 ++++++++++++------
 2 files changed, 112 insertions(+), 51 deletions(-)
 create mode 100644 features/com.minres.scviewer.e4.feature/.gitignore

diff --git a/features/com.minres.scviewer.e4.feature/.gitignore b/features/com.minres.scviewer.e4.feature/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/features/com.minres.scviewer.e4.feature/.gitignore
@@ -0,0 +1 @@
+/target/
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 48118da..17bf32f 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
@@ -12,9 +12,13 @@ package com.minres.scviewer.e4.application.parts;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 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;
 
@@ -34,6 +38,7 @@ 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;
@@ -42,6 +47,7 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.StyledString;
 import org.eclipse.jface.viewers.TreeExpansionEvent;
+import org.eclipse.jface.viewers.TreePath;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.TreeViewerColumn;
 import org.eclipse.jface.viewers.Viewer;
@@ -146,16 +152,19 @@ 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();
 			}
 
 		});
-
 		// Set up the table
 		Tree tree = treeViewer.getTree();
 		tree.setLayoutData(new GridData(GridData.FILL_BOTH));
@@ -273,77 +282,110 @@ public class TransactionDetails {
 		this.waveformViewerPart=part;
 	}
 
+	class ViewSettings {
+		public ViewSettings(List<String> names, TreePath[] paths) {
+			super();
+			this.names = names;
+			this.paths = paths;
+		}
+		public List<String> names;
+		public TreePath[] paths;
+	}
+	HashMap<Integer, ViewSettings> settings = new HashMap<>();
+	
 	public void setInput(Object object) {
 		if(object instanceof ITx){
-			ArrayList<String> names = new ArrayList<>();
-			int indexInParent=getTopItemHier(names);
-			ArrayList<Boolean> states = getExpandedState(treeViewer.getTree().getItems());
+			Object oldInput = treeViewer.getInput();
+			if(oldInput!=null) {
+				final Integer hash = getAttrNameHash(oldInput);
+				final List<String> names = getTopItemHier(treeViewer.getTree().getTopItem());
+				final TreePath[] paths = treeViewer.getInput()!=null?treeViewer.getExpandedTreePaths():null;
+				settings.put(hash, new ViewSettings(names, paths));
+			}
 			treeViewer.setInput(object);
-			setExpandedState(treeViewer.getTree().getItems(), states);
-			setTopItemFromHier(names, indexInParent);
+			final Integer newHash = getAttrNameHash(object);
+			final ViewSettings newSettings = settings.get(newHash);
+			if(newSettings!=null) {
+				setExpandedState(newSettings.paths);
+				setTopItemFromHier(newSettings.names, treeViewer.getTree().getItems());
+			} else
+				setExpandedState(null);
 		} else {
 			treeViewer.setInput(null);
 		}
 
 	}
 
-	private void setExpandedState(TreeItem[] treeItems, ArrayList<Boolean> states) {
-		for (int i = 0; i < treeItems.length; i++) {
-			treeItems[i].setExpanded(states.size()>i?states.get(i):true);
-		}
-	}
+	int getAttrNameHash(Object o) {
+		if(o instanceof ITx) {
+			ITx tx = (ITx) o;
+			List<String> attr_names = tx.getAttributes().stream().map(a -> a.getName()).collect(Collectors.toList());
+			return Objects.hash(attr_names);
+		} else
+			return o.hashCode();
 
-	private ArrayList<Boolean> getExpandedState(TreeItem[] items){
-		ArrayList<Boolean> ret = new ArrayList<>();
-		for (TreeItem treeItem : items)
-			ret.add(treeItem.getItemCount()>0?treeItem.getExpanded():true);
-		return ret;
 	}
-
-	private int getTopItemHier(ArrayList<String> names){
-		int indexInParent=-1;
-		TreeItem obj = treeViewer.getTree().getTopItem();
-		if(obj!=null) {
-			names.add(0, obj.getText(0));
-			if(obj.getParentItem()!=null) {
-				TreeItem pobj=obj.getParentItem();
-				names.add(0, pobj.getText(0));
-				TreeItem[] items = pobj.getItems();
-				for (int i = 0; i < items.length; i++) {
-					if(items[i]==obj) {
-						indexInParent=i;
+	
+	private void setExpandedState(TreePath[] paths) {
+		if(paths==null)
+			treeViewer.setAutoExpandLevel(2);
+		else {
+			TransactionTreeContentProvider cp = (TransactionTreeContentProvider) treeViewer.getContentProvider();
+			Object[] elems = cp.getElements(treeViewer.getInput());
+			for(TreePath path: paths) {
+				TreeNode firstSeg = (TreeNode)path.getFirstSegment();
+				for(Object elem : elems) {
+					if(((TreeNode)elem).type == firstSeg.type) {
+						treeViewer.setExpandedState(elem, true);
+						if(firstSeg.type==TransactionDetails.Type.ATTRS && path.getSegmentCount()>1)
+							expandSubNodes(path, 1, (TreeNode)elem);
 						break;
 					}
 				}
 			}
 		}
-		return indexInParent;
 	}
 
-	private void setTopItemFromHier(ArrayList<String> names, int indexInParent) {
-		if(indexInParent<0 || names.size()==0 ) return;
-		TreeItem selItem=null;
-		for (TreeItem item : treeViewer.getTree().getItems()) { // find item from category
-			if(item.getText(0).equals(names.get(0))) {
-				if(names.size()>1) { // if we had an attribute as top item
-					TreeItem[] subItems=item.getItems();
-					for(TreeItem it : subItems) { // try to align by name
-						if(it.getText(0).equals(names.get(1))) {
-							selItem=it;
-							break;
-						}
-					}
-					if(selItem==null && indexInParent>=0 && subItems.length>0) // name based match failed so try to use position
-						selItem=subItems[subItems.length>indexInParent?indexInParent:subItems.length-1];
+	private void expandSubNodes(TreePath path, int level, TreeNode elem) {
+		if(level==path.getSegmentCount()) return;
+		TransactionTreeContentProvider cp = (TransactionTreeContentProvider) treeViewer.getContentProvider();
+		Object[] childs = cp.getChildren(elem);
+		TreeNode nextSeg = (TreeNode)path.getSegment(level);
+		for(Object child:childs) {
+			if(child instanceof TreeNode) {
+				TreeNode node = (TreeNode) child;
+				if(nextSeg.toString().equals(node.toString())) {
+					treeViewer.setExpandedState(node, true);
+					expandSubNodes(path, level+1, node);
+					break;
 				}
-				if(selItem==null) // no match in attributes so set the category as top item
-					selItem=item;
-				break;
 			}
 		}
-		if(selItem!=null)
-			treeViewer.getTree().setTopItem(selItem);
 	}
+
+	List<String> getTopItemHier(TreeItem node){
+		if(node == null) {
+			return new ArrayList<String>();
+		} else {
+			List<String> elems = getTopItemHier(node.getParentItem());
+			elems.add(node.getText(0));
+			return elems;
+		}
+	}
+	
+	private void setTopItemFromHier(List<String> names, TreeItem [] items) {
+		for (TreeItem item : items) { // find item from category
+			if(item.getText(0).equals(names.get(0))) {
+				if(names.size()==1 || item.getItemCount()==0) {
+					treeViewer.getTree().setTopItem(item);
+				} else {
+					setTopItemFromHier(names.subList(1,  names.size()), item.getItems());
+				}
+				return;
+			}
+		}
+	}
+	
 	/**
 	 * Sets the selection.
 	 *
@@ -513,7 +555,7 @@ public class TransactionDetails {
 	/**
 	 * The Class TreeNode.
 	 */
-	class TreeNode{
+	class TreeNode implements Comparable<TreeNode>{
 
 		/** The type. */
 		public Type type;
@@ -576,6 +618,24 @@ public class TransactionDetails {
 		}
 		
 		private Object[] childs=null;
+
+		@Override
+		public boolean equals(Object o) {
+			if(o instanceof TreeNode) {
+				TreeNode t = (TreeNode) o;
+				return type==t.type && hier_path.equals(t.hier_path); 
+			}
+			return false;
+		}
+		
+		@Override
+		public int compareTo(TreeNode o) {
+			int res1 = type.compareTo(o.type);
+			if(res1==0) {
+				return hier_path.compareTo(o.hier_path);
+			} else
+				return res1;
+		}
 	}
 
 	/**