Merge branch 'release/2.6'

.gitignore

@@ -8,4 +8,3 @@ SCViewer.xcf
 SCViewer_1.png
 *.launch
 copyrightLog.txt
-/workspace

.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,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.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.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

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.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

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/.settings/org.eclipse.jdt.groovy.core.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+groovy.compiler.level=25

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.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>
 	
@@ -42,4 +42,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>

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

@@ -70,7 +70,7 @@ public class TextDbLoader implements IWaveformDbLoader{
 		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