Merge branch 'release/2.4.1'

.project

@@ -1,73 +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>
-	<filteredResources>
-		<filter>
-			<id>0</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>0</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>0</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>0</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>0</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>0</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>

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

@@ -9,6 +9,8 @@ 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
 Bundle-ClassPath: leveldb-0.11-SNAPSHOT-uber.jar,

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>../..</relativePath>
+		<relativePath>../com.minres.scviewer.parent</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
-</project>
+</project>

com.minres.scviewer.database.leveldb/src/com/minres/scviewer/database/leveldb/LevelDBLoader.java

@@ -64,7 +64,7 @@ public class LevelDBLoader implements IWaveformDbLoader {
 	}
 
 	@Override
-	public Collection<IWaveform> getAllWaves() {
+	public List<IWaveform> getAllWaves() {
 		List<IWaveform> streams=new ArrayList<IWaveform>();
 		SeekingIterator<String, String> it = levelDb.iterator();
 		it.seek("s~");

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>../..</relativePath>
+  	<relativePath>../com.minres.scviewer.parent</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>
   <dependencies>
@@ -16,4 +16,4 @@
   	</dependency>
   </dependencies>
   <version>1.0.0-SNAPSHOT</version>
-</project>
+</project>

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

@@ -61,7 +61,7 @@ public class SQLiteDbLoader implements IWaveformDbLoader {
 	}
 
 	@Override
-	public Collection<IWaveform> getAllWaves() {
+	public List<IWaveform> getAllWaves() {
 		SQLiteDatabaseSelectHandler<ScvStream> handler = new SQLiteDatabaseSelectHandler<ScvStream>(ScvStream.class, database);
 		List<IWaveform> streams=new ArrayList<IWaveform>();
 		try {
@@ -81,7 +81,6 @@ public class SQLiteDbLoader implements IWaveformDbLoader {
 
 	@Override
 	public boolean load(IWaveformDb db, File file) throws Exception {
-		if(file.isDirectory() || !file.exists()) return false;
 		this.db=db;
 		try {
 			FileInputStream fis = new FileInputStream(file);

com.minres.scviewer.database.test/DatabaseServicesTest.launch

@@ -0,0 +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"/>
+<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>

com.minres.scviewer.database.test/inputs/.gitignore

@@ -0,0 +1,2 @@
+/.scviewer.*
+/.my_db.txlog*

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>../..</relativePath>
+		<relativePath>../com.minres.scviewer.parent</relativePath>
 	</parent>
 	<packaging>eclipse-test-plugin</packaging>
 	<build>
@@ -16,7 +16,16 @@
 				<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>
-</project>
+</project>

com.minres.scviewer.database.text/.classpath

@@ -18,6 +18,5 @@
 	<classpathentry exported="true" kind="lib" path="lib/kotlin-stdlib-1.2.42.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/lz4-1.3.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/elsa-3.0.0-M5.jar"/>
-	<classpathentry kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.minres.scviewer.database.text/.settings/org.eclipse.jdt.groovy.core.prefs

@@ -1,3 +1,2 @@
 eclipse.preferences.version=1
 groovy.compiler.level=25
-groovy.script.filters=**/*.dsld,y,**/*.gradle,n

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

@@ -8,6 +8,8 @@ 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"
 Service-Component: OSGI-INF/component.xml

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>../..</relativePath>
+		<relativePath>../com.minres.scviewer.parent</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
 	
@@ -24,8 +24,8 @@
 			        </compilerArguments>
 					<!-- set verbose to be true if you want lots of uninteresting messages -->
 					<!-- <verbose>true</verbose> -->
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 				<dependencies>
 					<dependency>
@@ -42,4 +42,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>

com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy

@@ -50,8 +50,8 @@ public class TextDbLoader implements IWaveformDbLoader{
 	}
 
 	@Override
-	public Collection<IWaveform> getAllWaves() {
-		return streams;
+	public List<IWaveform> getAllWaves() {
+		return new LinkedList<IWaveform>(streams);
 	}
 
 	public Map<Long, ITxGenerator> getGeneratorsById() {
@@ -64,13 +64,12 @@ public class TextDbLoader implements IWaveformDbLoader{
 
 	@Override
 	boolean load(IWaveformDb db, File file) throws Exception {
-		if(file.isDirectory() || !file.exists()) return false;
 		this.db=db
 		this.streams=[]
 		try {
 			def gzipped = isGzipped(file)
 			if(isTxfile(gzipped?new GZIPInputStream(new FileInputStream(file)):new FileInputStream(file))){
-				def mapDbFile = File.createTempFile("."+file.name, null /*"tmp"*/, null /*file.parentFile*/)
+				def mapDbFile = File.createTempFile("."+file.name, "tmp", file.parentFile)
 				mapDbFile.delete()
 				mapDbFile.deleteOnExit()
 				this.mapDb = DBMaker
@@ -83,7 +82,7 @@ public class TextDbLoader implements IWaveformDbLoader{
 				.make()
 				// NPE here --->
 				parseInput(gzipped?new GZIPInputStream(new FileInputStream(file)):new FileInputStream(file))
-				streams.each{ TxStream  stream -> stream.getMaxConcurrency() }
+				calculateConcurrencyIndicees()
 				return true
 			}
 		} catch (IndexOutOfBoundsException e) {
@@ -136,7 +135,7 @@ public class TextDbLoader implements IWaveformDbLoader{
 			case "ms":return 1000000000000L
 			case "s": return 1000000000000000L
 		}
-		return 1L
+		return "fs"
 	}
 	
 	private def parseInput(InputStream inputStream){
@@ -153,29 +152,23 @@ 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
-					}
-					break;
-				case "scv_tr_generator":
-					if ((matcher = line =~ /^scv_tr_generator\s+\(ID\s+(\d+),\s+name\s+"([^"]+)",\s+scv_tr_stream\s+(\d+),$/)) {
+					} else 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
-					}
-					break;
-				case "begin_attribute":
-					if ((matcher = line =~ /^begin_attribute \(ID (\d+), name "([^"]+)", type "([^"]+)"\)$/)) {
+					} else if ((matcher = line =~ /^begin_attribute \(ID (\d+), name "([^"]+)", type "([^"]+)"\)$/)) {
 						generator.begin_attrs << TxAttributeType.getAttrType(matcher[0][2], DataType.valueOf(matcher[0][3]), AssociationType.BEGIN)
-					}
-					break;
-				case "end_attribute":
-					if ((matcher = line =~ /^end_attribute \(ID (\d+), name "([^"]+)", type "([^"]+)"\)$/)) {
+					} else 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;
@@ -234,6 +227,31 @@ 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();
 	}