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

moved TX interfaces into own package

This commit is contained in:
Eyck Jentzsch 2020-11-28 14:47:43 +01:00
parent 90f09cc222
commit 7c27bcec47
50 changed files with 102 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java
View File

@ -18,10 +18,6 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.AssociationType;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxAttribute;
import com.minres.scviewer.database.ITxGenerator;
import com.minres.scviewer.database.ITxRelation;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.sqlite.db.IDatabase; import com.minres.scviewer.database.sqlite.db.IDatabase;
import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler; import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler;
@ -30,6 +26,10 @@ import com.minres.scviewer.database.sqlite.tables.ScvTx;
import com.minres.scviewer.database.sqlite.tables.ScvTxAttribute; import com.minres.scviewer.database.sqlite.tables.ScvTxAttribute;
import com.minres.scviewer.database.sqlite.tables.ScvTxEvent; import com.minres.scviewer.database.sqlite.tables.ScvTxEvent;
import com.minres.scviewer.database.sqlite.tables.ScvTxRelation; import com.minres.scviewer.database.sqlite.tables.ScvTxRelation;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxAttribute;
import com.minres.scviewer.database.tx.ITxGenerator;
import com.minres.scviewer.database.tx.ITxRelation;
public class Tx implements ITx { public class Tx implements ITx {

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

@ -12,8 +12,8 @@ package com.minres.scviewer.database.sqlite;
import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.AssociationType;
import com.minres.scviewer.database.DataType; import com.minres.scviewer.database.DataType;
import com.minres.scviewer.database.ITxAttribute;
import com.minres.scviewer.database.sqlite.tables.ScvTxAttribute; import com.minres.scviewer.database.sqlite.tables.ScvTxAttribute;
import com.minres.scviewer.database.tx.ITxAttribute;
public class TxAttribute implements ITxAttribute{ public class TxAttribute implements ITxAttribute{

4
plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java
View File

@ -12,9 +12,9 @@ package com.minres.scviewer.database.sqlite;
import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.EventKind;
import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxEvent;
import com.minres.scviewer.database.WaveformType; import com.minres.scviewer.database.WaveformType;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxEvent;
public class TxEvent implements ITxEvent { public class TxEvent implements ITxEvent {

4
plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java
View File

@ -12,10 +12,10 @@ package com.minres.scviewer.database.sqlite;
import java.util.List; import java.util.List;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxGenerator;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.sqlite.tables.ScvGenerator; import com.minres.scviewer.database.sqlite.tables.ScvGenerator;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxGenerator;
public class TxGenerator implements ITxGenerator { public class TxGenerator implements ITxGenerator {

4
plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxRelation.java
View File

@ -10,9 +10,9 @@
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database.sqlite; package com.minres.scviewer.database.sqlite;
import com.minres.scviewer.database.ITxRelation;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.RelationType; import com.minres.scviewer.database.RelationType;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxRelation;
public class TxRelation implements ITxRelation { public class TxRelation implements ITxRelation {

4
plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java
View File

@ -23,8 +23,6 @@ import java.util.TreeMap;
import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.EventKind;
import com.minres.scviewer.database.HierNode; import com.minres.scviewer.database.HierNode;
import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxGenerator;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.IWaveformDb; import com.minres.scviewer.database.IWaveformDb;
import com.minres.scviewer.database.RelationType; import com.minres.scviewer.database.RelationType;
@ -34,6 +32,8 @@ import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler;
import com.minres.scviewer.database.sqlite.tables.ScvGenerator; import com.minres.scviewer.database.sqlite.tables.ScvGenerator;
import com.minres.scviewer.database.sqlite.tables.ScvStream; import com.minres.scviewer.database.sqlite.tables.ScvStream;
import com.minres.scviewer.database.sqlite.tables.ScvTx; import com.minres.scviewer.database.sqlite.tables.ScvTx;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxGenerator;
public class TxStream extends HierNode implements IWaveform { public class TxStream extends HierNode implements IWaveform {

2
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy
View File

@ -22,11 +22,11 @@ import groovy.io.FileType
import com.minres.scviewer.database.AssociationType import com.minres.scviewer.database.AssociationType
import com.minres.scviewer.database.DataType import com.minres.scviewer.database.DataType
import com.minres.scviewer.database.ITxGenerator
import com.minres.scviewer.database.IWaveform import com.minres.scviewer.database.IWaveform
import com.minres.scviewer.database.IWaveformDb import com.minres.scviewer.database.IWaveformDb
import com.minres.scviewer.database.IWaveformDbLoader import com.minres.scviewer.database.IWaveformDbLoader
import com.minres.scviewer.database.RelationType import com.minres.scviewer.database.RelationType
import com.minres.scviewer.database.tx.ITxGenerator
public class TextDbLoader implements IWaveformDbLoader{ public class TextDbLoader implements IWaveformDbLoader{

3
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.groovy
View File

@ -11,6 +11,9 @@
package com.minres.scviewer.database.text package com.minres.scviewer.database.text
import com.minres.scviewer.database.* import com.minres.scviewer.database.*
import com.minres.scviewer.database.tx.ITx
import com.minres.scviewer.database.tx.ITxAttribute
import com.minres.scviewer.database.tx.ITxRelation
class Tx implements ITx { class Tx implements ITx {

4
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttribute.groovy
View File

@ -12,8 +12,8 @@ package com.minres.scviewer.database.text
import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.AssociationType;
import com.minres.scviewer.database.DataType; import com.minres.scviewer.database.DataType;
import com.minres.scviewer.database.ITxAttributeType; import com.minres.scviewer.database.tx.ITxAttribute
import com.minres.scviewer.database.ITxAttribute import com.minres.scviewer.database.tx.ITxAttributeType
class TxAttribute implements ITxAttribute{ class TxAttribute implements ITxAttribute{

2
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeType.groovy
View File

@ -12,7 +12,7 @@ package com.minres.scviewer.database.text
import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.AssociationType;
import com.minres.scviewer.database.DataType; import com.minres.scviewer.database.DataType;
import com.minres.scviewer.database.ITxAttributeType; import com.minres.scviewer.database.tx.ITxAttributeType
class TxAttributeType implements ITxAttributeType { class TxAttributeType implements ITxAttributeType {
String name String name

4
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeTypeFactory.groovy
View File

@ -12,8 +12,8 @@ package com.minres.scviewer.database.text
import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.AssociationType;
import com.minres.scviewer.database.DataType import com.minres.scviewer.database.DataType
import com.minres.scviewer.database.ITxAttributeType import com.minres.scviewer.database.tx.ITxAttribute
import com.minres.scviewer.database.ITxAttribute import com.minres.scviewer.database.tx.ITxAttributeType
class TxAttributeTypeFactory { class TxAttributeTypeFactory {
static final TxAttributeTypeFactory instance = new TxAttributeTypeFactory() static final TxAttributeTypeFactory instance = new TxAttributeTypeFactory()

4
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.java
View File

@ -1,9 +1,9 @@
package com.minres.scviewer.database.text; package com.minres.scviewer.database.text;
import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.EventKind;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxEvent;
import com.minres.scviewer.database.WaveformType; import com.minres.scviewer.database.WaveformType;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxEvent;
class TxEvent implements ITxEvent { class TxEvent implements ITxEvent {

8
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.groovy
View File

@ -13,11 +13,11 @@ package com.minres.scviewer.database.text
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.minres.scviewer.database.ITxAttributeType
import com.minres.scviewer.database.ITxAttribute;
import com.minres.scviewer.database.ITxGenerator;
import com.minres.scviewer.database.IWaveform import com.minres.scviewer.database.IWaveform
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx
import com.minres.scviewer.database.tx.ITxAttribute
import com.minres.scviewer.database.tx.ITxAttributeType
import com.minres.scviewer.database.tx.ITxGenerator
class TxGenerator implements ITxGenerator{ class TxGenerator implements ITxGenerator{
Long id Long id

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

@ -1,8 +1,8 @@
package com.minres.scviewer.database.text; package com.minres.scviewer.database.text;
import com.minres.scviewer.database.ITxRelation;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.RelationType; import com.minres.scviewer.database.RelationType;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxRelation;
class TxRelation implements ITxRelation { class TxRelation implements ITxRelation {
final Tx source; final Tx source;

6
plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy
View File

@ -20,16 +20,16 @@ import java.util.Map.Entry
import org.mapdb.Serializer import org.mapdb.Serializer
import com.minres.scviewer.database.ITxEvent;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.IWaveformDb import com.minres.scviewer.database.IWaveformDb
import com.minres.scviewer.database.WaveformType import com.minres.scviewer.database.WaveformType
import com.minres.scviewer.database.ITxGenerator import com.minres.scviewer.database.tx.ITx
import com.minres.scviewer.database.tx.ITxEvent
import com.minres.scviewer.database.tx.ITxGenerator
import com.minres.scviewer.database.EventKind import com.minres.scviewer.database.EventKind
import com.minres.scviewer.database.HierNode; import com.minres.scviewer.database.HierNode;
import com.minres.scviewer.database.IEvent import com.minres.scviewer.database.IEvent
import com.minres.scviewer.database.IHierNode import com.minres.scviewer.database.IHierNode
import com.minres.scviewer.database.ITx
class TxStream extends HierNode implements IWaveform { class TxStream extends HierNode implements IWaveform {

4
plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java
View File

@ -21,9 +21,9 @@ import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxRelation;
import com.minres.scviewer.database.RelationType; import com.minres.scviewer.database.RelationType;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxRelation;
import com.minres.scviewer.database.ui.WaveformColors; import com.minres.scviewer.database.ui.WaveformColors;
public class ArrowPainter implements IPainter { public class ArrowPainter implements IPainter {

4
plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RelSelectionDialog.java
View File

@ -14,8 +14,8 @@ import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.ITxRelation; import com.minres.scviewer.database.tx.ITxRelation;
class RelSelectionDialog extends Dialog { class RelSelectionDialog extends Dialog {
private java.util.List<ITxRelation> entries; private java.util.List<ITxRelation> entries;

4
plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java
View File

@ -22,9 +22,9 @@ import org.eclipse.swt.graphics.Rectangle;
import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.EventKind;
import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxEvent;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxEvent;
import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.database.ui.TrackEntry;
import com.minres.scviewer.database.ui.WaveformColors; import com.minres.scviewer.database.ui.WaveformColors;

2
plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java
View File

@ -37,9 +37,9 @@ import org.eclipse.swt.widgets.ScrollBar;
import org.eclipse.wb.swt.SWTResourceManager; import org.eclipse.wb.swt.SWTResourceManager;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.RelationType; import com.minres.scviewer.database.RelationType;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.ui.IWaveformView; import com.minres.scviewer.database.ui.IWaveformView;
import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.database.ui.TrackEntry;
import com.minres.scviewer.database.ui.WaveformColors; import com.minres.scviewer.database.ui.WaveformColors;

6
plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java
View File

@ -82,12 +82,12 @@ import com.minres.scviewer.database.BitVector;
import com.minres.scviewer.database.DoubleVal; import com.minres.scviewer.database.DoubleVal;
import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.EventKind;
import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxEvent;
import com.minres.scviewer.database.ITxRelation;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.RelationType; import com.minres.scviewer.database.RelationType;
import com.minres.scviewer.database.WaveformType; import com.minres.scviewer.database.WaveformType;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxEvent;
import com.minres.scviewer.database.tx.ITxRelation;
import com.minres.scviewer.database.ui.GotoDirection; import com.minres.scviewer.database.ui.GotoDirection;
import com.minres.scviewer.database.ui.ICursor; import com.minres.scviewer.database.ui.ICursor;
import com.minres.scviewer.database.ui.IWaveformView; import com.minres.scviewer.database.ui.IWaveformView;

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

@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: MINRES Technologies GmbH Bundle-Vendor: MINRES Technologies GmbH
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: com.minres.scviewer.database, Export-Package: com.minres.scviewer.database,
com.minres.scviewer.database.internal;x-internal:=true com.minres.scviewer.database.tx
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/component.xml,OSGI-INF/component2.xml Service-Component: OSGI-INF/component.xml,OSGI-INF/component2.xml
Automatic-Module-Name: com.minres.scviewer.database Automatic-Module-Name: com.minres.scviewer.database

4
plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITx.java → plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITx.java
View File

@ -8,11 +8,13 @@
* Contributors: * Contributors:
* MINRES Technologies GmbH - initial API and implementation * MINRES Technologies GmbH - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database; package com.minres.scviewer.database.tx;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import com.minres.scviewer.database.IWaveform;
public interface ITx extends Comparable<ITx>{ public interface ITx extends Comparable<ITx>{
public Long getId(); public Long getId();

2
plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttribute.java → plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxAttribute.java
View File

@ -8,7 +8,7 @@
* Contributors: * Contributors:
* MINRES Technologies GmbH - initial API and implementation * MINRES Technologies GmbH - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database; package com.minres.scviewer.database.tx;
public interface ITxAttribute extends ITxAttributeType { public interface ITxAttribute extends ITxAttributeType {
public Object getValue(); public Object getValue();

5
plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttributeType.java → plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxAttributeType.java
View File

@ -8,7 +8,10 @@
* Contributors: * Contributors:
* MINRES Technologies GmbH - initial API and implementation * MINRES Technologies GmbH - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database; package com.minres.scviewer.database.tx;
import com.minres.scviewer.database.AssociationType;
import com.minres.scviewer.database.DataType;
public interface ITxAttributeType { public interface ITxAttributeType {
public String getName(); public String getName();

4
plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxEvent.java → plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxEvent.java
View File

@ -8,7 +8,9 @@
* Contributors: * Contributors:
* MINRES Technologies GmbH - initial API and implementation * MINRES Technologies GmbH - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database; package com.minres.scviewer.database.tx;
import com.minres.scviewer.database.IEvent;
public interface ITxEvent extends IEvent { public interface ITxEvent extends IEvent {

4
plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxGenerator.java → plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxGenerator.java
View File

@ -8,10 +8,12 @@
* Contributors: * Contributors:
* MINRES Technologies GmbH - initial API and implementation * MINRES Technologies GmbH - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database; package com.minres.scviewer.database.tx;
import java.util.List; import java.util.List;
import com.minres.scviewer.database.IWaveform;
public interface ITxGenerator { public interface ITxGenerator {
public Long getId(); public Long getId();
public IWaveform getStream(); public IWaveform getStream();

4
plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxRelation.java → plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxRelation.java
View File

@ -8,7 +8,9 @@
* Contributors: * Contributors:
* MINRES Technologies GmbH - initial API and implementation * MINRES Technologies GmbH - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package com.minres.scviewer.database; package com.minres.scviewer.database.tx;
import com.minres.scviewer.database.RelationType;
public interface ITxRelation { public interface ITxRelation {

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

@ -70,7 +70,7 @@
</count> </count>
<iterate <iterate
operator="or"> operator="or">
<instanceof value="com.minres.scviewer.database.ITx"/> <instanceof value="com.minres.scviewer.database.tx.ITx"/>
</iterate> </iterate>
</and> </and>
</with> </with>

2
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/RelationTypeToolControl.java
View File

@ -29,8 +29,8 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.RelationType; import com.minres.scviewer.database.RelationType;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.e4.application.Messages; import com.minres.scviewer.e4.application.Messages;
import com.minres.scviewer.e4.application.parts.PartListener; import com.minres.scviewer.e4.application.parts.PartListener;
import com.minres.scviewer.e4.application.parts.WaveformViewer; import com.minres.scviewer.e4.application.parts.WaveformViewer;

2
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/MoveWaveformHandler.java
View File

@ -20,8 +20,8 @@ import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.e4.ui.workbench.modeling.ESelectionService; import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.database.ui.TrackEntry;
import com.minres.scviewer.e4.application.parts.WaveformViewer; import com.minres.scviewer.e4.application.parts.WaveformViewer;

2
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateEvent.java
View File

@ -20,8 +20,8 @@ import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.e4.ui.workbench.modeling.ESelectionService; import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.ui.GotoDirection; import com.minres.scviewer.database.ui.GotoDirection;
import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.database.ui.TrackEntry;
import com.minres.scviewer.e4.application.parts.WaveformViewer; import com.minres.scviewer.e4.application.parts.WaveformViewer;

2
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateTrans.java
View File

@ -20,7 +20,7 @@ import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.e4.ui.workbench.modeling.ESelectionService; import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.ui.GotoDirection; import com.minres.scviewer.database.ui.GotoDirection;
import com.minres.scviewer.e4.application.parts.WaveformViewer; import com.minres.scviewer.e4.application.parts.WaveformViewer;

2
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java
View File

@ -77,9 +77,9 @@ import org.eclipse.wb.swt.SWTResourceManager;
import com.minres.scviewer.database.HierNode; import com.minres.scviewer.database.HierNode;
import com.minres.scviewer.database.IHierNode; import com.minres.scviewer.database.IHierNode;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.IWaveformDb; import com.minres.scviewer.database.IWaveformDb;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.e4.application.Messages; import com.minres.scviewer.e4.application.Messages;
import com.minres.scviewer.e4.application.handlers.AddWaveformHandler; import com.minres.scviewer.e4.application.handlers.AddWaveformHandler;
import com.minres.scviewer.e4.application.provider.TxDbContentProvider; import com.minres.scviewer.e4.application.provider.TxDbContentProvider;

2
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java
View File

@ -57,7 +57,7 @@ import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem; import org.eclipse.swt.widgets.TreeItem;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.e4.application.Messages; import com.minres.scviewer.e4.application.Messages;
import com.minres.scviewer.e4.application.parts.txTableTree.AttributeLabelProvider; import com.minres.scviewer.e4.application.parts.txTableTree.AttributeLabelProvider;
import com.minres.scviewer.e4.application.parts.txTableTree.AbstractTransactionTreeContentProvider; import com.minres.scviewer.e4.application.parts.txTableTree.AbstractTransactionTreeContentProvider;

6
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionList.java
View File

@ -38,11 +38,11 @@ import org.eclipse.swt.widgets.Text;
import com.minres.scviewer.database.DataType; import com.minres.scviewer.database.DataType;
import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.EventKind;
import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxAttribute;
import com.minres.scviewer.database.ITxEvent;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.WaveformType; import com.minres.scviewer.database.WaveformType;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxAttribute;
import com.minres.scviewer.database.tx.ITxEvent;
import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.database.ui.TrackEntry;
import com.minres.scviewer.e4.application.parts.txTableTree.AbstractTransactionTreeContentProvider; import com.minres.scviewer.e4.application.parts.txTableTree.AbstractTransactionTreeContentProvider;
import com.minres.scviewer.e4.application.parts.txTableTree.AttributeLabelProvider; import com.minres.scviewer.e4.application.parts.txTableTree.AttributeLabelProvider;

8
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java
View File

@ -87,14 +87,14 @@ import org.osgi.service.prefs.Preferences;
import com.minres.scviewer.database.DataType; import com.minres.scviewer.database.DataType;
import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxAttribute;
import com.minres.scviewer.database.ITxEvent;
import com.minres.scviewer.database.ITxRelation;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.IWaveformDb; import com.minres.scviewer.database.IWaveformDb;
import com.minres.scviewer.database.IWaveformDbFactory; import com.minres.scviewer.database.IWaveformDbFactory;
import com.minres.scviewer.database.RelationType; import com.minres.scviewer.database.RelationType;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxAttribute;
import com.minres.scviewer.database.tx.ITxEvent;
import com.minres.scviewer.database.tx.ITxRelation;
import com.minres.scviewer.database.ui.GotoDirection; import com.minres.scviewer.database.ui.GotoDirection;
import com.minres.scviewer.database.ui.ICursor; import com.minres.scviewer.database.ui.ICursor;
import com.minres.scviewer.database.ui.IWaveformView; import com.minres.scviewer.database.ui.IWaveformView;

4
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AbstractTransactionTreeContentProvider.java
View File

@ -5,8 +5,8 @@ import java.util.Vector;
import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.ITxRelation; import com.minres.scviewer.database.tx.ITxRelation;
import com.minres.scviewer.e4.application.Messages; import com.minres.scviewer.e4.application.Messages;
import com.minres.scviewer.e4.application.parts.WaveformViewer; import com.minres.scviewer.e4.application.parts.WaveformViewer;

6
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AttributeLabelProvider.java
View File

@ -8,9 +8,9 @@ import org.eclipse.jface.viewers.StyledString;
import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
import com.minres.scviewer.database.DataType; import com.minres.scviewer.database.DataType;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.ITxAttribute; import com.minres.scviewer.database.tx.ITxAttribute;
import com.minres.scviewer.database.ITxRelation; import com.minres.scviewer.database.tx.ITxRelation;
import com.minres.scviewer.e4.application.Messages; import com.minres.scviewer.e4.application.Messages;
import com.minres.scviewer.e4.application.parts.WaveformViewer; import com.minres.scviewer.e4.application.parts.WaveformViewer;

2
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TransactionTreeNode.java
View File

@ -5,7 +5,7 @@ import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.e4.application.Messages; import com.minres.scviewer.e4.application.Messages;
/** /**

2
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeFilter.java
View File

@ -5,7 +5,7 @@ import java.util.regex.PatternSyntaxException;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.viewers.ViewerFilter;
import com.minres.scviewer.database.ITxAttribute; import com.minres.scviewer.database.tx.ITxAttribute;
/** /**
* The Class TxAttributeFilter. * The Class TxAttributeFilter.

2
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeViewerSorter.java
View File

@ -3,7 +3,7 @@ package com.minres.scviewer.e4.application.parts.txTableTree;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.jface.viewers.ViewerComparator;
import com.minres.scviewer.database.ITxAttribute; import com.minres.scviewer.database.tx.ITxAttribute;
/** /**
* The Class TxAttributeViewerSorter. * The Class TxAttributeViewerSorter.

4
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxFilter.java
View File

@ -11,8 +11,8 @@ import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.viewers.ViewerFilter;
import com.minres.scviewer.database.DataType; import com.minres.scviewer.database.DataType;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.ITxAttribute; import com.minres.scviewer.database.tx.ITxAttribute;
/** /**
* The Class TxAttributeFilter. * The Class TxAttributeFilter.

4
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesContentProvider.java
View File

@ -18,8 +18,8 @@ import org.eclipse.jface.viewers.Viewer;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Collections2; import com.google.common.collect.Collections2;
import com.minres.scviewer.database.IHierNode; import com.minres.scviewer.database.IHierNode;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.ITxAttribute; import com.minres.scviewer.database.tx.ITxAttribute;
/** /**
* The Class TxPropertiesContentProvider. Not used atm * The Class TxPropertiesContentProvider. Not used atm

2
plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesLabelProvider.java
View File

@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import com.minres.scviewer.database.ITxAttribute; import com.minres.scviewer.database.tx.ITxAttribute;
import com.minres.scviewer.e4.application.parts.TransactionDetails; import com.minres.scviewer.e4.application.parts.TransactionDetails;
/** /**

10
plugins/com.minres.scviewer.ui/plugin.xml
View File

@ -67,7 +67,7 @@
id="com.minres.scviewer.ui.propertySectionAll" id="com.minres.scviewer.ui.propertySectionAll"
tab="com.minres.scviewer.ui.propertyTabTransaction"> tab="com.minres.scviewer.ui.propertyTabTransaction">
<input <input
type="com.minres.scviewer.database.ITx"> type="com.minres.scviewer.database.tx.ITx">
</input> </input>
</propertySection> </propertySection>
<propertySection <propertySection
@ -76,7 +76,7 @@
id="com.minres.scviewer.ui.propertySectionAttributes" id="com.minres.scviewer.ui.propertySectionAttributes"
tab="com.minres.scviewer.ui.propertyTabAttributes"> tab="com.minres.scviewer.ui.propertyTabAttributes">
<input <input
type="com.minres.scviewer.database.ITx"> type="com.minres.scviewer.database.tx.ITx">
</input> </input>
</propertySection> </propertySection>
<propertySection <propertySection
@ -85,7 +85,7 @@
id="com.minres.scviewer.ui.propertySectionRelated" id="com.minres.scviewer.ui.propertySectionRelated"
tab="com.minres.scviewer.ui.propertyTabRelated"> tab="com.minres.scviewer.ui.propertyTabRelated">
<input <input
type="com.minres.scviewer.database.ITx"> type="com.minres.scviewer.database.tx.ITx">
</input> </input>
</propertySection> </propertySection>
</propertySections> </propertySections>
@ -93,7 +93,7 @@
<extension <extension
point="org.eclipse.core.runtime.adapters"> point="org.eclipse.core.runtime.adapters">
<factory <factory
adaptableType="com.minres.scviewer.database.ITx" adaptableType="com.minres.scviewer.database.tx.ITx"
class="com.minres.scviewer.ui.adapter.TxAdapterFactory"> class="com.minres.scviewer.ui.adapter.TxAdapterFactory">
<adapter <adapter
type="org.eclipse.ui.views.properties.IPropertySource"> type="org.eclipse.ui.views.properties.IPropertySource">
@ -465,7 +465,7 @@
</count> </count>
<iterate <iterate
operator="or"> operator="or">
<instanceof value="com.minres.scviewer.database.ITx"/> <instanceof value="com.minres.scviewer.database.tx.ITx"/>
</iterate> </iterate>
</and> </and>
</with> </with>

2
plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/ITransactionPropertySource.java
View File

@ -16,7 +16,7 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.PropertyDescriptor; import org.eclipse.ui.views.properties.PropertyDescriptor;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx;
public class ITransactionPropertySource implements IPropertySource { public class ITransactionPropertySource implements IPropertySource {

2
plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/TxAdapterFactory.java
View File

@ -13,7 +13,7 @@ package com.minres.scviewer.ui.adapter;
import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.ui.views.properties.IPropertySource; import org.eclipse.ui.views.properties.IPropertySource;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx;
public class TxAdapterFactory implements IAdapterFactory { public class TxAdapterFactory implements IAdapterFactory {

4
plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/AttributeProperty.java
View File

@ -45,8 +45,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.AssociationType;
import com.minres.scviewer.database.DataType; import com.minres.scviewer.database.DataType;
import com.minres.scviewer.database.ITxAttribute; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITxAttribute;
public class AttributeProperty extends AbstractPropertySection implements ISelectionProvider { public class AttributeProperty extends AbstractPropertySection implements ISelectionProvider {

4
plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/RelatedProperty.java
View File

@ -48,8 +48,8 @@ import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection; import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.ITxRelation; import com.minres.scviewer.database.tx.ITxRelation;
public class RelatedProperty extends AbstractPropertySection implements ISelectionProvider, ISelectionChangedListener { public class RelatedProperty extends AbstractPropertySection implements ISelectionProvider, ISelectionChangedListener {

6
tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java
View File

@ -27,12 +27,12 @@ import com.minres.scviewer.database.AssociationType;
import com.minres.scviewer.database.DataType; import com.minres.scviewer.database.DataType;
import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.EventKind;
import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEvent;
import com.minres.scviewer.database.ITx;
import com.minres.scviewer.database.ITxAttribute;
import com.minres.scviewer.database.ITxEvent;
import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveform;
import com.minres.scviewer.database.IWaveformDb; import com.minres.scviewer.database.IWaveformDb;
import com.minres.scviewer.database.IWaveformDbFactory; import com.minres.scviewer.database.IWaveformDbFactory;
import com.minres.scviewer.database.tx.ITx;
import com.minres.scviewer.database.tx.ITxAttribute;
import com.minres.scviewer.database.tx.ITxEvent;
public class DatabaseServicesTest { public class DatabaseServicesTest {