From 8aab5490feb06ec6cf861d10b1713fd33ab8ff2c Mon Sep 17 00:00:00 2001 From: ejentzsx Date: Thu, 22 Jan 2015 13:59:30 +0100 Subject: [PATCH] Added Tycho build Minor UI fixes --- .../.classpath | 2 +- .../.gitignore | 1 + com.minres.scviewer.database.sqlite/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../build.properties | 1 - com.minres.scviewer.database.sqlite/pom.xml | 24 +++ com.minres.scviewer.database.test/.classpath | 6 +- com.minres.scviewer.database.test/.gitignore | 1 + com.minres.scviewer.database.test/.project | 6 + .../org.eclipse.core.resources.prefs | 1 + .../.settings/org.eclipse.jdt.core.prefs | 1 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../META-INF/MANIFEST.MF | 1 - .../OSGI-INF/component.xml | 5 - .../build.properties | 4 +- com.minres.scviewer.database.test/pom.xml | 24 +++ com.minres.scviewer.database.text/.classpath | 8 +- com.minres.scviewer.database.text/.gitignore | 1 + com.minres.scviewer.database.text/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../build.properties | 1 - com.minres.scviewer.database.text/pom.xml | 24 +++ com.minres.scviewer.database.vcd/.classpath | 6 +- com.minres.scviewer.database.vcd/.gitignore | 1 + com.minres.scviewer.database.vcd/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../META-INF/MANIFEST.MF | 2 +- .../build.properties | 1 - com.minres.scviewer.database.vcd/pom.xml | 24 +++ com.minres.scviewer.database/.classpath | 6 +- com.minres.scviewer.database/.gitignore | 1 + com.minres.scviewer.database/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 1 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../META-INF/MANIFEST.MF | 2 +- com.minres.scviewer.database/build.properties | 1 - com.minres.scviewer.database/pom.xml | 24 +++ com.minres.scviewer.feature/.gitignore | 1 + com.minres.scviewer.feature/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.m2e.core.prefs | 4 + com.minres.scviewer.feature/build.properties | 3 +- com.minres.scviewer.feature/pom.xml | 11 + com.minres.scviewer.feature/txviewer.product | 35 --- com.minres.scviewer.parent/.project | 17 ++ .../.settings/org.eclipse.m2e.core.prefs | 4 + com.minres.scviewer.parent/pom.xml | 201 ++++++++++++++++++ com.minres.scviewer.ui/.classpath | 8 +- com.minres.scviewer.ui/.gitignore | 1 + com.minres.scviewer.ui/.project | 6 + .../org.eclipse.core.resources.prefs | 1 + .../.settings/org.eclipse.m2e.core.prefs | 4 + com.minres.scviewer.ui/META-INF/MANIFEST.MF | 2 +- com.minres.scviewer.ui/build.properties | 1 - com.minres.scviewer.ui/pom.xml | 24 +++ .../src/com/minres/scviewer/ui/swt/Ruler.java | 2 +- .../com/minres/scviewer/ui/swt/TxDisplay.java | 5 +- .../scviewer/ui/swt/WaveformCanvas.java | 4 +- com.minres.scviewer.updateSite/.gitignore | 1 + com.minres.scviewer.updateSite/.project | 6 + .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../{site.xml => category.xml} | 2 +- com.minres.scviewer.updateSite/pom.xml | 20 ++ .../{ => src/main/resources}/index.html | 0 .../{ => src/main/resources}/web/site.css | 0 .../{ => src/main/resources}/web/site.xsl | 0 71 files changed, 532 insertions(+), 77 deletions(-) create mode 100644 com.minres.scviewer.database.sqlite/.settings/org.eclipse.core.resources.prefs create mode 100644 com.minres.scviewer.database.sqlite/.settings/org.eclipse.m2e.core.prefs create mode 100644 com.minres.scviewer.database.sqlite/pom.xml create mode 100644 com.minres.scviewer.database.test/.settings/org.eclipse.m2e.core.prefs delete mode 100644 com.minres.scviewer.database.test/OSGI-INF/component.xml create mode 100644 com.minres.scviewer.database.test/pom.xml create mode 100644 com.minres.scviewer.database.text/.settings/org.eclipse.core.resources.prefs create mode 100644 com.minres.scviewer.database.text/.settings/org.eclipse.m2e.core.prefs create mode 100644 com.minres.scviewer.database.text/pom.xml create mode 100644 com.minres.scviewer.database.vcd/.settings/org.eclipse.core.resources.prefs create mode 100644 com.minres.scviewer.database.vcd/.settings/org.eclipse.m2e.core.prefs create mode 100644 com.minres.scviewer.database.vcd/pom.xml create mode 100644 com.minres.scviewer.database/.settings/org.eclipse.core.resources.prefs create mode 100644 com.minres.scviewer.database/.settings/org.eclipse.m2e.core.prefs create mode 100644 com.minres.scviewer.database/pom.xml create mode 100644 com.minres.scviewer.feature/.gitignore create mode 100644 com.minres.scviewer.feature/.settings/org.eclipse.core.resources.prefs create mode 100644 com.minres.scviewer.feature/.settings/org.eclipse.m2e.core.prefs create mode 100644 com.minres.scviewer.feature/pom.xml delete mode 100644 com.minres.scviewer.feature/txviewer.product create mode 100644 com.minres.scviewer.parent/.project create mode 100644 com.minres.scviewer.parent/.settings/org.eclipse.m2e.core.prefs create mode 100644 com.minres.scviewer.parent/pom.xml create mode 100644 com.minres.scviewer.ui/.settings/org.eclipse.m2e.core.prefs create mode 100644 com.minres.scviewer.ui/pom.xml create mode 100644 com.minres.scviewer.updateSite/.settings/org.eclipse.core.resources.prefs create mode 100644 com.minres.scviewer.updateSite/.settings/org.eclipse.m2e.core.prefs rename com.minres.scviewer.updateSite/{site.xml => category.xml} (69%) create mode 100644 com.minres.scviewer.updateSite/pom.xml rename com.minres.scviewer.updateSite/{ => src/main/resources}/index.html (100%) rename com.minres.scviewer.updateSite/{ => src/main/resources}/web/site.css (100%) rename com.minres.scviewer.updateSite/{ => src/main/resources}/web/site.xsl (100%) diff --git a/com.minres.scviewer.database.sqlite/.classpath b/com.minres.scviewer.database.sqlite/.classpath index 563eb8c..d21af63 100644 --- a/com.minres.scviewer.database.sqlite/.classpath +++ b/com.minres.scviewer.database.sqlite/.classpath @@ -4,5 +4,5 @@ - + diff --git a/com.minres.scviewer.database.sqlite/.gitignore b/com.minres.scviewer.database.sqlite/.gitignore index ae3c172..09e3bc9 100644 --- a/com.minres.scviewer.database.sqlite/.gitignore +++ b/com.minres.scviewer.database.sqlite/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/com.minres.scviewer.database.sqlite/.project b/com.minres.scviewer.database.sqlite/.project index 2a48cd3..7a9e5e4 100644 --- a/com.minres.scviewer.database.sqlite/.project +++ b/com.minres.scviewer.database.sqlite/.project @@ -25,8 +25,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/com.minres.scviewer.database.sqlite/.settings/org.eclipse.core.resources.prefs b/com.minres.scviewer.database.sqlite/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.minres.scviewer.database.sqlite/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.minres.scviewer.database.sqlite/.settings/org.eclipse.m2e.core.prefs b/com.minres.scviewer.database.sqlite/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.scviewer.database.sqlite/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.scviewer.database.sqlite/build.properties b/com.minres.scviewer.database.sqlite/build.properties index 8e3ad1b..000038b 100644 --- a/com.minres.scviewer.database.sqlite/build.properties +++ b/com.minres.scviewer.database.sqlite/build.properties @@ -9,7 +9,6 @@ # MINRES Technologies GmbH - initial API and implementation ############################################################################### source.. = src/ -output.. = bin/ bin.includes = META-INF/,\ .,\ sqlite-jdbc-3.8.7.jar,\ diff --git a/com.minres.scviewer.database.sqlite/pom.xml b/com.minres.scviewer.database.sqlite/pom.xml new file mode 100644 index 0000000..95e686f --- /dev/null +++ b/com.minres.scviewer.database.sqlite/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + com.minres.scviewer.database.sqlite + + src + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + + + com.minres.scviewer + com.minres.scviewer.parent + 1.0.0-SNAPSHOT + ../com.minres.scviewer.parent + + eclipse-plugin + \ No newline at end of file diff --git a/com.minres.scviewer.database.test/.classpath b/com.minres.scviewer.database.test/.classpath index 16d067f..46cec6e 100644 --- a/com.minres.scviewer.database.test/.classpath +++ b/com.minres.scviewer.database.test/.classpath @@ -1,7 +1,7 @@ + - - - + + diff --git a/com.minres.scviewer.database.test/.gitignore b/com.minres.scviewer.database.test/.gitignore index ae3c172..09e3bc9 100644 --- a/com.minres.scviewer.database.test/.gitignore +++ b/com.minres.scviewer.database.test/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/com.minres.scviewer.database.test/.project b/com.minres.scviewer.database.test/.project index 2347cce..92c9f12 100644 --- a/com.minres.scviewer.database.test/.project +++ b/com.minres.scviewer.database.test/.project @@ -25,8 +25,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/com.minres.scviewer.database.test/.settings/org.eclipse.core.resources.prefs b/com.minres.scviewer.database.test/.settings/org.eclipse.core.resources.prefs index 29a3512..e84a201 100644 --- a/com.minres.scviewer.database.test/.settings/org.eclipse.core.resources.prefs +++ b/com.minres.scviewer.database.test/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,3 @@ eclipse.preferences.version=1 encoding//src/com/minres/scviewer/database/test/DatabaseServicesTest.java=UTF-8 +encoding/=UTF-8 diff --git a/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs index f42de36..443e085 100644 --- a/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs +++ b/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs @@ -4,4 +4,5 @@ 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 diff --git a/com.minres.scviewer.database.test/.settings/org.eclipse.m2e.core.prefs b/com.minres.scviewer.database.test/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.scviewer.database.test/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.scviewer.database.test/META-INF/MANIFEST.MF b/com.minres.scviewer.database.test/META-INF/MANIFEST.MF index 1678032..c14c0b7 100644 --- a/com.minres.scviewer.database.test/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.test/META-INF/MANIFEST.MF @@ -7,5 +7,4 @@ Bundle-Vendor: MINRES Technologies GnbH Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.junit, com.minres.scviewer.database -Service-Component: OSGI-INF/component.xml Bundle-ActivationPolicy: lazy diff --git a/com.minres.scviewer.database.test/OSGI-INF/component.xml b/com.minres.scviewer.database.test/OSGI-INF/component.xml deleted file mode 100644 index ce4c335..0000000 --- a/com.minres.scviewer.database.test/OSGI-INF/component.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/com.minres.scviewer.database.test/build.properties b/com.minres.scviewer.database.test/build.properties index d49042b..9066d9d 100644 --- a/com.minres.scviewer.database.test/build.properties +++ b/com.minres.scviewer.database.test/build.properties @@ -8,8 +8,6 @@ # Contributors: # MINRES Technologies GmbH - initial API and implementation ############################################################################### -output.. = bin/ bin.includes = META-INF/,\ - .,\ - OSGI-INF/ + . source.. = src/ diff --git a/com.minres.scviewer.database.test/pom.xml b/com.minres.scviewer.database.test/pom.xml new file mode 100644 index 0000000..1177551 --- /dev/null +++ b/com.minres.scviewer.database.test/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + com.minres.scviewer.database.test + + src + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + + + com.minres.scviewer + com.minres.scviewer.parent + 1.0.0-SNAPSHOT + ../com.minres.scviewer.parent + + eclipse-test-plugin + \ No newline at end of file diff --git a/com.minres.scviewer.database.text/.classpath b/com.minres.scviewer.database.text/.classpath index ec468ee..46cec6e 100644 --- a/com.minres.scviewer.database.text/.classpath +++ b/com.minres.scviewer.database.text/.classpath @@ -1,9 +1,7 @@ + - - - - - + + diff --git a/com.minres.scviewer.database.text/.gitignore b/com.minres.scviewer.database.text/.gitignore index 5e56e04..06ba672 100644 --- a/com.minres.scviewer.database.text/.gitignore +++ b/com.minres.scviewer.database.text/.gitignore @@ -1 +1,2 @@ /bin +/target/ diff --git a/com.minres.scviewer.database.text/.project b/com.minres.scviewer.database.text/.project index 954b21f..e6c7553 100644 --- a/com.minres.scviewer.database.text/.project +++ b/com.minres.scviewer.database.text/.project @@ -25,8 +25,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.groovy.core.groovyNature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/com.minres.scviewer.database.text/.settings/org.eclipse.core.resources.prefs b/com.minres.scviewer.database.text/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.minres.scviewer.database.text/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.minres.scviewer.database.text/.settings/org.eclipse.m2e.core.prefs b/com.minres.scviewer.database.text/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.scviewer.database.text/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.scviewer.database.text/build.properties b/com.minres.scviewer.database.text/build.properties index d49042b..7856cb9 100644 --- a/com.minres.scviewer.database.text/build.properties +++ b/com.minres.scviewer.database.text/build.properties @@ -8,7 +8,6 @@ # Contributors: # MINRES Technologies GmbH - initial API and implementation ############################################################################### -output.. = bin/ bin.includes = META-INF/,\ .,\ OSGI-INF/ diff --git a/com.minres.scviewer.database.text/pom.xml b/com.minres.scviewer.database.text/pom.xml new file mode 100644 index 0000000..7c55efb --- /dev/null +++ b/com.minres.scviewer.database.text/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + com.minres.scviewer.database.text + + src + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + + + com.minres.scviewer + com.minres.scviewer.parent + 1.0.0-SNAPSHOT + ../com.minres.scviewer.parent + + eclipse-plugin + \ No newline at end of file diff --git a/com.minres.scviewer.database.vcd/.classpath b/com.minres.scviewer.database.vcd/.classpath index 1fa3e68..46cec6e 100644 --- a/com.minres.scviewer.database.vcd/.classpath +++ b/com.minres.scviewer.database.vcd/.classpath @@ -1,7 +1,7 @@ - + - - + + diff --git a/com.minres.scviewer.database.vcd/.gitignore b/com.minres.scviewer.database.vcd/.gitignore index ae3c172..09e3bc9 100644 --- a/com.minres.scviewer.database.vcd/.gitignore +++ b/com.minres.scviewer.database.vcd/.gitignore @@ -1 +1,2 @@ /bin/ +/target/ diff --git a/com.minres.scviewer.database.vcd/.project b/com.minres.scviewer.database.vcd/.project index 2e4e1b2..29c92e0 100644 --- a/com.minres.scviewer.database.vcd/.project +++ b/com.minres.scviewer.database.vcd/.project @@ -25,8 +25,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/com.minres.scviewer.database.vcd/.settings/org.eclipse.core.resources.prefs b/com.minres.scviewer.database.vcd/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.minres.scviewer.database.vcd/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.minres.scviewer.database.vcd/.settings/org.eclipse.m2e.core.prefs b/com.minres.scviewer.database.vcd/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.scviewer.database.vcd/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF index 0270a0c..134e951 100644 --- a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Vcd +Bundle-Name: VCD signal database Bundle-SymbolicName: com.minres.scviewer.database.vcd Bundle-Version: 1.0.0.qualifier Bundle-Vendor: MINRES Technologies GmbH diff --git a/com.minres.scviewer.database.vcd/build.properties b/com.minres.scviewer.database.vcd/build.properties index 608209f..5f30e48 100644 --- a/com.minres.scviewer.database.vcd/build.properties +++ b/com.minres.scviewer.database.vcd/build.properties @@ -9,7 +9,6 @@ # MINRES Technologies GmbH - initial API and implementation ############################################################################### source.. = src/ -output.. = bin/ bin.includes = META-INF/,\ .,\ OSGI-INF/ diff --git a/com.minres.scviewer.database.vcd/pom.xml b/com.minres.scviewer.database.vcd/pom.xml new file mode 100644 index 0000000..93264e1 --- /dev/null +++ b/com.minres.scviewer.database.vcd/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + com.minres.scviewer.database.vcd + + src + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + + + com.minres.scviewer + com.minres.scviewer.parent + 1.0.0-SNAPSHOT + ../com.minres.scviewer.parent + + eclipse-plugin + \ No newline at end of file diff --git a/com.minres.scviewer.database/.classpath b/com.minres.scviewer.database/.classpath index 16d067f..46cec6e 100644 --- a/com.minres.scviewer.database/.classpath +++ b/com.minres.scviewer.database/.classpath @@ -1,7 +1,7 @@ + - - - + + diff --git a/com.minres.scviewer.database/.gitignore b/com.minres.scviewer.database/.gitignore index 5e56e04..06ba672 100644 --- a/com.minres.scviewer.database/.gitignore +++ b/com.minres.scviewer.database/.gitignore @@ -1 +1,2 @@ /bin +/target/ diff --git a/com.minres.scviewer.database/.project b/com.minres.scviewer.database/.project index 01e6eeb..ebc8b1e 100644 --- a/com.minres.scviewer.database/.project +++ b/com.minres.scviewer.database/.project @@ -25,8 +25,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/com.minres.scviewer.database/.settings/org.eclipse.core.resources.prefs b/com.minres.scviewer.database/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.minres.scviewer.database/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs b/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs index f42de36..443e085 100644 --- a/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs +++ b/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs @@ -4,4 +4,5 @@ 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 diff --git a/com.minres.scviewer.database/.settings/org.eclipse.m2e.core.prefs b/com.minres.scviewer.database/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.scviewer.database/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.scviewer.database/META-INF/MANIFEST.MF b/com.minres.scviewer.database/META-INF/MANIFEST.MF index 4f5e81c..78283e0 100644 --- a/com.minres.scviewer.database/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Transaction Database +Bundle-Name: Waveform database Bundle-SymbolicName: com.minres.scviewer.database Bundle-Version: 1.0.0.qualifier Bundle-Vendor: MINRES Technologies GmbH diff --git a/com.minres.scviewer.database/build.properties b/com.minres.scviewer.database/build.properties index d49042b..7856cb9 100644 --- a/com.minres.scviewer.database/build.properties +++ b/com.minres.scviewer.database/build.properties @@ -8,7 +8,6 @@ # Contributors: # MINRES Technologies GmbH - initial API and implementation ############################################################################### -output.. = bin/ bin.includes = META-INF/,\ .,\ OSGI-INF/ diff --git a/com.minres.scviewer.database/pom.xml b/com.minres.scviewer.database/pom.xml new file mode 100644 index 0000000..62180bb --- /dev/null +++ b/com.minres.scviewer.database/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + com.minres.scviewer.database + + src + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + + + com.minres.scviewer + com.minres.scviewer.parent + 1.0.0-SNAPSHOT + ../com.minres.scviewer.parent + + eclipse-plugin + \ No newline at end of file diff --git a/com.minres.scviewer.feature/.gitignore b/com.minres.scviewer.feature/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/com.minres.scviewer.feature/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/com.minres.scviewer.feature/.project b/com.minres.scviewer.feature/.project index 3a05e69..9bf4b5d 100644 --- a/com.minres.scviewer.feature/.project +++ b/com.minres.scviewer.feature/.project @@ -10,8 +10,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.FeatureNature diff --git a/com.minres.scviewer.feature/.settings/org.eclipse.core.resources.prefs b/com.minres.scviewer.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.minres.scviewer.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.minres.scviewer.feature/.settings/org.eclipse.m2e.core.prefs b/com.minres.scviewer.feature/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.scviewer.feature/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.scviewer.feature/build.properties b/com.minres.scviewer.feature/build.properties index 64f93a9..b3a611b 100644 --- a/com.minres.scviewer.feature/build.properties +++ b/com.minres.scviewer.feature/build.properties @@ -1 +1,2 @@ -bin.includes = feature.xml +bin.includes = feature.xml,\ + feature.properties diff --git a/com.minres.scviewer.feature/pom.xml b/com.minres.scviewer.feature/pom.xml new file mode 100644 index 0000000..c2b0204 --- /dev/null +++ b/com.minres.scviewer.feature/pom.xml @@ -0,0 +1,11 @@ + + 4.0.0 + com.minres.scviewer.feature + eclipse-feature + + com.minres.scviewer + com.minres.scviewer.parent + 1.0.0-SNAPSHOT + ../com.minres.scviewer.parent + + \ No newline at end of file diff --git a/com.minres.scviewer.feature/txviewer.product b/com.minres.scviewer.feature/txviewer.product deleted file mode 100644 index 4ffad07..0000000 --- a/com.minres.scviewer.feature/txviewer.product +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/com.minres.scviewer.parent/.project b/com.minres.scviewer.parent/.project new file mode 100644 index 0000000..a68889f --- /dev/null +++ b/com.minres.scviewer.parent/.project @@ -0,0 +1,17 @@ + + + com.minres.scviewer.parent + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/com.minres.scviewer.parent/.settings/org.eclipse.m2e.core.prefs b/com.minres.scviewer.parent/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.scviewer.parent/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.scviewer.parent/pom.xml b/com.minres.scviewer.parent/pom.xml new file mode 100644 index 0000000..0feb310 --- /dev/null +++ b/com.minres.scviewer.parent/pom.xml @@ -0,0 +1,201 @@ + + 4.0.0 + com.minres.scviewer + com.minres.scviewer.parent + 1.0.0-SNAPSHOT + pom + + ../com.minres.scviewer.database + ../com.minres.scviewer.database.sqlite + ../com.minres.scviewer.database.text + ../com.minres.scviewer.database.vcd + ../com.minres.scviewer.feature + ../com.minres.scviewer.ui + ../com.minres.scviewer.updateSite + ../com.minres.scviewer.database.test + + + + 0.22.0 + 0.22.0 + UTF-8 + http://download.eclipse.org/releases/luna + http://dist.springsource.org/release/GRECLIPSE/e4.4 + https://oss.sonatype.org/content/groups/public/ + + + + + + eclipse + ${eclipse-repo.url} + p2 + + + springsource + ${groovy-repo.url} + p2 + + + + + + tycho + ${tycho-repo.url} + + false + + + true + + + + + + + + org.eclipse.tycho + tycho-maven-plugin + ${tycho.version} + true + + + + org.eclipse.tycho + target-platform-configuration + + + + linux + gtk + x86 + + + linux + gtk + x86_64 + + + win32 + win32 + x86 + + + win32 + win32 + x86_64 + + + macosx + cocoa + x86_64 + + + + + + + org.eclipse.tycho + tycho-source-plugin + + + plugin-source + + plugin-source + + + + + + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho.version} + + + org.eclipse.tycho + tycho-compiler-plugin + ${tycho.version} + + + + + ISO-8859-1 + + + + + org.eclipse.tycho + tycho-packaging-plugin + ${tycho.version} + + + org.eclipse.tycho.extras + tycho-buildtimestamp-jgit + ${tycho-extras.version} + + + + + org.eclipse.tycho + tycho-surefire-plugin + ${tycho.version} + + + org.eclipse.tycho + tycho-source-plugin + ${tycho.version} + + false + + + + org.eclipse.tycho + tycho-p2-director-plugin + ${tycho.version} + + + org.eclipse.tycho + tycho-p2-repository-plugin + ${tycho.version} + + + org.eclipse.tycho.extras + tycho-source-feature-plugin + ${tycho-extras.version} + + + org.eclipse.tycho.extras + tycho-custom-bundle-plugin + ${tycho-extras.version} + + + org.eclipse.tycho + tycho-p2-plugin + ${tycho.version} + + warn + none + + + http://download.eclipse.org/eclipse/updates/4.4 + + + + + + + + + \ No newline at end of file diff --git a/com.minres.scviewer.ui/.classpath b/com.minres.scviewer.ui/.classpath index f653dd5..fffb3a2 100644 --- a/com.minres.scviewer.ui/.classpath +++ b/com.minres.scviewer.ui/.classpath @@ -1,8 +1,8 @@ + - - - - + + + diff --git a/com.minres.scviewer.ui/.gitignore b/com.minres.scviewer.ui/.gitignore index 5e56e04..06ba672 100644 --- a/com.minres.scviewer.ui/.gitignore +++ b/com.minres.scviewer.ui/.gitignore @@ -1 +1,2 @@ /bin +/target/ diff --git a/com.minres.scviewer.ui/.project b/com.minres.scviewer.ui/.project index e5469cf..b604161 100644 --- a/com.minres.scviewer.ui/.project +++ b/com.minres.scviewer.ui/.project @@ -25,8 +25,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.groovy.core.groovyNature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/com.minres.scviewer.ui/.settings/org.eclipse.core.resources.prefs b/com.minres.scviewer.ui/.settings/org.eclipse.core.resources.prefs index 2cfbe0c..14960bd 100644 --- a/com.minres.scviewer.ui/.settings/org.eclipse.core.resources.prefs +++ b/com.minres.scviewer.ui/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,3 @@ eclipse.preferences.version=1 encoding//src/com/minres/scviewer/ui/swt/TxDisplay.java=UTF-8 +encoding/=UTF-8 diff --git a/com.minres.scviewer.ui/.settings/org.eclipse.m2e.core.prefs b/com.minres.scviewer.ui/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.scviewer.ui/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.scviewer.ui/META-INF/MANIFEST.MF b/com.minres.scviewer.ui/META-INF/MANIFEST.MF index 1590348..acc0c5c 100644 --- a/com.minres.scviewer.ui/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.ui/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Graph +Bundle-Name: SCViewer Bundle-SymbolicName: com.minres.scviewer.ui;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: com.minres.scviewer.ui.TxEditorPlugin diff --git a/com.minres.scviewer.ui/build.properties b/com.minres.scviewer.ui/build.properties index 2ffd695..cf8a4d2 100644 --- a/com.minres.scviewer.ui/build.properties +++ b/com.minres.scviewer.ui/build.properties @@ -15,4 +15,3 @@ bin.includes = plugin.xml,\ res/ source.. = src/ jars.compile.order = . -output.. = bin/ diff --git a/com.minres.scviewer.ui/pom.xml b/com.minres.scviewer.ui/pom.xml new file mode 100644 index 0000000..74d211a --- /dev/null +++ b/com.minres.scviewer.ui/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + com.minres.scviewer.ui + + src + + + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + + + + com.minres.scviewer + com.minres.scviewer.parent + 1.0.0-SNAPSHOT + ../com.minres.scviewer.parent + + eclipse-plugin + \ No newline at end of file diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/Ruler.java b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/Ruler.java index 5f17f27..8faf9f2 100644 --- a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/Ruler.java +++ b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/Ruler.java @@ -47,7 +47,7 @@ public class Ruler extends Composite { private String unit=""; Ruler(Composite parent, int style) { - super(parent, style | SWT.DOUBLE_BUFFERED); + super(parent, style | SWT.DOUBLE_BUFFERED | SWT.NO_BACKGROUND); this.length=0; headerBgColor=getDisplay().getSystemColor(SWT.COLOR_WHITE); headerFgColor=getDisplay().getSystemColor(SWT.COLOR_BLACK); diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/TxDisplay.java b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/TxDisplay.java index d170724..9a63447 100644 --- a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/TxDisplay.java +++ b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/TxDisplay.java @@ -471,8 +471,11 @@ public class TxDisplay implements PropertyChangeListener, ISelectionProvider, Mo gc.setForeground(SWTResourceManager.getColor(SWT.COLOR_LIST_SELECTION_TEXT)); gc.fillRectangle(subArea.x, subArea.y+yOffset, subArea.width, subArea.height); gc.setFont(nameFontB); - }else + }else{ + gc.setBackground(SWTResourceManager.getColor(SWT.COLOR_LIST_BACKGROUND)); + gc.setForeground(SWTResourceManager.getColor(SWT.COLOR_LIST_FOREGROUND)); gc.setFont(nameFont); + } gc.drawText(value, subArea.x+5, subArea.y + yOffset+(trackList.getTrackHeight()-size.y)/2, true); } diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/WaveformCanvas.java b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/WaveformCanvas.java index 50d2332..066ec64 100644 --- a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/WaveformCanvas.java +++ b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/swt/WaveformCanvas.java @@ -82,7 +82,7 @@ public class WaveformCanvas extends Canvas { * @param style the style of this control. */ public WaveformCanvas(final Composite parent, int style) { - super( parent, style |SWT.NO_BACKGROUND|SWT.NO_REDRAW_RESIZE|SWT.V_SCROLL|SWT.H_SCROLL); + 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(); @@ -124,7 +124,7 @@ public class WaveformCanvas extends Canvas { colors[Colors.SIGNALZ.ordinal()]=SWTResourceManager.getColor(SWT.COLOR_GRAY); colors[Colors.SIGNALX.ordinal()]=SWTResourceManager.getColor(SWT.COLOR_RED); colors[Colors.SIGNAL_TEXT.ordinal()]=SWTResourceManager.getColor(SWT.COLOR_WHITE); - colors[Colors.CURSOR.ordinal()]=SWTResourceManager.getColor(SWT.COLOR_DARK_RED); + colors[Colors.CURSOR.ordinal()]=SWTResourceManager.getColor(SWT.COLOR_YELLOW); } } diff --git a/com.minres.scviewer.updateSite/.gitignore b/com.minres.scviewer.updateSite/.gitignore index 3f14e2a..aea1bd3 100644 --- a/com.minres.scviewer.updateSite/.gitignore +++ b/com.minres.scviewer.updateSite/.gitignore @@ -2,3 +2,4 @@ /plugins/ /artifacts.jar /content.jar +/target/ diff --git a/com.minres.scviewer.updateSite/.project b/com.minres.scviewer.updateSite/.project index f698a6a..b9340c3 100644 --- a/com.minres.scviewer.updateSite/.project +++ b/com.minres.scviewer.updateSite/.project @@ -10,8 +10,14 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.UpdateSiteNature diff --git a/com.minres.scviewer.updateSite/.settings/org.eclipse.core.resources.prefs b/com.minres.scviewer.updateSite/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/com.minres.scviewer.updateSite/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.minres.scviewer.updateSite/.settings/org.eclipse.m2e.core.prefs b/com.minres.scviewer.updateSite/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/com.minres.scviewer.updateSite/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/com.minres.scviewer.updateSite/site.xml b/com.minres.scviewer.updateSite/category.xml similarity index 69% rename from com.minres.scviewer.updateSite/site.xml rename to com.minres.scviewer.updateSite/category.xml index 6817c97..a4f42b6 100644 --- a/com.minres.scviewer.updateSite/site.xml +++ b/com.minres.scviewer.updateSite/category.xml @@ -1,6 +1,6 @@ - + diff --git a/com.minres.scviewer.updateSite/pom.xml b/com.minres.scviewer.updateSite/pom.xml new file mode 100644 index 0000000..00dba70 --- /dev/null +++ b/com.minres.scviewer.updateSite/pom.xml @@ -0,0 +1,20 @@ + + 4.0.0 + com.minres.scviewer.updateSite + eclipse-repository + + com.minres.scviewer + com.minres.scviewer.parent + 1.0.0-SNAPSHOT + ../com.minres.scviewer.parent + + + \ No newline at end of file diff --git a/com.minres.scviewer.updateSite/index.html b/com.minres.scviewer.updateSite/src/main/resources/index.html similarity index 100% rename from com.minres.scviewer.updateSite/index.html rename to com.minres.scviewer.updateSite/src/main/resources/index.html diff --git a/com.minres.scviewer.updateSite/web/site.css b/com.minres.scviewer.updateSite/src/main/resources/web/site.css similarity index 100% rename from com.minres.scviewer.updateSite/web/site.css rename to com.minres.scviewer.updateSite/src/main/resources/web/site.css diff --git a/com.minres.scviewer.updateSite/web/site.xsl b/com.minres.scviewer.updateSite/src/main/resources/web/site.xsl similarity index 100% rename from com.minres.scviewer.updateSite/web/site.xsl rename to com.minres.scviewer.updateSite/src/main/resources/web/site.xsl