diff --git a/com.minres.scviewer.database.swt/swing2swt.jar b/com.minres.scviewer.database.swt/swing2swt.jar
deleted file mode 100644
index ee261b5..0000000
Binary files a/com.minres.scviewer.database.swt/swing2swt.jar and /dev/null differ
diff --git a/com.minres.scviewer.database.swt/.classpath b/com.minres.scviewer.database.ui.swt/.classpath
similarity index 85%
rename from com.minres.scviewer.database.swt/.classpath
rename to com.minres.scviewer.database.ui.swt/.classpath
index fffb3a2..46cec6e 100644
--- a/com.minres.scviewer.database.swt/.classpath
+++ b/com.minres.scviewer.database.ui.swt/.classpath
@@ -3,6 +3,5 @@
-
diff --git a/com.minres.scviewer.database.swt/.gitignore b/com.minres.scviewer.database.ui.swt/.gitignore
similarity index 100%
rename from com.minres.scviewer.database.swt/.gitignore
rename to com.minres.scviewer.database.ui.swt/.gitignore
diff --git a/com.minres.scviewer.database.swt/.project b/com.minres.scviewer.database.ui.swt/.project
similarity index 94%
rename from com.minres.scviewer.database.swt/.project
rename to com.minres.scviewer.database.ui.swt/.project
index e661377..5774607 100644
--- a/com.minres.scviewer.database.swt/.project
+++ b/com.minres.scviewer.database.ui.swt/.project
@@ -1,6 +1,6 @@
- com.minres.scviewer.database.swt
+ com.minres.scviewer.database.ui.swt
diff --git a/com.minres.scviewer.database.swt/.settings/org.eclipse.core.resources.prefs b/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from com.minres.scviewer.database.swt/.settings/org.eclipse.core.resources.prefs
rename to com.minres.scviewer.database.ui.swt/.settings/org.eclipse.core.resources.prefs
diff --git a/com.minres.scviewer.database.swt/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.swt/.settings/org.eclipse.jdt.core.prefs
rename to com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs
diff --git a/com.minres.scviewer.database.swt/.settings/org.eclipse.m2e.core.prefs b/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.swt/.settings/org.eclipse.m2e.core.prefs
rename to com.minres.scviewer.database.ui.swt/.settings/org.eclipse.m2e.core.prefs
diff --git a/com.minres.scviewer.database.swt/.settings/org.eclipse.pde.core.prefs b/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from com.minres.scviewer.database.swt/.settings/org.eclipse.pde.core.prefs
rename to com.minres.scviewer.database.ui.swt/.settings/org.eclipse.pde.core.prefs
diff --git a/com.minres.scviewer.database.swt/META-INF/MANIFEST.MF b/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
similarity index 78%
rename from com.minres.scviewer.database.swt/META-INF/MANIFEST.MF
rename to com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
index 99006e9..ac7633b 100644
--- a/com.minres.scviewer.database.swt/META-INF/MANIFEST.MF
+++ b/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: SWT widget
-Bundle-SymbolicName: com.minres.scviewer.database.swt
+Bundle-SymbolicName: com.minres.scviewer.database.ui.swt
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: MINRES Technologies GmbH
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
com.minres.scviewer.database;bundle-version="1.0.0",
com.google.guava;bundle-version="15.0.0",
org.eclipse.jface,
- org.eclipse.equinox.registry
+ org.eclipse.equinox.registry,
+ com.minres.scviewer.database.ui
Export-Package: com.minres.scviewer.database.swt
Bundle-ClassPath: .,
swing2swt.jar
diff --git a/com.minres.scviewer.database.swt/build.properties b/com.minres.scviewer.database.ui.swt/build.properties
similarity index 92%
rename from com.minres.scviewer.database.swt/build.properties
rename to com.minres.scviewer.database.ui.swt/build.properties
index 8a5bcac..4e2b05a 100644
--- a/com.minres.scviewer.database.swt/build.properties
+++ b/com.minres.scviewer.database.ui.swt/build.properties
@@ -9,7 +9,6 @@
# MINRES Technologies GmbH - initial API and implementation
###############################################################################
bin.includes = META-INF/,\
- .,\
- swing2swt.jar
+ .
source.. = src/
jars.compile.order = .
diff --git a/com.minres.scviewer.database.ui.swt/pom.xml b/com.minres.scviewer.database.ui.swt/pom.xml
new file mode 100644
index 0000000..52701bd
--- /dev/null
+++ b/com.minres.scviewer.database.ui.swt/pom.xml
@@ -0,0 +1,11 @@
+
+ 4.0.0
+ com.minres.scviewer.database.ui.swt
+ eclipse-plugin
+
+ com.minres.scviewer
+ com.minres.scviewer.parent
+ 1.0.0-SNAPSHOT
+ ../com.minres.scviewer.parent
+
+
\ No newline at end of file
diff --git a/com.minres.scviewer.database.swt/src/com/minres/scviewer/database/swt/TxDisplay.java b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/TxDisplay.java
similarity index 83%
rename from com.minres.scviewer.database.swt/src/com/minres/scviewer/database/swt/TxDisplay.java
rename to com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/TxDisplay.java
index 202c9e3..5e85e4e 100644
--- a/com.minres.scviewer.database.swt/src/com/minres/scviewer/database/swt/TxDisplay.java
+++ b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/TxDisplay.java
@@ -25,7 +25,6 @@ import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
@@ -84,19 +83,15 @@ import com.minres.scviewer.database.swt.internal.SignalPainter;
import com.minres.scviewer.database.swt.internal.StreamPainter;
import com.minres.scviewer.database.swt.internal.TrackPainter;
import com.minres.scviewer.database.swt.internal.WaveformCanvas;
+import com.minres.scviewer.database.ui.GotoDirection;
+import com.minres.scviewer.database.ui.IWaveformPanel;
-import swing2swt.layout.BorderLayout;
-
-public class TxDisplay implements PropertyChangeListener, ISelectionProvider {
+public class TxDisplay implements IWaveformPanel {
private ListenerList selectionChangedListeners = new ListenerList();
private PropertyChangeSupport pcs;
- public static final String CURSOR_PROPERTY = "cursor_time";
-
- public static final String MARKER_PROPERTY = "marker_time";
-
private static final String SELECTION = "selection";
private ITx currentTxSelection;
@@ -111,7 +106,7 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider {
private Canvas valueList;
- WaveformCanvas waveformList;
+ WaveformCanvas waveformCanvas;
private Composite top;
@@ -121,8 +116,6 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider {
int selectedMarker = 0;
- private Composite trackPane;
-
private int trackVerticalHeight;
private TreeMap> trackVerticalOffset;
@@ -154,9 +147,9 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider {
public void mouseDown(MouseEvent e) {
start=new Point(e.x, e.y);
if (e.button == 1) {
- initialSelected = waveformList.getClicked(start);
+ initialSelected = waveformCanvas.getClicked(start);
} else if (e.button == 3) {
- List