Merge branch 'release/2.16.1'

Minres · Jun 12, 2022 · 3a931d5 · 3a931d5
2 parents fda4c64 + e53764c
commit 3a931d5
Show file tree

Hide file tree

Showing 30 changed files with 246 additions and 213 deletions.
diff --git a/doc/com.minres.scviewer.doc/pom.xml b/doc/com.minres.scviewer.doc/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.16.0</version>
+		<version>2.16.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 

diff --git a/features/com.minres.scviewer.database.feature/pom.xml b/features/com.minres.scviewer.database.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.16.0</version>
+  	<version>2.16.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>3.0.0-SNAPSHOT</version>

diff --git a/features/com.minres.scviewer.e4.feature/pom.xml b/features/com.minres.scviewer.e4.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.16.0</version>
+  	<version>2.16.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

diff --git a/features/com.minres.scviewer.e4.help.feature/pom.xml b/features/com.minres.scviewer.e4.help.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.16.0</version>
+  	<version>2.16.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.0.0-SNAPSHOT</version>

diff --git a/features/com.minres.scviewer.e4.platform.feature/pom.xml b/features/com.minres.scviewer.e4.platform.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.16.0</version>
+  	<version>2.16.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.0.0-SNAPSHOT</version>

diff --git a/features/com.minres.scviewer.feature/pom.xml b/features/com.minres.scviewer.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.16.0</version>
+  	<version>2.16.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

diff --git a/features/com.minres.scviewer.ui.feature/pom.xml b/features/com.minres.scviewer.ui.feature/pom.xml
@@ -5,7 +5,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.16.0</version>
+  	<version>2.16.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <version>1.1.0-SNAPSHOT</version>

diff --git a/plugins/com.minres.scviewer.database.sqlite/pom.xml b/plugins/com.minres.scviewer.database.sqlite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.minres.scviewer</groupId>
   	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.16.0</version>
+  	<version>2.16.1</version>
 	<relativePath>../..</relativePath>
   </parent>
   <packaging>eclipse-plugin</packaging>

diff --git a/...nres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java b/...nres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java
@@ -78,24 +78,24 @@ public Collection<IWaveform> getAllWaves() {
 		return streams;
 	}
 
-	@Override
-	public boolean canLoad(File inputFile) {
-		if (!inputFile.isDirectory() && inputFile.exists()) {
-			try(InputStream stream = new FileInputStream(inputFile)){
-				byte[] buffer = new byte[x.length];
-				int readCnt = stream.read(buffer, 0, x.length);
-				if (readCnt == x.length) {
-					for (int i = 0; i < x.length; i++)
-						if (buffer[i] != x[i])
-							return false;
-				}
-				return true;
-			} catch (Exception e) {
-				return false;
-			}
-		}
-		return false;
-	}
+//	@Override
+//	public boolean canLoad(File inputFile) {
+//		if (!inputFile.isDirectory() && inputFile.exists()) {
+//			try(InputStream stream = new FileInputStream(inputFile)){
+//				byte[] buffer = new byte[x.length];
+//				int readCnt = stream.read(buffer, 0, x.length);
+//				if (readCnt == x.length) {
+//					for (int i = 0; i < x.length; i++)
+//						if (buffer[i] != x[i])
+//							return false;
+//				}
+//				return true;
+//			} catch (Exception e) {
+//				return false;
+//			}
+//		}
+//		return false;
+//	}
 
 	@Override
 	public void load(IWaveformDb db, File file) throws InputFormatException {

diff --git a/plugins/com.minres.scviewer.database.text/pom.xml b/plugins/com.minres.scviewer.database.text/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.16.0</version>
+		<version>2.16.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>