From 7c27bcec4797440d3dfe946c5bd704bbba3c1fc0 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 28 Nov 2020 14:47:43 +0100 Subject: [PATCH] moved TX interfaces into own package --- .../src/com/minres/scviewer/database/sqlite/Tx.java | 8 ++++---- .../minres/scviewer/database/sqlite/TxAttribute.java | 2 +- .../com/minres/scviewer/database/sqlite/TxEvent.java | 4 ++-- .../minres/scviewer/database/sqlite/TxGenerator.java | 4 ++-- .../minres/scviewer/database/sqlite/TxRelation.java | 4 ++-- .../com/minres/scviewer/database/sqlite/TxStream.java | 4 ++-- .../minres/scviewer/database/text/TextDbLoader.groovy | 2 +- .../src/com/minres/scviewer/database/text/Tx.groovy | 3 +++ .../minres/scviewer/database/text/TxAttribute.groovy | 4 ++-- .../scviewer/database/text/TxAttributeType.groovy | 2 +- .../database/text/TxAttributeTypeFactory.groovy | 4 ++-- .../src/com/minres/scviewer/database/text/TxEvent.java | 4 ++-- .../minres/scviewer/database/text/TxGenerator.groovy | 8 ++++---- .../com/minres/scviewer/database/text/TxRelation.java | 4 ++-- .../com/minres/scviewer/database/text/TxStream.groovy | 6 +++--- .../database/ui/swt/internal/ArrowPainter.java | 4 ++-- .../database/ui/swt/internal/RelSelectionDialog.java | 4 ++-- .../database/ui/swt/internal/StreamPainter.java | 4 ++-- .../database/ui/swt/internal/WaveformCanvas.java | 2 +- .../database/ui/swt/internal/WaveformView.java | 6 +++--- .../com.minres.scviewer.database/META-INF/MANIFEST.MF | 2 +- .../src/com/minres/scviewer/database/{ => tx}/ITx.java | 4 +++- .../scviewer/database/{ => tx}/ITxAttribute.java | 2 +- .../scviewer/database/{ => tx}/ITxAttributeType.java | 5 ++++- .../minres/scviewer/database/{ => tx}/ITxEvent.java | 4 +++- .../scviewer/database/{ => tx}/ITxGenerator.java | 4 +++- .../minres/scviewer/database/{ => tx}/ITxRelation.java | 4 +++- plugins/com.minres.scviewer.e4.application/plugin.xml | 2 +- .../application/elements/RelationTypeToolControl.java | 2 +- .../e4/application/handlers/MoveWaveformHandler.java | 2 +- .../e4/application/handlers/NavigateEvent.java | 2 +- .../e4/application/handlers/NavigateTrans.java | 2 +- .../scviewer/e4/application/parts/DesignBrowser.java | 2 +- .../e4/application/parts/TransactionDetails.java | 2 +- .../scviewer/e4/application/parts/TransactionList.java | 6 +++--- .../scviewer/e4/application/parts/WaveformViewer.java | 8 ++++---- .../AbstractTransactionTreeContentProvider.java | 4 ++-- .../parts/txTableTree/AttributeLabelProvider.java | 6 +++--- .../parts/txTableTree/TransactionTreeNode.java | 2 +- .../parts/txTableTree/TxAttributeFilter.java | 2 +- .../parts/txTableTree/TxAttributeViewerSorter.java | 2 +- .../e4/application/parts/txTableTree/TxFilter.java | 4 ++-- .../provider/TxPropertiesContentProvider.java | 4 ++-- .../provider/TxPropertiesLabelProvider.java | 2 +- plugins/com.minres.scviewer.ui/plugin.xml | 10 +++++----- .../ui/adapter/ITransactionPropertySource.java | 2 +- .../minres/scviewer/ui/adapter/TxAdapterFactory.java | 2 +- .../scviewer/ui/views/sections/AttributeProperty.java | 4 ++-- .../scviewer/ui/views/sections/RelatedProperty.java | 4 ++-- .../scviewer/database/test/DatabaseServicesTest.java | 6 +++--- 50 files changed, 102 insertions(+), 88 deletions(-) rename plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/{ => tx}/ITx.java (91%) rename plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/{ => tx}/ITxAttribute.java (93%) rename plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/{ => tx}/ITxAttributeType.java (82%) rename plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/{ => tx}/ITxEvent.java (88%) rename plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/{ => tx}/ITxGenerator.java (89%) rename plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/{ => tx}/ITxRelation.java (87%) diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java index 9701c6b..5651097 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java @@ -18,10 +18,6 @@ import java.util.Collection; import java.util.List; 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.sqlite.db.IDatabase; 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.ScvTxEvent; 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 { diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxAttribute.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxAttribute.java index f06af9e..c6c987c 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxAttribute.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxAttribute.java @@ -12,8 +12,8 @@ package com.minres.scviewer.database.sqlite; import com.minres.scviewer.database.AssociationType; 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.tx.ITxAttribute; public class TxAttribute implements ITxAttribute{ diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java index 99d0ac8..3900e0d 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxEvent.java @@ -12,9 +12,9 @@ package com.minres.scviewer.database.sqlite; import com.minres.scviewer.database.EventKind; 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.tx.ITx; +import com.minres.scviewer.database.tx.ITxEvent; public class TxEvent implements ITxEvent { diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java index 32836d7..3c8ec0f 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java @@ -12,10 +12,10 @@ package com.minres.scviewer.database.sqlite; 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.sqlite.tables.ScvGenerator; +import com.minres.scviewer.database.tx.ITx; +import com.minres.scviewer.database.tx.ITxGenerator; public class TxGenerator implements ITxGenerator { diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxRelation.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxRelation.java index e1ba06c..207247f 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxRelation.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxRelation.java @@ -10,9 +10,9 @@ *******************************************************************************/ 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.tx.ITx; +import com.minres.scviewer.database.tx.ITxRelation; public class TxRelation implements ITxRelation { diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java index 3dd25e1..ca561bd 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java @@ -23,8 +23,6 @@ import java.util.TreeMap; import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.HierNode; 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.IWaveformDb; 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.ScvStream; 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 { diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy index b5f3b10..577af7e 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy @@ -22,11 +22,11 @@ import groovy.io.FileType import com.minres.scviewer.database.AssociationType import com.minres.scviewer.database.DataType -import com.minres.scviewer.database.ITxGenerator import com.minres.scviewer.database.IWaveform import com.minres.scviewer.database.IWaveformDb import com.minres.scviewer.database.IWaveformDbLoader import com.minres.scviewer.database.RelationType +import com.minres.scviewer.database.tx.ITxGenerator public class TextDbLoader implements IWaveformDbLoader{ diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.groovy index 4442146..32fa2a6 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.groovy +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.groovy @@ -11,6 +11,9 @@ package com.minres.scviewer.database.text 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 { diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttribute.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttribute.groovy index 0ec90b7..bc4a884 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttribute.groovy +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttribute.groovy @@ -12,8 +12,8 @@ package com.minres.scviewer.database.text import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.DataType; -import com.minres.scviewer.database.ITxAttributeType; -import com.minres.scviewer.database.ITxAttribute +import com.minres.scviewer.database.tx.ITxAttribute +import com.minres.scviewer.database.tx.ITxAttributeType class TxAttribute implements ITxAttribute{ diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeType.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeType.groovy index 7bc8388..6a7c0b6 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeType.groovy +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeType.groovy @@ -12,7 +12,7 @@ package com.minres.scviewer.database.text import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.DataType; -import com.minres.scviewer.database.ITxAttributeType; +import com.minres.scviewer.database.tx.ITxAttributeType class TxAttributeType implements ITxAttributeType { String name diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeTypeFactory.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeTypeFactory.groovy index ecc6474..18647d9 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeTypeFactory.groovy +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeTypeFactory.groovy @@ -12,8 +12,8 @@ package com.minres.scviewer.database.text import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.DataType -import com.minres.scviewer.database.ITxAttributeType -import com.minres.scviewer.database.ITxAttribute +import com.minres.scviewer.database.tx.ITxAttribute +import com.minres.scviewer.database.tx.ITxAttributeType class TxAttributeTypeFactory { static final TxAttributeTypeFactory instance = new TxAttributeTypeFactory() diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.java b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.java index 0b64801..2e0ada8 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.java +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.java @@ -1,9 +1,9 @@ package com.minres.scviewer.database.text; 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.tx.ITx; +import com.minres.scviewer.database.tx.ITxEvent; class TxEvent implements ITxEvent { diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.groovy index 6dd487b..f51a70c 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.groovy +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.groovy @@ -13,11 +13,11 @@ package com.minres.scviewer.database.text import java.util.ArrayList; 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.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{ Long id diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.java b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.java index 15a9460..6990b4f 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.java +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.java @@ -1,8 +1,8 @@ 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.tx.ITx; +import com.minres.scviewer.database.tx.ITxRelation; class TxRelation implements ITxRelation { final Tx source; diff --git a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy index 74af5b5..08fd9c5 100644 --- a/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy +++ b/plugins/com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy @@ -20,16 +20,16 @@ import java.util.Map.Entry import org.mapdb.Serializer -import com.minres.scviewer.database.ITxEvent; import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.IWaveformDb 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.HierNode; import com.minres.scviewer.database.IEvent import com.minres.scviewer.database.IHierNode -import com.minres.scviewer.database.ITx class TxStream extends HierNode implements IWaveform { diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java index 05bc995..e876b23 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java @@ -21,9 +21,9 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; 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.tx.ITx; +import com.minres.scviewer.database.tx.ITxRelation; import com.minres.scviewer.database.ui.WaveformColors; public class ArrowPainter implements IPainter { diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RelSelectionDialog.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RelSelectionDialog.java index 28c7d97..0a381c9 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RelSelectionDialog.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RelSelectionDialog.java @@ -14,8 +14,8 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.Shell; -import com.minres.scviewer.database.ITx; -import com.minres.scviewer.database.ITxRelation; +import com.minres.scviewer.database.tx.ITx; +import com.minres.scviewer.database.tx.ITxRelation; class RelSelectionDialog extends Dialog { private java.util.List entries; diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java index ddb4a0e..97230d9 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java @@ -22,9 +22,9 @@ import org.eclipse.swt.graphics.Rectangle; import com.minres.scviewer.database.EventKind; 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.tx.ITx; +import com.minres.scviewer.database.tx.ITxEvent; import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.database.ui.WaveformColors; diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java index 2d0f9cf..3629bf6 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java @@ -37,9 +37,9 @@ import org.eclipse.swt.widgets.ScrollBar; import org.eclipse.wb.swt.SWTResourceManager; import com.google.common.collect.Lists; -import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.IWaveform; 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.TrackEntry; import com.minres.scviewer.database.ui.WaveformColors; diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java index 8cad658..13ccc23 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java @@ -82,12 +82,12 @@ import com.minres.scviewer.database.BitVector; import com.minres.scviewer.database.DoubleVal; import com.minres.scviewer.database.EventKind; 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.RelationType; 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.ICursor; import com.minres.scviewer.database.ui.IWaveformView; diff --git a/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF index 09d9fe4..d5936df 100644 --- a/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: MINRES Technologies GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.minres.scviewer.database, - com.minres.scviewer.database.internal;x-internal:=true + com.minres.scviewer.database.tx Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/component.xml,OSGI-INF/component2.xml Automatic-Module-Name: com.minres.scviewer.database diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITx.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITx.java similarity index 91% rename from plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITx.java rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITx.java index 5679876..73e72d7 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITx.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITx.java @@ -8,11 +8,13 @@ * Contributors: * 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.List; +import com.minres.scviewer.database.IWaveform; + public interface ITx extends Comparable{ public Long getId(); diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttribute.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxAttribute.java similarity index 93% rename from plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttribute.java rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxAttribute.java index f976cfa..1e06781 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttribute.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxAttribute.java @@ -8,7 +8,7 @@ * Contributors: * MINRES Technologies GmbH - initial API and implementation *******************************************************************************/ -package com.minres.scviewer.database; +package com.minres.scviewer.database.tx; public interface ITxAttribute extends ITxAttributeType { public Object getValue(); diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttributeType.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxAttributeType.java similarity index 82% rename from plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttributeType.java rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxAttributeType.java index 19125a3..fe21390 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxAttributeType.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxAttributeType.java @@ -8,7 +8,10 @@ * Contributors: * 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 String getName(); diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxEvent.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxEvent.java similarity index 88% rename from plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxEvent.java rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxEvent.java index de13b19..1aada15 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxEvent.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxEvent.java @@ -8,7 +8,9 @@ * Contributors: * 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 { diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxGenerator.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxGenerator.java similarity index 89% rename from plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxGenerator.java rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxGenerator.java index e512a6f..92a8e2b 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxGenerator.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxGenerator.java @@ -8,10 +8,12 @@ * Contributors: * MINRES Technologies GmbH - initial API and implementation *******************************************************************************/ -package com.minres.scviewer.database; +package com.minres.scviewer.database.tx; import java.util.List; +import com.minres.scviewer.database.IWaveform; + public interface ITxGenerator { public Long getId(); public IWaveform getStream(); diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxRelation.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxRelation.java similarity index 87% rename from plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxRelation.java rename to plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxRelation.java index cb3bd88..40eafe1 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/ITxRelation.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/ITxRelation.java @@ -8,7 +8,9 @@ * Contributors: * 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 { diff --git a/plugins/com.minres.scviewer.e4.application/plugin.xml b/plugins/com.minres.scviewer.e4.application/plugin.xml index e5b3bf8..de027ae 100644 --- a/plugins/com.minres.scviewer.e4.application/plugin.xml +++ b/plugins/com.minres.scviewer.e4.application/plugin.xml @@ -70,7 +70,7 @@ - + diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/RelationTypeToolControl.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/RelationTypeToolControl.java index 2c214a7..bb38cb6 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/RelationTypeToolControl.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/RelationTypeToolControl.java @@ -29,8 +29,8 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; -import com.minres.scviewer.database.ITx; 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.parts.PartListener; import com.minres.scviewer.e4.application.parts.WaveformViewer; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/MoveWaveformHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/MoveWaveformHandler.java index 3b5fcce..388a931 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/MoveWaveformHandler.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/MoveWaveformHandler.java @@ -20,8 +20,8 @@ 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.ITx; import com.minres.scviewer.database.IWaveform; +import com.minres.scviewer.database.tx.ITx; import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.e4.application.parts.WaveformViewer; diff --git 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 index 971d409..4c4ad61 100644 --- 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 @@ -20,8 +20,8 @@ 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.ITx; 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.TrackEntry; import com.minres.scviewer.e4.application.parts.WaveformViewer; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateTrans.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateTrans.java index 8a2f75c..f73c811 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateTrans.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/NavigateTrans.java @@ -20,7 +20,7 @@ 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.ITx; +import com.minres.scviewer.database.tx.ITx; import com.minres.scviewer.database.ui.GotoDirection; import com.minres.scviewer.e4.application.parts.WaveformViewer; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java index 0e11385..6616c3e 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java @@ -77,9 +77,9 @@ import org.eclipse.wb.swt.SWTResourceManager; import com.minres.scviewer.database.HierNode; import com.minres.scviewer.database.IHierNode; -import com.minres.scviewer.database.ITx; import com.minres.scviewer.database.IWaveform; 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.handlers.AddWaveformHandler; import com.minres.scviewer.e4.application.provider.TxDbContentProvider; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java index b6c2af4..2a973eb 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java @@ -57,7 +57,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Tree; 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.parts.txTableTree.AttributeLabelProvider; import com.minres.scviewer.e4.application.parts.txTableTree.AbstractTransactionTreeContentProvider; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionList.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionList.java index 00f5cd7..9ff0ba6 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionList.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionList.java @@ -38,11 +38,11 @@ import org.eclipse.swt.widgets.Text; import com.minres.scviewer.database.DataType; import com.minres.scviewer.database.EventKind; 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.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.e4.application.parts.txTableTree.AbstractTransactionTreeContentProvider; import com.minres.scviewer.e4.application.parts.txTableTree.AttributeLabelProvider; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java index 37937ef..f0a1c35 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java @@ -87,14 +87,14 @@ import org.osgi.service.prefs.Preferences; import com.minres.scviewer.database.DataType; 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.IWaveformDb; import com.minres.scviewer.database.IWaveformDbFactory; 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.ICursor; import com.minres.scviewer.database.ui.IWaveformView; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AbstractTransactionTreeContentProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AbstractTransactionTreeContentProvider.java index 9934945..ee9f230 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AbstractTransactionTreeContentProvider.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AbstractTransactionTreeContentProvider.java @@ -5,8 +5,8 @@ import java.util.Vector; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; -import com.minres.scviewer.database.ITx; -import com.minres.scviewer.database.ITxRelation; +import com.minres.scviewer.database.tx.ITx; +import com.minres.scviewer.database.tx.ITxRelation; import com.minres.scviewer.e4.application.Messages; import com.minres.scviewer.e4.application.parts.WaveformViewer; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AttributeLabelProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AttributeLabelProvider.java index 6b20914..10e4b33 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AttributeLabelProvider.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AttributeLabelProvider.java @@ -8,9 +8,9 @@ import org.eclipse.jface.viewers.StyledString; import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; import com.minres.scviewer.database.DataType; -import com.minres.scviewer.database.ITx; -import com.minres.scviewer.database.ITxAttribute; -import com.minres.scviewer.database.ITxRelation; +import com.minres.scviewer.database.tx.ITx; +import com.minres.scviewer.database.tx.ITxAttribute; +import com.minres.scviewer.database.tx.ITxRelation; import com.minres.scviewer.e4.application.Messages; import com.minres.scviewer.e4.application.parts.WaveformViewer; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TransactionTreeNode.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TransactionTreeNode.java index d800104..4c1c17e 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TransactionTreeNode.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TransactionTreeNode.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.TreeMap; 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; /** diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeFilter.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeFilter.java index aea24ee..54520ab 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeFilter.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeFilter.java @@ -5,7 +5,7 @@ import java.util.regex.PatternSyntaxException; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; -import com.minres.scviewer.database.ITxAttribute; +import com.minres.scviewer.database.tx.ITxAttribute; /** * The Class TxAttributeFilter. diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeViewerSorter.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeViewerSorter.java index 1b1dc4d..a7297e4 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeViewerSorter.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxAttributeViewerSorter.java @@ -3,7 +3,7 @@ package com.minres.scviewer.e4.application.parts.txTableTree; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerComparator; -import com.minres.scviewer.database.ITxAttribute; +import com.minres.scviewer.database.tx.ITxAttribute; /** * The Class TxAttributeViewerSorter. diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxFilter.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxFilter.java index 8b642b5..4cd613e 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxFilter.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TxFilter.java @@ -11,8 +11,8 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import com.minres.scviewer.database.DataType; -import com.minres.scviewer.database.ITx; -import com.minres.scviewer.database.ITxAttribute; +import com.minres.scviewer.database.tx.ITx; +import com.minres.scviewer.database.tx.ITxAttribute; /** * The Class TxAttributeFilter. diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesContentProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesContentProvider.java index a04cf8c..d13b681 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesContentProvider.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesContentProvider.java @@ -18,8 +18,8 @@ import org.eclipse.jface.viewers.Viewer; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.minres.scviewer.database.IHierNode; -import com.minres.scviewer.database.ITx; -import com.minres.scviewer.database.ITxAttribute; +import com.minres.scviewer.database.tx.ITx; +import com.minres.scviewer.database.tx.ITxAttribute; /** * The Class TxPropertiesContentProvider. Not used atm diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesLabelProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesLabelProvider.java index b6f068b..340f616 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesLabelProvider.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxPropertiesLabelProvider.java @@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.ITableLabelProvider; 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; /** diff --git a/plugins/com.minres.scviewer.ui/plugin.xml b/plugins/com.minres.scviewer.ui/plugin.xml index c924485..ca5912b 100644 --- a/plugins/com.minres.scviewer.ui/plugin.xml +++ b/plugins/com.minres.scviewer.ui/plugin.xml @@ -67,7 +67,7 @@ id="com.minres.scviewer.ui.propertySectionAll" tab="com.minres.scviewer.ui.propertyTabTransaction"> + type="com.minres.scviewer.database.tx.ITx"> + type="com.minres.scviewer.database.tx.ITx"> + type="com.minres.scviewer.database.tx.ITx"> @@ -93,7 +93,7 @@ @@ -465,7 +465,7 @@ - + diff --git a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/ITransactionPropertySource.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/ITransactionPropertySource.java index a24f978..450be66 100644 --- a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/ITransactionPropertySource.java +++ b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/ITransactionPropertySource.java @@ -16,7 +16,7 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; 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 { diff --git a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/TxAdapterFactory.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/TxAdapterFactory.java index d4c59aa..383dd77 100644 --- a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/TxAdapterFactory.java +++ b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/adapter/TxAdapterFactory.java @@ -13,7 +13,7 @@ package com.minres.scviewer.ui.adapter; import org.eclipse.core.runtime.IAdapterFactory; 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 { diff --git a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/AttributeProperty.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/AttributeProperty.java index 703ed20..72f2c44 100644 --- a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/AttributeProperty.java +++ b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/AttributeProperty.java @@ -45,8 +45,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.DataType; -import com.minres.scviewer.database.ITxAttribute; -import com.minres.scviewer.database.ITx; +import com.minres.scviewer.database.tx.ITx; +import com.minres.scviewer.database.tx.ITxAttribute; public class AttributeProperty extends AbstractPropertySection implements ISelectionProvider { diff --git a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/RelatedProperty.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/RelatedProperty.java index c98f83c..c8ce08b 100644 --- a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/RelatedProperty.java +++ b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/sections/RelatedProperty.java @@ -48,8 +48,8 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage; -import com.minres.scviewer.database.ITx; -import com.minres.scviewer.database.ITxRelation; +import com.minres.scviewer.database.tx.ITx; +import com.minres.scviewer.database.tx.ITxRelation; public class RelatedProperty extends AbstractPropertySection implements ISelectionProvider, ISelectionChangedListener { diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java index 55e2685..882f7db 100644 --- a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java @@ -27,12 +27,12 @@ import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.DataType; import com.minres.scviewer.database.EventKind; 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.IWaveformDb; 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 {