Merge branch 'release/2.15.1'

2021-12-02 16:55:18 +01:00 · 2021-12-02 16:55:18 +01:00 · 539e5de813
commit 539e5de813
parent e76000d87b 5736279e8d
22 changed files with 41 additions and 34 deletions
--- 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.15.0</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>3.0.0-SNAPSHOT</version>
--- 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.15.0</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.1.0-SNAPSHOT</version>
--- 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.15.0</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.0.0-SNAPSHOT</version>
--- 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.15.0</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.1.0-SNAPSHOT</version>
--- 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.15.0</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.1.0-SNAPSHOT</version>
--- 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.15.0</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Textual transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.text
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.0.1.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.osgi.framework;version="1.3.0"
--- a/plugins/com.minres.scviewer.database.text/pom.xml
+++ b/plugins/com.minres.scviewer.database.text/pom.xml
@ -2,11 +2,11 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>com.minres.scviewer.database.text</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>4.0.1-SNAPSHOT</version>
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.15.0</version>
+		<version>2.15.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java
+++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java
@ -345,10 +345,10 @@ public class TextDbLoader implements IWaveformDbLoader {
 			String curLine = reader.readLine();
 			String nextLine = null;
 			while ((nextLine = reader.readLine()) != null && curLine != null) {
-				curLine = parseLine(curLine, nextLine);
+				curLine = parseLine(curLine, nextLine, false);
 			}
 			if (curLine != null)
-				parseLine(curLine, nextLine);
+				parseLine(curLine, nextLine, true);
 			for(Entry<Long, ScvTx> e: transactionById.entrySet()) {
 				ScvTx scvTx = e.getValue();
 				scvTx.endTime=loader.maxTime;
@ -385,16 +385,16 @@ public class TextDbLoader implements IWaveformDbLoader {
 		 * @throws IOException Signals that an I/O exception has occurred.
 		 * @throws InputFormatException Signals that the input format is wrong
 		 */
-		private String parseLine(String curLine, String nextLine) throws IOException, InputFormatException {
+		private String parseLine(String curLine, String nextLine, boolean last) throws IOException, InputFormatException {
 			String[] tokens = curLine.split("\\s+");
-			if ("tx_record_attribute".equals(tokens[0])) {
+			if ("tx_record_attribute".equals(tokens[0]) && tokens.length>4) {
 				Long id = Long.parseLong(tokens[1]);
 				String name = tokens[2].substring(1, tokens[2].length()-1);
 				DataType type = DataType.valueOf(tokens[3]);
 				String remaining = tokens.length > 5 ? String.join(" ", Arrays.copyOfRange(tokens, 5, tokens.length)) : "";
 				TxAttributeType attrType = getAttrType(name, type, AssociationType.RECORD);
 				transactionById.get(id).attributes.add(new TxAttribute(attrType, getAttrString(attrType, remaining)));
-			} else if ("tx_begin".equals(tokens[0])) {
+			} else if ("tx_begin".equals(tokens[0]) && tokens.length>4) {
 				Long id = Long.parseLong(tokens[1]);
 				Long genId = Long.parseLong(tokens[2]);
 				TxGenerator gen = loader.txGenerators.get(genId);
@ -413,7 +413,7 @@ public class TextDbLoader implements IWaveformDbLoader {
 					}
 				}
 				transactionById.put(id, scvTx);
-			} else if ("tx_end".equals(tokens[0])) {
+			} else if ("tx_end".equals(tokens[0]) && tokens.length>4) {
 				Long id = Long.parseLong(tokens[1]);
 				ScvTx scvTx = transactionById.get(id);
 				assert Long.parseLong(tokens[2]) == scvTx.generatorId;
@ -443,7 +443,7 @@ public class TextDbLoader implements IWaveformDbLoader {
 				}
 				txSink.put(scvTx.getId(), scvTx);
 				transactionById.remove(id);
-			} else if ("tx_relation".equals(tokens[0])) {
+			} else if ("tx_relation".equals(tokens[0]) && tokens.length>3) {
 				Long tr2 = Long.parseLong(tokens[2]);
 				Long tr1 = Long.parseLong(tokens[3]);
 				String relType = tokens[1].substring(1, tokens[1].length() - 1);
@ -483,7 +483,7 @@ public class TextDbLoader implements IWaveformDbLoader {
 				}
 			} else if (")".equals(tokens[0])) {
 				generator = null;
-			} else
+			} else if(!last)			
 				throw new InputFormatException("Don't know what to do with: '" + curLine + "'");
 			return nextLine;
 		}
--- a/plugins/com.minres.scviewer.database.ui.swt/pom.xml
+++ b/plugins/com.minres.scviewer.database.ui.swt/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.15.0</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>4.0.0-SNAPSHOT</version>
--- a/plugins/com.minres.scviewer.database.vcd/pom.xml
+++ b/plugins/com.minres.scviewer.database.vcd/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.15.0</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.database/pom.xml
+++ b/plugins/com.minres.scviewer.database/pom.xml
@ -4,7 +4,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.15.0</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/plugins/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.15.0
+Bundle-Version: 2.15.1
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
 org.eclipse.core.runtime;bundle-version="3.11.1",
--- a/plugins/com.minres.scviewer.e4.application/pom.xml
+++ b/plugins/com.minres.scviewer.e4.application/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.15.0</version>
+		<version>2.15.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
--- a/plugins/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
@ -17,7 +17,6 @@ import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
-import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
 import org.eclipse.jface.viewers.IStructuredSelection;

 import com.minres.scviewer.database.IWaveform;
--- a/plugins/com.minres.scviewer.ui/pom.xml
+++ b/plugins/com.minres.scviewer.ui/pom.xml
@ -4,7 +4,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.15.0</version>
+  	<version>2.15.1</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/pom.xml
+++ b/pom.xml
@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.minres.scviewer</groupId>
 	<artifactId>com.minres.scviewer.parent</artifactId>
-	<version>2.15.0</version>
+	<version>2.15.1</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>releng/com.minres.scviewer.target</module>
@ -68,7 +68,7 @@
 						<artifact>
 							<groupId>com.minres.scviewer</groupId>
 							<artifactId>com.minres.scviewer.target</artifactId>
-							<version>2.15.0</version>
+							<version>2.15.1</version>
 						</artifact>
 					</target>
 					<environments>
--- a/products/com.minres.scviewer.e4.product/pom.xml
+++ b/products/com.minres.scviewer.e4.product/pom.xml
@ -6,11 +6,11 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.15.0</version>
+		<version>2.15.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-  	<version>2.15.0</version>
+  	<version>2.15.1</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>
@ -45,7 +45,7 @@
 					</formats>
 					<products>
 						<product>
-							<id>product</id>
+							<id>scviewer</id>
 							<archiveFileName>SCViewer-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</archiveFileName>
 							<rootFolders>
 								<macosx>SCViewer.app</macosx>
--- a/products/com.minres.scviewer.e4.product/scviewer.product
+++ b/products/com.minres.scviewer.e4.product/scviewer.product
@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>

-<product name="SCViewer" uid="product" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.15.0" useFeatures="true" includeLaunchers="true">
+<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.15.1" useFeatures="true" includeLaunchers="true">
+

   <configIni use="default">
   </configIni>
@ -9,7 +10,7 @@
   <launcherArgs>
      <programArgs>-clearPersistedState
      </programArgs>
-      <vmArgs>-Xms64m -Xmx2G -Dosgi.instance.area=@user.home/.scviewer -Dosgi.instance.area.default=@user.home/.scviewer --add-modules=ALL-SYSTEM -Dfile.encoding=UTF-8
+      <vmArgs>-Xms64m -Xmx4G -Dosgi.instance.area=@user.home/.scviewer -Dosgi.instance.area.default=@user.home/.scviewer --add-modules=ALL-SYSTEM -Dfile.encoding=UTF-8
      </vmArgs>
      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
      </vmArgsMac>
@ -17,6 +18,7 @@

   <windowImages/>

+
   <launcher name="scviewer">
      <linux icon="icons/SCViewer_512x512.xpm"/>
      <macosx icon="icons/SCViewer.icns"/>
@ -33,6 +35,7 @@
      </win>
   </launcher>

+
   <vm>
      <linux include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
      <macos include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
@ -75,6 +78,11 @@
      <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1" />
   </configurations>

+   <repositories>
+      <repository location="http://https://minres.github.io/SCViewer/repository" enabled="true" />
+      <repository location="http://https://minres.github.io/SCViewer/repository" enabled="true" />
+   </repositories>
+
   <preferencesInfo>
      <targetfile overwrite="false"/>
   </preferencesInfo>
--- a/releng/com.minres.scviewer.target/pom.xml
+++ b/releng/com.minres.scviewer.target/pom.xml
@ -12,7 +12,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.15.0</version>
+  	<version>2.15.1</version>
  	<relativePath>../..</relativePath>
  </parent>

--- a/releng/com.minres.scviewer.updateSite/pom.xml
+++ b/releng/com.minres.scviewer.updateSite/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.15.0</version>
+		<version>2.15.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<build>
--- a/tests/com.minres.scviewer.database.test/pom.xml
+++ b/tests/com.minres.scviewer.database.test/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.15.0</version>
+		<version>2.15.1</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-test-plugin</packaging>