Fixed #916 - Scan Remover - Rename Bundle

eclipse · Feb 22, 2022 · 0417c49 · 0417c49
1 parent 5984048
commit 0417c49
Show file tree

Hide file tree

Showing 43 changed files with 108 additions and 107 deletions.
diff --git a/...ter.supplier.scanremover.feature/.project → ...xxd.filter.supplier.scan.feature/.project b/...ter.supplier.scanremover.feature/.project → ...xxd.filter.supplier.scan.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.feature</name>
+	<name>org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/...lier.scanremover.feature/build.properties → ...er.supplier.scan.feature/build.properties b/...lier.scanremover.feature/build.properties → ...er.supplier.scan.feature/build.properties
diff --git a/....supplier.scanremover.feature/feature.xml → ....filter.supplier.scan.feature/feature.xml b/....supplier.scanremover.feature/feature.xml → ....filter.supplier.scan.feature/feature.xml
@@ -1,37 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.feature"
-      label="Scan Remover Filter"
-      version="0.9.0.qualifier" provider-name="ChemClipse" plugin="org.eclipse.chemclipse.feature.branding">
+      id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.feature"
+      label="Chromatogram Scan Filter"
+      version="0.9.0.qualifier"
+      provider-name="ChemClipse"
+      plugin="org.eclipse.chemclipse.feature.branding">
 
-   <description url="http://www.openchrom.net/plugins/filter/scanremover">
+   <description url="http://www.chemclipse.net">
       This is a scan remover filter.
    </description>
 
    <copyright url="http://www.chemclipse.net">
-      Copyright (c) 2011, 2018 Lablicate GmbH.
+      Copyright (c) 2011, 2022 Lablicate GmbH.
    </copyright>
 
    <license url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2011, 2018 Lablicate GmbH.
+      Copyright (c) 2011, 2022 Lablicate GmbH.
 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
    </license>
 
    <plugin
-         id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover"
+         id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.ui"
+         id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.ui"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-</feature>
+</feature>
diff --git a/chemclipse/features/org.eclipse.chemclipse.rcp.app.compilation.core.feature/feature.xml b/chemclipse/features/org.eclipse.chemclipse.rcp.app.compilation.core.feature/feature.xml
@@ -199,7 +199,7 @@ http://www.eclipse.org/legal/epl-v10.html
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.feature"
+         id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.feature"
          version="0.0.0"/>
 
    <includes

diff --git a/...filter.supplier.scanremover.ui/.classpath → ...am.xxd.filter.supplier.scan.ui/.classpath b/...filter.supplier.scanremover.ui/.classpath → ...am.xxd.filter.supplier.scan.ui/.classpath
diff --git a/...filter.supplier.scanremover.ui/.gitignore → ...am.xxd.filter.supplier.scan.ui/.gitignore b/...filter.supplier.scanremover.ui/.gitignore → ...am.xxd.filter.supplier.scan.ui/.gitignore
diff --git a/....xxd.filter.supplier.scanremover/.project → ...gram.xxd.filter.supplier.scan.ui/.project b/....xxd.filter.supplier.scanremover/.project → ...gram.xxd.filter.supplier.scan.ui/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover</name>
+	<name>org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/...r.ui/.settings/org.eclipse.jdt.core.prefs → ...n.ui/.settings/org.eclipse.jdt.core.prefs b/...r.ui/.settings/org.eclipse.jdt.core.prefs → ...n.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/...plier.scanremover.ui/META-INF/MANIFEST.MF → ...ter.supplier.scan.ui/META-INF/MANIFEST.MF b/...plier.scanremover.ui/META-INF/MANIFEST.MF → ...ter.supplier.scan.ui/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.ui
+Automatic-Module-Name: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.ui
 Bundle-ManifestVersion: 2
-Bundle-Name: Chromatogram Filter UI
-Bundle-SymbolicName: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.ui;singleton:=true
+Bundle-Name: Chromatogram Scan Filter UI
+Bundle-SymbolicName: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.ui;singleton:=true
 Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.ui.Activator
-Bundle-Vendor: Chemclipse
+Bundle-Activator: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.ui.Activator
+Bundle-Vendor: ChemClipse
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.chemclipse.msd.model;bundle-version="0.8.0",
  org.eclipse.chemclipse.logging;bundle-version="0.8.0",
  org.eclipse.chemclipse.progress;bundle-version="0.8.0",
- org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover;bundle-version="0.8.0",
+ org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan;bundle-version="0.8.0",
  org.eclipse.chemclipse.chromatogram.msd.filter;bundle-version="0.8.0",
  org.eclipse.chemclipse.logging.ui;bundle-version="0.8.0",
  org.eclipse.chemclipse.processing;bundle-version="0.8.0",

diff --git a/...ver.ui/OSGI-INF/l10n/bundle_en.properties → ...can.ui/OSGI-INF/l10n/bundle_en.properties b/...ver.ui/OSGI-INF/l10n/bundle_en.properties → ...can.ui/OSGI-INF/l10n/bundle_en.properties
diff --git a/....supplier.scanremover.ui/build.properties → ....filter.supplier.scan.ui/build.properties b/....supplier.scanremover.ui/build.properties → ....filter.supplier.scan.ui/build.properties
diff --git a/...filter.supplier.scanremover.ui/plugin.xml → ...am.xxd.filter.supplier.scan.ui/plugin.xml b/...filter.supplier.scanremover.ui/plugin.xml → ...am.xxd.filter.supplier.scan.ui/plugin.xml
@@ -5,8 +5,8 @@
          point="org.eclipse.ui.preferencePages">
       <page
             category="org.eclipse.chemclipse.chromatogram.filter.ui.preferences.filterPreferencePage"
-            class="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.ui.preferences.FilterPreferencePage"
-            id="org.eclipse.chemclipse.chromatogram.msd.filter.supplier.scanremover.ui.preferences.scanremoverFilterPreferencePage"
+            class="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.ui.preferences.PreferencePage"
+            id="org.eclipse.chemclipse.chromatogram.msd.filter.supplier.scan.ui.preferences.preferencePage"
             name="Chromatogram Scan Filter">
       </page>
    </extension>  

diff --git a/...er/supplier/scanremover/ui/Activator.java → ...xd/filter/supplier/scan/ui/Activator.java b/...er/supplier/scanremover/ui/Activator.java → ...xd/filter/supplier/scan/ui/Activator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2018 Lablicate GmbH.
+ * Copyright (c) 2011, 2022 Lablicate GmbH.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,9 +9,9 @@
  * Contributors:
  * Dr. Philip Wenig - initial API and implementation
  *******************************************************************************/
-package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.ui;
+package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.ui;
 
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.preferences.PreferenceSupplier;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.preferences.PreferenceSupplier;
 import org.eclipse.chemclipse.support.ui.activator.AbstractActivatorUI;
 import org.osgi.framework.BundleContext;
 

diff --git a/.../ui/preferences/FilterPreferencePage.java → ...r/scan/ui/preferences/PreferencePage.java b/.../ui/preferences/FilterPreferencePage.java → ...r/scan/ui/preferences/PreferencePage.java
@@ -9,11 +9,11 @@
  * Contributors:
  * Dr. Philip Wenig - initial API and implementation
  *******************************************************************************/
-package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.ui.preferences;
+package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.ui.preferences;
 
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.model.ScanSelectorOption;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.preferences.PreferenceSupplier;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.ui.Activator;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.model.ScanSelectorOption;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.preferences.PreferenceSupplier;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.ui.Activator;
 import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.DoubleFieldEditor;
 import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.LabelFieldEditor;
 import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpacerFieldEditor;
@@ -23,9 +23,9 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
-public class FilterPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+public class PreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
-	public FilterPreferencePage() {
+	public PreferencePage() {
 
 		super(GRID);
 		setPreferenceStore(Activator.getDefault().getPreferenceStore());

diff --git a/...xd.filter.supplier.scanremover/.classpath → ...ogram.xxd.filter.supplier.scan/.classpath b/...xd.filter.supplier.scanremover/.classpath → ...ogram.xxd.filter.supplier.scan/.classpath
diff --git a/...xd.filter.supplier.scanremover/.gitignore → ...ogram.xxd.filter.supplier.scan/.gitignore b/...xd.filter.supplier.scanremover/.gitignore → ...ogram.xxd.filter.supplier.scan/.gitignore
diff --git a/...d.filter.supplier.scanremover.ui/.project → ...atogram.xxd.filter.supplier.scan/.project b/...d.filter.supplier.scanremover.ui/.project → ...atogram.xxd.filter.supplier.scan/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.ui</name>
+	<name>org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/...over/.settings/org.eclipse.jdt.core.prefs → ...scan/.settings/org.eclipse.jdt.core.prefs b/...over/.settings/org.eclipse.jdt.core.prefs → ...scan/.settings/org.eclipse.jdt.core.prefs
diff --git a/...supplier.scanremover/META-INF/MANIFEST.MF → ...filter.supplier.scan/META-INF/MANIFEST.MF b/...supplier.scanremover/META-INF/MANIFEST.MF → ...filter.supplier.scan/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover
+Automatic-Module-Name: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan
 Bundle-ManifestVersion: 2
-Bundle-Name: Scanremover
-Bundle-SymbolicName: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover;singleton:=true
+Bundle-Name: ChromatogramScanFilter
+Bundle-SymbolicName: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan;singleton:=true
 Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.Activator
+Bundle-Activator: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.Activator
 Bundle-Vendor: Chemclipse
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.chemclipse.msd.model;bundle-version="0.8.0",
@@ -18,6 +18,6 @@ Require-Bundle: org.eclipse.core.runtime,
  com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.6.2"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.model,
- org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.preferences,
- org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.settings
+Export-Package: org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.model,
+ org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.preferences,
+ org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.settings
diff --git a/...emover/OSGI-INF/l10n/bundle_en.properties → ...r.scan/OSGI-INF/l10n/bundle_en.properties b/...emover/OSGI-INF/l10n/bundle_en.properties → ...r.scan/OSGI-INF/l10n/bundle_en.properties
diff --git a/...ter.supplier.scanremover/build.properties → ...xxd.filter.supplier.scan/build.properties b/...ter.supplier.scanremover/build.properties → ...xxd.filter.supplier.scan/build.properties
diff --git a/...xd.filter.supplier.scanremover/plugin.xml → ...ogram.xxd.filter.supplier.scan/plugin.xml b/...xd.filter.supplier.scanremover/plugin.xml → ...ogram.xxd.filter.supplier.scan/plugin.xml
@@ -5,37 +5,37 @@
          point="org.eclipse.chemclipse.chromatogram.filter.chromatogramFilterSupplier">
       <ChromatogramFilterSupplier
             description="This filter enables to remove a series of scans."
-            filter="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.core.FilterRemover"
+            filter="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.core.FilterRemover"
             filterName="Scan Remover"
-            filterSettings="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.settings.FilterSettingsRemover"
+            filterSettings="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.settings.FilterSettingsRemover"
             id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover">
       </ChromatogramFilterSupplier>
       <ChromatogramFilterSupplier
             description="This filters removes empty scans."
-            filter="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.core.FilterCleaner"
+            filter="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.core.FilterCleaner"
             filterName="Scan Cleaner (Remove Empty)"
-            filterSettings="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.settings.FilterSettingsCleaner"
+            filterSettings="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.settings.FilterSettingsCleaner"
             id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.removeemptyscans">
       </ChromatogramFilterSupplier> 
       <ChromatogramFilterSupplier
             description="This filters deletes scan identification(s)."
-            filter="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.core.FilterDeleteIdentifier"
+            filter="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.core.FilterDeleteIdentifier"
             filterName="Scan Targets (Delete)"
-            filterSettings="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.settings.FilterSettingsDeleteIdentifier"
+            filterSettings="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.settings.FilterSettingsDeleteIdentifier"
             id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.removescanidentifications">
       </ChromatogramFilterSupplier>
       <ChromatogramFilterSupplier
             description="This filters selects a scan in the chromatogram."
-            filter="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.core.FilterScanSelector"
+            filter="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.core.FilterScanSelector"
             filterName="Scan Selector"
-            filterSettings="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.settings.FilterSettingsScanSelector"
+            filterSettings="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.settings.FilterSettingsScanSelector"
             id="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanselector">
       </ChromatogramFilterSupplier>      
    </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.preferences.PreferenceInitializer">
+            class="org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.preferences.PreferenceInitializer">
       </initializer>
    </extension>
 </plugin>
diff --git a/...ilter/supplier/scanremover/Activator.java → ...m/xxd/filter/supplier/scan/Activator.java b/...ilter/supplier/scanremover/Activator.java → ...m/xxd/filter/supplier/scan/Activator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2018 Lablicate GmbH.
+ * Copyright (c) 2011, 2022 Lablicate GmbH.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
  * Contributors:
  * Dr. Philip Wenig - initial API and implementation
  *******************************************************************************/
-package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover;
+package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -40,4 +40,4 @@ public void stop(BundleContext bundleContext) throws Exception {
 
 		Activator.context = null;
 	}
-}
+}
diff --git a/...plier/scanremover/core/FilterCleaner.java → ...ter/supplier/scan/core/FilterCleaner.java b/...plier/scanremover/core/FilterCleaner.java → ...ter/supplier/scan/core/FilterCleaner.java
@@ -9,7 +9,7 @@
  * Contributors:
  * Dr. Philip Wenig - initial API and implementation
  *******************************************************************************/
-package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.core;
+package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.core;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,9 +18,9 @@
 import org.eclipse.chemclipse.chromatogram.filter.result.ChromatogramFilterResult;
 import org.eclipse.chemclipse.chromatogram.filter.result.ResultStatus;
 import org.eclipse.chemclipse.chromatogram.filter.settings.IChromatogramFilterSettings;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.exceptions.FilterException;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.preferences.PreferenceSupplier;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.settings.FilterSettingsCleaner;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.exceptions.FilterException;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.preferences.PreferenceSupplier;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.settings.FilterSettingsCleaner;
 import org.eclipse.chemclipse.csd.model.core.IScanCSD;
 import org.eclipse.chemclipse.model.core.IChromatogram;
 import org.eclipse.chemclipse.model.core.IScan;

diff --git a/...nremover/core/FilterDeleteIdentifier.java → ...ier/scan/core/FilterDeleteIdentifier.java b/...nremover/core/FilterDeleteIdentifier.java → ...ier/scan/core/FilterDeleteIdentifier.java
@@ -9,15 +9,15 @@
  * Contributors:
  * Philip Wenig - initial API and implementation
  *******************************************************************************/
-package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.core;
+package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.core;
 
 import org.eclipse.chemclipse.chromatogram.filter.core.chromatogram.AbstractChromatogramFilter;
 import org.eclipse.chemclipse.chromatogram.filter.result.ChromatogramFilterResult;
 import org.eclipse.chemclipse.chromatogram.filter.result.ResultStatus;
 import org.eclipse.chemclipse.chromatogram.filter.settings.IChromatogramFilterSettings;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.exceptions.FilterException;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.preferences.PreferenceSupplier;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.settings.FilterSettingsDeleteIdentifier;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.exceptions.FilterException;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.preferences.PreferenceSupplier;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.settings.FilterSettingsDeleteIdentifier;
 import org.eclipse.chemclipse.model.core.IChromatogram;
 import org.eclipse.chemclipse.model.core.IScan;
 import org.eclipse.chemclipse.model.selection.IChromatogramSelection;

diff --git a/...plier/scanremover/core/FilterRemover.java → ...ter/supplier/scan/core/FilterRemover.java b/...plier/scanremover/core/FilterRemover.java → ...ter/supplier/scan/core/FilterRemover.java
@@ -9,7 +9,7 @@
  * Contributors:
  * Dr. Philip Wenig - initial API and implementation
  *******************************************************************************/
-package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.core;
+package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.core;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,10 +18,10 @@
 import org.eclipse.chemclipse.chromatogram.filter.result.ChromatogramFilterResult;
 import org.eclipse.chemclipse.chromatogram.filter.result.ResultStatus;
 import org.eclipse.chemclipse.chromatogram.filter.settings.IChromatogramFilterSettings;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.exceptions.FilterException;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.model.ScanRemoverPattern;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.preferences.PreferenceSupplier;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.settings.FilterSettingsRemover;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.exceptions.FilterException;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.model.ScanRemoverPattern;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.preferences.PreferenceSupplier;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.settings.FilterSettingsRemover;
 import org.eclipse.chemclipse.model.core.IChromatogram;
 import org.eclipse.chemclipse.model.core.IScan;
 import org.eclipse.chemclipse.model.selection.IChromatogramSelection;

diff --git a/.../scanremover/core/FilterScanSelector.java → ...upplier/scan/core/FilterScanSelector.java b/.../scanremover/core/FilterScanSelector.java → ...upplier/scan/core/FilterScanSelector.java
@@ -9,15 +9,15 @@
  * Contributors:
  * Philip Wenig - initial API and implementation
  *******************************************************************************/
-package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.core;
+package org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.core;
 
 import org.eclipse.chemclipse.chromatogram.filter.core.chromatogram.AbstractChromatogramFilter;
 import org.eclipse.chemclipse.chromatogram.filter.result.ChromatogramFilterResult;
 import org.eclipse.chemclipse.chromatogram.filter.result.ResultStatus;
 import org.eclipse.chemclipse.chromatogram.filter.settings.IChromatogramFilterSettings;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.exceptions.FilterException;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.preferences.PreferenceSupplier;
-import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scanremover.settings.FilterSettingsScanSelector;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.exceptions.FilterException;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.preferences.PreferenceSupplier;
+import org.eclipse.chemclipse.chromatogram.xxd.filter.supplier.scan.settings.FilterSettingsScanSelector;
 import org.eclipse.chemclipse.model.core.IChromatogram;
 import org.eclipse.chemclipse.model.core.IChromatogramOverview;
 import org.eclipse.chemclipse.model.core.IScan;