cleanup build
This commit is contained in:
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
||||
|
Reference in New Issue
Block a user