refactor plugin structures

2020-07-15 21:39:30 +02:00
1 parent b4a7f032f5
commit 8cb77a555b
@@ -29,26 +29,12 @@ http://www.eclipse.org/legal/epl-v10.html
   </url>

   <requires>
+      <import plugin="org.codehaus.groovy" version="2.5.8" match="greaterOrEqual"/>
      <import plugin="org.eclipse.osgi.services" version="3.4.0" match="greaterOrEqual"/>
      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.osgi"/>
      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views.properties.tabbed"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.swt" version="3.103.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.equinox.registry"/>
-      <import plugin="org.codehaus.groovy" version="2.5.8" match="greaterOrEqual"/>
-      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
   </requires>

   <plugin
@@ -41,7 +41,6 @@
      <import plugin="org.eclipse.e4.ui.di" version="1.1.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.e4.core.contexts" version="1.4.0" match="greaterOrEqual"/>
      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui"/>
      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.osgi.services" version="3.5.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.e4.core.services" version="2.0.0" match="greaterOrEqual"/>
@@ -51,17 +50,15 @@
      <import plugin="org.eclipse.equinox.preferences"/>
      <import plugin="org.eclipse.core.expressions"/>
      <import plugin="org.eclipse.e4.core.commands" version="0.11.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.e4.ui.workbench.addons.swt"/>
-      <import plugin="com.opcoach.e4.preferences"/>
      <import plugin="org.eclipse.e4.core.di.extensions"/>
      <import plugin="org.eclipse.e4.ui.css.swt.theme" version="0.10.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.core.resources" version="3.13.0" match="greaterOrEqual"/>
-      <import plugin="com.opcoach.e4.preferences.mainmenu" version="1.2.0" match="greaterOrEqual"/>
      <import feature="com.opcoach.e4.preferences.feature" version="1.3.0.202004072127"/>
      <import feature="org.eclipse.equinox.executable" version="3.8.700.v20200207-2156"/>
      <import feature="org.eclipse.equinox.sdk" version="3.20.100.v20200303-1901"/>
      <import feature="org.eclipse.sdk" version="4.15.0.v20200305-0155"/>
      <import feature="org.eclipse.rcptt.core" version="2.5.1.M3"/>
+      <import plugin="org.eclipse.core.commands"/>
   </requires>

   <plugin
@@ -37,8 +37,8 @@ http://www.eclipse.org/legal/epl-v10.html
         version="0.0.0"/>

   <requires>
+      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="com.minres.scviewer.database.ui" version="1.0.0" match="greaterOrEqual"/>
      <import plugin="com.minres.scviewer.database.ui.swt" version="1.0.0" match="greaterOrEqual"/>
      <import plugin="org.eclipse.core.runtime"/>
      <import plugin="org.eclipse.core.resources"/>
@@ -52,7 +52,6 @@ http://www.eclipse.org/legal/epl-v10.html
      <import plugin="org.eclipse.core.expressions" version="3.4.600" match="greaterOrEqual"/>
      <import plugin="org.eclipse.jface"/>
      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
-      <import plugin="org.hamcrest.core" version="1.3.0" match="greaterOrEqual"/>
   </requires>

   <plugin
@@ -17,12 +17,19 @@
      [Enter License Description here.]
   </license>

-   <plugin
-         id="com.minres.scviewer.database.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <includes
+         id="com.minres.scviewer.database.feature"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="org.eclipse.swt" version="3.103.1" match="greaterOrEqual"/>
+      <import plugin="com.minres.scviewer.database" version="1.0.0" match="greaterOrEqual"/>
+      <import plugin="com.google.guava" version="15.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.jface"/>
+      <import plugin="org.eclipse.equinox.registry"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.osgi"/>
+   </requires>

   <plugin
         id="com.minres.scviewer.database.ui.swt"
@@ -10,11 +10,21 @@ Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
 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
+Export-Package: com.minres.scviewer.database.ui;
+  uses:="org.eclipse.swt.events,
+   org.eclipse.swt.graphics,
+   org.eclipse.swt.widgets,
+   com.minres.scviewer.database,
+   org.eclipse.jface.viewers",
+ com.minres.scviewer.database.ui.swt;
+  uses:="org.osgi.framework,
+   org.eclipse.core.runtime,
+   com.minres.scviewer.database.ui,
+   org.eclipse.swt.graphics,
+   org.eclipse.swt.widgets"
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
-Bundle-Activator: com.minres.scviewer.database.swt.DatabaseUiPlugin
+Bundle-Activator: com.minres.scviewer.database.ui.swt.DatabaseUiPlugin
 Automatic-Module-Name: com.minres.scviewer.database.ui.swt
@@ -51,7 +51,9 @@ public interface IWaveformView extends PropertyChangeListener, ISelectionProvide

 	public void setSelection(ISelection selection);

-	public void setSelection(ISelection selection, boolean addIfNeeded);
+	public void setSelection(ISelection selection, boolean showIfNeeded);
+
+	public void addToSelection(ISelection selection, boolean showIfNeeded);

 	public void moveSelection(GotoDirection direction);

@@ -110,4 +112,6 @@ public interface IWaveformView extends PropertyChangeListener, ISelectionProvide
 	public void scrollHorizontal(int percent);
 	
 	public void addDisposeListener( DisposeListener listener );
+
+	public void deleteSelectedTracks();
 }
@@ -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.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
@@ -1,2 +0,0 @@
-/bin/
-/target/
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.minres.scviewer.database.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-pluginProject.extensions=false
-resolve.requirebundle=false
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Database UI
-Bundle-SymbolicName: com.minres.scviewer.database.ui
-Bundle-Version: 2.0.0.qualifier
-Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: com.minres.scviewer.database.ui
-Require-Bundle: com.minres.scviewer.database,
- org.eclipse.jface,
- org.eclipse.swt
-Automatic-Module-Name: com.minres.scviewer.database.ui
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
@@ -1,12 +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.ui</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-  <parent>
-  	<groupId>com.minres.scviewer</groupId>
-  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.0.0-SNAPSHOT</version>
-	<relativePath>../..</relativePath>
-  </parent>
-  </project>
@@ -15,7 +15,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
 org.eclipse.e4.ui.di;bundle-version="1.1.0",
 org.eclipse.e4.core.contexts;bundle-version="1.4.0",
 com.minres.scviewer.database.ui.swt;bundle-version="1.0.0",
- com.minres.scviewer.database.ui,
 com.minres.scviewer.database;bundle-version="1.0.0",
 org.eclipse.osgi.services;bundle-version="3.5.0",
 org.eclipse.e4.core.services;bundle-version="2.0.0",
@@ -6,7 +6,6 @@ Bundle-Version: 1.0.1.qualifier
 Bundle-Activator: com.minres.scviewer.ui.TxEditorPlugin
 Bundle-Vendor: MINRES Technologies GmbH
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
- com.minres.scviewer.database.ui;bundle-version="1.0.0",
 com.minres.scviewer.database.ui.swt;bundle-version="1.0.0",
 org.eclipse.core.runtime,
 org.eclipse.core.resources,
@@ -13,7 +13,6 @@
 		<module>plugins/com.minres.scviewer.database.text</module>
 		<module>plugins/com.minres.scviewer.database.vcd</module>
 		<module>tests/com.minres.scviewer.database.test</module>
-		<module>plugins/com.minres.scviewer.database.ui</module>
 		<module>plugins/com.minres.scviewer.database.ui.swt</module>
 		<module>plugins/com.minres.scviewer.e4.application</module>
 		<module>plugins/com.minres.scviewer.ui</module>