Merge branch 'release/2.19.4'

streams

.gitignore

@@ -3,3 +3,11 @@
 /.recommenders/
 /RemoteSystemsTempFiles/
 /*.zip
+SCViewer initiator_target.launch
+SCViewer.xcf
+SCViewer_1.png
+copyrightLog.txt
+/workspace
+?*.launch
+/.settings/
+.tycho-consumer-pom.xml

.launch/Build SCViewer.launch

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <intAttribute key="M2_COLORS" value="0"/>
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+    <stringAttribute key="M2_GOALS" value="package"/>
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+    <booleanAttribute key="M2_OFFLINE" value="false"/>
+    <stringAttribute key="M2_PROFILES" value=""/>
+    <listAttribute key="M2_PROPERTIES"/>
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+    <intAttribute key="M2_THREADS" value="1"/>
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.minres.scviewer.parent}"/>
+</launchConfiguration>

.launch/Build and deploy SCViewer.launch

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <intAttribute key="M2_COLORS" value="0"/>
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+    <stringAttribute key="M2_GOALS" value="package"/>
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+    <booleanAttribute key="M2_OFFLINE" value="false"/>
+    <stringAttribute key="M2_PROFILES" value="release-composite"/>
+    <listAttribute key="M2_PROPERTIES"/>
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+    <intAttribute key="M2_THREADS" value="4"/>
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.minres.scviewer.parent}"/>
+</launchConfiguration>

.launch/Set SCViewer version.launch

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+    <intAttribute key="M2_COLORS" value="0"/>
+    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+    <stringAttribute key="M2_GOALS" value="tycho-versions:set-version tycho-versions:update-pom"/>
+    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+    <booleanAttribute key="M2_OFFLINE" value="false"/>
+    <stringAttribute key="M2_PROFILES" value=""/>
+    <listAttribute key="M2_PROPERTIES">
+        <listEntry value="newVersion=${string_prompt:new version number}"/>
+    </listAttribute>
+    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+    <intAttribute key="M2_THREADS" value="1"/>
+    <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+    <stringAttribute key="M2_USER_SETTINGS" value=""/>
+    <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+    <stringAttribute key="bad_container_name" value="/com.minres.scviewer.parent/.launch"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.minres.scviewer.parent}"/>
+</launchConfiguration>

LICENSE

@@ -0,0 +1,203 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+   distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+    i) changes to the Program, and
+   ii) additions to the Program;
+
+   where such changes and/or additions to the Program originate from and are
+   distributed by that particular Contributor. A Contribution 'originates'
+   from a Contributor if it was added to the Program by such Contributor
+   itself or anyone acting on such Contributor's behalf. Contributions do not
+   include additions to the Program which: (i) are separate modules of
+   software distributed in conjunction with the Program under their own
+   license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+  a) Subject to the terms of this Agreement, each Contributor hereby grants
+     Recipient a non-exclusive, worldwide, royalty-free copyright license to
+     reproduce, prepare derivative works of, publicly display, publicly
+     perform, distribute and sublicense the Contribution of such Contributor,
+     if any, and such derivative works, in source code and object code form.
+  b) Subject to the terms of this Agreement, each Contributor hereby grants
+     Recipient a non-exclusive, worldwide, royalty-free patent license under
+     Licensed Patents to make, use, sell, offer to sell, import and otherwise
+     transfer the Contribution of such Contributor, if any, in source code and
+     object code form. This patent license shall apply to the combination of
+     the Contribution and the Program if, at the time the Contribution is
+     added by the Contributor, such addition of the Contribution causes such
+     combination to be covered by the Licensed Patents. The patent license
+     shall not apply to any other combinations which include the Contribution.
+     No hardware per se is licensed hereunder.
+  c) Recipient understands that although each Contributor grants the licenses
+     to its Contributions set forth herein, no assurances are provided by any
+     Contributor that the Program does not infringe the patent or other
+     intellectual property rights of any other entity. Each Contributor
+     disclaims any liability to Recipient for claims brought by any other
+     entity based on infringement of intellectual property rights or
+     otherwise. As a condition to exercising the rights and licenses granted
+     hereunder, each Recipient hereby assumes sole responsibility to secure
+     any other intellectual property rights needed, if any. For example, if a
+     third party patent license is required to allow Recipient to distribute
+     the Program, it is Recipient's responsibility to acquire that license
+     before distributing the Program.
+  d) Each Contributor represents that to its knowledge it has sufficient
+     copyright rights in its Contribution, if any, to grant the copyright
+     license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+  a) it complies with the terms and conditions of this Agreement; and
+  b) its license agreement:
+      i) effectively disclaims on behalf of all Contributors all warranties
+         and conditions, express and implied, including warranties or
+         conditions of title and non-infringement, and implied warranties or
+         conditions of merchantability and fitness for a particular purpose;
+     ii) effectively excludes on behalf of all Contributors all liability for
+         damages, including direct, indirect, special, incidental and
+         consequential damages, such as lost profits;
+    iii) states that any provisions which differ from this Agreement are
+         offered by that Contributor alone and not by any other party; and
+     iv) states that source code for the Program is available from such
+         Contributor, and informs licensees how to obtain it in a reasonable
+         manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+  a) it must be made available under this Agreement; and
+  b) a copy of this Agreement must be included with each copy of the Program.
+     Contributors may not remove or alter any copyright notices contained
+     within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore,
+if a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits and
+other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such Commercial
+Contributor in connection with its distribution of the Program in a commercial
+product offering. The obligations in this section do not apply to any claims
+or Losses relating to any actual or alleged intellectual property
+infringement. In order to qualify, an Indemnified Contributor must:
+a) promptly notify the Commercial Contributor in writing of such claim, and
+b) allow the Commercial Contributor to control, and cooperate with the
+Commercial Contributor in, the defense and any related settlement
+negotiations. The Indemnified Contributor may participate in any such claim at
+its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If
+that Commercial Contributor then makes performance claims, or offers
+warranties related to Product X, those performance claims and warranties are
+such Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its
+exercise of rights under this Agreement , including but not limited to the
+risks and costs of program errors, compliance with applicable laws, damage to
+or loss of data, programs or equipment, and unavailability or interruption of
+operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
+LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
+OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of the
+remainder of the terms of this Agreement, and without further action by the
+parties hereto, such provision shall be reformed to the minimum extent
+necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue
+and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to
+time. No one other than the Agreement Steward has the right to modify this
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The
+Eclipse Foundation may assign the responsibility to serve as the Agreement
+Steward to a suitable separate entity. Each new version of the Agreement will
+be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the
+Agreement under which it was received. In addition, after a new version of the
+Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly
+stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
+licenses to the intellectual property of any Contributor under this Agreement,
+whether expressly, by implication, estoppel or otherwise. All rights in the
+Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.

README.md

@@ -1,42 +1,70 @@
 SCViewer
 ========
 
-SCViewer is composed of a set of eclipse plugins to display VCD and transaction streams 
-created by the SystemC VCD trace implementation and the SystemC Verification Library (SCV).
-For further description of the SCV please refer to 
-http://www.accellera.org/activities/committees/systemc-verification.
+SCViewer is composed of a set of eclipse plugins to display VCD (e.g. created by SystemC VCD trace) and transaction streams. Those streams can be 
+created by the SystemC Verification Library (SCV, For further description of the SCV please refer to https://www.accellera.org/activities/working-groups/systemc-verification) or by the **L**ight**w**eight **T**ranasaction **R**ecording for SystemC ( [LWTR4SC](https://github.com/Minres/LWTR4SC) ).
 
-The viewer is in early alpha stage and not yet ready for production use!
+The viewer has the following features
+- support of VCD files (compressed and uncompressed)
+ - real numbers
+ - showing vectors and real numbers as analog (step-wise & continuous)
+ - various value representations of bit vectors
+- support of SCV transaction recordings in various formats
+ - text log files (compressed and uncompressed)
+ - sqlite based 
+ - visualization of transaction relations
 
-The plugins are structured as follows:
-- com.minres.scviewer.database
-	the interface defining the API to access the database and the implementation for VCD
-- com.minres.scviewer.database.text
-	an implementation of the API to read the text files generated by the SCV
-	sc_tr_text database
-- com.minres.scviewer.database.sqlite
-	an implementation of the API to read the files generated by implementation in the
-	sc_tr_sqlite project using a SQLite based database
-- com.minres.scviewer.database.test
-	a some JUnit tests of the 3 back ends
-- com.minres.scviewer.ui
-	the viewer it self to diplay the transactions and associated views like the
-	outline of the DB and the properties of the transaction
-- com.minres.scviewer.feature
-	the feature combining the plugins above into a somhow usable form
-- scv_tr_sqlite
-	a C++ project containing the SQLite based SCV database implementation and the scv4tlm 
-	socket implementations.
-	A simple example (scv_tr_recording_example.cpp) for testig purposes of the database is
-	provided. 
-	
-To build the plugins the Eclipse SDK or PDE can be used. In both cases the Groovy
-eclipse plugin (http://groovy.codehaus.org/Eclipse+Plugin or Market) has to be
-installed.
+> If you encounter issue when running on Linux please try running as `SWT_GTK3=0 scviewer` as there exist issues wiht GTK3.
+
+To build the plugins the Eclipse SDK or PDE can be used.
+
+Key Shortcuts
+=============
+
+Legend:
+
+* Left Mouse Button: LMB
+* Middle Mouse Button: MMB
+* Mouse Scroll wheel: MScrl
+* Context any means Name List, Value List or Waveform
+
+| Input      | Modifier | Context  | Action                            |
+|------------|----------|----------|-----------------------------------|
+| LMB click  |          | any      | select                            |
+| LMB click  | Shift    | Waveform | move selected marker to position  |
+| LMB click  | Control  | Waveform | move cursor to position           |
+| LMB drag   |          | Waveform | zoom to range                     |
+| MMB click  |          | Waveform | move selected marker to position  |
+| MScrl      |          | any      | scroll window up/down             |
+| MScrl      | Shift    | any      | scroll window left/right          |
+| MScrl      | Control  | Waveform | zoom in/out                       |
+| Key left   |          | Waveform | scroll window to the left (slow)  |
+| Key right  |          | Waveform | scroll window to the right (slow) |
+| Key left   | Shift    | Waveform | scroll window to the left (fast)  |
+| Key right  | Shift    | Waveform | scroll window to the right (fast) |
+| Key up     |          | Waveform | move selection up                 |
+| Key down   |          | Waveform | move selection down               |
+| Key up     | Control  | Waveform | move selected track up            |
+| Key down   | Control  | Waveform | move selected track down          |
+| Key +      | Control  | Waveform | zoom in                           |
+| Key -      | Control  | Waveform | zoom out                          |
+| Key Pos1   |          | Waveform | jump to selected marker           |
+| Key End    |          | Waveform | jump to cursor                    |
+| Key Del    |          | any      | delete selected entries           |
+| LMB click  |          | ZoomBar  | increment/decrement 1 page        |
+| LMB drag   |          | ZoomBar  | drag both markers (pan)           |
+| LMB drag   | Control  | ZoomBar  | drag one marker (zoom)            |
+| MMB drag   |          | ZoomBar  | drag one marker (zoom)            |
+| xMB dclick |          | ZoomBar  | pan to position                   |
+| MScrl      |          | ZoomBar  | scroll window left/right          |
+| MScrl      | Shift    | ZoomBar  | scroll window left/right double speed |
+| MScrl      | Control  | ZoomBar  | zoom in/out                       |
+| Key left   |          | ZoomBar  | scroll window to the left (slow)  |
+| Key right  |          | ZoomBar  | scroll window to the right (slow) |
+| Key up     |          | ZoomBar  | scroll window to the left (slow)  |
+| Key down   |          | ZoomBar  | scroll window to the right (slow) |
+| Key PgUp   |          | ZoomBar  | scroll window to the left (fast)  |
+| Key PgDown |          | ZoomBar  | scroll window to the right (fast) |
+| Key Pos1   |          | ZoomBar  | scroll to begin                   |
+| Key End    |          | ZoomBar  | scroll to end                     |
 
-TODO
-====
-- add more tests
-- move to feature based product to allow automatic updates
-- improve graphics
-- catch-up e3 plugin to functionality of e4 product

com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7

com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.sqlite;
-
-import java.util.List;
-
-import com.minres.scviewer.database.ITx;
-import com.minres.scviewer.database.ITxEvent;
-import com.minres.scviewer.database.ITxGenerator;
-import com.minres.scviewer.database.ITxStream;
-import com.minres.scviewer.database.sqlite.tables.ScvGenerator;
-
-public class TxGenerator implements ITxGenerator {
-
-	private ITxStream<ITxEvent>  stream;
-	
-	private ScvGenerator scvGenerator;
-
-	public TxGenerator(ITxStream<ITxEvent>  stream, ScvGenerator scvGenerator) {
-		this.stream=stream;
-		this.scvGenerator=scvGenerator;
-	}
-
-	@Override
-	public Long getId() {
-		return (long) scvGenerator.getId();
-	}
-
-	@Override
-	public ITxStream<ITxEvent> getStream() {
-		return stream;
-	}
-
-	@Override
-	public String getName() {
-		return scvGenerator.getName();
-	}
-
-	@Override
-	public List<ITx> getTransactions() {
-		return null;
-	}
-
-}

com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java

@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.sqlite;
-
-import java.beans.IntrospectionException;
-import java.lang.reflect.InvocationTargetException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import com.minres.scviewer.database.HierNode;
-import com.minres.scviewer.database.ITx;
-import com.minres.scviewer.database.ITxEvent;
-import com.minres.scviewer.database.ITxGenerator;
-import com.minres.scviewer.database.ITxStream;
-import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.IWaveformDb;
-import com.minres.scviewer.database.IWaveformEvent;
-import com.minres.scviewer.database.RelationType;
-import com.minres.scviewer.database.sqlite.db.IDatabase;
-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;
-
-public class TxStream extends HierNode implements ITxStream<ITxEvent> {
-
-	private IDatabase database;
-
-	private String fullName;
-	
-	private IWaveformDb db;
-	
-	private ScvStream scvStream;
-	
-	private TreeMap<Integer, TxGenerator> generators;
-	
-	private TreeMap<Integer, ITx> transactions;
-	
-	private Integer maxConcurrency;
-	
-	private TreeMap<Long, List<ITxEvent>> events;
-
-	private List<RelationType> usedRelationsList;
-	
-	public TxStream(IDatabase database, IWaveformDb waveformDb, ScvStream scvStream) {
-		super(scvStream.getName());
-		this.database=database;
-		fullName=scvStream.getName();
-		this.scvStream=scvStream;
-		db=waveformDb;
-	}
-
-	@Override
-	public IWaveformDb getDb() {
-		return db;
-	}
-
-	@Override
-	public String getFullName() {
-		return fullName;
-	}
-
-	@Override
-	public Long getId() {
-		return (long) scvStream.getId();
-	}
-
-	@Override
-	public String getKind() {
-		return scvStream.getKind();
-	}
-
-	@Override
-	public List<ITxGenerator> getGenerators() {
-		if(generators==null){
-			SQLiteDatabaseSelectHandler<ScvGenerator> handler = new SQLiteDatabaseSelectHandler<ScvGenerator>(
-					ScvGenerator.class, database, "stream="+scvStream.getId());
-			generators=new TreeMap<Integer, TxGenerator>();
-			try {
-				for(ScvGenerator scvGenerator:handler.selectObjects()){
-					generators.put(scvGenerator.getId(), new TxGenerator(this, scvGenerator));
-				}
-			} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-					| InvocationTargetException | SQLException | IntrospectionException e) {
-				e.printStackTrace();
-			}
-		}
-		return new ArrayList<ITxGenerator>(generators.values());
-	}
-
-	@Override
-	public int getMaxConcurrency() {
-		if(maxConcurrency==null){
-			java.sql.Connection connection=null;
-			java.sql.Statement statement=null;
-			java.sql.ResultSet resultSet=null;
-			try {
-				connection = database.createConnection();
-				statement = connection.createStatement();
-				StringBuilder sb = new StringBuilder();
-				sb.append("SELECT MAX(concurrencyLevel) as concurrencyLevel FROM ScvTx where stream=");
-				sb.append(scvStream.getId());
-				resultSet = statement.executeQuery(sb.toString());
-				while (resultSet.next()) {
-					Object value = resultSet.getObject("concurrencyLevel");
-					if(value!=null)
-						maxConcurrency=(Integer) value;
-				}
-			} catch (SQLException e) {
-				if(maxConcurrency==null) maxConcurrency=0;
-			} finally {
-				try{
-				if(resultSet!=null) resultSet.close();
-				if(statement!=null) statement.close();
-				if(connection!=null) connection.close();
-				} catch (SQLException e) {	}
-			}
-			maxConcurrency+=1;
-		}
-		return maxConcurrency;
-	}
-
-	@Override
-	public  NavigableMap<Long, List<ITxEvent>> getEvents(){
-		if(events==null){
-			events=new TreeMap<Long, List<ITxEvent>>();
-			for(Entry<Integer, ITx> entry:getTransactions().entrySet()){
-				putEvent(new TxEvent(TxEvent.Type.BEGIN, entry.getValue()));
-				putEvent(new TxEvent(TxEvent.Type.END, entry.getValue()));
-			}	
-		}
-		return events;
-	}
-
-	private void putEvent(TxEvent ev){
-		Long time = ev.getTime();
-		if(!events.containsKey(time)){
-			Vector<ITxEvent> vector=new Vector<ITxEvent>();
-			vector.add(ev);
-			events.put(time,  vector);
-		} else {
-			events.get(time).add(ev);
-		}
-	}
-
-	protected Map<Integer, ITx> getTransactions() {
-		if(transactions==null){
-			if(generators==null) getGenerators();
-			transactions = new TreeMap<Integer, ITx>();
-			SQLiteDatabaseSelectHandler<ScvTx> handler = new SQLiteDatabaseSelectHandler<ScvTx>(ScvTx.class, database,
-					"stream="+scvStream.getId());
-			try {
-				for(ScvTx scvTx:handler.selectObjects()){
-					transactions.put(scvTx.getId(), new Tx(database, this, generators.get(scvTx.getGenerator()), scvTx));
-				}
-			} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
-					| InvocationTargetException | SQLException | IntrospectionException e) {
-				e.printStackTrace();
-			}
-		}
-		return transactions;
-	}
-
-	@Override
-	public Collection<ITxEvent> getWaveformEventsAtTime(Long time) {
-		return getEvents().get(time);
-	}
-
-	public void setRelationTypeList(List<RelationType> usedRelationsList){
-		this.usedRelationsList=usedRelationsList;
-	}
-	
-	public RelationType getRelationType(String name) {
-		RelationType relType=RelationType.create(name);
-		if(!usedRelationsList.contains(relType)) usedRelationsList.add(relType);
-		return relType;
-	}
-
-	@Override
-	public Boolean equals(IWaveform<? extends IWaveformEvent> other) {
-		return(other instanceof TxStream && this.getId()==other.getId());
-	}
-
-}

com.minres.scviewer.database.test/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

com.minres.scviewer.database.test/.settings/org.eclipse.core.resources.prefs

@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/com/minres/scviewer/database/test/DatabaseServicesTest.java=UTF-8
-encoding/<project>=UTF-8

com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7

com.minres.scviewer.database.test/DatabaseServicesTest.launch

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="com.minres.scviewer.database.swt,com.minres.scviewer.e4.application,com.minres.scviewer.ui"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.minres.scviewer.database.test.DatabaseServicesTest"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.minres.scviewer.database.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="com.minres.scviewer.e4.product"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava*10.0.1.v201203051515@default:default,com.google.guava*15.0.0.v201403281430@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.codehaus.groovy*2.4.3.xx-201508121448-e45@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.trace@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.mozilla.javascript@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.minres.scviewer.database.sqlite@default:true,com.minres.scviewer.database.test@default:default,com.minres.scviewer.database.text@default:true,com.minres.scviewer.database.vcd@default:default,com.minres.scviewer.database@default:true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>

com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java

@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.minres.scviewer.database.IWaveformDb;
-import com.minres.scviewer.database.IWaveformDbFactory;
-
-public class DatabaseServicesTest {
-
-
-	private static IWaveformDbFactory waveformDbFactory;
-
-	private IWaveformDb waveformDb;
-	
-	public synchronized void setFactory(IWaveformDbFactory service) {
-		waveformDbFactory = service;
-	}
-
-	public synchronized void unsetFactory(IWaveformDbFactory service) {
-		if (waveformDbFactory == service) {
-			waveformDbFactory = null;
-		}
-	}
-	
-	@Before
-	public void setUp() throws Exception {
-		waveformDb=waveformDbFactory.getDatabase();
-		// Wait for OSGi dependencies
-//		for (int i = 0; i < 10; i++) {
-//			if (waveformDb.size() == 3) // Dependencies fulfilled
-//				return;
-//			Thread.sleep(1000);
-//		}
-//		assertEquals("OSGi dependencies unfulfilled", 3, WaveformDb.getLoaders().size());
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
-
-	@Test
-	public void testVCD() throws Exception {
-		File f = new File("inputs/my_db.vcd").getAbsoluteFile();
-		assertTrue(f.exists());
-		waveformDb.load(f);
-		assertNotNull(waveformDb);
-		assertEquals(14,  waveformDb.getAllWaves().size());
-		assertEquals(2,  waveformDb.getChildNodes().size());
-	}
-
-	@Test
-	public void testTxSQLite() throws Exception {
-		File f = new File("inputs/my_db.txdb").getAbsoluteFile();
-		assertTrue(f.exists());
-		waveformDb.load(f);
-		assertNotNull(waveformDb);
-		assertEquals(3,  waveformDb.getAllWaves().size());
-		assertEquals(1,  waveformDb.getChildNodes().size());
-	}
-
-	@Test
-	public void testTxText() throws Exception {
-		File f = new File("inputs/my_db.txlog").getAbsoluteFile();
-		assertTrue(f.exists());
-		waveformDb.load(f);
-		assertNotNull(waveformDb);
-		assertEquals(3,  waveformDb.getAllWaves().size());
-		assertEquals(1,  waveformDb.getChildNodes().size());
-	}
-
-
-}

com.minres.scviewer.database.text/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

com.minres.scviewer.database.text/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7

com.minres.scviewer.database.text/META-INF/MANIFEST.MF

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Textual transaction database
-Bundle-SymbolicName: com.minres.scviewer.database.text
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: com.minres.scviewer.database,
- org.osgi.framework;version="1.3.0"
-Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- org.codehaus.groovy;bundle-version="1.8.6",
- org.eclipse.equinox.util;bundle-version="1.0.500",
- org.eclipse.equinox.ds;bundle-version="1.4.200",
- org.eclipse.osgi.services;bundle-version="3.4.0",
- com.google.guava;bundle-version="15.0.0"
-Service-Component: OSGI-INF/component.xml
-Bundle-ActivationPolicy: lazy

com.minres.scviewer.database.text/pom.xml

@@ -1,43 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>com.minres.scviewer.database.text</artifactId>
-	<parent>
-		<groupId>com.minres.scviewer</groupId>
-		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../com.minres.scviewer.parent</relativePath>
-	</parent>
-	<packaging>eclipse-plugin</packaging>
-	<build>
-	<plugins>
-				<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-compiler-plugin</artifactId>
-				<configuration>
-					<compilerId>groovy-eclipse-compiler</compilerId>
-					<!-- set verbose to be true if you want lots of uninteresting messages -->
-					<!-- <verbose>true</verbose> -->
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.codehaus.groovy</groupId>
-						<artifactId>groovy-eclipse-compiler</artifactId>
-						<version>${groovy-eclipse-compiler-version}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.codehaus.groovy</groupId>
-						<artifactId>groovy-eclipse-batch</artifactId>
-						<version>${groovy-eclipse-batch-version}</version>
-						<!-- or choose a different compiler version -->
-						<!-- <version>2.1.8-01</version> -->
-					</dependency>
-				</dependencies>
-			</plugin>
-	</plugins>
-	</build>
-	<groupId>com.minres.scviewer</groupId>
-	<version>1.0.0-SNAPSHOT</version>
-</project>

com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TextDbLoader.groovy

@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 IT Just working.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IT Just working - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.text;
-
-import java.util.Collection;
-
-import com.minres.scviewer.database.AssociationType
-import com.minres.scviewer.database.DataType
-import com.minres.scviewer.database.ITxGenerator
-import com.minres.scviewer.database.ITxStream
-import com.minres.scviewer.database.IWaveform
-import com.minres.scviewer.database.IWaveformDb
-import com.minres.scviewer.database.IWaveformDbLoader
-import com.minres.scviewer.database.RelationType
-
-public class TextDbLoader implements IWaveformDbLoader{
-
-	private Long maxTime;
-
-	IWaveformDb db;
-		
-	def streams = []
-	
-	def relationTypes=[:]
-	
-	public TextDbLoader() {
-	}
-
-	@Override
-	public Long getMaxTime() {
-		return maxTime;
-	}
-
-	@Override
-	public List<IWaveform> getAllWaves() {
-		return new LinkedList<IWaveform>(streams);
-	}
-
-	public Map<Long, ITxGenerator> getGeneratorsById() {
-		TreeMap<Long, ITxGenerator> res = new TreeMap<Long, ITxGenerator>();
-		streams.each{TxStream stream -> stream.generators.each{res.put(it.id, id)} }
-		return res;
-	}
-
-	static final byte[] x = "scv_tr_stream".bytes
-
-	@Override
-	boolean load(IWaveformDb db, File file) throws Exception {
-		this.db=db
-		this.streams=[]
-		FileInputStream fis = new FileInputStream(file)
-        byte[] buffer = new byte[x.size()]
-        def readCnt = fis.read(buffer, 0, x.size())
-        fis.close()
-        if(readCnt==x.size())
-        	for(int i=0; i<x.size(); i++)
-        		if(buffer[i]!=x[i]) return false
-		parseInput(file)
-		calculateConcurrencyIndicees()
-		return true
-	}
-
-	private stringToScale(String scale){
-		switch(scale.trim()){
-			case "fs":return 1L
-			case "ps":return 1000L
-			case "ns":return 1000000L
-			case "us":return 1000000000L
-			case "ms":return 1000000000000L
-			case "s": return 1000000000000000L
-		}
-	}
-	private def parseInput(File input){
-		def streamsById = [:]
-		def generatorsById = [:]
-		def transactionsById = [:]
-		TxGenerator generator
-		Tx transaction
-		boolean endTransaction=false
-		def matcher
-		input.eachLine { line ->
-			def tokens = line.split(/\s+/)
-			switch(tokens[0]){
-				case "scv_tr_stream":
-				case "scv_tr_generator":
-				case "begin_attribute":
-				case "end_attribute":
-					if ((matcher = line =~ /^scv_tr_stream\s+\(ID (\d+),\s+name\s+"([^"]+)",\s+kind\s+"([^"]+)"\)$/)) {
-						def id = Integer.parseInt(matcher[0][1])
-						def stream = new TxStream(db, id, matcher[0][2], matcher[0][3])
-						streams<<stream
-						streamsById[id]=stream
-					} else if ((matcher = line =~ /^scv_tr_generator\s+\(ID\s+(\d+),\s+name\s+"([^"]+)",\s+scv_tr_stream\s+(\d+),$/)) {
-						def id = Integer.parseInt(matcher[0][1])
-						ITxStream stream=streamsById[Integer.parseInt(matcher[0][3])]
-						generator=new TxGenerator(id, stream, matcher[0][2])
-						stream.generators<<generator
-						generatorsById[id]=generator
-					} else if ((matcher = line =~ /^begin_attribute \(ID (\d+), name "([^"]+)", type "([^"]+)"\)$/)) {
-						generator.begin_attrs << TxAttributeType.getAttrType(matcher[0][2], DataType.valueOf(matcher[0][3]), AssociationType.BEGIN)
-					} else if ((matcher = line =~ /^end_attribute \(ID (\d+), name "([^"]+)", type "([^"]+)"\)$/)) {
-						generator.end_attrs << TxAttributeType.getAttrType(matcher[0][2], DataType.valueOf(matcher[0][3]), AssociationType.END)
-					}
-					break;
-				case ")":
-					generator=null
-					break
-				case "tx_begin"://matcher = line =~ /^tx_begin\s+(\d+)\s+(\d+)\s+(\d+)\s+([munpf]?s)/
-					def id = Integer.parseInt(tokens[1])
-					TxGenerator gen=generatorsById[Integer.parseInt(tokens[2])]
-					transaction = new Tx(id, gen.stream, gen, Long.parseLong(tokens[3])*stringToScale(tokens[4]))
-					gen.transactions << transaction
-					transactionsById[id]= transaction
-					gen.begin_attrs_idx=0;
-					maxTime = maxTime>transaction.beginTime?maxTime:transaction.beginTime
-					endTransaction=false
-					break
-				case "tx_end"://matcher = line =~ /^tx_end\s+(\d+)\s+(\d+)\s+(\d+)\s+([munpf]?s)/
-					def id = Integer.parseInt(tokens[1])
-					transaction = transactionsById[id]
-					assert Integer.parseInt(tokens[2])==transaction.generator.id
-					transaction.endTime = Long.parseLong(tokens[3])*stringToScale(tokens[4])
-					transaction.generator.end_attrs_idx=0;
-					maxTime = maxTime>transaction.endTime?maxTime:transaction.endTime
-					endTransaction=true
-					break
-				case "tx_record_attribute"://matcher = line =~ /^tx_record_attribute\s+(\d+)\s+"([^"]+)"\s+(\S+)\s*=\s*(.+)$/
-					def id = Integer.parseInt(tokens[1])
-					transactionsById[id].attributes<<new TxAttribute(tokens[2][1..-2], DataType.valueOf(tokens[3]), AssociationType.RECORD, tokens[5..-1].join(' '))
-					break
-				case "a"://matcher = line =~ /^a\s+(.+)$/
-					if(endTransaction){
-						transaction.attributes << new TxAttribute(transaction.generator.end_attrs[0], tokens[1])
-					} else {
-						transaction.attributes << new TxAttribute(transaction.generator.begin_attrs[0], tokens[1])
-					}
-					break
-				case "tx_relation"://matcher = line =~ /^tx_relation\s+\"(\S+)\"\s+(\d+)\s+(\d+)$/
-					Tx tr2= transactionsById[Integer.parseInt(tokens[2])]
-					Tx tr1= transactionsById[Integer.parseInt(tokens[3])]
-					def relType=tokens[1][1..-2]
-					if(!relationTypes.containsKey(relType)) relationTypes[relType]=RelationType.create(relType)
-					def rel = new TxRelation(relationTypes[relType], tr1, tr2)
-					tr1.outgoingRelations<<rel
-					tr2.incomingRelations<<rel
-					break
-				default:
-					println "Don't know what to do with: '$line'"
-
-			}
-		}
-	}
-
-	private def calculateConcurrencyIndicees(){
-		streams.each{ TxStream  stream -> stream.getMaxConcurrency() }
-	}
-	
-	
-	public Collection<RelationType> getAllRelationTypes(){
-		return relationTypes.values();
-	}
-
-}

com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/Tx.groovy

@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 IT Just working.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IT Just working - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.text
-
-import com.minres.scviewer.database.*
-
-class Tx implements ITx {
-	
-	Long id
-	
-	TxGenerator generator
-
-	TxStream stream
-	
-	int concurrencyIndex
-	
-	Long beginTime
-	
-	Long endTime
-	
-	ArrayList<ITxAttribute> attributes = new ArrayList<ITxAttribute>()
-	
-	def incomingRelations =[]
-	
-	def outgoingRelations =[]
-	
-	Tx(int id, TxStream stream, TxGenerator generator, Long begin){
-		this.id=id
-		this.stream=stream
-		this.generator=generator
-		this.beginTime=begin
-        this.endTime=begin
-	}
-	
-	@Override
-	public Collection<ITxRelation> getIncomingRelations() {
-		return incomingRelations;
-	}
-
-	@Override
-	public Collection<ITxRelation> getOutgoingRelations() {
-		return outgoingRelations;
-	}
-
-	@Override
-	public int compareTo(ITx o) {
-		def res =beginTime.compareTo(o.beginTime)
-		if(res!=0) 
-			return res
-		else
-			return id.compareTo(o.id)
-	}
-	
-	@Override
-	public String toString() {
-		return "tx#"+getId()+"["+getBeginTime()/1000000+"ns - "+getEndTime()/1000000+"ns]";
-	}
-
-}

com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttribute.groovy

@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 IT Just working.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IT Just working - initial API and implementation
- *******************************************************************************/
-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
-
-class TxAttribute  implements ITxAttribute{
-	
-	TxAttributeType attributeType
-
-	def value
-	
-	TxAttribute(String name, DataType dataType, AssociationType type, value){
-		attributeType = TxAttributeTypeFactory.instance.getAttrType(name, dataType, type)
-		switch(dataType){
-			case DataType.STRING:
-			case DataType.ENUMERATION:
-				this.value=value[1..-2]
-				break;
-			default:
-				this.value=value
-		}
-	}
-
-	TxAttribute(TxAttributeType other){
-		attributeType=other
-	}
-	
-	TxAttribute(TxAttributeType other, value){
-		this(other.name, other.dataType, other.type, value)
-	}
-
-	@Override
-	public String getName() {
-		return attributeType.getName();
-	}
-
-	@Override
-	public AssociationType getType() {
-		attributeType.type;
-	}
-
-	@Override
-	public DataType getDataType() {
-		attributeType.dataType;
-	}
-
-}

com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeType.groovy

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 IT Just working.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IT Just working - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.text
-
-import com.minres.scviewer.database.AssociationType;
-import com.minres.scviewer.database.DataType;
-import com.minres.scviewer.database.ITxAttributeType;
-
-class TxAttributeType implements ITxAttributeType {
-	String name
-	DataType dataType
-	AssociationType type
-	
-	static TxAttributeType getAttrType(String name, DataType dataType, AssociationType type){
-		TxAttributeTypeFactory.instance.getAttrType(name, dataType, type)
-	}
-	
-	TxAttributeType(String name, DataType dataType, AssociationType type){
-		this.name=name
-		this.dataType=dataType
-		this.type=type
-	}
-}

com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxAttributeTypeFactory.groovy

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 IT Just working.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IT Just working - initial API and implementation
- *******************************************************************************/
-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
-
-class TxAttributeTypeFactory {
-	private static final instance = new TxAttributeTypeFactory()
-	
-	def attributes = [:]
-	
-	private TxAttributeTypeFactory() {
-		TxAttributeTypeFactory.metaClass.constructor = {-> instance }
-	}
-	
-	ITxAttributeType getAttrType(String name, DataType dataType, AssociationType type){
-		def key = name+":"+dataType.toString()
-		ITxAttributeType res
-		if(attributes.containsKey(key)){
-			res=attributes[key]
-		} else {
-			res=new TxAttributeType(name, dataType, type)
-			attributes[key]=res
-		}
-		return res
-	}
-}

com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxEvent.groovy

@@ -1,36 +0,0 @@
-package com.minres.scviewer.database.text;
-
-import com.minres.scviewer.database.ITx
-import com.minres.scviewer.database.ITxEvent
-import com.minres.scviewer.database.IWaveformEvent
-
-class TxEvent implements ITxEvent {
-
-	final ITxEvent.Type type;
-	
-	final Tx transaction;
-	
-	final Long time
-	
-	TxEvent(ITxEvent.Type type, ITx transaction) {
-		super();
-		this.type = type;
-		this.transaction = transaction;
-		this.time = type==ITxEvent.Type.BEGIN?transaction.beginTime:transaction.endTime
-	}
-
-	@Override
-	IWaveformEvent duplicate() throws CloneNotSupportedException {
-		new TxEvent(type, transaction, time)
-	}
-
-	@Override
-	int compareTo(IWaveformEvent o) {
-		time.compareTo(o.time)
-	}
-
-	@Override
-	String toString() {
-		type.toString()+"@"+time+" of tx #"+transaction.id;
-	}
-}

com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxGenerator.groovy

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 IT Just working.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IT Just working - initial API and implementation
- *******************************************************************************/
-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.ITxEvent;
-import com.minres.scviewer.database.ITxGenerator;
-import com.minres.scviewer.database.ITxStream;
-import com.minres.scviewer.database.ITx;
-import com.minres.scviewer.database.IWaveformEvent;
-
-class TxGenerator implements ITxGenerator{
-	Long id
-	TxStream stream
-	String name
-	Boolean active = false
-	ArrayList<ITx> transactions=[]
-	
-	ArrayList<ITxAttributeType> begin_attrs = []
-	int begin_attrs_idx = 0
-	ArrayList<ITxAttributeType> end_attrs= []
-	int end_attrs_idx = 0
-	
-	TxGenerator(int id, TxStream stream, name){
-		this.id=id
-		this.stream=stream
-		this.name=name
-	}
-	
-	ITxStream<? extends ITxEvent> getStream(){
-		return stream;
-	}
-	
-	List<ITx> getTransactions(){
-		return transactions
-	}
-	
-	Boolean isActive() {return active};
-	
-}

com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxRelation.groovy

@@ -1,36 +0,0 @@
-package com.minres.scviewer.database.text
-
-import com.minres.scviewer.database.ITxRelation
-import com.minres.scviewer.database.ITx;
-import com.minres.scviewer.database.RelationType;
-
-class TxRelation implements ITxRelation {
-	Tx source
-	
-	Tx target
-	
-	RelationType relationType
-	
-	
-	public TxRelation(RelationType relationType, Tx source, Tx target) {
-		this.source = source;
-		this.target = target;
-		this.relationType = relationType;
-	}
-
-	@Override
-	public RelationType getRelationType() {
-		return relationType;
-	}
-
-	@Override
-	public ITx getSource() {
-		return source;
-	}
-
-	@Override
-	public ITx getTarget() {
-		return target;
-	}
-
-}

com.minres.scviewer.database.text/src/com/minres/scviewer/database/text/TxStream.groovy

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 IT Just working.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IT Just working - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.text
-
-import java.beans.PropertyChangeListener;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-
-import com.google.common.collect.TreeMultimap
-import com.minres.scviewer.database.ITxEvent;
-import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.IWaveformDb
-import com.minres.scviewer.database.IWaveformEvent
-import com.minres.scviewer.database.ITxGenerator
-import com.minres.scviewer.database.HierNode;
-import com.minres.scviewer.database.IHierNode
-import com.minres.scviewer.database.ITxStream
-import com.minres.scviewer.database.ITx
-
-class TxStream extends HierNode implements ITxStream {
-
-	Long id
-	
-	IWaveformDb database
-	
-	String fullName
-	
-	String kind
-	
-	def generators = []
-	
-	int maxConcurrency
-	
-	private TreeMap<Long, List<ITxEvent>> events
-	
-	TxStream(IWaveformDb db, int id, String name, String kind){
-		super(name)
-		this.id=id
-		this.database=db
-		this.fullName=name
-		this.kind=kind
-		this.maxConcurrency=0
-		events = new TreeMap<Long, List<ITxEvent>>()
-	}
-
-	List<ITxGenerator> getGenerators(){
-		return generators as List<ITxGenerator>
-	}
-
-	@Override
-	public IWaveformDb getDb() {
-		return database
-	}
-
-	@Override
-	public int getMaxConcurrency() {
-		if(!maxConcurrency){
-			generators.each {TxGenerator generator ->
-				generator.transactions.each{ Tx tx ->
-					putEvent(new TxEvent(ITxEvent.Type.BEGIN, tx))
-					putEvent(new TxEvent(ITxEvent.Type.END, tx))
-				}
-			}
-			def rowendtime = [0]
-			events.keySet().each{long time ->
-				def value=events.get(time)
-				def starts=value.findAll{ITxEvent event ->event.type==ITxEvent.Type.BEGIN}
-				starts.each {ITxEvent event ->
-					Tx tx = event.transaction
-					def rowIdx = 0
-					for(rowIdx=0; rowIdx<rowendtime.size() && rowendtime[rowIdx]>tx.beginTime; rowIdx++);
-					if(rowendtime.size<=rowIdx)
-						rowendtime<<tx.endTime
-					else
-						rowendtime[rowIdx]=tx.endTime
-					tx.concurrencyIndex=rowIdx
-				}
-			}
-			maxConcurrency=rowendtime.size()
-		}
-		return maxConcurrency
-	}
-
-	private putEvent(ITxEvent event){
-		if(!events.containsKey(event.time)) 
-			events.put(event.time, [event])
-		else
-			events[event.time]<<event
-	}
-	
-	@Override
-	public NavigableMap getEvents() {
-		return events;
-	}
-
-	@Override
-	public Collection getWaveformEventsAtTime(Long time) {
-		return events.get(time);
-	}
-	
-	@Override
-	public Boolean equals(IWaveform<? extends IWaveformEvent> other) {
-		return(other instanceof TxStream && this.getId()==other.getId());
-	}
-
-}

com.minres.scviewer.database.ui.swt/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7

com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF

@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SWT widget
-Bundle-SymbolicName: com.minres.scviewer.database.ui.swt
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-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,
- com.minres.scviewer.database.ui,
- org.eclipse.core.runtime,
- org.eclipse.osgi
-Export-Package: com.minres.scviewer.database.swt
-Bundle-ClassPath: .
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: com.minres.scviewer.database.swt.DatabaseUiPlugin

com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/WaveformViewerFactory.java

@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.swt;
-
-import org.eclipse.swt.widgets.Composite;
-
-import com.minres.scviewer.database.swt.internal.WaveformViewer;
-import com.minres.scviewer.database.ui.IWaveformViewer;
-import com.minres.scviewer.database.ui.IWaveformViewerFactory;
-
-public class WaveformViewerFactory implements IWaveformViewerFactory {
-
-	@Override
-	public IWaveformViewer createPanel(Composite parent) {
-		return new WaveformViewer(parent);
-	}
-
-}

com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/ArrowPainter.java

@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Path;
-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.ITxStream;
-import com.minres.scviewer.database.RelationType;
-import com.minres.scviewer.database.ui.WaveformColors;
-
-public class ArrowPainter implements IPainter {
-	
-	private final int xCtrlOffset = 50;
-
-	private final int yCtrlOffset = 30;
-
-	private WaveformCanvas waveCanvas;
-
-	private ITx tx;
-
-	private List<LinkEntry> iRect;
-
-	private List<LinkEntry> oRect;
-
-	private Rectangle txRectangle;
-
-	private RelationType highlightType;
-
-	long scaleFactor;
-
-	boolean deferredUpdate;
-
-	public ArrowPainter(WaveformCanvas waveCanvas, RelationType relationType) {
-		this.waveCanvas = waveCanvas;
-		highlightType=relationType;
-		setTx(null);
-	}
-
-	public RelationType getHighlightType() {
-		return highlightType;
-	}
-
-	public void setHighlightType(RelationType highlightType) {
-		this.highlightType = highlightType;
-	}
-
-	public ITx getTx() {
-		return tx;
-	}
-
-	public void setTx(ITx newTx) {
-		this.tx = newTx;
-		iRect = new LinkedList<>();
-		oRect = new LinkedList<>();
-		scaleFactor = waveCanvas.getScaleFactor();
-		if (tx != null) {
-			calculateGeometries();
-		}
-	}
-
-	protected void calculateGeometries() {
-		deferredUpdate = false;
-		ITxStream<?> stream = tx.getStream();
-		IWaveformPainter painter = waveCanvas.wave2painterMap.get(stream);
-		if (painter == null) { // stream has been added but painter not yet
-								// created
-			deferredUpdate = true;
-			return;
-		}
-		int laneHeight = painter.getHeight() / stream.getMaxConcurrency();
-		txRectangle = new Rectangle((int) (tx.getBeginTime() / scaleFactor),
-				waveCanvas.rulerHeight + painter.getVerticalOffset() + laneHeight * tx.getConcurrencyIndex(),
-				(int) ((tx.getEndTime() - tx.getBeginTime()) / scaleFactor), laneHeight);
-		deriveGeom(tx.getIncomingRelations(), iRect, false);
-		deriveGeom(tx.getOutgoingRelations(), oRect, true);
-	}
-
-	protected void deriveGeom(Collection<ITxRelation> relations, List<LinkEntry> res, boolean useTarget) {
-		for (ITxRelation iTxRelation : relations) {
-			ITx otherTx = useTarget ? iTxRelation.getTarget() : iTxRelation.getSource();
-			if (waveCanvas.wave2painterMap.containsKey(otherTx.getStream())) {
-				ITxStream<?> stream = otherTx.getStream();
-				IWaveformPainter painter = waveCanvas.wave2painterMap.get(stream);
-				int laneHeight = painter.getHeight() / stream.getMaxConcurrency();
-				Rectangle bb = new Rectangle((int) (otherTx.getBeginTime() / scaleFactor),
-						waveCanvas.rulerHeight + painter.getVerticalOffset()
-								+ laneHeight * otherTx.getConcurrencyIndex(),
-						(int) ((otherTx.getEndTime() - otherTx.getBeginTime()) / scaleFactor), laneHeight);
-				res.add(new LinkEntry(bb, iTxRelation.getRelationType()));
-			}
-		}
-	}
-
-	@Override
-	public void paintArea(GC gc, Rectangle area) {
-		Color fgColor = waveCanvas.colors[WaveformColors.REL_ARROW.ordinal()];
-		Color highliteColor = waveCanvas.colors[WaveformColors.REL_ARROW_HIGHLITE.ordinal()];
-
-		if (deferredUpdate || (tx != null && waveCanvas.getScaleFactor() != scaleFactor)) {
-			scaleFactor = waveCanvas.getScaleFactor();
-			calculateGeometries();
-		}
-		for (LinkEntry entry : iRect) {
-			Point target = drawPath(gc, highlightType.equals(entry.relationType) ? highliteColor : fgColor,
-					entry.rectangle, txRectangle);
-			drawArrow(gc, target);
-		}
-		for (LinkEntry entry : oRect) {
-			Point target = drawPath(gc, highlightType.equals(entry.relationType) ? highliteColor : fgColor, txRectangle,
-					entry.rectangle);
-			drawArrow(gc, target);
-		}
-	}
-
-	protected void drawArrow(GC gc, Point target) {
-		gc.drawLine(target.x - 8, target.y - 5, target.x, target.y);
-		gc.drawLine(target.x - 8, target.y + 5, target.x, target.y);
-	}
-
-	protected Point drawPath(GC gc, Color fgColor, Rectangle srcRectangle, Rectangle tgtRectangle) {
-		Point point1 = new Point(0, srcRectangle.y + srcRectangle.height / 2);
-		Point point2 = new Point(0, tgtRectangle.y + tgtRectangle.height / 2);
-
-		point1.x = srcRectangle.x;
-		point2.x = tgtRectangle.x;
-
-		if (point2.x > point1.x + srcRectangle.width)
-			point1.x += srcRectangle.width;
-		if (point1.x > point2.x + tgtRectangle.width)
-			point2.x += tgtRectangle.width;
-
-		Path path = new Path(Display.getCurrent());
-		path.moveTo(point1.x, point1.y);
-		if (point1.y == point2.y) {
-			Point center = new Point((point1.x + point2.x) / 2, point1.y - yCtrlOffset);
-			path.cubicTo(point1.x + xCtrlOffset, point1.y, center.x - xCtrlOffset, center.y, center.x, center.y);
-			path.cubicTo(center.x + xCtrlOffset, center.y, point2.x - xCtrlOffset, point2.y, point2.x, point2.y);
-		} else
-			path.cubicTo(point1.x + xCtrlOffset, point1.y, point2.x - xCtrlOffset, point2.y, point2.x, point2.y);
-		gc.setAntialias(SWT.ON);
-		gc.setForeground(fgColor);
-		gc.drawPath(path);
-		path.dispose();
-		return point2;
-	}
-
-	class LinkEntry {
-		public Rectangle rectangle;
-		public RelationType relationType;
-
-		public LinkEntry(Rectangle rectangle, RelationType relationType) {
-			super();
-			this.rectangle = rectangle;
-			this.relationType = relationType;
-		}
-	}
-
-}

com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/RulerPainter.java

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.wb.swt.SWTResourceManager;
-
-public class RulerPainter implements IPainter {
-    protected WaveformCanvas waveCanvas;
-    
-    static final int rulerTickMinorC = 10;
-    static final int rulerTickMajorC = 100;
-       
-    public RulerPainter(WaveformCanvas waveCanvas) {
-        this.waveCanvas=waveCanvas;
-    }
-
-    @Override
-    public void paintArea(GC gc, Rectangle area) {
-    	Color headerFgColor=waveCanvas.getDisplay().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND);
-    	if(headerFgColor.isDisposed())
-    		headerFgColor=SWTResourceManager.getColor(0,0,0);
-    	Color headerBgColor = waveCanvas.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
-    	if(headerBgColor.isDisposed())
-    		headerBgColor=SWTResourceManager.getColor(255,255,255);
-        String unit=waveCanvas.getUnitStr();
-        int unitMultiplier=waveCanvas.getUnitMultiplier();
-        long scaleFactor=waveCanvas.getScaleFactor();
-        long zoomLevel = waveCanvas.getZoomLevel();
-        long start=area.x*scaleFactor;
-        long end=start+area.width*scaleFactor;
-
-        long rulerTickMinor = rulerTickMinorC*scaleFactor;
-        long rulerTickMajor = rulerTickMajorC*scaleFactor;
-        if(zoomLevel%3==1){
-        	rulerTickMinor/=3;
-        	rulerTickMajor/=3;
-        }
-        int minorTickY = waveCanvas.rulerHeight-5;
-        int majorTickY = waveCanvas.rulerHeight-15;
-        int textY=waveCanvas.rulerHeight-20;
-        int baselineY=waveCanvas.rulerHeight - 1;
-        int bottom=waveCanvas.rulerHeight - 2;
-
-        long startMinorIncr = start;
-        long modulo = start % rulerTickMinor;
-        startMinorIncr+=rulerTickMinor-modulo;
-        
-        gc.setBackground(waveCanvas.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-        gc.fillRectangle(new Rectangle(area.x, area.y, area.width, waveCanvas.rulerHeight));
-        gc.setBackground(headerBgColor);
-        gc.fillRectangle(new Rectangle(area.x, area.y, area.width, baselineY));
-        gc.setForeground(headerFgColor);
-        gc.drawLine(area.x, area.y+bottom, area.x+area.width, area.y+bottom);
-        
-        for (long tick = startMinorIncr; tick < end; tick += rulerTickMinor) {
-            int x0 = (int) (tick/scaleFactor);
-            if ((tick % rulerTickMajor) == 0) {
-                gc.drawText(Double.toString(tick/scaleFactor*unitMultiplier)+unit, x0, area.y+textY);
-                gc.drawLine(x0, area.y+majorTickY, x0,area.y+ bottom);
-            } else {
-                gc.drawLine(x0, area.y+minorTickY, x0, area.y+bottom);
-            }
-        }
-        
-    }
-}

com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java

@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
-
-import java.util.Map.Entry;
-import java.util.NavigableMap;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-
-import com.minres.scviewer.database.ISignal;
-import com.minres.scviewer.database.ISignalChange;
-import com.minres.scviewer.database.ISignalChangeMulti;
-import com.minres.scviewer.database.ISignalChangeSingle;
-import com.minres.scviewer.database.ui.TrackEntry;
-import com.minres.scviewer.database.ui.WaveformColors;
-
-public class SignalPainter extends TrackPainter  {
-	
-	/**
-	 * 
-	 */
-	private final WaveformCanvas waveCanvas;
-	private ISignal<? extends ISignalChange> signal;
-
-	public SignalPainter(WaveformCanvas txDisplay, boolean even, TrackEntry trackEntry) {
-		super(trackEntry, even);
-		this.waveCanvas = txDisplay;
-		this.signal=trackEntry.getSignal();
-	}
-
-	public void paintArea(GC gc, Rectangle area) {	
-		if(trackEntry.selected)
-			gc.setBackground(this.waveCanvas.colors[WaveformColors.TRACK_BG_HIGHLITE.ordinal()]);
-		else
-			gc.setBackground(this.waveCanvas.colors[even?WaveformColors.TRACK_BG_EVEN.ordinal():WaveformColors.TRACK_BG_ODD.ordinal()]);
-		gc.setFillRule(SWT.FILL_EVEN_ODD);
-		gc.fillRectangle(area);
-		Entry<Long, ? extends ISignalChange> firstChange=signal.getEvents().floorEntry(area.x*this.waveCanvas.getScaleFactor());
-		Entry<Long, ? extends ISignalChange> lastTx=signal.getEvents().ceilingEntry((area.x+area.width)*this.waveCanvas.getScaleFactor());
-		if(firstChange==null){
-			if(lastTx==null) return;
-			firstChange = signal.getEvents().firstEntry();
-		} else if(lastTx==null){
-			lastTx=signal.getEvents().lastEntry();
-		}
-		gc.setForeground(this.waveCanvas.colors[WaveformColors.LINE.ordinal()]);
-		gc.setLineStyle(SWT.LINE_SOLID);
-		gc.setLineWidth(1);
-		Entry<Long, ? extends ISignalChange> left=firstChange;
-		if(left.getValue() instanceof ISignalChangeSingle){
-			NavigableMap<Long, ? extends ISignalChange> entries=signal.getEvents().subMap(firstChange.getKey(), false, lastTx.getKey(), true);
-			for(Entry<Long, ? extends ISignalChange> right:entries.entrySet()){
-			    int xEnd= (int)(right.getKey()/this.waveCanvas.getScaleFactor());
-			    int xBegin= (int)(left.getKey()/this.waveCanvas.getScaleFactor());
-			    if(xEnd>xBegin){
-			        int yOffset = this.waveCanvas.getTrackHeight()/2;
-			        Color color = this.waveCanvas.colors[WaveformColors.SIGNALX.ordinal()];
-			        switch(((ISignalChangeSingle) left.getValue()).getValue()){
-			        case '1':
-			            color=this.waveCanvas.colors[WaveformColors.SIGNAL1.ordinal()];
-			            yOffset = this.waveCanvas.getTrackHeight()/5;
-			            break;
-			        case '0':
-			            color=this.waveCanvas.colors[WaveformColors.SIGNAL0.ordinal()];
-			            yOffset = 4*this.waveCanvas.getTrackHeight()/5;
-			            break;
-			        case 'Z':
-			            color=this.waveCanvas.colors[WaveformColors.SIGNALZ.ordinal()];
-			            break;
-			        default:	
-			        }
-			        yOffset+=area.y;
-			        gc.setForeground(color);
-			        gc.drawLine(xBegin, yOffset, xEnd, yOffset);
-			        int yNext =  this.waveCanvas.getTrackHeight()/2;
-			        switch(((ISignalChangeSingle) right.getValue()).getValue()){
-			        case '1':
-			            yNext = this.waveCanvas.getTrackHeight()/5+area.y;
-			            break;
-			        case '0':
-			            yNext = 4*this.waveCanvas.getTrackHeight()/5+area.y;
-			            break;
-			        default:	
-			        }
-			        gc.drawLine(xEnd, yOffset, xEnd, yNext);
-			    }
-			    left=right;
-			}
-		} else if(left.getValue() instanceof ISignalChangeMulti){
-			NavigableMap<Long,? extends ISignalChange> entries=signal.getEvents().subMap(firstChange.getKey(), false, lastTx.getKey(), true);
-			for(Entry<Long, ? extends ISignalChange> right:entries.entrySet()){
-				int yOffsetT = this.waveCanvas.getTrackHeight()/5+area.y;
-				int yOffsetM = this.waveCanvas.getTrackHeight()/2+area.y;
-				int yOffsetB = 4*this.waveCanvas.getTrackHeight()/5+area.y;
-				Color colorBorder = this.waveCanvas.colors[WaveformColors.SIGNAL0.ordinal()];
-				ISignalChangeMulti last = (ISignalChangeMulti) left.getValue();
-				if(last.getValue().toString().contains("X")){
-					colorBorder=this.waveCanvas.colors[WaveformColors.SIGNALX.ordinal()];
-				}else if(last.getValue().toString().contains("Z")){
-					colorBorder=this.waveCanvas.colors[WaveformColors.SIGNALZ.ordinal()];
-				}
-				int beginTime= (int)(left.getKey()/this.waveCanvas.getScaleFactor());
-				int endTime= (int)(right.getKey()/this.waveCanvas.getScaleFactor());
-				int[] points = {
-						beginTime,yOffsetM, 
-						beginTime+1,yOffsetT, 
-						endTime-1,yOffsetT, 
-						endTime,yOffsetM, 
-						endTime-1,yOffsetB, 
-						beginTime+1,yOffsetB
-				};
-				gc.setForeground(colorBorder);
-				gc.drawPolygon(points);
-				gc.setForeground(this.waveCanvas.colors[WaveformColors.SIGNAL_TEXT.ordinal()]);
-				int size = gc.getDevice().getDPI().y * gc.getFont().getFontData()[0].getHeight()/72;
-				if(beginTime<area.x) beginTime=area.x;
-				int width=endTime-beginTime;
-				if(width>6) {
-					Rectangle old = gc.getClipping();
-					gc.setClipping(beginTime+3, yOffsetT, endTime-beginTime-5, yOffsetB-yOffsetT);
-					gc.drawText("h'"+last.getValue().toHexString(), beginTime+3, yOffsetM-size/2-1);
-					gc.setClipping(old);
-				}
-				left=right;
-			}
-		}
-	}
-
-
-	public ISignal<? extends ISignalChange> getSignal() {
-		return signal;
-	}
-
-}

com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/StreamPainter.java

@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.NavigableMap;
-import java.util.TreeSet;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-
-import com.minres.scviewer.database.ITx;
-import com.minres.scviewer.database.ITxEvent;
-import com.minres.scviewer.database.ITxStream;
-import com.minres.scviewer.database.ui.TrackEntry;
-import com.minres.scviewer.database.ui.WaveformColors;
-
-public class StreamPainter extends TrackPainter{
-
-	/**
-	 * 
-	 */
-	private final WaveformCanvas waveCanvas;
-	private ITxStream<? extends ITxEvent> stream;
-	private int txBase, txHeight;
-	private boolean even;
-	private TreeSet<ITx> seenTx;
-
-	public StreamPainter(WaveformCanvas waveCanvas, boolean even, TrackEntry trackEntry) {
-		super(trackEntry, even);
-		this.waveCanvas = waveCanvas;
-		this.stream=trackEntry.getStream();
-		this.seenTx=new TreeSet<ITx>();
-	}
-
-	@SuppressWarnings("unchecked")
-	public void paintArea(GC gc, Rectangle area) {
-		if(stream.getEvents().size()==0) return;
-		int trackHeight=trackEntry.height/stream.getMaxConcurrency();
-		txBase=trackHeight/5;
-		txHeight=trackHeight*3/5;
-		if(trackEntry.selected)
-			gc.setBackground(this.waveCanvas.colors[WaveformColors.TRACK_BG_HIGHLITE.ordinal()]);
-		else
-			gc.setBackground(this.waveCanvas.colors[even?WaveformColors.TRACK_BG_EVEN.ordinal():WaveformColors.TRACK_BG_ODD.ordinal()]);
-		gc.setFillRule(SWT.FILL_EVEN_ODD);
-		gc.fillRectangle(area);
-		Entry<Long, ?> firstTx=stream.getEvents().floorEntry(area.x*waveCanvas.getScaleFactor());
-		Entry<Long, ?> lastTx=stream.getEvents().ceilingEntry((area.x+area.width)*waveCanvas.getScaleFactor());
-		if(firstTx==null) firstTx = stream.getEvents().firstEntry();
-		if(lastTx==null) lastTx=stream.getEvents().lastEntry();
-        gc.setFillRule(SWT.FILL_EVEN_ODD);
-        gc.setLineStyle(SWT.LINE_SOLID);
-        gc.setLineWidth(1);
-        gc.setForeground(this.waveCanvas.colors[WaveformColors.LINE.ordinal()]);
-        for(int y1=area.y+trackHeight/2; y1<area.y+trackEntry.height; y1+=trackHeight)
-        	gc.drawLine(area.x, y1, area.x+area.width, y1);
-		if(firstTx==lastTx)
-			for(ITxEvent txEvent:(Collection<?  extends ITxEvent>)firstTx.getValue())
-				drawTx(gc, area, txEvent.getTransaction());					
-		else{
-			seenTx.clear();
-			NavigableMap<Long,?> entries = stream.getEvents().subMap(firstTx.getKey(), true, lastTx.getKey(), true);
-			boolean highlighed=false;
-	        gc.setForeground(this.waveCanvas.colors[WaveformColors.LINE.ordinal()]);
-	        gc.setBackground(this.waveCanvas.colors[WaveformColors.TX_BG.ordinal()]);
-			for(Entry<Long, ?> entry: entries.entrySet())
-				for(ITxEvent txEvent:(Collection<?  extends ITxEvent>)entry.getValue()){
-					if(txEvent.getType()==ITxEvent.Type.BEGIN)
-						seenTx.add(txEvent.getTransaction());
-					if(txEvent.getType()==ITxEvent.Type.END){
-						ITx tx = txEvent.getTransaction();
-						highlighed|=waveCanvas.currentSelection!=null && waveCanvas.currentSelection.equals(tx);
-						drawTx(gc, area, tx);
-						seenTx.remove(tx);
-					}
-				}
-			for(ITx tx:seenTx){
-				drawTx(gc, area, tx);
-			}
-			if(highlighed){
-		        gc.setForeground(this.waveCanvas.colors[WaveformColors.LINE_HIGHLITE.ordinal()]);
-		        gc.setBackground(this.waveCanvas.colors[WaveformColors.TX_BG_HIGHLITE.ordinal()]);
-				drawTx(gc, area, waveCanvas.currentSelection);
-			}
-		}
-	}
-
-	protected void drawTx(GC gc, Rectangle area, ITx tx) {
-		int offset = tx.getConcurrencyIndex()*this.waveCanvas.getTrackHeight();
-		Rectangle bb = new Rectangle(
-				(int)(tx.getBeginTime()/this.waveCanvas.getScaleFactor()), area.y+offset+txBase,
-				(int)((tx.getEndTime()-tx.getBeginTime())/this.waveCanvas.getScaleFactor()), txHeight);
-		if(bb.x+bb.width<area.x || bb.x>area.x+area.width) return;
-		if(bb.width==0){
-			gc.drawLine(bb.x, bb.y, bb.x, bb.y+bb.height);
-		} else if(bb.width<10){
-			gc.fillRectangle(bb);
-			gc.drawRectangle(bb);
-		} else {
-		    gc.fillRoundRectangle(bb.x, bb.y, bb.width, bb.height, 5, 5);
-		    gc.drawRoundRectangle(bb.x, bb.y, bb.width, bb.height, 5, 5);
-		}
-	}
-
-	public ITx getClicked(Point point) {
-		int lane=point.y/waveCanvas.getTrackHeight();
-		Entry<Long, List<ITxEvent>> firstTx=stream.getEvents().floorEntry(point.x*waveCanvas.getScaleFactor());
-		if(firstTx!=null){
-			do {
-				ITx tx = getTxFromEntry(lane, point.x, firstTx);
-				if(tx!=null) return tx;
-				firstTx=stream.getEvents().lowerEntry(firstTx.getKey());
-			}while(firstTx!=null);
-		}
-		return null;
-	}
-
-	public ITxStream<? extends ITxEvent> getStream() {
-		return stream;
-	}
-
-	public void setStream(ITxStream<? extends ITxEvent> stream) {
-		this.stream = stream;
-	}
-
-	protected ITx getTxFromEntry(int lane, int offset, Entry<Long, List<ITxEvent>> firstTx) {
-        long timePoint=offset*waveCanvas.getScaleFactor();
-		for(ITxEvent evt:firstTx.getValue()){
-		    ITx tx=evt.getTransaction();
-			if(evt.getType()==ITxEvent.Type.BEGIN && tx.getConcurrencyIndex()==lane && tx.getBeginTime()<=timePoint && tx.getEndTime()>=timePoint){
-				return evt.getTransaction();
-			}
-		}
-		// now with some fuzziness
-        timePoint=(offset-5)*waveCanvas.getScaleFactor();
-        long timePointHigh=(offset+5)*waveCanvas.getScaleFactor();
-        for(ITxEvent evt:firstTx.getValue()){
-            ITx tx=evt.getTransaction();
-            if(evt.getType()==ITxEvent.Type.BEGIN && tx.getConcurrencyIndex()==lane && tx.getBeginTime()<=timePointHigh && tx.getEndTime()>=timePoint){
-                return evt.getTransaction();
-            }
-        }
-		return null;
-	}
-
-}

com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/WaveformCanvas.java

@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.swt.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.graphics.Transform;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-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.IWaveformEvent;
-import com.minres.scviewer.database.RelationType;
-import com.minres.scviewer.database.ui.IWaveformViewer;
-import com.minres.scviewer.database.ui.WaveformColors;
-
-public class WaveformCanvas extends Canvas {
-	
-    Color[] colors = new Color[WaveformColors.values().length];
-
-    private int trackHeight = 50;
-    
-    private long scaleFactor = 1000000L; // 1ns
-    
-    String unit="ns";
-    
-    private int level = 12;
-    
-    public final static String[] unitString={"fs", "ps", "ns", "µs", "ms"};//, "s"};
-    
-    public final static int[] unitMultiplier={1, 3, 10, 30, 100, 300};
-    
-    private long maxTime;
-    
-    protected Point origin; /* original size */
-    
-    protected Transform transform;
-    
-    protected int rulerHeight=40;
-    
-    protected List<IPainter> painterList;
-    
-    ITx currentSelection;
-    
-    private List<SelectionAdapter> selectionListeners;
-
-	private RulerPainter rulerPainter;
-
-	private TrackAreaPainter trackAreaPainter;
-
-	private ArrowPainter arrowPainter;
-
-	private List<CursorPainter> cursorPainters;
-
-	HashMap<IWaveform<?>, IWaveformPainter> wave2painterMap;
-    /**
-     * Constructor for ScrollableCanvas.
-     * 
-     * @param parent
-     *            the parent of this control.
-     * @param style
-     *            the style of this control.
-     */
-    public WaveformCanvas(final Composite parent, int style) {
-        super(parent, style | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND | SWT.NO_REDRAW_RESIZE | SWT.V_SCROLL | SWT.H_SCROLL);
-        addControlListener(new ControlAdapter() { /* resize listener. */
-            public void controlResized(ControlEvent event) {
-                syncScrollBars();
-            }
-        });
-        addPaintListener(new PaintListener() { /* paint listener. */
-            public void paintControl(final PaintEvent event) {
-                paint(event.gc);
-            }
-        });
-        painterList = new LinkedList<IPainter>();
-        origin = new Point(0, 0);
-        transform = new Transform(getDisplay());
-        selectionListeners = new LinkedList<>();
-        cursorPainters= new ArrayList<>();
-        wave2painterMap=new HashMap<>();
-        
-        initScrollBars();
-        initColors(null);
-		// order is important: it is bottom to top
-        trackAreaPainter=new TrackAreaPainter(this);
-        painterList.add(trackAreaPainter);
-        rulerPainter=new RulerPainter(this);
-        painterList.add(rulerPainter);
-        arrowPainter=new ArrowPainter(this, IWaveformViewer.NEXT_PREV_IN_STREAM);
-        painterList.add(arrowPainter);
-		CursorPainter cp = new CursorPainter(this, scaleFactor * 10, cursorPainters.size()-1);
-		painterList.add(cp);
-		cursorPainters.add(cp);
-		CursorPainter marker = new CursorPainter(this, scaleFactor * 100, cursorPainters.size()-1);
-		painterList.add(marker);
-		cursorPainters.add(marker);
-		wave2painterMap=new HashMap<>();
-    }
-
-	public void addCursoPainter(CursorPainter cursorPainter){
-		painterList.add(cursorPainter);
-		cursorPainters.add(cursorPainter);
-	}
-	
-    public void initColors(HashMap<WaveformColors, RGB> colourMap) {
-        Display d = getDisplay();
-        if (colourMap != null) {
-            for (WaveformColors c : WaveformColors.values()) {
-                if (colourMap.containsKey(c)) {
-                    colors[c.ordinal()] = new Color(d, colourMap.get(c));
-                }
-            }
-            redraw();
-        } else {
-            colors[WaveformColors.LINE.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_RED);
-            colors[WaveformColors.LINE_HIGHLITE.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_CYAN);
-            colors[WaveformColors.TRACK_BG_EVEN.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_BLACK);
-            colors[WaveformColors.TRACK_BG_ODD.ordinal()] = SWTResourceManager.getColor(40, 40, 40);
-            colors[WaveformColors.TRACK_BG_HIGHLITE.ordinal()] = SWTResourceManager.getColor(40, 40, 80);
-            colors[WaveformColors.TX_BG.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_GREEN);
-            colors[WaveformColors.TX_BG_HIGHLITE.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GREEN);
-            colors[WaveformColors.TX_BORDER.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_RED);
-            colors[WaveformColors.SIGNAL0.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GREEN);
-            colors[WaveformColors.SIGNAL1.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GREEN);
-            colors[WaveformColors.SIGNALZ.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_GRAY);
-            colors[WaveformColors.SIGNALX.ordinal()] = SWTResourceManager.getColor(255,  128,  182);
-            colors[WaveformColors.SIGNAL_TEXT.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_WHITE);
-            colors[WaveformColors.CURSOR.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_RED);
-            colors[WaveformColors.CURSOR_DRAG.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_GRAY);
-            colors[WaveformColors.CURSOR_TEXT.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_WHITE);
-            colors[WaveformColors.MARKER.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GRAY);
-            colors[WaveformColors.MARKER_TEXT.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_WHITE);
-            colors[WaveformColors.REL_ARROW.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_MAGENTA);
-            colors[WaveformColors.REL_ARROW_HIGHLITE.ordinal()] = SWTResourceManager.getColor(255, 128, 255);
-        }
-    }
-
-    public void setHighliteRelation(RelationType relationType){
-    	if(arrowPainter!=null){
-    		boolean redraw = arrowPainter.getHighlightType()!=relationType; 
-    		arrowPainter.setHighlightType(relationType);
-    		if(redraw) redraw();
-    	}
-    }
-    
-    public Point getOrigin() {
-        return origin;
-    }
-
-    public void setOrigin(Point origin) {
-        setOrigin(origin.x, origin.y);
-    }
-
-    public void setOrigin(int x, int y) {
-        checkWidget();
-        ScrollBar hBar = getHorizontalBar();
-        hBar.setSelection(-x);
-        x = -hBar.getSelection();
-        ScrollBar vBar = getVerticalBar();
-        vBar.setSelection(-y);
-        y = -vBar.getSelection();
-        origin.x = x;
-        origin.y = y;
-        syncScrollBars();
-    }
-
-    public long getMaxTime() {
-        return maxTime;
-    }
-
-    public void setMaxTime(long maxTime) {
-        this.maxTime = maxTime;
-        syncScrollBars();
-    }
-
-    public int getTrackHeight() {
-        return trackHeight;
-    }
-
-    public void setTrackHeight(int trackHeight) {
-        this.trackHeight = trackHeight;
-        syncScrollBars();
-    }
-
-    public int getZoomLevel() {
-        return level;
-    }
-    
-    public int getMaxZoomLevel(){
-    	return unitMultiplier.length*unitString.length-1;
-    }
-
-    public void setZoomLevel(int level) {
-    	long oldScaleFactor=scaleFactor;
-    	if(level<unitMultiplier.length*unitString.length){
-    		this.level = level;
-    		this.scaleFactor = (long) Math.pow(10, level/2);
-    		if(level%2==1) this.scaleFactor*=3;
-    		ITx tx = arrowPainter.getTx();
-    		arrowPainter.setTx(null);
-    		/*
-    		 * xc = tc/oldScaleFactor
-    		 * xoffs = xc+origin.x
-    		 * xcn = tc/newScaleFactor
-    		 * t0n = (xcn-xoffs)*scaleFactor
-    		 */
-    		long tc=cursorPainters.get(0).getTime(); // cursor time
-    		long xc=tc/oldScaleFactor; // cursor total x-offset
-    		long xoffs=xc+origin.x; // cursor offset relative to left border
-    		long xcn=tc/scaleFactor; // new total x-offset
-    		long originX=xcn-xoffs;
-    		if(originX>0)
-    			origin.x=(int) -originX; // new cursor time offset relative to left border
-    		else
-    			origin.x=0;
-    		syncScrollBars();
-    		arrowPainter.setTx(tx);    		
-    		redraw();
-    	}
-    }
-
-    public long getScaleFactor() {
-        return scaleFactor;
-    }
-
-    public long getScaleFactorPow10() {
-    	int scale = level/unitMultiplier.length;
-    	double res = Math.pow(1000, scale);
-    	return (long) res;
-    }
-
-    public String getUnitStr(){
-        return unitString[level/unitMultiplier.length];
-    }
-     
-    public int getUnitMultiplier(){
-        return unitMultiplier[level%unitMultiplier.length];
-    }
-    
-    public long getTimeForOffset(int xOffset){
-        return (xOffset-origin.x) * scaleFactor;
-    }
-    
-    public void addPainter(IPainter painter) {
-        painterList.add(painter);
-        redraw();
-    }
-
-    public void removePainter(IPainter painter) {
-        painterList.remove(painter);
-        redraw();
-    }
-
-    public void clearAllWaveformPainter() {
-        trackAreaPainter.getTrackVerticalOffset().clear();
-        wave2painterMap.clear();
-        syncScrollBars();
-    }
-
-    public void addWaveformPainter(IWaveformPainter painter) {
-        trackAreaPainter.addTrackPainter(painter);
-        wave2painterMap.put(painter.getTrackEntry().waveform, painter);
-        syncScrollBars();
-    }
-
-    public List<CursorPainter> getCursorPainters() {
-		return cursorPainters;
-	}
-
-	/**
-     * Dispose the garbage here
-     */
-    public void dispose() {
-        transform.dispose();
-        for (WaveformColors c : WaveformColors.values())
-            colors[c.ordinal()].dispose();
-        super.dispose();
-    }
-
-    /* Initalize the scrollbar and register listeners. */
-    private void initScrollBars() {
-        ScrollBar horizontal = getHorizontalBar();
-        horizontal.setEnabled(false);
-        horizontal.setVisible(true);
-        horizontal.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent event) {
-                if (painterList.size() == 0)
-                    return;
-                setOrigin(-((ScrollBar) event.widget).getSelection(), origin.y);
-            }
-        });
-        ScrollBar vertical = getVerticalBar();
-        vertical.setEnabled(false);
-        vertical.setVisible(true);
-        vertical.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent event) {
-                if (painterList.size() == 0)
-                    return;
-                setOrigin(origin.x, -((ScrollBar) event.widget).getSelection());
-            }
-        });
-    }
-
-    /**
-     * Synchronize the scrollbar with the image. If the transform is out of
-     * range, it will correct it. This function considers only following factors
-     * :<b> transform, image size, client area</b>.
-     */
-    public void syncScrollBars() {
-        if (painterList.size() == 0) {
-            redraw();
-            return;
-        }
-        int height = trackAreaPainter.getHeight();
-        int width = (int) (maxTime / scaleFactor);
-        ScrollBar horizontal = getHorizontalBar();
-        horizontal.setIncrement((int) (getClientArea().width / 100));
-        horizontal.setPageIncrement(getClientArea().width);
-        int cw = getClientArea().width;
-        if (width > cw) { /* image is wider than client area */
-            horizontal.setMaximum(width);
-            horizontal.setEnabled(true);
-            if (((int) -origin.x) > horizontal.getMaximum() - cw)
-                origin.x = -horizontal.getMaximum() + cw;
-        } else { /* image is narrower than client area */
-            horizontal.setEnabled(false);
-        }
-        horizontal.setSelection(-origin.x);
-        horizontal.setThumb(cw);
-
-        ScrollBar vertical = getVerticalBar();
-        vertical.setIncrement((int) (getClientArea().height / 100));
-        vertical.setPageIncrement((int) (getClientArea().height));
-        int ch = getClientArea().height;
-        if (height > ch) { /* image is higher than client area */
-            vertical.setMaximum(height);
-            vertical.setEnabled(true);
-            if (((int) -origin.y) > vertical.getMaximum() - ch)
-                origin.y = -vertical.getMaximum() + ch;
-        } else { /* image is less higher than client area */
-            vertical.setMaximum((int) (ch));
-            vertical.setEnabled(false);
-        }
-        vertical.setSelection(-origin.y);
-        vertical.setThumb(ch);
-        redraw();
-        fireSelectionEvent();
-
-    }
-
-    /* Paint function */
-    private void paint(GC gc) {
-        Rectangle clientRect = getClientArea(); /* Canvas' painting area */
-        clientRect.x = -origin.x;
-        clientRect.y = -origin.y;
-        // reset the transform
-        transform.identity();
-        // shift the content
-        transform.translate(origin.x, origin.y);
-        gc.setTransform(transform);
-        gc.setClipping(clientRect);
-        if (painterList.size() > 0 ) {
-            for (IPainter painter : painterList)
-                painter.paintArea(gc, clientRect);
-        } else {
-            gc.fillRectangle(clientRect);
-            initScrollBars();
-        }
-    }
-
-    public List<Object> getClicked(Point point) {
-    	LinkedList<Object> result=new LinkedList<>();
-        for (IPainter p : Lists.reverse(painterList)) {
-            if (p instanceof TrackAreaPainter) {
-                int y = point.y - origin.y;
-                int x = point.x - origin.x;
-                Entry<Integer, IWaveformPainter> entry = trackAreaPainter.getTrackVerticalOffset().floorEntry(y);
-                if (entry != null) {
-                    if (entry.getValue() instanceof StreamPainter) {
-                    	ITx tx = ((StreamPainter) entry.getValue()).getClicked(new Point(x, y - entry.getKey()));
-                    	if(tx!=null)
-                    		result.add(tx);
-                    } 
-                    result.add(entry.getValue().getTrackEntry());
-                }
-            } else if (p instanceof CursorPainter) {
-                if (Math.abs(point.x - origin.x - ((CursorPainter) p).getTime()/scaleFactor) < 2) {
-                	result.add(p);
-                }
-            }
-        }
-        return result;
-    }
-
-    public List<Object> getEntriesAtPosition(IWaveform<? extends IWaveformEvent> iWaveform, int i) {
-    	LinkedList<Object> result=new LinkedList<>();
-        int x = i - origin.x;
-        for(IPainter p: wave2painterMap.values()){
-        	if (p instanceof StreamPainter && ((StreamPainter)p).getStream()==iWaveform) {
-        		result.add(((StreamPainter) p).getClicked(new Point(x, trackHeight/2)));
-        	}
-        }
-        return result;
-    }
-
-    public void setSelected(ITx currentSelection) {
-        this.currentSelection = currentSelection;
-        if (currentSelection != null)
-            reveal(currentSelection);
-        arrowPainter.setTx(currentSelection);
-        redraw();
-    }
-
-    public void reveal(ITx tx) {
-        int lower = (int) (tx.getBeginTime() / scaleFactor);
-        int higher = (int) (tx.getEndTime() / scaleFactor);
-        Point size = getSize();
-        size.x -= getVerticalBar().getSize().x + 2;
-        size.y -= getHorizontalBar().getSize().y;
-        if (lower < -origin.x) {
-            setOrigin(-lower, origin.y);
-        } else if (higher > (size.x - origin.x)) {
-            setOrigin(size.x - higher, origin.y);
-        }
-        for (IWaveformPainter painter : wave2painterMap.values()) {
-            if (painter instanceof StreamPainter && ((StreamPainter) painter).getStream() == tx.getStream()) {
-                int top = painter.getVerticalOffset() + trackHeight * tx.getConcurrencyIndex();
-                int bottom = top + trackHeight;
-                if (top < -origin.y) {
-                    setOrigin(origin.x, -(top-trackHeight));
-                } else if (bottom > (size.y - origin.y)) {
-                    setOrigin(origin.x, size.y - bottom);
-                }
-            }
-        }
-    }
-    
-    public void reveal(long time) {
-        int scaledTime = (int) (time / scaleFactor);
-        Point size = getSize();
-        size.x -= getVerticalBar().getSize().x + 2;
-        size.y -= getHorizontalBar().getSize().y;
-        if (scaledTime < -origin.x) {
-            setOrigin(-scaledTime+10, origin.y);
-        } else if (scaledTime > (size.x - origin.x)) {
-            setOrigin(size.x - scaledTime-30, origin.y);
-        }
-    }
-
-    public int getRulerHeight() {
-        return rulerHeight;
-    }
-
-    public void setRulerHeight(int rulerHeight) {
-        this.rulerHeight = rulerHeight;
-    }
-
-    public void addSelectionListener(SelectionAdapter selectionAdapter) {
-        selectionListeners.add(selectionAdapter);
-    }
-
-    public void removeSelectionListener(SelectionAdapter selectionAdapter) {
-        selectionListeners.remove(selectionAdapter);
-    }
-
-    /**
-     * 
-     */
-    protected void fireSelectionEvent() {
-        Event e = new Event();
-        e.widget = this;
-        e.detail=SWT.SELECTED;
-        e.type=SWT.Selection;
-        SelectionEvent ev = new SelectionEvent(e);
-        ev.x = origin.x;
-        ev.y = origin.y;
-        for (SelectionAdapter a : selectionListeners) {
-            a.widgetSelected(ev);
-        }
-    }
-
-}

com.minres.scviewer.database.ui/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7

com.minres.scviewer.database.ui/META-INF/MANIFEST.MF

@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Database UI
-Bundle-SymbolicName: com.minres.scviewer.database.ui
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: com.minres.scviewer.database.ui
-Require-Bundle: com.minres.scviewer.database,
- org.eclipse.jface

com.minres.scviewer.database.ui/build.properties

@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/IWaveformViewer.java

@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.ui;
-
-import java.beans.PropertyChangeListener;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Control;
-
-import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.RelationType;
-
-public interface IWaveformViewer extends PropertyChangeListener, ISelectionProvider{
-
-	String CURSOR_PROPERTY = "cursor_time";
-	
-	String MARKER_PROPERTY = "marker_time";
-	
-	public static final RelationType NEXT_PREV_IN_STREAM = RelationType.create("Prev/Next in stream"); 
-
-	public void addSelectionChangedListener(ISelectionChangedListener listener);
-
-	public void removeSelectionChangedListener(ISelectionChangedListener listener);
-
-	public Control getControl();
-
-	public Control getNameControl();
-
-	public Control getValueControl();
-
-	public Control getWaveformControl();
-
-	public ISelection getSelection();
-
-	public void setSelection(ISelection selection);
-
-	public void setSelection(ISelection selection, boolean addIfNeeded);
-
-	public void moveSelection(GotoDirection direction);
-
-	public void moveSelection(GotoDirection direction, RelationType relationType);
-
-	public void moveCursor(GotoDirection direction);
-
-	public List<TrackEntry> getStreamList();
-
-	public TrackEntry getEntryForStream(IWaveform<?> source);
-	
-	public void moveSelectedTrack(int i);
-	
-    public void setHighliteRelation(RelationType relationType);
-
-	public long getMaxTime();
-
-	public void setMaxTime(long maxTime);
-
-	public void setZoomLevel(int scale);
-
-	public int getZoomLevel();
-
-	public void setCursorTime(long time);
-
-	public void setMarkerTime(long time, int index);
-
-	public long getCursorTime();
-
-	public int getSelectedMarkerId();
-
-	public long getMarkerTime(int index);
-
-	public void addPropertyChangeListener(PropertyChangeListener listener);
-
-	public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener);
-
-	public void removePropertyChangeListener(PropertyChangeListener listener);
-
-	public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener);
-
-	public String getScaledTime(long time);
-
-	public String[] getZoomLevels();
-
-	public List<ICursor> getCursorList();
-
-	public void setColors(HashMap<WaveformColors, RGB> colourMap);
-
-	public long getBaselineTime();
-
-	public void setBaselineTime(Long scale);
-}

com.minres.scviewer.database.ui/src/com/minres/scviewer/database/ui/TrackEntry.java

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.ui;
-
-import com.minres.scviewer.database.ISignal;
-import com.minres.scviewer.database.ISignalChange;
-import com.minres.scviewer.database.ITxEvent;
-import com.minres.scviewer.database.ITxStream;
-import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.IWaveformEvent;
-
-public class TrackEntry {
-	final public IWaveform<? extends IWaveformEvent> waveform;
-
-	public int vOffset;
-	
-	public int height;
-
-	public boolean selected;
-	
-	public TrackEntry(IWaveform<? extends IWaveformEvent> waveform) {
-		this.waveform = waveform;
-		vOffset=0;
-		height=0;
-		selected=false;
-	}
-	
-	public boolean isStream(){
-		return waveform instanceof ITxStream<?>;
-	}
-
-	public ITxStream<? extends ITxEvent> getStream(){
-		return (ITxStream<?>) waveform;
-	}
-
-	public boolean isSignal(){
-		return waveform instanceof ISignal<?>;
-	}
-	
-	public ISignal<? extends ISignalChange> getSignal(){
-		return (ISignal<?>) waveform;
-	}
-
-	@Override
-    public boolean equals(Object obj) {
-		if(obj instanceof TrackEntry){
-			TrackEntry o = (TrackEntry) obj;
-			return waveform==o.waveform && vOffset==o.vOffset;
-		}
-		return false;
-	}
-}

com.minres.scviewer.database.vcd/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7

com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDDbLoader.java

@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.vcd;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Stack;
-import java.util.TreeMap;
-import java.util.Vector;
-
-import com.minres.scviewer.database.BitVector;
-import com.minres.scviewer.database.ISignal;
-import com.minres.scviewer.database.ISignalChange;
-import com.minres.scviewer.database.ISignalChangeMulti;
-import com.minres.scviewer.database.ISignalChangeSingle;
-import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.IWaveformDb;
-import com.minres.scviewer.database.IWaveformDbLoader;
-import com.minres.scviewer.database.IWaveformEvent;
-import com.minres.scviewer.database.InputFormatException;
-import com.minres.scviewer.database.RelationType;
-
-/**
- * The Class VCDDb.
- */
-public class VCDDbLoader implements IWaveformDbLoader, IVCDDatabaseBuilder {
-
-	
-	/** The Constant TIME_RES. */
-	private static final Long TIME_RES = 1000L; // ps;
-
-	/** The db. */
-	private IWaveformDb db;
-	
-	/** The module stack. */
-	private Stack<String> moduleStack;
-	
-	/** The signals. */
-	private List<IWaveform<? extends IWaveformEvent>> signals;
-	
-	/** The max time. */
-	private long maxTime;
-	
-	/**
-	 * Instantiates a new VCD db.
-	 */
-	public VCDDbLoader() {
-	}
-
-	/** The date bytes. */
-	private byte[] dateBytes = "$date".getBytes();
-
-	/* (non-Javadoc)
-	 * @see com.minres.scviewer.database.ITrDb#load(java.io.File)
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public boolean load(IWaveformDb db, File file) throws Exception {
-		this.db=db;
-		FileInputStream fis = new FileInputStream(file);
-		byte[] buffer = new byte[dateBytes.length];
-		int read = fis.read(buffer, 0, dateBytes.length);
-		fis.close();
-		if (read == dateBytes.length)
-			for (int i = 0; i < dateBytes.length; i++)
-				if (buffer[i] != dateBytes[i])
-					return false;
-
-		signals = new Vector<IWaveform<? extends IWaveformEvent>>();
-		moduleStack= new Stack<String>(); 
-		boolean res = new VCDFileParser(false).load(new FileInputStream(file), this);
-		moduleStack=null;
-		if(!res) throw new InputFormatException();
-		// calculate max time of database
-		for(IWaveform<? extends IWaveformEvent> waveform:signals)
-			maxTime= Math.max(maxTime, ((ISignal<? extends ISignalChange>)waveform).getEvents().lastKey());
-		// extend signals to hav a last value set at max time
-		for(IWaveform<? extends IWaveformEvent> waveform:signals){
-			TreeMap<Long,? extends ISignalChange> events = ((VCDSignal<? extends ISignalChange>)waveform).values;
-			if(events.lastKey()<maxTime){
-				ISignalChange x = events.lastEntry().getValue();
-				if(x instanceof ISignalChangeSingle)
-					((VCDSignal<ISignalChangeSingle>)waveform).values.put(maxTime, 
-							new VCDSignalChangeSingle(maxTime, ((ISignalChangeSingle)x).getValue()));
-				else
-					if(x instanceof ISignalChangeMulti)
-						((VCDSignal<ISignalChangeMulti>)waveform).values.put(maxTime, 
-								new VCDSignalChangeMulti(maxTime, ((ISignalChangeMulti)x).getValue()));
-			}
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.minres.scviewer.database.ITrDb#getMaxTime()
-	 */
-	@Override
-	public Long getMaxTime() {
-		return maxTime;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.minres.scviewer.database.ITrDb#getAllWaves()
-	 */
-	@Override
-	public List<IWaveform<? extends IWaveformEvent>> getAllWaves() {
-		return signals;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.minres.scviewer.database.vcd.ITraceBuilder#enterModule(java.lang.String)
-	 */
-	@Override
-	public void enterModule(String tokenString) {
-		if(moduleStack.isEmpty())
-			moduleStack.push(tokenString);
-		else
-			moduleStack.push(moduleStack.peek()+"."+tokenString);
-
-	}
-
-	/* (non-Javadoc)
-	 * @see com.minres.scviewer.database.vcd.ITraceBuilder#exitModule()
-	 */
-	@Override
-	public void exitModule() {
-		if(!moduleStack.isEmpty()) moduleStack.pop();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.minres.scviewer.database.vcd.ITraceBuilder#newNet(java.lang.String, int, int)
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public Integer newNet(String netName, int i, int width) {
-		int id = signals.size();
-		VCDSignal<? extends IWaveformEvent> signal;
-		if(width==1){
-			signal = i<0 ? new VCDSignal<ISignalChangeSingle>(db, id, netName) :
-				new VCDSignal<ISignalChangeSingle>((VCDSignal<ISignalChangeSingle>)signals.get(i), id, netName);
-		} else {
-			signal = i<0 ? new VCDSignal<ISignalChangeMulti>(db, id, netName, width) :
-				new VCDSignal<ISignalChangeMulti>((VCDSignal<VCDSignalChangeMulti>)signals.get(i), id, netName);
-		};
-		signals.add(signal);
-		return id;
-	}
-
-	/* (non-Javadoc)
-	 * @see com.minres.scviewer.database.vcd.ITraceBuilder#getNetWidth(int)
-	 */
-	@Override
-	public int getNetWidth(int intValue) {
-		VCDSignal<? extends IWaveformEvent> signal = (VCDSignal<? extends IWaveformEvent>) signals.get(intValue);
-		return signal.getWidth();
-	}
-
-	/* (non-Javadoc)
-	 * @see com.minres.scviewer.database.vcd.ITraceBuilder#appendTransition(int, long, com.minres.scviewer.database.vcd.BitVector)
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void appendTransition(int signalId, long currentTime, BitVector decodedValues) {
-		VCDSignal<? extends IWaveformEvent> signal = (VCDSignal<? extends IWaveformEvent>) signals.get(signalId);
-		Long time = currentTime* TIME_RES;
-		if(signal.getWidth()==1){
-			((VCDSignal<ISignalChangeSingle>)signal).values.put(time, new VCDSignalChangeSingle(time, decodedValues.getValue()[0]));
-		} else {
-			((VCDSignal<VCDSignalChangeMulti>)signal).values.put(time, new VCDSignalChangeMulti(time, decodedValues));
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.minres.scviewer.database.IWaveformDbLoader#getAllRelationTypes()
-	 */
-	@Override
-	public Collection<RelationType> getAllRelationTypes(){
-		return Collections.emptyList();
-	}
-
-}

com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignal.java

@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.vcd;
-
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import com.minres.scviewer.database.HierNode;
-import com.minres.scviewer.database.ISignal;
-import com.minres.scviewer.database.ISignalChange;
-import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.IWaveformDb;
-import com.minres.scviewer.database.IWaveformEvent;
-
-public class VCDSignal<T extends ISignalChange> extends HierNode implements ISignal<T> {
-
-	private long id;
-
-	private String fullName;
-
-	private final String kind = "signal";
-	
-	private final int width;
-	
-	private IWaveformDb db;
-
-	TreeMap<Long, T> values;
-	
-	public VCDSignal(IWaveformDb db, String name) {
-		this(db, 0, name, 1);
-	}
-
-	public VCDSignal(IWaveformDb db, int id, String name) {
-		this(db, id,name,1);
-	}
-
-	public VCDSignal(IWaveformDb db, int id, String name, int width) {
-		super(name);
-		this.db=db;
-		fullName=name;
-		this.id=id;
-		this.width=width;
-		this.values=new TreeMap<Long, T>();
-	}
-
-	@SuppressWarnings("unchecked")
-	public VCDSignal(IWaveform<? extends ISignalChange> other, int id, String name) {
-		super(name);
-		fullName=name;
-		this.id=id;
-		assert(other instanceof VCDSignal<?>);
-		this.width=((VCDSignal<? extends IWaveformEvent>)other).width;
-		this.values=((VCDSignal<T>)other).values;
-		this.db=other.getDb();
-	}
-
-	@Override
-	public String getFullName() {
-		return fullName;
-	}
-
-	public void setId(int id) {
-		this.id=id;
-	}
-
-	@Override
-	public Long getId() {
-		return id;
-	}
-
-	@Override
-	public String getKind() {
-		return kind;
-	}
-
-	public int getWidth() {
-		return width;
-	}
-
-	@Override
-	public IWaveformDb getDb() {
-		return db;
-	}
-
-	public void addSignalChange(T change){
-		values.put(change.getTime(), change);
-	}
-	
-	@Override
-	public NavigableMap<Long, T> getEvents() {
-		return values;
-	}
-
-	@Override
-	public T getWaveformEventsAtTime(Long time) {
-		return values.get(time);
-	}
-
-    @Override
-    public T getWaveformEventsBeforeTime(Long time) {
-        return  values.floorEntry(time).getValue();
-    }
-
-	@Override
-	public Boolean equals(IWaveform<? extends IWaveformEvent> other) {
-		return(other instanceof VCDSignal<?> && this.getId()==other.getId());
-	}
-
-
-
-}

com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignalChangeMulti.java

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.vcd;
-
-import com.minres.scviewer.database.BitVector;
-import com.minres.scviewer.database.ISignalChangeMulti;
-import com.minres.scviewer.database.SignalChange;
-
-public class VCDSignalChangeMulti extends SignalChange implements ISignalChangeMulti, Cloneable  {
-
-	private BitVector value;
-	
-	public VCDSignalChangeMulti(Long time) {
-		super(time);
-	}
-
-	public VCDSignalChangeMulti(Long time, BitVector decodedValues) {
-		super(time);
-		this.value=decodedValues;
-	}
-
-	public BitVector getValue() {
-		return value;
-	}
-	
-	public void setValue(BitVector value) {
-		this.value = value;
-	}
-
-	@Override
-	public String toString() {
-		return value.toHexString()+"@"+getTime();
-	}
-
-}

com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDSignalChangeSingle.java

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.vcd;
-
-import com.minres.scviewer.database.ISignalChangeSingle;
-import com.minres.scviewer.database.SignalChange;
-
-public class VCDSignalChangeSingle extends SignalChange implements ISignalChangeSingle, Cloneable {
-
-	private char value;
-
-	public VCDSignalChangeSingle(Long time, char value) {
-		super(time);
-		this.value=value;
-	}
-
-	public char getValue() {
-		return value;
-	}
-
-	public void setValue(char value) {
-		this.value = value;
-	}
-	
-	@Override
-	public String toString() {
-		return value+"@"+getTime();
-	}
-}

com.minres.scviewer.database/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7

com.minres.scviewer.database/META-INF/MANIFEST.MF

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Waveform database
-Bundle-SymbolicName: com.minres.scviewer.database
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: com.minres.scviewer.database
-Bundle-ActivationPolicy: lazy
-Service-Component: OSGI-INF/component.xml,OSGI-INF/component2.xml
-Require-Bundle: org.eclipse.equinox.ds;bundle-version="1.4.200",
- org.eclipse.equinox.util;bundle-version="1.0.500",
- org.eclipse.osgi.services;bundle-version="3.4.0"

com.minres.scviewer.database/src/com/minres/scviewer/database/BitVector.java

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database;
-
-public class BitVector {
-
-	public static final char VALUE_X = 'X';
-	public static final char VALUE_Z = 'Z';
-	public static final char VALUE_1 = '1';
-	public static final char VALUE_0 = '0';
-
-	private final int width;
-	
-	private char[] value;
-	
-	public BitVector(int netWidth) {
-		this.width=netWidth;
-		value = new char[netWidth];
-		for(int i=0; i<netWidth; i++) value[i]='0';
-	}
-
-	public void setValue(int i, char value) {
-		this.value[i]=value;
-	}
-
-	public char[] getValue() {
-		return value;
-	}
-
-	public void setValue(char[] value) {
-		this.value = value;
-	}
-
-	public int getWidth() {
-		return width;
-	}
-
-	public String toString(){
-		return new String(value);
-	}
-	
-	public String toHexString(){
-		int resWidth=(width-1)/4+1;
-		char[] res = new char[resWidth];
-		for(int i=resWidth-1; i>=0; i--){
-			int digit=0;
-			for(int j=3; j>=0; j--){
-				if(value[4*i+j]==VALUE_X ||value[4*i+j]==VALUE_Z ){
-					res[i]=VALUE_X;
-				}
-				if(value[4*i+j]==VALUE_1)
-					digit+=1<<(3-j);
-				res[i]=Character.forDigit(digit, 16); //((digit < 10) ? '0' + digit : 'a' + digit -10)
-			}
-		}
-		return new String(res);		
-	}
-}

com.minres.scviewer.database/src/com/minres/scviewer/database/DataType.java

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database;
-
-public enum DataType {
-	BOOLEAN, // bool
-	ENUMERATION, // enum
-	INTEGER, // char, short, int, long, long long, sc_int, sc_bigint
-	UNSIGNED, // unsigned { char, short, int, long, long long }, sc_uint,
-				// sc_biguint
-	FLOATING_POINT_NUMBER, // float, double
-	BIT_VECTOR, // sc_bit, sc_bv
-	LOGIC_VECTOR, // sc_logic, sc_lv
-	FIXED_POINT_INTEGER, // sc_fixed
-	UNSIGNED_FIXED_POINT_INTEGER, // sc_ufixed
-	RECORD, // struct/class
-	POINTER, // T*
-	ARRAY, // T[N]
-	STRING // string, std::string
-};

com.minres.scviewer.database/src/com/minres/scviewer/database/HierNode.java

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database;
-
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.util.ArrayList;
-import java.util.List;
-
-public class HierNode implements IHierNode {
-
-	protected String name;
-	
-	protected String parentName;
-	
-	protected ArrayList<IHierNode> childs;
-	
-	protected PropertyChangeSupport pcs;
-
-	public HierNode() {
-		childs = new ArrayList<IHierNode>();
-		pcs=new PropertyChangeSupport(this);
-	}
-
-	public HierNode(String name) {
-		this(name, "");
-	}
-
-	public HierNode(String name, String parentName) {
-		this();
-		this.name=name;
-		this.parentName=parentName;
-	}
-
-	@Override
-	public void addPropertyChangeListener(PropertyChangeListener l) {
-		pcs.addPropertyChangeListener(l);
-	}
-
-	@Override
-	public void removePropertyChangeListener(PropertyChangeListener l) {
-		pcs.removePropertyChangeListener(l);
-	}
-
-
-	@Override
-	public String getFullName() {
-		if(parentName!=null && parentName.length()>0)
-			return parentName+"."+name;
-		else
-			return name;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name=name;
-	}
-
-	@Override
-	public void setParentName(String name) {
-		this.parentName=name;
-	}
-
-	@Override
-	public List<IHierNode> getChildNodes() {
-		return childs;
-	}
-
-	@Override
-	public int compareTo(IHierNode o) {
-		return name.compareTo(o.getName());
-	}
-
-}

com.minres.scviewer.database/src/com/minres/scviewer/database/IHierNode.java

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database;
-
-import java.beans.PropertyChangeListener;
-import java.util.List;
-
-public interface IHierNode extends Comparable<IHierNode>{
-	
-	/**
-	 * Attach a non-null PropertyChangeListener to this object.
-	 * 
-	 * @param l
-	 *            a non-null PropertyChangeListener instance
-	 * @throws IllegalArgumentException
-	 *             if the parameter is null
-	 */
-	public void addPropertyChangeListener(PropertyChangeListener l);
-
-	/**
-	 * Remove a PropertyChangeListener from this component.
-	 * 
-	 * @param l
-	 *            a PropertyChangeListener instance
-	 */
-	public void removePropertyChangeListener(PropertyChangeListener l) ;
-
-	public String getFullName();
-	
-	public String getName();
-	
-	public void setName(String name);
-	
-	public void setParentName(String name);
-
-	public List<IHierNode> getChildNodes();
-
-}

com.minres.scviewer.database/src/com/minres/scviewer/database/ISignal.java

@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database;
-
-import java.util.NavigableMap;
-
-
-public interface ISignal<T extends ISignalChange> extends IWaveform<T>{
-
-	public NavigableMap<Long, T> getEvents();
-
-	public T getWaveformEventsAtTime(Long time);
-
-	public T getWaveformEventsBeforeTime(Long time);
-}
-

com.minres.scviewer.database/src/com/minres/scviewer/database/ITx.java

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database;
-
-import java.util.Collection;
-import java.util.List;
-
-public interface ITx extends Comparable<ITx>{
-
-	public Long getId();
-	
-	public ITxStream<ITxEvent> getStream();
-	
-	public ITxGenerator getGenerator();
-	
-	public Long getBeginTime();
-	
-	public Long getEndTime();
-	
-	public int getConcurrencyIndex();
-	
-	public List<ITxAttribute> getAttributes();
-	
-	public Collection<ITxRelation> getIncomingRelations();
-
-	public Collection<ITxRelation> getOutgoingRelations();
-}

com.minres.scviewer.database/src/com/minres/scviewer/database/ITxGenerator.java

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database;
-
-import java.util.List;
-
-public interface ITxGenerator {
-	public Long getId();
-	public ITxStream<ITxEvent> getStream();
-	public String getName();
-	public List<ITx> getTransactions();
-}

com.minres.scviewer.database/src/com/minres/scviewer/database/ITxStream.java

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.NavigableMap;
-
-public interface  ITxStream<T extends ITxEvent> extends IWaveform<T> {
-
-	public List<ITxGenerator> getGenerators();
-
-	public int getMaxConcurrency();
-
-	public NavigableMap<Long, List<ITxEvent>> getEvents();
-
-	public Collection<T> getWaveformEventsAtTime(Long time);
-
-}

com.minres.scviewer.database/src/com/minres/scviewer/database/SignalChange.java

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database;
-
-public class SignalChange implements IWaveformEvent {
-	
-	Long time;
-	
-	
-	public SignalChange() {
-		time=0L;
-	}
-
-	public SignalChange(Long time) {
-		super();
-		this.time = time;
-	}
-
-	@Override
-	public int compareTo(IWaveformEvent o) {
-		return time.compareTo(o.getTime());
-	}
-
-	@Override
-	public Long getTime() {
-		return time;
-	}
-
-	public void setTime(Long time) {
-		this.time = time;
-	}
-
-	@Override
-	public IWaveformEvent duplicate() throws CloneNotSupportedException {
-		return (IWaveformEvent) this.clone();
-	}
-
-}

com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java

@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.database.internal;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import com.minres.scviewer.database.HierNode;
-import com.minres.scviewer.database.IHierNode;
-import com.minres.scviewer.database.ISignal;
-import com.minres.scviewer.database.ITxStream;
-import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.IWaveformDb;
-import com.minres.scviewer.database.IWaveformDbLoader;
-import com.minres.scviewer.database.IWaveformEvent;
-import com.minres.scviewer.database.InputFormatException;
-import com.minres.scviewer.database.RelationType;
-
-public class WaveformDb extends HierNode implements IWaveformDb {
-
-	private static List<IWaveformDbLoader> loaders=new LinkedList<IWaveformDbLoader>();
-
-	private boolean loaded;
-
-	private List<IHierNode> childNodes;
-
-	private List<RelationType> relationTypes;
-	
-	private Map<String, IWaveform<?>> waveforms;
-
-	private Long maxTime;
-	
-	
-	public synchronized void bind(IWaveformDbLoader loader){
-		loaders.add(loader);
-	}
-
-	public synchronized void unbind(IWaveformDbLoader loader){
-		loaders.remove(loader);
-	}
-
-	
-	public static List<IWaveformDbLoader> getLoaders() {
-		return Collections.unmodifiableList(loaders);
-	}
-
-	public WaveformDb() {
-		super();
-		waveforms = new HashMap<String, IWaveform<?>>();
-		relationTypes=new ArrayList<>();
-		maxTime=0L;
-	}
-
-	@Override
-	public Long getMaxTime() {
-		return maxTime;
-	}
-
-	@Override
-	public IWaveform<? extends IWaveformEvent> getStreamByName(String name) {
-		return waveforms.get(name);
-	}
-
-	@Override
-	public List<IWaveform<?>> getAllWaves() {
-		return new ArrayList<IWaveform<?>>(waveforms.values());
-	}
-
-	@Override
-	public boolean load(File inp) throws Exception {
-		for(IWaveformDbLoader loader:loaders){
-			if(loader.load(this, inp)){
-				for(IWaveform<?> w:loader.getAllWaves()){
-					waveforms.put(w.getFullName(),w);
-				}
-				if(loader.getMaxTime()>maxTime){
-					maxTime=loader.getMaxTime();
-				}
-				if(name==null) name=getFileBasename(inp.getName());
-				buildHierarchyNodes() ;
-				relationTypes.addAll(loader.getAllRelationTypes());
-				pcs.firePropertyChange("WAVEFORMS", null, waveforms);
-				pcs.firePropertyChange("CHILDS", null, childNodes);
-				loaded = true;
-				return true;
-			}
-		}		
-		return false;
-	}
-
-	protected static String getFileBasename(String f) {
-	    String ext = "";
-	    int i = f.lastIndexOf('.');
-	    if (i > 0 &&  i < f.length() - 1) {
-	      ext = f.substring(0, i);
-	    }
-	    return ext;
-	  }
-
-	@Override
-	public void clear() {
-		waveforms.clear();
-		childNodes.clear();
-		loaded=false;
-	}
-
-	public boolean isLoaded() {
-		return loaded;
-	}
-
-	private void buildHierarchyNodes() throws InputFormatException{
-		childNodes= new ArrayList<IHierNode>();
-		for(IWaveform<?> stream:getAllWaves()){
-			updateMaxTime(stream);
-			String[] hier = stream.getName().split("\\.");
-			IHierNode node = this;
-			List<String> path=new LinkedList<String>();
-			path.add(name);
-			for(String name:hier){
-				IHierNode n1 = null;
-				for (IHierNode n : node.getChildNodes()) {
-					if (n.getName().equals(name)) {
-						n1=n;
-						break;
-					}
-				}
-				if(name == hier[hier.length-1]){ //leaf
-					if(n1!=null) {
-						if(n1 instanceof HierNode){
-							node.getChildNodes().remove(n1);
-							stream.getChildNodes().addAll(n1.getChildNodes());
-							Collections.sort(stream.getChildNodes());
-						} else {
-							throw new InputFormatException();
-						}
-					}
-					stream.setName(name);
-					stream.setParentName(join(path, "."));
-					node.getChildNodes().add(stream);
-					Collections.sort(node.getChildNodes());
-					node=stream;
-				} else { // intermediate
-					if(n1 != null) {
-						node=n1;
-					} else {
-						HierNode newNode = new HierNode(name, join(path, "."));
-						node.getChildNodes().add(newNode);
-						Collections.sort(node.getChildNodes());
-						node=newNode;
-					}
-				}
-				path.add(name);
-			}
-		}
-	}
-
-	private void updateMaxTime(IWaveform<?> waveform) {
-		Long last=0L;
-		if(waveform instanceof ITxStream<?> && ((ITxStream<?>)waveform).getEvents().lastEntry()!=null)
-			last=((ITxStream<?>)waveform).getEvents().lastEntry().getKey();
-		else if(waveform instanceof ISignal<?> && ((ISignal<?>)waveform).getEvents().lastEntry()!=null)
-			last=((ISignal<?>)waveform).getEvents().lastEntry().getKey();
-		if(last>maxTime)
-			maxTime=last;
-	}
-	
-	private static String join(Collection<?> col, String delim) {
-	    StringBuilder sb = new StringBuilder();
-	    Iterator<?> iter = col.iterator();
-	    if (iter.hasNext())
-	        sb.append(iter.next().toString());
-	    while (iter.hasNext()) {
-	        sb.append(delim);
-	        sb.append(iter.next().toString());
-	    }
-	    return sb.toString();
-	}
-
-	@Override
-	public List<RelationType> getAllRelationTypes() {
-		return relationTypes;
-	}
-}

com.minres.scviewer.e4.application/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

com.minres.scviewer.e4.application/.settings/org.eclipse.pde.core.prefs

@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false

com.minres.scviewer.e4.application/pom.xml

@@ -1,13 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>com.minres.scviewer.e4.application</artifactId>
-  <parent>
-  	<groupId>com.minres.scviewer</groupId>
-  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>1.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
-  </parent>
-  <packaging>eclipse-plugin</packaging>
-  <version>1.0.0-SNAPSHOT</version>
-  <groupId>com.minres.scviewer</groupId>
-</project>

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/OpenHandler.java

@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.e4.application.handlers;
-
-import java.io.File;
-
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
-import org.eclipse.e4.ui.workbench.modeling.EModelService;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Shell;
-public class OpenHandler {
-
-	@Execute
-	public void execute(Shell shell, MApplication app, EModelService modelService, EPartService partService){
-		FileDialog dialog = new FileDialog(shell, SWT.OPEN | SWT.MULTI);
-//		dialog.setFilterExtensions (new String []{"vcd", "txdb", "txlog"});
-		dialog.setFilterExtensions (new String []{"*.vcd;*.txdb;*.txlog"});
-		dialog.open();
-		String path = dialog.getFilterPath();
-		for(String fileName: dialog.getFileNames()){
-			File file = new File(path+File.separator+fileName);
-			if(file.exists()){
-//				MPart part = MBasicFactory.INSTANCE.createPart();
-//				part.setLabel(fileName);
-//				part.setContributionURI("bundleclass://com.minres.scviewer.e4.application/"+ WaveformViewerPart.class.getName());
-				MPart part = partService .createPart("com.minres.scviewer.e4.application.partdescriptor.waveformviewer");
-				part.setLabel(file.getName());
-								
-
-				MPartStack partStack = (MPartStack)modelService.find("org.eclipse.editorss", app);
-				partStack.getChildren().add(part);
-				partService.showPart(part, PartState.ACTIVATE);
-//				Object o = part.getObject();
-//				if(o instanceof WaveformViewerPart)
-//					((WaveformViewerPart)o).setPartInput(file);
-				IEclipseContext ctx=part.getContext();
-				ctx.modify("input", file);
-				ctx.declareModifiable("input");
-
-				
-			}
-		}
-	}
-	
-}

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
- 
-package com.minres.scviewer.e4.application.handlers;
-
-import org.eclipse.e4.core.di.annotations.Execute;
-
-public class SelectAllHandler {
-
-	@Execute
-	public void execute() {
-		
-	}
-		
-}

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/HeapStatus.java

@@ -1,779 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.e4.application.internal.status;
-import java.lang.reflect.Method;
-
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.wb.swt.ResourceManager;
-import org.eclipse.wb.swt.SWTResourceManager;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The Heap Status control, which shows the heap usage statistics in the window trim.
- * Part of the code is taken from the eclipse internal implementation
- */
-public class HeapStatus extends Composite {
-
-	/** The armed. */
-	private boolean armed;
-	
-	/** The gc image. */
-	private Image gcImage;
-	
-	/** The disabled gc image. */
-	private Image disabledGcImage;
-	
-	/** The arm col. */
-	private Color bgCol, usedMemCol, lowMemCol, freeMemCol, topLeftCol, bottomRightCol, sepCol, textCol, markCol, armCol;
-    
-    /** The button. */
-    private Canvas button;
-	
-	/** The preferences. */
-	private Preferences preferences;
-	
-	/** The update interval. */
-	private int updateInterval;
-	
-	/** The show max. */
-	private boolean showMax;
-    
-    /** The total mem. */
-    private long totalMem;
-    
-    /** The prev total mem. */
-    private long prevTotalMem = -1L;
-    
-    /** The prev used mem. */
-    private long prevUsedMem = -1L;
-    
-    /** The has changed. */
-    private boolean hasChanged;
-    
-    /** The used mem. */
-    private long usedMem;
-    
-    /** The mark. */
-    private long mark = -1;
-    
-    /** The img bounds. */
-    // start with 12x12
-	private Rectangle imgBounds = new Rectangle(0,0,12,12);
-	
-	/** The max mem. */
-	private long maxMem = Long.MAX_VALUE;
-	
-	/** The max mem known. */
-	private boolean maxMemKnown;
-	
-	/** The low mem threshold. */
-	private float lowMemThreshold = 0.05f;
-	
-	/** The show low mem threshold. */
-	private boolean showLowMemThreshold = true;
-	
-	/** The update tooltip. */
-	private boolean updateTooltip = false;
-
-	/** The is in gc. */
-	protected volatile boolean isInGC = false;
-
-    /** The timer. */
-    private final Runnable timer = new Runnable() {
-        @Override
-		public void run() {
-            if (!isDisposed()) {
-                updateStats();
-                if (hasChanged) {
-                	if (updateTooltip) {
-                		updateToolTip();
-                	}
-                    redraw();
-                    hasChanged = false;
-                }
-                getDisplay().timerExec(updateInterval, this);
-            }
-        }
-    };
-
-    /** The pref listener. */
-    private final IPreferenceChangeListener prefListener = new IPreferenceChangeListener() {
-		@Override
-		public void preferenceChange(PreferenceChangeEvent event) {
-			if (IHeapStatusConstants.PREF_UPDATE_INTERVAL.equals(event.getKey())) {
-				setUpdateIntervalInMS(preferences.getInt(IHeapStatusConstants.PREF_UPDATE_INTERVAL, 100));
-			}
-			else if (IHeapStatusConstants.PREF_SHOW_MAX.equals(event.getKey())) {
-				showMax = preferences.getBoolean(IHeapStatusConstants.PREF_SHOW_MAX, true);
-			}
-			
-		}
-	};
-
-    /**
-     * Creates a new heap status control with the given parent, and using
-     * the given preference store to obtain settings such as the refresh
-     * interval.
-     *
-     * @param parent the parent composite
-     * @param preferences the preference store
-     */
-	public HeapStatus(Composite parent, Preferences preferences) {
-		super(parent, SWT.NONE);
-
-		maxMem = getMaxMem();
-		maxMemKnown = maxMem != Long.MAX_VALUE;
-
-        this.preferences = preferences;
-        if(this.preferences instanceof IEclipsePreferences)
-        	((IEclipsePreferences)this.preferences).addPreferenceChangeListener(prefListener);
-
-        setUpdateIntervalInMS(preferences.getInt(IHeapStatusConstants.PREF_UPDATE_INTERVAL, 100));
-        showMax = preferences.getBoolean(IHeapStatusConstants.PREF_SHOW_MAX, true);
-
-        button = new Canvas(this, SWT.NONE);
-        button.setToolTipText("Run Garbage Collection");
-
-		ImageDescriptor imageDesc = ResourceManager.getPluginImageDescriptor("com.minres.scviewer.e4.application", "icons/trash.png"); //$NON-NLS-1$
-		Display display = getDisplay();
-		gcImage = imageDesc.createImage();
-		if (gcImage != null) {
-			imgBounds = gcImage.getBounds();
-			disabledGcImage = new Image(display, gcImage, SWT.IMAGE_DISABLE);
-		}
-		usedMemCol = display.getSystemColor(SWT.COLOR_INFO_BACKGROUND);
-		lowMemCol = SWTResourceManager.getColor(255, 70, 70);  // medium red
-		freeMemCol = SWTResourceManager.getColor(255, 190, 125);  // light orange
-		bgCol = SWTResourceManager.getColor(SWT.COLOR_WIDGET_BACKGROUND);
-		sepCol = topLeftCol = armCol = SWTResourceManager.getColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
-		bottomRightCol = SWTResourceManager.getColor(SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW);
-		markCol = textCol = SWTResourceManager.getColor(SWT.COLOR_INFO_FOREGROUND);
-
-		createContextMenu();
-
-        Listener listener = new Listener() {
-
-            @Override
-			public void handleEvent(Event event) {
-                switch (event.type) {
-                case SWT.Dispose:
-                	doDispose();
-                    break;
-                case SWT.Resize:
-                    Rectangle rect = getClientArea();
-                    button.setBounds(rect.width - imgBounds.width - 1, 1, imgBounds.width, rect.height - 2);
-                    break;
-                case SWT.Paint:
-                    if (event.widget == HeapStatus.this) {
-                    	paintComposite(event.gc);
-                    }
-                    else if (event.widget == button) {
-                        paintButton(event.gc);
-                    }
-                    break;
-                case SWT.MouseUp:
-                    if (event.button == 1) {
-						if (!isInGC) {
-							arm(false);
-							gc();
-						}
-                    }
-                    break;
-                case SWT.MouseDown:
-                    if (event.button == 1) {
-	                    if (event.widget == HeapStatus.this) {
-							setMark();
-						} else if (event.widget == button) {
-							if (!isInGC)
-								arm(true);
-						}
-                    }
-                    break;
-                case SWT.MouseEnter:
-                	HeapStatus.this.updateTooltip = true;
-                	updateToolTip();
-                	break;
-                case SWT.MouseExit:
-                    if (event.widget == HeapStatus.this) {
-                    	HeapStatus.this.updateTooltip = false;
-					} else if (event.widget == button) {
-						arm(false);
-					}
-                    break;
-                }
-            }
-
-        };
-        addListener(SWT.Dispose, listener);
-        addListener(SWT.MouseDown, listener);
-        addListener(SWT.Paint, listener);
-        addListener(SWT.Resize, listener);
-        addListener(SWT.MouseEnter, listener);
-        addListener(SWT.MouseExit, listener);
-        button.addListener(SWT.MouseDown, listener);
-        button.addListener(SWT.MouseExit, listener);
-        button.addListener(SWT.MouseUp, listener);
-        button.addListener(SWT.Paint, listener);
-
-		// make sure stats are updated before first paint
-		updateStats();
-
-        getDisplay().asyncExec(new Runnable() {
-			@Override
-			public void run() {
-				if (!isDisposed()) {
-					getDisplay().timerExec(updateInterval, timer);
-				}
-			}
-		});
-   	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#setBackground(org.eclipse.swt.graphics.Color)
-	 */
-	@Override
-	public void setBackground(Color color) {
-		bgCol = color;
-		button.redraw();
-		button.update();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#setForeground(org.eclipse.swt.graphics.Color)
-	 */
-	@Override
-	public void setForeground(Color color) {
-		if (color == null) {
-			usedMemCol = getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND);
-		} else {
-			usedMemCol = color;
-		}
-
-		button.redraw();
-		button.update();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#getForeground()
-	 */
-	@Override
-	public Color getForeground() {
-		if (usedMemCol != null) {
-			return usedMemCol;
-		}
-		return getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND);
-	}
-
-	/**
-	 * Returns the maximum memory limit, or Long.MAX_VALUE if the max is not known.
-	 *
-	 * @return the max mem
-	 */
-	private long getMaxMem() {
-		long max = Long.MAX_VALUE;
-		try {
-			// Must use reflect to allow compilation against JCL/Foundation
-			Method maxMemMethod = Runtime.class.getMethod("maxMemory", new Class[0]); //$NON-NLS-1$
-			Object o = maxMemMethod.invoke(Runtime.getRuntime(), new Object[0]);
-			if (o instanceof Long) {
-				max = ((Long) o).longValue();
-			}
-		}
-		catch (Exception e) {
-			// ignore if method missing or if there are other failures trying to determine the max
-		}
-		return max;
-	}
-
-	/**
-	 * Sets the update interval in ms.
-	 *
-	 * @param interval the new update interval in ms
-	 */
-	private void setUpdateIntervalInMS(int interval) {
-		updateInterval = Math.max(100, interval);
-	}
-
-	/**
-	 * Do dispose.
-	 */
-	private void doDispose() {
-		if(preferences instanceof IEclipsePreferences)
-        	((IEclipsePreferences)preferences).removePreferenceChangeListener(prefListener);
-    	if (gcImage != null) {
-			gcImage.dispose();
-		}
-		if (disabledGcImage != null) {
-			disabledGcImage.dispose();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Composite#computeSize(int, int, boolean)
-	 */
-	@Override
-	public Point computeSize(int wHint, int hHint, boolean changed) {
-        GC gc = new GC(this);
-        Point p = gc.textExtent("MMMMMMMMMMMM");
-        int height = imgBounds.height;
-        // choose the largest of
-        // 	- Text height + margins
-        //	- Image height + margins
-        //	- Default Trim heightin
-        height = Math.max(height, p.y) + 4;
-        height = Math.max(TrimUtil.TRIM_DEFAULT_HEIGHT, height);
-        gc.dispose();
-		return new Point(p.x + 15, height);
-	}
-
-    /**
-     * Arm.
-     *
-     * @param armed the armed
-     */
-    private void arm(boolean armed) {
-        if (this.armed == armed) {
-			return;
-		}
-        this.armed = armed;
-        button.redraw();
-        button.update();
-    }
-
-	/**
-	 * Gc running.
-	 *
-	 * @param isInGC the is in gc
-	 */
-	private void gcRunning(boolean isInGC) {
-		if (this.isInGC == isInGC) {
-			return;
-		}
-		this.isInGC = isInGC;
-		 button.redraw();
-		 button.update();
-	}
-
-    /**
-     * Creates the context menu.
-     */
-    private void createContextMenu() {
-        MenuManager menuMgr = new MenuManager();
-        menuMgr.setRemoveAllWhenShown(true);
-        menuMgr.addMenuListener(new IMenuListener() {
-			@Override
-			public void menuAboutToShow(IMenuManager menuMgr) {
-				fillMenu(menuMgr);
-			}
-		});
-        Menu menu = menuMgr.createContextMenu(this);
-        setMenu(menu);
-    }
-
-    /**
-     * Fill menu.
-     *
-     * @param menuMgr the menu mgr
-     */
-    private void fillMenu(IMenuManager menuMgr) {
-        menuMgr.add(new SetMarkAction());
-        menuMgr.add(new ClearMarkAction());
-        menuMgr.add(new ShowMaxAction());
-        menuMgr.add(new CloseHeapStatusAction());
-//        if (isKyrsoftViewAvailable()) {
-//        	menuMgr.add(new ShowKyrsoftViewAction());
-//        }
-    }
-
-    /**
-     * Sets the mark to the current usedMem level.
-     */
-    private void setMark() {
-    	updateStats();  // get up-to-date stats before taking the mark
-        mark = usedMem;
-        hasChanged = true;
-        redraw();
-    }
-
-    /**
-     * Clears the mark.
-     */
-    private void clearMark() {
-        mark = -1;
-        hasChanged = true;
-        redraw();
-    }
-
-    /**
-     * Gc.
-     */
-    private void gc() {
-		gcRunning(true);
-		Thread t = new Thread() {
-			@Override
-			public void run() {
-				busyGC();
-				getDisplay().asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						if (!isDisposed()) {
-							gcRunning(false);
-						}
-					}
-				});
-			}
-		};
-		t.start();
-    }
-
-    /**
-     * Busy gc.
-     */
-    private void busyGC() {
-        for (int i = 0; i < 2; ++i) {
-	        System.gc();
-	        System.runFinalization();
-        }
-    }
-
-    /**
-     * Paint button.
-     *
-     * @param gc the gc
-     */
-    private void paintButton(GC gc) {
-        Rectangle rect = button.getClientArea();
-		if (isInGC) {
-			if (disabledGcImage != null) {
-				int buttonY = (rect.height - imgBounds.height) / 2 + rect.y;
-				gc.drawImage(disabledGcImage, rect.x, buttonY);
-			}
-			return;
-		}
-        if (armed) {
-            gc.setBackground(armCol);
-            gc.fillRectangle(rect.x, rect.y, rect.width, rect.height);
-        }
-        if (gcImage != null) {
-			int by = (rect.height - imgBounds.height) / 2 + rect.y; // button y
-			gc.drawImage(gcImage, rect.x, by);
-        }
-    }
-
-    /**
-     * Paint composite.
-     *
-     * @param gc the gc
-     */
-    private void paintComposite(GC gc) {
-		if (showMax && maxMemKnown) {
-			paintCompositeMaxKnown(gc);
-		} else {
-			paintCompositeMaxUnknown(gc);
-		}
-    }
-
-    /**
-     * Paint composite max unknown.
-     *
-     * @param gc the gc
-     */
-    private void paintCompositeMaxUnknown(GC gc) {
-        Rectangle rect = getClientArea();
-        int x = rect.x;
-        int y = rect.y;
-        int w = rect.width;
-        int h = rect.height;
-        int bw = imgBounds.width; // button width
-        int dx = x + w - bw - 2; // divider x
-        int sw = w - bw - 3; // status width
-        int uw = (int) (sw * usedMem / totalMem); // used mem width
-        int ux = x + 1 + uw; // used mem right edge
-        if (bgCol != null) {
-			gc.setBackground(bgCol);
-		}
-        gc.fillRectangle(rect);
-        gc.setForeground(sepCol);
-		gc.drawLine(dx, y, dx, y + h);
-		gc.drawLine(ux, y, ux, y + h);
-        gc.setForeground(topLeftCol);
-        gc.drawLine(x, y, x+w, y);
-		gc.drawLine(x, y, x, y+h);
-		gc.setForeground(bottomRightCol);
-        gc.drawLine(x+w-1, y, x+w-1, y+h);
-		gc.drawLine(x, y+h-1, x+w, y+h-1);
-
-		gc.setBackground(usedMemCol);
-        gc.fillRectangle(x + 1, y + 1, uw, h - 2);
-
-        String s =  convertToMegString(usedMem)+" of "+ convertToMegString(totalMem);
-        Point p = gc.textExtent(s);
-        int sx = (rect.width - 15 - p.x) / 2 + rect.x + 1;
-        int sy = (rect.height - 2 - p.y) / 2 + rect.y + 1;
-        gc.setForeground(textCol);
-        gc.drawString(s, sx, sy, true);
-
-        // draw an I-shaped bar in the foreground colour for the mark (if present)
-        if (mark != -1) {
-            int ssx = (int) (sw * mark / totalMem) + x + 1;
-            paintMark(gc, ssx, y, h);
-        }
-    }
-
-    /**
-     * Paint composite max known.
-     *
-     * @param gc the gc
-     */
-    private void paintCompositeMaxKnown(GC gc) {
-        Rectangle rect = getClientArea();
-        int x = rect.x;
-        int y = rect.y;
-        int w = rect.width;
-        int h = rect.height;
-        int bw = imgBounds.width; // button width
-        int dx = x + w - bw - 2; // divider x
-        int sw = w - bw - 3; // status width
-        int uw = (int) (sw * usedMem / maxMem); // used mem width
-        int ux = x + 1 + uw; // used mem right edge
-        int tw = (int) (sw * totalMem / maxMem); // current total mem width
-        int tx = x + 1 + tw; // current total mem right edge
-
-        if (bgCol != null) {
-			gc.setBackground(bgCol);
-		}
-        gc.fillRectangle(rect);
-        gc.setForeground(sepCol);
-		gc.drawLine(dx, y, dx, y + h);
-		gc.drawLine(ux, y, ux, y + h);
-		gc.drawLine(tx, y, tx, y + h);
-        gc.setForeground(topLeftCol);
-        gc.drawLine(x, y, x+w, y);
-		gc.drawLine(x, y, x, y+h);
-		gc.setForeground(bottomRightCol);
-        gc.drawLine(x+w-1, y, x+w-1, y+h);
-		gc.drawLine(x, y+h-1, x+w, y+h-1);
-
-        if (lowMemThreshold != 0 && ((double)(maxMem - usedMem) / (double)maxMem < lowMemThreshold)) {
-            gc.setBackground(lowMemCol);
-        } else {
-            gc.setBackground(usedMemCol);
-        }
-        gc.fillRectangle(x + 1, y + 1, uw, h - 2);
-
-        gc.setBackground(freeMemCol);
-        gc.fillRectangle(ux + 1, y + 1, tx - (ux + 1), h - 2);
-
-        // paint line for low memory threshold
-        if (showLowMemThreshold && lowMemThreshold != 0) {
-            gc.setForeground(lowMemCol);
-            int thresholdX = x + 1 + (int) (sw * (1.0 - lowMemThreshold));
-            gc.drawLine(thresholdX, y + 1, thresholdX, y + h - 2);
-        }
-
-        String s = convertToMegString(usedMem)+" of "+convertToMegString(totalMem);
-        Point p = gc.textExtent(s);
-        int sx = (rect.width - 15 - p.x) / 2 + rect.x + 1;
-        int sy = (rect.height - 2 - p.y) / 2 + rect.y + 1;
-        gc.setForeground(textCol);
-        gc.drawString(s, sx, sy, true);
-
-        // draw an I-shaped bar in the foreground colour for the mark (if present)
-        if (mark != -1) {
-            int ssx = (int) (sw * mark / maxMem) + x + 1;
-            paintMark(gc, ssx, y, h);
-        }
-    }
-
-	/**
-	 * Paint mark.
-	 *
-	 * @param gc the gc
-	 * @param x the x
-	 * @param y the y
-	 * @param h the h
-	 */
-	private void paintMark(GC gc, int x, int y, int h) {
-        gc.setForeground(markCol);
-		gc.drawLine(x, y+1, x, y+h-2);
-		gc.drawLine(x-1, y+1, x+1, y+1);
-		gc.drawLine(x-1, y+h-2, x+1, y+h-2);
-	}
-
-    /**
-     * Update stats.
-     */
-    private void updateStats() {
-        Runtime runtime = Runtime.getRuntime();
-        totalMem = runtime.totalMemory();
-        long freeMem = runtime.freeMemory();
-        usedMem = totalMem - freeMem;
-
-        if (convertToMeg(prevUsedMem) != convertToMeg(usedMem)) {
-            prevUsedMem = usedMem;
-            this.hasChanged = true;
-        }
-
-        if (prevTotalMem != totalMem) {
-            prevTotalMem = totalMem;
-            this.hasChanged = true;
-        }
-    }
-
-    /**
-     * Update tool tip.
-     */
-    private void updateToolTip() {
-    	String usedStr = convertToMegString(usedMem);
-    	String totalStr = convertToMegString(totalMem);
-    	String maxStr = maxMemKnown ? convertToMegString(maxMem) : "<unknown>";
-    	String markStr = mark == -1 ? "<none>" : convertToMegString(mark);
-        String toolTip = "Heap size: "+usedStr+" of total: "+totalStr+" max: "+maxStr+" mark: "+markStr;
-        if (!toolTip.equals(getToolTipText())) {
-            setToolTipText(toolTip);
-        }
-    }
-
-    /**
-     * Converts the given number of bytes to a printable number of megabytes (rounded up).
-     *
-     * @param numBytes the num bytes
-     * @return the string
-     */
-    private String convertToMegString(long numBytes) {
-        return new Long(convertToMeg(numBytes)).toString()+"M";
-    }
-
-    /**
-     * Converts the given number of bytes to the corresponding number of megabytes (rounded up).
-     *
-     * @param numBytes the num bytes
-     * @return the long
-     */
-	private long convertToMeg(long numBytes) {
-		return (numBytes + (512 * 1024)) / (1024 * 1024);
-	}
-
-
-    /**
-     * The Class SetMarkAction.
-     */
-    class SetMarkAction extends Action {
-        
-        /**
-         * Instantiates a new sets the mark action.
-         */
-        SetMarkAction() {
-            super("&Set Mark");
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.jface.action.Action#run()
-         */
-        @Override
-		public void run() {
-            setMark();
-        }
-    }
-
-    /**
-     * The Class ClearMarkAction.
-     */
-    class ClearMarkAction extends Action {
-        
-        /**
-         * Instantiates a new clear mark action.
-         */
-        ClearMarkAction() {
-            super("&Clear Mark");
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.jface.action.Action#run()
-         */
-        @Override
-		public void run() {
-            clearMark();
-        }
-    }
-
-    /**
-     * The Class ShowMaxAction.
-     */
-    class ShowMaxAction extends Action {
-    	
-	    /**
-	     * Instantiates a new show max action.
-	     */
-	    ShowMaxAction() {
-            super("Show &Max Heap", IAction.AS_CHECK_BOX);
-            setEnabled(maxMemKnown);
-            setChecked(showMax);
-        }
-
-        /* (non-Javadoc)
-         * @see org.eclipse.jface.action.Action#run()
-         */
-        @Override
-		public void run() {
-            preferences.putBoolean(IHeapStatusConstants.PREF_SHOW_MAX, isChecked());
-            redraw();
-        }
-    }
-
-    /**
-     * The Class CloseHeapStatusAction.
-     */
-    class CloseHeapStatusAction extends Action{
-
-    	/**
-	     * Instantiates a new close heap status action.
-	     */
-	    CloseHeapStatusAction(){
-    		super("&Close");
-    	}
-
-    	/* (non-Javadoc)
-	     * @see org.eclipse.jface.action.Action#run()
-	     */
-	    @Override
-		public void run(){
-//			WorkbenchWindow wbw = (WorkbenchWindow) PlatformUI.getWorkbench()
-//					.getActiveWorkbenchWindow();
-//			if (wbw != null) {
-//				wbw.showHeapStatus(false);
-//			}
-    		System.out.println("NYI");
-    	}
-    }
-
-}
-

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/internal/status/WaveStatusBarControl.java

@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.e4.application.internal.status;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.ui.di.UIEventTopic;
-import org.eclipse.e4.ui.di.UISynchronize;
-import org.eclipse.e4.ui.services.IServiceConstants;
-import org.eclipse.e4.ui.workbench.modeling.EModelService;
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.jface.action.StatusLineManager;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * The Class WaveStatusBarControl.
- */
-public class WaveStatusBarControl extends StatusBarControl {
-
-	/** The Constant ZOOM_LEVEL. */
-	public static final String ZOOM_LEVEL="ZoomLevelUpdate";
-	
-	/** The Constant CURSOR_TIME. */
-	public static final String CURSOR_TIME="CursorPosUpdate";
-	
-	/** The Constant MARKER_TIME. */
-	public static final String MARKER_TIME="MarkerPosUpdate";
-	
-	/** The Constant MARKER_DIFF. */
-	public static final String MARKER_DIFF="MarlerDiffUpdate";
-
-	/** The model service. */
-	@Inject
-	EModelService modelService;
-
-	/**
-	 * The Class TextContributionItem.
-	 */
-	class TextContributionItem extends ContributionItem {
-
-		/** The label string. */
-		final String labelString;
-		
-		/** The width. */
-		final int width;
-		
-		/** The text. */
-		CLabel label, text;
-		
-		/** The content. */
-		private String content;
-
-		/**
-		 * Instantiates a new text contribution item.
-		 *
-		 * @param labelString the label string
-		 * @param width the width
-		 */
-		public TextContributionItem(String labelString, int width) {
-			super();
-			this.labelString = labelString;
-			this.width=width;
-			content="";
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets.Composite)
-		 */
-		@Override
-		public void fill(Composite parent) {
-			Composite box=new Composite(parent, SWT.NONE);
-			box.setLayout(new GridLayout(2, false));
-			label=new CLabel(box, SWT.SHADOW_NONE);	
-			label.setText(labelString);
-			text=new CLabel(box, SWT.SHADOW_IN);
-			GridData layoutData=new GridData(SWT.DEFAULT, SWT.DEFAULT, true, false);
-			layoutData.minimumWidth=width;
-			text.setLayoutData(layoutData);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.action.ContributionItem#isDynamic()
-		 */
-		@Override
-		public boolean isDynamic() {
-			return true;
-		}
-
-		/**
-		 * Sets the text.
-		 *
-		 * @param message the new text
-		 */
-		public void setText(String message){
-			this.content=message;
-			if(text!=null && !text.isDisposed()) text.setText(content);
-		}
-
-	}
-
-	/** The zoom contribution. */
-	TextContributionItem cursorContribution, markerContribution, markerDiffContribution, zoomContribution;
-
-	/**
-	 * Instantiates a new wave status bar control.
-	 *
-	 * @param sync the sync
-	 */
-	@Inject
-	public WaveStatusBarControl(UISynchronize sync) {
-		super(sync);
-		cursorContribution = new TextContributionItem("C:", 80);
-		markerContribution = new TextContributionItem("M:", 80);
-		markerDiffContribution = new TextContributionItem("C-M:", 80);
-		zoomContribution = new TextContributionItem("Z:", 80);
-		manager.appendToGroup(StatusLineManager.BEGIN_GROUP,cursorContribution);
-		manager.appendToGroup(StatusLineManager.BEGIN_GROUP,markerContribution);
-		manager.appendToGroup(StatusLineManager.BEGIN_GROUP,markerDiffContribution);
-		manager.appendToGroup(StatusLineManager.BEGIN_GROUP, zoomContribution);
-	}
-
-	/**
-	 * Sets the selection.
-	 *
-	 * @param selection the new selection
-	 */
-	@Inject
-	public void setSelection(@Named(IServiceConstants.ACTIVE_SELECTION)@Optional IStructuredSelection selection){
-		if(manager!=null && selection!=null){
-			switch(selection.size()){
-			case 0:
-				manager.setMessage("");
-				break;
-			case 1:
-				manager.setMessage(selection.getFirstElement().getClass().getSimpleName()+" selected");
-				break;
-			default:
-				manager.setMessage(""+selection.size()+" Elements");
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Gets the zoom event.
-	 *
-	 * @param text the text
-	 * @return the zoom event
-	 */
-	@Inject @Optional
-	public void  getZoomEvent(@UIEventTopic(ZOOM_LEVEL) String text) {
-		zoomContribution.setText(text);
-	} 
-
-	/**
-	 * Gets the cursor event.
-	 *
-	 * @param text the text
-	 * @return the cursor event
-	 */
-	@Inject @Optional
-	public void  getCursorEvent(@UIEventTopic(CURSOR_TIME) String text) {
-		cursorContribution.setText(text);
-	} 
-
-	/**
-	 * Gets the marker event.
-	 *
-	 * @param text the text
-	 * @return the marker event
-	 */
-	@Inject @Optional
-	public void  getMarkerEvent(@UIEventTopic(MARKER_TIME) String text) {
-		markerContribution.setText(text);
-	} 
-
-	/**
-	 * Gets the diff event.
-	 *
-	 * @param text the text
-	 * @return the diff event
-	 */
-	@Inject @Optional
-	public void  getDiffEvent(@UIEventTopic(MARKER_DIFF) String text) {
-		markerDiffContribution.setText(text);
-	} 
-
-}

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/LoadingWaveformDb.java

@@ -1,88 +0,0 @@
-package com.minres.scviewer.e4.application.parts;
-
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.minres.scviewer.database.IHierNode;
-import com.minres.scviewer.database.IWaveform;
-import com.minres.scviewer.database.IWaveformDb;
-import com.minres.scviewer.database.IWaveformEvent;
-import com.minres.scviewer.database.RelationType;
-
-public class LoadingWaveformDb implements IWaveformDb {
-
-	private final String label = "Database loading..."; 
-
-	@Override
-	public void addPropertyChangeListener(PropertyChangeListener l) {
-	}
-
-	@Override
-	public void removePropertyChangeListener(PropertyChangeListener l) {
-	}
-
-	@Override
-	public String getFullName() {
-		return label;
-	}
-
-	@Override
-	public String getName() {
-		return label;
-	}
-
-	@Override
-	public void setName(String name) {
-	}
-
-	@Override
-	public void setParentName(String name) {
-	}
-
-	@Override
-	public List<IHierNode> getChildNodes() {
-		return new ArrayList<IHierNode>();
-	}
-
-	@Override
-	public int compareTo(IHierNode o) {
-		return 0;
-	}
-
-	@Override
-	public Long getMaxTime() {
-		return new Long(0);
-	}
-
-	@Override
-	public IWaveform<? extends IWaveformEvent> getStreamByName(String name) {
-		return null;
-	}
-
-	@Override
-	public List<IWaveform<?>> getAllWaves() {
-		return new ArrayList<IWaveform<?>>();
-	}
-
-	@Override
-	public List<RelationType> getAllRelationTypes() {
-		return new ArrayList<RelationType>();
-	}
-
-	@Override
-	public boolean load(File inp) throws Exception {
-		return false;
-	}
-
-	@Override
-	public boolean isLoaded() {
-		return false;
-	}
-
-	@Override
-	public void clear() {
-	}
-
-}

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/TransactionDetails.java

@@ -1,594 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.e4.application.parts;
-
-import java.util.Vector;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.core.services.events.IEventBroker;
-import org.eclipse.e4.ui.di.Focus;
-import org.eclipse.e4.ui.di.UIEventTopic;
-import org.eclipse.e4.ui.services.IServiceConstants;
-import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider;
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StyledString;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-
-import com.minres.scviewer.database.ITx;
-import com.minres.scviewer.database.ITxAttribute;
-import com.minres.scviewer.database.ITxRelation;
-import com.minres.scviewer.e4.application.provider.TxPropertiesLabelProvider;
-
-/**
- * The Class TransactionDetails shows the details of a selected transaction. 
- */
-public class TransactionDetails {
-
-	/** The Constant COLUMN_FIRST. */
-	// Column constants
-	public static final int COLUMN_FIRST = 0;
-
-	/** The Constant COLUMN_SECOND. */
-	public static final int COLUMN_SECOND = 1;
-
-	/** The Constant COLUMN_THIRD. */
-	public static final int COLUMN_THIRD = 2;
-
-	/** The event broker. */
-	@Inject IEventBroker eventBroker;
-
-	/** The selection service. */
-	@Inject	ESelectionService selectionService;
-
-	/** The name filter. */
-	private Text nameFilter;
-
-	/** The tree viewer. */
-	private TreeViewer treeViewer;
-
-	/** The col3. */
-	private TreeViewerColumn col1, col2, col3;
-
-	/** The attribute filter. */
-	TxAttributeFilter attributeFilter;
-	
-	/** The view sorter. */
-	TxAttributeViewerSorter viewSorter;
-
-	/** The waveform viewer part. */
-	private WaveformViewer waveformViewerPart;
-
-
-	/**
-	 * Creates the composite.
-	 *
-	 * @param parent the parent
-	 */
-	@PostConstruct
-	public void createComposite(final Composite parent) {
-		parent.setLayout(new GridLayout(1, false));
-
-		nameFilter = new Text(parent, SWT.BORDER);
-		nameFilter.setMessage("Enter text to filter");
-		nameFilter.addModifyListener(new ModifyListener() {
-			@Override
-			public void modifyText(ModifyEvent e) {
-				attributeFilter.setSearchText(((Text) e.widget).getText());
-				treeViewer.refresh();
-			}
-		});
-		nameFilter.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		attributeFilter = new TxAttributeFilter();
-		viewSorter = new TxAttributeViewerSorter();
-		
-		treeViewer = new TreeViewer(parent);
-		treeViewer.setContentProvider(new TransactionTreeContentProvider());
-		treeViewer.setLabelProvider(new TxPropertiesLabelProvider());
-		treeViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		treeViewer.addFilter(attributeFilter);
-		treeViewer.setSorter(viewSorter);
-		treeViewer.setAutoExpandLevel(2);
-
-		// Set up the table
-		Tree tree = treeViewer.getTree();
-		tree.setLayoutData(new GridData(GridData.FILL_BOTH));
-		// Add the name column
-		col1 = new TreeViewerColumn(treeViewer, SWT.NONE);
-		col1.getColumn().setText("Name");
-		col1.getColumn().setResizable(true);
-		col1.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(AttributeLabelProvider.NAME)));
-		col1.getColumn().addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				((TxAttributeViewerSorter) treeViewer.getSorter()).doSort(COLUMN_FIRST);
-				treeViewer.refresh();
-			}
-		});
-		// Add the type column
-		col2 = new TreeViewerColumn(treeViewer, SWT.NONE);
-		col2.getColumn().setText("Type");
-		col2.getColumn().setResizable(true);
-		col2.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(AttributeLabelProvider.TYPE)));
-		col2.getColumn().addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				((TxAttributeViewerSorter) treeViewer.getSorter()).doSort(COLUMN_SECOND);
-				treeViewer.refresh();
-			}
-		});
-		// Add the value column
-		col3 = new TreeViewerColumn(treeViewer, SWT.NONE);
-		col3.getColumn().setText("Value");
-		col3.getColumn().setResizable(true);
-		col3.setLabelProvider(new DelegatingStyledCellLabelProvider(new AttributeLabelProvider(AttributeLabelProvider.VALUE)));
-		col3.getColumn().addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				((TxAttributeViewerSorter) treeViewer.getSorter()).doSort(COLUMN_SECOND);
-				treeViewer.refresh();
-			}
-		});
-		// Pack the columns
-//		for (int i = 0, n = table.getColumnCount(); i < n; i++) {
-//			table.getColumn(i).pack();
-//		}
-
-		// Turn on the header and the lines
-		tree.setHeaderVisible(true);
-		tree.setLinesVisible(true);
-		
-		treeViewer.addDoubleClickListener(new IDoubleClickListener(){
-
-			@Override
-			public void doubleClick(DoubleClickEvent event) {
-				ISelection selection = treeViewer.getSelection();
-				if(selection instanceof IStructuredSelection){
-					IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-					Object selected = structuredSelection.getFirstElement();
-					if(selected instanceof Object[]){
-						Object[] selectedArray = (Object[]) selected;
-						if(selectedArray.length==3 && selectedArray[2] instanceof ITx){
-							waveformViewerPart.setSelection(new StructuredSelection(selectedArray[2]));
-							treeViewer.setInput(selectedArray[2]);
-						}
-					}
-				}
-			}
-			
-		});
-		parent.addControlListener(new ControlAdapter() {
-			public void controlResized(ControlEvent e) {
-				Tree table = treeViewer.getTree();
-				Rectangle area = parent.getClientArea();
-				Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-				int width = area.width - 2*table.getBorderWidth();
-				if (preferredSize.y > area.height + table.getHeaderHeight()) {
-					// Subtract the scrollbar width from the total column width
-					// if a vertical scrollbar will be required
-					Point vBarSize = table.getVerticalBar().getSize();
-					width -= vBarSize.x;
-				}
-				Point oldSize = table.getSize();
-				if (oldSize.x > area.width) {
-					// table is getting smaller so make the columns 
-					// smaller first and then resize the table to
-					// match the client area width
-					col1.getColumn().setWidth(width/3);
-					col2.getColumn().setWidth(width/4);
-					col3.getColumn().setWidth(width - col1.getColumn().getWidth());
-					table.setSize(area.width, area.height);
-				} else {
-					// table is getting bigger so make the table 
-					// bigger first and then make the columns wider
-					// to match the client area width
-					table.setSize(area.width, area.height);
-					col1.getColumn().setWidth(width/3);
-					col2.getColumn().setWidth(width/4);
-					col3.getColumn().setWidth(width - col1.getColumn().getWidth()- col2.getColumn().getWidth());
-				}
-			}
-		});
-	}
-
-	/**
-	 * Sets the focus.
-	 */
-	@Focus
-	public void setFocus() {
-		treeViewer.getTree().setFocus();
-	}
-
-	/**
-	 * Gets the status event.
-	 *
-	 * @param part the part
-	 * @return the status event
-	 */
-	@Inject @Optional
-	public void  getStatusEvent(@UIEventTopic(WaveformViewer.ACTIVE_WAVEFORMVIEW) WaveformViewer part) {
-		this.waveformViewerPart=part;
-	}
-
-	/**
-	 * Sets the selection.
-	 *
-	 * @param selection the new selection
-	 */
-	@Inject
-	public void setSelection(@Named(IServiceConstants.ACTIVE_SELECTION) @Optional IStructuredSelection selection){
-		if(treeViewer!=null && selection!=null && !treeViewer.getTree().isDisposed()){
-			if( selection instanceof IStructuredSelection) {
-				Object object= ((IStructuredSelection)selection).getFirstElement();			
-				if(object instanceof ITx){
-					treeViewer.setInput(object);
-				} else {
-					treeViewer.setInput(null);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Time to string.
-	 *
-	 * @param time the time
-	 * @return the string
-	 */
-	String timeToString(Long time){
-		return waveformViewerPart.getScaledTime(time);
-	}
-
-	/**
-	 * Tx to string.
-	 *
-	 * @param tx the tx
-	 * @return the string
-	 */
-	String txToString(ITx tx){
-		StringBuilder sb = new StringBuilder();
-		sb.append("tx#").append(tx.getId()).append("[").append(timeToString(tx.getBeginTime())).
-			append(" - ").append(timeToString(tx.getEndTime())).append("]");
-		return sb.toString();
-	}
-	
-	/**
-	 * The Class TxAttributeViewerSorter.
-	 */
-	class TxAttributeViewerSorter extends ViewerSorter {
-		
-		/** The Constant ASCENDING. */
-		private static final int ASCENDING = 0;
-
-		/** The Constant DESCENDING. */
-		private static final int DESCENDING = 1;
-
-		/** The column. */
-		private int column;
-
-		/** The direction. */
-		private int direction;
-
-		/**
-		 * Does the sort. If it's a different column from the previous sort, do an
-		 * ascending sort. If it's the same column as the last sort, toggle the sort
-		 * direction.
-		 *
-		 * @param column the column
-		 */
-		public void doSort(int column) {
-			if (column == this.column) {
-				// Same column as last sort; toggle the direction
-				direction = 1 - direction;
-			} else {
-				// New column; do an ascending sort
-				this.column = column;
-				direction = ASCENDING;
-			}
-		}
-
-		/**
-		 * Compares the object for sorting.
-		 *
-		 * @param viewer the viewer
-		 * @param e1 the e1
-		 * @param e2 the e2
-		 * @return the int
-		 */
-		@SuppressWarnings("unchecked")
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			int rc = 0;
-			if(e1 instanceof ITxAttribute && e2 instanceof ITxAttribute){
-				ITxAttribute p1 = (ITxAttribute) e1;
-				ITxAttribute p2 = (ITxAttribute) e2;
-				// Determine which column and do the appropriate sort
-				switch (column) {
-				case COLUMN_FIRST:
-					rc = getComparator().compare(p1.getName(), p2.getName());
-					break;
-				case COLUMN_SECOND:
-					rc = getComparator().compare(p1.getDataType().name(), p2.getDataType().name());
-					break;
-				case COLUMN_THIRD:
-					rc = getComparator().compare(p1.getValue(), p2.getValue());
-					break;
-				}
-				// If descending order, flip the direction
-				if (direction == DESCENDING) rc = -rc;
-			}
-			return rc;
-		}
-	}
-
-	/**
-	 * The Class TxAttributeFilter.
-	 */
-	class TxAttributeFilter extends ViewerFilter {
-
-		/** The search string. */
-		private String searchString;
-
-		/**
-		 * Sets the search text.
-		 *
-		 * @param s the new search text
-		 */
-		public void setSearchText(String s) {
-			this.searchString = ".*" + s + ".*";
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		@Override
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if (searchString == null || searchString.length() == 0) {
-				return true;
-			}
-			if(element instanceof ITxAttribute){
-				ITxAttribute p = (ITxAttribute) element;
-				if (p.getName().matches(searchString)) {
-					return true;
-				}
-			} else if(element instanceof TreeNode)
-				return true;
-			return false;
-		}
-	}
-
-	/**
-	 * The Enum Type.
-	 */
-	enum Type {/** The props. */
-PROPS, /** The attrs. */
- ATTRS, /** The in rel. */
- IN_REL, /** The out rel. */
- OUT_REL}
-
-	/**
-	 * The Class TreeNode.
-	 */
-	class TreeNode{
-		
-		/** The type. */
-		public Type type;
-		
-		/** The element. */
-		public ITx element;
-
-		/**
-		 * Instantiates a new tree node.
-		 *
-		 * @param element the element
-		 * @param type the type
-		 */
-		public TreeNode(ITx element, Type type){
-			this.element=element;
-			this.type=type;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
-		public String toString(){
-			switch(type){
-			case PROPS:      return "Properties";
-			case ATTRS:	     return "Attributes";
-			case IN_REL:     return "Incoming relations";
-			case OUT_REL:    return "Outgoing relations";
-			}
-			return "";
-		}
-	}
-
-	/**
-	 * The Class TransactionTreeContentProvider.
-	 */
-	class TransactionTreeContentProvider implements ITreeContentProvider {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
-		@Override
-		public void dispose() {	}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		@Override
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getElements(java.lang.Object)
-		 */
-		@Override
-		public Object[] getElements(Object element) {
-			return new Object[]{
-					new TreeNode((ITx)element, Type.PROPS),  
-					new TreeNode((ITx)element, Type.ATTRS),  
-					new TreeNode((ITx)element, Type.IN_REL),
-					new TreeNode((ITx)element, Type.OUT_REL)
-			};
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-		 */
-		@Override
-		public Object[] getChildren(Object element) {
-			if(element instanceof TreeNode){
-				TreeNode propertyHolder=(TreeNode) element;
-				if(propertyHolder.type == Type.PROPS){
-					return new Object[][]{
-						{"Name", "String", propertyHolder.element.getStream().getFullName()},
-						{"Type", "String", propertyHolder.element.getGenerator().getName()},
-						{"Start time", "Time", timeToString(propertyHolder.element.getBeginTime())},
-						{"End time", "Time", timeToString(propertyHolder.element.getEndTime())}
-					};
-				}else if(propertyHolder.type == Type.ATTRS)
-					return propertyHolder.element.getAttributes().toArray();
-				else if(propertyHolder.type == Type.IN_REL){
-					Vector<Object[] > res = new Vector<>();
-					for(ITxRelation rel:propertyHolder.element.getIncomingRelations()){
-						res.add(new Object[]{
-								rel.getRelationType(), 
-								rel.getSource().getGenerator().getName(), 
-								rel.getSource()});
-					}
-					return res.toArray();
-				} else if(propertyHolder.type == Type.OUT_REL){
-					Vector<Object[] > res = new Vector<>();
-					for(ITxRelation rel:propertyHolder.element.getOutgoingRelations()){
-						res.add(new Object[]{
-								rel.getRelationType(), 
-								rel.getTarget().getGenerator().getName(), 
-								rel.getTarget()});
-					}
-					return res.toArray();
-				}
-			}
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-		 */
-		@Override
-		public Object getParent(Object element) {
-			return null;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-		 */
-		@Override
-		public boolean hasChildren(Object element) {
-			return getChildren(element)!=null;
-		}
-
-	}
-
-	/**
-	 * The Class AttributeLabelProvider.
-	 */
-	class AttributeLabelProvider extends LabelProvider implements IStyledLabelProvider {
-		
-		/** The field. */
-		final int field;
-		
-		/** The Constant NAME. */
-		public static final int NAME=0;
-		
-		/** The Constant TYPE. */
-		public static final int TYPE=1;
-		
-		/** The Constant VALUE. */
-		public static final int VALUE=2;
-
-		/**
-		 * Instantiates a new attribute label provider.
-		 *
-		 * @param field the field
-		 */
-		public  AttributeLabelProvider(int field) {
-			this.field=field;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider#getStyledText(java.lang.Object)
-		 */
-		@Override
-		public StyledString getStyledText(Object element) {
-			switch(field){
-			case NAME:
-				if (element instanceof ITxAttribute) {
-					ITxAttribute attribute = (ITxAttribute) element;
-					return new StyledString(attribute.getName());
-				}else if (element instanceof ITxRelation) {
-					return new StyledString("Relation");
-				}else if(element instanceof Object[]){
-					Object[] elements = (Object[]) element;
-					return new StyledString(elements[field].toString());
-				} else 
-					return new StyledString(element.toString());
-			case TYPE:
-				if (element instanceof ITxAttribute) {
-					ITxAttribute attribute = (ITxAttribute) element;
-					return new StyledString(attribute.getDataType().toString());
-				}else if(element instanceof Object[]){
-					Object[] elements = (Object[]) element;
-					return new StyledString(elements[field].toString());
-				}else 
-					return new StyledString("");					
-			default:
-				if (element instanceof ITxAttribute) {
-					ITxAttribute attribute = (ITxAttribute) element;
-					return new StyledString(attribute.getValue().toString());
-				}else if(element instanceof Object[]){
-					Object[] elements = (Object[]) element;
-					return new StyledString(elements[field].toString());
-				} else if(element instanceof ITx){
-					return new StyledString(txToString((ITx) element));
-				}else 
-					return new StyledString("");					
-			}
-		}
-	}
-}
-

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java

@@ -1,883 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.e4.application.parts;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
-import org.eclipse.e4.core.di.annotations.Optional;
-import org.eclipse.e4.core.di.extensions.Preference;
-import org.eclipse.e4.core.services.events.IEventBroker;
-import org.eclipse.e4.ui.di.Focus;
-import org.eclipse.e4.ui.di.PersistState;
-import org.eclipse.e4.ui.di.UIEventTopic;
-import org.eclipse.e4.ui.model.application.ui.basic.MPart;
-import org.eclipse.e4.ui.services.EMenuService;
-import org.eclipse.e4.ui.workbench.modeling.EPartService;
-import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.StringConverter;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-
-import com.minres.scviewer.database.ITx;
-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.IWaveformEvent;
-import com.minres.scviewer.database.RelationType;
-import com.minres.scviewer.database.swt.WaveformViewerFactory;
-import com.minres.scviewer.database.ui.GotoDirection;
-import com.minres.scviewer.database.ui.ICursor;
-import com.minres.scviewer.database.ui.IWaveformViewer;
-import com.minres.scviewer.database.ui.TrackEntry;
-import com.minres.scviewer.database.ui.WaveformColors;
-import com.minres.scviewer.e4.application.internal.status.WaveStatusBarControl;
-import com.minres.scviewer.e4.application.internal.util.FileMonitor;
-import com.minres.scviewer.e4.application.internal.util.IFileChangeListener;
-import com.minres.scviewer.e4.application.internal.util.IModificationChecker;
-import com.minres.scviewer.e4.application.preferences.DefaultValuesInitializer;
-import com.minres.scviewer.e4.application.preferences.PreferenceConstants;
-
-/**
- * The Class WaveformViewerPart.
- */
-@SuppressWarnings("restriction")
-public class WaveformViewer implements IFileChangeListener, IPreferenceChangeListener {
-
-	/** The Constant ACTIVE_WAVEFORMVIEW. */
-	public static final String ACTIVE_WAVEFORMVIEW = "Active_Waveform_View";
-
-	/** The Constant ADD_WAVEFORM. */
-	public static final String ADD_WAVEFORM = "AddWaveform";
-
-	/** The Constant DATABASE_FILE. */
-	protected static final String DATABASE_FILE = "DATABASE_FILE";
-	
-	/** The Constant SHOWN_WAVEFORM. */
-	protected static final String SHOWN_WAVEFORM = "SHOWN_WAVEFORM";
-	
-	/** The Constant SHOWN_CURSOR. */
-	protected static final String SHOWN_CURSOR = "SHOWN_CURSOR";
-	
-	/** The Constant ZOOM_LEVEL. */
-	protected static final String ZOOM_LEVEL = "ZOOM_LEVEL";
-
-	/** The Constant BASE_LINE_TIME. */
-	protected static final String BASE_LINE_TIME = "BASE_LINE_TIME";
-
-	/** The Constant FILE_CHECK_INTERVAL. */
-	protected static final long FILE_CHECK_INTERVAL = 60000;
-	
-	/** The zoom level. */
-	private String[] zoomLevel;
-
-	/** The Constant ID. */
-	public static final String ID = "com.minres.scviewer.ui.TxEditorPart"; //$NON-NLS-1$
-
-	/** The Constant WAVE_ACTION_ID. */
-	public static final String WAVE_ACTION_ID = "com.minres.scviewer.ui.action.AddToWave";
-
-	/** The factory. */
-	WaveformViewerFactory factory = new WaveformViewerFactory();
-
-	/** The waveform pane. */
-	private IWaveformViewer waveformPane;
-
-	/** The event broker. */
-	@Inject
-	private IEventBroker eventBroker;
-
-	/** The menu service. */
-	@Inject
-	EMenuService menuService;
-
-	/** The selection service. */
-	@Inject
-	ESelectionService selectionService;
-
-	/** The e part service. */
-	@Inject
-	EPartService ePartService;
-
-	/** The prefs. */
-	@Inject
-	@Preference(nodePath = PreferenceConstants.PREFERENCES_SCOPE)
-	IEclipsePreferences prefs;
-
-	/** The database. */
-	private IWaveformDb database;
-
-	/** The check for updates. */
-	private boolean checkForUpdates;
-
-	/** The my part. */
-	private MPart myPart;
-
-	/** The my parent. */
-	private Composite myParent;
-
-	/** The files to load. */
-	ArrayList<File> filesToLoad;
-
-	/** The persisted state. */
-	Map<String, String> persistedState;
-
-	/** The browser state. */
-	private Object browserState;
-
-	/** The details settings. */
-	private Object detailsSettings;
-
-	/** The navigation relation type. */
-	private RelationType navigationRelationType=IWaveformViewer.NEXT_PREV_IN_STREAM ;
-
-	/** The file monitor. */
-	FileMonitor fileMonitor = new FileMonitor();
-
-	/** The file checker. */
-	IModificationChecker fileChecker;
-
-	/**
-	 * Creates the composite.
-	 *
-	 * @param part the part
-	 * @param parent the parent
-	 * @param dbFactory the db factory
-	 */
-	@PostConstruct
-	public void createComposite(MPart part, Composite parent, IWaveformDbFactory dbFactory) {
-		myPart = part;
-		myParent = parent;
-		database = dbFactory.getDatabase();
-		database.addPropertyChangeListener(new PropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent evt) {
-				if ("WAVEFORMS".equals(evt.getPropertyName())) {
-					myParent.getDisplay().syncExec(new Runnable() {
-						@Override
-						public void run() {
-							waveformPane.setMaxTime(database.getMaxTime());
-						}
-					});
-				}
-			}
-		});
-		waveformPane = factory.createPanel(parent);
-		waveformPane.setMaxTime(0);
-		waveformPane.addPropertyChangeListener(IWaveformViewer.CURSOR_PROPERTY, new PropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent evt) {
-				Long time = (Long) evt.getNewValue();
-				eventBroker.post(WaveStatusBarControl.CURSOR_TIME, waveformPane.getScaledTime(time));
-				long marker = waveformPane.getMarkerTime(waveformPane.getSelectedMarkerId());
-				eventBroker.post(WaveStatusBarControl.MARKER_DIFF, waveformPane.getScaledTime(time - marker));
-
-			}
-		});
-		waveformPane.addPropertyChangeListener(IWaveformViewer.MARKER_PROPERTY, new PropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent evt) {
-				Long time = (Long) evt.getNewValue();
-				eventBroker.post(WaveStatusBarControl.MARKER_TIME, waveformPane.getScaledTime(time));
-				long cursor = waveformPane.getCursorTime();
-				eventBroker.post(WaveStatusBarControl.MARKER_DIFF, waveformPane.getScaledTime(cursor - time));
-			}
-		});
-		waveformPane.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (event.getSelection() instanceof IStructuredSelection)
-					selectionService.setSelection(event.getSelection());
-			}
-		});
-		zoomLevel = waveformPane.getZoomLevels();
-		setupColors();
-		checkForUpdates = prefs.getBoolean(PreferenceConstants.DATABASE_RELOAD, true);
-		filesToLoad = new ArrayList<File>();
-		persistedState = part.getPersistedState();
-		Integer files = persistedState.containsKey(DATABASE_FILE + "S")
-				? Integer.parseInt(persistedState.get(DATABASE_FILE + "S")) : 0;
-		for (int i = 0; i < files; i++) {
-			filesToLoad.add(new File(persistedState.get(DATABASE_FILE + i)));
-		}
-		if (filesToLoad.size() > 0)
-			loadDatabase(persistedState);
-		eventBroker.post(WaveStatusBarControl.ZOOM_LEVEL, zoomLevel[waveformPane.getZoomLevel()]);
-		menuService.registerContextMenu(waveformPane.getNameControl(),
-				"com.minres.scviewer.e4.application.popupmenu.namecontext");
-		menuService.registerContextMenu(waveformPane.getValueControl(),
-				"com.minres.scviewer.e4.application.popupmenu.namecontext");
-		menuService.registerContextMenu(waveformPane.getWaveformControl(),
-				"com.minres.scviewer.e4.application.popupmenu.wavecontext");
-		ePartService.addPartListener(new PartListener() {
-			@Override
-			public void partActivated(MPart part) {
-				if (part == myPart) {
-					if (fileChecker != null)
-						fileChecker.check();
-					updateAll();
-				}
-			}
-		});
-		prefs.addPreferenceChangeListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
-	 */
-	@Override
-	public void preferenceChange(PreferenceChangeEvent event) {
-		if (PreferenceConstants.DATABASE_RELOAD.equals(event.getKey())) {
-			checkForUpdates = (Boolean) event.getNewValue();
-			fileChecker = null;
-			if (checkForUpdates)
-				fileChecker = fileMonitor.addFileChangeListener(WaveformViewer.this, filesToLoad,
-						FILE_CHECK_INTERVAL);
-			else
-				fileMonitor.removeFileChangeListener(this);
-		} else {
-			setupColors();
-		}
-	}
-
-	/**
-	 * Setup colors.
-	 */
-	protected void setupColors() {
-		DefaultValuesInitializer initializer = new DefaultValuesInitializer();
-		HashMap<WaveformColors, RGB> colorPref = new HashMap<>();
-		for (WaveformColors c : WaveformColors.values()) {
-			String prefValue = prefs.get(c.name() + "_COLOR",
-					StringConverter.asString(initializer.colors[c.ordinal()].getRGB()));
-			RGB rgb = StringConverter.asRGB(prefValue);
-			colorPref.put(c, rgb);
-		}
-		waveformPane.setColors(colorPref);
-	}
-
-	/**
-	 * Load database.
-	 *
-	 * @param state the state
-	 */
-	protected void loadDatabase(final Map<String, String> state) {
-		fileMonitor.removeFileChangeListener(this);
-		Job job = new Job("Database Load Job") {
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				// convert to SubMonitor and set total number of work units
-				SubMonitor subMonitor = SubMonitor.convert(monitor, filesToLoad.size()+1);
-				try {
-					subMonitor.worked(1);
-					for (File file : filesToLoad) {
-						subMonitor.setTaskName("Loading "+file.getName());
-						database.load(file);
-						database.addPropertyChangeListener(waveformPane);
-						subMonitor.worked(1);
-						if (monitor.isCanceled())
-							return Status.CANCEL_STATUS;
-					}
-				} catch (Exception e) {
-					database = null;
-					e.printStackTrace();
-					return Status.CANCEL_STATUS;
-				}
-				subMonitor.done();
-				monitor.done();
-				return Status.OK_STATUS;
-			}
-		};
-		job.addJobChangeListener(new JobChangeAdapter() {
-			@Override
-			public void done(IJobChangeEvent event) {
-				if (event.getResult() == Status.OK_STATUS)
-					myParent.getDisplay().asyncExec(new Runnable() {
-						@Override
-						public void run() {
-							waveformPane.setMaxTime(database.getMaxTime());
-							if (state != null)
-								restoreWaveformViewerState(state);
-							fileChecker = null;
-							if (checkForUpdates)
-								fileChecker = fileMonitor.addFileChangeListener(WaveformViewer.this, filesToLoad,
-										FILE_CHECK_INTERVAL);
-						}
-					});
-			}
-		});
-		job.schedule(0);
-	}
-
-	/* (non-Javadoc)
-	 * @see com.minres.scviewer.e4.application.internal.util.IFileChangeListener#fileChanged(java.util.List)
-	 */
-	@Override
-	public void fileChanged(List<File> file) {
-		final Display display = myParent.getDisplay();
-		display.asyncExec(new Runnable() {
-			@Override
-			public void run() {
-				if (MessageDialog.openQuestion(display.getActiveShell(), "Database re-load",
-						"Would you like to reload the database?")) {
-					Map<String, String> state = new HashMap<>();
-					saveWaveformViewerState(state);
-					waveformPane.getStreamList().clear();
-					database.clear();
-					if (filesToLoad.size() > 0)
-						loadDatabase(state);
-				}
-			}
-		});
-		fileMonitor.removeFileChangeListener(this);
-	}
-
-	/**
-	 * Sets the part input.
-	 *
-	 * @param partInput the new part input
-	 */
-	@Inject
-	@Optional
-	public void setPartInput(@Named("input") Object partInput) {
-		if (partInput instanceof File) {
-			filesToLoad = new ArrayList<File>();
-			File file = (File) partInput;
-			if (file.exists()) {
-				filesToLoad.add(file);
-				try {
-					String ext = getFileExtension(file.getName());
-					if ("vcd".equals(ext.toLowerCase())) {
-						if (askIfToLoad(new File(renameFileExtension(file.getCanonicalPath(), "txdb")))) {
-							filesToLoad.add(new File(renameFileExtension(file.getCanonicalPath(), "txdb")));
-						} else if (askIfToLoad(new File(renameFileExtension(file.getCanonicalPath(), "txlog")))) {
-							filesToLoad.add(new File(renameFileExtension(file.getCanonicalPath(), "txlog")));
-						}
-					} else if ("txdb".equals(ext.toLowerCase()) || "txlog".equals(ext.toLowerCase())) {
-						if (askIfToLoad(new File(renameFileExtension(file.getCanonicalPath(), "vcd")))) {
-							filesToLoad.add(new File(renameFileExtension(file.getCanonicalPath(), "vcd")));
-						}
-					}
-				} catch (IOException e) { // silently ignore any error
-				}
-			}
-			if (filesToLoad.size() > 0)
-				loadDatabase(persistedState);
-		}
-	}
-
-	/**
-	 * Sets the focus.
-	 */
-	@Focus
-	public void setFocus() {
-		myParent.setFocus();
-	}
-
-	/**
-	 * Save state.
-	 *
-	 * @param part the part
-	 */
-	@PersistState
-	public void saveState(MPart part) {
-		// save changes
-		Map<String, String> persistedState = part.getPersistedState();
-		persistedState.put(DATABASE_FILE + "S", Integer.toString(filesToLoad.size()));
-		Integer index = 0;
-		for (File file : filesToLoad) {
-			persistedState.put(DATABASE_FILE + index, file.getAbsolutePath());
-			index++;
-		}
-		saveWaveformViewerState(persistedState);
-	}
-
-	public void saveState(String fileName){
-		Map<String, String> persistedState = new HashMap<>();
-		persistedState.put(DATABASE_FILE + "S", Integer.toString(filesToLoad.size()));
-		Integer index = 0;
-		for (File file : filesToLoad) {
-			persistedState.put(DATABASE_FILE + index, file.getAbsolutePath());
-			index++;
-		}
-		saveWaveformViewerState(persistedState);
-		Properties props = new Properties();
-		props.putAll(persistedState);
-		try {
-			FileOutputStream out = new FileOutputStream(fileName);
-			props.store(out, "Written by SCViewer");
-			out.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void loadState(String fileName){
-		Properties props = new Properties();
-		try {
-			FileInputStream in = new FileInputStream(fileName);
-			props.load(in);
-			in.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		@SuppressWarnings({ "unchecked", "rawtypes" })
-		HashMap<String, String> propMap = new HashMap<String, String>((Map) props);
-		restoreWaveformViewerState(propMap);
-	}
-	
-	/**
-	 * Save waveform viewer state.
-	 *
-	 * @param persistedState the persisted state
-	 */
-	protected void saveWaveformViewerState(Map<String, String> persistedState) {
-		Integer index;
-		persistedState.put(SHOWN_WAVEFORM + "S", Integer.toString(waveformPane.getStreamList().size()));
-		index = 0;
-		for (TrackEntry trackEntry : waveformPane.getStreamList()) {
-			persistedState.put(SHOWN_WAVEFORM + index, trackEntry.waveform.getFullName());
-			index++;
-		}
-		List<ICursor> cursors = waveformPane.getCursorList();
-		persistedState.put(SHOWN_CURSOR + "S", Integer.toString(cursors.size()));
-		index = 0;
-		for (ICursor cursor : cursors) {
-			persistedState.put(SHOWN_CURSOR + index, Long.toString(cursor.getTime()));
-			index++;
-		}
-		persistedState.put(ZOOM_LEVEL, Integer.toString(waveformPane.getZoomLevel()));
-		persistedState.put(BASE_LINE_TIME, Long.toString(waveformPane.getBaselineTime()));
-	}
-
-	/**
-	 * Restore waveform viewer state.
-	 *
-	 * @param state the state
-	 */
-	protected void restoreWaveformViewerState(Map<String, String> state) {
-		Integer waves = state.containsKey(SHOWN_WAVEFORM+"S") ? Integer.parseInt(state.get(SHOWN_WAVEFORM + "S")):0;
-		List<TrackEntry> res = new LinkedList<>();
-		for (int i = 0; i < waves; i++) {
-			IWaveform<? extends IWaveformEvent> waveform = database.getStreamByName(state.get(SHOWN_WAVEFORM + i));
-			if (waveform != null)
-				res.add(new TrackEntry(waveform));
-		}
-		if (res.size() > 0)
-			waveformPane.getStreamList().addAll(res);
-		Integer cursorLength = state.containsKey(SHOWN_CURSOR+"S")?Integer.parseInt(state.get(SHOWN_CURSOR + "S")):0;
-		List<ICursor> cursors = waveformPane.getCursorList();
-		if (cursorLength == cursors.size()) {
-			for (int i = 0; i < cursorLength; i++) {
-				Long time = Long.parseLong(state.get(SHOWN_CURSOR + i));
-				cursors.get(i).setTime(time);
-			}
-		}
-		if (state.containsKey(ZOOM_LEVEL)) {
-			try {
-				Integer scale = Integer.parseInt(state.get(ZOOM_LEVEL));
-				waveformPane.setZoomLevel(scale);
-			} catch (NumberFormatException e) {
-			}
-		}
-		if (state.containsKey(BASE_LINE_TIME)) {
-			try {
-				Long scale = Long.parseLong(state.get(BASE_LINE_TIME));
-				waveformPane.setBaselineTime(scale);
-			} catch (NumberFormatException e) {
-			}
-		}
-		updateAll();
-	}
-
-	/**
-	 * Update all status elements by posting respective events.
-	 */
-	private void updateAll() {
-		eventBroker.post(ACTIVE_WAVEFORMVIEW, this);
-		eventBroker.post(WaveStatusBarControl.ZOOM_LEVEL, zoomLevel[waveformPane.getZoomLevel()]);
-		long cursor = waveformPane.getCursorTime();
-		long marker = waveformPane.getMarkerTime(waveformPane.getSelectedMarkerId());
-		eventBroker.post(WaveStatusBarControl.CURSOR_TIME, waveformPane.getScaledTime(cursor));
-		eventBroker.post(WaveStatusBarControl.MARKER_TIME, waveformPane.getScaledTime(marker));
-		eventBroker.post(WaveStatusBarControl.MARKER_DIFF, waveformPane.getScaledTime(cursor - marker));
-	}
-
-	/**
-	 * Gets the adds the waveform event.
-	 *
-	 * @param o the o
-	 * @return the adds the waveform event
-	 */
-	@Inject
-	@Optional
-	public void getAddWaveformEvent(@UIEventTopic(WaveformViewer.ADD_WAVEFORM) Object o) {
-		Object sel = o == null ? selectionService.getSelection() : o;
-		if (sel instanceof IStructuredSelection)
-			for (Object el : ((IStructuredSelection) sel).toArray()) {
-				if (el instanceof IWaveform<?>)
-					addStreamToList((IWaveform<?>) el, false);
-			}
-	}
-
-	/**
-	 * Ask if to load.
-	 *
-	 * @param txFile the tx file
-	 * @return true, if successful
-	 */
-	protected boolean askIfToLoad(File txFile) {
-		if (txFile.exists() && MessageDialog.openQuestion(myParent.getDisplay().getActiveShell(), "Database open",
-				"Would you like to open the adjacent database " + txFile.getName() + " as well?")) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Rename file extension.
-	 *
-	 * @param source the source
-	 * @param newExt the new ext
-	 * @return the string
-	 */
-	protected static String renameFileExtension(String source, String newExt) {
-		String target;
-		String currentExt = getFileExtension(source);
-		if (currentExt.equals("")) {
-			target = source + "." + newExt;
-		} else {
-			target = source.replaceFirst(Pattern.quote("." + currentExt) + "$", Matcher.quoteReplacement("." + newExt));
-		}
-		return target;
-	}
-
-	/**
-	 * Gets the file extension.
-	 *
-	 * @param f the f
-	 * @return the file extension
-	 */
-	protected static String getFileExtension(String f) {
-		String ext = "";
-		int i = f.lastIndexOf('.');
-		if (i > 0 && i < f.length() - 1) {
-			ext = f.substring(i + 1);
-		}
-		return ext;
-	}
-
-	/**
-	 * Gets the model.
-	 *
-	 * @return the model
-	 */
-	public IWaveformDb getModel() {
-		return database;
-	}
-
-	/**
-	 * Gets the database.
-	 *
-	 * @return the database
-	 */
-	public IWaveformDb getDatabase() {
-		return database;
-	}
-
-	/**
-	 * Adds the stream to list.
-	 *
-	 * @param obj the obj
-	 * @param insert the insert
-	 */
-	public void addStreamToList(IWaveform<? extends IWaveformEvent> obj, boolean insert) {
-		addStreamsToList(new IWaveform<?>[] { obj }, insert);
-	}
-
-	/**
-	 * Adds the streams to list.
-	 *
-	 * @param iWaveforms the i waveforms
-	 * @param insert the insert
-	 */
-	public void addStreamsToList(IWaveform<? extends IWaveformEvent>[] iWaveforms, boolean insert) {
-		List<TrackEntry> streams = new LinkedList<>();
-		for (IWaveform<? extends IWaveformEvent> stream : iWaveforms)
-			streams.add(new TrackEntry(stream));
-		IStructuredSelection selection = (IStructuredSelection) waveformPane.getSelection();
-		if (selection.size() == 0) {
-			waveformPane.getStreamList().addAll(streams);
-		} else {
-			Object first = selection.getFirstElement();
-			IWaveform<?> stream = (first instanceof ITx) ? ((ITx) first).getStream() : (IWaveform<?>) first;
-			TrackEntry trackEntry = waveformPane.getEntryForStream(stream);
-			int index = waveformPane.getStreamList().indexOf(trackEntry);
-			if (!insert)
-				index++;
-			waveformPane.getStreamList().addAll(index, streams);
-		}
-	}
-
-	/**
-	 * Removes the stream from list.
-	 *
-	 * @param stream the stream
-	 */
-	public void removeStreamFromList(IWaveform<? extends IWaveformEvent> stream) {
-		TrackEntry trackEntry = waveformPane.getEntryForStream(stream);
-		waveformPane.getStreamList().remove(trackEntry);
-	}
-
-	/**
-	 * Removes the streams from list.
-	 *
-	 * @param iWaveforms the i waveforms
-	 */
-	public void removeStreamsFromList(IWaveform<? extends IWaveformEvent>[] iWaveforms) {
-		for (IWaveform<? extends IWaveformEvent> stream : iWaveforms)
-			removeStreamFromList(stream);
-	}
-
-	/**
-	 * Move selected.
-	 *
-	 * @param i the i
-	 */
-	public void moveSelected(int i) {
-		waveformPane.moveSelectedTrack(i);
-	}
-
-	
-	/**
-	 * Move selection.
-	 *
-	 * @param direction the direction
-	 */
-	public void moveSelection(GotoDirection direction ) {
-		moveSelection(direction, navigationRelationType); 
-	}
-
-	/**
-	 * Move selection.
-	 *
-	 * @param direction the direction
-	 * @param relationType the relation type
-	 */
-	public void moveSelection(GotoDirection direction, RelationType relationType) {
-		waveformPane.moveSelection(direction, relationType);
-	}
-
-	/**
-	 * Move cursor.
-	 *
-	 * @param direction the direction
-	 */
-	public void moveCursor(GotoDirection direction) {
-		waveformPane.moveCursor(direction);
-	}
-
-	/**
-	 * Sets the zoom level.
-	 *
-	 * @param level the new zoom level
-	 */
-	public void setZoomLevel(Integer level) {
-		if (level < 0)
-			level = 0;
-		if (level > zoomLevel.length - 1)
-			level = zoomLevel.length - 1;
-		waveformPane.setZoomLevel(level);
-		updateAll();
-	}
-
-	/**
-	 * Sets the zoom fit.
-	 */
-	public void setZoomFit() {
-		waveformPane.setZoomLevel(6);
-		updateAll();
-	}
-
-	/**
-	 * Gets the zoom level.
-	 *
-	 * @return the zoom level
-	 */
-	public int getZoomLevel() {
-		return waveformPane.getZoomLevel();
-	}
-
-	/**
-	 * Gets the selection.
-	 *
-	 * @return the selection
-	 */
-	public ISelection getSelection() {
-		return waveformPane.getSelection();
-	}
-
-	/**
-	 * Sets the selection.
-	 *
-	 * @param structuredSelection the new selection
-	 */
-	public void setSelection(IStructuredSelection structuredSelection) {
-		waveformPane.setSelection(structuredSelection, true);
-	}
-
-	/**
-	 * Gets the scaled time.
-	 *
-	 * @param time the time
-	 * @return the scaled time
-	 */
-	public String getScaledTime(Long time) {
-		return waveformPane.getScaledTime(time);
-	}
-
-	/**
-	 * Store design brower state.
-	 *
-	 * @param browserState the browser state
-	 */
-	public void storeDesignBrowerState(Object browserState) {
-		this.browserState=browserState;
-	}
-
-	/**
-	 * Retrieve design brower state.
-	 *
-	 * @return the object
-	 */
-	public Object retrieveDesignBrowerState() {
-		return browserState;
-	}
-
-	/**
-	 * Store transaction details settings
-	 *
-	 * @param detailsSettings the details settings
-	 */
-	public void storeDetailsSettings(Object detailsSettings) {
-		this.detailsSettings=detailsSettings;
-	}
-
-	/**
-	 * Retrieve design details settings.
-	 *
-	 * @return the details settings
-	 */
-	public Object retrieveDetailsSettings() {
-		return detailsSettings;
-	}
-
-	/**
-	 * Gets the all relation types.
-	 *
-	 * @return the all relation types
-	 */
-	public List<RelationType> getAllRelationTypes() {
-		List<RelationType> res =new ArrayList<>();
-		res.add(IWaveformViewer.NEXT_PREV_IN_STREAM);
-		res.addAll(database.getAllRelationTypes());
-		return res;
-	}
-
-	/**
-	 * Gets the selection relation types.
-	 *
-	 * @return the selection relation types
-	 */
-	public List<RelationType> getSelectionRelationTypes() {
-		List<RelationType> res =new ArrayList<>();
-		res.add(IWaveformViewer.NEXT_PREV_IN_STREAM);
-		ISelection selection = waveformPane.getSelection();
-		if(selection instanceof IStructuredSelection && !selection.isEmpty()){
-			IStructuredSelection sel=(IStructuredSelection) selection;
-			if(sel.getFirstElement() instanceof ITx){
-				ITx tx = (ITx) sel.getFirstElement();
-				for(ITxRelation rel:tx.getIncomingRelations()){
-					if(!res.contains(rel.getRelationType()))
-						res.add(rel.getRelationType());
-				}
-				for(ITxRelation rel:tx.getOutgoingRelations()){
-					if(!res.contains(rel.getRelationType()))
-						res.add(rel.getRelationType());
-				}
-			}
-		}
-		return res;
-	}
-
-	/**
-	 * Gets the relation type filter.
-	 *
-	 * @return the relation type filter
-	 */
-	public RelationType getRelationTypeFilter() {
-		return navigationRelationType;
-	}
-
-	/**
-	 * Sets the navigation relation type.
-	 *
-	 * @param relationName the new navigation relation type
-	 */
-	public void setNavigationRelationType(String relationName) {
-		setNavigationRelationType(RelationType.create(relationName));
-	}
-
-	/**
-	 * Sets the navigation relation type.
-	 *
-	 * @param relationType the new navigation relation type
-	 */
-	public void setNavigationRelationType(RelationType relationType) {
-		if(navigationRelationType!=relationType) waveformPane.setHighliteRelation(relationType);
-		navigationRelationType=relationType;
-	}
-
-}

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/DefaultValuesInitializer.java

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.e4.application.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.StringConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.wb.swt.SWTResourceManager;
-
-import com.minres.scviewer.database.ui.WaveformColors;
-import com.opcoach.e4.preferences.ScopedPreferenceStore;
-
-/**
- * The Class DefaultValuesInitializer.
- */
-public class DefaultValuesInitializer extends AbstractPreferenceInitializer {
-
-    /** The default colors. */
-    public final Color[] colors = new Color[WaveformColors.values().length];
-
-	/**
-	 * Instantiates a new default values initializer.
-	 */
-	public DefaultValuesInitializer() {
-        colors[WaveformColors.LINE.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_RED);
-        colors[WaveformColors.LINE_HIGHLITE.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_CYAN);
-        colors[WaveformColors.TRACK_BG_EVEN.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_BLACK);
-        colors[WaveformColors.TRACK_BG_ODD.ordinal()] = SWTResourceManager.getColor(40, 40, 40);
-        colors[WaveformColors.TRACK_BG_HIGHLITE.ordinal()] = SWTResourceManager.getColor(40, 40, 80);
-        colors[WaveformColors.TX_BG.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_GREEN);
-        colors[WaveformColors.TX_BG_HIGHLITE.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GREEN);
-        colors[WaveformColors.TX_BORDER.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_RED);
-        colors[WaveformColors.SIGNAL0.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GREEN);
-        colors[WaveformColors.SIGNAL1.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GREEN);
-        colors[WaveformColors.SIGNALZ.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_GRAY);
-        colors[WaveformColors.SIGNALX.ordinal()] = SWTResourceManager.getColor(255,  128,  182);
-        colors[WaveformColors.SIGNAL_TEXT.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_WHITE);
-        colors[WaveformColors.CURSOR.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_RED);
-        colors[WaveformColors.CURSOR_DRAG.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_GRAY);
-        colors[WaveformColors.CURSOR_TEXT.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_WHITE);
-        colors[WaveformColors.MARKER.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_DARK_GRAY);
-        colors[WaveformColors.MARKER_TEXT.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_WHITE);
-        colors[WaveformColors.REL_ARROW.ordinal()] = SWTResourceManager.getColor(SWT.COLOR_MAGENTA);
-        colors[WaveformColors.REL_ARROW_HIGHLITE.ordinal()] = SWTResourceManager.getColor(255, 128, 255);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = new ScopedPreferenceStore(InstanceScope.INSTANCE, PreferenceConstants.PREFERENCES_SCOPE);
-
-		store.setDefault(PreferenceConstants.DATABASE_RELOAD, true);
-        for (WaveformColors c : WaveformColors.values()) {
-        	 store.setDefault(c.name()+"_COLOR", StringConverter.asString(colors[c.ordinal()].getRGB()));
-        }
-	}
-
-}

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/preferences/PreferenceConstants.java

@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.e4.application.preferences;
-
-/**
- * The Class PreferenceConstants for the preferences dialog & setting.
- */
-public class PreferenceConstants {
-
-	/** The Constant PREFERENCES_SCOPE. */
-	public static final String PREFERENCES_SCOPE="com.minres.scviewer.e4.application";
-	
-	/** The Constant DATABASE_RELOAD. */
-	public static final String DATABASE_RELOAD="databaseReload";
-	
-	/** The Constant LINE_COLOR. */
-	public static final String LINE_COLOR="LINE_COLOR";
-	
-	/** The Constant LINE_HIGHLITE_COLOR. */
-	public static final String LINE_HIGHLITE_COLOR="LINE_HIGHLITE_COLOR";
-	
-	/** The Constant TRACK_BG_EVEN_COLOR. */
-	public static final String TRACK_BG_EVEN_COLOR="TRACK_BG_EVEN_COLOR";
-	
-	/** The Constant TRACK_BG_ODD_COLOR. */
-	public static final String TRACK_BG_ODD_COLOR="TRACK_BG_ODD_COLOR";
-	
-	/** The Constant TRACK_BG_HIGHLITE_COLOR. */
-	public static final String TRACK_BG_HIGHLITE_COLOR="TRACK_BG_HIGHLITE_COLOR"; 
-	
-	/** The Constant TX_BG_COLOR. */
-	public static final String TX_BG_COLOR="TX_BG_COLOR";
-	
-	/** The Constant TX_BG_HIGHLITE_COLOR. */
-	public static final String TX_BG_HIGHLITE_COLOR="TX_BG_HIGHLITE_COLOR";
-	
-	/** The Constant TX_BORDER_COLOR. */
-	public static final String TX_BORDER_COLOR="TX_BORDER_COLOR";
-	
-	/** The Constant SIGNAL0_COLOR. */
-	public static final String SIGNAL0_COLOR="SIGNAL0_COLOR";
-	
-	/** The Constant SIGNAL1_COLOR. */
-	public static final String SIGNAL1_COLOR="SIGNAL1_COLOR";
-	
-	/** The Constant SIGNALZ_COLOR. */
-	public static final String SIGNALZ_COLOR="SIGNALZ_COLOR";
-	
-	/** The Constant SIGNALX_COLOR. */
-	public static final String SIGNALX_COLOR="SIGNALX_COLOR";
-	
-	/** The Constant SIGNAL_TEXT_COLOR. */
-	public static final String SIGNAL_TEXT_COLOR="SIGNAL_TEXT_COLOR"; 
-	
-	/** The Constant CURSOR_COLOR. */
-	public static final String CURSOR_COLOR="CURSOR_COLOR";
-	
-	/** The Constant CURSOR_DRAG_COLOR. */
-	public static final String CURSOR_DRAG_COLOR="CURSOR_DRAG_COLOR";
-	
-	/** The Constant CURSOR_TEXT_COLOR. */
-	public static final String CURSOR_TEXT_COLOR="CURSOR_TEXT_COLOR";
-	
-	/** The Constant MARKER_COLOR. */
-	public static final String MARKER_COLOR="MARKER_COLOR";
-	
-	/** The Constant MARKER_TEXT_COLOR. */
-	public static final String MARKER_TEXT_COLOR="MARKER_TEXT_COLOR";
-
-
-}

com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/provider/TxDbLabelProvider.java

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.e4.application.provider;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wb.swt.ResourceManager;
-
-import com.minres.scviewer.database.IHierNode;
-import com.minres.scviewer.database.ISignal;
-import com.minres.scviewer.database.ISignalChangeMulti;
-import com.minres.scviewer.database.ITxStream;
-import com.minres.scviewer.database.IWaveformDb;
-import com.minres.scviewer.e4.application.parts.LoadingWaveformDb;
-
-/**
- * The Class TxDbLabelProvider providing the labels for the respective viewers.
- */
-public class TxDbLabelProvider implements ILabelProvider {
-
-	/** The listeners. */
-	private List<ILabelProviderListener> listeners = new ArrayList<ILabelProviderListener>();
-
-	/** The wave. */
-	private Image loadinDatabase, database, stream, signal, folder, wave;
-	
-	
-	/**
-	 * Instantiates a new tx db label provider.
-	 */
-	public TxDbLabelProvider() {
-		super();
-		loadinDatabase=ResourceManager.getPluginImage("com.minres.scviewer.e4.application", "icons/database_go.png");
-		database=ResourceManager.getPluginImage("com.minres.scviewer.e4.application", "icons/database.png");
-		stream=ResourceManager.getPluginImage("com.minres.scviewer.e4.application", "icons/stream.png");
-		folder=ResourceManager.getPluginImage("com.minres.scviewer.e4.application", "icons/folder.png");
-		signal=ResourceManager.getPluginImage("com.minres.scviewer.e4.application", "icons/signal.png");
-		wave=ResourceManager.getPluginImage("com.minres.scviewer.e4.application", "icons/wave.png");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	@Override
-	public void addListener(ILabelProviderListener listener) {
-		  listeners.add(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
-	@Override
-	public void dispose() {
-		if(loadinDatabase!=null) database.dispose();
-		if(database!=null) database.dispose();
-		if(stream!=null) stream.dispose();
-		if(folder!=null) folder.dispose();
-		if(signal!=null) signal.dispose();
-		if(wave!=null) wave.dispose();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-	 */
-	@Override
-	public boolean isLabelProperty(Object element, String property) {
-		  return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-	 */
-	@Override
-	public void removeListener(ILabelProviderListener listener) {
-		  listeners.remove(listener);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	@Override
-	public Image getImage(Object element) {
-		if(element instanceof IWaveformDb){
-			if(element instanceof LoadingWaveformDb)
-				return loadinDatabase;
-			else
-				return database;
-		}else if(element instanceof ITxStream){
-			return stream;
-		}else if(element instanceof ISignal<?>){
-			Object o = ((ISignal<?>)element).getEvents().firstEntry().getValue();
-			if(o instanceof ISignalChangeMulti)
-				return wave;
-			else 
-				return signal;
-		}else if(element instanceof IHierNode){
-			return folder;
-		} else
-			return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	@Override
-	public String getText(Object element) {
-		return ((IHierNode)element).getName();
-	}
-
-}
-
-

com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/ResourceManager.java

@@ -1,415 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wb.swt;
-
-import java.io.File;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.osgi.framework.Bundle;
-
-/**
- * Utility class for managing OS resources associated with SWT/JFace controls such as colors, fonts, images,
- * etc.
- * 
- * !!! IMPORTANT !!! Application code must explicitly invoke the <code>dispose()</code> method to release the
- * operating system resources managed by cached objects when those objects and OS resources are no longer
- * needed (e.g. on application shutdown)
- * 
- * This class may be freely distributed as part of any application or plugin.
- * <p>
- * 
- * @author scheglov_ke
- * @author Dan Rubel
- */
-public class ResourceManager extends SWTResourceManager {
-	////////////////////////////////////////////////////////////////////////////
-	//
-	// Image
-	//
-	////////////////////////////////////////////////////////////////////////////
-	private static Map<ImageDescriptor, Image> m_descriptorImageMap = new HashMap<ImageDescriptor, Image>();
-	/**
-	 * Returns an {@link ImageDescriptor} stored in the file at the specified path relative to the specified
-	 * class.
-	 * 
-	 * @param clazz
-	 *            the {@link Class} relative to which to find the image descriptor.
-	 * @param path
-	 *            the path to the image file.
-	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
-	 */
-	public static ImageDescriptor getImageDescriptor(Class<?> clazz, String path) {
-		return ImageDescriptor.createFromFile(clazz, path);
-	}
-	/**
-	 * Returns an {@link ImageDescriptor} stored in the file at the specified path.
-	 * 
-	 * @param path
-	 *            the path to the image file.
-	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		try {
-			return ImageDescriptor.createFromURL(new File(path).toURI().toURL());
-		} catch (MalformedURLException e) {
-			return null;
-		}
-	}
-	/**
-	 * Returns an {@link Image} based on the specified {@link ImageDescriptor}.
-	 * 
-	 * @param descriptor
-	 *            the {@link ImageDescriptor} for the {@link Image}.
-	 * @return the {@link Image} based on the specified {@link ImageDescriptor}.
-	 */
-	public static Image getImage(ImageDescriptor descriptor) {
-		if (descriptor == null) {
-			return null;
-		}
-		Image image = m_descriptorImageMap.get(descriptor);
-		if (image == null) {
-			image = descriptor.createImage();
-			m_descriptorImageMap.put(descriptor, image);
-		}
-		return image;
-	}
-	/**
-	 * Maps images to decorated images.
-	 */
-	@SuppressWarnings("unchecked")
-	private static Map<Image, Map<Image, Image>>[] m_decoratedImageMap = new Map[LAST_CORNER_KEY];
-	/**
-	 * Returns an {@link Image} composed of a base image decorated by another image.
-	 * 
-	 * @param baseImage
-	 *            the base {@link Image} that should be decorated.
-	 * @param decorator
-	 *            the {@link Image} to decorate the base image.
-	 * @return {@link Image} The resulting decorated image.
-	 */
-	public static Image decorateImage(Image baseImage, Image decorator) {
-		return decorateImage(baseImage, decorator, BOTTOM_RIGHT);
-	}
-	/**
-	 * Returns an {@link Image} composed of a base image decorated by another image.
-	 * 
-	 * @param baseImage
-	 *            the base {@link Image} that should be decorated.
-	 * @param decorator
-	 *            the {@link Image} to decorate the base image.
-	 * @param corner
-	 *            the corner to place decorator image.
-	 * @return the resulting decorated {@link Image}.
-	 */
-	public static Image decorateImage(final Image baseImage, final Image decorator, final int corner) {
-		if (corner <= 0 || corner >= LAST_CORNER_KEY) {
-			throw new IllegalArgumentException("Wrong decorate corner");
-		}
-		Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[corner];
-		if (cornerDecoratedImageMap == null) {
-			cornerDecoratedImageMap = new HashMap<Image, Map<Image, Image>>();
-			m_decoratedImageMap[corner] = cornerDecoratedImageMap;
-		}
-		Map<Image, Image> decoratedMap = cornerDecoratedImageMap.get(baseImage);
-		if (decoratedMap == null) {
-			decoratedMap = new HashMap<Image, Image>();
-			cornerDecoratedImageMap.put(baseImage, decoratedMap);
-		}
-		//
-		Image result = decoratedMap.get(decorator);
-		if (result == null) {
-			final Rectangle bib = baseImage.getBounds();
-			final Rectangle dib = decorator.getBounds();
-			final Point baseImageSize = new Point(bib.width, bib.height);
-			CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor() {
-				@Override
-				protected void drawCompositeImage(int width, int height) {
-					drawImage(baseImage.getImageData(), 0, 0);
-					if (corner == TOP_LEFT) {
-						drawImage(decorator.getImageData(), 0, 0);
-					} else if (corner == TOP_RIGHT) {
-						drawImage(decorator.getImageData(), bib.width - dib.width, 0);
-					} else if (corner == BOTTOM_LEFT) {
-						drawImage(decorator.getImageData(), 0, bib.height - dib.height);
-					} else if (corner == BOTTOM_RIGHT) {
-						drawImage(decorator.getImageData(), bib.width - dib.width, bib.height - dib.height);
-					}
-				}
-				@Override
-				protected Point getSize() {
-					return baseImageSize;
-				}
-			};
-			//
-			result = compositImageDesc.createImage();
-			decoratedMap.put(decorator, result);
-		}
-		return result;
-	}
-	/**
-	 * Dispose all of the cached images.
-	 */
-	public static void disposeImages() {
-		SWTResourceManager.disposeImages();
-		// dispose ImageDescriptor images
-		{
-			for (Iterator<Image> I = m_descriptorImageMap.values().iterator(); I.hasNext();) {
-				I.next().dispose();
-			}
-			m_descriptorImageMap.clear();
-		}
-		// dispose decorated images
-		for (int i = 0; i < m_decoratedImageMap.length; i++) {
-			Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[i];
-			if (cornerDecoratedImageMap != null) {
-				for (Map<Image, Image> decoratedMap : cornerDecoratedImageMap.values()) {
-					for (Image image : decoratedMap.values()) {
-						image.dispose();
-					}
-					decoratedMap.clear();
-				}
-				cornerDecoratedImageMap.clear();
-			}
-		}
-		// dispose plugin images
-		{
-			for (Iterator<Image> I = m_URLImageMap.values().iterator(); I.hasNext();) {
-				I.next().dispose();
-			}
-			m_URLImageMap.clear();
-		}
-	}
-	////////////////////////////////////////////////////////////////////////////
-	//
-	// Plugin images support
-	//
-	////////////////////////////////////////////////////////////////////////////
-	/**
-	 * Maps URL to images.
-	 */
-	private static Map<String, Image> m_URLImageMap = new HashMap<String, Image>();
-	/**
-	 * Provider for plugin resources, used by WindowBuilder at design time.
-	 */
-	public interface PluginResourceProvider {
-		URL getEntry(String symbolicName, String path);
-	}
-	/**
-	 * Instance of {@link PluginResourceProvider}, used by WindowBuilder at design time.
-	 */
-	private static PluginResourceProvider m_designTimePluginResourceProvider = null;
-	/**
-	 * Returns an {@link Image} based on a plugin and file path.
-	 * 
-	 * @param plugin
-	 *            the plugin {@link Object} containing the image
-	 * @param name
-	 *            the path to the image within the plugin
-	 * @return the {@link Image} stored in the file at the specified path
-	 * 
-	 * @deprecated Use {@link #getPluginImage(String, String)} instead.
-	 */
-	@Deprecated
-	public static Image getPluginImage(Object plugin, String name) {
-		try {
-			URL url = getPluginImageURL(plugin, name);
-			if (url != null) {
-				return getPluginImageFromUrl(url);
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		return null;
-	}
-	/**
-	 * Returns an {@link Image} based on a {@link Bundle} and resource entry path.
-	 * 
-	 * @param symbolicName
-	 *            the symbolic name of the {@link Bundle}.
-	 * @param path
-	 *            the path of the resource entry.
-	 * @return the {@link Image} stored in the file at the specified path.
-	 */
-	public static Image getPluginImage(String symbolicName, String path) {
-		try {
-			URL url = getPluginImageURL(symbolicName, path);
-			if (url != null) {
-				return getPluginImageFromUrl(url);
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		return null;
-	}
-	/**
-	 * Returns an {@link Image} based on given {@link URL}.
-	 */
-	private static Image getPluginImageFromUrl(URL url) {
-		try {
-			try {
-				String key = url.toExternalForm();
-				Image image = m_URLImageMap.get(key);
-				if (image == null) {
-					InputStream stream = url.openStream();
-					try {
-						image = getImage(stream);
-						m_URLImageMap.put(key, image);
-					} finally {
-						stream.close();
-					}
-				}
-				return image;
-			} catch (Throwable e) {
-				// Ignore any exceptions
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		return null;
-	}
-	/**
-	 * Returns an {@link ImageDescriptor} based on a plugin and file path.
-	 * 
-	 * @param plugin
-	 *            the plugin {@link Object} containing the image.
-	 * @param name
-	 *            the path to th eimage within the plugin.
-	 * @return the {@link ImageDescriptor} stored in the file at the specified path.
-	 * 
-	 * @deprecated Use {@link #getPluginImageDescriptor(String, String)} instead.
-	 */
-	@Deprecated
-	public static ImageDescriptor getPluginImageDescriptor(Object plugin, String name) {
-		try {
-			try {
-				URL url = getPluginImageURL(plugin, name);
-				return ImageDescriptor.createFromURL(url);
-			} catch (Throwable e) {
-				// Ignore any exceptions
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		return null;
-	}
-	/**
-	 * Returns an {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
-	 * 
-	 * @param symbolicName
-	 *            the symbolic name of the {@link Bundle}.
-	 * @param path
-	 *            the path of the resource entry.
-	 * @return the {@link ImageDescriptor} based on a {@link Bundle} and resource entry path.
-	 */
-	public static ImageDescriptor getPluginImageDescriptor(String symbolicName, String path) {
-		try {
-			URL url = getPluginImageURL(symbolicName, path);
-			if (url != null) {
-				return ImageDescriptor.createFromURL(url);
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		return null;
-	}
-	/**
-	 * Returns an {@link URL} based on a {@link Bundle} and resource entry path.
-	 */
-	private static URL getPluginImageURL(String symbolicName, String path) {
-		// try runtime plugins
-		{
-			Bundle bundle = Platform.getBundle(symbolicName);
-			if (bundle != null) {
-				return bundle.getEntry(path);
-			}
-		}
-		// try design time provider
-		if (m_designTimePluginResourceProvider != null) {
-			return m_designTimePluginResourceProvider.getEntry(symbolicName, path);
-		}
-		// no such resource
-		return null;
-	}
-	/**
-	 * Returns an {@link URL} based on a plugin and file path.
-	 * 
-	 * @param plugin
-	 *            the plugin {@link Object} containing the file path.
-	 * @param name
-	 *            the file path.
-	 * @return the {@link URL} representing the file at the specified path.
-	 * @throws Exception
-	 */
-	private static URL getPluginImageURL(Object plugin, String name) throws Exception {
-		// try to work with 'plugin' as with OSGI BundleContext
-		try {
-			Class<?> BundleClass = Class.forName("org.osgi.framework.Bundle"); //$NON-NLS-1$
-			Class<?> BundleContextClass = Class.forName("org.osgi.framework.BundleContext"); //$NON-NLS-1$
-			if (BundleContextClass.isAssignableFrom(plugin.getClass())) {
-				Method getBundleMethod = BundleContextClass.getMethod("getBundle", new Class[0]); //$NON-NLS-1$
-				Object bundle = getBundleMethod.invoke(plugin, new Object[0]);
-				//
-				Class<?> PathClass = Class.forName("org.eclipse.core.runtime.Path"); //$NON-NLS-1$
-				Constructor<?> pathConstructor = PathClass.getConstructor(new Class[]{String.class});
-				Object path = pathConstructor.newInstance(new Object[]{name});
-				//
-				Class<?> IPathClass = Class.forName("org.eclipse.core.runtime.IPath"); //$NON-NLS-1$
-				Class<?> PlatformClass = Class.forName("org.eclipse.core.runtime.Platform"); //$NON-NLS-1$
-				Method findMethod = PlatformClass.getMethod("find", new Class[]{BundleClass, IPathClass}); //$NON-NLS-1$
-				return (URL) findMethod.invoke(null, new Object[]{bundle, path});
-			}
-		} catch (Throwable e) {
-			// Ignore any exceptions
-		}
-		// else work with 'plugin' as with usual Eclipse plugin
-		{
-			Class<?> PluginClass = Class.forName("org.eclipse.core.runtime.Plugin"); //$NON-NLS-1$
-			if (PluginClass.isAssignableFrom(plugin.getClass())) {
-				//
-				Class<?> PathClass = Class.forName("org.eclipse.core.runtime.Path"); //$NON-NLS-1$
-				Constructor<?> pathConstructor = PathClass.getConstructor(new Class[]{String.class});
-				Object path = pathConstructor.newInstance(new Object[]{name});
-				//
-				Class<?> IPathClass = Class.forName("org.eclipse.core.runtime.IPath"); //$NON-NLS-1$
-				Method findMethod = PluginClass.getMethod("find", new Class[]{IPathClass}); //$NON-NLS-1$
-				return (URL) findMethod.invoke(plugin, new Object[]{path});
-			}
-		}
-		return null;
-	}
-	////////////////////////////////////////////////////////////////////////////
-	//
-	// General
-	//
-	////////////////////////////////////////////////////////////////////////////
-	/**
-	 * Dispose of cached objects and their underlying OS resources. This should only be called when the cached
-	 * objects are no longer needed (e.g. on application shutdown).
-	 */
-	public static void dispose() {
-		disposeColors();
-		disposeFonts();
-		disposeImages();
-	}
-}

com.minres.scviewer.e4.product/SCViewer (restart).launch

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.e4.ui.workbench.swt.E4Application"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/SCViewer (restart)"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-com.minres.scviewer.e4.application.product"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="com.minres.scviewer.e4.application.product"/>
-<stringAttribute key="productFile" value="/com.minres.scviewer.e4.application/com.minres.scviewer.e4.application.product"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.codehaus.groovy@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.java7@default:false,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.minres.scviewer.database.sqlite@default:default,com.minres.scviewer.database.text@default:default,com.minres.scviewer.database.ui.swt@default:default,com.minres.scviewer.database.ui@default:default,com.minres.scviewer.database.vcd@default:default,com.minres.scviewer.database@default:default,com.minres.scviewer.e4.application@default:default,com.opcoach.e4.preferences@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>

com.minres.scviewer.e4.product/scviewer.product

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <programArgs>-clearPersistedState -data @none
-      </programArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
-      </vmArgsMac>
-   </launcherArgs>
-
-   <windowImages i16="/com.minres.scviewer.e4.application/icons/SCViewer_16x32.png" i32="/com.minres.scviewer.e4.application/icons/SCViewer_32x32.png" i48="/com.minres.scviewer.e4.application/icons/SCViewer_48x32.png" i64="/com.minres.scviewer.e4.application/icons/SCViewer_64x32.png" i128="/com.minres.scviewer.e4.application/icons/SCViewer_128x32.png" i256="/com.minres.scviewer.e4.application/icons/SCViewer_256x32.png"/>
-
-   <launcher name="scviewer">
-      <linux icon="icons/SCViewer_512x512.xpm"/>
-      <macosx icon="icons/SCViewer.icns"/>
-      <solaris/>
-      <win useIco="false">
-         <bmp
-            winSmallHigh="icons/SCViewer_16x16@32.bmp"
-            winSmallLow="icons/SCViewer_16x16@8.bmp"
-            winMediumHigh="icons/SCViewer_32x32@32.bmp"
-            winMediumLow="icons/SCViewer_32x32@8.bmp"
-            winLargeHigh="icons/SCViewer_48x48@32.bmp"
-            winLargeLow="icons/SCViewer_48x48@8.bmp"
-            winExtraLargeHigh="icons/SCViewer_256x256@32.bmp"/>
-      </win>
-   </launcher>
-
-   <vm>
-   </vm>
-
-   <plugins>
-      <plugin id="com.ibm.icu"/>
-      <plugin id="com.minres.scviewer.database"/>
-      <plugin id="com.minres.scviewer.database.sqlite"/>
-      <plugin id="com.minres.scviewer.database.text"/>
-      <plugin id="com.minres.scviewer.database.ui"/>
-      <plugin id="com.minres.scviewer.database.ui.swt"/>
-      <plugin id="com.minres.scviewer.database.vcd"/>
-      <plugin id="com.minres.scviewer.e4.application"/>
-      <plugin id="com.opcoach.e4.preferences"/>
-      <plugin id="javax.annotation"/>
-      <plugin id="javax.inject"/>
-      <plugin id="javax.xml"/>
-      <plugin id="org.apache.batik.css"/>
-      <plugin id="org.apache.batik.util"/>
-      <plugin id="org.apache.batik.util.gui"/>
-      <plugin id="org.apache.commons.jxpath"/>
-      <plugin id="org.apache.commons.logging"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.databinding.beans"/>
-      <plugin id="org.eclipse.core.databinding.observable"/>
-      <plugin id="org.eclipse.core.databinding.property"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.filesystem"/>
-      <plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.resources"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>
-      <plugin id="org.eclipse.e4.core.commands"/>
-      <plugin id="org.eclipse.e4.core.contexts"/>
-      <plugin id="org.eclipse.e4.core.di"/>
-      <plugin id="org.eclipse.e4.core.di.annotations"/>
-      <plugin id="org.eclipse.e4.core.di.extensions"/>
-      <plugin id="org.eclipse.e4.core.services"/>
-      <plugin id="org.eclipse.e4.emf.xpath"/>
-      <plugin id="org.eclipse.e4.ui.bindings"/>
-      <plugin id="org.eclipse.e4.ui.css.core"/>
-      <plugin id="org.eclipse.e4.ui.css.swt"/>
-      <plugin id="org.eclipse.e4.ui.css.swt.theme"/>
-      <plugin id="org.eclipse.e4.ui.di"/>
-      <plugin id="org.eclipse.e4.ui.model.workbench"/>
-      <plugin id="org.eclipse.e4.ui.services"/>
-      <plugin id="org.eclipse.e4.ui.widgets"/>
-      <plugin id="org.eclipse.e4.ui.workbench"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" fragment="true"/>
-      <plugin id="org.eclipse.e4.ui.workbench.swt"/>
-      <plugin id="org.eclipse.e4.ui.workbench3"/>
-      <plugin id="org.eclipse.emf.common"/>
-      <plugin id="org.eclipse.emf.ecore"/>
-      <plugin id="org.eclipse.emf.ecore.change"/>
-      <plugin id="org.eclipse.emf.ecore.xmi"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.concurrent"/>
-      <plugin id="org.eclipse.equinox.ds"/>
-      <plugin id="org.eclipse.equinox.event"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.equinox.util"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
-      <plugin id="org.eclipse.osgi.services"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
-      <plugin id="org.w3c.css.sac"/>
-      <plugin id="org.w3c.dom.events"/>
-      <plugin id="org.w3c.dom.smil"/>
-      <plugin id="org.w3c.dom.svg"/>
-   </plugins>
-
-   <configurations>
-      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
-      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-   </configurations>
-
-</product>

com.minres.scviewer.parent/.gitignore

@@ -1 +0,0 @@
-/workspace/

com.minres.scviewer.parent/pom.xml

@@ -1,143 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.minres.scviewer</groupId>
-	<artifactId>com.minres.scviewer.parent</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<modules>
-		<module>../com.minres.scviewer.target</module>
-		<module>../com.minres.scviewer.database</module>
-		<module>../com.minres.scviewer.database.sqlite</module>
-		<module>../com.minres.scviewer.database.text</module>
-		<module>../com.minres.scviewer.database.vcd</module>
-		<module>../com.minres.scviewer.database.ui</module>
-		<module>../com.minres.scviewer.database.ui.swt</module>
-		<module>../com.opcoach.e4.preferences</module>
-		<module>../com.minres.scviewer.e4.application</module>
-		<module>../com.minres.scviewer.ui</module>
-		<module>../com.minres.scviewer.feature</module>
-		<module>../com.minres.scviewer.updateSite</module>
-		<module>../com.minres.scviewer.e4.product</module>
-	</modules>
-
-	<properties>
-		<tycho-version>0.23.1</tycho-version>
- 		<tycho-extras-version>${tycho-version}</tycho-extras-version>  
- 		<groovy-eclipse-compiler-version>2.8.0-01</groovy-eclipse-compiler-version>
-		<!-- <groovy-eclipse-batch-version>2.0.5</groovy-eclipse-batch-version> -->
-		<groovy-eclipse-batch-version>2.1.8-01</groovy-eclipse-batch-version>
-
-	</properties>
-	<repositories>
-		<repository>
-			<id>mars</id>
-			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/mars</url>
-		</repository>
-		<repository>
-			<id>GRECLIPSE</id>
-			<layout>p2</layout>
-			<url>http://dist.springsource.org/snapshot/GRECLIPSE/e4.5</url>
-		</repository>
-	</repositories>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<extensions>true</extensions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<environments>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86_64</arch>
-						</environment>
-					</environments>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho-extras-version}</version>
-
-				<executions>
-					<execution>
-						<id>source-feature</id>
-						<phase>package</phase>
-						<goals>
-							<goal>source-feature</goal>
-						</goals>
-					</execution>
-				</executions>
- 
-				<configuration>
-					<excludes>
-						<!-- provide plug-ins not containing any source code -->
-						<plugin id="org.codehaus.groovy" />
-					</excludes>
-				</configuration>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-
-				<executions>
-					<execution>
-						<id>plugin-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attached-p2-metadata</id>
-						<phase>package</phase>
-						<goals>
-							<goal>p2-metadata</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

com.minres.scviewer.target/mars.target

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Mars Platform" sequenceNumber="130">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.rcp.sdk.id" version="4.5.1.M20150904-0015"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.200.v20150602-1417"/>
-<unit id="org.eclipse.rcptt.core.feature.group" version="2.0.1.201508201020"/>
-<unit id="org.eclipse.platform.sdk" version="4.5.1.M20150904-0015"/>
-<repository location="http://download.eclipse.org/releases/mars"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.codehaus.groovy24.feature.feature.group" version="2.9.2.xx-201508121448-e45"/>
-<repository location="http://dist.springsource.org/snapshot/GRECLIPSE/e4.5"/>
-</location>
-</locations>
-<environment>
-<arch>x86_64</arch>
-<nl>de_DE</nl>
-</environment>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 7 [1.7.0_45]"/>
-<launcherArgs>
-<vmArgs>-Dosgi.requiredJavaVersion=1.6 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -XX:MaxPermSize=256m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts -Xms40m -Xmx512m -Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgs>
-</launcherArgs>
-</target>

com.minres.scviewer.ui/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

com.minres.scviewer.ui/.settings/org.eclipse.jdt.groovy.core.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-groovy.compiler.level=23

com.minres.scviewer.ui/src/com/minres/scviewer/ui/handler/Zoom.java

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015 MINRES Technologies GmbH and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     MINRES Technologies GmbH - initial API and implementation
- *******************************************************************************/
-package com.minres.scviewer.ui.handler;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-import com.minres.scviewer.ui.TxEditorPart;
-
-public class Zoom extends AbstractHandler {
-	private static final String PARM_MSG = "com.minres.scviewer.ui.zoom.level";
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-	    String msg = event.getParameter(PARM_MSG);
-	    if (msg == null) {
-			if(editor instanceof TxEditorPart){
-				((TxEditorPart)editor).setZoomFit();
-			}
-	    } else {
-	    	Integer level = Integer.parseInt(msg);
-			if(editor instanceof TxEditorPart){
-				((TxEditorPart)editor).setZoomLevel(level);
-			}
-	    }
-		return null;
-	}
-
-}

com.minres.scviewer.updateSite/category.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/com.minres.scviewer.feature_1.0.0.qualifier.jar" id="com.minres.scviewer.feature" version="1.0.0.qualifier">
-      <category name="com.minres.scviewer"/>
-   </feature>
-   <category-def name="com.minres.scviewer" label="SCViewer">
-      <description>
-         Viewer for SystemC Verification (SCV) library&apos;s transaction recording
-      </description>
-   </category-def>
-</site>

com.minres.scviewer.updateSite/pom.xml

@@ -1,20 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>com.minres.scviewer.updateSite</artifactId>
-	<packaging>eclipse-repository</packaging>
-	<parent>
-		<groupId>com.minres.scviewer</groupId>
-		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../com.minres.scviewer.parent</relativePath>
-	</parent>
-<!--	<build>
- 		<finalName>resources</finalName>
-		<resources>
-			<resource>
-				<directory>resources</directory>
-			</resource>
-		</resources>
-	</build> -->
-	</project>

com.opcoach.e4.preferences/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

com.opcoach.e4.preferences/META-INF/MANIFEST.MF

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Preferences
-Bundle-SymbolicName: com.opcoach.e4.preferences;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: OPCOACH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: javax.inject,
- org.eclipse.core.runtime;bundle-version="3.9.0",
- org.eclipse.jface;bundle-version="3.9.0",
- org.eclipse.e4.core.di;bundle-version="1.3.0",
- org.eclipse.e4.ui.model.workbench;bundle-version="1.0.0",
- org.eclipse.e4.core.services;bundle-version="1.1.0",
- org.eclipse.e4.core.contexts;bundle-version="1.3.0",
- org.eclipse.e4.ui.services;bundle-version="1.0.0"
-Export-Package: com.opcoach.e4.preferences,
- com.opcoach.e4.preferences.handlers
-Bundle-ActivationPolicy: lazy

com.opcoach.e4.preferences/build.properties

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml

com.opcoach.e4.preferences/plugin.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension-point id="e4PreferencePages" name="e4PreferencePages" schema="schema/e4PreferencePages.exsd"/>
-   <extension-point id="e4PreferenceStoreProvider" name="e4PreferenceStoreProvider" schema="schema/e4PreferenceStoreProvider.exsd"/>
-
-</plugin>

com.opcoach.e4.preferences/pom.xml

@@ -1,13 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>com.opcoach.e4.preferences</artifactId>
-  <parent>
-  	<groupId>com.minres.scviewer</groupId>
-  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>1.0.0-SNAPSHOT</version>
-  	<relativePath>../com.minres.scviewer.parent</relativePath>
-  </parent>
-  <packaging>eclipse-plugin</packaging>
-  <version>1.0.0-SNAPSHOT</version>
-  <groupId>com.minres.scviewer</groupId>
-</project>

com.opcoach.e4.preferences/schema/e4PreferencePages.exsd

@@ -1,163 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.opcoach.e4.preferences" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="com.opcoach.e4.preferences" id="e4PreferencePages" name="e4PreferencePages"/>
-      </appinfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="page" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified identifier of the target extension point
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  an optional identifier of the extension instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  an optional name of the extension instance
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="page">
-      <annotation>
-         <appinfo>
-            <meta.element labelAttribute="name"/>
-         </appinfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="keywordReference" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique name that will be used to identify this page.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a translatable name that will be used in the UI for this page.
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a name of the fully qualified class that implements 
-&lt;samp&gt;org.eclipse.jface.preference.IPreferencePage&lt;/samp&gt;.
-
-IT IS EASYER to extend FieldEditorPreferencePage 
-
-If this class extends directly org.eclipse.jface.preference.FieldEditorPreferencePage preferenceStore is automatically set on it.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jface.preference.FieldEditorPreferencePage:"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="category" type="string">
-            <annotation>
-               <documentation>
-                  a path indicating the location of the page in the preference tree. The path may either be a parent node ID or a sequence
-     of IDs separated by &apos;/&apos;, representing the full path from the root node.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="identifier" basedOn="com.opcoach.e4.preferences.e4PreferencePages/page/@id"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="keywordReference">
-      <annotation>
-         <documentation>
-            A reference by a preference page to a keyword. See the keywords extension point.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id of the keyword being referred to.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="identifier" basedOn="org.eclipse.ui.keywords/keyword/@id"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiinfo"/>
-      </appinfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>

com.opcoach.e4.preferences/schema/e4PreferenceStoreProvider.exsd

@@ -1,149 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="com.opcoach.e4.preferences" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="com.opcoach.e4.preferences" id="e4PreferenceStoreProvider" name="e4PreferenceStoreProvider"/>
-      </appinfo>
-      <documentation>
-         This extension point is used to associate a preference store to a plugin. 
-You can choose either to implement the IPreferenceStoreProvider interface or to give the ID of the IPreferenceStore to use (stored in the workbench context of your E4 application). 
-If this extension point is not used, a default ScopedPreferenceStore will be used for the preference page. 
-
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="preferenceStoreProvider" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="preferenceStoreProvider">
-      <complexType>
-         <attribute name="pluginId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Set here the plugin Id concerned by this extension. 
-Must be a valid plugin ID (control will be done at runtime)
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  Set a class to get the IPreferenceStore for the defined pluginID. 
-This parameter is optional if you use the contextId attribute.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":com.opcoach.e4.preferences.IPreferenceStoreProvider"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="idInWorkbenchContext" type="string">
-            <annotation>
-               <documentation>
-                  If no class is defined, you can set here the ID of the IPreferenceStore available in the context. 
-This object must be set in the workbenchContext using an Addon for instance, with the following code (in addon): 
-
-@PostContextCreate
-public void initMyAddon(IEclipseContext ctx)
-{
-    IPreferenceStore ps = new ... .  // The code to create your pref store
-    ctx.set(ID set in this extension,  ps);
-}
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         The definition could be like the following : 
-
-pluginId=&quot;yourPluginID&quot;
-provider=&quot;a class implementing IPreferenceStoreProvider&quot;
-
-
-Or using the key in context (usefull to share the same preference store between plugins) : 
-
-pluginId=&quot;yourPluginID&quot;
-keyInContext=&quot;the key of the IPreferenceStore stored in context&quot;
-
-
-
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiinfo"/>
-      </appinfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="copyright"/>
-      </appinfo>
-      <documentation>
-         @OPCoach 2014
-      </documentation>
-   </annotation>
-
-</schema>

com.opcoach.e4.preferences/src/com/opcoach/e4/preferences/IPreferenceStoreProvider.java

@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 OPCoach.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     OPCoach - initial API and implementation
- *******************************************************************************/
-package com.opcoach.e4.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-/** This interface can be implemented to provide a PreferenceStore for a given plugin. 
- * This associatino must be done in the e4PreferenceStoreProvider extension point. 
- * @author olivier
- *
- */
-public interface IPreferenceStoreProvider
-{
-	/** Must be implemented to return a preference store */
-	public IPreferenceStore getPreferenceStore();
-
-}

com.opcoach.e4.preferences/src/com/opcoach/e4/preferences/ScopedPreferenceStore.java

@@ -1,861 +0,0 @@
-
-/*******************************************************************************
- * Copyright (c) 2014 OPCoach.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Eclipse - copy of the implementation coming from jface 
- *******************************************************************************/
-
-package com.opcoach.e4.preferences;
-
-import java.io.IOException;
-
-import org.eclipse.core.commands.common.EventManager;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.SafeRunner;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.NodeChangeEvent;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
-import org.eclipse.jface.preference.IPersistentPreferenceStore;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.util.SafeRunnable;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * The ScopedPreferenceStore is an IPreferenceStore that uses the scopes
- * provided in org.eclipse.core.runtime.preferences.
- * <p>
- * A ScopedPreferenceStore does the lookup of a preference based on it's search
- * scopes and sets the value of the preference based on its store scope.
- * </p>
- * <p>
- * The default scope is always included in the search scopes when searching for
- * preference values.
- * </p>
- * 
- * @see org.eclipse.core.runtime.preferences
- * @since 3.1
- */
-public class ScopedPreferenceStore extends EventManager implements
-		IPreferenceStore, IPersistentPreferenceStore {
-
-	/**
-	 * The storeContext is the context where values will stored with the
-	 * setValue methods. If there are no searchContexts this will be the search
-	 * context. (along with the "default" context)
-	 */
-	private IScopeContext storeContext;
-
-	/**
-	 * The searchContext is the array of contexts that will be used by the get
-	 * methods for searching for values.
-	 */
-	private IScopeContext[] searchContexts;
-
-	/**
-	 * A boolean to indicate the property changes should not be propagated.
-	 */
-	protected boolean silentRunning = false;
-
-	/**
-	 * The listener on the IEclipsePreferences. This is used to forward updates
-	 * to the property change listeners on the preference store.
-	 */
-	IEclipsePreferences.IPreferenceChangeListener preferencesListener;
-
-	/**
-	 * The default context is the context where getDefault and setDefault
-	 * methods will search. This context is also used in the search.
-	 */
-	private IScopeContext defaultContext = DefaultScope.INSTANCE;
-
-	/**
-	 * The nodeQualifer is the string used to look up the node in the contexts.
-	 */
-	String nodeQualifier;
-
-	/**
-	 * The defaultQualifier is the string used to look up the default node.
-	 */
-	String defaultQualifier;
-
-	/**
-	 * Boolean value indicating whether or not this store has changes to be
-	 * saved.
-	 */
-	private boolean dirty;
-
-	/**
-	 * Create a new instance of the receiver. Store the values in context in the
-	 * node looked up by qualifier. <strong>NOTE:</strong> Any instance of
-	 * ScopedPreferenceStore should call
-	 * 
-	 * @param context
-	 *            the scope to store to
-	 * @param qualifier
-	 *            the qualifier used to look up the preference node
-	 * @param defaultQualifierPath
-	 *            the qualifier used when looking up the defaults
-	 */
-	public ScopedPreferenceStore(IScopeContext context, String qualifier,
-			String defaultQualifierPath) {
-		this(context, qualifier);
-		this.defaultQualifier = defaultQualifierPath;
-	}
-
-	/**
-	 * Create a new instance of the receiver. Store the values in context in the
-	 * node looked up by qualifier.
-	 * 
-	 * @param context
-	 *            the scope to store to
-	 * @param qualifier
-	 *            the qualifer used to look up the preference node
-	 */
-	public ScopedPreferenceStore(IScopeContext context, String qualifier) {
-		storeContext = context;
-		this.nodeQualifier = qualifier;
-		this.defaultQualifier = qualifier;
-
-		((IEclipsePreferences) getStorePreferences().parent())
-				.addNodeChangeListener(getNodeChangeListener());
-	}
-
-	/**
-	 * Return a node change listener that adds a removes the receiver when nodes
-	 * change.
-	 * 
-	 * @return INodeChangeListener
-	 */
-	private INodeChangeListener getNodeChangeListener() {
-		return new IEclipsePreferences.INodeChangeListener() {
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener#added(org.eclipse.core.runtime.preferences.IEclipsePreferences.NodeChangeEvent)
-			 */
-			public void added(NodeChangeEvent event) {
-				if (nodeQualifier.equals(event.getChild().name())
-						&& isListenerAttached()) {
-					getStorePreferences().addPreferenceChangeListener(
-							preferencesListener);
-				}
-			}
-
-			/*
-			 * (non-Javadoc)
-			 * 
-			 * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.INodeChangeListener#removed(org.eclipse.core.runtime.preferences.IEclipsePreferences.NodeChangeEvent)
-			 */
-			public void removed(NodeChangeEvent event) {
-				// Do nothing as there are no events from removed node
-			}
-		};
-	}
-
-	/**
-	 * Initialize the preferences listener.
-	 */
-	private void initializePreferencesListener() {
-		if (preferencesListener == null) {
-			preferencesListener = new IEclipsePreferences.IPreferenceChangeListener() {
-				/*
-				 * (non-Javadoc)
-				 * 
-				 * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
-				 */
-				public void preferenceChange(PreferenceChangeEvent event) {
-
-					if (silentRunning) {
-						return;
-					}
-
-					Object oldValue = event.getOldValue();
-					Object newValue = event.getNewValue();
-					String key = event.getKey();
-					if (newValue == null) {
-						newValue = getDefault(key, oldValue);
-					} else if (oldValue == null) {
-						oldValue = getDefault(key, newValue);
-					}
-					firePropertyChangeEvent(event.getKey(), oldValue, newValue);
-				}
-			};
-			getStorePreferences().addPreferenceChangeListener(
-					preferencesListener);
-		}
-
-	}
-
-	/**
-	 * Does its best at determining the default value for the given key. Checks
-	 * the given object's type and then looks in the list of defaults to see if
-	 * a value exists. If not or if there is a problem converting the value, the
-	 * default default value for that type is returned.
-	 * 
-	 * @param key
-	 *            the key to search
-	 * @param obj
-	 *            the object who default we are looking for
-	 * @return Object or <code>null</code>
-	 */
-	Object getDefault(String key, Object obj) {
-		IEclipsePreferences defaults = getDefaultPreferences();
-		if (obj instanceof String) {
-			return defaults.get(key, STRING_DEFAULT_DEFAULT);
-		} else if (obj instanceof Integer) {
-			return new Integer(defaults.getInt(key, INT_DEFAULT_DEFAULT));
-		} else if (obj instanceof Double) {
-			return new Double(defaults.getDouble(key, DOUBLE_DEFAULT_DEFAULT));
-		} else if (obj instanceof Float) {
-			return new Float(defaults.getFloat(key, FLOAT_DEFAULT_DEFAULT));
-		} else if (obj instanceof Long) {
-			return new Long(defaults.getLong(key, LONG_DEFAULT_DEFAULT));
-		} else if (obj instanceof Boolean) {
-			return defaults.getBoolean(key, BOOLEAN_DEFAULT_DEFAULT) ? Boolean.TRUE
-					: Boolean.FALSE;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * Return the IEclipsePreferences node associated with this store.
-	 * 
-	 * @return the preference node for this store
-	 */
-	IEclipsePreferences getStorePreferences() {
-		return storeContext.getNode(nodeQualifier);
-	}
-
-	/**
-	 * Return the default IEclipsePreferences for this store.
-	 * 
-	 * @return this store's default preference node
-	 */
-	private IEclipsePreferences getDefaultPreferences() {
-		return defaultContext.getNode(defaultQualifier);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
-	 */
-	public void addPropertyChangeListener(IPropertyChangeListener listener) {
-		initializePreferencesListener();// Create the preferences listener if it
-		// does not exist
-		addListenerObject(listener);
-	}
-
-	/**
-	 * Return the preference path to search preferences on. This is the list of
-	 * preference nodes based on the scope contexts for this store. If there are
-	 * no search contexts set, then return this store's context.
-	 * <p>
-	 * Whether or not the default context should be included in the resulting
-	 * list is specified by the <code>includeDefault</code> parameter.
-	 * </p>
-	 * 
-	 * @param includeDefault
-	 *            <code>true</code> if the default context should be included
-	 *            and <code>false</code> otherwise
-	 * @return IEclipsePreferences[]
-	 * @since 3.4 public, was added in 3.1 as private method
-	 */
-	public IEclipsePreferences[] getPreferenceNodes(boolean includeDefault) {
-		// if the user didn't specify a search order, then return the scope that
-		// this store was created on. (and optionally the default)
-		if (searchContexts == null) {
-			if (includeDefault) {
-				return new IEclipsePreferences[] { getStorePreferences(),
-						getDefaultPreferences() };
-			}
-			return new IEclipsePreferences[] { getStorePreferences() };
-		}
-		// otherwise the user specified a search order so return the appropriate
-		// nodes based on it
-		int length = searchContexts.length;
-		if (includeDefault) {
-			length++;
-		}
-		IEclipsePreferences[] preferences = new IEclipsePreferences[length];
-		for (int i = 0; i < searchContexts.length; i++) {
-			preferences[i] = searchContexts[i].getNode(nodeQualifier);
-		}
-		if (includeDefault) {
-			preferences[length - 1] = getDefaultPreferences();
-		}
-		return preferences;
-	}
-
-	/**
-	 * Set the search contexts to scopes. When searching for a value the seach
-	 * will be done in the order of scope contexts and will not search the
-	 * storeContext unless it is in this list.
-	 * <p>
-	 * If the given list is <code>null</code>, then clear this store's search
-	 * contexts. This means that only this store's scope context and default
-	 * scope will be used during preference value searching.
-	 * </p>
-	 * <p>
-	 * The defaultContext will be added to the end of this list automatically
-	 * and <em>MUST NOT</em> be included by the user.
-	 * </p>
-	 * 
-	 * @param scopes
-	 *            a list of scope contexts to use when searching, or
-	 *            <code>null</code>
-	 */
-	public void setSearchContexts(IScopeContext[] scopes) {
-		this.searchContexts = scopes;
-		if (scopes == null) {
-			return;
-		}
-
-		// Assert that the default was not included (we automatically add it to
-		// the end)
-		for (int i = 0; i < scopes.length; i++) {
-			if (scopes[i].equals(defaultContext)) {
-				Assert
-						.isTrue(
-								false,
-								"Do not add the default to the search contexts");
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#contains(java.lang.String)
-	 */
-	public boolean contains(String name) {
-		if (name == null) {
-			return false;
-		}
-		return (Platform.getPreferencesService().get(name, null,
-				getPreferenceNodes(true))) != null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#firePropertyChangeEvent(java.lang.String,
-	 *      java.lang.Object, java.lang.Object)
-	 */
-	public void firePropertyChangeEvent(String name, Object oldValue,
-			Object newValue) {
-		// important: create intermediate array to protect against listeners
-		// being added/removed during the notification
-		final Object[] list = getListeners();
-		if (list.length == 0) {
-			return;
-		}
-		final PropertyChangeEvent event = new PropertyChangeEvent(this, name,
-				oldValue, newValue);
-		for (int i = 0; i < list.length; i++) {
-			final IPropertyChangeListener listener = (IPropertyChangeListener) list[i];
-			SafeRunner.run(new SafeRunnable(JFaceResources
-					.getString("PreferenceStore.changeError")) { //$NON-NLS-1$
-						public void run() {
-							listener.propertyChange(event);
-						}
-					});
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getBoolean(java.lang.String)
-	 */
-	public boolean getBoolean(String name) {
-		String value = internalGet(name);
-		return value == null ? BOOLEAN_DEFAULT_DEFAULT : Boolean.valueOf(value)
-				.booleanValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultBoolean(java.lang.String)
-	 */
-	public boolean getDefaultBoolean(String name) {
-		return getDefaultPreferences()
-				.getBoolean(name, BOOLEAN_DEFAULT_DEFAULT);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultDouble(java.lang.String)
-	 */
-	public double getDefaultDouble(String name) {
-		return getDefaultPreferences().getDouble(name, DOUBLE_DEFAULT_DEFAULT);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultFloat(java.lang.String)
-	 */
-	public float getDefaultFloat(String name) {
-		return getDefaultPreferences().getFloat(name, FLOAT_DEFAULT_DEFAULT);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultInt(java.lang.String)
-	 */
-	public int getDefaultInt(String name) {
-		return getDefaultPreferences().getInt(name, INT_DEFAULT_DEFAULT);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultLong(java.lang.String)
-	 */
-	public long getDefaultLong(String name) {
-		return getDefaultPreferences().getLong(name, LONG_DEFAULT_DEFAULT);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultString(java.lang.String)
-	 */
-	public String getDefaultString(String name) {
-		return getDefaultPreferences().get(name, STRING_DEFAULT_DEFAULT);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getDouble(java.lang.String)
-	 */
-	public double getDouble(String name) {
-		String value = internalGet(name);
-		if (value == null) {
-			return DOUBLE_DEFAULT_DEFAULT;
-		}
-		try {
-			return Double.parseDouble(value);
-		} catch (NumberFormatException e) {
-			return DOUBLE_DEFAULT_DEFAULT;
-		}
-	}
-
-	/**
-	 * Return the string value for the specified key. Look in the nodes which
-	 * are specified by this object's list of search scopes. If the value does
-	 * not exist then return <code>null</code>.
-	 * 
-	 * @param key
-	 *            the key to search with
-	 * @return String or <code>null</code> if the value does not exist.
-	 */
-	private String internalGet(String key) {
-		return Platform.getPreferencesService().get(key, null,
-				getPreferenceNodes(true));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getFloat(java.lang.String)
-	 */
-	public float getFloat(String name) {
-		String value = internalGet(name);
-		if (value == null) {
-			return FLOAT_DEFAULT_DEFAULT;
-		}
-		try {
-			return Float.parseFloat(value);
-		} catch (NumberFormatException e) {
-			return FLOAT_DEFAULT_DEFAULT;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getInt(java.lang.String)
-	 */
-	public int getInt(String name) {
-		String value = internalGet(name);
-		if (value == null) {
-			return INT_DEFAULT_DEFAULT;
-		}
-		try {
-			return Integer.parseInt(value);
-		} catch (NumberFormatException e) {
-			return INT_DEFAULT_DEFAULT;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getLong(java.lang.String)
-	 */
-	public long getLong(String name) {
-		String value = internalGet(name);
-		if (value == null) {
-			return LONG_DEFAULT_DEFAULT;
-		}
-		try {
-			return Long.parseLong(value);
-		} catch (NumberFormatException e) {
-			return LONG_DEFAULT_DEFAULT;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#getString(java.lang.String)
-	 */
-	public String getString(String name) {
-		String value = internalGet(name);
-		return value == null ? STRING_DEFAULT_DEFAULT : value;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#isDefault(java.lang.String)
-	 */
-	public boolean isDefault(String name) {
-		if (name == null) {
-			return false;
-		}
-		return (Platform.getPreferencesService().get(name, null,
-				getPreferenceNodes(false))) == null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#needsSaving()
-	 */
-	public boolean needsSaving() {
-		return dirty;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#putValue(java.lang.String,
-	 *      java.lang.String)
-	 */
-	public void putValue(String name, String value) {
-		try {
-			// Do not notify listeners
-			silentRunning = true;
-			getStorePreferences().put(name, value);
-		} finally {
-			// Be sure that an exception does not stop property updates
-			silentRunning = false;
-			dirty = true;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
-	 */
-	public void removePropertyChangeListener(IPropertyChangeListener listener) {
-		removeListenerObject(listener);
-		if (!isListenerAttached()) {
-			disposePreferenceStoreListener();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
-	 *      double)
-	 */
-	public void setDefault(String name, double value) {
-		getDefaultPreferences().putDouble(name, value);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
-	 *      float)
-	 */
-	public void setDefault(String name, float value) {
-		getDefaultPreferences().putFloat(name, value);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
-	 *      int)
-	 */
-	public void setDefault(String name, int value) {
-		getDefaultPreferences().putInt(name, value);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
-	 *      long)
-	 */
-	public void setDefault(String name, long value) {
-		getDefaultPreferences().putLong(name, value);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
-	 *      java.lang.String)
-	 */
-	public void setDefault(String name, String defaultObject) {
-		getDefaultPreferences().put(name, defaultObject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String,
-	 *      boolean)
-	 */
-	public void setDefault(String name, boolean value) {
-		getDefaultPreferences().putBoolean(name, value);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setToDefault(java.lang.String)
-	 */
-	public void setToDefault(String name) {
-
-		String oldValue = getString(name);
-		String defaultValue = getDefaultString(name);
-		try {
-			silentRunning = true;// Turn off updates from the store
-			// removing a non-existing preference is a no-op so call the Core
-			// API directly
-			getStorePreferences().remove(name);
-			if (oldValue != defaultValue){
-				dirty = true;
-				firePropertyChangeEvent(name, oldValue, defaultValue);
-			}
-				
-		} finally {
-			silentRunning = false;// Restart listening to preferences
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
-	 *      double)
-	 */
-	public void setValue(String name, double value) {
-		double oldValue = getDouble(name);
-		if (oldValue == value) {
-			return;
-		}
-		try {
-			silentRunning = true;// Turn off updates from the store
-			if (getDefaultDouble(name) == value) {
-				getStorePreferences().remove(name);
-			} else {
-				getStorePreferences().putDouble(name, value);
-			}
-			dirty = true;
-			firePropertyChangeEvent(name, new Double(oldValue), new Double(
-					value));
-		} finally {
-			silentRunning = false;// Restart listening to preferences
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
-	 *      float)
-	 */
-	public void setValue(String name, float value) {
-		float oldValue = getFloat(name);
-		if (oldValue == value) {
-			return;
-		}
-		try {
-			silentRunning = true;// Turn off updates from the store
-			if (getDefaultFloat(name) == value) {
-				getStorePreferences().remove(name);
-			} else {
-				getStorePreferences().putFloat(name, value);
-			}
-			dirty = true;
-			firePropertyChangeEvent(name, new Float(oldValue), new Float(value));
-		} finally {
-			silentRunning = false;// Restart listening to preferences
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
-	 *      int)
-	 */
-	public void setValue(String name, int value) {
-		int oldValue = getInt(name);
-		if (oldValue == value) {
-			return;
-		}
-		try {
-			silentRunning = true;// Turn off updates from the store
-			if (getDefaultInt(name) == value) {
-				getStorePreferences().remove(name);
-			} else {
-				getStorePreferences().putInt(name, value);
-			}
-			dirty = true;
-			firePropertyChangeEvent(name, new Integer(oldValue), new Integer(
-					value));
-		} finally {
-			silentRunning = false;// Restart listening to preferences
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
-	 *      long)
-	 */
-	public void setValue(String name, long value) {
-		long oldValue = getLong(name);
-		if (oldValue == value) {
-			return;
-		}
-		try {
-			silentRunning = true;// Turn off updates from the store
-			if (getDefaultLong(name) == value) {
-				getStorePreferences().remove(name);
-			} else {
-				getStorePreferences().putLong(name, value);
-			}
-			dirty = true;
-			firePropertyChangeEvent(name, new Long(oldValue), new Long(value));
-		} finally {
-			silentRunning = false;// Restart listening to preferences
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
-	 *      java.lang.String)
-	 */
-	public void setValue(String name, String value) {
-		// Do not turn on silent running here as Strings are propagated
-		if (getDefaultString(name).equals(value)) {
-			getStorePreferences().remove(name);
-		} else {
-			getStorePreferences().put(name, value);
-		}
-		dirty = true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String,
-	 *      boolean)
-	 */
-	public void setValue(String name, boolean value) {
-		boolean oldValue = getBoolean(name);
-		if (oldValue == value) {
-			return;
-		}
-		try {
-			silentRunning = true;// Turn off updates from the store
-			if (getDefaultBoolean(name) == value) {
-				getStorePreferences().remove(name);
-			} else {
-				getStorePreferences().putBoolean(name, value);
-			}
-			dirty = true;
-			firePropertyChangeEvent(name, oldValue ? Boolean.TRUE
-					: Boolean.FALSE, value ? Boolean.TRUE : Boolean.FALSE);
-		} finally {
-			silentRunning = false;// Restart listening to preferences
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPersistentPreferenceStore#save()
-	 */
-	public void save() throws IOException {
-		try {
-			getStorePreferences().flush();
-			dirty = false;
-		} catch (BackingStoreException e) {
-			throw new IOException(e.getMessage());
-		}
-
-	}
-
-	/**
-	 * Dispose the receiver.
-	 */
-	private void disposePreferenceStoreListener() {
-
-		IEclipsePreferences root = (IEclipsePreferences) Platform
-				.getPreferencesService().getRootNode().node(
-						Plugin.PLUGIN_PREFERENCE_SCOPE);
-		try {
-			if (!(root.nodeExists(nodeQualifier))) {
-				return;
-			}
-		} catch (BackingStoreException e) {
-			return;// No need to report here as the node won't have the
-			// listener
-		}
-
-		IEclipsePreferences preferences = getStorePreferences();
-		if (preferences == null) {
-			return;
-		}
-		if (preferencesListener != null) {
-			preferences.removePreferenceChangeListener(preferencesListener);
-			preferencesListener = null;
-		}
-	}
-
-}

com.opcoach.e4.preferences/src/com/opcoach/e4/preferences/handlers/E4PreferencesHandler.java

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 OPCoach.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Manumitting Technologies : Brian de Alwis for initial API and implementation
- *     OPCoach  : O.Prouvost fix bugs on hierarchy
- *******************************************************************************//* 
- * Handler to open up a configured preferences dialog.
- * Written by Brian de Alwis, Manumitting Technologies.
- * Placed in the public domain.
- * This code comes from : http://www.eclipse.org/forums/index.php/fa/4347/
- * and was referenced in the thread : http://www.eclipse.org/forums/index.php/m/750139/
- */
-package com.opcoach.e4.preferences.handlers;
-
-import javax.inject.Named;
-
-import org.eclipse.e4.core.di.annotations.CanExecute;
-import org.eclipse.e4.core.di.annotations.Execute;
-import org.eclipse.e4.ui.services.IServiceConstants;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.swt.widgets.Shell;
-
-import com.opcoach.e4.preferences.internal.E4PreferenceRegistry;
-
-
-public class E4PreferencesHandler
-{
-	
-	
-	@CanExecute
-	public boolean canExecute()
-	{
-		return true;	
-	}
-	
-	@Execute
-	public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell,  E4PreferenceRegistry prefReg)
-	{
-		PreferenceManager pm = prefReg.getPreferenceManager();
-		PreferenceDialog dialog = new PreferenceDialog(shell, pm);
-		dialog.create();
-		dialog.getTreeViewer().setComparator(new ViewerComparator());
-		dialog.getTreeViewer().expandAll();
-		dialog.open();
-	}
-
-	
-
-	
-}

com.opcoach.e4.preferences/src/com/opcoach/e4/preferences/internal/E4PreferenceRegistry.java

@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 OPCoach.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     OPCoach - initial API and implementation
- *******************************************************************************/
-package com.opcoach.e4.preferences.internal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.di.annotations.Creatable;
-import org.eclipse.e4.core.services.contributions.IContributionFactory;
-import org.eclipse.e4.core.services.log.Logger;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.preference.PreferenceNode;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-
-import com.opcoach.e4.preferences.IPreferenceStoreProvider;
-import com.opcoach.e4.preferences.ScopedPreferenceStore;
-
-@SuppressWarnings("restriction")
-@Creatable
-public class E4PreferenceRegistry
-{
-
-	public static final String PREFS_PAGE_XP = "com.opcoach.e4.preferences.e4PreferencePages"; // $NON-NLS-1$
-	public static final String PREF_STORE_PROVIDER = "com.opcoach.e4.preferences.e4PreferenceStoreProvider"; // $NON-NLS-1$
-	protected static final String ELMT_PAGE = "page"; // $NON-NLS-1$
-	protected static final String ATTR_ID = "id"; // $NON-NLS-1$
-	protected static final String ATTR_CATEGORY = "category"; // $NON-NLS-1$
-	protected static final String ATTR_CLASS = "class"; // $NON-NLS-1$
-	protected static final String ATTR_NAME = "name"; // $NON-NLS-1$
-
-	protected static final String ATTR_PLUGIN_ID = "pluginId"; // $NON-NLS-1$
-	protected static final String ATTR_ID_IN_WBCONTEXT = "idInWorkbenchContext"; // $NON-NLS-1$
-
-	@Inject
-	protected Logger logger;
-
-	@Inject
-	protected IEclipseContext context;
-
-	@Inject
-	protected IExtensionRegistry registry;
-
-	private PreferenceManager pm = null;
-
-	// A map of (pluginId, { IPreferenceStoreProvider, or key in wbcontext }
-	private Map<String, Object> psProviders;
-
-	public PreferenceManager getPreferenceManager()
-	{
-
-		// Remember of the unbounded nodes to order parent pages.
-		// Map<category, list of children> (all nodes except root nodes)
-		Map<String, Collection<IPreferenceNode>> childrenNodes = new HashMap<String, Collection<IPreferenceNode>>();
-
-		if (pm != null)
-			return pm;
-
-		pm = new PreferenceManager();
-		IContributionFactory factory = context.get(IContributionFactory.class);
-
-		for (IConfigurationElement elmt : registry.getConfigurationElementsFor(PREFS_PAGE_XP))
-		{
-			String bundleId = elmt.getNamespaceIdentifier();
-			if (!elmt.getName().equals(ELMT_PAGE))
-			{
-				logger.warn("unexpected element: {0}", elmt.getName());
-				continue;
-			} else if (isEmpty(elmt.getAttribute(ATTR_ID)) || isEmpty(elmt.getAttribute(ATTR_NAME)))
-			{
-				logger.warn("missing id and/or name: {}", bundleId);
-				continue;
-			}
-			PreferenceNode pn = null;
-			if (elmt.getAttribute(ATTR_CLASS) != null)
-			{
-				PreferencePage page = null;
-				try
-				{
-					String prefPageURI = getClassURI(bundleId, elmt.getAttribute(ATTR_CLASS));
-					Object object = factory.create(prefPageURI, context);
-					if (!(object instanceof PreferencePage))
-					{
-						logger.error("Expected instance of PreferencePage: {0}", elmt.getAttribute(ATTR_CLASS));
-						continue;
-					}
-					page = (PreferencePage) object;
-					setPreferenceStore(bundleId, page);
-
-				} catch (ClassNotFoundException e)
-				{
-					logger.error(e);
-					continue;
-				}
-				ContextInjectionFactory.inject(page, context);
-				if ((page.getTitle() == null || page.getTitle().isEmpty()) && elmt.getAttribute(ATTR_NAME) != null)
-				{
-					page.setTitle(elmt.getAttribute(ATTR_NAME));
-				}
-
-				pn = new PreferenceNode(elmt.getAttribute(ATTR_ID), page);
-			} else
-			{
-				pn = new PreferenceNode(elmt.getAttribute(ATTR_ID), new EmptyPreferencePage(elmt.getAttribute(ATTR_NAME)));
-			}
-
-			// Issue 2 : Fix bug on order (see :
-			// https://github.com/opcoach/e4Preferences/issues/2)
-			// Add only pages at root level and remember of child pages for
-			// categories
-			String category = elmt.getAttribute(ATTR_CATEGORY);
-			if (isEmpty(category))
-			{
-				pm.addToRoot(pn);
-			} else
-			{
-				/*
-				 * IPreferenceNode parent = findNode(pm, category); if (parent
-				 * == null) { // No parent found, but may be the extension has
-				 * not been read yet. So remember of it unboundedNodes.put(pn,
-				 * category); } else { parent.add(pn); }
-				 */
-				// Check if this category is already registered.
-				Collection<IPreferenceNode> children = childrenNodes.get(category);
-				if (children == null)
-				{
-					children = new ArrayList<IPreferenceNode>();
-					childrenNodes.put(category, children);
-				}
-				children.add(pn);
-			}
-		}
-
-		// Must now bind pages that has not been added in nodes (depends on the
-		// preference page read order)
-		// Iterate on all possible categories
-		Collection<String> categoriesDone = new ArrayList<String>();
-
-		while (!childrenNodes.isEmpty())
-		{
-			for (String cat : Collections.unmodifiableSet(childrenNodes.keySet()))
-			{
-				// Is this category already in preference manager ? If not add
-				// it later...
-				IPreferenceNode parent = findNode(pm, cat);
-				if (parent != null)
-				{
-					// Can add the list of children to this parent page...
-					for (IPreferenceNode pn : childrenNodes.get(cat))
-					{
-						parent.add(pn);
-					}
-					// Ok This parent page is done. Can remove it from map
-					// outside of this loop
-					categoriesDone.add(cat);
-				}
-			}
-
-			for (String keyToRemove : categoriesDone)
-				childrenNodes.remove(keyToRemove);
-			categoriesDone.clear();
-
-		}
-
-		return pm;
-	}
-
-	private void setPreferenceStore(String bundleId, PreferencePage page)
-	{
-		// Affect preference store to this page if this is a
-		// PreferencePage, else, must manage it internally
-		// Set the issue#1 on github :
-		// https://github.com/opcoach/e4Preferences/issues/1
-		// And manage the extensions of IP
-		initialisePreferenceStoreProviders();
-
-		IPreferenceStore store = null;
-
-		// Get the preference store according to policy.
-		Object data = psProviders.get(bundleId);
-		if (data != null)
-		{
-			if (data instanceof IPreferenceStore)
-				store = (IPreferenceStore) data;
-			else if (data instanceof IPreferenceStoreProvider)
-				store = ((IPreferenceStoreProvider) data).getPreferenceStore();
-			else if (data instanceof String)
-				store = (IPreferenceStore) context.get((String) data);
-			
-		} else
-		{
-			// Default behavior : create a preference store for this bundle and remember of it
-			store = new ScopedPreferenceStore(InstanceScope.INSTANCE, bundleId);
-			psProviders.put(bundleId, store);
-		}
-
-		
-		if (store != null)
-			page.setPreferenceStore(store);
-		else
-		{
-			logger.warn("Unable to set the preferenceStore for page " + page.getTitle() + " defined in bundle " + bundleId);
-		}
-
-	}
-
-	/** Read the e4PreferenceStoreProvider extension point */
-	private void initialisePreferenceStoreProviders()
-	{
-		if (psProviders == null)
-		{
-			IContributionFactory factory = context.get(IContributionFactory.class);
-
-			psProviders = new HashMap<String, Object>();
-
-			// Read extensions and fill the map...
-			for (IConfigurationElement elmt : registry.getConfigurationElementsFor(PREF_STORE_PROVIDER))
-			{
-				String declaringBundle = elmt.getNamespaceIdentifier();
-				String pluginId = elmt.getAttribute(ATTR_PLUGIN_ID);
-				if (isEmpty(pluginId))
-				{
-					logger.warn("missing plugin Id in extension " + PREF_STORE_PROVIDER + " check the plugin " + declaringBundle);
-					continue;
-				}
-
-				String classname = elmt.getAttribute(ATTR_CLASS);
-				String objectId = elmt.getAttribute(ATTR_ID_IN_WBCONTEXT);
-
-				if ((isEmpty(classname) && isEmpty(objectId)) || (((classname != null) && classname.length() > 0) && ((objectId != null) && objectId.length() > 0)))
-				{
-					logger.warn("In extension " + PREF_STORE_PROVIDER + " only one of the two attributes (pluginId or idInWorkbenchContext) must be set. Check the plugin "
-							+ declaringBundle);
-					continue;
-				}
-
-				// Ok can now work with data...
-				Object data = objectId;
-				if (classname != null)
-				{
-					data = factory.create(classname, context);
-					if (!(data instanceof IPreferenceStoreProvider))
-					{
-						logger.warn("In extension " + PREF_STORE_PROVIDER + " the class must implements IPreferenceStoreProvider. Check the plugin " + declaringBundle);
-						continue;
-					}
-				}
-
-				psProviders.put(pluginId, data);
-
-			}
-		}
-	}
-
-	private IPreferenceNode findNode(PreferenceManager pm, String categoryId)
-	{
-		for (Object o : pm.getElements(PreferenceManager.POST_ORDER))
-		{
-			if (o instanceof IPreferenceNode && ((IPreferenceNode) o).getId().equals(categoryId))
-			{
-				return (IPreferenceNode) o;
-			}
-		}
-		return null;
-	}
-
-	private String getClassURI(String definingBundleId, String spec) throws ClassNotFoundException
-	{
-		if (spec.startsWith("platform:"))
-		{
-			return spec;
-		} // $NON-NLS-1$
-		return "bundleclass://" + definingBundleId + '/' + spec;
-	}
-
-	private boolean isEmpty(String value)
-	{
-		return value == null || value.trim().isEmpty();
-	}
-
-	static class EmptyPreferencePage extends PreferencePage
-	{
-
-		public EmptyPreferencePage(String title)
-		{
-			setTitle(title);
-			noDefaultAndApplyButton();
-		}
-
-		@Override
-		protected Control createContents(Composite parent)
-		{
-			return new Label(parent, SWT.NONE);
-		}
-
-	}
-
-}

doc/com.minres.scviewer.doc/.project

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.minres.scviewer.doc</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>