Tools/SCViewer
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release/2.12.2'

Browse Source
This commit is contained in:
Eyck Jentzsch
2021-02-24 07:04:59 +00:00
parent 4ee2e8bc68 df77af64ca
commit 25545dac51
21 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/com.minres.scviewer.database.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<version>3.0.0-SNAPSHOT</version>

2
features/com.minres.scviewer.e4.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<version>1.1.0-SNAPSHOT</version>

2
features/com.minres.scviewer.e4.platform.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<version>1.0.0-SNAPSHOT</version>

2
features/com.minres.scviewer.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<version>1.1.0-SNAPSHOT</version>

2
features/com.minres.scviewer.ui.feature/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<version>1.1.0-SNAPSHOT</version>

2
plugins/com.minres.scviewer.database.sqlite/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<packaging>eclipse-plugin</packaging>

2
plugins/com.minres.scviewer.database.text/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<packaging>eclipse-plugin</packaging>

12
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/AbstractTxStream.java
View File

@@ -30,6 +30,8 @@ import com.minres.scviewer.database.tx.ITxEvent;
*/
abstract class AbstractTxStream extends HierNode implements IWaveform {
private final String fullName;
/** The id. */
private Long id;
@@ -51,10 +53,20 @@ abstract class AbstractTxStream extends HierNode implements IWaveform {
*/
protected AbstractTxStream(TextDbLoader loader, Long id, String name) {
super(name);
fullName=name;
this.loader = loader;
this.id = id;
}
/**
* Gets the full hierarchical name.
*
* @return the full name
*/
@Override
public String getFullName() {
return fullName;
}
/**
* Adds the event.
*

2
plugins/com.minres.scviewer.database.ui.swt/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<version>3.0.0-SNAPSHOT</version>

2
plugins/com.minres.scviewer.database.vcd/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<packaging>eclipse-plugin</packaging>

2
plugins/com.minres.scviewer.database/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<packaging>eclipse-plugin</packaging>

2
plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/HierNode.java
View File

@@ -80,7 +80,7 @@ public class HierNode implements IHierNode {
}
/**
* Gets the full name.
* Gets the full hierarchical name.
*
* @return the full name
*/

2
plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
View File

@@ -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.12.1
Bundle-Version: 2.12.2
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: javax.inject;bundle-version="1.0.0",
org.eclipse.core.runtime;bundle-version="3.11.1",

2
plugins/com.minres.scviewer.e4.application/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<packaging>eclipse-plugin</packaging>

2
plugins/com.minres.scviewer.ui/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<packaging>eclipse-plugin</packaging>

4
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<packaging>pom</packaging>
<modules>
<module>releng/com.minres.scviewer.target</module>
@@ -67,7 +67,7 @@
<artifact>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.target</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
</artifact>
</target>
<environments>

4
products/com.minres.scviewer.e4.product/pom.xml
View File

@@ -6,11 +6,11 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>com.minres.scviewer.e4.product</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<packaging>eclipse-repository</packaging>
<groupId>com.minres.scviewer</groupId>
<build>

2
products/com.minres.scviewer.e4.product/scviewer.product
View File

@@ -1,7 +1,7 @@
<?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.12.1" useFeatures="true" includeLaunchers="true">
<product name="SCViewer" uid="product" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.12.2" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>

2
releng/com.minres.scviewer.target/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>

2
releng/com.minres.scviewer.updateSite/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<build>

2
tests/com.minres.scviewer.database.test/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>com.minres.scviewer</groupId>
<artifactId>com.minres.scviewer.parent</artifactId>
<version>2.12.1</version>
<version>2.12.2</version>
<relativePath>../..</relativePath>
</parent>
<packaging>eclipse-test-plugin</packaging>