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

cleanup build

This commit is contained in:
Eyck Jentzsch 2021-01-03 17:44:52 +01:00
parent 85ce07f11f
commit 841b5fe2b2
11 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
com.minres.scviewer.target/com.minres.scviewer.target.target
View File

@ -31,6 +31,11 @@
<repository location="http://download.eclipse.org/nebula/releases/latest"/>
<unit id="org.eclipse.nebula.widgets.xviewer.feature.feature.group" version="1.1.0.202011020719"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/collections/10.4.0/repository"/>
<unit id="org.eclipse.collections.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.collections.feature.source.feature.group" version="0.0.0"/>
</location>
</locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<launcherArgs>

6
plugins/com.minres.scviewer.database.text/.classpath
View File

@ -11,13 +11,9 @@
<attribute name="javadoc_location" value="jar:platform:/resource/com.minres.scviewer.database.text/lib/mapdb-3.0.7-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/eclipse-collections-9.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/eclipse-collections-api-9.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/eclipse-collections-forkjoin-9.2.0.jar"/>
<classpathentry kind="src" path="src"/>
<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_DSL_SUPPORT"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

1
plugins/com.minres.scviewer.database.text/.project
View File

@ -33,7 +33,6 @@
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>

8
plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
View File

@ -7,17 +7,13 @@ Bundle-Vendor: MINRES Technologies GmbH
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.osgi.services;bundle-version="3.4.0",
com.google.guava;bundle-version="15.0.0"
Service-Component: OSGI-INF/component.xml
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: com.minres.scviewer.database.text
Bundle-ClassPath: lib/mapdb-3.0.7.jar,
.,
lib/eclipse-collections-9.2.0.jar,
lib/eclipse-collections-api-9.2.0.jar,
lib/eclipse-collections-forkjoin-9.2.0.jar,
Bundle-ClassPath: .,
lib/mapdb-3.0.7.jar,
lib/kotlin-stdlib-1.2.42.jar,
lib/lz4-1.3.0.jar,
lib/elsa-3.0.0-M5.jar

3
plugins/com.minres.scviewer.database.text/build.properties
View File

@ -13,9 +13,6 @@ bin.includes = META-INF/,\
OSGI-INF/,\
lib/,\
lib/mapdb-3.0.7.jar,\
lib/eclipse-collections-9.2.0.jar,\
lib/eclipse-collections-api-9.2.0.jar,\
lib/eclipse-collections-forkjoin-9.2.0.jar,\
lib/kotlin-stdlib-1.2.42.jar,\
lib/lz4-1.3.0.jar,\
lib/elsa-3.0.0-M5.jar

BIN
plugins/com.minres.scviewer.database.text/lib/eclipse-collections-9.2.0.jar
View File

Binary file not shown.

BIN
plugins/com.minres.scviewer.database.text/lib/eclipse-collections-api-9.2.0.jar
View File

Binary file not shown.

BIN
plugins/com.minres.scviewer.database.text/lib/eclipse-collections-forkjoin-9.2.0.jar
View File

Binary file not shown.

8
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.java
View File

@ -52,9 +52,9 @@ public class TextDbLoader implements IWaveformDbLoader{
DB mapDb;
TreeMap<Long, TxStream> txStreams;
Map<Long, TxStream> txStreams;
TreeMap<Long, TxGenerator> txGenerators;
Map<Long, TxGenerator> txGenerators;
BTreeMap<Long, ScvTx> transactions;
@ -121,8 +121,8 @@ public class TextDbLoader implements IWaveformDbLoader{
return false;
}
transactions=txSink.create();
txStreams=new TreeMap<>(parser.streamsById);
txGenerators=new TreeMap<>(parser.generatorsById);
txStreams=new HashMap<>(parser.streamsById);
txGenerators=new HashMap<>(parser.generatorsById);
txCache.clear();
return true;
}

14
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.java
View File

@ -10,20 +10,14 @@
*******************************************************************************/
package com.minres.scviewer.database.text;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxAttributeType;
import com.minres.scviewer.database.tx.ITxGenerator;
class TxGenerator implements ITxGenerator, Serializable{
/**
*
*/
private static final long serialVersionUID = -1477511353554904763L;
class TxGenerator implements ITxGenerator {
Long id;
@ -33,11 +27,11 @@ class TxGenerator implements ITxGenerator, Serializable{
Boolean active = false;
ArrayList<ITx> transactions=new ArrayList<ITx>();
List<ITx> transactions=new ArrayList<>();
ArrayList<TxAttributeType> beginAttrs = new ArrayList<>();
List<TxAttributeType> beginAttrs = new ArrayList<>();
ArrayList<TxAttributeType> endAttrs= new ArrayList<>();
List<TxAttributeType> endAttrs= new ArrayList<>();
TxGenerator(Long id, TxStream stream, String name){
this.id=id;

8
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.java
View File

@ -1,16 +1,10 @@
package com.minres.scviewer.database.text;
import java.io.Serializable;
import com.minres.scviewer.database.RelationType;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxRelation;
class TxRelation implements ITxRelation, Serializable {
/**
*
*/
private static final long serialVersionUID = -347668857680574140L;
class TxRelation implements ITxRelation {
final TextDbLoader loader;